lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Settings progress

Browse Source
This commit is contained in:
cschwinne 2021-01-26 00:19:41 +01:00
parent c105f3b970
commit 89b76b514c
4 changed files with 76 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wled00/const.h
View File

@ -163,6 +163,9 @@
#define ERR_FS_QUOTA 11 // The FS is full or the maximum file size is reached #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_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_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 //Timer mode types
#define NL_MODE_SET 0 //After nightlight time elapsed, set to target brightness #define NL_MODE_SET 0 //After nightlight time elapsed, set to target brightness

53
wled00/data/settings_leds.htm
View File

@ -61,17 +61,16 @@
var s = d.getElementsByTagName("select"); var s = d.getElementsByTagName("select");
for (i=0; i<s.length; i++) { for (i=0; i<s.length; i++) {
if (s[i].name.substring(0,2)=="LT") { if (s[i].name.substring(0,2)=="LT") {
n=s[i].name.substring(3); n=s[i].name.substring(2);
d.getElementsByName("EW"+n)[0].checked = (parseInt(s[i].value)==30||parseInt(s[i].value)==54); // TYPE_xxxx values from const.h
var LK = d.getElementsByName("LK"+n)[0]; var LK = d.getElementsByName("LK"+n)[0];
var o = d.getElementsByName("iLK"); var o = d.getElementsByName("iLK");
n=(n==""?0:parseInt(n,10)); n=(n==""?0:parseInt(n,10));
if (s[i].value>49 && s[i].value!=54) // TYPE_xxxx values from const.h if (s[i].value>49 && s[i].value!=54) // TYPE_xxxx values from const.h
{ {
o[n].style = "display:inline;"; o[n].style.display = "inline";
LK.required = true; LK.required = true;
} else { } else {
o[n].style = "display:none;"; o[n].style.display = "none";
LK.required = false; LK.required = false;
LK.value=""; LK.value="";
} }
@ -123,7 +122,7 @@
} }
function addLEDs(n) 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 o = d.getElementsByName("iST");
var i = o.length; var i = o.length;
@ -141,7 +140,7 @@
s.setAttribute("name","LT"+i); s.setAttribute("name","LT"+i);
s.onchange = function(){UI()} s.onchange = function(){UI()}
o = d.createElement("option"); o.text = "WS281x"; o.value = "22"; s.add(o); 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 = "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 = "APA102"; o.value = "51"; s.add(o);
o = d.createElement("option"); o.text = "LPD8806"; o.value = "52"; 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); o = d.createElement("option"); o.text = "GBR"; o.value = "5"; s.add(o);
t.appendChild(s); 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.createElement("br"));
t.appendChild(d.createTextNode("pin:")); t.appendChild(d.createTextNode("Pin: "));
var e = d.createElement("input"); 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()}; 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); t.appendChild(e);
var b = d.createElement("div"); var b = d.createElement("div");
b.setAttribute("name","iLK"); b.setAttribute("name","iLK");
b.appendChild(d.createTextNode(" clk:")); b.appendChild(d.createTextNode(" Clk: "));
e = d.createElement("input"); e = d.createElement("input");
e.type = "number"; e.value = ""; e.name = "LK"+i; e.min=0; e.max=40; e.onchange=function(){UI()}; 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; //if (d.getElementsByName("LT"+i)[0].value>49) e.required = true;
b.appendChild(e); b.appendChild(e);
t.appendChild(b); t.appendChild(b);
t.appendChild(d.createTextNode(" count:")); t.appendChild(d.createTextNode(" Count: "));
e = d.createElement("input"); 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()}; 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); t.appendChild(e);
@ -194,16 +187,17 @@
o[--i].remove();--i; o[--i].remove();--i;
} }
var p = d.getElementById("+"); d.getElementById("+").style.display = (i<d.maxST-1) ? "inline":"none";
var m = d.getElementById("-"); d.getElementById("-").style.display = (i>0) ? "inline":"none";
if (i<d.maxST-1) {p.style="display:inline";} else {p.style="display:none";}
if (i>0) {m.style="display:inline";} else {m.style="display:none";}
UI(); UI();
} }
function GetV() function GetV()
{ {
//values injected by server while sending HTML //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;
} }
</script> </script>
<style> <style>
@ -214,18 +208,8 @@
<form id="form_s" name="Sf" method="post"> <form id="form_s" name="Sf" method="post">
<div class="helpB"><button type="button" onclick="H()">?</button></div> <div class="helpB"><button type="button" onclick="H()">?</button></div>
<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr> <button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
<h2>LED &amp; HW setup</h2> <h2>LED &amp; Hardware setup</h2>
Total LED count: <input name="LC" type="number" min="1" max="1500" oninput="UI()" required><br> Total LED count: <input name="LC" type="number" min="1" max="1500" oninput="UI()" required><br>
LED strips
<button type="button" id="+" onclick="addLEDs(1)" style="display:none;">+</button><button type="button" id="-" onclick="addLEDs(-1)" style="display:none;"> - </button><br>
<div id="mLC">
Loading...
</div><hr>
Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()"> Active high? <input type="checkbox" name="RM"><br>
Button pin: <input type="number" min="-1" max="40" name="BT" onchange="UI()"><br>
IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()"><br>
AUX pin: <input type="number" min="-1" max="40" name="AX" onchange="UI()"><hr>
<div id="ledwarning" style="color: orange; display: none;"> <div id="ledwarning" style="color: orange; display: none;">
&#9888; You might run into stability or lag issues.<br> &#9888; You might run into stability or lag issues.<br>
Use less than 1000 LEDs per ESP for the best experience!<br> Use less than 1000 LEDs per ESP for the best experience!<br>
@ -258,7 +242,6 @@
<span id="LAdis" style="display: none;">Custom max. current per LED: <input name="LA" type="number" min="0" max="255" id="la" oninput="UI()" required> mA<br></span> <span id="LAdis" style="display: none;">Custom max. current per LED: <input name="LA" type="number" min="0" max="255" id="la" oninput="UI()" required> mA<br></span>
<i>Keep at default if you are unsure about your type of LEDs.</i><br> <i>Keep at default if you are unsure about your type of LEDs.</i><br>
</div> </div>
<br>
<span class="wc"> <span class="wc">
Auto-calculate white channel from RGB:<br> Auto-calculate white channel from RGB:<br>
<select name="AW"> <select name="AW">
@ -269,6 +252,14 @@
<option value=4>Legacy</option> <option value=4>Legacy</option>
</select> </select>
<br></span> <br></span>
<h3>Hardware setup</h3>
<div id="mLC">LED outputs:</div>
<button type="button" id="+" onclick="addLEDs(1)" style="display:none;border-radius:20px;height:36px;">+</button>
<button type="button" id="-" onclick="addLEDs(-1)" style="display:none;border-radius:20px;width:36px;height:36px;">-</button><br><br>
Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()"> Active high? <input type="checkbox" name="RM"><br>
Button pin: <input type="number" min="-1" max="40" name="BT" onchange="UI()"><br>
IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()"><br>
AUX pin: <input type="number" min="-1" max="40" name="AX" onchange="UI()">
<h3>Defaults</h3> <h3>Defaults</h3>
Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br> Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br> Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br>

