sp9unb
/
meshtastic-firmware
sforkowany z mirror/meshtastic-firmware
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
1 375 Commity
8 Gałęzie
195 Tagi
44 MiB
Wykres commitów

1375 Commity (1a064a466649b660e601af39f9996b76cd51fa29)

Autor SHA1 Wiadomość Data
geeksville 1a064a4666 Merge remote-tracking branch 'root/master' 2020-09-25 09:19:58 -07:00
Kevin Hester e81c89dcae
Merge pull request #436 from meshtastic/dev-wifi 
Initial Merge of WiFi Soft AP, WiFi Client, HTTP Server, DNS Server, Captive Portal and Apple Captive Network Assistant (CNA)
 2020-09-25 09:18:44 -07:00
geeksville 1f36139e99 remove Signal 2020-09-25 09:14:44 -07:00
Jm Casler 05351ce3e4
Merge branch 'master' into dev-wifi 2020-09-24 17:21:16 -07:00
Jm Casler fed4dfd410
Merge pull request #435 from mc-hamster/master 
Update dev-wifi from my fork
 2020-09-24 11:15:47 -07:00
Jm Casler 0d3b8bdb22 Note not to file bugs 2020-09-24 11:07:30 -07:00
Kevin Hester 3c4f56f3bf
Merge pull request #434 from geeksville/dev-wifi 
Add stubs so that portduino can build with wifi. cc @mc-hamster
 2020-09-24 10:51:39 -07:00
geeksville d3c00584a2 oops - the NRF52 build rules are suppose to inherit from arduino_base. 2020-09-24 10:36:37 -07:00
Jm Casler ce7fa65595 David's latest changes to the HTML UI 2020-09-23 19:04:12 -07:00
geeksville 9c0a0ad220 Add stubs so that portduino can build with wifi. cc @mc-hamster 2020-09-23 17:22:17 -07:00
Kevin Hester 22d0ef36b8
Merge pull request #431 from KenVanHoeylandt/patch-1 
Fix for broken link to device API docs
 2020-09-23 17:12:52 -07:00
Ken Van Hoeylandt 829c5f493c
Fix for broken link to device API docs 
bluetooth-api.md -> device-api.md
 2020-09-23 20:16:21 +02:00
Jm Casler 2d8eb8e205
Merge pull request #9 from meshtastic/dev-wifi 
from dev-wifi to my fork
 2020-09-22 22:09:06 -07:00
Jm Casler 52a3927585 Merge branch 'master' into dev-wifi 2020-09-22 22:00:55 -07:00
Jm Casler b39f6c96bd Merge remote-tracking branch 'origin/dev-wifi' 2020-09-22 22:00:07 -07:00
Jm Casler a96c2e0eac
Merge pull request #428 from mc-hamster/master 
Initial check-in of David's UI
 2020-09-22 21:10:48 -07:00
Jm Casler 10b24c0269 Initial check-in of David's UI 2020-09-22 21:01:31 -07:00
Jm Casler 4140883684
Merge pull request #426 from comgram/kr 
Add Korean Frequency
 2020-09-22 05:46:18 -07:00
geeksville 3352fae64c fix #371 allow button while using API. also don't let tbeams sleep if they have USB power 2020-09-21 12:41:39 -07:00
comgram 55cb0c52ee Add Korean Frequency 2020-09-21 16:10:20 +09:00
Jm Casler 626d82614c
Merge pull request #425 from mc-hamster/master 
Fix for - dev-wifi: Detailed error reporting of reason why WiFi didn't connect #424
 2020-09-19 22:05:57 -07:00
Jm Casler d890068acb dev-wifi: Detailed error reporting of reason why WiFi didn't connect #424 2020-09-19 21:58:21 -07:00
Jm Casler 468ad39a94
Merge pull request #7 from meshtastic/dev-wifi 
Bringing in the API changes
 2020-09-19 17:27:29 -07:00
