Merge pull request #719 from cyberman54/development

Development

platformio_orig.ini

@@ -47,7 +47,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 2.1.1
+release_version = 2.2.0
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3

src/gpsread.cpp

@@ -119,8 +119,8 @@ time_t get_gpstime(uint16_t *msec) {
     tm.Year = CalendarYrToTm(atoi(gpsyear.value())); // year offset from 1970
     t = makeTime(tm);
 
-    // ESP_LOGD(TAG, "GPS time/date = %2d:%2d:%2d / %2d.%2d.%2d", tm.Hour,
+    ESP_LOGD(TAG, "GPS time/date = %2d:%2d:%2d / %2d.%2d.%2d", tm.Hour,
-    //         tm.Minute, tm.Second, tm.Day, tm.Month, tm.Year + 1970);
+            tm.Minute, tm.Second, tm.Day, tm.Month, tm.Year + 1970);
 
     // add protocol delay with millisecond precision
     t += delay_ms / 1000 - 1; // whole seconds

src/timekeeper.cpp

@@ -109,8 +109,9 @@ void IRAM_ATTR setMyTime(uint32_t t_sec, uint16_t t_msec,
              _seconds(), timeSetSymbols[mytimesource]);
   } else {
     timesyncer.attach(TIME_SYNC_INTERVAL_RETRY * 60, setTimeSyncIRQ);
-    ESP_LOGD(TAG, "[%0.3f] Timesync failed, invalid time fetched | source: %c",
+    time_t unix_sec_at_compilation = compiledUTC();
-             _seconds(), timeSetSymbols[mytimesource]);
+    ESP_LOGD(TAG, "[%0.3f] Failed to synchronise time from source %c | unix sec obtained from source: %d | unix sec at program compilation: %d",
+             _seconds(), timeSetSymbols[mytimesource], time_to_set, unix_sec_at_compilation);
   }
 }