Fix update_gauge typo, Close #69

data/js/controls.js

@@ -47,7 +47,7 @@ const UI_STEP = 16;
 const UPDATE_STEP = 116;
 
 const UI_GAUGE = 17;
-const UPTDATE_GAUGE = 117;
+const UPDATE_GAUGE = 117;
 const UI_ACCEL = 18;
 const UPTDATE_ACCEL = 117;
 
@@ -171,9 +171,7 @@ function restoreGraphData(id) {
 }
 
 function restart() {
-  $(document)
+  $(document).add("*").off();
-    .add("*")
-    .off();
   $("#row").html("");
   websock.close();
   start();
@@ -186,7 +184,7 @@ function conStatusError() {
   $("#conStatus").html("Error / No Connection ↻");
   $("#conStatus").off();
   $("#conStatus").on({
-    click: restart
+    click: restart,
   });
 }
 
@@ -238,7 +236,7 @@ function start() {
         }
         data.controls.forEach(element => {
           var fauxEvent = {
-            data: JSON.stringify(element)
+            data: JSON.stringify(element),
           };
           handleEvent(fauxEvent);
         });
@@ -310,7 +308,7 @@ function start() {
           touchend: function (e) {
             e.preventDefault();
             buttonclick(data.id, false);
-          }
+          },
         });
         break;
 
