Support for USA DST calculations (#664)

xoseperez · Mar 15, 2018 · c886d9f · c886d9f
1 parent 6150544
commit c886d9f
Show file tree

Hide file tree

Showing 6 changed files with 2,449 additions and 2,435 deletions.
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
@@ -842,6 +842,7 @@ PROGMEM const char* const custom_reset_string[] = {
 #define NTP_SYNC_INTERVAL       60              // NTP initial check every minute
 #define NTP_UPDATE_INTERVAL     1800            // NTP check every 30 minutes
 #define NTP_START_DELAY         1000            // Delay NTP start 1 second
+#define NTP_DST_REGION          0               // 0 for Europe, 1 for USA (defined in NtpClientLib)
 
 // -----------------------------------------------------------------------------
 // ALEXA

diff --git a/code/espurna/data/index.html.gz b/code/espurna/data/index.html.gz
diff --git a/code/espurna/ntp.ino b/code/espurna/ntp.ino
@@ -27,6 +27,7 @@ void _ntpWebSocketOnSend(JsonObject& root) {
     root["ntpServer"] = getSetting("ntpServer", NTP_SERVER);
     root["ntpOffset"] = getSetting("ntpOffset", NTP_TIME_OFFSET).toInt();
     root["ntpDST"] = getSetting("ntpDST", NTP_DAY_LIGHT).toInt() == 1;
+    root["ntpRegion"] = getSetting("ntpRegion", NTP_DST_REGION).toInt();
     if (ntpSynced()) root["now"] = now();
 }
 
@@ -66,6 +67,9 @@ void _ntpConfigure() {
         NTP.setNtpServerName(server);
     }
 
+    uint8_t dst_region = getSetting("ntpRegion", NTP_DST_REGION).toInt();
+    NTP.setDSTZone(dst_region);
+
 }
 
 void _ntpUpdate() {