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

2047 Commity (c97342db9987d63eca90e233e7bc4e9efbbaa7b0)

Autor SHA1 Wiadomość Data
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
Jm 3c69beef94 Update to the airtime calculator. I didn't 0 out the RX log. 2020-12-26 23:37:04 -08:00
Jm Casler e55c5e10bc
Merge branch 'master' into master 2020-12-26 22:43:56 -08:00
Jm e321528a6d #588 - Calculate TX air time 2020-12-26 22:39:43 -08:00
Kevin Hester ee897bce6c
Merge pull request #595 from geeksville/mqtt 
draft pull request to visualize MQTT changes vs master
 2020-12-27 13:28:55 +08:00
Kevin Hester 186a52172c fix #577 don't make invalid radio settings reboot the board 
instead raise a critical fault (note though: this is still not ideal
because the radio will be in an undefined state until valid settings
are used)
 2020-12-27 13:09:20 +08:00
Kevin Hester 21570fc24f fix #540 use gps to fix rtc clock drift every 12 hrs 2020-12-27 12:54:44 +08:00
Kevin Hester 2edc6b363d fix #587 thanks @cronyx 2020-12-27 12:53:23 +08:00
Kevin Hester 0c74303e9d move criticalerror defs into .proto for cross platform support 2020-12-27 11:22:08 +08:00
Kevin Hester 244e597a9f Merge remote-tracking branch 'root/master' into dev 2020-12-26 14:01:46 +08:00
Kevin Hester 15833e1e53 Merge remote-tracking branch 'root/master' into mqtt 2020-12-26 13:59:26 +08:00
Kevin Hester 73d64d378a Merge branch 'dev' into mqtt 2020-12-26 13:58:58 +08:00
Kevin Hester 8d04410f45 improve error descriptions 2020-12-26 13:55:59 +08:00
Kevin Hester 36d28d2da6
Merge pull request #594 from geeksville/dev 
Dev
 2020-12-26 13:53:48 +08:00
Kevin Hester 4a653ab054 fix nrf52 build 2020-12-26 13:47:02 +08:00
Kevin Hester 651bd71454 show critical faults on the screen 2020-12-26 13:36:21 +08:00
Kevin Hester 1e9ebbc476 Merge remote-tracking branch 'root/master' into dev 2020-12-26 12:53:39 +08:00