@@ -417,7 +415,7 @@ function start() {
           touchend: function (e) {
             e.preventDefault();
             padclick(UP, data.id, false);
-          }
+          },
         });
         $("#pl" + data.id).on({
           touchstart: function (e) {
@@ -427,7 +425,7 @@ function start() {
           touchend: function (e) {
             e.preventDefault();
             padclick(LEFT, data.id, false);
-          }
+          },
         });
         $("#pr" + data.id).on({
           touchstart: function (e) {
@@ -437,7 +435,7 @@ function start() {
           touchend: function (e) {
             e.preventDefault();
             padclick(RIGHT, data.id, false);
-          }
+          },
         });
         $("#pb" + data.id).on({
           touchstart: function (e) {
@@ -447,7 +445,7 @@ function start() {
           touchend: function (e) {
             e.preventDefault();
             padclick(DOWN, data.id, false);
-          }
+          },
         });
         $("#pc" + data.id).on({
           touchstart: function (e) {
@@ -457,7 +455,7 @@ function start() {
           touchend: function (e) {
             e.preventDefault();
             padclick(CENTER, data.id, false);
-          }
+          },
         });
 
         break;
@@ -554,9 +552,7 @@ function start() {
         );
         $("#tabscontent").append("<div id='tab" + data.id + "'></div>");
 
-        tabs = $(".tabscontent")
+        tabs = $(".tabscontent").tabbedContent({ loop: true }).data("api");
-          .tabbedContent({ loop: true })
-          .data("api");
         // switch to tab...
         $("a")
           .filter(function () {
@@ -869,36 +865,24 @@ var rangeSlider = function(isDiscrete) {
 
   slider.each(function () {
     value.each(function () {
-      var value = $(this)
+      var value = $(this).prev().attr("value");
-        .prev()
-        .attr("value");
       $(this).html(value);
     });
 
     if (!isDiscrete) {
       range.on({
         input: function () {
-          sliderchange(
+          sliderchange($(this).attr("id").replace(/^\D+/g, ""));
-            $(this)
+        },
-              .attr("id")
-              .replace(/^\D+/g, "")
-          );
-        }
       });
     } else {
       range.on({
         input: function () {
-          $(this)
+          $(this).next().html(this.value);
-            .next()
-            .html(this.value);
         },
         change: function () {
-          sliderchange(
+          sliderchange($(this).attr("id").replace(/^\D+/g, ""));
-            $(this)
+        },
-              .attr("id")
-              .replace(/^\D+/g, "")
-          );
-        }
       });
     }
   });

data/js/controls.min.js

@@ -1,15 +1,168 @@
-const UI_INITIAL_GUI=200;const UPDATE_OFFSET=100;const UI_TITEL=0;const UI_PAD=1;const UPDATE_PAD=101;const UI_CPAD=2;const UPDATE_CPAD=102;const UI_BUTTON=3;const UPDATE_BUTTON=103;const UI_LABEL=4;const UPDATE_LABEL=104;const UI_SWITCHER=5;const UPDATE_SWITCHER=105;const UI_SLIDER=6;const UPDATE_SLIDER=106;const UI_NUMBER=7;const UPDATE_NUMBER=107;const UI_TEXT_INPUT=8;const UPDATE_TEXT_INPUT=108;const UI_GRAPH=9;const ADD_GRAPH_POINT=10;const CLEAR_GRAPH=109;const UI_TAB=11;const UPDATE_TAB=111;const UI_SELECT=12;const UPDATE_SELECT=112;const UI_OPTION=13;const UPDATE_OPTION=113;const UI_MIN=14;const UPDATE_MIN=114;const UI_MAX=15;const UPDATE_MAX=115;const UI_STEP=16;const UPDATE_STEP=116;const UI_GAUGE=17;const UPTDATE_GAUGE=117;const UI_ACCEL=18;const UPTDATE_ACCEL=117;const UP=0;const DOWN=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_DARK=7;const C_NONE=255;var graphData=new Array();var hasAccel=false;var sliderContinuous=false;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"dark";default:return"";}}
+const UI_INITIAL_GUI = 200;
-var websock;var websockConnected=false;function requestOrientationPermission(){}
+const UPDATE_OFFSET = 100;
-function saveGraphData(){localStorage.setItem("espuigraphs",JSON.stringify(graphData));}
+const UI_TITEL = 0;
-function restoreGraphData(id){var savedData=localStorage.getItem("espuigraphs",graphData);if(savedData!=null){savedData=JSON.parse(savedData);return savedData[id];}
+const UI_PAD = 1;
-return[];}
+const UPDATE_PAD = 101;
-function restart(){$(document).add("*").off();$("#row").html("");websock.close();start();}
+const UI_CPAD = 2;
-function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection ↻");$("#conStatus").off();$("#conStatus").on({click:restart});}
+const UPDATE_CPAD = 102;
-function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}
+const UI_BUTTON = 3;
-function start(){document.addEventListener("visibilitychange",handleVisibilityChange,false);if(window.location.port!=""||window.location.port!=80||window.location.port!=443){websock=new WebSocket("ws://"+window.location.hostname+":"+window.location.port+"/ws");}else{websock=new WebSocket("ws://"+window.location.hostname+"/ws");}
+const UPDATE_BUTTON = 103;
-websock.onopen=function(evt){console.log("websock open");$("#conStatus").addClass("color-green");$("#conStatus").text("Connected");websockConnected=true;};websock.onclose=function(evt){console.log("websock close");conStatusError();};websock.onerror=function(evt){console.log(evt);conStatusError();};var handleEvent=function(evt){var data=JSON.parse(evt.data);var e=document.body;var center="";switch(data.type){case UI_INITIAL_GUI:if(data.sliderContinuous){sliderContinuous=data.sliderContinuous;}
+const UI_LABEL = 4;
-data.controls.forEach(element=>{var fauxEvent={data:JSON.stringify(element)};handleEvent(fauxEvent);});break;case UI_TITEL:document.title=data.label;$("#mainHeader").html(data.label);break;case UI_LABEL:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+const UPDATE_LABEL = 104;
-parent.append("<div id='id"+
+const UI_SWITCHER = 5;
+const UPDATE_SWITCHER = 105;
+const UI_SLIDER = 6;
+const UPDATE_SLIDER = 106;
+const UI_NUMBER = 7;
+const UPDATE_NUMBER = 107;
+const UI_TEXT_INPUT = 8;
+const UPDATE_TEXT_INPUT = 108;
+const UI_GRAPH = 9;
+const ADD_GRAPH_POINT = 10;
+const CLEAR_GRAPH = 109;
+const UI_TAB = 11;
+const UPDATE_TAB = 111;
+const UI_SELECT = 12;
+const UPDATE_SELECT = 112;
+const UI_OPTION = 13;
+const UPDATE_OPTION = 113;
+const UI_MIN = 14;
+const UPDATE_MIN = 114;
+const UI_MAX = 15;
+const UPDATE_MAX = 115;
+const UI_STEP = 16;
+const UPDATE_STEP = 116;
+const UI_GAUGE = 17;
+const UPDATE_GAUGE = 117;
+const UI_ACCEL = 18;
+const UPTDATE_ACCEL = 117;
+const UP = 0;
+const DOWN = 1;
+const LEFT = 2;
+const RIGHT = 3;
+const CENTER = 4;
+const C_TURQUOISE = 0;
+const C_EMERALD = 1;
+const C_PETERRIVER = 2;
+const C_WETASPHALT = 3;
+const C_SUNFLOWER = 4;
+const C_CARROT = 5;
+const C_ALIZARIN = 6;
+const C_DARK = 7;
+const C_NONE = 255;
+var graphData = new Array();
+var hasAccel = false;
+var sliderContinuous = false;
+function colorClass(colorId) {
+  colorId = Number(colorId);
+  switch (colorId) {
+    case C_TURQUOISE:
+      return "turquoise";
+    case C_EMERALD:
+      return "emerald";
+    case C_PETERRIVER:
+      return "peterriver";
+    case C_WETASPHALT:
+      return "wetasphalt";
+    case C_SUNFLOWER:
+      return "sunflower";
+    case C_CARROT:
+      return "carrot";
+    case C_ALIZARIN:
+      return "alizarin";
+    case C_NONE:
+      return "dark";
+    default:
+      return "";
+  }
+}
+var websock;
+var websockConnected = false;
+function requestOrientationPermission() {}
+function saveGraphData() {
+  localStorage.setItem("espuigraphs", JSON.stringify(graphData));
+}
+function restoreGraphData(id) {
+  var savedData = localStorage.getItem("espuigraphs", graphData);
+  if (savedData != null) {
+    savedData = JSON.parse(savedData);
+    return savedData[id];
+  }
+  return [];
+}
+function restart() {
+  $(document).add("*").off();
+  $("#row").html("");
+  websock.close();
+  start();
+}
+function conStatusError() {
+  websockConnected = false;
+  $("#conStatus").removeClass("color-green");
+  $("#conStatus").addClass("color-red");
+  $("#conStatus").html("Error / No Connection &#8635;");
+  $("#conStatus").off();
+  $("#conStatus").on({ click: restart });
+}
+function handleVisibilityChange() {
+  if (!websockConnected && !document.hidden) {
+    restart();
+  }
+}
+function start() {
+  document.addEventListener("visibilitychange", handleVisibilityChange, false);
+  if (
+    window.location.port != "" ||
+    window.location.port != 80 ||
+    window.location.port != 443
+  ) {
+    websock = new WebSocket(
+      "ws://" + window.location.hostname + ":" + window.location.port + "/ws"
+    );
+  } else {
+    websock = new WebSocket("ws://" + window.location.hostname + "/ws");
+  }
+  websock.onopen = function (evt) {
+    console.log("websock open");
+    $("#conStatus").addClass("color-green");
+    $("#conStatus").text("Connected");
+    websockConnected = true;
+  };
+  websock.onclose = function (evt) {
+    console.log("websock close");
+    conStatusError();
+  };
+  websock.onerror = function (evt) {
+    console.log(evt);
+    conStatusError();
+  };
+  var handleEvent = function (evt) {
+    var data = JSON.parse(evt.data);
+    var e = document.body;
+    var center = "";
+    switch (data.type) {
+      case UI_INITIAL_GUI:
+        if (data.sliderContinuous) {
+          sliderContinuous = data.sliderContinuous;
+        }
+        data.controls.forEach(element => {
+          var fauxEvent = { data: JSON.stringify(element) };
+          handleEvent(fauxEvent);
+        });
+        break;
+      case UI_TITEL:
+        document.title = data.label;
+        $("#mainHeader").html(data.label);
+        break;
+      case UI_LABEL:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -22,8 +175,18 @@ data.id+
             "' class='label label-wrap'>" +
             data.value +
             "</span>" +
-"</div>");break;case UI_BUTTON:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-parent.append("<div id='id"+
+        );
+        break;
+      case UI_BUTTON:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='one columns card tcenter " +
             colorClass(data.color) +
@@ -41,8 +204,28 @@ data.id+
             data.id +
             ", false)'>" +
             data.value +
-"</button></div>");$("#btn"+data.id).on({touchstart:function(e){e.preventDefault();buttonclick(data.id,true);},touchend:function(e){e.preventDefault();buttonclick(data.id,false);}});break;case UI_SWITCHER:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</button></div>"
-parent.append("<div id='id"+
+        );
+        $("#btn" + data.id).on({
+          touchstart: function (e) {
+            e.preventDefault();
+            buttonclick(data.id, true);
+          },
+          touchend: function (e) {
+            e.preventDefault();
+            buttonclick(data.id, false);
+          },
+        });
+        break;
+      case UI_SWITCHER:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='one columns card tcenter " +
             colorClass(data.color) +
@@ -63,8 +246,20 @@ data.id+
             (data.value == "1" ? "checked" : "") +
             "/></div>" +
             "</label>" +
-"</div>");switcher(data.id,data.value);break;case UI_CPAD:case UI_PAD:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-parent.append("<div id='id"+
+        );
+        switcher(data.id, data.value);
+        break;
+      case UI_CPAD:
+      case UI_PAD:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -103,16 +298,78 @@ data.id+
             data.id +
             "'>▲</a></li>" +
             "</ul>" +
-(data.type==UI_CPAD?"<a class='confirm' onmousedown='padclick(CENTER,"+
+            (data.type == UI_CPAD
+              ? "<a class='confirm' onmousedown='padclick(CENTER," +
                 data.id +
                 ", true)' onmouseup='padclick(CENTER, " +
                 data.id +
                 ", false)' id='pc" +
                 data.id +
-"'>OK</a>":"")+
+                "'>OK</a>"
+              : "") +
             "</nav>" +
-"</div>");$("#pf"+data.id).on({touchstart:function(e){e.preventDefault();padclick(UP,data.id,true);},touchend:function(e){e.preventDefault();padclick(UP,data.id,false);}});$("#pl"+data.id).on({touchstart:function(e){e.preventDefault();padclick(LEFT,data.id,true);},touchend:function(e){e.preventDefault();padclick(LEFT,data.id,false);}});$("#pr"+data.id).on({touchstart:function(e){e.preventDefault();padclick(RIGHT,data.id,true);},touchend:function(e){e.preventDefault();padclick(RIGHT,data.id,false);}});$("#pb"+data.id).on({touchstart:function(e){e.preventDefault();padclick(DOWN,data.id,true);},touchend:function(e){e.preventDefault();padclick(DOWN,data.id,false);}});$("#pc"+data.id).on({touchstart:function(e){e.preventDefault();padclick(CENTER,data.id,true);},touchend:function(e){e.preventDefault();padclick(CENTER,data.id,false);}});break;case UI_SLIDER:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-parent.append("<div id='id"+
+        );
+        $("#pf" + data.id).on({
+          touchstart: function (e) {
+            e.preventDefault();
+            padclick(UP, data.id, true);
+          },
+          touchend: function (e) {
+            e.preventDefault();
+            padclick(UP, data.id, false);
+          },
+        });
+        $("#pl" + data.id).on({
+          touchstart: function (e) {
+            e.preventDefault();
+            padclick(LEFT, data.id, true);
+          },
+          touchend: function (e) {
+            e.preventDefault();
+            padclick(LEFT, data.id, false);
+          },
+        });
+        $("#pr" + data.id).on({
+          touchstart: function (e) {
+            e.preventDefault();
+            padclick(RIGHT, data.id, true);
+          },
+          touchend: function (e) {
+            e.preventDefault();
+            padclick(RIGHT, data.id, false);
+          },
+        });
+        $("#pb" + data.id).on({
+          touchstart: function (e) {
+            e.preventDefault();
+            padclick(DOWN, data.id, true);
+          },
+          touchend: function (e) {
+            e.preventDefault();
+            padclick(DOWN, data.id, false);
+          },
+        });
+        $("#pc" + data.id).on({
+          touchstart: function (e) {
+            e.preventDefault();
+            padclick(CENTER, data.id, true);
+          },
+          touchend: function (e) {
+            e.preventDefault();
+            padclick(CENTER, data.id, false);
+          },
+        });
+        break;
+      case UI_SLIDER:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter card-slider " +
             colorClass(data.color) +
@@ -130,8 +387,19 @@ data.value+
             data.value +
             "</span>" +
             "</div>" +
-"</div>");rangeSlider(!sliderContinuous);break;case UI_NUMBER:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-parent.append("<div id='id"+
+        );
+        rangeSlider(!sliderContinuous);
+        break;
+      case UI_NUMBER:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -146,8 +414,18 @@ data.value+
             "' onchange='numberchange(" +
             data.id +
             ")' />" +
-"</div>");break;case UI_TEXT_INPUT:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-parent.append("<div id='id"+
+        );
+        break;
+      case UI_TEXT_INPUT:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -162,9 +440,36 @@ data.value+
             "' onchange='textchange(" +
             data.id +
             ")' />" +
-"</div>");break;case UI_TAB:$("#tabsnav").append("<li><a href='#tab"+data.id+"'>"+data.value+"</a></li>");$("#tabscontent").append("<div id='tab"+data.id+"'></div>");tabs=$(".tabscontent").tabbedContent({loop:true}).data("api");$("a").filter(function(){return $(this).attr("href")==="#click-to-switch";}).on("click",function(e){var tab=prompt("Tab to switch to (number or id)?");if(!tabs.switchTab(tab)){alert("That tab does not exist :\\");}
+            "</div>"
-e.preventDefault();});break;case UI_SELECT:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+        );
-parent.append("<div id='id"+
+        break;
+      case UI_TAB:
+        $("#tabsnav").append(
+          "<li><a href='#tab" + data.id + "'>" + data.value + "</a></li>"
+        );
+        $("#tabscontent").append("<div id='tab" + data.id + "'></div>");
+        tabs = $(".tabscontent").tabbedContent({ loop: true }).data("api");
+        $("a")
+          .filter(function () {
+            return $(this).attr("href") === "#click-to-switch";
+          })
+          .on("click", function (e) {
+            var tab = prompt("Tab to switch to (number or id)?");
+            if (!tabs.switchTab(tab)) {
+              alert("That tab does not exist :\\");
+            }
+            e.preventDefault();
+          });
+        break;
+      case UI_SELECT:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -177,7 +482,14 @@ data.id+
             "' onchange='selectchange(" +
             data.id +
             ")' />" +
-"</div>");break;case UI_OPTION:if(data.parentControl){var parent=$("#select"+data.parentControl);parent.append("<option id='option"+
+            "</div>"
+        );
+        break;
+      case UI_OPTION:
+        if (data.parentControl) {
+          var parent = $("#select" + data.parentControl);
+          parent.append(
+            "<option id='option" +
               data.id +
               "' value='" +
               data.value +
@@ -185,12 +497,43 @@ data.value+
               data.selected +
               ">" +
               data.label +
-"</option>");}
+              "</option>"
-break;case UI_MIN:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){parent.attr("min",data.value);}}
+          );
-break;case UI_MAX:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){parent.attr("max",data.value);}}
+        }
-break;case UI_STEP:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){parent.attr("step",data.value);}}
+        break;
-break;case UI_GRAPH:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+      case UI_MIN:
-parent.append("<div id='id"+
+        if (data.parentControl) {
+          var parent = $("#id" + data.parentControl + " input");
+          if (parent.size()) {
+            parent.attr("min", data.value);
+          }
+        }
+        break;
+      case UI_MAX:
+        if (data.parentControl) {
+          var parent = $("#id" + data.parentControl + " input");
+          if (parent.size()) {
+            parent.attr("max", data.value);
+          }
+        }
+        break;
+      case UI_STEP:
+        if (data.parentControl) {
+          var parent = $("#id" + data.parentControl + " input");
+          if (parent.size()) {
+            parent.attr("step", data.value);
+          }
+        }
+        break;
+      case UI_GRAPH:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -205,8 +548,31 @@ data.id+
             data.label +
             "</figcaption>" +
             "</figure>" +
-"</div>");graphData[data.id]=restoreGraphData(data.id);renderGraphSvg(graphData[data.id],"graph"+data.id);break;case ADD_GRAPH_POINT:var ts=Math.round(new Date().getTime()/1000);graphData[data.id].push({x:ts,y:data.value});saveGraphData();renderGraphSvg(graphData[data.id],"graph"+data.id);break;case CLEAR_GRAPH:graphData[data.id]=[];saveGraphData();renderGraphSvg(graphData[data.id],"graph"+data.id);break;case UI_GAUGE:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-parent.append("<div id='id"+
+        );
+        graphData[data.id] = restoreGraphData(data.id);
+        renderGraphSvg(graphData[data.id], "graph" + data.id);
+        break;
+      case ADD_GRAPH_POINT:
+        var ts = Math.round(new Date().getTime() / 1000);
+        graphData[data.id].push({ x: ts, y: data.value });
+        saveGraphData();
+        renderGraphSvg(graphData[data.id], "graph" + data.id);
+        break;
+      case CLEAR_GRAPH:
+        graphData[data.id] = [];
+        saveGraphData();
+        renderGraphSvg(graphData[data.id], "graph" + data.id);
+        break;
+      case UI_GAUGE:
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -221,8 +587,20 @@ data.value+
             "' onchange='numberchange(" +
             data.id +
             ")' />" +