21
wled00/set.cpp
View File

@ -86,22 +86,22 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
//busses->removeAll(); //busses->removeAll();
uint8_t colorOrder, type; uint8_t colorOrder, type;
uint16_t length; uint16_t length, start;
uint8_t pins[2] = {255, 255}; uint8_t pins[2] = {255, 255};
for (uint8_t s = 0; s < WLED_MAX_BUSSES; s++) { for (uint8_t s = 0; s < WLED_MAX_BUSSES; s++) {
char lp[4] = "LP"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 char lp[4] = "LP"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
char lk[4] = "LK"; lk[2] = 48+s; lk[3] = 0; char lk[4] = "LK"; lk[2] = 48+s; lk[3] = 0; //strip clock pin. 255 for none
char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; //strip length
char co[4] = "CO"; co[2] = 48+s; co[3] = 0; char co[4] = "CO"; co[2] = 48+s; co[3] = 0; //strip color order
char lt[4] = "LT"; lt[2] = 48+s; lt[3] = 0; char lt[4] = "LT"; lt[2] = 48+s; lt[3] = 0; //strip type
char ls[4] = "LS"; ls[2] = 48+s; ls[3] = 0; char ls[4] = "LS"; ls[2] = 48+s; ls[3] = 0; //strip start LED
char cv[4] = "CV"; cv[2] = 48+s; cv[3] = 0; char cv[4] = "CV"; cv[2] = 48+s; cv[3] = 0; //strip reverse
if (!request->hasArg(lp)) { if (!request->hasArg(lp)) {
DEBUG_PRINTLN("No data."); break; DEBUG_PRINTLN("No data."); break;
} }
pins[0] = request->arg(lp).toInt(); pins[0] = request->arg(lp).toInt();
if ( request->hasArg(lk) ) { if (request->hasArg(lk)) {
pins[1] = (request->arg(lk).length() > 0) ? request->arg(lk).toInt() : 255; pins[1] = (request->arg(lk).length() > 0) ? request->arg(lk).toInt() : 255;
} }
type = request->arg(lt).toInt(); type = request->arg(lt).toInt();
@ -113,7 +113,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
break; // no parameter break; // no parameter
} }
colorOrder = request->arg(co).toInt(); colorOrder = request->arg(co).toInt();
//busses.add(type, pins, 0, length, colorOrder, request->hasArg(cv)); start = (request->hasArg(ls)) ? request->arg(ls).toInt() : 0;
//busses.add(type, pins, start, length, colorOrder, request->hasArg(cv));
} }
ledCount = request->arg(F("LC")).toInt(); ledCount = request->arg(F("LC")).toInt();

