Merge remote-tracking branch 'upstream/dev' into dev

khudson · khudson · commit 4b508136b41c · 2025-08-31T11:30:59.000-07:00
diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h
@@ -8,11 +8,11 @@
 #define FIRMWARE_VER_CODE 7
 
 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "24 Jul 2025"
+#define FIRMWARE_BUILD_DATE "31 Aug 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "v1.7.4"
+#define FIRMWARE_VERSION "v1.8.0"
 #endif
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp
@@ -551,7 +551,22 @@ void UITask::loop() {
   if (millis() > next_batt_chck) {
     uint16_t milliVolts = getBattMilliVolts();
     if (milliVolts > 0 && milliVolts < AUTO_SHUTDOWN_MILLIVOLTS) {
+
+      // show low battery shutdown alert
+      // we should only do this for eink displays, which will persist after power loss
+      #ifdef THINKNODE_M1
+      if (_display != NULL) {
+        _display->startFrame();
+        _display->setTextSize(2);
+        _display->setColor(DisplayDriver::RED);
+        _display->drawTextCentered(_display->width() / 2, 20, "Low Battery.");
+        _display->drawTextCentered(_display->width() / 2, 40, "Shutting Down!");
+        _display->endFrame();
+      }
+      #endif
+
       shutdown();
+
     }
     next_batt_chck = millis() + 8000;
   }
diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp
@@ -22,11 +22,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "24 Jul 2025"
+  #define FIRMWARE_BUILD_DATE   "31 Aug 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.7.4"
+  #define FIRMWARE_VERSION   "v1.8.0"
 #endif
 
 #ifndef LORA_FREQ
diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp
@@ -22,11 +22,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "24 Jul 2025"
+  #define FIRMWARE_BUILD_DATE   "31 Aug 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.7.4"
+  #define FIRMWARE_VERSION   "v1.8.0"
 #endif
 
 #ifndef LORA_FREQ
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
@@ -49,11 +49,11 @@ struct ContactInfo {
 };
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "24 Jul 2025"
+  #define FIRMWARE_BUILD_DATE   "31 Aug 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.7.4"
+  #define FIRMWARE_VERSION   "v1.8.0"
 #endif
 
 #define FIRMWARE_ROLE "sensor"
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "MeshCore",
-    "version" : "1.7.4",
+    "version" : "1.8.0",
     "dependencies": {
         "SPI": "*",
         "Wire": "*",
@@ -13,4 +13,4 @@
     "build": {
         "extraScript": "build_as_lib.py"
     }
-}
+}
diff --git a/platformio.ini b/platformio.ini
@@ -68,7 +68,7 @@ lib_deps =
 ; esp32c6 uses arduino framework 3.x
 [esp32c6_base]
 extends = esp32_base
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.12/platform-espressif32.zip
 
 ; ----------------- NRF52 ---------------------
 
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
@@ -268,7 +268,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       } else if (memcmp(config, "agc.reset.interval ", 19) == 0) {
         _prefs->agc_reset_interval = atoi(&config[19]) / 4;
         savePrefs();
-        strcpy(reply, "OK");
+        sprintf(reply, "OK - interval rounded to %d", ((uint32_t) _prefs->agc_reset_interval) * 4);
       } else if (memcmp(config, "multi.acks ", 11) == 0) {
         _prefs->multi_acks = atoi(&config[11]);
         savePrefs();
diff --git a/src/helpers/nrf52/ThinkNodeM1Board.h b/src/helpers/nrf52/ThinkNodeM1Board.h
@@ -57,6 +57,14 @@ class ThinkNodeM1Board : public mesh::MainBoard {
   }
 
   void powerOff() override {
+
+    // turn off all leds, sd_power_system_off will not do this for us
+    #ifdef P_LORA_TX_LED
+    digitalWrite(P_LORA_TX_LED, LOW);
+    #endif
+
+    // power off board
     sd_power_system_off();
+
   }
 };
diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini
@@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=1
 build_src_filter = ${Generic_ESPNOW.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
@@ -54,7 +54,7 @@ lib_deps =
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini
@@ -55,7 +55,7 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
@@ -73,7 +73,7 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D OFFLINE_QUEUE_SIZE=256
   -D BLE_PIN_CODE=123456
diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini
@@ -43,7 +43,7 @@ build_flags =
   -D ARDUINO_USB_CDC_ON_BOOT=1      ; need for Serial
   -D DISPLAY_ROTATION=1
   -D DISPLAY_CLASS=ST7735Display
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456 ; HWT will use display for pin
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
@@ -72,7 +72,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
diff --git a/variants/heltec_vision_master_e213/platformio.ini b/variants/heltec_vision_master_e213/platformio.ini
@@ -38,7 +38,7 @@ extends = Heltec_Vision_Master_E213_base
 build_flags =
   ${Heltec_Vision_Master_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
diff --git a/variants/heltec_vision_master_e290/platformio.ini b/variants/heltec_vision_master_e290/platformio.ini
@@ -22,7 +22,7 @@ build_flags =
   -D PIN_BOARD_SCL=38
   -D Vision_Master_E290
 build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/heltec_vision_master_e290>    
+  +<../variants/heltec_vision_master_e290>
 lib_deps =
   ${esp32_base.lib_deps}
   https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip
@@ -32,7 +32,7 @@ extends = Heltec_Vision_Master_E290_base
 build_flags =
   ${Heltec_Vision_Master_E290_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D DISPLAY_CLASS=E290Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
diff --git a/variants/heltec_vision_master_t190/platformio.ini b/variants/heltec_vision_master_t190/platformio.ini
@@ -31,11 +31,11 @@ build_flags =
   -D ST7789
   -D DISPLAY_CLASS=ST7789Display
 build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/heltec_vision_master_t190> 
+  +<../variants/heltec_vision_master_t190>
   +<helpers/*.cpp>
   +<helpers/ui/ST7789Display.cpp>
   +<helpers/ui/OLEDDisplay.cpp>
-  +<helpers/ui/OLEDDisplayFonts.cpp>   
+  +<helpers/ui/OLEDDisplayFonts.cpp>
 lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit GFX Library @ ^1.12.1
@@ -45,7 +45,7 @@ extends = Heltec_Vision_Master_T190_base
 build_flags =
   ${Heltec_Vision_Master_T190_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
@@ -28,7 +28,7 @@ build_flags =
   -D ARDUINO_heltec_wifi_lora_32_V3
   -D WIRELESS_PAPER
 build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/heltec_wireless_paper>    
+  +<../variants/heltec_wireless_paper>
 lib_deps =
   ${esp32_base.lib_deps}
   https://github.com/todd-herbert/heltec-eink-modules/archive/9207eb6ab2b96f66298e0488740218c17b006af7.zip
@@ -38,7 +38,7 @@ extends = Heltec_Wireless_Paper_base
 build_flags =
   ${Heltec_Wireless_Paper_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini
@@ -56,7 +56,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1262
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -91,7 +91,7 @@ build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -110,7 +110,7 @@ build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini
@@ -54,7 +54,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1276
 build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -90,7 +90,7 @@ build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
@@ -109,7 +109,7 @@ build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -25,7 +25,7 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/lilygo_tbeam_supreme_SX1262>
   +<helpers/ui/SH1106Display.cpp>
   +<helpers/esp32/TBeamBoard.cpp>
-  +<helpers/sensors> 
+  +<helpers/sensors>
 board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 lib_deps =
   ${esp32_base.lib_deps}
@@ -74,7 +74,7 @@ extends = T_Beam_S3_Supreme_SX1262
 build_flags =
   ${T_Beam_S3_Supreme_SX1262.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini
@@ -67,7 +67,7 @@ lib_deps =
 [env:LilyGo_Tlora_C6_companion_radio_ble]
 extends = tlora_c6
 build_flags = ${tlora_c6.build_flags}
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini
@@ -82,6 +82,7 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
+  -I examples/companion_radio/ui-new
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -99,8 +100,11 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/companion_radio/*.cpp>
   +<helpers/esp32/*.cpp>
   +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
+  -I examples/companion_radio/ui-new
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -159,8 +163,11 @@ extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/companion_radio/*.cpp>
   +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
+  -I examples/companion_radio/ui-new
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -178,8 +185,11 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/companion_radio/*.cpp>
   +<helpers/esp32/*.cpp>
   +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
+  -I examples/companion_radio/ui-new
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp
@@ -18,10 +18,6 @@ MASensorManager sensors = MASensorManager(nmea);
   DISPLAY_CLASS display;
 #endif
 
-#ifndef LORA_CR
-  #define LORA_CR      5
-#endif
-
 bool radio_init() {
   fallback_clock.begin();
   rtc_clock.begin(Wire);
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "MeshCore",`
`3`		`- "version" : "1.7.4",`
	`3`	`+ "version" : "1.8.0",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"SPI": "*",`
`6`	`6`	`"Wire": "*",`
`@@ -13,4 +13,4 @@`
`13`	`13`	`"build": {`
`14`	`14`	`"extraScript": "build_as_lib.py"`
`15`	`15`	`}`
`16`		`-}`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,14 @@ class ThinkNodeM1Board : public mesh::MainBoard {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`void powerOff() override {`
	`60`	`+`
	`61`	`+ // turn off all leds, sd_power_system_off will not do this for us`
	`62`	`+ #ifdef P_LORA_TX_LED`
	`63`	`+ digitalWrite(P_LORA_TX_LED, LOW);`
	`64`	`+ #endif`
	`65`	`+`
	`66`	`+ // power off board`
`60`	`67`	`sd_power_system_off();`
	`68`	`+`
`61`	`69`	`}`
`62`	`70`	`};`