Jm Casler 5cbe06c2b0
Merge pull request #419 from geeksville/dev-wifi 
Add API server on port 4403 (kinda a WIP, seems to work but I haven't
 2020-09-19 17:25:24 -07:00
Jm Casler 3412ecfe7b
Merge pull request #6 from meshtastic/dev-wifi 
Pulling from meshtastic dev-wifi to my work area
 2020-09-19 17:21:56 -07:00
Jm Casler adb16a334c
Merge pull request #423 from mc-hamster/master 
Add more detail on the connection status on the screen #422
 2020-09-19 17:20:35 -07:00
Jm Casler 377f0bda5d Add more detail on the connection status on the screen #422 2020-09-19 17:15:03 -07:00
Jm Casler 51ab853658
Merge pull request #421 from mc-hamster/master 
Fix for Bug #420 : Wifi in station mode sometimes enters loops of repeatedly joining
 2020-09-19 16:46:05 -07:00
Jm Casler 464a42258f Fix for "Wifi in station mode sometimes enters loops of repeatedly joining... #420" 
Fix for Wifi in station mode sometimes enters loops of repeatedly joining... #420
 2020-09-19 16:38:59 -07:00
geeksville 9e9c50e6d8 Add API server on port 4403 (kinda a WIP, seems to work but I haven't 
finished the python client code)
 2020-09-19 12:54:49 -07:00
Jm Casler 945f726b65 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-09-19 12:50:46 -07:00
Jm Casler 7c44daf8f4 pushing my chances to personal branch so i can get the changes from the laptop 2020-09-19 12:50:43 -07:00
Jm Casler c57a9a8613 Update from my laptop 2020-09-19 11:24:55 -07:00
geeksville 3c0429deee Add new factory_reset preferences option clients can set 2020-09-19 11:19:42 -07:00
Kevin Hester 5d8f541e70
Merge pull request #418 from geeksville/master 
1.1.0
 2020-09-19 10:33:48 -07:00
geeksville bd126b866c 1.1.0 2020-09-19 10:32:57 -07:00
Kevin Hester 036a1991b8
Merge pull request #403 from r51n/anz 
Add Australia/New Zealand channels and build target
 2020-09-19 07:48:17 -07:00
Jm Casler 6e3b22c624 Stub for a handler of the root (/) of the web server with a html table and form for chat 2020-09-18 20:42:35 -07:00
Jm Casler 82fbedbf41 Auto formatting of meshwifi.cpp 2020-09-18 18:51:42 -07:00
Jm Casler 0929b86d62
Merge pull request #411 from mc-hamster/master 
Moved handleDNSResponse from main into handleWebResponse and used the auto format
 2020-09-18 18:36:40 -07:00
Jm Casler 65fc1cf4a6 Moved handleDNSResponse into handleWebResponse and used the autoformatter 2020-09-18 18:29:16 -07:00
Jm Casler 6f753799fd
Merge pull request #410 from mc-hamster/master 
Completed Software AP and basic Captive Portal
 2020-09-18 18:20:27 -07:00
Jm Casler 4d72afebe6 Soft AP and basic captive portal done. 2020-09-18 18:16:58 -07:00
Jm Casler b1643e6036
Merge pull request #5 from meshtastic/dev-wifi 
Dev wifi
 2020-09-18 18:06:13 -07:00
Jm Casler 362d8cb831
Merge branch 'master' into dev-wifi 2020-09-18 18:02:56 -07:00
Jm Casler b203c95dd1 changes for soft ap + captive portal 2020-09-18 15:33:03 -07:00
Kevin Hester 8d4672964c
Merge pull request #409 from geeksville/dev-wifi 
Make wifi optional and exclude from nrf52 builds
 2020-09-18 13:38:00 -07:00
geeksville 6e5e5822aa Make wifi optional and exclude from nrf52 builds 2020-09-18 10:48:39 -07:00
Kevin Hester 5fb0bf2575
Merge branch 'master' into anz 2020-09-18 10:19:43 -07:00
Kevin Hester 9af2045dc1
Merge pull request #404 from geeksville/master 
Merge portduino/sim beginnings into mainline
 2020-09-18 10:18:33 -07:00