Add possibility to configure a custom time sync function

Author: pennam

src/utility/time/TimeService.cpp

@@ -105,10 +105,9 @@ TimeService::TimeService()
 , _is_tz_configured(false)
 , _timezone_offset(0)
 , _timezone_dst_until(0)
-#ifdef HAS_TCP
-, _last_ntp_sync_tick(0)
-, _ntp_sync_interval_ms(TIMESERVICE_NTP_SYNC_TIMEOUT_ms)
-#endif
+, _last_sync_tick(0)
+, _sync_interval_ms(TIMESERVICE_NTP_SYNC_TIMEOUT_ms)
+, _sync_func(nullptr)
 {
 
 }
@@ -130,7 +129,7 @@ unsigned long TimeService::getTime()
 {
   /* Check if it's time to sync */
   unsigned long const current_tick = millis();
-  bool const is_ntp_sync_timeout = (current_tick - _last_ntp_sync_tick) > _ntp_sync_interval_ms;
+  bool const is_ntp_sync_timeout = (current_tick - _last_sync_tick) > _sync_interval_ms;
   if(!_is_rtc_configured || is_ntp_sync_timeout) {
     sync();
   }
@@ -145,7 +144,6 @@ void TimeService::setTime(unsigned long time)
   setRTC(time);
 }
 
-#ifdef HAS_TCP
 bool TimeService::sync()
 {
   _is_rtc_configured = false;
@@ -166,17 +164,23 @@ bool TimeService::sync()
   if(isTimeValid(utc)) {
     DEBUG_DEBUG("TimeServiceClass::%s  Drift: %d RTC value: %u", __FUNCTION__, getRTC() - utc, utc);
     setRTC(utc);
-    _last_ntp_sync_tick = millis();
+    _last_sync_tick = millis();
     _is_rtc_configured = true;
   }
   return _is_rtc_configured;
 }
 
 void TimeService::setSyncInterval(unsigned long seconds)
 {
-  _ntp_sync_interval_ms = seconds * 1000;
+  _sync_interval_ms = seconds * 1000;
+}
+
+void TimeService::setSyncFunction(syncTimeFunctionPtr sync_func)
+{
+  if(sync_func) {
+    _sync_func = sync_func;
+  }
 }
-#endif
 
 void TimeService::setTimeZoneData(long offset, unsigned long dst_until)
 {

src/utility/time/TimeService.h

@@ -25,6 +25,12 @@
 #include <AIoTC_Config.h>
 #include <Arduino_ConnectionHandler.h>
 
+/******************************************************************************
+ * TYPEDEF
+ ******************************************************************************/
+
+typedef unsigned long(*syncTimeFunctionPtr)(void);
+
 /**************************************************************************************
  * CLASS DECLARATION
  **************************************************************************************/
@@ -41,10 +47,9 @@ class TimeService
   void          setTime(unsigned long time);
   unsigned long getLocalTime();
   void          setTimeZoneData(long offset, unsigned long valid_until);
-#ifdef HAS_TCP
   bool          sync();
-#endif
   void          setSyncInterval(unsigned long seconds);
+  void          setSyncFunction(syncTimeFunctionPtr sync_func);
 
   /* Helper function to convert an input String into a UNIX timestamp.
    * The input String format must be as follow "2021 Nov 01 17:00:00"
@@ -58,10 +63,9 @@ class TimeService
   bool _is_tz_configured;
   long _timezone_offset;
   unsigned long _timezone_dst_until;
-#ifdef HAS_TCP
-  unsigned long _last_ntp_sync_tick;
-  unsigned long _ntp_sync_interval_ms;
-#endif
+  unsigned long _last_sync_tick;
+  unsigned long _sync_interval_ms;
+  syncTimeFunctionPtr _sync_func;
 
 #ifdef HAS_TCP
   unsigned long getRemoteTime();