-"</div>");break;case UI_ACCEL:if(hasAccel)break;var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
+            "</div>"
-hasAccel=true;parent.append("<div id='id"+
+        );
+        break;
+      case UI_ACCEL:
+        if (hasAccel) break;
+        var parent;
+        if (data.parentControl) {
+          parent = $("#tab" + data.parentControl);
+        } else {
+          parent = $("#row");
+        }
+        hasAccel = true;
+        parent.append(
+          "<div id='id" +
             data.id +
             "' class='two columns card tcenter " +
             colorClass(data.color) +
@@ -237,13 +615,143 @@ data.id+
             "'></div><pre class='accelerometeroutput" +
             data.id +
             "'></pre>" +
-"</div>");requestOrientationPermission();break;case UPDATE_LABEL:$("#l"+data.id).html(data.value);break;case UPDATE_SWITCHER:switcher(data.id,data.value=="0"?0:1);break;case UPDATE_SLIDER:slider_move($("#sl"+data.id),data.value,"100",false);break;case UPDATE_NUMBER:$("#num"+data.id).val(data.value);break;case UPDATE_TEXT_INPUT:$("#text"+data.id).val(data.value);break;case UPDATE_SELECT:$("#select"+data.id).val(data.value);break;case UPDATE_BUTTON:case UPDATE_PAD:case UPDATE_CPAD:break;case UPDATE_GAUGE:$("#gauge"+data.id).val(data.value);break;case UPDATE_ACCEL:break;default:console.error("Unknown type or event");break;}
+            "</div>"
-if(data.type>=UPDATE_OFFSET&&data.type<UI_INITIAL_GUI){var element=$("#id"+data.id);if(data.type==UPDATE_SLIDER){element.removeClass("slider-turquoise slider-emerald slider-peterriver slider-wetasphalt slider-sunflower slider-carrot slider-alizarin");element.addClass("slider-"+colorClass(data.color));}else{element.removeClass("turquoise emerald peterriver wetasphalt sunflower carrot alizarin");element.addClass(colorClass(data.color));}}};websock.onmessage=handleEvent;}
+        );
-function sliderchange(number){var val=$("#sl"+number).val();websock.send("slvalue:"+val+":"+number);}
+        requestOrientationPermission();
-function numberchange(number){var val=$("#num"+number).val();websock.send("nvalue:"+val+":"+number);}
+        break;
-function textchange(number){var val=$("#text"+number).val();websock.send("tvalue:"+val+":"+number);}
+      case UPDATE_LABEL:
-function selectchange(number){var val=$("#select"+number).val();websock.send("svalue:"+val+":"+number);}
+        $("#l" + data.id).html(data.value);
-function buttonclick(number,isdown){if(isdown)websock.send("bdown:"+number);else websock.send("bup:"+number);}
+        break;
-function padclick(type,number,isdown){switch(type){case CENTER:if(isdown)websock.send("pcdown:"+number);else websock.send("pcup:"+number);break;case UP:if(isdown)websock.send("pfdown:"+number);else websock.send("pfup:"+number);break;case DOWN:if(isdown)websock.send("pbdown:"+number);else websock.send("pbup:"+number);break;case LEFT:if(isdown)websock.send("pldown:"+number);else websock.send("plup:"+number);break;case RIGHT:if(isdown)websock.send("prdown:"+number);else websock.send("prup:"+number);break;}}
+      case UPDATE_SWITCHER:
-function switcher(number,state){if(state==null){if($("#s"+number).is(":checked")){websock.send("sactive:"+number);$("#sl"+number).addClass("checked");}else{websock.send("sinactive:"+number);$("#sl"+number).removeClass("checked");}}else if(state==1){$("#sl"+number).addClass("checked");$("#sl"+number).prop("checked",true);}else if(state==0){$("#sl"+number).removeClass("checked");$("#sl"+number).prop("checked",false);}}
+        switcher(data.id, data.value == "0" ? 0 : 1);
-var rangeSlider=function(isDiscrete){var slider=$(".range-slider"),range=$(".range-slider__range"),value=$(".range-slider__value");slider.each(function(){value.each(function(){var value=$(this).prev().attr("value");$(this).html(value);});if(!isDiscrete){range.on({input:function(){sliderchange($(this).attr("id").replace(/^\D+/g,""));}});}else{range.on({input:function(){$(this).next().html(this.value);},change:function(){sliderchange($(this).attr("id").replace(/^\D+/g,""));}});}});};
+        break;
+      case UPDATE_SLIDER:
+        slider_move($("#sl" + data.id), data.value, "100", false);
+        break;
+      case UPDATE_NUMBER:
+        $("#num" + data.id).val(data.value);
+        break;
+      case UPDATE_TEXT_INPUT:
+        $("#text" + data.id).val(data.value);
+        break;
+      case UPDATE_SELECT:
+        $("#select" + data.id).val(data.value);
+        break;
+      case UPDATE_BUTTON:
+      case UPDATE_PAD:
+      case UPDATE_CPAD:
+        break;
+      case UPDATE_GAUGE:
+        $("#gauge" + data.id).val(data.value);
+        break;
+      case UPDATE_ACCEL:
+        break;
+      default:
+        console.error("Unknown type or event");
+        break;
+    }
+    if (data.type >= UPDATE_OFFSET && data.type < UI_INITIAL_GUI) {
+      var element = $("#id" + data.id);
+      if (data.type == UPDATE_SLIDER) {
+        element.removeClass(
+          "slider-turquoise slider-emerald slider-peterriver slider-wetasphalt slider-sunflower slider-carrot slider-alizarin"
+        );
+        element.addClass("slider-" + colorClass(data.color));
+      } else {
+        element.removeClass(
+          "turquoise emerald peterriver wetasphalt sunflower carrot alizarin"
+        );
+        element.addClass(colorClass(data.color));
+      }
+    }
+  };
+  websock.onmessage = handleEvent;
+}
+function sliderchange(number) {
+  var val = $("#sl" + number).val();
+  websock.send("slvalue:" + val + ":" + number);
+}
+function numberchange(number) {
+  var val = $("#num" + number).val();
+  websock.send("nvalue:" + val + ":" + number);
+}
+function textchange(number) {
+  var val = $("#text" + number).val();
+  websock.send("tvalue:" + val + ":" + number);
+}
+function selectchange(number) {
+  var val = $("#select" + number).val();
+  websock.send("svalue:" + val + ":" + number);
+}
+function buttonclick(number, isdown) {
+  if (isdown) websock.send("bdown:" + number);
+  else websock.send("bup:" + number);
+}
+function padclick(type, number, isdown) {
+  switch (type) {
+    case CENTER:
+      if (isdown) websock.send("pcdown:" + number);
+      else websock.send("pcup:" + number);
+      break;
+    case UP:
+      if (isdown) websock.send("pfdown:" + number);
+      else websock.send("pfup:" + number);
+      break;
+    case DOWN:
+      if (isdown) websock.send("pbdown:" + number);
+      else websock.send("pbup:" + number);
+      break;
+    case LEFT:
+      if (isdown) websock.send("pldown:" + number);
+      else websock.send("plup:" + number);
+      break;
+    case RIGHT:
+      if (isdown) websock.send("prdown:" + number);
+      else websock.send("prup:" + number);
+      break;
+  }
+}
+function switcher(number, state) {
+  if (state == null) {
+    if ($("#s" + number).is(":checked")) {
+      websock.send("sactive:" + number);
+      $("#sl" + number).addClass("checked");
+    } else {
+      websock.send("sinactive:" + number);
+      $("#sl" + number).removeClass("checked");
+    }
+  } else if (state == 1) {
+    $("#sl" + number).addClass("checked");
+    $("#sl" + number).prop("checked", true);
+  } else if (state == 0) {
+    $("#sl" + number).removeClass("checked");
+    $("#sl" + number).prop("checked", false);
+  }
+}
+var rangeSlider = function (isDiscrete) {
+  var slider = $(".range-slider"),
+    range = $(".range-slider__range"),
+    value = $(".range-slider__value");
+  slider.each(function () {
+    value.each(function () {
+      var value = $(this).prev().attr("value");
+      $(this).html(value);
+    });
+    if (!isDiscrete) {
+      range.on({
+        input: function () {
+          sliderchange($(this).attr("id").replace(/^\D+/g, ""));
+        },
+      });
+    } else {
+      range.on({
+        input: function () {
+          $(this).next().html(this.value);
+        },
+        change: function () {
+          sliderchange($(this).attr("id").replace(/^\D+/g, ""));
+        },
+      });
+    }
+  });
+};

