mirror of
https://github.com/s00500/ESPUI.git
synced 2024-11-22 09:10:54 +00:00
Add remControl() method for remove contols
This commit is contained in:
ruslan.teliuk@aspose.com
parent
1b7af71d29
commit
81366af7f1
GPG Key ID:
CCC6AA87CC8DF425
4
data/js/controls.js
vendored
4
data/js/controls.js
vendored
@ -1,4 +1,5 @@
|
|||||||
const UI_INITIAL_GUI = 200;
|
const UI_INITIAL_GUI = 200;
|
||||||
|
const UI_RELOAD = 201;
|
||||||
const UPDATE_OFFSET = 100;
|
const UPDATE_OFFSET = 100;
|
||||||
|
|
||||||
const UI_TITEL = 0;
|
const UI_TITEL = 0;
|
||||||
@ -241,6 +242,9 @@ function start() {
|
|||||||
handleEvent(fauxEvent);
|
handleEvent(fauxEvent);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
case UI_RELOAD:
|
||||||
|
window.location.reload();
|
||||||
|
break;
|
||||||
|
|
||||||
case UI_TITEL:
|
case UI_TITEL:
|
||||||
document.title = data.label;
|
document.title = data.label;
|
||||||
|
|||||||
608
data/js/controls.min.js
vendored
608
data/js/controls.min.js
vendored
@ -1,168 +1,15 @@
|
|||||||
const UI_INITIAL_GUI = 200;
|
const UI_INITIAL_GUI=200;const UI_RELOAD=201;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"";}}
|
||||||
const UPDATE_OFFSET = 100;
|
var websock;var websockConnected=false;function requestOrientationPermission(){}
|
||||||
const UI_TITEL = 0;
|
function saveGraphData(){localStorage.setItem("espuigraphs",JSON.stringify(graphData));}
|
||||||
const UI_PAD = 1;
|
function restoreGraphData(id){var savedData=localStorage.getItem("espuigraphs",graphData);if(savedData!=null){savedData=JSON.parse(savedData);return savedData[id];}
|
||||||
const UPDATE_PAD = 101;
|
return[];}
|
||||||
const UI_CPAD = 2;
|
function restart(){$(document).add("*").off();$("#row").html("");websock.close();start();}
|
||||||
const UPDATE_CPAD = 102;
|
function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection ↻");$("#conStatus").off();$("#conStatus").on({click:restart,});}
|
||||||
const UI_BUTTON = 3;
|
function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}
|
||||||
const UPDATE_BUTTON = 103;
|
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 UI_LABEL = 4;
|
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 UPDATE_LABEL = 104;
|
data.controls.forEach(element=>{var fauxEvent={data:JSON.stringify(element),};handleEvent(fauxEvent);});break;case UI_RELOAD:window.location.reload();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 UI_SWITCHER = 5;
|
parent.append("<div id='id"+
|
||||||
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 ↻");
|
|
||||||
$("#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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -175,18 +22,8 @@ function start() {
|
|||||||
"' class='label label-wrap'>"+
|
"' class='label label-wrap'>"+
|
||||||
data.value+
|
data.value+
|
||||||
"</span>"+
|
"</span>"+
|
||||||
"</div>"
|
"</div>");break;case UI_BUTTON:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='one columns card tcenter "+
|
"' class='one columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -204,28 +41,8 @@ function start() {
|
|||||||
data.id+
|
data.id+
|
||||||
", false)'>"+
|
", false)'>"+
|
||||||
data.value+
|
data.value+
|
||||||
"</button></div>"
|
"</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");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='one columns card tcenter "+
|
"' class='one columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -246,20 +63,8 @@ function start() {
|
|||||||
(data.value=="1"?"checked":"")+
|
(data.value=="1"?"checked":"")+
|
||||||
"/></div>"+
|
"/></div>"+
|
||||||
"</label>"+
|
"</label>"+
|
||||||
"</div>"
|
"</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");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -298,78 +103,16 @@ function start() {
|
|||||||
data.id+
|
data.id+
|
||||||
"'>▲</a></li>"+
|
"'>▲</a></li>"+
|
||||||
"</ul>"+
|
"</ul>"+
|
||||||
(data.type == UI_CPAD
|
(data.type==UI_CPAD?"<a class='confirm' onmousedown='padclick(CENTER,"+
|
||||||
? "<a class='confirm' onmousedown='padclick(CENTER," +
|
|
||||||
data.id+
|
data.id+
|
||||||
", true)' onmouseup='padclick(CENTER, "+
|
", true)' onmouseup='padclick(CENTER, "+
|
||||||
data.id+
|
data.id+
|
||||||
", false)' id='pc"+
|
", false)' id='pc"+
|
||||||
data.id+
|
data.id+
|
||||||
"'>OK</a>"
|
"'>OK</a>":"")+
|
||||||
: "") +
|
|
||||||
"</nav>"+
|
"</nav>"+
|
||||||
"</div>"
|
"</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");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='two columns card tcenter card-slider "+
|
"' class='two columns card tcenter card-slider "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -387,19 +130,8 @@ function start() {
|
|||||||
data.value+
|
data.value+
|
||||||
"</span>"+
|
"</span>"+
|
||||||
"</div>"+
|
"</div>"+
|
||||||
"</div>"
|
"</div>");rangeSlider(!sliderContinuous);break;case UI_NUMBER:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -414,18 +146,8 @@ function start() {
|
|||||||
"' onchange='numberchange("+
|
"' onchange='numberchange("+
|
||||||
data.id+
|
data.id+
|
||||||
")' />"+
|
")' />"+
|
||||||
"</div>"
|
"</div>");break;case UI_TEXT_INPUT:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -440,36 +162,9 @@ function start() {
|
|||||||
"' onchange='textchange("+
|
"' onchange='textchange("+
|
||||||
data.id+
|
data.id+
|
||||||
")' />"+
|
")' />"+
|
||||||
"</div>"
|
"</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 :\\");}
|
||||||
);
|
e.preventDefault();});break;case UI_SELECT:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
|
||||||
break;
|
parent.append("<div id='id"+
|
||||||
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -482,14 +177,7 @@ function start() {
|
|||||||
"' onchange='selectchange("+
|
"' onchange='selectchange("+
|
||||||
data.id+
|
data.id+
|
||||||
")' />"+
|
")' />"+
|
||||||
"</div>"
|
"</div>");break;case UI_OPTION:if(data.parentControl){var parent=$("#select"+data.parentControl);parent.append("<option id='option"+
|
||||||
);
|
|
||||||
break;
|
|
||||||
case UI_OPTION:
|
|
||||||
if (data.parentControl) {
|
|
||||||
var parent = $("#select" + data.parentControl);
|
|
||||||
parent.append(
|
|
||||||
"<option id='option" +
|
|
||||||
data.id+
|
data.id+
|
||||||
"' value='"+
|
"' value='"+
|
||||||
data.value+
|
data.value+
|
||||||
@ -497,43 +185,12 @@ function start() {
|
|||||||
data.selected+
|
data.selected+
|
||||||
">"+
|
">"+
|
||||||
data.label+
|
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;
|
break;case UI_STEP:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){parent.attr("step",data.value);}}
|
||||||
case UI_MIN:
|
break;case UI_GRAPH:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
|
||||||
if (data.parentControl) {
|
parent.append("<div id='id"+
|
||||||
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -548,31 +205,8 @@ function start() {
|
|||||||
data.label+
|
data.label+
|
||||||
"</figcaption>"+
|
"</figcaption>"+
|
||||||
"</figure>"+
|
"</figure>"+
|
||||||
"</div>"
|
"</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");}
|
||||||
);
|
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -587,20 +221,8 @@ function start() {
|
|||||||
"' onchange='numberchange("+
|
"' onchange='numberchange("+
|
||||||
data.id+
|
data.id+
|
||||||
")' />"+
|
")' />"+
|
||||||
"</div>"
|
"</div>");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"+
|
||||||
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+
|
data.id+
|
||||||
"' class='two columns card tcenter "+
|
"' class='two columns card tcenter "+
|
||||||
colorClass(data.color)+
|
colorClass(data.color)+
|
||||||
@ -615,143 +237,13 @@ function start() {
|
|||||||
"'></div><pre class='accelerometeroutput"+
|
"'></div><pre class='accelerometeroutput"+
|
||||||
data.id+
|
data.id+
|
||||||
"'></pre>"+
|
"'></pre>"+
|
||||||
"</div>"
|
"</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;}
|
||||||
);
|
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;}
|
||||||
requestOrientationPermission();
|
function sliderchange(number){var val=$("#sl"+number).val();websock.send("slvalue:"+val+":"+number);}
|
||||||
break;
|
function numberchange(number){var val=$("#num"+number).val();websock.send("nvalue:"+val+":"+number);}
|
||||||
case UPDATE_LABEL:
|
function textchange(number){var val=$("#text"+number).val();websock.send("tvalue:"+val+":"+number);}
|
||||||
$("#l" + data.id).html(data.value);
|
function selectchange(number){var val=$("#select"+number).val();websock.send("svalue:"+val+":"+number);}
|
||||||
break;
|
function buttonclick(number,isdown){if(isdown)websock.send("bdown:"+number);else websock.send("bup:"+number);}
|
||||||
case UPDATE_SWITCHER:
|
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;}}
|
||||||
switcher(data.id, data.value == "0" ? 0 : 1);
|
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);}}
|
||||||
break;
|
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,""));},});}});};
|
||||||
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, ""));
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -411,6 +411,52 @@ uint16_t ESPUIClass::addControl(ControlType type, const char *label, String valu
|
|||||||
return control->id;
|
return control->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ESPUIClass::remControl(uint16_t id, bool reload_ui)
|
||||||
|
{
|
||||||
|
if(nullptr == this->controls) return false;
|
||||||
|
|
||||||
|
Control * it = this->controls;
|
||||||
|
|
||||||
|
if(id == it->id) {
|
||||||
|
this->controls = it->next;
|
||||||
|
delete it;
|
||||||
|
if(reload_ui) {
|
||||||
|
reload();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Control * it_next = it->next;
|
||||||
|
while(nullptr != it_next && id != it_next->id) {
|
||||||
|
it = it_next;
|
||||||
|
it_next = it_next->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(nullptr != it_next) {
|
||||||
|
it->next = it_next->next;
|
||||||
|
delete it_next;
|
||||||
|
if(reload_ui) {
|
||||||
|
reload();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESPUIClass::reload()
|
||||||
|
{
|
||||||
|
int tryId = 0;
|
||||||
|
|
||||||
|
for (int count = 0; count < this->ws->count();) {
|
||||||
|
if (this->ws->hasClient(tryId)) {
|
||||||
|
ESPUI.jsonReload(this->ws->client(tryId));
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
tryId++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
uint16_t ESPUIClass::label(const char *label, ControlColor color, String value) { return addControl(ControlType::Label, label, value, color); }
|
uint16_t ESPUIClass::label(const char *label, ControlColor color, String value) { return addControl(ControlType::Label, label, value, color); }
|
||||||
|
|
||||||
uint16_t ESPUIClass::graph(const char *label, ControlColor color) { return addControl(ControlType::Graph, label, "", color); }
|
uint16_t ESPUIClass::graph(const char *label, ControlColor color) { return addControl(ControlType::Graph, label, "", color); }
|
||||||
@ -669,6 +715,22 @@ void ESPUIClass::jsonDom(AsyncWebSocketClient *client) {
|
|||||||
client->text(json);
|
client->text(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ESPUIClass::jsonReload(AsyncWebSocketClient *client)
|
||||||
|
{
|
||||||
|
String json;
|
||||||
|
DynamicJsonDocument document(jsonUpdateDocumentSize);
|
||||||
|
JsonObject root = document.to<JsonObject>();
|
||||||
|
|
||||||
|
root["type"] = (int)UI_RELOAD;
|
||||||
|
serializeJson(document, json);
|
||||||
|
|
||||||
|
if (this->verbosity >= Verbosity::VerboseJSON) {
|
||||||
|
Serial.println(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
this->ws->textAll(json);
|
||||||
|
}
|
||||||
|
|
||||||
void ESPUIClass::beginSPIFFS(const char *_title, const char *username, const char *password) {
|
void ESPUIClass::beginSPIFFS(const char *_title, const char *username, const char *password) {
|
||||||
ui_title = _title;
|
ui_title = _title;
|
||||||
this->basicAuthUsername = username;
|
this->basicAuthUsername = username;
|
||||||
|
|||||||
@ -77,10 +77,12 @@ enum ControlType : uint8_t
|
|||||||
UpdateGauge,
|
UpdateGauge,
|
||||||
UpdateAccel,
|
UpdateAccel,
|
||||||
|
|
||||||
InitialGui = 200
|
InitialGui = 200,
|
||||||
|
Reload = 201
|
||||||
};
|
};
|
||||||
|
|
||||||
#define UI_INITIAL_GUI ControlType::InitialGui
|
#define UI_INITIAL_GUI ControlType::InitialGui
|
||||||
|
#define UI_RELOAD ControlType::Reload
|
||||||
|
|
||||||
#define UI_TITLE ControlType::Title
|
#define UI_TITLE ControlType::Title
|
||||||
#define UI_LABEL ControlType::Label
|
#define UI_LABEL ControlType::Label
|
||||||
@ -206,6 +208,7 @@ public:
|
|||||||
|
|
||||||
uint16_t addControl(ControlType type, const char *label, String value = String(""), ControlColor color = ControlColor::Turquoise,
|
uint16_t addControl(ControlType type, const char *label, String value = String(""), ControlColor color = ControlColor::Turquoise,
|
||||||
uint16_t parentControl = Control::noParent, void (*callback)(Control *, int) = nullptr);
|
uint16_t parentControl = Control::noParent, void (*callback)(Control *, int) = nullptr);
|
||||||
|
bool remControl(uint16_t id, bool reload_ui = true);
|
||||||
|
|
||||||
// create Elements
|
// create Elements
|
||||||
uint16_t button(const char *label, void (*callback)(Control *, int), ControlColor color, String value = ""); // Create Event Button
|
uint16_t button(const char *label, void (*callback)(Control *, int), ControlColor color, String value = ""); // Create Event Button
|
||||||
@ -239,6 +242,8 @@ public:
|
|||||||
void updateControl(uint16_t id, int clientId = -1);
|
void updateControl(uint16_t id, int clientId = -1);
|
||||||
void updateControl(Control *control, int clientId = -1);
|
void updateControl(Control *control, int clientId = -1);
|
||||||
|
|
||||||
|
void reload();
|
||||||
|
|
||||||
void print(uint16_t id, String value);
|
void print(uint16_t id, String value);
|
||||||
void updateLabel(uint16_t id, String value);
|
void updateLabel(uint16_t id, String value);
|
||||||
void updateSwitcher(uint16_t id, bool nValue, int clientId = -1);
|
void updateSwitcher(uint16_t id, bool nValue, int clientId = -1);
|
||||||
@ -255,6 +260,7 @@ public:
|
|||||||
const char *ui_title = "ESPUI"; // Store UI Title and Header Name
|
const char *ui_title = "ESPUI"; // Store UI Title and Header Name
|
||||||
Control *controls = nullptr;
|
Control *controls = nullptr;
|
||||||
void jsonDom(AsyncWebSocketClient *client);
|
void jsonDom(AsyncWebSocketClient *client);
|
||||||
|
void jsonReload(AsyncWebSocketClient *client);
|
||||||
|
|
||||||
Verbosity verbosity;
|
Verbosity verbosity;
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -16,4 +16,4 @@ function renderGraphSvg(dataArray,renderId){var figure=document.getElementById(r
|
|||||||
var svg=document.createElementNS("http://www.w3.org/2000/svg","svg");svg.setAttribute("viewBox","0 0 640 440");svg.setAttribute("preserveAspectRatio","xMidYMid meet");lineGraph(svg,(function(data,min,max){var i=0;return{hasNext:function(){return i<data.length;},next:function(){return data[i++].x;},reset:function(){i=0;},min:function(){return min;},max:function(){return max;}};})(dataArray,Math.min.apply(Math,dataArray.map(function(o){return o.x;})),Math.max.apply(Math,dataArray.map(function(o){return o.x;}))),(function(data,min,max){var i=0;return{hasNext:function(){return i<data.length;},next:function(){return data[i++].y;},reset:function(){i=0;},min:function(){return min;},max:function(){return max;}};})(dataArray,Math.min.apply(Math,dataArray.map(function(o){return o.y;})),Math.max.apply(Math,dataArray.map(function(o){return o.y;}))));figure.appendChild(svg);}
|
var svg=document.createElementNS("http://www.w3.org/2000/svg","svg");svg.setAttribute("viewBox","0 0 640 440");svg.setAttribute("preserveAspectRatio","xMidYMid meet");lineGraph(svg,(function(data,min,max){var i=0;return{hasNext:function(){return i<data.length;},next:function(){return data[i++].x;},reset:function(){i=0;},min:function(){return min;},max:function(){return max;}};})(dataArray,Math.min.apply(Math,dataArray.map(function(o){return o.x;})),Math.max.apply(Math,dataArray.map(function(o){return o.x;}))),(function(data,min,max){var i=0;return{hasNext:function(){return i<data.length;},next:function(){return data[i++].y;},reset:function(){i=0;},min:function(){return min;},max:function(){return max;}};})(dataArray,Math.min.apply(Math,dataArray.map(function(o){return o.y;})),Math.max.apply(Math,dataArray.map(function(o){return o.y;}))));figure.appendChild(svg);}
|
||||||
)=====";
|
)=====";
|
||||||
|
|
||||||
const uint8_t JS_GRAPH_GZIP[1245] PROGMEM = { 31,139,8,0,243,90,6,94,2,255,205,87,95,111,219,54,16,127,247,167,112,4,44,16,107,89,86,27,175,3,170,240,33,109,135,174,64,18,20,77,48,96,24,246,192,73,180,76,76,150,4,138,182,69,184,254,238,59,146,162,36,219,82,134,58,45,186,135,56,226,253,231,241,119,119,228,98,157,69,130,229,217,56,101,25,253,192,73,177,116,11,194,105,38,188,234,38,138,104,89,230,220,147,246,11,237,162,60,43,197,120,203,98,177,196,175,95,5,161,89,47,41,75,150,2,207,27,66,178,22,130,114,60,183,235,130,85,52,45,63,81,254,200,162,127,240,85,16,46,172,219,108,189,162,156,69,143,156,100,229,34,231,176,112,99,34,200,29,203,60,253,159,84,94,81,169,21,252,146,10,237,54,132,143,21,227,61,91,44,112,45,49,181,26,69,165,201,90,116,106,212,20,235,51,1,87,216,48,103,86,217,139,242,156,199,134,101,105,51,35,19,114,42,214,60,219,137,252,157,146,121,99,131,213,145,161,157,225,234,133,245,140,94,52,126,38,218,111,184,247,68,254,30,104,173,178,246,215,104,235,149,137,17,189,104,67,153,212,6,195,253,62,220,143,154,44,145,138,149,159,105,22,83,14,249,201,57,131,243,81,210,153,39,108,222,76,102,148,220,7,158,175,11,28,231,17,100,54,19,126,196,41,17,244,215,148,170,213,253,131,235,44,133,40,222,204,102,219,237,214,223,94,249,57,79,102,175,130,32,152,149,155,196,241,156,196,65,161,53,244,137,192,33,159,105,167,0,93,48,213,196,227,151,84,220,8,193,217,223,107,65,93,39,74,73,89,58,94,103,39,19,103,170,132,107,247,42,45,216,128,168,94,147,10,107,212,77,59,84,169,164,12,246,14,201,32,92,175,217,162,155,46,140,177,83,57,104,103,119,119,20,85,12,129,223,141,157,137,242,62,113,224,67,154,143,91,77,35,85,67,67,33,164,220,85,190,24,214,167,205,174,177,18,8,217,100,130,118,224,211,101,83,125,178,63,29,2,31,227,224,242,146,93,96,173,100,78,76,208,74,156,155,100,165,11,9,83,255,124,150,101,148,255,246,120,119,139,239,212,198,22,41,64,202,109,208,225,50,84,203,29,238,184,114,60,214,203,144,142,103,54,218,195,139,129,233,188,164,171,131,243,37,69,1,248,124,183,100,105,236,42,29,4,8,222,195,214,233,121,201,110,104,80,243,157,100,75,157,228,107,44,117,210,219,100,203,167,146,45,219,100,3,253,155,148,71,194,89,124,11,13,243,153,229,241,195,15,191,26,58,99,57,4,140,24,180,156,169,255,179,62,254,33,112,248,87,154,109,179,244,95,39,207,142,107,76,185,182,71,117,128,44,107,113,136,111,144,55,128,74,171,161,161,57,234,23,178,96,69,161,153,130,39,76,107,161,237,205,106,112,54,189,185,103,104,122,85,51,220,60,249,120,216,175,211,231,99,168,241,232,115,10,121,118,81,40,79,40,80,36,23,173,220,146,148,247,144,39,23,125,249,114,33,79,169,118,68,193,30,85,136,202,205,3,156,93,150,96,115,106,205,22,218,205,250,153,209,52,53,219,10,200,99,129,112,11,137,164,110,79,44,151,151,189,161,180,222,39,216,128,100,244,100,0,35,21,193,232,201,16,246,163,244,20,147,245,64,114,74,184,140,80,53,133,210,94,220,182,225,244,2,36,213,208,236,96,163,200,89,38,206,5,135,86,126,118,187,106,173,12,108,89,223,99,180,84,249,157,225,244,181,135,175,39,191,186,68,253,78,210,53,197,199,167,109,110,6,184,139,135,70,216,48,101,171,44,251,148,37,238,34,229,72,57,98,60,74,207,174,78,163,13,9,53,31,199,185,87,189,119,136,167,102,239,0,143,131,229,121,61,131,190,235,240,232,100,18,138,122,6,69,213,97,118,51,53,48,87,6,47,21,195,67,229,229,147,35,101,234,255,162,249,29,56,119,43,207,100,107,144,93,223,72,70,61,53,219,106,40,129,22,76,184,231,101,210,34,112,197,50,23,121,157,53,169,96,29,76,204,181,211,235,94,85,161,130,158,52,42,143,140,202,35,163,7,23,220,198,133,153,114,77,107,209,73,111,172,250,230,237,113,44,163,242,127,42,243,21,243,203,175,95,68,135,102,52,169,78,253,183,48,212,233,159,92,155,211,207,210,135,77,162,159,92,55,156,19,233,25,198,199,216,52,137,5,75,214,188,83,170,9,21,117,37,188,149,31,99,183,17,174,199,143,17,87,157,70,67,224,62,143,105,169,250,77,77,231,116,149,111,168,65,71,77,130,86,41,52,1,213,83,17,202,232,220,218,83,191,40,132,223,35,152,111,24,221,190,205,85,37,4,227,96,252,122,30,140,231,243,160,87,178,80,141,152,111,232,77,89,208,72,232,119,35,104,193,117,42,254,3,254,198,43,74,69,61,193,204,131,30,44,120,238,193,35,214,3,168,121,43,251,158,102,56,176,79,222,186,251,182,175,86,219,190,199,236,90,41,250,41,205,18,177,132,231,109,214,47,166,132,254,132,155,249,95,126,5,66,122,98,116,165,148,171,189,242,222,163,186,210,207,102,136,170,143,7,247,126,245,36,70,29,12,232,142,4,74,170,156,83,233,170,165,215,112,161,120,138,118,207,121,99,40,87,113,33,84,43,147,234,28,101,244,3,178,41,255,167,217,148,207,201,166,86,134,43,89,93,101,221,182,12,152,133,90,251,23,198,24,146,161,158,18,0,0 };
|
const uint8_t JS_GRAPH_GZIP[1245] PROGMEM = { 31,139,8,0,19,56,231,94,2,255,205,87,95,111,219,54,16,127,247,167,112,4,44,16,107,89,86,27,175,3,170,240,33,109,135,174,64,18,20,77,48,96,24,246,192,73,180,76,76,150,4,138,182,69,184,254,238,59,146,162,36,219,82,134,58,45,186,135,56,226,253,231,241,119,119,228,98,157,69,130,229,217,56,101,25,253,192,73,177,116,11,194,105,38,188,234,38,138,104,89,230,220,147,246,11,237,162,60,43,197,120,203,98,177,196,175,95,5,161,89,47,41,75,150,2,207,27,66,178,22,130,114,60,183,235,130,85,52,45,63,81,254,200,162,127,240,85,16,46,172,219,108,189,162,156,69,143,156,100,229,34,231,176,112,99,34,200,29,203,60,253,159,84,94,81,169,21,252,146,10,237,54,132,143,21,227,61,91,44,112,45,49,181,26,69,165,201,90,116,106,212,20,235,51,1,87,216,48,103,86,217,139,242,156,199,134,101,105,51,35,19,114,42,214,60,219,137,252,157,146,121,99,131,213,145,161,157,225,234,133,245,140,94,52,126,38,218,111,184,247,68,254,30,104,173,178,246,215,104,235,149,137,17,189,104,67,153,212,6,195,253,62,220,143,154,44,145,138,149,159,105,22,83,14,249,201,57,131,243,81,210,153,39,108,222,76,102,148,220,7,158,175,11,28,231,17,100,54,19,126,196,41,17,244,215,148,170,213,253,131,235,44,133,40,222,204,102,219,237,214,223,94,249,57,79,102,175,130,32,152,149,155,196,241,156,196,65,161,53,244,137,192,33,159,105,167,0,93,48,213,196,227,151,84,220,8,193,217,223,107,65,93,39,74,73,89,58,94,103,39,19,103,170,132,107,247,42,45,216,128,168,94,147,10,107,212,77,59,84,169,164,12,246,14,201,32,92,175,217,162,155,46,140,177,83,57,104,103,119,119,20,85,12,129,223,141,157,137,242,62,113,224,67,154,143,91,77,35,85,67,67,33,164,220,85,190,24,214,167,205,174,177,18,8,217,100,130,118,224,211,101,83,125,178,63,29,2,31,227,224,242,146,93,96,173,100,78,76,208,74,156,155,100,165,11,9,83,255,124,150,101,148,255,246,120,119,139,239,212,198,22,41,64,202,109,208,225,50,84,203,29,238,184,114,60,214,203,144,142,103,54,218,195,139,129,233,188,164,171,131,243,37,69,1,248,124,183,100,105,236,42,29,4,8,222,195,214,233,121,201,110,104,80,243,157,100,75,157,228,107,44,117,210,219,100,203,167,146,45,219,100,3,253,155,148,71,194,89,124,11,13,243,153,229,241,195,15,191,26,58,99,57,4,140,24,180,156,169,255,179,62,254,33,112,248,87,154,109,179,244,95,39,207,142,107,76,185,182,71,117,128,44,107,113,136,111,144,55,128,74,171,161,161,57,234,23,178,96,69,161,153,130,39,76,107,161,237,205,106,112,54,189,185,103,104,122,85,51,220,60,249,120,216,175,211,231,99,168,241,232,115,10,121,118,81,40,79,40,80,36,23,173,220,146,148,247,144,39,23,125,249,114,33,79,169,118,68,193,30,85,136,202,205,3,156,93,150,96,115,106,205,22,218,205,250,153,209,52,53,219,10,200,99,129,112,11,137,164,110,79,44,151,151,189,161,180,222,39,216,128,100,244,100,0,35,21,193,232,201,16,246,163,244,20,147,245,64,114,74,184,140,80,53,133,210,94,220,182,225,244,2,36,213,208,236,96,163,200,89,38,206,5,135,86,126,118,187,106,173,12,108,89,223,99,180,84,249,157,225,244,181,135,175,39,191,186,68,253,78,210,53,197,199,167,109,110,6,184,139,135,70,216,48,101,171,44,251,148,37,238,34,229,72,57,98,60,74,207,174,78,163,13,9,53,31,199,185,87,189,119,136,167,102,239,0,143,131,229,121,61,131,190,235,240,232,100,18,138,122,6,69,213,97,118,51,53,48,87,6,47,21,195,67,229,229,147,35,101,234,255,162,249,29,56,119,43,207,100,107,144,93,223,72,70,61,53,219,106,40,129,22,76,184,231,101,210,34,112,197,50,23,121,157,53,169,96,29,76,204,181,211,235,94,85,161,130,158,52,42,143,140,202,35,163,7,23,220,198,133,153,114,77,107,209,73,111,172,250,230,237,113,44,163,242,127,42,243,21,243,203,175,95,68,135,102,52,169,78,253,183,48,212,233,159,92,155,211,207,210,135,77,162,159,92,55,156,19,233,25,198,199,216,52,137,5,75,214,188,83,170,9,21,117,37,188,149,31,99,183,17,174,199,143,17,87,157,70,67,224,62,143,105,169,250,77,77,231,116,149,111,168,65,71,77,130,86,41,52,1,213,83,17,202,232,220,218,83,191,40,132,223,35,152,111,24,221,190,205,85,37,4,227,96,252,122,30,140,231,243,160,87,178,80,141,152,111,232,77,89,208,72,232,119,35,104,193,117,42,254,3,254,198,43,74,69,61,193,204,131,30,44,120,238,193,35,214,3,168,121,43,251,158,102,56,176,79,222,186,251,182,175,86,219,190,199,236,90,41,250,41,205,18,177,132,231,109,214,47,166,132,254,132,155,249,95,126,5,66,122,98,116,165,148,171,189,242,222,163,186,210,207,102,136,170,143,7,247,126,245,36,70,29,12,232,142,4,74,170,156,83,233,170,165,215,112,161,120,138,118,207,121,99,40,87,113,33,84,43,147,234,28,101,244,3,178,41,255,167,217,148,207,201,166,86,134,43,89,93,101,221,182,12,152,133,90,251,23,198,24,146,161,158,18,0,0 };
|
||||||
|
|||||||
@ -2,4 +2,4 @@ const char HTML_INDEX[] PROGMEM = R"=====(
|
|||||||
<!DOCTYPE html><html> <head><meta charset=utf-8><title>Control</title><meta name=viewport content="width=device-width, initial-scale=1"><link rel="shortcut icon" href=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAPFBMVEUAAACA1VWR21qQ2liR3FqR3FqS3VuR3VqR3VuR3VqO21mS21uS3FqS3FqS21uJ2GKQ21qR3FuR3FoAAAB/3Gu7AAAAEnRSTlMABoA3kPBwz8i5Kzioxg4NVcU3uEJHAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB+EFEhcEM+HpYwQAAABYSURBVBjThY/JDsAgCESt4lpX/v9jLQZJ6qF9t3khAyj1xXUKbQ4BVowDwqOYgExkkW4iY6lPaF06RqM8YItOuRbMaz6xjbsusDAW/drplBg47jP696cXE8bPA1eUDeK2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTA1LTE4VDIzOjA0OjUxKzAyOjAwxE59ewAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0wNS0xOFQyMzowNDo1MSswMjowMLUTxccAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC><link rel=stylesheet href=/css/normalize.css><link rel=stylesheet href=/css/style.css><script src=/js/zepto.min.js></script><script src=/js/slider.js></script><script src=/js/graph.js></script><script src=/js/controls.js></script><script src=/js/tabbedcontent.js></script></head> <body onload=javascript:start();> <div> <h4> <div id=mainHeader>Control</div> <span id=conStatus class=label>Offline</span> </h4> </div> <hr> <div class=container> <div id=row class="row u-full-width"></div> <ul id=tabsnav class="navigation navigation-tabs u-full-width"></ul> <div id=tabscontent class="tabscontent u-full-width"></div> </div> </body> </html>
|
<!DOCTYPE html><html> <head><meta charset=utf-8><title>Control</title><meta name=viewport content="width=device-width, initial-scale=1"><link rel="shortcut icon" href=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAPFBMVEUAAACA1VWR21qQ2liR3FqR3FqS3VuR3VqR3VuR3VqO21mS21uS3FqS3FqS21uJ2GKQ21qR3FuR3FoAAAB/3Gu7AAAAEnRSTlMABoA3kPBwz8i5Kzioxg4NVcU3uEJHAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB+EFEhcEM+HpYwQAAABYSURBVBjThY/JDsAgCESt4lpX/v9jLQZJ6qF9t3khAyj1xXUKbQ4BVowDwqOYgExkkW4iY6lPaF06RqM8YItOuRbMaz6xjbsusDAW/drplBg47jP696cXE8bPA1eUDeK2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTA1LTE4VDIzOjA0OjUxKzAyOjAwxE59ewAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0wNS0xOFQyMzowNDo1MSswMjowMLUTxccAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC><link rel=stylesheet href=/css/normalize.css><link rel=stylesheet href=/css/style.css><script src=/js/zepto.min.js></script><script src=/js/slider.js></script><script src=/js/graph.js></script><script src=/js/controls.js></script><script src=/js/tabbedcontent.js></script></head> <body onload=javascript:start();> <div> <h4> <div id=mainHeader>Control</div> <span id=conStatus class=label>Offline</span> </h4> </div> <hr> <div class=container> <div id=row class="row u-full-width"></div> <ul id=tabsnav class="navigation navigation-tabs u-full-width"></ul> <div id=tabscontent class="tabscontent u-full-width"></div> </div> </body> </html>
|
||||||
)=====";
|
)=====";
|
||||||
|
|
||||||
const uint8_t HTML_INDEX_GZIP[916] PROGMEM = { 31,139,8,0,193,22,6,94,2,255,133,148,235,115,162,58,20,192,255,21,174,159,238,157,221,22,95,181,237,174,56,19,20,108,85,68,64,240,241,45,64,42,193,240,40,9,162,254,245,155,128,157,238,157,189,211,235,12,201,201,57,191,243,200,17,206,240,175,137,57,94,239,86,154,20,177,132,140,134,245,42,13,35,4,195,209,48,65,12,74,65,4,11,138,152,82,178,183,187,167,209,144,97,70,208,104,156,165,172,200,200,80,110,142,13,153,194,4,41,39,140,170,60,43,152,20,112,4,165,76,105,85,56,100,145,18,162,19,14,208,93,125,248,46,225,20,51,12,201,29,13,32,65,74,167,53,26,18,156,30,165,2,17,165,69,35,238,30,148,76,194,60,68,75,138,10,244,166,132,144,193,31,56,129,7,36,231,233,225,167,15,41,26,244,191,99,79,53,237,170,61,159,30,50,192,127,75,199,141,52,247,192,37,85,28,129,53,6,134,216,179,133,245,188,22,130,58,13,213,181,171,1,176,152,174,198,242,57,82,45,174,28,171,177,163,207,150,220,58,152,113,223,195,43,87,174,68,188,49,24,240,53,20,158,102,46,162,14,18,190,232,189,113,80,18,237,73,196,91,233,170,225,105,110,205,118,188,141,221,237,188,91,93,130,237,158,254,46,30,167,231,149,118,207,227,114,179,155,221,78,226,116,59,165,83,219,248,195,229,89,119,58,183,184,31,231,57,163,139,188,170,220,155,150,143,34,190,150,218,206,154,24,64,205,64,239,184,82,171,235,19,126,152,95,113,118,62,244,151,94,224,246,74,109,246,82,223,116,51,91,216,109,11,96,224,134,78,173,32,149,163,147,171,232,73,167,2,96,18,6,170,133,177,143,106,91,216,118,220,142,174,126,211,116,45,10,52,227,219,75,190,171,68,35,212,157,227,218,170,167,198,235,104,39,207,38,20,28,198,154,195,250,36,223,202,167,231,120,97,237,103,131,119,253,153,245,142,17,184,196,157,243,214,157,251,86,95,245,178,106,82,189,155,187,131,118,62,30,55,125,188,27,144,21,212,219,3,251,221,120,218,189,50,179,180,125,3,94,7,231,216,167,37,157,128,141,28,22,57,81,15,253,199,120,53,120,30,4,91,237,201,95,129,14,114,39,104,222,21,213,205,182,182,190,121,177,143,187,173,77,204,100,121,217,111,244,246,222,2,23,99,162,245,22,107,208,89,172,181,190,55,121,189,154,49,104,155,177,123,158,95,193,133,203,213,89,123,120,70,149,248,43,188,182,237,69,237,253,148,251,173,115,230,119,237,124,159,30,129,17,131,243,242,210,174,150,78,251,108,234,214,197,184,102,213,114,146,117,12,135,86,70,156,85,198,194,93,159,131,64,148,176,15,53,111,23,234,203,211,62,181,123,187,237,140,128,151,176,23,94,30,114,63,97,215,93,87,175,246,206,195,41,72,144,255,24,87,176,110,169,70,244,245,209,41,173,100,60,254,237,77,166,236,66,16,141,16,98,205,75,44,7,148,202,105,86,36,144,224,43,186,231,167,255,131,107,101,3,210,160,192,57,147,104,17,40,114,76,229,43,202,89,118,159,224,244,62,230,70,185,177,254,65,81,130,67,84,124,137,28,10,152,71,95,18,65,243,173,211,47,33,6,125,31,133,183,111,254,223,164,92,15,19,105,232,103,225,69,202,82,146,193,80,137,225,9,54,246,31,148,193,130,253,253,207,79,78,132,248,36,102,79,191,17,37,28,42,9,196,233,11,119,71,197,231,200,105,40,154,195,84,16,60,165,195,32,43,169,20,16,72,169,66,160,143,200,200,124,123,227,157,69,188,8,142,113,90,174,131,222,92,163,226,150,160,241,16,69,243,52,168,248,76,91,100,213,205,216,18,98,121,247,86,18,210,204,46,62,170,110,97,74,34,80,126,113,154,194,143,88,45,46,226,3,100,56,75,165,79,241,78,64,127,68,41,201,103,66,1,220,154,247,17,233,119,213,127,23,240,177,137,198,214,119,172,103,247,47,103,53,186,226,210,5,0,0 };
|
const uint8_t HTML_INDEX_GZIP[916] PROGMEM = { 31,139,8,0,19,56,231,94,2,255,133,148,235,115,162,58,20,192,255,21,174,159,238,157,221,22,95,181,237,174,56,19,20,108,85,68,64,240,241,45,64,42,193,240,40,9,162,254,245,155,128,157,238,157,189,211,235,12,201,201,57,191,243,200,17,206,240,175,137,57,94,239,86,154,20,177,132,140,134,245,42,13,35,4,195,209,48,65,12,74,65,4,11,138,152,82,178,183,187,167,209,144,97,70,208,104,156,165,172,200,200,80,110,142,13,153,194,4,41,39,140,170,60,43,152,20,112,4,165,76,105,85,56,100,145,18,162,19,14,208,93,125,248,46,225,20,51,12,201,29,13,32,65,74,167,53,26,18,156,30,165,2,17,165,69,35,238,30,148,76,194,60,68,75,138,10,244,166,132,144,193,31,56,129,7,36,231,233,225,167,15,41,26,244,191,99,79,53,237,170,61,159,30,50,192,127,75,199,141,52,247,192,37,85,28,129,53,6,134,216,179,133,245,188,22,130,58,13,213,181,171,1,176,152,174,198,242,57,82,45,174,28,171,177,163,207,150,220,58,152,113,223,195,43,87,174,68,188,49,24,240,53,20,158,102,46,162,14,18,190,232,189,113,80,18,237,73,196,91,233,170,225,105,110,205,118,188,141,221,237,188,91,93,130,237,158,254,46,30,167,231,149,118,207,227,114,179,155,221,78,226,116,59,165,83,219,248,195,229,89,119,58,183,184,31,231,57,163,139,188,170,220,155,150,143,34,190,150,218,206,154,24,64,205,64,239,184,82,171,235,19,126,152,95,113,118,62,244,151,94,224,246,74,109,246,82,223,116,51,91,216,109,11,96,224,134,78,173,32,149,163,147,171,232,73,167,2,96,18,6,170,133,177,143,106,91,216,118,220,142,174,126,211,116,45,10,52,227,219,75,190,171,68,35,212,157,227,218,170,167,198,235,104,39,207,38,20,28,198,154,195,250,36,223,202,167,231,120,97,237,103,131,119,253,153,245,142,17,184,196,157,243,214,157,251,86,95,245,178,106,82,189,155,187,131,118,62,30,55,125,188,27,144,21,212,219,3,251,221,120,218,189,50,179,180,125,3,94,7,231,216,167,37,157,128,141,28,22,57,81,15,253,199,120,53,120,30,4,91,237,201,95,129,14,114,39,104,222,21,213,205,182,182,190,121,177,143,187,173,77,204,100,121,217,111,244,246,222,2,23,99,162,245,22,107,208,89,172,181,190,55,121,189,154,49,104,155,177,123,158,95,193,133,203,213,89,123,120,70,149,248,43,188,182,237,69,237,253,148,251,173,115,230,119,237,124,159,30,129,17,131,243,242,210,174,150,78,251,108,234,214,197,184,102,213,114,146,117,12,135,86,70,156,85,198,194,93,159,131,64,148,176,15,53,111,23,234,203,211,62,181,123,187,237,140,128,151,176,23,94,30,114,63,97,215,93,87,175,246,206,195,41,72,144,255,24,87,176,110,169,70,244,245,209,41,173,100,60,254,237,77,166,236,66,16,141,16,98,205,75,44,7,148,202,105,86,36,144,224,43,186,231,167,255,131,107,101,3,210,160,192,57,147,104,17,40,114,76,229,43,202,89,118,159,224,244,62,230,70,185,177,254,65,81,130,67,84,124,137,28,10,152,71,95,18,65,243,173,211,47,33,6,125,31,133,183,111,254,223,164,92,15,19,105,232,103,225,69,202,82,146,193,80,137,225,9,54,246,31,148,193,130,253,253,207,79,78,132,248,36,102,79,191,17,37,28,42,9,196,233,11,119,71,197,231,200,105,40,154,195,84,16,60,165,195,32,43,169,20,16,72,169,66,160,143,200,200,124,123,227,157,69,188,8,142,113,90,174,131,222,92,163,226,150,160,241,16,69,243,52,168,248,76,91,100,213,205,216,18,98,121,247,86,18,210,204,46,62,170,110,97,74,34,80,126,113,154,194,143,88,45,46,226,3,100,56,75,165,79,241,78,64,127,68,41,201,103,66,1,220,154,247,17,233,119,213,127,23,240,177,137,198,214,119,172,103,247,47,103,53,186,226,210,5,0,0 };
|
||||||
|
|||||||
@ -2,4 +2,4 @@ const char CSS_NORMALIZE[] PROGMEM = R"=====(
|
|||||||
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
|
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
|
||||||
)=====";
|
)=====";
|
||||||
|
|
||||||
const uint8_t CSS_NORMALIZE_GZIP[861] PROGMEM = { 31,139,8,0,193,22,6,94,2,255,149,84,237,142,155,58,16,125,149,104,171,74,183,146,137,216,237,199,94,25,221,39,137,242,99,176,7,112,227,47,217,38,155,20,241,238,119,12,132,36,219,108,165,254,2,6,123,230,204,57,103,166,75,70,15,141,179,169,104,192,40,125,230,17,108,44,34,6,213,84,133,137,69,194,83,42,162,250,133,5,200,159,125,76,252,185,44,63,87,197,27,214,7,149,30,255,29,107,39,207,131,129,208,42,203,203,17,66,82,66,35,131,168,36,50,137,9,148,142,172,81,173,0,159,148,179,249,181,15,200,26,231,18,6,214,33,200,252,104,131,235,61,51,160,44,51,104,123,102,225,200,34,138,233,70,236,13,165,63,15,82,69,175,225,204,107,237,196,97,132,94,42,199,4,216,35,68,230,131,107,3,198,200,142,84,213,173,39,149,213,202,98,49,93,168,142,152,161,129,46,64,171,214,242,26,34,230,191,115,34,110,93,250,103,39,136,153,224,116,220,127,89,83,88,103,177,234,80,181,93,162,238,118,157,146,18,237,158,37,52,244,59,225,221,185,17,134,26,196,33,247,98,101,33,156,118,129,167,64,12,123,8,104,211,8,28,168,163,35,145,195,59,71,112,6,215,167,12,33,211,86,215,97,151,84,210,184,31,106,23,136,147,162,118,41,57,195,159,253,105,35,233,21,229,88,179,72,240,108,59,43,248,54,131,170,157,150,163,108,236,28,140,233,172,145,171,68,61,138,177,123,94,130,36,25,127,65,83,45,42,109,127,188,162,217,148,35,125,30,110,16,243,79,77,83,86,51,236,79,101,89,142,209,128,214,55,41,254,37,181,99,79,40,122,127,19,125,253,254,185,154,104,190,176,84,121,23,85,86,142,7,36,142,168,225,15,185,207,153,146,243,188,216,126,71,147,115,15,75,215,197,246,37,71,148,105,23,58,136,163,120,108,39,153,120,32,239,124,25,50,131,141,118,111,124,214,100,156,141,117,113,226,51,117,248,173,244,167,177,11,67,97,220,47,162,243,148,241,42,219,242,44,51,233,145,67,213,7,225,85,113,79,41,215,74,208,39,55,10,71,198,62,212,146,76,135,44,130,241,119,3,101,156,117,164,183,64,182,190,85,87,174,8,213,88,247,212,161,101,202,250,62,49,231,211,108,125,34,132,236,206,242,136,145,89,96,152,101,80,182,163,217,76,83,134,245,99,157,181,57,211,21,222,81,69,85,107,188,84,152,83,14,211,212,78,54,108,92,48,179,81,151,19,29,173,131,205,4,100,151,206,30,255,123,154,227,79,123,118,27,164,193,194,244,46,70,82,25,69,193,225,178,27,192,123,4,42,34,144,207,73,42,209,135,72,45,120,167,136,214,176,148,220,209,188,0,97,148,251,219,226,107,112,88,46,73,108,160,215,105,185,196,249,164,96,227,68,31,11,101,45,45,140,233,222,239,241,213,44,149,7,41,179,168,229,56,29,29,110,29,106,137,7,208,227,109,63,162,67,113,32,225,223,183,14,180,27,158,242,72,174,46,89,167,243,244,190,198,114,199,246,166,198,240,180,39,116,11,55,19,180,34,122,101,139,91,241,63,60,79,107,225,254,252,176,0,159,252,119,39,3,113,46,186,199,50,100,221,27,133,90,86,127,242,255,229,226,95,141,199,67,12,87,252,115,164,16,25,134,126,212,242,135,87,36,10,23,32,239,142,71,29,77,214,157,90,34,67,94,164,206,251,49,58,173,228,38,42,77,147,176,142,199,230,197,95,37,218,126,165,117,178,217,254,120,153,30,175,121,183,104,108,209,202,71,142,89,135,240,126,240,47,179,250,251,250,77,217,189,151,189,77,147,171,193,71,228,151,151,106,249,145,151,193,82,64,178,212,13,215,130,255,3,4,241,118,208,151,7,0,0 };
|
const uint8_t CSS_NORMALIZE_GZIP[861] PROGMEM = { 31,139,8,0,19,56,231,94,2,255,149,84,237,142,155,58,16,125,149,104,171,74,183,146,137,216,237,199,94,25,221,39,137,242,99,176,7,112,227,47,217,38,155,20,241,238,119,12,132,36,219,108,165,254,2,6,123,230,204,57,103,166,75,70,15,141,179,169,104,192,40,125,230,17,108,44,34,6,213,84,133,137,69,194,83,42,162,250,133,5,200,159,125,76,252,185,44,63,87,197,27,214,7,149,30,255,29,107,39,207,131,129,208,42,203,203,17,66,82,66,35,131,168,36,50,137,9,148,142,172,81,173,0,159,148,179,249,181,15,200,26,231,18,6,214,33,200,252,104,131,235,61,51,160,44,51,104,123,102,225,200,34,138,233,70,236,13,165,63,15,82,69,175,225,204,107,237,196,97,132,94,42,199,4,216,35,68,230,131,107,3,198,200,142,84,213,173,39,149,213,202,98,49,93,168,142,152,161,129,46,64,171,214,242,26,34,230,191,115,34,110,93,250,103,39,136,153,224,116,220,127,89,83,88,103,177,234,80,181,93,162,238,118,157,146,18,237,158,37,52,244,59,225,221,185,17,134,26,196,33,247,98,101,33,156,118,129,167,64,12,123,8,104,211,8,28,168,163,35,145,195,59,71,112,6,215,167,12,33,211,86,215,97,151,84,210,184,31,106,23,136,147,162,118,41,57,195,159,253,105,35,233,21,229,88,179,72,240,108,59,43,248,54,131,170,157,150,163,108,236,28,140,233,172,145,171,68,61,138,177,123,94,130,36,25,127,65,83,45,42,109,127,188,162,217,148,35,125,30,110,16,243,79,77,83,86,51,236,79,101,89,142,209,128,214,55,41,254,37,181,99,79,40,122,127,19,125,253,254,185,154,104,190,176,84,121,23,85,86,142,7,36,142,168,225,15,185,207,153,146,243,188,216,126,71,147,115,15,75,215,197,246,37,71,148,105,23,58,136,163,120,108,39,153,120,32,239,124,25,50,131,141,118,111,124,214,100,156,141,117,113,226,51,117,248,173,244,167,177,11,67,97,220,47,162,243,148,241,42,219,242,44,51,233,145,67,213,7,225,85,113,79,41,215,74,208,39,55,10,71,198,62,212,146,76,135,44,130,241,119,3,101,156,117,164,183,64,182,190,85,87,174,8,213,88,247,212,161,101,202,250,62,49,231,211,108,125,34,132,236,206,242,136,145,89,96,152,101,80,182,163,217,76,83,134,245,99,157,181,57,211,21,222,81,69,85,107,188,84,152,83,14,211,212,78,54,108,92,48,179,81,151,19,29,173,131,205,4,100,151,206,30,255,123,154,227,79,123,118,27,164,193,194,244,46,70,82,25,69,193,225,178,27,192,123,4,42,34,144,207,73,42,209,135,72,45,120,167,136,214,176,148,220,209,188,0,97,148,251,219,226,107,112,88,46,73,108,160,215,105,185,196,249,164,96,227,68,31,11,101,45,45,140,233,222,239,241,213,44,149,7,41,179,168,229,56,29,29,110,29,106,137,7,208,227,109,63,162,67,113,32,225,223,183,14,180,27,158,242,72,174,46,89,167,243,244,190,198,114,199,246,166,198,240,180,39,116,11,55,19,180,34,122,101,139,91,241,63,60,79,107,225,254,252,176,0,159,252,119,39,3,113,46,186,199,50,100,221,27,133,90,86,127,242,255,229,226,95,141,199,67,12,87,252,115,164,16,25,134,126,212,242,135,87,36,10,23,32,239,142,71,29,77,214,157,90,34,67,94,164,206,251,49,58,173,228,38,42,77,147,176,142,199,230,197,95,37,218,126,165,117,178,217,254,120,153,30,175,121,183,104,108,209,202,71,142,89,135,240,126,240,47,179,250,251,250,77,217,189,151,189,77,147,171,193,71,228,151,151,106,249,145,151,193,82,64,178,212,13,215,130,255,3,4,241,118,208,151,7,0,0 };
|
||||||
|
|||||||
@ -12,4 +12,4 @@ function sliderDiscrete_tmplt(){var tmplt='<div class="slider">'+
|
|||||||
function slider_move(parents,newW,sliderW,send){var slider_new_val=parseInt(Math.round((newW/sliderW)*100));var slider_fill=parents.find(".slider-fill");var slider_handle=parents.find(".slider-handle");var range=parents.find('input[type="range"]');slider_fill.css("width",slider_new_val+"%");slider_handle.css({left:slider_new_val+"%",transition:"none","-webkit-transition":"none","-moz-transition":"none"});range.val(slider_new_val);if(parents.find(".slider-handle span").text()!=slider_new_val){parents.find(".slider-handle span").text(slider_new_val);var number=parents.attr("id").substring(2);if(send)websock.send("slvalue:"+slider_new_val+":"+number);}}
|
function slider_move(parents,newW,sliderW,send){var slider_new_val=parseInt(Math.round((newW/sliderW)*100));var slider_fill=parents.find(".slider-fill");var slider_handle=parents.find(".slider-handle");var range=parents.find('input[type="range"]');slider_fill.css("width",slider_new_val+"%");slider_handle.css({left:slider_new_val+"%",transition:"none","-webkit-transition":"none","-moz-transition":"none"});range.val(slider_new_val);if(parents.find(".slider-handle span").text()!=slider_new_val){parents.find(".slider-handle span").text(slider_new_val);var number=parents.attr("id").substring(2);if(send)websock.send("slvalue:"+slider_new_val+":"+number);}}
|
||||||
)=====";
|
)=====";
|
||||||
|
|
||||||
const uint8_t JS_SLIDER_GZIP[869] PROGMEM = { 31,139,8,0,226,85,7,94,2,255,237,86,77,143,155,48,16,189,231,87,100,173,237,6,186,196,155,238,49,196,185,180,170,212,67,79,173,212,74,171,85,228,128,89,172,16,131,176,73,218,102,243,223,59,254,128,0,33,171,109,79,61,244,4,246,60,143,103,222,60,123,156,84,34,82,60,23,227,114,179,141,87,37,21,79,236,75,198,99,86,122,146,101,44,82,121,233,31,118,180,28,195,40,9,164,177,172,246,60,86,105,61,200,147,68,50,21,68,85,41,148,155,251,192,101,84,50,197,2,227,206,77,134,218,3,185,62,185,13,219,222,136,182,98,243,235,53,22,235,218,154,236,191,231,227,140,37,42,236,238,99,16,189,57,204,104,148,122,137,203,206,227,193,206,63,152,24,33,4,149,114,233,135,102,132,105,81,48,17,123,221,197,43,181,45,50,216,204,15,77,6,196,66,19,14,192,9,23,69,165,30,212,207,130,17,100,172,232,113,82,71,220,6,34,108,231,80,147,78,194,179,140,216,255,46,100,170,45,39,92,74,69,156,177,97,164,181,157,176,25,93,179,11,78,141,9,144,186,122,38,208,213,142,102,164,160,165,100,159,132,242,204,20,134,41,157,102,43,66,28,73,233,33,83,9,20,52,235,110,209,155,126,128,22,168,203,113,9,103,34,112,81,201,130,10,228,99,197,126,184,173,53,218,15,143,126,104,203,43,60,180,205,43,201,226,124,47,198,42,175,162,84,42,90,130,235,126,234,65,83,83,230,31,120,226,49,188,174,148,202,5,33,228,222,63,64,245,160,4,227,132,102,146,133,199,145,206,29,50,102,66,201,186,238,216,141,129,40,45,249,105,83,37,163,242,182,36,29,176,81,101,11,224,148,89,35,186,226,212,184,40,101,209,198,30,167,6,245,130,126,48,135,120,230,49,151,116,157,177,24,130,129,196,218,46,8,81,101,197,206,210,171,83,162,113,252,62,163,186,28,92,78,41,176,179,99,46,161,109,190,99,31,43,210,230,204,114,242,196,190,19,134,205,247,249,25,106,153,234,125,226,175,154,120,38,31,102,143,214,212,206,89,176,125,67,12,152,166,29,42,116,192,125,220,130,180,233,188,185,185,58,71,160,25,242,253,131,155,214,177,122,142,172,160,15,237,222,61,134,141,240,120,52,241,85,69,47,195,154,22,8,205,179,170,41,225,188,119,202,128,112,139,41,92,50,189,247,0,133,118,131,218,7,57,24,137,106,236,220,18,27,24,165,182,39,12,162,42,230,58,40,107,133,235,197,140,142,225,181,23,231,81,181,133,40,124,45,248,83,104,175,63,5,255,229,223,75,239,76,156,78,212,255,130,60,71,127,160,206,65,165,253,133,142,142,163,122,175,241,112,79,51,231,223,252,147,201,34,230,187,113,164,101,79,144,19,194,114,114,59,26,152,183,45,106,185,184,3,203,37,136,187,160,151,3,38,219,139,150,11,221,5,150,179,197,157,249,90,103,141,75,100,255,80,232,170,108,98,60,207,167,91,7,40,192,55,199,61,124,129,34,247,90,57,149,167,211,244,62,83,149,226,50,175,64,137,158,94,122,231,150,250,111,223,205,102,126,71,227,166,91,247,238,140,110,187,110,129,93,203,30,134,55,61,187,233,196,175,57,19,23,123,114,55,183,75,141,249,160,207,226,252,28,11,218,164,66,114,77,232,28,137,92,64,67,69,211,61,91,111,184,154,158,76,232,100,219,230,191,6,12,71,247,52,50,15,136,238,46,230,244,190,196,196,184,253,22,240,175,72,111,249,225,213,107,251,251,106,126,69,181,93,195,67,172,246,65,149,42,225,74,135,59,5,203,106,45,85,201,197,147,119,111,66,52,106,129,204,101,30,109,176,30,192,35,37,3,63,21,155,163,219,62,113,48,101,61,235,174,243,27,27,117,74,231,52,11,0,0 };
|
const uint8_t JS_SLIDER_GZIP[869] PROGMEM = { 31,139,8,0,19,56,231,94,2,255,237,86,77,143,155,48,16,189,231,87,100,173,237,6,186,196,155,238,49,196,185,180,170,212,67,79,173,212,74,171,85,228,128,89,172,16,131,176,73,218,102,243,223,59,254,128,0,33,171,109,79,61,244,4,246,60,143,103,222,60,123,156,84,34,82,60,23,227,114,179,141,87,37,21,79,236,75,198,99,86,122,146,101,44,82,121,233,31,118,180,28,195,40,9,164,177,172,246,60,86,105,61,200,147,68,50,21,68,85,41,148,155,251,192,101,84,50,197,2,227,206,77,134,218,3,185,62,185,13,219,222,136,182,98,243,235,53,22,235,218,154,236,191,231,227,140,37,42,236,238,99,16,189,57,204,104,148,122,137,203,206,227,193,206,63,152,24,33,4,149,114,233,135,102,132,105,81,48,17,123,221,197,43,181,45,50,216,204,15,77,6,196,66,19,14,192,9,23,69,165,30,212,207,130,17,100,172,232,113,82,71,220,6,34,108,231,80,147,78,194,179,140,216,255,46,100,170,45,39,92,74,69,156,177,97,164,181,157,176,25,93,179,11,78,141,9,144,186,122,38,208,213,142,102,164,160,165,100,159,132,242,204,20,134,41,157,102,43,66,28,73,233,33,83,9,20,52,235,110,209,155,126,128,22,168,203,113,9,103,34,112,81,201,130,10,228,99,197,126,184,173,53,218,15,143,126,104,203,43,60,180,205,43,201,226,124,47,198,42,175,162,84,42,90,130,235,126,234,65,83,83,230,31,120,226,49,188,174,148,202,5,33,228,222,63,64,245,160,4,227,132,102,146,133,199,145,206,29,50,102,66,201,186,238,216,141,129,40,45,249,105,83,37,163,242,182,36,29,176,81,101,11,224,148,89,35,186,226,212,184,40,101,209,198,30,167,6,245,130,126,48,135,120,230,49,151,116,157,177,24,130,129,196,218,46,8,81,101,197,206,210,171,83,162,113,252,62,163,186,28,92,78,41,176,179,99,46,161,109,190,99,31,43,210,230,204,114,242,196,190,19,134,205,247,249,25,106,153,234,125,226,175,154,120,38,31,102,143,214,212,206,89,176,125,67,12,152,166,29,42,116,192,125,220,130,180,233,188,185,185,58,71,160,25,242,253,131,155,214,177,122,142,172,160,15,237,222,61,134,141,240,120,52,241,85,69,47,195,154,22,8,205,179,170,41,225,188,119,202,128,112,139,41,92,50,189,247,0,133,118,131,218,7,57,24,137,106,236,220,18,27,24,165,182,39,12,162,42,230,58,40,107,133,235,197,140,142,225,181,23,231,81,181,133,40,124,45,248,83,104,175,63,5,255,229,223,75,239,76,156,78,212,255,130,60,71,127,160,206,65,165,253,133,142,142,163,122,175,241,112,79,51,231,223,252,147,201,34,230,187,113,164,101,79,144,19,194,114,114,59,26,152,183,45,106,185,184,3,203,37,136,187,160,151,3,38,219,139,150,11,221,5,150,179,197,157,249,90,103,141,75,100,255,80,232,170,108,98,60,207,167,91,7,40,192,55,199,61,124,129,34,247,90,57,149,167,211,244,62,83,149,226,50,175,64,137,158,94,122,231,150,250,111,223,205,102,126,71,227,166,91,247,238,140,110,187,110,129,93,203,30,134,55,61,187,233,196,175,57,19,23,123,114,55,183,75,141,249,160,207,226,252,28,11,218,164,66,114,77,232,28,137,92,64,67,69,211,61,91,111,184,154,158,76,232,100,219,230,191,6,12,71,247,52,50,15,136,238,46,230,244,190,196,196,184,253,22,240,175,72,111,249,225,213,107,251,251,106,126,69,181,93,195,67,172,246,65,149,42,225,74,135,59,5,203,106,45,85,201,197,147,119,111,66,52,106,129,204,101,30,109,176,30,192,35,37,3,63,21,155,163,219,62,113,48,101,61,235,174,243,27,27,117,74,231,52,11,0,0 };
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user