Wykres commitów

2566 Commity (9623be1484028143b7525b48bb21779b1ec065d7)

Autor SHA1 Wiadomość Data
Kevin Hester 9623be1484 fix CI build script typo 2021-03-31 12:08:48 +08:00
Kevin Hester d810ce0c1e add more time for sim startup 2021-03-31 11:26:19 +08:00
Kevin Hester efd39c0f49 someone made a boo-boo adding "serial_disabled", caused a nasty NPE 2021-03-31 11:26:00 +08:00
Kevin Hester 5f45a10db5 fix sign comparsion 2021-03-31 11:14:55 +08:00
Kevin Hester 5f948c09fe update libs to fix CI build, thanks @meehow! 2021-03-31 11:05:43 +08:00
Kevin Hester 22f3efd083 update proto 2021-03-31 09:15:41 +08:00
Kevin Hester 88716fc352 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-31 09:14:43 +08:00
Kevin Hester 5c1d8b5bb0 todo updates 2021-03-31 09:13:41 +08:00
Kevin Hester b68397a911 fix simradio init to work more like real radios 2021-03-30 23:39:51 +08:00
Kevin Hester 5fdcb72d46 cleanup applyModemConfig based on porduino testing, share with sim 2021-03-30 23:34:13 +08:00
Kevin Hester b70a359fe8 leave phone timeout off a bit longer 2021-03-30 23:11:56 +08:00
Kevin Hester a9c8564524 fix millisecond unsigned rollover errors found via portduino 2021-03-30 23:11:33 +08:00
Jm Casler b527e0d447
Merge pull request #774 from mc-hamster/master
Update of #638 - Redid protobuf generation
2021-03-29 17:34:39 -07:00
Jm d8669f860a Update fo #638 - Redid protobuf generation 2021-03-29 17:33:37 -07:00
Jm Casler 78f104c6de
Merge pull request #773 from mc-hamster/master
Fix for #638 - Add option to disable serial interface
2021-03-29 17:12:21 -07:00
Jm 2f8e663f03 Add serial_disabled for #638 2021-03-29 17:08:56 -07:00
Jm Casler 7f7b07ce9d
Merge pull request #82 from meshtastic/master
update from master
2021-03-29 17:04:57 -07:00
Kevin Hester cdb4756d9d fix native build 2021-03-29 20:56:02 +08:00
Kevin Hester 385e291f51
Merge pull request #771 from geeksville/dev1.2
Dev1.2
2021-03-28 12:24:14 +08:00
Kevin Hester 7e60078791 1.2.17 2021-03-28 12:19:49 +08:00
Kevin Hester 073eecd147 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-28 12:16:50 +08:00
Kevin Hester 525fe9b96c dramatically speed up message RX in some cases (we were sleeping much too long) 2021-03-28 12:16:37 +08:00
Kevin Hester c7f411fc7c remove unused Preferences code (cc @mc-hamster for review)
(noticed because of a compiler warning)
2021-03-28 12:07:43 +08:00
Kevin Hester fc96500329 fix unused prefs field 2021-03-28 12:06:16 +08:00
Kevin Hester 4e87c4411c fix serious nak bug reported by @havealoha and @luxoon 2021-03-28 11:44:19 +08:00
Kevin Hester 9eb9c473db add note about credit! 2021-03-28 11:43:28 +08:00
Kevin Hester bfd147062f
Merge pull request #761 from geeksville/dev1.2
Dev1.2
2021-03-27 17:19:50 +08:00
Kevin Hester 890ec7bdb2 doc update 2021-03-27 17:19:15 +08:00
Kevin Hester 76269b397f Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	src/esp32/main-esp32.cpp
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
2021-03-27 16:44:42 +08:00
Jm Casler 9fb6b1718f
Merge pull request #770 from mc-hamster/master
#669 - Add restart counter
2021-03-27 01:30:28 -07:00
Jm 57c82988e2 #669 - Add restart counter 2021-03-27 01:20:07 -07:00
Kevin Hester 1e3b037fea populate position.time for broadcast positions 2021-03-27 16:17:01 +08:00
Jm Casler 1e7808991d
Merge pull request #81 from meshtastic/master
update from master
2021-03-27 01:00:57 -07:00
Jm 4f4cdf4f9e #669 Add restart counter 2021-03-27 01:00:27 -07:00
Kevin Hester 78f2c656d0 fix nrf52 builds 2021-03-27 11:21:43 +08:00
Kevin Hester 37ec969f96 Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	src/mesh/NodeDB.cpp
2021-03-27 11:10:47 +08:00
Jm Casler f1a6693bb7
Merge pull request #768 from IZ1IVA/patch-1
Update device-update.sh
2021-03-26 19:54:49 -07:00
Kevin Hester 8ffd5a1d4f add reboot message 2021-03-27 10:19:59 +08:00
IZ1IVA 29eb5e8327
Update device-update.sh
Please have a look at https://github.com/meshtastic/Meshtastic-device/issues/760
2021-03-26 14:49:27 +01:00
Jm Casler c175c21189
Merge pull request #767 from mc-hamster/master
Fix bad merge
2021-03-25 19:37:15 -07:00
Jm fc2862bd16 Fix bad merge 2021-03-25 19:36:37 -07:00
Jm Casler c9f814a9a7
Merge pull request #80 from meshtastic/master
Merge pull request #766 from mc-hamster/master
2021-03-25 19:33:35 -07:00
Jm Casler 92d2d3960b
Merge pull request #766 from mc-hamster/master
#758 Report elevation while in range test
2021-03-25 19:32:22 -07:00
Jm Casler 7872cb050d
Merge branch 'master' into master 2021-03-25 19:32:13 -07:00
Jm 89029311c1 Update NodeDB.cpp 2021-03-25 19:28:15 -07:00
Jm f6f586decb Remove my code that doesn't work with channels 2021-03-25 19:27:46 -07:00
Jm 471c06b169 #758 Report elevation while in range test 2021-03-25 19:25:20 -07:00
Jm 040bb1d1e0 Add a "Development Mode" for our plugins 2021-03-25 19:24:36 -07:00
Jm bbaf5946f0 Update StoreForwardPlugin.cpp 2021-03-25 19:22:46 -07:00
Jm Casler 5286f23c9a
Merge pull request #764 from meehow/android-captive-portal
captive portal for Android devices
2021-03-25 19:10:10 -07:00