From 6b12f4c0a4211fdd479b471c5ee736474a462195 Mon Sep 17 00:00:00 2001 From: mikecarper Date: Wed, 14 Oct 2026 00:16:15 -0700 Subject: [PATCH] Preserve tracker GPS ownership when changing power saving --- test/test_sensor_tracker_gps.py | 67 +++++++++++++++++++++++---- variants/heltec_mesh_solar/target.cpp | 4 ++ variants/heltec_tracker/target.cpp | 4 ++ variants/meshadventurer/target.cpp | 4 ++ variants/meshtracker_x1/target.cpp | 4 ++ variants/nano_g2_ultra/target.cpp | 4 ++ variants/thinknode_m1/target.cpp | 4 ++ 7 files changed, 82 insertions(+), 9 deletions(-) diff --git a/test/test_sensor_tracker_gps.py b/test/test_sensor_tracker_gps.py index 68dbbca83..ad7d6666f 100644 --- a/test/test_sensor_tracker_gps.py +++ b/test/test_sensor_tracker_gps.py @@ -160,15 +160,38 @@ void ownershipAndRestore(){ assert(!s.beginTrackerGpsAcquisition()); } templatevoid derivedPowerPreference(){ - now_ms=1;Sensors s;s.user(true);s.setTrackerGpsModeEnabled(true); - s.setPowerSavingEnabled(true);assert(!s.active&&!s.provider.getGPSPowerSaving()); - assert(s.beginTrackerGpsAcquisition()); - s.setPowerSavingEnabled(false);assert(s.active&&!s.provider.getGPSPowerSaving()); - s.user(false);assert(s.active); // current window remains owned by tracker - s.fix();s.finishClock();assert(!s.active); - s.setTrackerGpsModeEnabled(false);assert(!s.active&&!s.userEnabled()); - s.user(true);assert(s.active);s.setPowerSavingEnabled(true); - assert(s.provider.getGPSPowerSaving()); // normal mode still uses its power cycle + for(bool initial:{false,true})for(bool manual:{false,true}) + for(bool acquiring:{false,true})for(bool requested:{false,true}){ + now_ms=1;Sensors s;s.user(manual);s.setPowerSavingEnabled(initial); + s.setTrackerGpsModeEnabled(true);assert(!s.active&&!s.provider.getGPSPowerSaving()); + if(acquiring)assert(s.beginTrackerGpsAcquisition()); + const unsigned starts=s.starts,stops=s.stops; + // Both transitions, and an unchanged value, must preserve the tracker's + // exclusive window regardless of the saved manual GPS preference. + for(bool value:{requested,!requested,requested,requested}){ + s.setPowerSavingEnabled(value); + assert(s.powersaving_enabled==value&&!s.provider.getGPSPowerSaving()); + assert(s.active==acquiring&&s.isTrackerGpsAcquisitionPending()==acquiring); + assert(s.starts==starts&&s.stops==stops); + } + s.user(!manual);assert(s.active==acquiring); + s.user(manual);assert(s.active==acquiring&&s.userEnabled()==manual); + // Leaving either an idle or interrupted window restores only the saved + // ordinary preference, using the final selected device-power policy. + s.setTrackerGpsModeEnabled(false); + assert(s.active==manual&&!s.isTrackerGpsAcquisitionPending()); + assert(s.provider.getGPSPowerSaving()==(requested&&manual)); + } + now_ms=1;Sensors normal;normal.user(true); + normal.setPowerSavingEnabled(true); + assert(normal.active&&normal.provider.getGPSPowerSaving()); + normal.hardwareStop();normal.setPowerSavingEnabled(false); + assert(normal.active&&!normal.provider.getGPSPowerSaving()); + normal.setPowerSavingEnabled(true); + assert(normal.active&&normal.provider.getGPSPowerSaving()); + normal.user(false);assert(!normal.active); + normal.setPowerSavingEnabled(false);normal.setPowerSavingEnabled(true); + assert(!normal.active&&!normal.provider.getGPSPowerSaving()); } void fifoBound(){ Uart uart;MicroNMEALocationProvider provider(uart); @@ -322,6 +345,32 @@ class SensorTrackerGpsTest(unittest.TestCase): def test_fresh_acquisition_time_bound_transport_and_preferences(self): self.compile_run(self.harness(), sources=("src/helpers/SensorManager.cpp",)) + def test_all_custom_manager_power_preferences_preserve_tracker_ownership(self): + harness = self.harness().split("int main(){", 1)[0] + for variant, manager in ( + ("heltec_tracker", "HWTSensorManager"), + ("heltec_mesh_solar", "SolarSensorManager"), + ("meshadventurer", "MASensorManager"), + ("nano_g2_ultra", "NanoG2UltraSensorManager"), + ("thinknode_m1", "ThinkNodeM1SensorManager"), + ("meshtracker_x1", "MeshTrackerX1SensorManager"), + ): + with self.subTest(variant=variant): + source = (ROOT / "variants" / variant / "target.cpp").read_text() + setter = extract_braced(source, f"void {manager}::setPowerSavingEnabled(") + # Reuse only the counted hardware boundary. The declaration + # supplies both historical provider names; the setter and + # tracker ownership/state machine remain actual production. + declaration = f'''class {manager}:public T1000SensorManager {{ +public: + LocationProvider* _location=&provider; + void setPowerSavingEnabled(bool enabled)override; +}}; +''' + self.compile_run(harness + declaration + setter + + f"\nint main(){{derivedPowerPreference<{manager}>();}}\n", + sources=("src/helpers/SensorManager.cpp",)) + def test_missing_freshness_and_timeout_negative_controls(self): source = (ROOT / "src/helpers/SensorManager.cpp").read_text() for old, replacement in ( diff --git a/variants/heltec_mesh_solar/target.cpp b/variants/heltec_mesh_solar/target.cpp index f24c8c2aa..dd95882ba 100644 --- a/variants/heltec_mesh_solar/target.cpp +++ b/variants/heltec_mesh_solar/target.cpp @@ -137,6 +137,10 @@ void SolarSensorManager::setPowerSavingEnabled(bool enabled) { if (powersaving_enabled == enabled) return; powersaving_enabled = enabled; + if (isTrackerGpsModeEnabled()) { + _location->setGPSPowerSaving(false); + return; + } bool gps_user_enabled = isGpsTelemetryUserEnabled(); _location->setGPSPowerSaving(enabled && gps_user_enabled); if (!gps_user_enabled) return; diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp index e75f52e31..9d514fae3 100644 --- a/variants/heltec_tracker/target.cpp +++ b/variants/heltec_tracker/target.cpp @@ -142,6 +142,10 @@ void HWTSensorManager::setPowerSavingEnabled(bool enabled) { if (powersaving_enabled == enabled) return; powersaving_enabled = enabled; + if (isTrackerGpsModeEnabled()) { + _location->setGPSPowerSaving(false); + return; + } bool gps_user_enabled = isGpsTelemetryUserEnabled(); _location->setGPSPowerSaving(enabled && gps_user_enabled); if (!gps_user_enabled) return; diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp index faa879939..a9213dfb5 100644 --- a/variants/meshadventurer/target.cpp +++ b/variants/meshadventurer/target.cpp @@ -135,6 +135,10 @@ void MASensorManager::setPowerSavingEnabled(bool enabled) { if (powersaving_enabled == enabled) return; powersaving_enabled = enabled; + if (isTrackerGpsModeEnabled()) { + _location->setGPSPowerSaving(false); + return; + } bool gps_user_enabled = isGpsTelemetryUserEnabled(); _location->setGPSPowerSaving(enabled && gps_user_enabled); if (!gps_user_enabled) return; diff --git a/variants/meshtracker_x1/target.cpp b/variants/meshtracker_x1/target.cpp index 8235ae48a..60bd4f3e8 100644 --- a/variants/meshtracker_x1/target.cpp +++ b/variants/meshtracker_x1/target.cpp @@ -163,6 +163,10 @@ void MeshTrackerX1SensorManager::setPowerSavingEnabled(bool enabled) { if (powersaving_enabled == enabled) return; powersaving_enabled = enabled; + if (isTrackerGpsModeEnabled()) { + _nmea->setGPSPowerSaving(false); + return; + } bool gps_user_enabled = isGpsTelemetryUserEnabled(); _nmea->setGPSPowerSaving(enabled && gps_user_enabled); if (!gps_user_enabled) return; diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index 49229790b..04b373341 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -140,6 +140,10 @@ void NanoG2UltraSensorManager::setPowerSavingEnabled(bool enabled) { if (powersaving_enabled == enabled) return; powersaving_enabled = enabled; + if (isTrackerGpsModeEnabled()) { + _location->setGPSPowerSaving(false); + return; + } bool gps_user_enabled = isGpsTelemetryUserEnabled(); _location->setGPSPowerSaving(enabled && gps_user_enabled); if (!gps_user_enabled) return; diff --git a/variants/thinknode_m1/target.cpp b/variants/thinknode_m1/target.cpp index ec8e6efe3..2cfab4bae 100644 --- a/variants/thinknode_m1/target.cpp +++ b/variants/thinknode_m1/target.cpp @@ -167,6 +167,10 @@ void ThinkNodeM1SensorManager::setPowerSavingEnabled(bool enabled) { if (powersaving_enabled == enabled) return; powersaving_enabled = enabled; + if (isTrackerGpsModeEnabled()) { + _location->setGPSPowerSaving(false); + return; + } bool gps_user_enabled = isGpsTelemetryUserEnabled(); _location->setGPSPowerSaving(enabled && gps_user_enabled); if (!gps_user_enabled) return;