From 01e4c0c16932701e0dbe5a2592cb59334f46d025 Mon Sep 17 00:00:00 2001 From: Peter Aandahl Date: Thu, 29 Oct 2026 17:17:43 +0100 Subject: [PATCH 1/3] Add configurable auto_reboot CLI command, 5s peripheral power-cycle reset, and ESP32 hardware watchdog --- examples/simple_repeater/main.cpp | 22 ++++++++++++++ merge-bin.py | 13 +++++---- src/helpers/CommonCLI.cpp | 19 ++++++++++++ src/helpers/CommonCLI.h | 2 ++ src/helpers/ESP32Board.cpp | 42 +++++++++++++++++++++++++++ src/helpers/ESP32Board.h | 21 +++++++++++--- variants/heltec_v4/HeltecV4Board.cpp | 6 ++++ variants/heltec_v4/HeltecV4Board.h | 1 + variants/heltec_v4/LoRaFEMControl.cpp | 2 +- 9 files changed, 118 insertions(+), 10 deletions(-) diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp index d475b13d842..72d0b7fb85c 100644 --- a/examples/simple_repeater/main.cpp +++ b/examples/simple_repeater/main.cpp @@ -19,6 +19,8 @@ SimpleMeshTables tables; MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables); void halt() { + delay(5000); + board.reboot(); while (1) ; } @@ -205,6 +207,26 @@ void loop() { #ifdef HAS_EXTERNAL_WATCHDOG external_watchdog.loop(); #endif + + uint16_t reboot_hours = the_mesh.getNodePrefs()->auto_reboot_hours; + if (reboot_hours > 0) { + unsigned long reboot_interval_ms = (unsigned long)reboot_hours * 3600000UL; + #if defined(ESP_PLATFORM) + bool ota_active = board.isSleepInhibited(); + #else + bool ota_active = false; + #endif + if (!ota_active && millis() >= reboot_interval_ms) { + if (!the_mesh.hasPendingWork() || millis() >= (reboot_interval_ms + 10000UL)) { + if (the_mesh.getNodePrefs()->isDirty()) { + the_mesh.savePrefs(); + } + Serial.println("Scheduled auto_reboot: cycling peripheral power and restarting..."); + board.reboot(); + } + } + } + if (the_mesh.getNodePrefs()->powersaving_enabled && !the_mesh.hasPendingWork()) { #if defined(NRF52_PLATFORM) board.sleep(0); // nrf ignores seconds param, sleeps whenever possible diff --git a/merge-bin.py b/merge-bin.py index e125afd4944..2ecda36ea56 100644 --- a/merge-bin.py +++ b/merge-bin.py @@ -4,7 +4,7 @@ import os -Import("env", "projenv") +Import("env") board_config = env.BoardConfig() firmware_bin = "${BUILD_DIR}/${PROGNAME}.bin" @@ -13,9 +13,12 @@ def merge_bin_action(source, target, env): flash_images = [ - *env.Flatten(env.get("FLASH_EXTRA_IMAGES", [])), - "$ESP32_APP_OFFSET", - source[0].get_abspath(), + f'"{env.subst(str(x))}"' if " " in env.subst(str(x)) else env.subst(str(x)) + for x in [ + *env.Flatten(env.get("FLASH_EXTRA_IMAGES", [])), + "$ESP32_APP_OFFSET", + source[0].get_abspath(), + ] ] merge_cmd = " ".join( [ @@ -25,7 +28,7 @@ def merge_bin_action(source, target, env): board_config.get("build.mcu", "esp32"), "merge_bin", "-o", - merged_bin, + f'"{env.subst(merged_bin)}"', "--flash_mode", board_config.get("build.flash_mode", "dio"), "--flash_freq", diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 04199e24d1d..a01ba6f0300 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -657,6 +657,19 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep savePrefs(); strcpy(reply, "OK"); #endif + } else if (memcmp(config, "auto_reboot ", 12) == 0 || memcmp(config, "auto.reboot ", 12) == 0) { + int hours = _atoi(&config[12]); + if (hours >= 0 && hours <= 720) { + _prefs->auto_reboot_hours = (uint16_t)hours; + savePrefs(); + if (hours == 0) { + strcpy(reply, "OK - auto_reboot disabled"); + } else { + sprintf(reply, "OK - auto_reboot every %d hours", hours); + } + } else { + strcpy(reply, "Error: hours must be between 0-720"); + } } else if (memcmp(config, "adc.multiplier ", 15) == 0) { _prefs->adc_multiplier = atof(&config[15]); if (_board->setAdcMultiplier(_prefs->adc_multiplier)) { @@ -791,6 +804,12 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep #else strcpy(reply, "Error: unsupported"); #endif + } else if (memcmp(config, "auto_reboot", 11) == 0 || memcmp(config, "auto.reboot", 11) == 0) { + if (_prefs->auto_reboot_hours == 0) { + strcpy(reply, "> 0 (disabled)"); + } else { + sprintf(reply, "> %u", (unsigned)_prefs->auto_reboot_hours); + } } else if (memcmp(config, "adc.multiplier", 14) == 0) { float adc_mult = _board->getAdcMultiplier(); if (adc_mult == 0.0f) { diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h index 2759b0c4f0e..8fe87ad4a74 100644 --- a/src/helpers/CommonCLI.h +++ b/src/helpers/CommonCLI.h @@ -58,6 +58,7 @@ class NodePrefs : public ConfigSerializer { char bridge_secret[16]; // for XOR encryption of bridge packets (ESP-NOW only) // Power setting uint8_t powersaving_enabled = 0; // boolean + uint16_t auto_reboot_hours = 24; // hours between automatic reboots (0 = disabled) // Gps settings uint8_t gps_enabled = 0; uint32_t gps_interval = 0; // in seconds @@ -171,6 +172,7 @@ class NodePrefs : public ConfigSerializer { void structure() override { def("adc_mult", _parent->adc_multiplier); def("pwr_sav_en", _parent->powersaving_enabled); + def("auto_reboot", _parent->auto_reboot_hours); } public: PowerPrefs(NodePrefs* parent) : _parent(parent) { } diff --git a/src/helpers/ESP32Board.cpp b/src/helpers/ESP32Board.cpp index a55abb264e9..854125a1bc3 100644 --- a/src/helpers/ESP32Board.cpp +++ b/src/helpers/ESP32Board.cpp @@ -45,6 +45,48 @@ bool ESP32Board::startOTAUpdate(const char* id, char reply[]) { } #endif +void ESP32Board::reboot() { +#ifdef DISPLAY_CLASS + display.turnOff(); +#endif + radio_driver.powerOff(); + + if (sensors.getLocationProvider() != NULL) { + sensors.getLocationProvider()->stop(); + } + +#if defined(P_LORA_PA_POWER) && P_LORA_PA_POWER >= 0 + pinMode(P_LORA_PA_POWER, OUTPUT); + digitalWrite(P_LORA_PA_POWER, LOW); +#endif + +#if defined(SX126X_RXEN) && SX126X_RXEN >= 0 + pinMode(SX126X_RXEN, OUTPUT); + digitalWrite(SX126X_RXEN, LOW); +#endif + +#if defined(P_LORA_RESET) && P_LORA_RESET >= 0 + pinMode(P_LORA_RESET, OUTPUT); + digitalWrite(P_LORA_RESET, LOW); +#endif + +#if defined(PIN_VEXT_EN) && PIN_VEXT_EN >= 0 + pinMode(PIN_VEXT_EN, OUTPUT); + digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE); +#endif + + Serial.flush(); + + // Hold radio & external power rails in reset/off state for 5 seconds + for (int i = 0; i < 50; i++) { + esp_task_wdt_reset(); + delay(100); + } + + rtc_clock.tick(); + esp_restart(); +} + void ESP32Board::powerOff() { enterDeepSleep(0); // Do not wakeup } diff --git a/src/helpers/ESP32Board.h b/src/helpers/ESP32Board.h index 3f95e6923f4..81813975563 100644 --- a/src/helpers/ESP32Board.h +++ b/src/helpers/ESP32Board.h @@ -14,6 +14,7 @@ #include #include "soc/rtc.h" #include "esp_system.h" +#include #include #include @@ -49,7 +50,15 @@ class ESP32Board : public mesh::MainBoard { #endif #else Wire.begin(); - #endif + #endif + + // Enable 60-second hardware Task Watchdog Timer for unattended reliability + esp_task_wdt_init(60, true); + esp_task_wdt_add(NULL); + } + + void loop() override { + esp_task_wdt_reset(); } void attachDynamicPrefs(KeyValueStore* prefs) { } // no-op @@ -103,7 +112,9 @@ class ESP32Board : public mesh::MainBoard { gpio_wakeup_enable((gpio_num_t)wakeupPin, GPIO_INTR_HIGH_LEVEL); // Wake up when receiving a LoRa packet // MCU enters light sleep + esp_task_wdt_reset(); esp_light_sleep_start(); + esp_task_wdt_reset(); // Avoid ISR flood during wakeup due to HIGH LEVEL interrupt gpio_wakeup_disable(wakeupPin); @@ -153,9 +164,7 @@ class ESP32Board : public mesh::MainBoard { return "Generic ESP32"; } - void reboot() override { - esp_restart(); - } + void reboot() override; bool startOTAUpdate(const char* id, char reply[]) override; @@ -163,6 +172,10 @@ class ESP32Board : public mesh::MainBoard { inhibit_sleep = inhibit; } + bool isSleepInhibited() const { + return inhibit_sleep; + } + uint32_t getResetReason() const override { return esp_reset_reason(); } diff --git a/variants/heltec_v4/HeltecV4Board.cpp b/variants/heltec_v4/HeltecV4Board.cpp index 794257d76ad..e74172de447 100644 --- a/variants/heltec_v4/HeltecV4Board.cpp +++ b/variants/heltec_v4/HeltecV4Board.cpp @@ -1,4 +1,5 @@ #include "HeltecV4Board.h" +#include "target.h" void HeltecV4Board::begin() { ESP32Board::begin(); @@ -32,6 +33,11 @@ void HeltecV4Board::begin() { loRaFEMControl.setRxModeEnable(); } + void HeltecV4Board::reboot() { + loRaFEMControl.setSleepModeEnable(); + ESP32Board::reboot(); + } + void HeltecV4Board::powerOff() { // Turn off PA digitalWrite(P_LORA_PA_POWER, LOW); diff --git a/variants/heltec_v4/HeltecV4Board.h b/variants/heltec_v4/HeltecV4Board.h index 79a690e8407..2067dc3fe81 100644 --- a/variants/heltec_v4/HeltecV4Board.h +++ b/variants/heltec_v4/HeltecV4Board.h @@ -29,6 +29,7 @@ class HeltecV4Board : public ESP32Board { void onBeforeTransmit(void) override; void onAfterTransmit(void) override; + void reboot() override; void powerOff() override; uint16_t getBattMilliVolts() override; bool setAdcMultiplier(float multiplier) override { diff --git a/variants/heltec_v4/LoRaFEMControl.cpp b/variants/heltec_v4/LoRaFEMControl.cpp index 168185c31ff..c373a41d709 100644 --- a/variants/heltec_v4/LoRaFEMControl.cpp +++ b/variants/heltec_v4/LoRaFEMControl.cpp @@ -13,7 +13,7 @@ void LoRaFEMControl::init(void) esp_reset_reason_t reason = esp_reset_reason(); if (reason != ESP_RST_DEEPSLEEP) { - delay(1); // FEM startup time after cold power-on + delay(10); // FEM startup time after cold power-on or scheduled power-cycle } // Auto-detect FEM type via shared GPIO2 default pull level. From b802d3379a5914c028d97f6f741558c63a69a84a Mon Sep 17 00:00:00 2001 From: Peter Aandahl Date: Thu, 29 Oct 2026 18:27:32 +0100 Subject: [PATCH 2/3] Default auto_reboot to 0 (off) and handle extra spaces in get/set auto_reboot --- src/helpers/CommonCLI.cpp | 6 +++++- src/helpers/CommonCLI.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index a01ba6f0300..552dbbc5867 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -485,6 +485,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* re void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* reply) { const char* config = &command[4]; + while (*config == ' ') config++; if (memcmp(config, "allow.read.only ", 16) == 0) { _prefs->allow_read_only = memcmp(&config[16], "on", 2) == 0; @@ -658,7 +659,9 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep strcpy(reply, "OK"); #endif } else if (memcmp(config, "auto_reboot ", 12) == 0 || memcmp(config, "auto.reboot ", 12) == 0) { - int hours = _atoi(&config[12]); + const char* val = &config[12]; + while (*val == ' ') val++; + int hours = _atoi(val); if (hours >= 0 && hours <= 720) { _prefs->auto_reboot_hours = (uint16_t)hours; savePrefs(); @@ -713,6 +716,7 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* reply) { const char* config = &command[4]; + while (*config == ' ') config++; if (memcmp(config, "allow.read.only", 15) == 0) { sprintf(reply, "> %s", _prefs->allow_read_only ? "on" : "off"); } else if (memcmp(config, "flood.advert.interval", 21) == 0) { diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h index 8fe87ad4a74..5b4976b4b2a 100644 --- a/src/helpers/CommonCLI.h +++ b/src/helpers/CommonCLI.h @@ -58,7 +58,7 @@ class NodePrefs : public ConfigSerializer { char bridge_secret[16]; // for XOR encryption of bridge packets (ESP-NOW only) // Power setting uint8_t powersaving_enabled = 0; // boolean - uint16_t auto_reboot_hours = 24; // hours between automatic reboots (0 = disabled) + uint16_t auto_reboot_hours = 0; // hours between automatic reboots (0 = disabled) // Gps settings uint8_t gps_enabled = 0; uint32_t gps_interval = 0; // in seconds From 3d0dc9cf21dd304e53728cbd197296e86f013c4d Mon Sep 17 00:00:00 2001 From: Peter Aandahl Date: Tue, 17 Nov 2026 15:54:07 +0100 Subject: [PATCH 3/3] Enable PIN_VBAT_READ on D0 (GPIO 1) for Xiao_S3_WIO --- variants/xiao_s3_wio/platformio.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index 5a2ef106173..ce7d8ff77a1 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -8,6 +8,7 @@ build_flags = ${esp32_base.build_flags} -I variants/xiao_s3_wio -UENV_INCLUDE_GPS -D SEEED_XIAO_S3 + -D PIN_VBAT_READ=1 ; D0 -D P_LORA_DIO_1=39 -D P_LORA_NSS=41 -D P_LORA_RESET=42 ; RADIOLIB_NC