Add properties and logic to handle timezone and dst changes

Author: pennam

src/ArduinoIoTCloud.h

@@ -97,7 +97,9 @@ class ArduinoIoTCloudClass
 
     inline ConnectionHandler * getConnection()          { return _connection; }
 
-    inline unsigned long getInternalTime() { return _time_service.getTime(); }
+    inline unsigned long getInternalTime()              { return _time_service.getTime(); }
+    inline unsigned long getLocalTime()                 { return _time_service.getLocalTime(); }
+    inline void          updateInternalTimezoneInfo()   { _time_service.setTimeZoneData(_tz_offset, _tz_dst_until); }
 
     void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);
 
@@ -146,6 +148,8 @@ class ArduinoIoTCloudClass
     ConnectionHandler * _connection = nullptr;
     PropertyContainer _property_container;
     TimeService _time_service;
+    int _tz_offset = 0;
+    unsigned int _tz_dst_until = 0;
 
     void execCloudEventCallback(ArduinoIoTCloudEvent const event);
 

src/ArduinoIoTCloudTCP.cpp

@@ -64,6 +64,11 @@ extern "C" unsigned long getTime()
   return ArduinoCloud.getInternalTime();
 }
 
+extern "C" void updateTimezoneInfo()
+{
+  ArduinoCloud.updateInternalTimezoneInfo();
+}
+
 /******************************************************************************
    CTOR/DTOR
  ******************************************************************************/
@@ -243,6 +248,9 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   addPropertyReal(_ota_req, "OTA_REQ", Permission::ReadWrite).onSync(CLOUD_WINS);
 #endif /* OTA_ENABLED */
 
+  addPropertyReal(_tz_offset, "tz_offset", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
+  addPropertyReal(_tz_dst_until, "tz_dst_until", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
+
 #if OTA_STORAGE_PORTENTA_QSPI
   #define BOOTLOADER_ADDR   (0x8000000)
   uint32_t bootloader_data_offset = 0x1F000;
@@ -527,7 +535,12 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
     */
     sendPropertiesToCloud();
 
-    return State::Connected;
+    unsigned long const internal_posix_time = _time_service.getTime();
+    if(internal_posix_time < _tz_dst_until) {
+      return State::Connected;
+    } else {
+      return State::RequestLastValues;
+    }
   }
 }
 
@@ -555,6 +568,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] last values received", __FUNCTION__, millis());
     CBORDecoder::decode(_property_container, (uint8_t*)bytes, length, true);
     sendPropertiesToCloud();
+    _time_service.setTimeZoneData(_tz_offset, _tz_dst_until);
     execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
     _last_sync_request_cnt = 0;
     _last_sync_request_tick = 0;

src/property/types/CloudSchedule.h

@@ -74,7 +74,7 @@ class Schedule : public TimeService {
 
     bool isActive() {
 
-      unsigned int now = getTime();
+      unsigned int now = getLocalTime();
       if(checkSchedulePeriod(now, frm, to)) {
         /* We are in the schedule range */
 

src/utility/time/TimeService.cpp

@@ -91,6 +91,18 @@ unsigned long TimeService::getTime()
 #endif
 }
 
+void TimeService::setTimeZoneData(long offset, unsigned long dst_until)
+{
+  _timezone_offset = offset;
+  _timezone_dst_until = dst_until;
+}
+
+unsigned long TimeService::getLocalTime()
+{
+  unsigned long utc = getTime();
+  return utc + _timezone_offset;
+}
+
 /**************************************************************************************
  * PRIVATE MEMBER FUNCTIONS
  **************************************************************************************/

src/utility/time/TimeService.h

@@ -24,6 +24,7 @@
 
 #include <Arduino_ConnectionHandler.h>
 
+
 #ifdef ARDUINO_ARCH_SAMD
   #include <RTCZero.h>
 #endif
@@ -46,6 +47,8 @@ class TimeService
 
   void          begin  (ConnectionHandler * con_hdl);
   unsigned long getTime();
+  unsigned long getLocalTime();
+  void          setTimeZoneData(long offset, unsigned long valid_until);
 
 private:
 
@@ -55,8 +58,13 @@ class TimeService
 #endif
 
   unsigned long getRemoteTime();
+
   static bool isTimeValid(unsigned long const time);
 
+private:
+  long _timezone_offset;
+  unsigned long _timezone_dst_until;
+
 };
 
 #endif /* ARDUINO_IOT_CLOUD_TIME_SERVICE_H_ */