Add support for daylight saving time

Author: Deni90

doc/feDesign.jpg

@@ -1 +1 @@
-{"offset":0}
+{"offset":0,"isDst":0}

firmware/data/config/time_info.json

@@ -58,6 +58,19 @@ <h2>Time configuration</h2>
 				<option value="46800">UTC+13:00</option>
 			</select>
 		</div>
+		<div class="field-container">
+			<label for="dst">Daylight saving time:</label>
+			<div class="choice-container">
+				<div class="choice" onclick="selectDstChoice(event)" name="dstChoice" value="0">
+					<input id="dstOff" type="radio"/>
+					<label for="dstOff">Off</label>
+				</div>
+				<div class="choice" onclick="selectDstChoice(event)" name="dstChoice" value="1">
+					<input id="dstOn" type="radio"/>
+					<label for="dstOn">On</label>
+				</div>
+			</div>
+		</div>
 		<h2>Sleep configuration</h2>
 		<h3>Sleep before</h3>
 		<div class="field-container">

firmware/data/web_server/index.html

@@ -13,17 +13,19 @@ class HSV {
 }
 
 class TimeInfo {
-    constructor(offset) {
+    constructor(offset, isDst) {
         this.offset = offset;
+        this.isDst = isDst;
     }
     toJson() {
         return {
-            "offset": this.offset
+            "offset": this.offset,
+            "isDst": this.isDst
         };
     }
     static Builder = class {
         fromJson(message) {
-            return new TimeInfo(message.offset);
+            return new TimeInfo(message.offset, message.isDst);
         }
     }
 }
@@ -184,6 +186,7 @@ function getTimeInfo() {
         .then(data => {
             timeInfo = new TimeInfo.Builder().fromJson(data);
             document.getElementById("selectTimeZone").value = timeInfo.offset;
+            selectRadioChoiceByName("dstChoice", timeInfo.isDst);
         })
         .catch(error => {
             console.error('There was a problem with the getting time info:', error);
@@ -387,6 +390,10 @@ function selectBacklightChoice(evt) {
     ledInfo.state = selectRadioChoiceByEvent(evt);
 }
 
+function selectDstChoice(evt) {
+    timeInfo.isDst = selectRadioChoiceByEvent(evt);
+}
+
 function updateSleepBefore() {
     document.getElementById("inputSleepBeforeHour").value = document.getElementById("sliderSleepBeforeHour").value
     document.getElementById("inputSleepBeforeMinute").value = document.getElementById("sliderSleepBeforeMinute").value

firmware/data/web_server/server.js

@@ -10,6 +10,7 @@
 class TimeInfo {
   private:
     int offset;
+    bool isDst;
 
   public:
     /**
@@ -21,8 +22,9 @@ class TimeInfo {
      * @brief Construct a new Time Info object
      *
      * @param offset offset in seconds
+     * @param isDst flag indicating is daylight saving time enabled
      */
-    TimeInfo(int offset);
+    TimeInfo(int offset, bool isDst);
 
     /**
      * @brief Default destructor
@@ -49,6 +51,20 @@ class TimeInfo {
      */
     void SetOffset(int value);
 
+    /**
+     * @brief Getter for isDst
+     *
+     * @return isDst Flag indicating is daylight saving enabled
+     */
+    bool IsDst() const;
+
+    /**
+     * @brief Setter for isDst
+     *
+     * @param value Flag indicating is daylight saving enabled
+     */
+    void SetDst(bool value);
+
     /**
      * @brief Convert TimeInfo to JSON format
      *

firmware/include/TimeInfo.h

@@ -89,6 +89,7 @@ void ConfigStore::LoadTimeInfo(TimeInfo& timeInfo) {
         Serial.printf("Failed to read %s file.\n", TIME_INFO_FILE);
     file.close();
     timeInfo.SetOffset(doc["offset"]);
+    timeInfo.SetDst(doc["isDst"]);
 }
 
 void ConfigStore::SaveTimeInfo(const TimeInfo& timeInfo) {

firmware/src/ConfigStore.cpp

@@ -210,7 +210,8 @@ TimeInfo NixieClock::OnGetTimeInfo() const {
 
 void NixieClock::OnSetTimeInfo(const TimeInfo& timeInfo) {
     ConfigStore::SaveTimeInfo(timeInfo);
-    timeManager.SetOffset(timeInfo.GetOffset());
+    int offset = timeInfo.GetOffset() + (timeInfo.IsDst() ? 3600 : 0);
+    timeManager.SetOffset(offset);
 }
 
 bool NixieClock::IsInSleepMode() {

firmware/src/NixieClock.cpp

@@ -1,13 +1,18 @@
 #include "TimeInfo.h"
 
-TimeInfo::TimeInfo(int offset) : offset(offset) {}
+TimeInfo::TimeInfo(int offset, bool isDst) : offset(offset), isDst(isDst) {}
 
 int TimeInfo::GetOffset() const { return offset; }
 
 void TimeInfo::SetOffset(int value) { offset = value; }
 
+bool TimeInfo::IsDst() const { return isDst; }
+
+void TimeInfo::SetDst(bool value) { isDst = value; }
+
 JsonDocument TimeInfo::ToJson() const {
     JsonDocument doc;
     doc["offset"] = offset;
+    doc["isDst"] = static_cast<uint8_t>(isDst);
     return doc;
 }

firmware/src/TimeInfo.cpp

@@ -219,13 +219,15 @@ void WebServer::HandleSetTimeInfo(AsyncWebServerRequest* request,
         return;
     }
     JsonDocument requestBody = json.as<JsonObject>();
-    if (!requestBody.containsKey("offset")) {
+    if (!requestBody.containsKey("offset") ||
+        !requestBody.containsKey("isDst")) {
         request->send(HTTP_400_BAD_REQUEST,
                       "Error HandleSetTimeInfo: missing argument(s)!");
         return;
     }
     int offset = requestBody["offset"];
-    TimeInfo ti(offset);
+    uint8_t isDst = requestBody["isDst"];
+    TimeInfo ti(offset, isDst);
     callback.OnSetTimeInfo(ti);
     request->send(HTTP_200_OK, "");
 }

firmware/src/WebServer.cpp

@@ -1,13 +1,13 @@
 #include <ArduinoJson.h>
-#include <base64.hpp>
 #include <DNSServer.h>
-#include <ESP8266mDNS.h>
 #include <ESP8266WiFi.h>
+#include <ESP8266mDNS.h>
 #include <LittleFS.h>
 #include <RtcDS3231.h>
 #include <Ticker.h>
 #include <WiFiClient.h>
 #include <Wire.h>
+#include <base64.hpp>
 
 #include "ConfigStore.h"
 #include "In14NixieTube.h"
@@ -187,7 +187,7 @@ void setup() {
 
     TimeInfo ti;
     ConfigStore::LoadTimeInfo(ti);
-    timeManager.Initialize(ti.GetOffset());
+    timeManager.Initialize(ti.GetOffset() + (ti.IsDst() ? 3600 : 0));
     SynchroniseTime();
 
     Serial.printf("Initializing timer(s)... ");