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

Merge branch 'JCWebPretty' of gitlab.com:mrjones.id.au/bluetoothheater into JCWebPretty

Browse source 
Conflicts resolved:
Arduino/BTCDieselHeater/mainpage.cpp
This commit is contained in:
rljonesau 2018-12-09 20:19:51 +11:00
parent 40305d6224 374d299cf1
commit 1c9727b675
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Arduino/BTCDieselHeater/mainpage.cpp
View file

@ -10,29 +10,26 @@ const char* MAIN_PAGE PROGMEM = R"=====(
Socket = new WebSocket('ws://' + window.location.hostname + ':81/'); Socket = new WebSocket('ws://' + window.location.hostname + ':81/');
Socket.onmessage = function(event){ Socket.onmessage = function(event){
document.getElementById("TempCurrent").innerHTML = event.data; console.log("msg rec", event.data);
// console.log("msg rec", evt.data); var msgArray = event.data.split(","); // split message by delimiter into a string array
// var rawMsg = evt.data; console.log("msgArray", msgArray[0]);
// var msgArray = evt.data.split(","); // split message by delimiter into a string array console.log("msgArray", msgArray[1]);
// console.log("msgArray", msgArray[0]); console.log("msgArray", msgArray[2]);
// console.log("msgArray", msgArray[1]); console.log("msgArray", msgArray[3]);
// console.log("msgArray", msgArray[2]); var indicator = msgArray[1]; // the first element in the message array is the ID of the object to update
// console.log("msgArray", msgArray[3]); console.log("indiactor", indicator);
// var indicator = msgArray[1]; // the first element in the message array is the ID of the object to update if (SensorRead) // if an object by the name of the message exists, update its value or its attributes
// console.log("indiactor", indicator); {
// if (SensorRead) // if an object by the name of the message exists, update its value or its attributes switch (msgArray[1])
// { {
// switch (msgArray[1]) case "CurrentTemp":
// { document.getElementById("TempCurrent").innerHTML = event.data;
// case "CurrentTemp": break;
// document.getElementById("TempCurrent").innerHTML = event.data; }
// break; }
// }
// }
} }
} }
</script> </script>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">