lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2024-11-22 04:00:55 +00:00
Code Issues Releases Activity

Adding basic structure for new widgets

Browse Source
This commit is contained in:
Lukas Bachschwell 2019-03-26 16:22:21 +01:00
parent 3c69f013fc
commit 043ba99ea9
7 changed files with 666 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
README.md
View File

@ -26,14 +26,16 @@ THIS IS THE 2.0.0 DEVELOPMENT BRANCH, NOT GUARANTIED TO WORK
- ArduinoJSON 6.10.0 Support ✅ - ArduinoJSON 6.10.0 Support ✅
- Tabs by @eringerli ISSUE #45 ✅ - Tabs by @eringerli ISSUE #45 ✅
- remove black line without tabs ✅ - remove black line without tabs ✅
- API changes by @eringerli - API changes by @eringerli ✅
- less updateControl functions ✅ - less updateControl functions ✅
- proper wrappers for all create/update actions - proper wrappers for all create/update actions ✅
- OptionList by @eringerli - OptionList by @eringerli
- Better return values - Min Max on slider by @eringerli ✅
- Min Max on slider - Public Access to ESPAsyncServer
- Accelerometer Widget - Accelerometer Widget
- Cleanup Example - Graph Widget
-
- Cleanup Example, DNS and autojoin
- Cleanup and extend Documentation - Cleanup and extend Documentation
- Number field ✅ - Number field ✅
- Text field ✅ - Text field ✅
@ -45,6 +47,12 @@ THIS IS THE 2.0.0 DEVELOPMENT BRANCH, NOT GUARANTIED TO WORK
- Tab usage - Tab usage
- Verbosity setting - Verbosity setting
## OLD Roadmap :
- Datagraph output -> _WIP_
- Number min and max value
- proper return value (as int and not as string) for slider
## Changelog for functions: ## Changelog for functions:
- split pad into pad and padWithCenter - split pad into pad and padWithCenter
@ -143,21 +151,6 @@ Checkout the example for the usage
- COLOR_ALIZARIN - COLOR_ALIZARIN
- COLOR_NONE - COLOR_NONE
## Roadmap :
- ~~Setup SPIFFS using values in program memory~~
- ~~ESP8266 support~~
- ~~PlattformIO Integration~~
- ~~Multiline Labels~~
- ~~GZip Files and serve from memory~~
- Datagraph output -> _WIP_
- ~~Number input ~~
- ~~Text input ~~
- Dokumentation for Text and number widget
- Number min and max value
- proper return value (as int and not as string) for slider
- Maybe a slider range setting, meanwhile please use _map()_
## Documentation ## Documentation
The heart of ESPUI is The heart of ESPUI is
@ -227,7 +220,8 @@ the normal `<br>` tag in the string you print to the label
The Slider can be used to slide through a value from 1 to 100. Slides provide The Slider can be used to slide through a value from 1 to 100. Slides provide
realtime data, are touch compatible and can be used to for example control a realtime data, are touch compatible and can be used to for example control a
Servo. The current value is shown while the slider is dragged in a little bubble Servo. The current value is shown while the slider is dragged in a little bubble
over the handle. over the handle. In the Callback the slider does not return an int but a String.
Use the .toInt
#### Number Input #### Number Input

428
data/js/controls.js vendored
View File

