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

Included effect and palette lists in LED settings

Browse Source
This commit is contained in:
cschwinne 2019-02-25 22:23:26 +01:00
parent 587cf751d8
commit 62a2246448
4 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wled00/data/settings_leds.htm
View File

Binary file not shown.

50
wled00/html_settings.h
View File

@ -67,14 +67,14 @@ AP IP: <span class="sip"> Not active </span><hr>
//LED settings //LED settings
const char PAGE_settings_leds[] PROGMEM = R"=====(<!DOCTYPE html> const char PAGE_settings_leds[] PROGMEM = R"=====(<!DOCTYPE html>
<html><head><meta name="viewport" content="width=500"> <html><head><meta name="viewport" content="width=500">
<title>LED Settings</title><script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");}function B(){window.history.back();}function S(){GetV();UI();}function UI(){ <title>LED Settings</title><script>var f=0,p=0;function H()
var myC=document.querySelectorAll('.wc'),l=myC.length; {window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");}
for (i = 0; i < l; i++){myC[i].style.display=(document.getElementById('rgbw').checked)?'inline':'none';} function B(){window.open("/settings","_self");}function S(){GetV();setTimeout(function(){fillfx(0);},200);setTimeout(function(){fillfx(1);},400);UI();}
var val=Math.ceil((100+document.Sf.LC.value*55)/500)/2; function UI(){var myC=document.querySelectorAll('.wc'),l=myC.length;for(i=0;i<l;i++){myC[i].style.display=(document.getElementById('rgbw').checked)?'inline':'none';}
val=(val>5)?Math.ceil(val):val;var s=""; var val=Math.ceil((100+document.Sf.LC.value*55)/500)/2;val=(val>5)?Math.ceil(val):val;var s="";if(val<1.02){s="ESP 5V pin with 1A USB supply";}else{s="External 5V ";s+=val;s+="A supply connected to LEDs";}document.getElementById('psu').innerHTML=s;}
if (val<1.1){s="ESP 5V pin with 1A USB supply";}else{s="External 5V ";s+=val;s+="A supply connected to LEDs";} function fillfx(pl){e="<option>Error loading list!</option>";el=pl?Sf.FP:Sf.FX;fetch(pl?'/json/palettes':'/json/effects').then(res=>{if(!res.ok){el.innerHTML=e;}
document.getElementById('psu').innerHTML=s;document.getElementById('ps2').innerHTML=val+"A = "+val*1000; return res.json();}).then(json=>{var x="";var l=pl?json.palettes:json.effects;for(i in l){x+="<option value=\""+i+"\">"+l[i]+" ("+i+")</option>";}
}function GetV(){var d=document;%CSS%%SCSS%</head> el.innerHTML=x;el.selectedIndex=pl?p:f;}).catch(function(){el.innerHTML=e;})}function GetV(){var d=document;%CSS%%SCSS%</head>
<body onload="S()"> <body onload="S()">
<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>
@ -97,26 +97,34 @@ Color order:
<option value="2">BRG</option> <option value="2">BRG</option>
<option value="3">RBG</option></select> <option value="3">RBG</option></select>
<h3>Defaults</h3> <h3>Defaults</h3>
Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br><br> Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
Default RGB color: Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br>
Set current color, brightness and effects as boot default: <input type="checkbox" name="IS"><br>
Set current preset cycle setting as boot default: <input type="checkbox" name="PC">
<br>- <i>or</i> -<br>
Apply preset <input name="BP" type="number" min="0" max="25" required> at boot (0 uses defaults)
<br>- <i>or</i> -<br>
Default RGB<span class="wc">W</span> color:<br>
<input name="CR" type="number" min="0" max="255" required> <input name="CR" type="number" min="0" max="255" required>
<input name="CG" type="number" min="0" max="255" required> <input name="CG" type="number" min="0" max="255" required>
<input name="CB" type="number" min="0" max="255" required><br> <input name="CB" type="number" min="0" max="255" required>
<span class="wc">Default white value: <input name="CW" type="number" min="0" max="255" required><br> <span class="wc"><input name="CW" type="number" min="0" max="255" required><br>
Auto-calculate white from RGB instead: <input type="checkbox" name="AW"><br></span> Auto-calculate white from RGB instead: <input type="checkbox" name="AW"></span><br>
Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br>
Default effect ID: <input name="FX" type="number" min="0" max="79" required><br>
Default effect speed: <input name="SX" type="number" min="0" max="255" required><br>
Default effect intensity: <input name="IX" type="number" min="0" max="255" required><br>
Default effect palette: <input name="FP" type="number" min="0" max="255" required><br>
Default secondary RGB<span class="wc">W</span>:<br> Default secondary RGB<span class="wc">W</span>:<br>
<input name="SR" type="number" min="0" max="255" required> <input name="SR" type="number" min="0" max="255" required>
<input name="SG" type="number" min="0" max="255" required> <input name="SG" type="number" min="0" max="255" required>
<input name="SB" type="number" min="0" max="255" required> <input name="SB" type="number" min="0" max="255" required>
<span class="wc"><input name="SW" type="number" min="0" max="255" required></span><br> <span class="wc"><input name="SW" type="number" min="0" max="255" required></span><br>
Ignore and use current color, brightness and effects: <input type="checkbox" name="IS"><br><br> Default effect ID:<br>
Apply preset <input name="BP" type="number" min="0" max="25" required> at boot (0 uses defaults)<br> <select name="FX">
Save current preset cycle configuration as boot default: <input type="checkbox" name="PC"><br><br> <option>Loading...</option>
</select>
<br>Default color palette:<br>
<select name="FP">
<option>Loading...</option>
</select><br>
Default effect speed: <input name="SX" type="number" min="0" max="255" required><br>
Default effect intensity: <input name="IX" type="number" min="0" max="255" required><br><br>
Use Gamma correction for color: <input type="checkbox" name="GC"> (strongly recommended)<br> Use Gamma correction for color: <input type="checkbox" name="GC"> (strongly recommended)<br>
Use Gamma correction for brightness: <input type="checkbox" name="GB"> (not recommended)<br><br> Use Gamma correction for brightness: <input type="checkbox" name="GB"> (not recommended)<br><br>
Brightness factor: <input name="BF" type="number" min="0" max="255" required> %% Brightness factor: <input name="BF" type="number" min="0" max="255" required> %%

2
wled00/wled00.ino
View File

@ -86,7 +86,7 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1902222 #define VERSION 1902251
char versionString[] = "0.8.4-dev"; char versionString[] = "0.8.4-dev";

8
wled00/wled02_xml.ino
View File

@ -22,7 +22,6 @@ void XML_response(AsyncWebServerRequest *request, bool includeTheme)
oappendi(colSec[i]); oappendi(colSec[i]);
oappend("</cs>"); oappend("</cs>");
} }
oappend("<ns>"); oappend("<ns>");
oappendi(notifyDirect); oappendi(notifyDirect);
oappend("</ns><nr>"); oappend("</ns><nr>");
@ -242,10 +241,13 @@ void getSettingsJS(byte subPage)
sappend('v',"SW",colSecS[3]); sappend('v',"SW",colSecS[3]);
sappend('c',"BO",turnOnAtBoot); sappend('c',"BO",turnOnAtBoot);
sappend('v',"BP",bootPreset); sappend('v',"BP",bootPreset);
sappend('v',"FX",effectDefault); oappend("f=");
oappendi(effectDefault);
oappend(";p=");
oappendi(effectPaletteDefault);
oappend(";");
sappend('v',"SX",effectSpeedDefault); sappend('v',"SX",effectSpeedDefault);
sappend('v',"IX",effectIntensityDefault); sappend('v',"IX",effectIntensityDefault);
sappend('v',"FP",effectPaletteDefault);
sappend('c',"GB",useGammaCorrectionBri); sappend('c',"GB",useGammaCorrectionBri);
sappend('c',"GC",useGammaCorrectionRGB); sappend('c',"GC",useGammaCorrectionRGB);
sappend('c',"TF",fadeTransition); sappend('c',"TF",fadeTransition);