timekeeper changes (experimental)

include/timekeeper.h

@@ -3,6 +3,7 @@
 
 #include "globals.h"
 #include "rtctime.h"
+#include "TimeLib.h"
 
 #ifdef HAS_GPS
 #include "gpsread.h"
@@ -18,11 +19,10 @@ extern const char timeSetSymbols[];
 void IRAM_ATTR CLOCKIRQ(void);
 void clock_init(void);
 void clock_loop(void *pvParameters);
-void timeSync(void);
 void timepulse_start(void);
 uint8_t timepulse_init(void);
-time_t TimeIsValid(time_t const t);
+time_t timeIsValid(time_t const t);
-time_t syncProvider_CB(void);
+time_t timeProvider(void);
 time_t compiledUTC(void);
 time_t tmConvert(uint16_t YYYY, uint8_t MM, uint8_t DD, uint8_t hh, uint8_t mm,
                  uint8_t ss);

lib/microTime

@@ -0,0 +1 @@
+Subproject commit 6d5b82c554590f49864cc44ce295ec91dcf1114e

src/gpsread.cpp

@@ -100,7 +100,7 @@ time_t get_gpstime(void) {
       t = tmConvert(gps.date.year(), gps.date.month(), gps.date.day(),
                     gps.time.hour(), gps.time.minute(), gps.time.second());
     }
-  return TimeIsValid(t);
+  return timeIsValid(t);
 } // get_gpstime()
 
 // GPS serial feed FreeRTos Task

src/irqhandler.cpp

