dandri/pyxis
1
0
Fork 0
mirror of https://github.com/torlando-tech/pyxis.git synced 2026-08-14 06:39:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: derive OS::time() offset from the 64-bit rolling uptime, not millis()

Browse Source 
The offset was computed as unix_ms - millis() (32-bit) but ltime() adds it to a
64-bit (high32<<32|low32) counter. Once high32 != 0 (a millis() rollover, or an
erratic screen-off/wake tripping ltime()'s roll-over check) OS::time() was wrong
by high32*49.7 days -- surfacing as garbage "Nw ago" timestamps in the
conversation list. Compute the offset from OS::ltime()-getTimeOffset() at both
the GPS and NTP sync sites; add a diagnostic logging OS::time() after each sync.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UWZuYkHBRqNb6BZHV8sTG5
This commit is contained in:
torlando-agent[bot]
2026-06-19 15:49:44 -04:00
co-authored by Claude Opus 4.8
parent 092fbedc44
commit f0a78f70e1
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+24 -4
View File
@@ -322,11 +322,23 @@ bool sync_time_from_gps(uint32_t timeout_ms = 30000) {
tzset();
}
// Set the time offset for Utilities::OS::time()
// Set the time offset for Utilities::OS::time().
// Derive the current uptime from the SAME 64-bit rolling counter OS::time()
// uses (ltime() = (high32<<32|low32) + _time_offset), not raw 32-bit
// millis(). If we used millis() here, then once high32 != 0 (after a
// millis() rollover, or an erratic screen-off/wake that trips ltime()'s
// roll-over check) OS::time() would be wrong by high32*49.7 days — surfacing
// as garbage "Nw ago" timestamps in the conversation list.
time_t now = time(nullptr);
uint64_t uptime_ms = millis();
uint64_t uptime_ms = RNS::Utilities::OS::ltime() - RNS::Utilities::OS::getTimeOffset();
uint64_t unix_ms = (uint64_t)now * 1000;
RNS::Utilities::OS::setTimeOffset(unix_ms - uptime_ms);
{
char tbuf[96];
snprintf(tbuf, sizeof(tbuf), " GPS time offset set: OS::time()=%lu (unix=%lu)",
(unsigned long)RNS::Utilities::OS::time(), (unsigned long)now);
INFO(tbuf);
}
// Display synced time
struct tm timeinfo;
@@ -684,9 +696,11 @@ static void pump_ntp_sync_if_pending() {
struct tm timeinfo;
if (getLocalTime(&timeinfo, 0)) {
// Set the time offset for Utilities::OS::time()
// Set the time offset for Utilities::OS::time(). Use the 64-bit rolling
// uptime OS::time() uses, not raw 32-bit millis() — see the GPS path for
// why (a high32 != 0 would otherwise skew OS::time() by 49.7-day units).
time_t now = time(nullptr);
uint64_t uptime_ms = millis();
uint64_t uptime_ms = RNS::Utilities::OS::ltime() - RNS::Utilities::OS::getTimeOffset();
uint64_t unix_ms = (uint64_t)now * 1000;
RNS::Utilities::OS::setTimeOffset(unix_ms - uptime_ms);
@@ -694,6 +708,12 @@ static void pump_ntp_sync_if_pending() {
strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S %Z", &timeinfo);
String msg = " NTP time synced: " + String(time_str);
INFO(msg.c_str());
{
char tbuf[96];
snprintf(tbuf, sizeof(tbuf), " NTP time offset set: OS::time()=%lu (unix=%lu)",
(unsigned long)RNS::Utilities::OS::time(), (unsigned long)now);
INFO(tbuf);
}
_ntp_pending = false;
return;
}