@ -46,6 +46,11 @@ const UPDATE_MAX = 115;
const UI_STEP = 16; const UI_STEP = 16;
const UPDATE_STEP = 116; const UPDATE_STEP = 116;
const UI_GAUGE = 17;
const UPTDATE_GAUGE = 117;
const UI_ACCEL = 18;
const UPTDATE_ACCEL = 117;
const UP = 0; const UP = 0;
const DOWN = 1; const DOWN = 1;
const LEFT = 2; const LEFT = 2;
@ -165,32 +170,54 @@ function start() {
case UI_LABEL: case UI_LABEL:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='two columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"<span id='l" + data.id + "' class='label label-wrap'>" + data.value + "</span>" + "' class='two columns card tcenter " +
colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<span id='l" +
data.id +
"' class='label label-wrap'>" +
data.value +
"</span>" +
"</div>" "</div>"
); );
break; break;
case UI_BUTTON: case UI_BUTTON:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='one columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"<button id='btn" + data.id + "' " + "' class='one columns card tcenter " +
"onmousedown='buttonclick(" + data.id + ", true)' "+ colorClass(data.color) +
"onmouseup='buttonclick(" + data.id + ", false)'>" + "'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<button id='btn" +
data.id +
"' " +
"onmousedown='buttonclick(" +
data.id +
", true)' " +
"onmouseup='buttonclick(" +
data.id +
", false)'>" +
data.value + data.value +
"</button></div>" "</button></div>"
); );
@ -208,16 +235,32 @@ function start() {
case UI_SWITCHER: case UI_SWITCHER:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='one columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"<label id='sl" + data.id + "' class='switch " + ((data.value == "1")?"checked":"") + "'>" + "' class='one columns card tcenter " +
"<div class='in'><input type='checkbox' id='s" + data.id + "' onClick='switcher(" + data.id + ",null)' " + ((data.value == "1")?"checked":"") + "/></div>" + colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<label id='sl" +
data.id +
"' class='switch " +
(data.value == "1" ? "checked" : "") +
"'>" +
"<div class='in'><input type='checkbox' id='s" +
data.id +
"' onClick='switcher(" +
data.id +
",null)' " +
(data.value == "1" ? "checked" : "") +
"/></div>" +
"</label>" + "</label>" +
"</div>" "</div>"
); );
@ -227,22 +270,60 @@ function start() {
case UI_CPAD: case UI_CPAD:
case UI_PAD: case UI_PAD:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='two columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"' class='two columns card tcenter " +
colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<nav class='control'>" + "<nav class='control'>" +
"<ul>" + "<ul>" +
"<li><a onmousedown='padclick(UP, " + data.id + ", true)' onmouseup='padclick(UP, " + data.id + ", false)' id='pf" + data.id + "'>▲</a></li>" + "<li><a onmousedown='padclick(UP, " +
"<li><a onmousedown='padclick(RIGHT, " + data.id + ", true)' onmouseup='padclick(RIGHT, " + data.id + ", false)' id='pr" + data.id + "'>▲</a></li>" + data.id +
"<li><a onmousedown='padclick(LEFT, " + data.id + ", true)' onmouseup='padclick(LEFT, " + data.id + ", false)' id='pl" + data.id + "'>▲</a></li>" + ", true)' onmouseup='padclick(UP, " +
"<li><a onmousedown='padclick(DOWN, " + data.id + ", true)' onmouseup='padclick(DOWN, " + data.id + ", false)' id='pb" + data.id + "'>▲</a></li>" + data.id +
", false)' id='pf" +
data.id +
"'>▲</a></li>" +
"<li><a onmousedown='padclick(RIGHT, " +
data.id +
", true)' onmouseup='padclick(RIGHT, " +
data.id +
", false)' id='pr" +
data.id +
"'>▲</a></li>" +
"<li><a onmousedown='padclick(LEFT, " +
data.id +
", true)' onmouseup='padclick(LEFT, " +
data.id +
", false)' id='pl" +
data.id +
"'>▲</a></li>" +
"<li><a onmousedown='padclick(DOWN, " +
data.id +
", true)' onmouseup='padclick(DOWN, " +
data.id +
", false)' id='pb" +
data.id +
"'>▲</a></li>" +
"</ul>" + "</ul>" +
((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>":"") + (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>"
: "") +
"</nav>" + "</nav>" +
"</div>" "</div>"
); );
@ -303,17 +384,29 @@ function start() {
//https://codepen.io/seanstopnik/pen/CeLqA //https://codepen.io/seanstopnik/pen/CeLqA
case UI_SLIDER: case UI_SLIDER:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='two columns card tcenter card-slider " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"' class='two columns card tcenter card-slider " +
colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<div class='range-slider'>" + "<div class='range-slider'>" +
"<input id='sl" + data.id + "' type='range' min='0' max='100' value='" + data.value + "' class='range-slider__range'>" + "<input id='sl" +
"<span class='range-slider__value'>" + data.value + "</span>" + data.id +
"' type='range' min='0' max='100' value='" +
data.value +
"' class='range-slider__range'>" +
"<span class='range-slider__value'>" +
data.value +
"</span>" +
"</div>" + "</div>" +
"</div>" "</div>"
); );
@ -322,30 +415,54 @@ function start() {
case UI_NUMBER: case UI_NUMBER:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='two columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"<input style='color:black;' id='num" + data.id + "' type='number' value='" + data.value + "' onchange='numberchange(" + data.id + ")' />" + "' class='two columns card tcenter " +
colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<input style='color:black;' id='num" +
data.id +
"' type='number' value='" +
data.value +
"' onchange='numberchange(" +
data.id +
")' />" +
"</div>" "</div>"
); );
break; break;
case UI_TEXT_INPUT: case UI_TEXT_INPUT:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='two columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"<input style='color:black;' id='text" + data.id + "' value='" + data.value + "' onchange='textchange(" + data.id + ")' />" + "' class='two columns card tcenter " +
colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<input style='color:black;' id='text" +
data.id +
"' value='" +
data.value +
"' onchange='textchange(" +
data.id +
")' />" +
"</div>" "</div>"
); );
break; break;
@ -354,18 +471,20 @@ function start() {
$("#tabsnav").append( $("#tabsnav").append(
"<li><a href='#tab" + data.id + "'>" + data.value + "</a></li>" "<li><a href='#tab" + data.id + "'>" + data.value + "</a></li>"
); );
$("#tabscontent").append( $("#tabscontent").append("<div id='tab" + data.id + "'></div>");
"<div id='tab" + data.id + "'></div>"
);
tabs = $('.tabscontent').tabbedContent({loop: true}).data('api'); tabs = $(".tabscontent")
.tabbedContent({ loop: true })
.data("api");
// switch to tab... // switch to tab...
$('a').filter(function() { $("a")
return $(this).attr('href') === '#click-to-switch'; .filter(function() {
}).on('click', function(e) { return $(this).attr("href") === "#click-to-switch";
var tab = prompt('Tab to switch to (number or id)?'); })
.on("click", function(e) {
var tab = prompt("Tab to switch to (number or id)?");
if (!tabs.switchTab(tab)) { if (!tabs.switchTab(tab)) {
alert('That tab does not exist :\\'); alert("That tab does not exist :\\");
} }
e.preventDefault(); e.preventDefault();
}); });
@ -373,32 +492,50 @@ function start() {
case UI_SELECT: case UI_SELECT:
var parent; var parent;
if(data.parentControl) { if (data.parentControl) {
parent = $("#tab"+data.parentControl); parent = $("#tab" + data.parentControl);
} else { } else {
parent = $("#row") parent = $("#row");
} }
parent.append( parent.append(
"<div id='id" + data.id + "' class='two columns card tcenter " + colorClass(data.color) + "'>" + "<div id='id" +
"<h5>" + data.label + "</h5><hr/>" + data.id +
"<select style='color:black;' id='select" + data.id + "' onchange='selectchange(" + data.id + ")' />" + "' class='two columns card tcenter " +
colorClass(data.color) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"<select style='color:black;' id='select" +
data.id +
"' onchange='selectchange(" +
data.id +
")' />" +
"</div>" "</div>"
); );
break; break;
case UI_OPTION: case UI_OPTION:
if(data.parentControl) { if (data.parentControl) {
var parent = $("#select"+data.parentControl); var parent = $("#select" + data.parentControl);
parent.append( parent.append(
"<option id='option" + data.id + "' value='" + data.value + "' " + data.selected + ">" + data.label + "</option>" "<option id='option" +
data.id +
"' value='" +
data.value +
"' " +
data.selected +
">" +
data.label +
"</option>"
); );
} }
break; break;
case UI_MIN: case UI_MIN:
if(data.parentControl) { if (data.parentControl) {
var parent = $("#id"+data.parentControl+" input"); var parent = $("#id" + data.parentControl + " input");
if(parent.size()){ if (parent.size()) {
console.log("MIN" + data.value); console.log("MIN" + data.value);
parent.attr("min", data.value); parent.attr("min", data.value);
} }
@ -406,9 +543,9 @@ function start() {
break; break;
case UI_MAX: case UI_MAX:
if(data.parentControl) { if (data.parentControl) {
var parent = $("#id"+data.parentControl+" input"); var parent = $("#id" + data.parentControl + " input");
if(parent.size()){ if (parent.size()) {
console.log("MAX" + data.value); console.log("MAX" + data.value);
parent.attr("max", data.value); parent.attr("max", data.value);
} }
@ -416,21 +553,101 @@ function start() {
break; break;
case UI_STEP: case UI_STEP:
if(data.parentControl) { if (data.parentControl) {
var parent = $("#id"+data.parentControl+" input"); var parent = $("#id" + data.parentControl + " input");
if(parent.size()){ if (parent.size()) {
console.log("STEP" + data.value); console.log("STEP" + data.value);
parent.attr("step", data.value); parent.attr("step", data.value);
} }
} }
break; 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) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"WILL BE A GRAPH <input style='color:black;' id='graph" +
data.id +
"' type='number' value='" +
data.value +
"' onchange='numberchange(" +
data.id +
")' />" +
"</div>"
);
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) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"WILL BE A GAUGE <input style='color:black;' id='gauge" +
data.id +
"' type='number' value='" +
data.value +
"' onchange='numberchange(" +
data.id +
")' />" +
"</div>"
);
break;
case UI_ACCEL:
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) +
"'>" +
"<h5>" +
data.label +
"</h5><hr/>" +
"WILL BE A ACCEL<div class='accelerometer' id='accel" +
data.id +
"' ><div class='ball" +
data.id +
"'></div><pre class='accelerometeroutput" +
data.id +
"'></pre>" +
"</div>"
);
break;
case UPDATE_LABEL: case UPDATE_LABEL:
$("#l" + data.id).html(data.value); $("#l" + data.id).html(data.value);
break; break;
case UPDATE_SWITCHER: case UPDATE_SWITCHER:
switcher(data.id, (data.value == "0")?0:1); switcher(data.id, data.value == "0" ? 0 : 1);
break; break;
case UPDATE_SLIDER: case UPDATE_SLIDER:
@ -453,21 +670,29 @@ function start() {
case UPDATE_PAD: case UPDATE_PAD:
case UPDATE_CPAD: case UPDATE_CPAD:
break; break;
case UPDATE_GAUGE:
$("#gauge" + data.id).val(data.value);
break;
case UPDATE_ACCEL:
break;
default: default:
console.error("Unknown type or event"); console.error("Unknown type or event");
break; break;
} }
if(data.type >= UPDATE_OFFSET && data.type < UI_INITIAL_GUI) { if (data.type >= UPDATE_OFFSET && data.type < UI_INITIAL_GUI) {
var element = $('#id' + data.id); var element = $("#id" + data.id);
// if(data.type == UPDATE_SLIDER) { // FIXME: Test sliderupdate
// element.removeClass("slider-turquoise slider-emerald slider-peterriver slider-wetasphalt slider-sunflower slider-carrot slider-alizarin"); // if(data.type == UPDATE_SLIDER) {
// element.addClass("slider-" + colorClass(data.color)); // element.removeClass("slider-turquoise slider-emerald slider-peterriver slider-wetasphalt slider-sunflower slider-carrot slider-alizarin");
// } else { // element.addClass("slider-" + colorClass(data.color));
element.removeClass("turquoise emerald peterriver wetasphalt sunflower carrot alizarin"); // } else {
element.removeClass(
"turquoise emerald peterriver wetasphalt sunflower carrot alizarin"
);
element.addClass(colorClass(data.color)); element.addClass(colorClass(data.color));
// } // }
} }
}; };
@ -543,24 +768,31 @@ function switcher(number, state) {
} }
} }
var rangeSlider = function(){ var rangeSlider = function() {
var slider = $('.range-slider'), var slider = $(".range-slider"),
range = $('.range-slider__range'), range = $(".range-slider__range"),
value = $('.range-slider__value'); value = $(".range-slider__value");
slider.each(function(){ slider.each(function() {
value.each(function() {
value.each(function(){ var value = $(this)
var value = $(this).prev().attr('value'); .prev()
.attr("value");
$(this).html(value); $(this).html(value);
}); });
range.on({ range.on({
'input': function(){ input: function() {
$(this).next().html(this.value); $(this)
.next()
.html(this.value);
}, },
'change': function(){ change: function() {
sliderchange($(this).attr('id').replace( /^\D+/g, '')); sliderchange(
$(this)
.attr("id")
.replace(/^\D+/g, "")
);
} }
}); });
}); });

268
data/js/controls.min.js vendored
View File

@ -1,62 +1,238 @@
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 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;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 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;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 restart(){$(document).add("*").off();$("#row").html("");websock.close();start();} var websock;var websockConnected=false;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 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 handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}
function start(){document.addEventListener("visibilitychange",handleVisibilityChange,false);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: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")} function start(){document.addEventListener("visibilitychange",handleVisibilityChange,false);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: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)+"'>"+ parent.append("<div id='id"+
"<h5>"+data.label+"</h5><hr/>"+ data.id+
"<span id='l"+data.id+"' class='label label-wrap'>"+data.value+"</span>"+ "' class='two columns card tcenter "+
"</div>");break;case UI_BUTTON:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row")} colorClass(data.color)+
parent.append("<div id='id"+data.id+"' class='one columns card tcenter "+colorClass(data.color)+"'>"+ "'>"+
"<h5>"+data.label+"</h5><hr/>"+ "<h5>"+
"<button id='btn"+data.id+"' "+ data.label+
"onmousedown='buttonclick("+data.id+", true)' "+ "</h5><hr/>"+
"onmouseup='buttonclick("+data.id+", false)'>"+ "<span id='l"+
data.id+
"' class='label label-wrap'>"+
data.value+ 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")} "</span>"+
parent.append("<div id='id"+data.id+"' class='one columns card tcenter "+colorClass(data.color)+"'>"+ "</div>");break;case UI_BUTTON:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
"<h5>"+data.label+"</h5><hr/>"+ parent.append("<div id='id"+
"<label id='sl"+data.id+"' class='switch "+((data.value=="1")?"checked":"")+"'>"+ data.id+
"<div class='in'><input type='checkbox' id='s"+data.id+"' onClick='switcher("+data.id+",null)' "+((data.value=="1")?"checked":"")+"/></div>"+ "' class='one columns card tcenter "+
colorClass(data.color)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"<button id='btn"+
data.id+
"' "+
"onmousedown='buttonclick("+
data.id+
", true)' "+
"onmouseup='buttonclick("+
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");}
parent.append("<div id='id"+
data.id+
"' class='one columns card tcenter "+
colorClass(data.color)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"<label id='sl"+
data.id+
"' class='switch "+
(data.value=="1"?"checked":"")+
"'>"+
"<div class='in'><input type='checkbox' id='s"+
data.id+
"' onClick='switcher("+
data.id+
",null)' "+
(data.value=="1"?"checked":"")+
"/></div>"+
"</label>"+ "</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>");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)+"'>"+ parent.append("<div id='id"+
"<h5>"+data.label+"</h5><hr/>"+ data.id+
"' class='two columns card tcenter "+
colorClass(data.color)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"<nav class='control'>"+ "<nav class='control'>"+
"<ul>"+ "<ul>"+
"<li><a onmousedown='padclick(UP, "+data.id+", true)' onmouseup='padclick(UP, "+data.id+", false)' id='pf"+data.id+"'>▲</a></li>"+ "<li><a onmousedown='padclick(UP, "+
"<li><a onmousedown='padclick(RIGHT, "+data.id+", true)' onmouseup='padclick(RIGHT, "+data.id+", false)' id='pr"+data.id+"'>▲</a></li>"+ data.id+
"<li><a onmousedown='padclick(LEFT, "+data.id+", true)' onmouseup='padclick(LEFT, "+data.id+", false)' id='pl"+data.id+"'>▲</a></li>"+ ", true)' onmouseup='padclick(UP, "+
"<li><a onmousedown='padclick(DOWN, "+data.id+", true)' onmouseup='padclick(DOWN, "+data.id+", false)' id='pb"+data.id+"'>▲</a></li>"+ data.id+
", false)' id='pf"+
data.id+
"'>▲</a></li>"+
"<li><a onmousedown='padclick(RIGHT, "+
data.id+
", true)' onmouseup='padclick(RIGHT, "+
data.id+
", false)' id='pr"+
data.id+
"'>▲</a></li>"+
"<li><a onmousedown='padclick(LEFT, "+
data.id+
", true)' onmouseup='padclick(LEFT, "+
data.id+
", false)' id='pl"+
data.id+
"'>▲</a></li>"+
"<li><a onmousedown='padclick(DOWN, "+
data.id+
", true)' onmouseup='padclick(DOWN, "+
data.id+
", false)' id='pb"+
data.id+
"'>▲</a></li>"+
"</ul>"+ "</ul>"+
((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>":"")+ (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>":"")+
"</nav>"+ "</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>");$("#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)+"'>"+ parent.append("<div id='id"+
"<h5>"+data.label+"</h5><hr/>"+ data.id+
"' class='two columns card tcenter card-slider "+
colorClass(data.color)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"<div class='range-slider'>"+ "<div class='range-slider'>"+
"<input id='sl"+data.id+"' type='range' min='0' max='100' value='"+data.value+"' class='range-slider__range'>"+ "<input id='sl"+
"<span class='range-slider__value'>"+data.value+"</span>"+ data.id+
"' type='range' min='0' max='100' value='"+
data.value+
"' class='range-slider__range'>"+
"<span class='range-slider__value'>"+
data.value+
"</span>"+
"</div>"+ "</div>"+
"</div>");rangeSlider();break;case UI_NUMBER:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row")} "</div>");rangeSlider();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)+"'>"+ parent.append("<div id='id"+
"<h5>"+data.label+"</h5><hr/>"+ data.id+
"<input style='color:black;' id='num"+data.id+"' type='number' value='"+data.value+"' onchange='numberchange("+data.id+")' />"+ "' class='two columns card tcenter "+
"</div>");break;case UI_TEXT_INPUT:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row")} colorClass(data.color)+
parent.append("<div id='id"+data.id+"' class='two columns card tcenter "+colorClass(data.color)+"'>"+ "'>"+
"<h5>"+data.label+"</h5><hr/>"+ "<h5>"+
"<input style='color:black;' id='text"+data.id+"' value='"+data.value+"' onchange='textchange("+data.id+")' />"+ data.label+
"</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 :\\');} "</h5><hr/>"+
e.preventDefault();});break;case UI_SELECT:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row")} "<input style='color:black;' id='num"+
parent.append("<div id='id"+data.id+"' class='two columns card tcenter "+colorClass(data.color)+"'>"+ data.id+
"<h5>"+data.label+"</h5><hr/>"+ "' type='number' value='"+
"<select style='color:black;' id='select"+data.id+"' onchange='selectchange("+data.id+")' />"+ data.value+
"</div>");break;case UI_OPTION:if(data.parentControl){var parent=$("#select"+data.parentControl);parent.append("<option id='option"+data.id+"' value='"+data.value+"' "+data.selected+">"+data.label+"</option>");} "' onchange='numberchange("+
data.id+
")' />"+
"</div>");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)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"<input style='color:black;' id='text"+
data.id+
"' value='"+
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 :\\");}
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)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"<select style='color:black;' id='select"+
data.id+
"' onchange='selectchange("+
data.id+
")' />"+
"</div>");break;case UI_OPTION:if(data.parentControl){var parent=$("#select"+data.parentControl);parent.append("<option id='option"+
data.id+
"' value='"+
data.value+
"' "+
data.selected+
">"+
data.label+
"</option>");}
break;case UI_MIN:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){console.log("MIN"+data.value);parent.attr("min",data.value);}} break;case UI_MIN:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){console.log("MIN"+data.value);parent.attr("min",data.value);}}
break;case UI_MAX:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){console.log("MAX"+data.value);parent.attr("max",data.value);}} break;case UI_MAX:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){console.log("MAX"+data.value);parent.attr("max",data.value);}}
break;case UI_STEP:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){console.log("STEP"+data.value);parent.attr("step",data.value);}} break;case UI_STEP:if(data.parentControl){var parent=$("#id"+data.parentControl+" input");if(parent.size()){console.log("STEP"+data.value);parent.attr("step",data.value);}}
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;default:console.error("Unknown type or event");break;} break;case UI_GRAPH:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
if(data.type>=UPDATE_OFFSET&&data.type<UI_INITIAL_GUI){var element=$('#id'+data.id);element.removeClass("turquoise emerald peterriver wetasphalt sunflower carrot alizarin");element.addClass(colorClass(data.color));}};websock.onmessage=handleEvent;} parent.append("<div id='id"+
data.id+
"' class='two columns card tcenter "+
colorClass(data.color)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"WILL BE A GRAPH <input style='color:black;' id='graph"+
data.id+
"' type='number' value='"+
data.value+
"' onchange='numberchange("+
data.id+
")' />"+
"</div>");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)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"WILL BE A GAUGE <input style='color:black;' id='gauge"+
data.id+
"' type='number' value='"+
data.value+
"' onchange='numberchange("+
data.id+
")' />"+
"</div>");break;case UI_ACCEL: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)+
"'>"+
"<h5>"+
data.label+
"</h5><hr/>"+
"WILL BE A ACCEL<div class='accelerometer' id='accel"+
data.id+
"' ><div class='ball"+
data.id+
"'></div><pre class='accelerometeroutput"+
data.id+
"'></pre>"+
"</div>");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);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();console.log("slvalue:"+val+":"+number);websock.send("slvalue:"+val+":"+number);} function sliderchange(number){var val=$("#sl"+number).val();console.log("slvalue:"+val+":"+number);websock.send("slvalue:"+val+":"+number);}
function numberchange(number){var val=$("#num"+number).val();websock.send("nvalue:"+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 textchange(number){var val=$("#text"+number).val();websock.send("tvalue:"+val+":"+number);}
@ -64,4 +240,4 @@ function selectchange(number){var val=$("#select"+number).val();websock.send("sv
function buttonclick(number,isdown){if(isdown)websock.send("bdown:"+number);else websock.send("bup:"+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 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);}} 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(){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);});range.on({'input':function(){$(this).next().html(this.value);},'change':function(){sliderchange($(this).attr('id').replace(/^\D+/g,''));}});});}; var rangeSlider=function(){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);});range.on({input:function(){$(this).next().html(this.value);},change:function(){sliderchange($(this).attr("id").replace(/^\D+/g,""));}});});};