@@ -32,7 +32,6 @@ void irqHandler(void *pvParameters) {
     // are cyclic tasks due?
     if (InterruptStatus & CYCLIC_IRQ) {
       doHousekeeping();
-      timeSync();
     }
 
     // is time to send the payload?

src/lorawan.cpp

@@ -464,7 +464,7 @@ void user_request_network_time_callback(void *pVoidUserUTCTime,
   *pUserUTCTime += requestDelaySec;
 
   // Update system time with time read from the network
-  if (TimeIsValid(*pUserUTCTime)) {
+  if (timeIsValid(*pUserUTCTime)) {
     xSemaphoreTake(TimePulse, pdMS_TO_TICKS(1000)); // wait for pps
     setTime(*pUserUTCTime + 1);
     timeSource = _lora;

src/main.cpp

@@ -414,9 +414,12 @@ void setup() {
 #endif
 #endif // HAS_BUTTON
 
+  // set time source
+  setSyncInterval(TIME_SYNC_INTERVAL * 60);
+  setSyncProvider(&timeProvider);
+
 #if defined HAS_IF482 || defined HAS_DCF77
   ESP_LOGI(TAG, "Starting Clock Controller...");
-  timeSync();
   clock_init();
 #endif
 

src/rtctime.cpp

@@ -29,7 +29,7 @@ uint8_t rtc_init(void) {
         RtcDateTime tt = Rtc.GetDateTime();
         time_t t = tt.Epoch32Time(); // sec2000 -> epoch
 
-        if (!Rtc.IsDateTimeValid() || !TimeIsValid(t)) {
+        if (!Rtc.IsDateTimeValid() || !timeIsValid(t)) {
           ESP_LOGW(TAG, "RTC has no recent time, setting to compilation date");
           Rtc.SetDateTime(
               RtcDateTime(compiledUTC() - SECS_YR_2000)); // epoch -> sec2000
@@ -67,7 +67,7 @@ time_t get_rtctime(void) {
     }
     I2C_MUTEX_UNLOCK();
   }
-  return TimeIsValid(t);
+  return timeIsValid(t);
 } // get_rtctime()
 
 float get_rtctemp(void) {

src/timekeeper.cpp

@@ -8,24 +8,22 @@ const char timeSetSymbols[] = {'G', 'R', 'L', '?'};
 
 getExternalTime TimeSourcePtr; // pointer to time source function
 
-// syncs systime from external time source and sets/reads RTC, called by
+time_t timeProvider(void) {
-// cyclic.cpp
+
-void timeSync(void) {
+  ESP_LOGD(TAG, "time synched");
 
   time_t t = 0;
 
 #ifdef HAS_GPS
-  xSemaphoreTake(TimePulse, pdMS_TO_TICKS(1100)); // wait for pps
+  // xSemaphoreTake(TimePulse, pdMS_TO_TICKS(1100)); // wait for pps
   t = get_gpstime(); // fetch recent time from last NEMA record
   if (t) {
-    t++; // last NMEA record concerns past second, so we add one
+    // t++; // last NMEA record concerns past second, so we add one
-    ESP_LOGD(TAG, "millis: %d, second: %d", millis(), second(t));
-    setTime(t);
 #ifdef HAS_RTC
     set_rtctime(t); // calibrate RTC
 #endif
     timeSource = _gps;
-    return;
+    return t;
   }
 #endif
 
@@ -33,12 +31,11 @@ void timeSync(void) {
 #ifdef HAS_RTC
   t = get_rtctime();
   if (t) {
-    setTime(t);
     timeSource = _rtc;
   }
 #endif
 
-// try lora sync if we have
+// kick off asychron lora sync if we have
 #if defined HAS_LORA && defined TIME_SYNC_LORA
   LMIC_requestNetworkTime(user_request_network_time_callback, &userUTCTime);
 #endif
@@ -46,7 +43,9 @@ void timeSync(void) {
   if (!t)
     timeSource = _unsynced;
 
-} // timeSync()
+  return t;
+
+} // timeProvider()
 
 // helper function to setup a pulse per second for time synchronisation
 uint8_t timepulse_init() {
@@ -103,6 +102,8 @@ void timepulse_start(void) {
 // interrupt service routine triggered by either pps or esp32 hardware timer
 void IRAM_ATTR CLOCKIRQ(void) {
 
+  SyncToPPS(); // calibrate systime from Time.h
+
   if (ClockTask != NULL)
     xTaskNotifyFromISR(ClockTask, uint32_t(now()), eSetBits, NULL);
 
@@ -115,15 +116,15 @@ void IRAM_ATTR CLOCKIRQ(void) {
 }
 
 // helper function to check plausibility of a time
-time_t TimeIsValid(time_t const t) {
+time_t timeIsValid(time_t const t) {
   // is it a time in the past? we use compile date to guess
   return (t >= compiledUTC() ? t : 0);
 }
 
 // helper function to convert compile time to UTC time
 time_t compiledUTC(void) {
-  time_t t = RtcDateTime(__DATE__, __TIME__).Epoch32Time();
+  static time_t t = myTZ.toUTC(RtcDateTime(__DATE__, __TIME__).Epoch32Time());
-  return myTZ.toUTC(t);
+  return t;
 }
 
 // helper function to convert gps date/time into time_t
@@ -182,7 +183,7 @@ void clock_loop(void *pvParameters) { // ClockTask
   configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check
 
   TickType_t wakeTime;
-  uint32_t ppstime;
+  uint32_t printtime;
   time_t t;
 
 #define t1(t) (t + DCF77_FRAME_SIZE + 1) // future minute for next DCF77 frame
@@ -196,18 +197,19 @@ void clock_loop(void *pvParameters) { // ClockTask
 
   // output time telegram for second following sec beginning with timepulse
   for (;;) {
-    xTaskNotifyWait(0x00, ULONG_MAX, &ppstime,
+    xTaskNotifyWait(0x00, ULONG_MAX, &printtime,
                     portMAX_DELAY); // wait for timepulse
 
     // no confident time -> suppress clock output
     if (timeStatus() == timeNotSet)
       continue;
 
-    t = time_t(ppstime);
+    t = time_t(printtime);
 
 #if defined HAS_IF482
 
-    IF482_Pulse(t2(t)); // next second
+    // IF482_Pulse(t2(t)); // next second
+    IF482_Pulse(t); // next second
 
 #elif defined HAS_DCF77
 
@@ -218,7 +220,8 @@ void clock_loop(void *pvParameters) { // ClockTask
         minute(t1(t))) // have recent frame? (timepulses could be missed!)
       continue;
     else
-      DCF77_Pulse(t2(t), DCFpulse); // then output next second of this frame
+      // DCF77_Pulse(t2(t), DCFpulse); // then output next second of this frame
+      DCF77_Pulse(t, DCFpulse); // then output next second of this frame
 
 #endif