Time Synch

Author: pschatzmann

src/SnapClient.h

@@ -86,12 +86,12 @@ class SnapClient {
 
     setupNVS();
 
-    setupSNTPTime();
-
     setupMDNS();
 
     setupPSRAM();
 
+    SnapTime::instance().setupSNTPTime();
+
     // start tasks
     return p_snapprocessor->begin();
   }
@@ -135,23 +135,6 @@ class SnapClient {
 #endif
   SnapProcessor *p_snapprocessor = &default_processor;
 
-  void setupSNTPTime() {
-#if CONFIG_SNAPCLIENT_SNTP_ENABLE
-    ESP_LOGD(TAG, "start");
-    const char *ntpServer = CONFIG_SNTP_SERVER;
-    const long gmtOffset_sec = 1 * 60 * 60;
-    const int daylightOffset_sec = 1 * 60 * 60;
-    for (int retry = 0; retry < 5; retry++) {
-      configTime(gmtOffset_sec, daylightOffset_sec, ntpServer);
-      if(!SnapTime().instance().printLocalTime()){
-        continue;
-      }
-      checkHeap();
-      SnapTime::instance().printLocalTime();
-      break;
-    }
-  #endif
-  }
 
   void setupMDNS() {
 #if CONFIG_SNAPCLIENT_USE_MDNS

src/SnapConfig.h

@@ -13,8 +13,8 @@
 #ifndef CONFIG_SNAPCLIENT_SNTP_ENABLE 
 #  define CONFIG_SNAPCLIENT_SNTP_ENABLE true
 #endif
-#ifndef CONFIG_SNAPCLIENT_SETTIME_ALLOWD
-#  define CONFIG_SNAPCLIENT_SETTIME_ALLOWD false
+#ifndef CONFIG_SNAPCLIENT_SET_TIME_ALLOWD
+#  define CONFIG_SNAPCLIENT_SET_TIME_ALLOWD true
 #endif
 #ifndef CONFIG_SNAPCLIENT_USE_MDNS 
 #  define CONFIG_SNAPCLIENT_USE_MDNS true

src/api/SnapOutputSimple.h

@@ -63,9 +63,15 @@ class SnapOutputSimple : public SnapOutput {
         // wait for the audio to become valid
         int diff_ms = msg_time - server_time;
         int delay_ms = diff_ms + SnapTime::instance().getStartDelay();
-        ESP_LOGI(TAG, "starting after %d ms", delay_ms);
-        delay(delay_ms);
-        is_sync_active = false;
+        if (delay_ms < 100000){
+          ESP_LOGI(TAG, "starting after %d ms", delay_ms);
+          delay(delay_ms);
+          is_sync_active = false;
+        } else {
+          ESP_LOGI(TAG, "invalid delay: %d ms - starting anyhow...", delay_ms);
+          delay(SnapTime::instance().getStartDelay());
+          is_sync_active = false;
+        }
       }
     }
     return true;

src/api/SnapProcessor.h

@@ -460,7 +460,7 @@ class SnapProcessor {
       is_time_set = true;
     } else {
       int64_t time_diff = snap_time.timeDifferenceMs(trx, ttx);
-      int time_diff_int = time_diff;
+      uint32_t time_diff_int = time_diff;
       assert(time_diff_int==time_diff);
       ESP_LOGI(TAG, "Time Difference to Server: %ld ms", time_diff);
       snap_time.setTimeDifferenceClientServerMs(time_diff);

src/api/SnapTime.h

@@ -47,7 +47,7 @@ class SnapTime {
   }
 
   /// Record the last time difference between client and server
-  void setTimeDifferenceClientServerMs(int diff) { time_diff = diff; }
+  void setTimeDifferenceClientServerMs(uint32_t diff) { time_diff = diff; }
 
   /// Provides the current server time in ms
   uint32_t serverMillis() {
@@ -70,13 +70,13 @@ class SnapTime {
     return sec * 1000 + (usec / 1000);
   }
 
-  bool printLocalTime() {
+  bool printLocalTime(const char* msg) {
     const timeval val = time();
     auto *tm_result = gmtime(&val.tv_sec);
 
     char str[80];
     strftime(str, 80, "%d-%m-%Y %H-%M-%S", tm_result);
-    ESP_LOGI(TAG, "Time is %s", str);
+    ESP_LOGI(TAG, "%s: Time is %s", msg, str);
     return true;
   }
 
@@ -89,12 +89,21 @@ class SnapTime {
   /// updates the actual time
   bool setTime(timeval time) {
     ESP_LOGI(TAG, "epoch: %lu", time.tv_sec);
-#if !CONFIG_SNAPCLIENT_SNTP_ENABLE && CONFIG_SNAPCLIENT_SETTIME_ALLOWD
+#if CONFIG_SNAPCLIENT_SET_TIME_ALLOWD
+    // we do not allow the update when the time is managed via smtp
+    if(has_sntp_time){
+      ESP_LOGI(TAG,"setTime not relevant because it is managed via sntp");
+      return true;
+    }
+    // update epoch
     int rc = settimeofday(&time, NULL);
-    printLocalTime();
+    if (rc==0){
+      time_diff = time.tv_sec / 1000;
+    }
+    printLocalTime("setTime");
     return rc == 0;
 #else
-    ESP_LOGI(TAG, "setTime now allowed/active");
+    ESP_LOGI(TAG, "setTime not allowed/active");
     return false;
 #endif
   }
@@ -113,11 +122,32 @@ class SnapTime {
     return delay;
   }
 
+  void setupSNTPTime() {
+#if CONFIG_SNAPCLIENT_SNTP_ENABLE
+    ESP_LOGD(TAG, "start");
+    const char *ntpServer = CONFIG_SNTP_SERVER;
+    const long gmtOffset_sec = 1 * 60 * 60;
+    const int daylightOffset_sec = 1 * 60 * 60;
+    for (int retry = 0; retry < 5; retry++) {
+      configTime(gmtOffset_sec, daylightOffset_sec, ntpServer);
+      tm time;
+      if(!getLocalTime(&time)){
+        continue;
+      }
+      SnapTime::instance().printLocalTime("SNTP");
+      has_sntp_time = true;
+      break;
+    }
+  #endif
+  }
+
+
 protected:
-  int64_t time_diff = 0;
+  uint32_t time_diff = 0;
   const char *TAG = "SnapTime";
   uint32_t server_ms = 0;
   uint32_t local_ms;
   uint16_t message_buffer_delay_ms = 0;
   timeval server_time;
+  bool has_sntp_time = false;
 };