From 2c136eb34c00da863a84f175e860c62619a4e1f1 Mon Sep 17 00:00:00 2001
From: rljonesau <ray@mrjones.id.au>
Date: Mon, 10 Dec 2018 21:26:29 +1100
Subject: [PATCH] Ray fiddles to get temp slider to talk to heater, and show
 desired temp value.

---
 Arduino/BTCDieselHeater/Screen2.cpp  |  2 +-
 Arduino/BTCDieselHeater/mainpage.cpp | 45 +++++++++++++++++-----------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Arduino/BTCDieselHeater/Screen2.cpp b/Arduino/BTCDieselHeater/Screen2.cpp
index 90d1b95..4a7bf34 100644
--- a/Arduino/BTCDieselHeater/Screen2.cpp
+++ b/Arduino/BTCDieselHeater/Screen2.cpp
@@ -97,7 +97,7 @@ CScreen2::show()
     if(tDelta < 0) {
       // Show current heat demand setting
       if(getHeaterInfo().isThermostat()) {
-        sprintf(msg, "Setpoint = %d`C", getHeaterInfo().getTemperature_Desired());
+        sprintf(msg, "Setpoint = %.0f`C", getHeaterInfo().getTemperature_Desired());
       }
       else {
         sprintf(msg, "Setpoint = %.1fHz", getHeaterInfo().getPump_Fixed());
diff --git a/Arduino/BTCDieselHeater/mainpage.cpp b/Arduino/BTCDieselHeater/mainpage.cpp
index bdc9090..87436ba 100644
--- a/Arduino/BTCDieselHeater/mainpage.cpp
+++ b/Arduino/BTCDieselHeater/mainpage.cpp
@@ -17,17 +17,18 @@ const char* MAIN_PAGE PROGMEM = R"=====(
           console.log("JSON desired temp", heater.DesiredTemp);
           document.getElementById("TempCurrent").innerHTML = heater.CurrentTemp;
           if (heater.RunState == 0){
-                  document.getElementById("myonoffswitch").checked = false;
-                  document.getElementById("myonoffswitch").style = "block";
-              } else if(heater.RunState === 7){
-                  document.getElementById("myonoffswitch").checked = false;
-                  document.getElementById("myonoffswitch").style = "none";
-              } else {
-                  document.getElementById("myonoffswitch").checked = true;
-                  document.getElementById("myonoffswitch").style = "block";               
-              }
-          document.getElementById("slide").value = heater.DesiredTemp;
+            document.getElementById("myonoffswitch").checked = false;
+            document.getElementById("myonoffswitch").style = "block";
+          } else if(heater.RunState >= 7){
+            document.getElementById("myonoffswitch").checked = false;
+            document.getElementById("myonoffswitch").style = "none";
+          } else {
+            document.getElementById("myonoffswitch").checked = true;
+            document.getElementById("myonoffswitch").style = "block";               
           }
+          document.getElementById("slide").value = heater.DesiredTemp;
+          document.getElementById("sliderAmount").innerHTML = heater.DesiredTemp;
+        }
       }
 
 function funcNavLinks() {
@@ -88,13 +89,21 @@ function OnOffCheck(){
   }
 }
 
-var slide = document.getElementById("slide");
-    sliderDiv = document.getElementById("sliderAmount");
-
-slide.oninput = function() {
-    sliderDiv.innerHTML = this.value;
-    Socket.send("TempDesired," + document.getElementById("slide").value);
+function onSlide(newVal) {
+  Socket.send("[CMD]degC" + newVal);
+  console.log("Sending desired temp", newVal);
+  document.getElementById("sliderAmount").innerHTML = newVal;
 }
+
+// var slide = document.getElementById("slide");
+//     sliderDiv = document.getElementById("sliderAmount");
+
+// slide.oninput = function() {
+//     sliderDiv.innerHTML = this.value;
+// //    Socket.send("TempDesired," + document.getElementById("slide").value);
+//     Socket.send("[CMD]degC" + document.getElementById("slide").value);
+//     console.log("Sending desired temp", document.getElementById("slide").value, this.value);
+// }
       </script>
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -286,10 +295,10 @@ MainPage {
 <div>
 <h2>Temperature Control</h2>
 </div>
-<input id="slide" type="range" min="8" max="35" step="1" value="22">
+<input type="range" id="slide" min="8" max="35" step="1" value="22" oninput="onSlide(this.value)" onchange="onSlide(this.value)">
 <div>
 <b>Desired Temp: </b>
-<Span id="sliderAmount"></Span>
+<span id="sliderAmount"></span>
 <div>
 </div>
 <b>Current Temp: </b><span id="TempCurrent">