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

2644 Commity (35a9c23bb64a9a5cd0ba1d4e948ba94de0411abc)

Autor SHA1 Wiadomość Data
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
Kevin Hester 7e9e33d462 fix has_gps reporting to phones 2021-03-26 09:30:33 +08:00
Kevin Hester 04225f7bc2 change! time of last packet rx in node->last_heard instead of node->position.time 2021-03-26 09:30:15 +08:00
Kevin Hester dd0f1b2704 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-26 08:57:47 +08:00
Kevin Hester 669807524e
Merge pull request #763 from IZ1IVA/patch-6 
Update device-install.sh
 2021-03-26 08:54:03 +08:00
Michał Adamski 97a5405293 captive portal for Android devices 2021-03-25 21:49:06 +01:00
IZ1IVA f298c7d053
Update device-install.sh 
Please have a look at https://github.com/meshtastic/Meshtastic-device/issues/760
 2021-03-25 10:43:25 +01:00
Kevin Hester a59f5344de Merge remote-tracking branch 'root/master' into dev1.2 2021-03-25 09:18:44 +08:00
Kevin Hester 13cfce48fa cleanly disable bluetooth while serial API is in use (and only then) 2021-03-25 08:54:43 +08:00
Kevin Hester 0261c243e0 PhoneAPIs shouldn't register for messages until they have clients 2021-03-25 07:51:54 +08:00
Kevin Hester ab325d6d2c Merge branch 'dev1.2' of https://github.com/geeksville/Meshtastic-esp32 into dev1.2 2021-03-25 06:15:36 +08:00
Kevin Hester b20930c111 move streamapi into a thread, saves power and increases responsiveness 2021-03-25 06:15:15 +08:00
Kevin Hester 770788d0a4
Merge pull request #759 from geeksville/dev1.2 
update altitude in nodedb for received altitudes (reported by @iz1kga)
 2021-03-24 19:25:48 +08:00
Kevin Hester d02f615cad
Merge branch 'master' into dev1.2 2021-03-24 19:25:40 +08:00
Kevin Hester e17fe7e075 update altitude in nodedb for received altitudes (reported by @iz1kga) 2021-03-24 19:24:33 +08:00
Kevin Hester 286686137f
Merge pull request #757 from geeksville/dev1.2 
getting ready for 1.2.13
 2021-03-24 13:34:57 +08:00
Kevin Hester 77c1112fe8 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-24 13:28:21 +08:00
Kevin Hester 2d4ba357f7
Merge pull request #755 from vfurman-gh/master 
Push RSSI to the phone
 2021-03-24 13:28:01 +08:00
Kevin Hester 455d0f8d66 1.2.13 2021-03-24 13:27:18 +08:00
Kevin Hester 5b0e7c6e82 fix has_preferences init 2021-03-24 13:25:21 +08:00
Kevin Hester 78c665abb9 properly discard messages with fromradio queue is full (Rather than blocking forever) 2021-03-24 13:25:10 +08:00
Kevin Hester 9a86d52d00 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-24 12:01:38 +08:00
Kevin Hester c5973f9a55 @mc-hamster it is VERY important to not accidentally turn this in in master 
;-)
 2021-03-24 11:41:14 +08:00