Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ray fiddles to get temp slider to talk to heater, and show desired temp value.

Browse source
This commit is contained in:
rljonesau 2018-12-10 21:26:29 +11:00
parent ff3fcc89f4
commit 2c136eb34c
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino/BTCDieselHeater/Screen2.cpp
View file

@ -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());

45
Arduino/BTCDieselHeater/mainpage.cpp
View file

@ -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">