diff -r 71e06f6d80fd -r 7639cfa6aec0 image/w/js/webui.js --- a/image/w/js/webui.js Sat May 04 11:41:16 2019 +0200 +++ b/image/w/js/webui.js Sat May 04 21:18:51 2019 +0200 @@ -8,43 +8,107 @@ Screen: -1, setScreen: function(s){ - console.log("Screen:"+s); - switch (s) { - case '0': - case '100': - case '101': - case '102': - case '103': - case '104': - case '105': - case '106': - case '107': - case '201': - $("#mltline").show(); - //$("#mlt01").hide(); - $("#midline").show(); - $("#hltline").show(); - $("#row_info").hide(); - console.log("this is 0"); - break; - case '108': $("#mltline").show(); // to boil - $("#midline").hide(); - $("#hltline").hide(); + Screen = parseInt(s,10); + console.log("Screen:"+Screen); + switch (Screen) { + case 0: $("#mltline").show(); + $("#mlt_table").show(); + $("#but00").text('Hand'); + $("#but20").text('Auto'); + $("#mlt00").show(); + $("#mlt20").show(); + $("#mlt01").hide(); + $("#mlt21").hide(); + $("#midline").show(); + $("#mid00").hide(); + $("#mid20").hide(); + $("#hltline").show(); + $("#hlt_table").show(); + $("#hlt00").hide(); + $("#hlt20").hide(); + $("#hlt01").show(); + $("#hlt21").show(); + $("#hlt01").css("background-color", "#e7e7e7"); + $("#hlt01").css("color", "black"); + $("#but04").text('Info'); + $("#but24").text('Tools'); + $("#row_info").hide(); + $("#prompt").hide(); break; - case '109': $("#mltline").show(); // boil - $("#midline").show(); - $("#hltline").hide(); - break; - case '2': $("#mltline").hide(); + case 2: $("#mltline").hide(); $("#midline").hide(); $("#hltline").hide(); $("#row_info").show(); - console.log("this is 2"); + $("#prompt").hide(); + break; +// case 21: Automaat show recipe and Stop / Start +// Prompt +// Prompt + case 100: + case 101: + case 102: + case 103: + case 104: + case 105: + case 106: + case 107: $("#mltline").show(); + $("#but00").text('+sp'); + $("#but20").text('-sp'); + $("#midline").show(); + $("#hltline").show(); + $("#hlt01").hide(); + $("#hlt21").hide(); + $("#row_info").hide(); + $("#prompt").hide(); break; + case 108: $("#mltline").show(); // to boil + $("#midline").hide(); + $("#hltline").hide(); + $("#prompt").hide(); + break; + case 109: $("#mltline").show(); // boil + $("#midline").show(); + $("#hltline").hide(); + $("#prompt").hide(); + break; + case 200: $("#mltline").hide(); + $("#midline").hide(); + $("#hltline").hide(); + $("#row_info").hide(); + $("#prompt").show(); + break; + case 201: $("#mltline").show(); + $("#mlt00").hide(); + $("#mlt20").hide(); + $("#mlt01").hide(); + $("#mlt21").hide(); + $("#mlt_table").hide(); + $("#but00").text('+sp'); + $("#but20").text('-sp'); + $("#but01").text('Pomp'); + $("#but21").text('Aan'); + $("#midline").show(); + $("#mid00").hide(); + $("#mid20").hide(); + $("#hltline").show(); + $("#hlt00").hide(); + $("#hlt20").hide(); + $("#hlt21").hide(); + $("#hlt_table").hide(); + $("#but03").text('+sp'); + $("#but23").text('-sp'); + $("#but04").text('Stop'); + $("#but24").text('Aan'); + $("#hlt01").css("background-color", "#575757"); + $("#hlt01").css("color", "white"); + $("#row_info").hide(); + $("#prompt").hide(); + break; default: $("#mltline").hide(); $("#midline").hide(); $("#hltline").hide(); - console.log("this is default"); + $("#prompt").hide(); + console.log("this is default screen "+Screen); break; } }, @@ -53,6 +117,15 @@ }, MLT_sp: function(s) { $("#mlt_sp").text(s); + if (Screen == 201) { + if (s != "") { + $("#mlt00").show(); + $("#mlt20").show(); + $("#mlt01").show(); + $("#mlt21").show(); + $("#mlt_table").show(); + } + } }, MLT_power: function(s) { $("#mlt_power").text(s); @@ -74,6 +147,14 @@ }, HLT_sp: function(s) { $("#hlt_sp").text(s); + if (Screen == 201) { + if (s != "") { + $("#hlt00").show(); + $("#hlt20").show(); + $("#hlt21").show(); + $("#hlt_table").show(); + } + } }, HLT_power: function(s) { $("#hlt_power").text(s); @@ -146,13 +227,25 @@ function sendTouch(x, y) { - websocket.send('{"touch":{"x":"'+x+'","y":"'+y+'"}}'); - console.log('Sent {"touch":{"x":"'+x+'","y":"'+y+'"}}'); + websocket.send('{"touch":{"x":'+x+',"y":'+y+'}}'); + console.log('Sent {"touch":{"x":'+x+',"y":'+y+'}}'); } /* Define keys in the screens and their actions. */ $("#ok_info").click( function() { sendTouch(160,220); }); +$("#mlt00").click( function() { sendTouch( 35, 46); }); +$("#mlt20").click( function() { sendTouch(285, 46); }); +$("#mlt01").click( function() { sendTouch( 35, 96); }); +$("#mlt21").click( function() { sendTouch(285, 96); }); +$("#mid00").click( function() { sendTouch( 35,140); }); +$("#mid20").click( function() { sendTouch(285,140); }); +$("#hlt00").click( function() { sendTouch( 35,170); }); +$("#hlt20").click( function() { sendTouch(285,170); }); +$("#hlt01").click( function() { sendTouch( 35,220); }); +$("#hlt21").click( function() { sendTouch(285,220); }); +$("#button_ja").click( function() { sendTouch( 80,120); }); +$("#button_nee").click( function() { sendTouch(240,120); }); websocket.onopen = function(evt) {