mirror of
https://github.com/ratspeak/ratdeck.git
synced 2026-08-14 14:50:18 +00:00
GPS time sync, status bar clock, configurable UTC offset
- Enable UBlox MIA-M10Q GPS on T-Deck Plus (HAS_GPS true) - Custom zero-dependency NMEA parser (NMEAParser.h) with XOR checksum - GPSManager: baud auto-detect (115200/38400/9600, 10s timeout), settimeofday() sync every 60s, NVS time/position persistence - GPS Time enabled by default, GPS Location disabled by default (user must explicitly opt in via Settings) - Replace status bar connectivity bars with clock display (top-left) - Default 12h format without AM/PM, configurable 24h in Settings - Add GPS/Time settings category: GPS Time, GPS Location, UTC Offset (-12 to +14), 24h Time toggle - Fix hardcoded UTC-5 NTP timezone to use configurable utcOffset - Change status bar brand text to "Ratspeak.org"
This commit is contained in:
DeFiDude
@@ -0,0 +1,218 @@
|
||||
#include "GPSManager.h"
|
||||
|
||||
#if HAS_GPS
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
|
||||
constexpr uint32_t GPSManager::BAUD_RATES[];
|
||||
|
||||
void GPSManager::begin() {
|
||||
if (_running) return;
|
||||
|
||||
// Restore last-known time from NVS on boot
|
||||
restoreTimeFromNVS();
|
||||
|
||||
// Start baud rate auto-detection: try first rate
|
||||
_baudDetected = false;
|
||||
_baudAttemptIdx = 0;
|
||||
_baudAttemptStart = millis();
|
||||
_serial.begin(BAUD_RATES[0], SERIAL_8N1, GPS_RX, GPS_TX);
|
||||
Serial.printf("[GPS] UART started, trying %lu baud (GPIO RX=%d TX=%d)\n",
|
||||
(unsigned long)BAUD_RATES[0], GPS_RX, GPS_TX);
|
||||
_running = true;
|
||||
}
|
||||
|
||||
void GPSManager::loop() {
|
||||
if (!_running) return;
|
||||
|
||||
uint32_t prevSentences = _parser.sentencesParsed();
|
||||
|
||||
// Read available bytes (up to 64 per call to stay non-blocking)
|
||||
int count = 0;
|
||||
while (_serial.available() && count < 64) {
|
||||
char c = _serial.read();
|
||||
_parser.feed(c);
|
||||
count++;
|
||||
}
|
||||
|
||||
// Baud rate auto-detection: if no valid sentence after timeout, try next rate
|
||||
if (!_baudDetected) {
|
||||
if (_parser.sentencesParsed() > 0) {
|
||||
_baudDetected = true;
|
||||
_detectedBaud = BAUD_RATES[_baudAttemptIdx];
|
||||
Serial.printf("[GPS] Baud detected: %lu (%lu sentences parsed)\n",
|
||||
(unsigned long)_detectedBaud, (unsigned long)_parser.sentencesParsed());
|
||||
} else if (millis() - _baudAttemptStart >= BAUD_DETECT_TIMEOUT_MS) {
|
||||
_baudAttemptIdx++;
|
||||
if (_baudAttemptIdx >= BAUD_RATE_COUNT) {
|
||||
// Exhausted all baud rates — keep last one active, will retry on next begin()
|
||||
Serial.println("[GPS] No valid NMEA data at any baud rate");
|
||||
_baudDetected = true; // Stop retrying
|
||||
_detectedBaud = BAUD_RATES[BAUD_RATE_COUNT - 1];
|
||||
} else {
|
||||
_serial.end();
|
||||
delay(10);
|
||||
_serial.begin(BAUD_RATES[_baudAttemptIdx], SERIAL_8N1, GPS_RX, GPS_TX);
|
||||
_baudAttemptStart = millis();
|
||||
Serial.printf("[GPS] Trying %lu baud...\n",
|
||||
(unsigned long)BAUD_RATES[_baudAttemptIdx]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check for new time data
|
||||
NMEAData& d = _parser.data();
|
||||
if (d.timeUpdated) {
|
||||
d.timeUpdated = false;
|
||||
_lastFixMs = millis();
|
||||
if (d.timeValid && (millis() - _lastTimeSyncMs >= TIME_SYNC_INTERVAL_MS || _timeSyncCount == 0)) {
|
||||
syncSystemTime();
|
||||
}
|
||||
}
|
||||
|
||||
// Check for new location data
|
||||
if (d.locationUpdated) {
|
||||
d.locationUpdated = false;
|
||||
_locationValid = d.locationValid;
|
||||
_lastFixMs = millis();
|
||||
|
||||
// Periodic NVS persist
|
||||
if (_locationValid && (millis() - _lastPersistMs >= PERSIST_INTERVAL_MS)) {
|
||||
persistToNVS();
|
||||
_lastPersistMs = millis();
|
||||
}
|
||||
}
|
||||
|
||||
// Stale fix detection
|
||||
if (_timeValid && (millis() - _lastFixMs >= FIX_TIMEOUT_MS)) {
|
||||
// Don't clear _timeValid — system clock is still set and accurate.
|
||||
// Only clear location validity since position may have changed.
|
||||
_locationValid = false;
|
||||
}
|
||||
}
|
||||
|
||||
void GPSManager::stop() {
|
||||
if (!_running) return;
|
||||
|
||||
// Persist current data before stopping
|
||||
if (_timeValid || _locationValid) {
|
||||
persistToNVS();
|
||||
}
|
||||
|
||||
_serial.end();
|
||||
_running = false;
|
||||
_baudDetected = false;
|
||||
_locationValid = false;
|
||||
Serial.println("[GPS] Stopped");
|
||||
}
|
||||
|
||||
uint32_t GPSManager::fixAgeMs() const {
|
||||
if (_lastFixMs == 0) return UINT32_MAX;
|
||||
return millis() - _lastFixMs;
|
||||
}
|
||||
|
||||
void GPSManager::syncSystemTime() {
|
||||
const NMEAData& d = _parser.data();
|
||||
if (!d.timeValid) return;
|
||||
|
||||
// Sanity check year range (reject spoofed/garbage data)
|
||||
if (d.year < 2024 || d.year > 2030) {
|
||||
Serial.printf("[GPS] Rejected time: year %d out of range\n", d.year);
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert GPS UTC date/time to Unix epoch using arithmetic
|
||||
// (avoids mktime() TZ contamination and timegm() unavailability on ESP32)
|
||||
auto daysFromCivil = [](int y, int m, int d) -> int32_t {
|
||||
// Converts civil date to days since 1970-01-01 (Howard Hinnant algorithm)
|
||||
y -= (m <= 2);
|
||||
int era = (y >= 0 ? y : y - 399) / 400;
|
||||
unsigned yoe = (unsigned)(y - era * 400);
|
||||
unsigned doy = (153 * (m + (m > 2 ? -3 : 9)) + 2) / 5 + d - 1;
|
||||
unsigned doe = yoe * 365 + yoe / 4 - yoe / 100 + doy;
|
||||
return era * 146097 + (int32_t)doe - 719468;
|
||||
};
|
||||
|
||||
int32_t days = daysFromCivil(d.year, d.month, d.day);
|
||||
time_t epoch = (time_t)days * 86400 + d.hour * 3600 + d.minute * 60 + d.second;
|
||||
if (epoch < 1700000000) {
|
||||
Serial.printf("[GPS] Rejected time: epoch %ld too low\n", (long)epoch);
|
||||
return;
|
||||
}
|
||||
|
||||
struct timeval tv = {};
|
||||
tv.tv_sec = epoch;
|
||||
tv.tv_usec = 0;
|
||||
settimeofday(&tv, nullptr);
|
||||
|
||||
_timeValid = true;
|
||||
_lastTimeSyncMs = millis();
|
||||
_timeSyncCount++;
|
||||
|
||||
// Set TZ from utcOffset so localtime() works correctly
|
||||
// POSIX TZ: "UTC<offset>" where offset sign is inverted
|
||||
// e.g., UTC-5 (EST) → "UTC5" in POSIX notation
|
||||
char tz[16];
|
||||
snprintf(tz, sizeof(tz), "UTC%d", -_utcOffset);
|
||||
setenv("TZ", tz, 1);
|
||||
tzset();
|
||||
|
||||
Serial.printf("[GPS] System time synced: %04d-%02d-%02d %02d:%02d:%02d UTC (sync #%lu)\n",
|
||||
d.year, d.month, d.day, d.hour, d.minute, d.second,
|
||||
(unsigned long)_timeSyncCount);
|
||||
}
|
||||
|
||||
void GPSManager::restoreTimeFromNVS() {
|
||||
Preferences prefs;
|
||||
if (!prefs.begin(NVS_NAMESPACE, true)) return; // read-only
|
||||
|
||||
int64_t storedEpoch = prefs.getLong64("epoch", 0);
|
||||
prefs.end();
|
||||
|
||||
if (storedEpoch > 1700000000) {
|
||||
struct timeval tv = {};
|
||||
tv.tv_sec = (time_t)storedEpoch;
|
||||
tv.tv_usec = 0;
|
||||
settimeofday(&tv, nullptr);
|
||||
|
||||
// Set TZ
|
||||
char tz[16];
|
||||
snprintf(tz, sizeof(tz), "UTC%d", -_utcOffset);
|
||||
setenv("TZ", tz, 1);
|
||||
tzset();
|
||||
|
||||
time_t now = time(nullptr);
|
||||
struct tm* local = localtime(&now);
|
||||
if (local) {
|
||||
Serial.printf("[GPS] Restored time from NVS: %04d-%02d-%02d %02d:%02d (stale, approximate)\n",
|
||||
local->tm_year + 1900, local->tm_mon + 1, local->tm_mday,
|
||||
local->tm_hour, local->tm_min);
|
||||
}
|
||||
// Note: _timeValid stays false — this is approximate/stale time.
|
||||
// The system clock is set so timestamps work, but the GPS indicator
|
||||
// won't show as "fixed" until a real satellite fix arrives.
|
||||
}
|
||||
}
|
||||
|
||||
void GPSManager::persistToNVS() {
|
||||
time_t now = time(nullptr);
|
||||
if (now < 1700000000) return; // Don't persist if we don't have real time
|
||||
|
||||
Preferences prefs;
|
||||
if (!prefs.begin(NVS_NAMESPACE, false)) return; // read-write
|
||||
|
||||
prefs.putLong64("epoch", (int64_t)now);
|
||||
|
||||
const NMEAData& d = _parser.data();
|
||||
if (d.locationValid) {
|
||||
// Store as integers (microdegrees) to avoid float NVS issues
|
||||
prefs.putLong("lat_ud", (int32_t)(d.latitude * 1000000.0));
|
||||
prefs.putLong("lon_ud", (int32_t)(d.longitude * 1000000.0));
|
||||
prefs.putLong("alt_cm", (int32_t)(d.altitude * 100.0));
|
||||
}
|
||||
|
||||
prefs.end();
|
||||
}
|
||||
|
||||
#endif // HAS_GPS
|
||||
Reference in New Issue
Block a user