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

2013 Commity (6da4e302158c65d5da78738dc6f4deb5110887b2)

Autor SHA1 Wiadomość Data
Jm Casler 9587729bb0
Merge branch 'master' into master 2020-12-31 20:55:32 -08:00
Jm 6ec368bf02 Commenting out upload ports 2020-12-31 20:50:11 -08:00
Jm d71c7b512f Cleanup some compile time warnings that were driving me crazy. 2020-12-31 20:44:53 -08:00
Jm 349701ac14 Display AP connection usage only when in AP mode 2020-12-31 20:17:18 -08:00
Kevin Hester d424fa5ea8
Merge pull request #605 from oztug/master 
Genieblocks LoRa support
 2020-12-31 14:19:30 +08:00
Kevin Hester ca6293eefe
Merge branch 'master' into master 2020-12-31 14:05:56 +08:00
Kevin Hester d289e8a86f Merge remote-tracking branch 'root/master' into dev 2020-12-31 14:02:47 +08:00
Kevin Hester 96328526b7
Merge pull request #613 from wfang2002/#604_rtc 
Shall upgrade RTC currentQuality if higher q available (fix #604)
 2020-12-31 13:58:40 +08:00
Wei Fang 279c89dca3 Shall upgrade RTC currentQuality if higher q available 2020-12-30 21:46:43 -08:00
wfang2002 a7a52e08d1
Merge branch 'master' into master 2020-12-30 21:26:51 -08:00
Wei Fang f6336855d0 Fix GPS turned on then off immediately every 2 minutes 2020-12-30 21:11:03 -08:00
Jm Casler 727d8a6456
Merge pull request #610 from mc-hamster/master 
Fix for meshtastic#606 and meshtastic#597
 2020-12-30 21:10:15 -08:00
Jm Casler 7b80b95381
Merge pull request #36 from mc-hamster/upload 
Fix for meshtastic#606 and meshtastic#597
 2020-12-30 18:19:52 -08:00
Jm 2867f8fd53 Fix for #606 and #597 
Upload interface randomly crashes #606

watchdog timer exception while building https certificate #597
 2020-12-30 18:10:35 -08:00
Kevin Hester cdf416cb73 partial fix for #608 - when a new TCP API connection arrives, close old one completely 2020-12-31 10:02:18 +08:00
Jm 7716d62018 Remove old comment 2020-12-30 15:16:04 -08:00
Jm Casler d5f76b16b9 write readLength to debug console 2020-12-30 14:52:39 -08:00
Jm Casler 552406b15f
Merge pull request #34 from meshtastic/master 
update from master
 2020-12-30 13:59:58 -08:00
Kevin Hester abb52e5446
Merge pull request #607 from geeksville/dev 
1.1.30
 2020-12-30 18:31:20 +08:00
Kevin Hester de37a0c31e 1.1.30 2020-12-30 18:21:32 +08:00
Kevin Hester 6e31ba30c7 move generated protobuf c code to own directory 2020-12-30 12:34:22 +08:00
Kevin Hester 8fe1c518d9 Merge branch 'mqtt' into dev 
# Conflicts:
#	proto
 2020-12-30 12:25:00 +08:00
Kevin Hester b6006fe3d5 use default serial port for the current platform 2020-12-30 12:19:08 +08:00
Kevin Hester 3e8173c4bd
Merge pull request #600 from geeksville/dev 
Dev
 2020-12-30 10:20:05 +08:00
Kevin Hester d8a15d6324
Merge branch 'master' into dev 2020-12-30 10:08:01 +08:00
oztug 9a3d558f61 Revert "Update proto" 
This reverts commit 85ddf3be1b.
 2020-12-30 01:27:20 +03:00
oztug 85ddf3be1b Update proto 2020-12-30 01:26:12 +03:00
oztug 3ca42b8f51 Merge remote-tracking branch 'upstream/master' 2020-12-30 01:24:13 +03:00
Jm Casler b75c7ad179
Merge pull request #596 from mc-hamster/master 
#588 - Calculate air time. TX and RX logging is done. #601 - tbeam draws too much power from usb
 2020-12-29 14:08:24 -08:00
Jm Casler 44f89c969d
Merge branch 'master' into master 2020-12-29 13:31:31 -08:00
oztug 5595fb38c1 Genieblocks Lora support 2020-12-29 18:08:11 +03:00
Jm Casler c0e0e095c9
Merge pull request #602 from Noki/master 
case with large gps antenna option
 2020-12-28 10:02:27 -08:00
Jm Casler 6c1c0640f2
Merge branch 'master' into master 2020-12-28 09:54:31 -08:00
Tobias Schwarz 698102371f
case with large gps antenna option 2020-12-28 11:20:43 +01:00
Jm 997ed283bf #601 - tbeam draws too much power from USB port 2020-12-28 01:12:42 -08:00
Kevin Hester 9128f7d4b3 turn on battery pin for lora_v2 per @msws 2020-12-28 15:00:34 +08:00
Kevin Hester 93d0257be7 Merge remote-tracking branch 'root/master' into dev 2020-12-28 14:59:09 +08:00
Kevin Hester adc71e7ed2 mqtt doc progress 2020-12-28 14:42:24 +08:00
Kevin Hester 516e18ca80 mqtt doc updates 2020-12-28 13:57:59 +08:00
Kevin Hester 4777e53c23 more mqtt design work 2020-12-28 13:36:11 +08:00
Kevin Hester d6912cfd8e mqtt design progress 2020-12-28 13:22:10 +08:00
Jm 621306e610 Add IP address and rssi to /json/report 2020-12-27 15:03:32 -08:00
Jm Casler 0e507e1923
Merge branch 'master' into master 2020-12-27 12:39:36 -08:00
Jm 15a0b3694d Update to #588 - Change "hour" to "period" 2020-12-27 10:50:52 -08:00
Jm Casler 6e4cf22cf0 Accidently checked in my platform.ini 2020-12-27 09:49:23 -08:00
Jm Casler 58859848a3 Add RX and RX_ALL analytics for #588 2020-12-27 09:29:48 -08:00
Kevin Hester 55f61826bf
Merge pull request #599 from geeksville/mqtt 
fix bug for scriptblock
 2020-12-27 17:05:33 +08:00
Kevin Hester f80d357b77 Merge remote-tracking branch 'root/master' into mqtt 2020-12-27 16:59:23 +08:00
Kevin Hester c972197643 fix #598 don't corrupt the heap when a TCP connection drops 2020-12-27 16:58:32 +08:00
Kevin Hester c06b7b2b48 add misc mqtt ideas 2020-12-27 16:06:30 +08:00