2
examples/gui-newAPI/gui-newAPI.ino
View File

@ -244,7 +244,7 @@ void loop(void) {
static bool testSwitchState = false; static bool testSwitchState = false;
if (millis() - oldTime > 5000) { if (millis() - oldTime > 5000) {
ESPUI.updateControl("Millis:", String(millis())); ESPUI.updateControlValue(millisLabelId, String(millis()));
testSwitchState = !testSwitchState; testSwitchState = !testSwitchState;
ESPUI.updateControlValue("Switch one", testSwitchState ? "1" : "0"); ESPUI.updateControlValue("Switch one", testSwitchState ? "1" : "0");
oldTime = millis(); oldTime = millis();

33
examples/gui/gui.ino
View File

@ -16,7 +16,10 @@ const char *password = "espui";
const char *hostname = "EspuiTest"; const char *hostname = "EspuiTest";
long oldTime = 0; long oldTime = 0;
bool testSwitchState = false; bool testSwitchState = false;
int statusLabelId;
int graphId;
int millisLabelId; int millisLabelId;
int testSwitchId; int testSwitchId;
@ -34,6 +37,21 @@ void slider(Control *sender, int type) {
Serial.print(sender->id); Serial.print(sender->id);
Serial.print(", Value: "); Serial.print(", Value: ");
Serial.println(sender->value); Serial.println(sender->value);
// Like all Control Values in ESPUI slider values are Strings. To use them as int simply do this:
int sliderValueWithOffset = sender->value.toInt() + 100;
Serial.print("SliderValue with offset");
Serial.println(sliderValueWithOffset);
}
void accelCall(Control *sender, int type) {
Serial.print("Accel: ID: ");
Serial.print(sender->id);
Serial.print(", Value: ");
Serial.println(sender->value);
// Like all Control Values in ESPUI accel values are Strings. To use them as int simply do this:
int sliderValueWithOffset = sender->value.toInt() + 100;
Serial.print("Accel with offset");
Serial.println(sliderValueWithOffset);
} }
void buttonCallback(Control *sender, int type) { void buttonCallback(Control *sender, int type) {
@ -52,12 +70,12 @@ void buttonExample(Control *sender, int type) {
switch (type) { switch (type) {
case B_DOWN: case B_DOWN:
Serial.println("Status: Start"); Serial.println("Status: Start");
// ESPUI.updateControl( "Status:", "Start" ); ESPUI.print(statusLabelId, "Start");
break; break;
case B_UP: case B_UP:
Serial.println("Status: Stop"); Serial.println("Status: Stop");
// ESPUI.updateControl( "Status:", "Stop" ); ESPUI.print(statusLabelId, "Stop");
break; break;
} }
} }
@ -188,7 +206,7 @@ void setup(void) {
Serial.print("IP address: "); Serial.print("IP address: ");
Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP()); Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP());
ESPUI.label("Status:", COLOR_TURQUOISE, "Stop"); statusLabelId = ESPUI.label("Status:", COLOR_TURQUOISE, "Stop");
millisLabelId = ESPUI.label("Millis:", COLOR_EMERALD, "0"); millisLabelId = ESPUI.label("Millis:", COLOR_EMERALD, "0");
ESPUI.button("Push Button", &buttonCallback, COLOR_PETERRIVER, "Press"); ESPUI.button("Push Button", &buttonCallback, COLOR_PETERRIVER, "Press");
ESPUI.button("Other Button", &buttonExample, COLOR_WETASPHALT, "Press"); ESPUI.button("Other Button", &buttonExample, COLOR_WETASPHALT, "Press");
@ -201,6 +219,11 @@ void setup(void) {
ESPUI.text("Text Test:", &textCall, COLOR_ALIZARIN, "a Text Field"); ESPUI.text("Text Test:", &textCall, COLOR_ALIZARIN, "a Text Field");
ESPUI.number("Numbertest", &numberCall, COLOR_ALIZARIN, 5, 0, 10); ESPUI.number("Numbertest", &numberCall, COLOR_ALIZARIN, 5, 0, 10);
graphId = ESPUI.graph("Graph Test", COLOR_WETASPHALT);
ESPUI.gauge("Gauge Test", COLOR_WETASPHALT, 58, 0, 100); // Gauge has
ESPUI.accelerometer("Accel Test", &accelCall, COLOR_WETASPHALT);
/* /*
* .begin loads and serves all files from PROGMEM directly. * .begin loads and serves all files from PROGMEM directly.
* If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS * If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS
@ -222,8 +245,12 @@ void loop(void) {
if (millis() - oldTime > 5000) { if (millis() - oldTime > 5000) {
ESPUI.print(millisLabelId, String(millis())); ESPUI.print(millisLabelId, String(millis()));
ESPUI.addGraphPoint(graphId, random(1, 50));
testSwitchState = !testSwitchState; testSwitchState = !testSwitchState;
ESPUI.updateSwitcher(testSwitchId, testSwitchState); ESPUI.updateSwitcher(testSwitchId, testSwitchState);
oldTime = millis(); oldTime = millis();
} }
} }

29
src/ESPUI.cpp
View File

@ -441,6 +441,17 @@ uint16_t ESPUIClass::number(const char *label, void (*callback)(Control *, int),
return numberId; return numberId;
} }
uint16_t ESPUIClass::gauge(const char *label, ControlColor color, int number, int min, int max) {
uint16_t numberId = addControl(ControlType::Gauge, label, String(number), color, Control::noParent);
addControl(ControlType::Min, label, String(min), ControlColor::None, numberId);
addControl(ControlType::Max, label, String(max), ControlColor::None, numberId);
return numberId;
}
uint16_t ESPUIClass::accelerometer(const char *label, void (*callback)(Control *, int), ControlColor color) {
return addControl(ControlType::Accel, label, "", color, Control::noParent, callback);
}
uint16_t ESPUIClass::text(const char *label, void (*callback)(Control *, int), ControlColor color, String value) { uint16_t ESPUIClass::text(const char *label, void (*callback)(Control *, int), ControlColor color, String value) {
return addControl(ControlType::Text, label, value, color, Control::noParent, callback); return addControl(ControlType::Text, label, value, color, Control::noParent, callback);
} }
@ -506,13 +517,14 @@ void ESPUIClass::updateControl(Control *control, int clientId) {
void ESPUIClass::updateControl(uint16_t id, int clientId) { void ESPUIClass::updateControl(uint16_t id, int clientId) {
Control *control = getControl(id); Control *control = getControl(id);
if (control) { if (!control) {
updateControl(control, clientId);
} else {
if (this->verbosity) { if (this->verbosity) {
Serial.println(String("Error: There is no control with ID ") + String(id)); Serial.println(String("Error: There is no control with ID ") + String(id));
} }
return;
} }
updateControl(control, clientId);
} }
void ESPUIClass::updateControlValue(Control *control, String value, int clientId) { void ESPUIClass::updateControlValue(Control *control, String value, int clientId) {
@ -527,13 +539,14 @@ void ESPUIClass::updateControlValue(Control *control, String value, int clientId
void ESPUIClass::updateControlValue(uint16_t id, String value, int clientId) { void ESPUIClass::updateControlValue(uint16_t id, String value, int clientId) {
Control *control = getControl(id); Control *control = getControl(id);
if (control) { if (!control) {
updateControlValue(control, value, clientId);
} else {
if (this->verbosity) { if (this->verbosity) {
Serial.println(String("Error: There is no control with ID ") + String(id)); Serial.println(String("Error: There is no control with ID ") + String(id));
} }
return;
} }
updateControlValue(control, value, clientId);
} }
void ESPUIClass::print(uint16_t id, String value) { updateControlValue(id, value); } void ESPUIClass::print(uint16_t id, String value) { updateControlValue(id, value); }
@ -550,6 +563,10 @@ void ESPUIClass::updateText(uint16_t id, String text, int clientId) { updateCont
void ESPUIClass::updateSelect(uint16_t id, String text, int clientId) { updateControlValue(id, text, clientId); } void ESPUIClass::updateSelect(uint16_t id, String text, int clientId) { updateControlValue(id, text, clientId); }
void ESPUIClass::updateGauge(uint16_t id, int number, int clientId) { updateControlValue(id, String(number), clientId); }
void ESPUIClass::clearGraph(uint16_t id, int clientId) {}
void ESPUIClass::addGraphPoint(uint16_t id, int nValue, int clientId) {}
/* /*
Convert & Transfer Arduino elements to JSON elements Convert & Transfer Arduino elements to JSON elements
Initially this function used to send the control element data individually. Initially this function used to send the control element data individually.

11
src/ESPUI.h
View File

@ -54,6 +54,8 @@ enum ControlType : uint8_t {
Min, Min,
Max, Max,
Step, Step,
Gauge,
Accel,
UpdateOffset = 100, UpdateOffset = 100,
UpdatePad = 101, UpdatePad = 101,
@ -71,6 +73,8 @@ enum ControlType : uint8_t {
UpdateMin, UpdateMin,
UpdateMax, UpdateMax,
UpdateStep, UpdateStep,
UpdateGauge,
UpdateAccel,
InitialGui = 200 InitialGui = 200
}; };
@ -188,6 +192,11 @@ public:
// Output only // Output only
uint16_t label(const char *label, ControlColor color, String value = ""); // Create Label uint16_t label(const char *label, ControlColor color, String value = ""); // Create Label
uint16_t graph(const char *label, ControlColor color); // Create Graph display uint16_t graph(const char *label, ControlColor color); // Create Graph display
uint16_t gauge(const char *label, ControlColor color, int value, int min = 0,
int max = 100); // Create Gauge display
// Input only
uint16_t accelerometer(const char *label, void (*callback)(Control *, int), ControlColor color);
// Update Elements // Update Elements
@ -207,6 +216,8 @@ public:
void updateNumber(uint16_t id, int nValue, int clientId = -1); void updateNumber(uint16_t id, int nValue, int clientId = -1);
void updateText(uint16_t id, String nValue, int clientId = -1); void updateText(uint16_t id, String nValue, int clientId = -1);
void updateSelect(uint16_t id, String nValue, int clientId = -1); void updateSelect(uint16_t id, String nValue, int clientId = -1);
void updateGauge(uint16_t id, int number, int clientId);
void clearGraph(uint16_t id, int clientId = -1); void clearGraph(uint16_t id, int clientId = -1);
void addGraphPoint(uint16_t id, int nValue, int clientId = -1); void addGraphPoint(uint16_t id, int nValue, int clientId = -1);