moved utcoffset to config

rackrick · Mar 28, 2021 · 2cdabd5 · 2cdabd5
1 parent 8f63c2a
commit 2cdabd5
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 8 deletions.
diff --git a/firmware/data/include/moonwatch.js b/firmware/data/include/moonwatch.js
@@ -12,6 +12,7 @@ function updateConfig(data) {
     // general settings
     document.getElementById("wifi").value = data.general.wifi;
     document.getElementById("display").value = data.general.display;
+    document.getElementById("utcOffset").value = data.general.utcOffset;
 
     // printers
     for (let i = 0; i < data.printers.length; i++) {
@@ -36,6 +37,7 @@ function save() {
             wifi: document.getElementById("wifi").value,
             password: document.getElementById("password").value,
             display: document.getElementById("display").value,
+            utcOffset: document.getElementById("utcOffset").value,
         }, 
         printers: [],
         led: {

diff --git a/firmware/data/index.html b/firmware/data/index.html
@@ -42,6 +42,14 @@ <h2>Welcome to MoonWatch</h2>
                             (currently only ST7735 Displays are supported)
                         </td>
                     </tr>
+                    <tr>
+                        <td class="label">
+                            utc Offset (Timezone):
+                        </td>
+                        <td class="utcOffset">
+                            <input type="number" id="utcOffset">
+                        </td>
+                    </tr>
                     <!-- PRINTER SETTINGS -->
                     <tr>
                         <td colspan="2" class="headline">Printers</td>

diff --git a/firmware/data/moonwatch.json b/firmware/data/moonwatch.json
@@ -2,7 +2,8 @@
     "general": {
         "wifi": "",
         "password": "",
-        "display": 0
+        "display": 0,
+        "utcOffset": 2
     },
     "printers": [
         {

diff --git a/firmware/src/MoonWatch.cpp b/firmware/src/MoonWatch.cpp
@@ -230,6 +230,9 @@ void MoonWatch::startMonitor() {
                     lcd->showPrinterScreen(printerName, printer);
                 }
             } else {
+                Serial.println("idle screen: " + config.printers[activePrinter].Name);
+                Serial.println(printer.connectionState);
+
                 lcd->showIdleScreen();
                 leds[printerLed] = CRGB::Black;            
             }        
@@ -265,6 +268,8 @@ void MoonWatch::startMonitor() {
 
 bool MoonWatch::switchPrinter(std::vector<PrinterConfig> printers) {
 
+    Serial.println(F("Try to switch"));
+
     uint nextPrinter = activePrinter;
 
     // with one printer we can't switch
@@ -278,13 +283,17 @@ bool MoonWatch::switchPrinter(std::vector<PrinterConfig> printers) {
         nextPrinter = 0;
     }
 
+    Serial.println("try next printer " + printers[nextPrinter].Name + "(" + nextPrinter + ")");
+
     MoonrakerClient mrClient;
     printer = mrClient.getData(printers[nextPrinter].Host);
 
     if (printer.connectionState == "success") {
+        Serial.println(F("success, switch printer"));
         activePrinter = nextPrinter;        
         return true;
     } else {
+        Serial.println(F("error, printer not reachable. skip."));
         leds[printers[nextPrinter].Led] = CRGB::Black;        
 
         return false;

diff --git a/firmware/src/Webserver/WebServer.cpp b/firmware/src/Webserver/WebServer.cpp
@@ -81,6 +81,7 @@ namespace RP {
                     config.display = jsonObj["general"]["display"].as<int>();
                 } else {
                     config.display = jsonObj["general"]["display"].as<int>();
+                    config.utcOffset = jsonObj["general"]["utcOffset"].as<int>();
                 }
 
                 bool updateGeneral = configStore.updateGeneral(config);
@@ -125,6 +126,7 @@ namespace RP {
         // reset esp
         server.on("/reset", HTTP_GET, [](AsyncWebServerRequest *request){
             Serial.println(F("reset called"));
+            request->send(200, "application/json", "{ \"status\": \"ok\" }");
             ESP.reset();
         });
 

diff --git a/firmware/src/tools/ConfigStore.cpp b/firmware/src/tools/ConfigStore.cpp
@@ -33,13 +33,11 @@ namespace RP {
                     return false;
                 }
 
-                Serial.println("Json:");
-                Serial.println(doc.as<String>());
-
                 // general config
                 general.wifi = doc["general"]["wifi"].as<String>();
                 general.password = doc["general"]["password"].as<String>();
                 general.display = doc["general"]["display"].as<int>();
+                general.utcOffset = doc["general"]["utcoffset"].as<int>();
 
                 // printers array
                 JsonArray arrPrinters = doc["printers"].as<JsonArray>();                   
@@ -69,6 +67,7 @@ namespace RP {
             json["general"]["wifi"] = general.wifi;
             json["general"]["password"] = general.password;
             json["general"]["display"] = general.display;
+            json["general"]["utcoffset"] = general.utcOffset;
 
             JsonArray arrPrinters = json["printers"].as<JsonArray>();
 
@@ -113,6 +112,7 @@ namespace RP {
             }
 
             general.display = newConfig.display;
+            general.utcOffset = newConfig.utcOffset;
 
             return true;
         }

diff --git a/firmware/src/tools/GeneralConfig.h b/firmware/src/tools/GeneralConfig.h
@@ -7,5 +7,6 @@ namespace RP {
             String wifi;
             String password;
             int display;
+            int utcOffset;
     };
 }
diff --git a/firmware/src/tools/NtpClock.cpp b/firmware/src/tools/NtpClock.cpp
@@ -12,8 +12,6 @@ namespace RP {
             return instance;
         }
 
-        //1613519630
-
         String NtpClock::getDateTimeString() {            
             // tick tack clock
             tickTime();
@@ -67,8 +65,9 @@ namespace RP {
             if (!ntpSuccess) {
                 delay(1000);
             }
-
-            long utcOffset = 1 * 60 * 60;   //TODO: Get from config
+
+            ConfigStore& config = ConfigStore::getInstance();                              
+            long utcOffset = config.general.utcOffset;
             WiFiUDP ntpUDP;
             NTPClient timeClient(ntpUDP, "pool.ntp.org", utcOffset);
             timeClient.begin();

diff --git a/firmware/src/tools/NtpClock.h b/firmware/src/tools/NtpClock.h
@@ -2,6 +2,11 @@
 #include <ESP8266WiFi.h>
 #include <WiFiUdp.h>
 
+#ifndef ConfigStoreH
+    #define ConfigStoreH
+    #include "ConfigStore.h"
+#endif
+
 namespace RP
 {
     namespace Tools