Skip to content

gps: don't let the settle time close a periodic window before the time sync #3845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fdlamotte merged 1 commit into from
Nov 15, 2026
Merged

gps: don't let the settle time close a periodic window before the time sync #3845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/helpers/sensors/MicroNMEALocationProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ class MicroNMEALocationProvider : public LocationProvider {
if (isValid()) time_valid++;
}

// the time sync has had its chance: done, not needed, or refused by GPS_GUARD.
// updateTime() tries it on the tick where time_valid goes from 3 to 4.
bool timeSyncSettled() const {
return _clock == nullptr || !_time_sync_needed || time_valid > 3;
}

bool timeSyncAllowed() {
#ifdef GPS_GUARD
return _guard.acceptTime(getTimestamp(), _clock->getCurrentTime());
Expand Down Expand Up @@ -403,10 +409,13 @@ class MicroNMEALocationProvider : public LocationProvider {
const uint8_t mode = currentFixMode();
if (mode == 0 || mode == 3) _goodFixInWindow = true;
if (_acquiringPeriodically && _goodFixInWindow) {
// stay on until a pending time sync is done (or the settle time is over)
const bool synced = _clock == nullptr || !_time_sync_needed;
if ((nmea.getNumSatellites() >= GPS_MIN_SATS_FOR_FIX && synced) ||
(uint32_t)(millis() - _firstFixInWindow) >= GPS_FIX_SETTLE_MS) {
// stay on until a pending time sync has been tried, even past the settle
// time: after a hot start the fix can come before the time is steady, and
// the window would close unsynced until the next period. The acquisition
// timeout below still bounds it.
if (timeSyncSettled() &&
(nmea.getNumSatellites() >= GPS_MIN_SATS_FOR_FIX ||
(uint32_t)(millis() - _firstFixInWindow) >= GPS_FIX_SETTLE_MS)) {
finishPeriodicAcquisition();
}
}
Expand Down