16
wled00/xml.cpp
View File

@ -290,11 +290,13 @@ void getSettingsJS(byte subPage, char* dest)
for (uint8_t s=0; s < busses.getNumBusses(); s++){ for (uint8_t s=0; s < busses.getNumBusses(); s++){
Bus* bus = busses.getBus(s); Bus* bus = busses.getBus(s);
char lp[4] = "LP"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 char lp[4] = "LP"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
char lk[4] = "LK"; lk[2] = 48+s; lp[3] = 0; char lk[4] = "LK"; lk[2] = 48+s; lk[3] = 0; //strip clock pin. 255 for none
char lc[4] = "LC"; lc[2] = 48+s; lp[3] = 0; char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; //strip length
char co[4] = "CO"; co[2] = 48+s; lp[3] = 0; char co[4] = "CO"; co[2] = 48+s; co[3] = 0; //strip color order
char lt[4] = "LT"; lt[2] = 48+s; lp[3] = 0; char lt[4] = "LT"; lt[2] = 48+s; lt[3] = 0; //strip type
char ls[4] = "LS"; ls[2] = 48+s; ls[3] = 0; //strip start LED
char cv[4] = "CV"; cv[2] = 48+s; cv[3] = 0; //strip reverse
oappend(SET_F("addLEDs(1);")); oappend(SET_F("addLEDs(1);"));
uint8_t pins[5]; uint8_t pins[5];
uint8_t nPins = bus->getPins(pins); uint8_t nPins = bus->getPins(pins);
@ -303,6 +305,8 @@ void getSettingsJS(byte subPage, char* dest)
sappend('v', lc, bus->getLength()); sappend('v', lc, bus->getLength());
sappend('v',lt,bus->getType()); sappend('v',lt,bus->getType());
sappend('v',co,bus->getColorOrder()); sappend('v',co,bus->getColorOrder());
sappend('v',ls,bus->getStart());
sappend('c',ls,bus->reversed);
} }
sappend('v',SET_F("MA"),strip.ablMilliampsMax); sappend('v',SET_F("MA"),strip.ablMilliampsMax);
sappend('v',SET_F("LA"),strip.milliampsPerLed); sappend('v',SET_F("LA"),strip.milliampsPerLed);
@ -315,7 +319,7 @@ void getSettingsJS(byte subPage, char* dest)
} }
sappend('v',SET_F("CA"),briS); sappend('v',SET_F("CA"),briS);
sappend('c',SET_F("EW"),useRGBW); //sappend('c',SET_F("EW"),useRGBW);
//sappend('i',SET_F("CO"),strip.getColorOrder()); //sappend('i',SET_F("CO"),strip.getColorOrder());
sappend('v',SET_F("AW"),strip.rgbwMode); sappend('v',SET_F("AW"),strip.rgbwMode);