diff --git a/docs/cli_commands.md b/docs/cli_commands.md index c36dc159f..757c959ed 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -102,9 +102,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore - `neighbor.remove ` **Parameters:** -- `pubkey_prefix`: The public key of the node to remove from the neighbors list. This can be a short prefix or the full key. All neighbors matching the provided prefix will be removed. - -**Note:** You can remove all neighbors by sending a space character as the prefix. The space indicates an empty prefix, which matches all existing neighbors. +- `pubkey_prefix`: The public key of the node to remove from the neighbors list --- @@ -579,6 +577,20 @@ This document provides an overview of CLI commands that can be sent to MeshCore --- +#### View or change the radio watchdog interval +**Usage:** +- `get radio.watchdog` +- `set radio.watchdog ` + +**Parameters:** +- `minutes`: `0` to disable, or `1-120` minutes + +**Default:** `5` + +**Note:** On quiet meshes, increasing this can reduce false recoveries when no traffic is expected. + +--- + #### Enable or disable Multi-Acks support **Usage:** - `get multi.acks` diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp index 6d12103e6..f22c6a7ac 100644 --- a/examples/simple_repeater/MyMesh.cpp +++ b/examples/simple_repeater/MyMesh.cpp @@ -945,6 +945,7 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc #ifdef WITH_MQTT_BRIDGE _prefs.agc_reset_interval = 7; // 28 seconds (secs/4) — prevents AGC drift on long-running observers #endif + _prefs.radio_watchdog_minutes = 5; // 5 minutes default // bridge defaults _prefs.bridge_enabled = 1; // enabled diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h index e320b1bec..4d3e6d4e3 100644 --- a/examples/simple_repeater/MyMesh.h +++ b/examples/simple_repeater/MyMesh.h @@ -165,6 +165,9 @@ protected: int getAGCResetInterval() const override { return ((int)_prefs.agc_reset_interval) * 4000; // milliseconds } + uint32_t getRadioWatchdogMillis() const override { + return ((uint32_t)_prefs.radio_watchdog_minutes) * 60000UL; + } uint8_t getExtraAckTransmitCount() const override { return _prefs.multi_acks; } diff --git a/src/Dispatcher.cpp b/src/Dispatcher.cpp index c5a17e831..edb1ee9ad 100644 --- a/src/Dispatcher.cpp +++ b/src/Dispatcher.cpp @@ -39,6 +39,10 @@ uint32_t Dispatcher::getCADFailMaxDuration() const { return 4000; // 4 seconds } +uint32_t Dispatcher::getRadioWatchdogMillis() const { + return RADIO_WATCHDOG_MS; +} + void Dispatcher::loop() { if (millisHasNowPassed(next_floor_calib_time)) { _radio->triggerNoiseFloorCalibrate(getInterferenceThreshold()); @@ -64,19 +68,22 @@ void Dispatcher::loop() { // in quiet mesh environments where packets may be more than RADIO_WATCHDOG_MS apart, // while still catching a truly stuck radio (PSRAM starvation → missed ISR → no activity). { - unsigned long last_recv = _radio->getLastRecvMillis(); - unsigned long last_irq = _radio->getLastRadioInterruptMillis(); - unsigned long last_active = (last_recv > last_irq ? last_recv : last_irq); - if (last_radio_active_ms > last_active) last_active = last_radio_active_ms; - if (is_recv && last_active > 0) { - unsigned long silent_ms = _ms->getMillis() - last_active; - unsigned long since_recovery = _ms->getMillis() - last_watchdog_recovery; - if (silent_ms > RADIO_WATCHDOG_MS && since_recovery > RADIO_WATCHDOG_MS) { - _err_flags |= ERR_EVENT_RADIO_WATCHDOG; - MESH_DEBUG_PRINTLN("Radio watchdog: silent %lu ms, state=%d, recovering", silent_ms, _radio->getRadioState()); - _radio->idle(); - _radio->startRecv(); - last_watchdog_recovery = _ms->getMillis(); + const uint32_t watchdog_ms = getRadioWatchdogMillis(); + if (watchdog_ms > 0) { + unsigned long last_recv = _radio->getLastRecvMillis(); + unsigned long last_irq = _radio->getLastRadioInterruptMillis(); + unsigned long last_active = (last_recv > last_irq ? last_recv : last_irq); + if (last_radio_active_ms > last_active) last_active = last_radio_active_ms; + if (is_recv && last_active > 0) { + unsigned long silent_ms = _ms->getMillis() - last_active; + unsigned long since_recovery = _ms->getMillis() - last_watchdog_recovery; + if (silent_ms > watchdog_ms && since_recovery > watchdog_ms) { + _err_flags |= ERR_EVENT_RADIO_WATCHDOG; + MESH_DEBUG_PRINTLN("Radio watchdog: silent %lu ms, state=%d, recovering", silent_ms, _radio->getRadioState()); + _radio->idle(); + _radio->startRecv(); + last_watchdog_recovery = _ms->getMillis(); + } } } } diff --git a/src/Dispatcher.h b/src/Dispatcher.h index f522494d5..0373c1b26 100644 --- a/src/Dispatcher.h +++ b/src/Dispatcher.h @@ -180,6 +180,7 @@ protected: virtual uint32_t getCADFailMaxDuration() const; virtual int getInterferenceThreshold() const { return 0; } // disabled by default virtual int getAGCResetInterval() const { return 0; } // disabled by default + virtual uint32_t getRadioWatchdogMillis() const; public: void begin(); diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 0b28933f2..899317fdb 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -2,7 +2,6 @@ #include "CommonCLI.h" #include "TxtDataHelpers.h" #include "AdvertDataHelpers.h" -#include "TxtDataHelpers.h" #include #ifndef BRIDGE_MAX_BAUD @@ -220,7 +219,10 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) { file.read((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain)); // 290 file.read((uint8_t *)&_prefs->snmp_enabled, sizeof(_prefs->snmp_enabled)); // 291 file.read((uint8_t *)&_prefs->snmp_community, sizeof(_prefs->snmp_community)); // 292 - // next: 316 + if (file.available() >= (int)sizeof(_prefs->radio_watchdog_minutes)) { + file.read((uint8_t *)&_prefs->radio_watchdog_minutes, sizeof(_prefs->radio_watchdog_minutes)); // 316 + } + // next: 317 // sanitise bad pref values _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f); @@ -252,6 +254,9 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) { _prefs->rx_boosted_gain = constrain(_prefs->rx_boosted_gain, 0, 1); // boolean _prefs->snmp_enabled = constrain(_prefs->snmp_enabled, 0, 1); _prefs->snmp_community[sizeof(_prefs->snmp_community) - 1] = '\0'; // ensure null terminated + if (_prefs->radio_watchdog_minutes > 120) { + _prefs->radio_watchdog_minutes = 5; + } file.close(); } @@ -339,7 +344,8 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) { file.write((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain)); // 290 file.write((uint8_t *)&_prefs->snmp_enabled, sizeof(_prefs->snmp_enabled)); // 291 file.write((uint8_t *)&_prefs->snmp_community, sizeof(_prefs->snmp_community)); // 292 - // next: 316 + file.write((uint8_t *)&_prefs->radio_watchdog_minutes, sizeof(_prefs->radio_watchdog_minutes)); // 316 + // next: 317 file.close(); } @@ -742,8 +748,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* re // change admin password StrHelper::strncpy(_prefs->password, &command[9], sizeof(_prefs->password)); savePrefs(); - sprintf(reply, "password now: "); - StrHelper::strncpy(&reply[14], _prefs->password, 160-15); // echo back just to let admin know for sure!! + sprintf(reply, "password now: %s", _prefs->password); // echo back just to let admin know for sure!! } else if (memcmp(command, "clear stats", 11) == 0) { _callbacks->clearStats(); strcpy(reply, "(OK - stats reset)"); @@ -948,6 +953,30 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep _prefs->agc_reset_interval = atoi(&config[19]) / 4; savePrefs(); sprintf(reply, "OK - interval rounded to %d", ((uint32_t) _prefs->agc_reset_interval) * 4); + } else if (memcmp(config, "radio.watchdog ", 15) == 0) { + const char* val = &config[15]; + if (*val == 0) { + strcpy(reply, "Error: missing radio.watchdog minutes"); + return; + } + for (const char* sp = val; *sp; sp++) { + if (*sp < '0' || *sp > '9') { + strcpy(reply, "Error: radio.watchdog must be an integer 0-120"); + return; + } + } + int mins = atoi(val); + if (mins > 120) { + strcpy(reply, "Error: radio.watchdog must be 0-120 minutes"); + } else { + _prefs->radio_watchdog_minutes = (uint8_t)mins; + savePrefs(); + if (mins == 0) { + strcpy(reply, "OK - radio watchdog disabled"); + } else { + sprintf(reply, "OK - radio watchdog %d min", mins); + } + } } else if (memcmp(config, "multi.acks ", 11) == 0) { _prefs->multi_acks = atoi(&config[11]); savePrefs(); @@ -1335,7 +1364,7 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep } } } else { - strcpy(reply, "Error: valid presets are: analyzer-us, analyzer-eu, meshmapper, meshrank, waev, meshomatic, cascadiamesh, tennmesh, nashmesh, chimesh, meshat.se, custom, none"); + strcpy(reply, "Error: valid presets are: analyzer-us, analyzer-eu, meshmapper, meshrank, waev, meshomatic, cascadiamesh, tennmesh, nashmesh, custom, none"); } } else if (memcmp(subcmd, "server ", 7) == 0) { StrHelper::strncpy(_prefs->mqtt_slot_host[slot], &subcmd[7], sizeof(_prefs->mqtt_slot_host[slot])); @@ -1452,8 +1481,7 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep strcpy(reply, "Error: unsupported by this board"); }; } else { - strcpy(reply, "unknown config: "); - StrHelper::strncpy(&reply[16], config, 160-17); + sprintf(reply, "unknown config: %s", config); } } @@ -1470,6 +1498,8 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep sprintf(reply, "> %d", (uint32_t) _prefs->interference_threshold); } else if (memcmp(config, "agc.reset.interval", 18) == 0) { sprintf(reply, "> %d", ((uint32_t) _prefs->agc_reset_interval) * 4); + } else if (memcmp(config, "radio.watchdog", 14) == 0) { + sprintf(reply, "> %d", (uint32_t)_prefs->radio_watchdog_minutes); } else if (memcmp(config, "multi.acks", 10) == 0) { sprintf(reply, "> %d", (uint32_t) _prefs->multi_acks); } else if (memcmp(config, "allow.read.only", 15) == 0) { @@ -1511,11 +1541,10 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep } else if (memcmp(config, "direct.txdelay", 14) == 0) { sprintf(reply, "> %s", StrHelper::ftoa(_prefs->direct_tx_delay_factor)); } else if (memcmp(config, "owner.info", 10) == 0) { - auto start = reply; *reply++ = '>'; *reply++ = ' '; const char* sp = _prefs->owner_info; - while (*sp && reply - start < 159) { + while (*sp) { *reply++ = (*sp == '\n') ? '|' : *sp; // translate newline back to orig '|' sp++; } diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h index a0f28f5ab..aaa7a77e0 100644 --- a/src/helpers/CommonCLI.h +++ b/src/helpers/CommonCLI.h @@ -103,6 +103,7 @@ struct NodePrefs { // persisted to file // SNMP settings (optional, only used when WITH_SNMP is defined) uint8_t snmp_enabled; // boolean: 0=off, 1=on char snmp_community[24]; // community string (default "public") + uint8_t radio_watchdog_minutes; // 0=disabled, 1-120 minutes }; #ifdef WITH_MQTT_BRIDGE