Merge pull request #4893 from meshtastic/softSleep

Only check hardsleep threshold if GPS softsleep is supported
This commit is contained in:
Thomas Göttgens 2024-09-28 11:35:57 +02:00 committed by GitHub
commit a39280e9df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -916,6 +916,7 @@ void GPS::down()
softsleepSupported = true;
#endif
if (softsleepSupported) {
// How long does gps_update_interval need to be, for GPS_HARDSLEEP to become more efficient than GPS_SOFTSLEEP?
// Heuristic equation. A compromise manually fitted to power observations from U-blox NEO-6M and M10050
// https://www.desmos.com/calculator/6gvjghoumr
@ -924,11 +925,12 @@ void GPS::down()
LOG_DEBUG("gps_update_interval >= %us needed to justify hardsleep\n", hardsleepThreshold / 1000);
// If update interval too short: softsleep (if supported by hardware)
if (softsleepSupported && updateInterval < hardsleepThreshold)
if (updateInterval < hardsleepThreshold) {
setPowerState(GPS_SOFTSLEEP, sleepTime);
return;
}
}
// If update interval long enough (or softsleep unsupported): hardsleep instead
else
setPowerState(GPS_HARDSLEEP, sleepTime);
}
}