dandri/HaloKeymind
1
0 Fork 0
mirror of https://github.com/mikecarper/MeshCore.git synced 2026-10-25 10:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep sub-second RS232 standby interrupt-idle eligible

Browse Source
This commit is contained in:
mikecarper committed 2026-10-17 11:03:43 -07:00
1 parent 5bdc6de0ed
commit 55354c7fbe
2 files changed
+19 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/simple_repeater/MyMesh.cpp
+4 -3
View File
@@ -5214,9 +5214,10 @@ uint32_t MyMesh::getPowerSaveSleepSeconds(uint32_t max_secs) const {
if (before_scheduled > 0 && sleep_secs == 0) blocked |= mask(Reason::Scheduled);
#if defined(WITH_RS232_BRIDGE)
if (bridge && rs232BridgeEnabled()) {
// Floor the deadline, not ceil: the ESP32 timed-light-sleep API uses whole
// seconds and must never sleep past a UART rendezvous or cleanup retry.
const uint32_t bridge_sleep_secs = bridge->powerWakeDelayMs(millis()) / 1000UL;
// Timed sleepers must not overshoot; interrupt-idle boards can still
// sleep with a positive sub-second remainder and wake on their clock IRQ.
const uint32_t bridge_sleep_secs = mesh::power::powerSaveSleepSeconds(
bridge->powerWakeDelayMs(millis()));
if (bridge_sleep_secs < sleep_secs) sleep_secs = bridge_sleep_secs;
if (bridge_sleep_secs == 0) blocked |= mask(Reason::BridgeWake);
}
test/test_rs232_heartbeat_owner.py
+15 -5
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
"""Execute RS-232 UART/GPS ownership and whole-second standby sleep gates."""
"""Execute RS-232 UART/GPS ownership and timed/interrupt standby sleep gates."""
from pathlib import Path
import shutil
@@ -18,6 +18,7 @@ HARNESS = r'''
#include <cstring>
#include <new>
#include <limits>
#include <initializer_list>
#include <helpers/PowerManagementUtils.h>
#include <helpers/PowerSavingDiagnostics.h>
#define WITH_BRIDGE 1
@@ -216,8 +217,15 @@ int main() {
const unsigned loops = node.bridge->loops;
node.serviceRs232BridgePower(); assert(node.bridge->loops == loops);
assert(node.getPowerSaveSleepSeconds(30) == 30);
node.bridge->wake_delay = 29999; assert(node.getPowerSaveSleepSeconds(30) == 29);
node.bridge->wake_delay = 999; assert(node.getPowerSaveSleepSeconds(30) == 0);
for (uint32_t remainder : {1U, 50U, 999U, 1000U, 29999U, 30000U}) {
node.bridge->wake_delay = remainder;
#ifdef NRF52_PLATFORM
const uint32_t expected = (remainder + 999U) / 1000U;
#else
const uint32_t expected = remainder / 1000U;
#endif
assert(node.getPowerSaveSleepSeconds(30) == expected);
}
node.bridge->wake_delay = 0; assert(node.hasPendingWork());
#ifdef WITH_MQTT_BRIDGE
MQTTBridge broker; node.mqtt_bridge = &broker;
@@ -304,13 +312,15 @@ class RS232HeartbeatOwnerTests(unittest.TestCase):
"uint32_t MyMesh::getPowerSaveSleepSeconds(uint32_t max_secs) const",
))
source = HARNESS.replace("@OWNER@", owner).replace("@SLEEP@", sleep)
for gps in (0, 1):
for gps, nrf in ((0, False), (1, False), (0, True), (1, True)):
for mqtt in (False, True):
with self.subTest(gps=gps, mqtt=mqtt), tempfile.TemporaryDirectory(prefix="rs232-owner-") as directory:
with self.subTest(gps=gps, mqtt=mqtt, nrf=nrf), tempfile.TemporaryDirectory(prefix="rs232-owner-") as directory:
work = Path(directory)
cpp, binary = work / "test.cpp", work / "test"
cpp.write_text(source, encoding="ascii")
flags = [f"-DENV_INCLUDE_GPS={gps}"]
if nrf:
flags.append("-DNRF52_PLATFORM=1")
if mqtt:
flags.append("-DWITH_MQTT_BRIDGE=1")
built = subprocess.run([compiler, "-std=c++17", "-Wall", "-Wextra", "-Werror",