mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-11-21 22:47:05 +00:00
Limit the first periodic GPS acquisition after boot
Before the first fix since boot, a periodic acquisition had no timeout. If no fix is accepted (no sky view, no antenna, or a guard rejecting spoofed fixes), the receiver then stayed on until a fix was accepted. Give that window its own limit, GPS_FIRST_FIX_TIMEOUT_MS (15 min by default, enough for a full almanac; 0 keeps the old behaviour). It counts as a miss and the next acquisition starts after the configured period.
This commit is contained in:
1 parent
bb870313e4
commit
ac2bf9372a
2 files changed
+13
-5
No files matched your search
@@ -1026,7 +1026,7 @@ region save
|
||||
**Parameters:**
|
||||
- `value`: `0` for continuous tracking, or a period. The value can be postfixed with `s`, `m`, `h` or `d` to specify the unit (seconds by default).
|
||||
|
||||
**Note:** A periodic acquisition stops after receiving a valid fix, then resumes after the configured period.
|
||||
**Note:** A periodic acquisition stops after receiving a valid fix, then resumes after the configured period. Without a fix it stops after 5 minutes, or after 15 minutes until the first fix since boot (`GPS_PERIODIC_ACQUISITION_TIMEOUT_MS`, `GPS_FIRST_FIX_TIMEOUT_MS`).
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -12,6 +12,11 @@
|
||||
#ifndef GPS_PERIODIC_ACQUISITION_TIMEOUT_MS
|
||||
#define GPS_PERIODIC_ACQUISITION_TIMEOUT_MS 300000UL
|
||||
#endif
|
||||
// limit for the periodic window before the first fix since boot (cold start can be long,
|
||||
// a full almanac takes 12.5 min); 0 = keep searching until a fix
|
||||
#ifndef GPS_FIRST_FIX_TIMEOUT_MS
|
||||
#define GPS_FIRST_FIX_TIMEOUT_MS 900000UL
|
||||
#endif
|
||||
|
||||
// in periodic mode, keep reading after the first valid fix until enough satellites
|
||||
// are used or the settle time has elapsed
|
||||
@@ -363,10 +368,13 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
// no timeout until a first fix has been obtained (cold start can be long)
|
||||
if (_acquiringPeriodically && _lastFix.valid &&
|
||||
(uint32_t)(millis() - _acquisitionStarted) >= GPS_PERIODIC_ACQUISITION_TIMEOUT_MS) {
|
||||
finishPeriodicAcquisition();
|
||||
// a longer limit until a first fix has been obtained (cold start can be long)
|
||||
if (_acquiringPeriodically) {
|
||||
const uint32_t limit = _lastFix.valid ? GPS_PERIODIC_ACQUISITION_TIMEOUT_MS
|
||||
: GPS_FIRST_FIX_TIMEOUT_MS;
|
||||
if (limit > 0 && (uint32_t)(millis() - _acquisitionStarted) >= limit) {
|
||||
finishPeriodicAcquisition();
|
||||
}
|
||||
}
|
||||
|
||||
updateTime();
|
||||
|
||||
Reference in new issue
Block a user