From 26d43a6070c07492313d9f20cb6e262e7094c51f Mon Sep 17 00:00:00 2001
From: Kai Lauterbach <klaute@gmx.de>
Date: Fri, 28 Apr 2023 14:26:02 +0200
Subject: [PATCH] Added a slider for each light to show pwm state

---
 firmware/firmware.ino       | 30 +++++++++++++++++++++++++++++-
 firmware/timing_control.ino |  4 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/firmware/firmware.ino b/firmware/firmware.ino
index be1d4ce..ee17ea3 100644
--- a/firmware/firmware.ino
+++ b/firmware/firmware.ino
@@ -593,7 +593,10 @@ void init_webserver()
       http_content += "<div class=\"pure-control-group\">";
       http_content += "<label for=\"bri\"" + (String)light_num + ">Bri</label>";
       http_content += "<input id=\"bri" + (String)light_num + "\" onchange=\"sendSliderValue(" + (String)(light_num+1) + ")\" name=\"bri" + (String)light_num + "\" type=\"range\" min=\"0\" max=\"255\" value=\"" + (String)bri[light_num] + "\">";
-      http_content += "<label id=\"bri" + (String)light_num + "_val\" name=\"bri" + (String)light_num + "\">" + (String)(int)(bri[light_num] * 100.0 / 255.0) + "</label>%";
+      http_content += "&nbsp;<span id=\"bri" + (String)light_num + "_val\" name=\"bri" + (String)light_num + "\">" + (String)(int)(bri[light_num] * 100.0 / 255.0) + "</span>%";
+      http_content += "<label for=\"light" + (String)light_num + "_pwm\">PWM-Wert</label>";
+      http_content += "<input type=\"range\" min=\"0\" max=\"383\" value=\"0\" id=\"light" + (String)light_num + "_pwm\" disabled>";
+      http_content += "&nbsp;<span id=\"light" + (String)light_num + "_pwm_txt\"></span>";
       http_content += "<script>";
       http_content += "var slider" + (String)light_num + " = document.getElementById(\"bri" + (String)light_num + "\");";
       http_content += "var output" + (String)light_num + " = document.getElementById(\"bri" + (String)light_num + "\_val\");";
@@ -602,6 +605,7 @@ void init_webserver()
       http_content += "output" + (String)light_num + ".innerHTML = (Math.round((this.value * 100.0 / 255.0) * 100) / 100).toFixed(2);";
       http_content += "}";
       http_content += "</script>";
+
       http_content += "</div>";
 
     }
@@ -859,6 +863,30 @@ void init_webserver()
                     "}"
                     "setInterval(updateLightState, 10000);"
                     "updateLightState();"
+
+                    // show pwm values in webinterface
+                    "function updatePWMValues() {"
+                    "for (let i = 0; i < " + (String)LIGHTS_COUNT + "; i++) {"
+                    "const lightID = i + 1;"
+                    "const pwmElement = document.getElementById(`light${i}_pwm`);"
+                    "const pwmElementTxt = document.getElementById(`light${i}_pwm_txt`);"
+                    "if (pwmElement) {"
+                    "const url = `http://192.168.0.26/state?light=${lightID}`;"
+                    "fetch(url)"
+                    ".then(response => response.json())"
+                    ".then(data => {"
+                    "const pwmValue = data.curpwm - 640;"
+                    //"console.log('curpwm[' + i + '] = ' + data.curpwm);"
+                    "pwmElement.innerText = pwmValue.toString();"
+                    "pwmElement.value = pwmValue;"
+                    "pwmElementTxt.innerText = pwmValue.toString();"
+                    "})"
+                    ".catch(error => console.error(error));"
+                    "}"
+                    "}"
+                    "}"
+                    "updatePWMValues();"
+                    "setInterval(updatePWMValues, 5000);"
                     "</script>";
 
 #endif  // DISABLE_WEB_CONTROL
diff --git a/firmware/timing_control.ino b/firmware/timing_control.ino
index 7b598da..3049d8a 100644
--- a/firmware/timing_control.ino
+++ b/firmware/timing_control.ino
@@ -251,9 +251,9 @@ void tc_update_main()
   if (target_data_block > 0)
   {
     // hours as seconds from now on to the next enabled block
-    t_time  = ((uint16_t)tc_data[target_data_block].hh * 60 * 60) - ((uint16_t)timeClient.getHours() * 60 * 60);
+    t_time  = ((uint16_t)tc_data[target_data_block].hh * 60 * 60) - ((uint16_t)hour() * 60 * 60);
     // add the left over seconds to the next enabled block
-    t_time += ((uint16_t)tc_data[target_data_block].mm * 60) - ((uint16_t)timeClient.getMinutes() * 60);
+    t_time += ((uint16_t)tc_data[target_data_block].mm * 60) - ((uint16_t)minute() * 60);
 
   }
   transitiontime[0] = t_time;