From 2b769279ae5388ceba3640b321964b25758ebed3 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 5 May 2022 13:20:16 -0500 Subject: [PATCH 1/3] Moving platform-native into meshtastic fork (#1437) --- variants/portduino/platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index dd37c3bc9..adc018666 100644 --- a/variants/portduino/platformio.ini +++ b/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} - @@ -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} - @@ -34,4 +34,4 @@ framework = arduino board = linux_hardware lib_deps = ${arduino_base.lib_deps} - rweather/Crypto \ No newline at end of file + rweather/Crypto From 5e109d96480973565f6f980f223348da4e114b29 Mon Sep 17 00:00:00 2001 From: Rockwell Schrock Date: Thu, 5 May 2022 14:46:39 -0400 Subject: [PATCH 2/3] Fix typo in calculation of NUM_ONLINE_SECS constant (#1436) Co-authored-by: Ben Meadors --- src/mesh/NodeDB.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index a90c271a6..3a05bbd93 100644 --- a/src/mesh/NodeDB.cpp +++ b/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() { From 223c706e91da12fb6e3acc4008f910b6a065a2aa Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 5 May 2022 13:54:21 -0500 Subject: [PATCH 3/3] Use meshtastic fork of arduino thread lib --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 5671ab513..fbdf1e021 100644 --- a/platformio.ini +++ b/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