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

1397 Commity (956d9e96f2ea9e91f4779d1514cbf02adf1d1df0)

Autor SHA1 Wiadomość Data
geeksville 956d9e96f2 Merge branch 'eink' of https://github.com/geeksville/Meshtastic-esp32 into eink 2020-09-26 13:49:54 -07:00
geeksville 266ba03bb7 route debug output back to the CDC-ACM device instead of JLINK 2020-09-26 13:49:22 -07:00
Kevin Hester 04c54840f4
Merge branch 'master' into eink 2020-09-26 12:58:13 -07:00
geeksville db33200468 remove more stale eink code 2020-09-26 12:51:05 -07:00
geeksville d7fbcf89bf cleanup todo eink now ready to merge 2020-09-26 12:36:11 -07:00
geeksville a8b1bc735a remove debugging code eink gps now works 2020-09-26 12:12:50 -07:00
geeksville ba8c640d6e eink leds kinda work now 2020-09-26 10:53:02 -07:00
geeksville d88d2780f4 eink display now kinda works 2020-09-26 09:40:48 -07:00
geeksville b0bbf95b03 LORA now works on the eink board (new schematic from ttgo) 2020-09-26 07:25:32 -07:00
Jm Casler 9c7aa02db8
Merge pull request #440 from mc-hamster/master 
Merging from my fork into master for some cleanup, more code comments, reduce compile warnings and move the "Mode" text up a line.
 2020-09-26 00:20:27 -07:00
Jm Casler 6f444ed4b5 Accidently left #include "nimble/BluetoothUtil.h" in screen 2020-09-26 00:03:23 -07:00
Jm Casler 28119bf1bf Fix for #439 and some cleanup 2020-09-26 00:01:02 -07:00
Jm Casler 7fdb5b594d
Merge pull request #10 from meshtastic/master 
update my fork from head
 2020-09-25 16:40:01 -07:00
Kevin Hester 6013fceb10
Merge pull request #438 from geeksville/master 
fix TCP API server and get ready to end "region specific" firmware builds
 2020-09-25 16:27:29 -07:00
geeksville 2996c7c8e2 Make tcp API now work. Sample usage and caveats below: 
Sample usage:

First configure device to use @mc-hamster's new wifi stuff:
meshtastic --set wifi_ssid mylanname --set wifi_password mylanpassword

Then reboot the device (so wifi starts up).

(assuming device was assigned addr 192.168.81.45)
meshtastic --info --host 192.168.81.45
(See the usual device info you previously had to get over USB)

Caveats:

* Currently we are limiting to one active TCP connection open at once, if
you open a new session the old one is closed automatically
* There are no access controls/authentication needed to open a TCP
connection to the device
* Currently main.cpp is kinda dumb about how we should schedule work and
we rely on too many helper loop() functions.  Very soon in my queue
(related to all the other cleanup) is to add a basic notion of coroutines,
so that we can get away from freertos threads and this old school arduino
loop function.  Once that cleanup happens we can the a) have much lower
battery consumption (always) and b) super fast response for all operations.
 2020-09-25 16:18:30 -07:00
geeksville d1c3078698 shrink guard for channel settings lock 2020-09-25 12:52:26 -07:00
geeksville 3e5f81bf2a move region into userpreferences, to end region specific firmwares 2020-09-25 12:52:08 -07:00
geeksville 772d045166 more eink notes 2020-09-25 10:41:27 -07:00
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
geeksville 6f77244af3 eink wip notes 2020-09-25 09:14:00 -07:00
Jm Casler 05351ce3e4
Merge branch 'master' into dev-wifi 2020-09-24 17:21:16 -07:00
geeksville a79aff4778 WIP - I think some pins are wrong, waiting for new schematic 2020-09-24 16:36:07 -07:00
geeksville 86d6f88787 Merge remote-tracking branch 'root/master' into eink 2020-09-24 15:13:08 -07:00
geeksville 5fbeaee0b0 eink kinda builds 2020-09-24 14:36:43 -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