Merge branch 'master' of github.com:meshtastic/Meshtastic-device

platformio.ini

@@ -49,7 +49,7 @@ lib_deps =
   https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
   Wire ; explicitly needed here because the AXP202 library forgets to add it
   SPI
-  https://github.com/geeksville/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
+  https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
   PubSubClient
   nanopb/Nanopb@^0.4.6
   meshtastic/json11@^1.0.2

src/mesh/NodeDB.cpp

@@ -439,7 +439,7 @@ uint32_t sinceLastSeen(const NodeInfo *n)
     return delta;
 }
 
-#define NUM_ONLINE_SECS (60 & 60 * 2) // 2 hrs to consider someone offline
+#define NUM_ONLINE_SECS (60 * 60 * 2) // 2 hrs to consider someone offline
 
 size_t NodeDB::getNumOnlineNodes()
 {

variants/portduino/platformio.ini

@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [env:native]
-platform = https://github.com/geeksville/platform-native.git 
+platform = https://github.com/meshtastic/platform-native.git 
 src_filter = 
   ${env.src_filter} 
   -<esp32/> 
@@ -19,7 +19,7 @@ lib_deps =
 
 ; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
 [env:linux]
-platform = https://github.com/geeksville/platform-native.git 
+platform = https://github.com/meshtastic/platform-native.git 
 src_filter = 
   ${env.src_filter} 
   -<esp32/> 
@@ -34,4 +34,4 @@ framework = arduino
 board = linux_hardware
 lib_deps =
   ${arduino_base.lib_deps}
-  rweather/Crypto
+  rweather/Crypto