Try #2 to fix timezone/DST

meshtastic · May 31, 2024 · a919ee6 · a919ee6
1 parent 7e81375
commit a919ee6
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/gps/RTC.cpp b/src/gps/RTC.cpp
@@ -222,14 +222,11 @@ bool perhapsSetRTC(RTCQuality q, struct tm &t)
  */
 int32_t getTZOffset()
 {
-    tzset();
-    time_t now;
+    time_t now = getTime(false);
     struct tm *gmt;
-    struct tm *local;
-    now = time(NULL);
     gmt = gmtime(&now);
-    local = localtime(&now);
-    return (int32_t)difftime(mktime(local), mktime(gmt));
+    gmt->tm_isdst = -1;
+    return (int32_t)difftime(now, mktime(gmt));
 }
 
 /**