From 89b76b514c5bfe55e3f4c953e9d2c6c75686b5ee Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 26 Jan 2021 00:19:41 +0100 Subject: [PATCH] Settings progress --- wled00/const.h | 3 + wled00/data/settings_leds.htm | 113 ++++++++++++++++------------------ wled00/set.cpp | 21 ++++--- wled00/xml.cpp | 16 +++-- 4 files changed, 76 insertions(+), 77 deletions(-) diff --git a/wled00/const.h b/wled00/const.h index c62d37e5..069f2c6e 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -163,6 +163,9 @@ #define ERR_FS_QUOTA 11 // The FS is full or the maximum file size is reached #define ERR_FS_PLOAD 12 // It was attempted to load a preset that does not exist #define ERR_FS_GENERAL 19 // A general unspecified filesystem error occured +#define ERR_OVERTEMP 30 // An attached temperature sensor has measured above threshold temperature (not implemented) +#define ERR_OVERCURRENT 31 // An attached current sensor has measured a current above the threshold (not implemented) +#define ERR_UNDERVOLT 32 // An attached voltmeter has measured a voltage below the threshold (not implemented) //Timer mode types #define NL_MODE_SET 0 //After nightlight time elapsed, set to target brightness diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index a133a296..4e129138 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -61,17 +61,16 @@ var s = d.getElementsByTagName("select"); for (i=0; i49 && s[i].value!=54) // TYPE_xxxx values from const.h { - o[n].style = "display:inline;"; + o[n].style.display = "inline"; LK.required = true; } else { - o[n].style = "display:none;"; + o[n].style.display = "none"; LK.required = false; LK.value=""; } @@ -123,7 +122,7 @@ } function addLEDs(n) { - if (n>1) {d.maxST=n; d.getElementById("+").style="display:inline;"; return;} + if (n>1) {d.maxST=n; d.getElementById("+").style.display="inline"; return;} var o = d.getElementsByName("iST"); var i = o.length; @@ -141,7 +140,7 @@ s.setAttribute("name","LT"+i); s.onchange = function(){UI()} o = d.createElement("option"); o.text = "WS281x"; o.value = "22"; s.add(o); - o = d.createElement("option"); o.text = "SK6812"; o.value = "30"; s.add(o); + o = d.createElement("option"); o.text = "SK6812 RGBW"; o.value = "30"; s.add(o); o = d.createElement("option"); o.text = "WS2801"; o.value = "50"; s.add(o); o = d.createElement("option"); o.text = "APA102"; o.value = "51"; s.add(o); o = d.createElement("option"); o.text = "LPD8806"; o.value = "52"; s.add(o); @@ -160,29 +159,23 @@ o = d.createElement("option"); o.text = "GBR"; o.value = "5"; s.add(o); t.appendChild(s); - t.appendChild(d.createTextNode(" RGBW: ")); - s = d.createElement("input"); - s.type = "checkbox"; - s.setAttribute("name","EW"+i); - t.appendChild(s); - t.appendChild(d.createElement("br")); - t.appendChild(d.createTextNode("pin:")); + t.appendChild(d.createTextNode("Pin: ")); var e = d.createElement("input"); e.type = "number"; e.value = ""; e.name = "LP"+i; e.min=0; e.max=40; e.required=true; e.onchange=function(){UI()}; t.appendChild(e); var b = d.createElement("div"); b.setAttribute("name","iLK"); - b.appendChild(d.createTextNode(" clk:")); + b.appendChild(d.createTextNode(" Clk: ")); e = d.createElement("input"); e.type = "number"; e.value = ""; e.name = "LK"+i; e.min=0; e.max=40; e.onchange=function(){UI()}; //if (d.getElementsByName("LT"+i)[0].value>49) e.required = true; b.appendChild(e); t.appendChild(b); - t.appendChild(d.createTextNode(" count:")); + t.appendChild(d.createTextNode(" Count: ")); e = d.createElement("input"); e.type = "number"; e.value = "0"; e.name = "LC"+i; e.min=0; e.max=1000; e.required=true; e.oninput = function(){UI()}; t.appendChild(e); @@ -194,16 +187,17 @@ o[--i].remove();--i; } - var p = d.getElementById("+"); - var m = d.getElementById("-"); - if (i0) {m.style="display:inline";} else {m.style="display:none";} + d.getElementById("+").style.display = (i0) ? "inline":"none"; UI(); } function GetV() { //values injected by server while sending HTML + var d=document; + d.um_p=[];addLEDs(3);d.Sf.LC.max=1536;d.Sf.LC.value=120;addLEDs(1);d.Sf.LP0.value=2;d.Sf.LC0.value=120;d.Sf.LT0.value=22;d.Sf.CO0.value=0;d.Sf.MA.value=5400;d.Sf.LA.value=0;d.Sf.CA.value=40;d.Sf.AW.value=3;d.Sf.BO.checked=0;d.Sf.BP.value=3;d.Sf.GB.checked=0;d.Sf.GC.checked=1;d.Sf.TF.checked=1;d.Sf.TD.value=700;d.Sf.PF.checked=0;d.Sf.BF.value=64;d.Sf.TB.value=0;d.Sf.TL.value=60;d.Sf.TW.value=1;d.Sf.PB.selectedIndex=0;d.Sf.RV.checked=0;d.Sf.SL.checked=0;d.Sf.RL.value=12;d.Sf.RM.checked=0;d.Sf.BT.value=0;d.Sf.IR.value=-1;d.Sf.AX.value=-1; + }