src/dataControlsJS.h

@@ -1,5 +1,5 @@
 const char JS_CONTROLS[] PROGMEM = R"=====(
-const UI_INITIAL_GUI=200;const UPDATE_OFFSET=100;const UI_TITEL=0;const UI_PAD=1;const UPDATE_PAD=101;const UI_CPAD=2;const UPDATE_CPAD=102;const UI_BUTTON=3;const UPDATE_BUTTON=103;const UI_LABEL=4;const UPDATE_LABEL=104;const UI_SWITCHER=5;const UPDATE_SWITCHER=105;const UI_SLIDER=6;const UPDATE_SLIDER=106;const UI_NUMBER=7;const UPDATE_NUMBER=107;const UI_TEXT_INPUT=8;const UPDATE_TEXT_INPUT=108;const UI_GRAPH=9;const ADD_GRAPH_POINT=10;const CLEAR_GRAPH=109;const UI_TAB=11;const UPDATE_TAB=111;const UI_SELECT=12;const UPDATE_SELECT=112;const UI_OPTION=13;const UPDATE_OPTION=113;const UI_MIN=14;const UPDATE_MIN=114;const UI_MAX=15;const UPDATE_MAX=115;const UI_STEP=16;const UPDATE_STEP=116;const UI_GAUGE=17;const UPTDATE_GAUGE=117;const UI_ACCEL=18;const UPTDATE_ACCEL=117;const UP=0;const DOWN=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_DARK=7;const C_NONE=255;var graphData=new Array();var hasAccel=false;var sliderContinuous=false;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"dark";default:return"";}}
+const UI_INITIAL_GUI=200;const UPDATE_OFFSET=100;const UI_TITEL=0;const UI_PAD=1;const UPDATE_PAD=101;const UI_CPAD=2;const UPDATE_CPAD=102;const UI_BUTTON=3;const UPDATE_BUTTON=103;const UI_LABEL=4;const UPDATE_LABEL=104;const UI_SWITCHER=5;const UPDATE_SWITCHER=105;const UI_SLIDER=6;const UPDATE_SLIDER=106;const UI_NUMBER=7;const UPDATE_NUMBER=107;const UI_TEXT_INPUT=8;const UPDATE_TEXT_INPUT=108;const UI_GRAPH=9;const ADD_GRAPH_POINT=10;const CLEAR_GRAPH=109;const UI_TAB=11;const UPDATE_TAB=111;const UI_SELECT=12;const UPDATE_SELECT=112;const UI_OPTION=13;const UPDATE_OPTION=113;const UI_MIN=14;const UPDATE_MIN=114;const UI_MAX=15;const UPDATE_MAX=115;const UI_STEP=16;const UPDATE_STEP=116;const UI_GAUGE=17;const UPDATE_GAUGE=117;const UI_ACCEL=18;const UPTDATE_ACCEL=117;const UP=0;const DOWN=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_DARK=7;const C_NONE=255;var graphData=new Array();var hasAccel=false;var sliderContinuous=false;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"dark";default:return"";}}
 var websock;var websockConnected=false;function requestOrientationPermission(){}
 function saveGraphData(){localStorage.setItem("espuigraphs",JSON.stringify(graphData));}
 function restoreGraphData(id){var savedData=localStorage.getItem("espuigraphs",graphData);if(savedData!=null){savedData=JSON.parse(savedData);return savedData[id];}