pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-07 22:24:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Change terminology

Browse Source
This commit is contained in:
Todd Herbert 2024-06-11 03:56:24 +12:00
parent 368aef591f
commit 059388694c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gps/GPS.cpp
View File

@ -30,8 +30,8 @@
// How many seconds of sleep make it worthwhile for the GPS to use powered-on standby // How many seconds of sleep make it worthwhile for the GPS to use powered-on standby
// Shorter than this, and we'll just wait instead // Shorter than this, and we'll just wait instead
#ifndef GPS_RESTING_THRESHOLD_SECONDS #ifndef GPS_IDLE_THRESHOLD_SECONDS
#define GPS_RESTING_THRESHOLD_SECONDS 10 #define GPS_IDLE_THRESHOLD_SECONDS 10
#endif #endif
#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO) #if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
@ -783,8 +783,8 @@ void GPS::setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime)
// Record the current powerState // Record the current powerState
if (on) if (on)
powerState = GPS_ACTIVE; powerState = GPS_ACTIVE;
else if (sleepTime <= GPS_RESTING_THRESHOLD_SECONDS * 1000UL && sleepTime > 0) // Note: sleepTime==0 if from GPS::disable() else if (sleepTime <= GPS_IDLE_THRESHOLD_SECONDS * 1000UL && sleepTime > 0) // Note: sleepTime==0 if from GPS::disable()
powerState = GPS_RESTING; powerState = GPS_IDLE;
else if (standbyOnly) else if (standbyOnly)
powerState = GPS_STANDBY; powerState = GPS_STANDBY;
else else
@ -793,7 +793,7 @@ void GPS::setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime)
LOG_DEBUG("GPS::powerState=%d\n", powerState); LOG_DEBUG("GPS::powerState=%d\n", powerState);
// If the next update is due *really soon*, don't actually power off or enter standby. Just wait it out. // If the next update is due *really soon*, don't actually power off or enter standby. Just wait it out.
if (!on && powerState == GPS_RESTING) if (!on && powerState == GPS_IDLE)
return; return;
if (on) { if (on) {
@ -892,7 +892,7 @@ void GPS::setConnected()
void GPS::setAwake(bool wantAwake) void GPS::setAwake(bool wantAwake)
{ {
// If user has disabled GPS, make sure it is off, not just in standby or "resting" // If user has disabled GPS, make sure it is off, not just in standby or idle
if (!wantAwake && !enabled && powerState != GPS_OFF) { if (!wantAwake && !enabled && powerState != GPS_OFF) {
setGPSPower(false, false, 0); setGPSPower(false, false, 0);
return; return;

2
src/gps/GPS.h
View File

@ -42,7 +42,7 @@ enum GPSPowerState : uint8_t {
GPS_OFF = 0, // Physically powered off GPS_OFF = 0, // Physically powered off
GPS_ACTIVE = 1, // Awake and want a position GPS_ACTIVE = 1, // Awake and want a position
GPS_STANDBY = 2, // Physically powered on, but soft-sleeping GPS_STANDBY = 2, // Physically powered on, but soft-sleeping
GPS_RESTING = 3, // Awake, but not wanting another position yet GPS_IDLE = 3, // Awake, but not wanting another position yet
}; };
// Generate a string representation of DOP // Generate a string representation of DOP