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

Fixed Auto White mode setting (fixes #1088)

Browse Source
This commit is contained in:
cschwinne 2020-08-10 23:35:18 +02:00
parent 34a4a89bc9
commit 5a4b719995
4 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
### Development versions after 0.10.0 release ### Development versions after 0.10.0 release
#### Build 2008100
- Fixed Auto White calculation dropdown (fixed #1088)
#### Build 2008070 #### Build 2008070
- Added segment mirroring (`mi` property) (#1017) - Added segment mirroring (`mi` property) (#1017)

10
wled00/data/settings_leds.htm
View File

@ -130,7 +130,15 @@
<br> <br>
LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW" onchange=UI() id="rgbw"><br> LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW" onchange=UI() id="rgbw"><br>
<span class="wc"> <span class="wc">
Auto-calculate white channel from RGB: <input type="checkbox" name="AW"><br></span> Auto-calculate white channel from RGB:<br>
<select name=AW>
<option value=0>None</option>
<option value=1>Brighter</option>
<option value=2>Accurate</option>
<option value=3>Dual</option>
<option value=4>Legacy</option>
</select>
<br></span>
Color order: Color order:
<select name="CO"> <select name="CO">
<option value=0>GRB</option> <option value=0>GRB</option>

56
wled00/html_settings.h
View File

@ -100,32 +100,34 @@ id="la" oninput="UI()" required> mA<br></span><i>
Keep at default if you are unsure about your type of LEDs.</i><br></div><br> Keep at default if you are unsure about your type of LEDs.</i><br></div><br>
LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW" LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW"
onchange="UI()" id="rgbw"><br><span class="wc"> onchange="UI()" id="rgbw"><br><span class="wc">
Auto-calculate white channel from RGB: <input type="checkbox" name="AW"><br> Auto-calculate white channel from RGB:<br><select name="AW"><option value="0">
</span>Color order: <select name="CO"><option value="0">GRB</option><option None</option><option value="1">Brighter</option><option value="2">Accurate
value="1">RGB</option><option value="2">BRG</option><option value="3">RBG </option><option value="3">Dual</option><option value="4">Legacy</option>
</option><option value="4">BGR</option><option value="5">GBR</option></select> </select><br></span>Color order: <select name="CO"><option value="0">GRB
<h3>Defaults</h3>Turn LEDs on after power up/reset: <input type="checkbox" </option><option value="1">RGB</option><option value="2">BRG</option><option
name="BO"><br>Default brightness: <input name="CA" type="number" min="0" value="3">RBG</option><option value="4">BGR</option><option value="5">GBR
max="255" required> (0-255)<br><br>Apply preset <input name="BP" type="number" </option></select><h3>Defaults</h3>Turn LEDs on after power up/reset: <input
min="0" max="16" required> at boot (0 uses defaults)<br>- <i>or</i> -<br> type="checkbox" name="BO"><br>Default brightness: <input name="CA"
Set current preset cycle setting as boot default: <input type="checkbox" type="number" min="0" max="255" required> (0-255)<br><br>Apply preset <input
name="PC"><br><br>Use Gamma correction for color: <input type="checkbox" name="BP" type="number" min="0" max="16" required> at boot (0 uses defaults)<br>
name="GC"> (strongly recommended)<br>Use Gamma correction for brightness: <input - <i>or</i> -<br>Set current preset cycle setting as boot default: <input
type="checkbox" name="GB"> (not recommended)<br><br>Brightness factor: <input type="checkbox" name="PC"><br><br>Use Gamma correction for color: <input
name="BF" type="number" min="1" max="255" required> %<h3>Transitions</h3> type="checkbox" name="GC"> (strongly recommended)<br>
Crossfade: <input type="checkbox" name="TF"><br>Transition Time: <input Use Gamma correction for brightness: <input type="checkbox" name="GB">
name="TD" maxlength="5" size="2"> ms<br>Enable Palette transitions: <input (not recommended)<br><br>Brightness factor: <input name="BF" type="number"
type="checkbox" name="PF"><h3>Timed light</h3>Default Duration: <input min="1" max="255" required> %<h3>Transitions</h3>Crossfade: <input
name="TL" type="number" min="1" max="255" required> min<br> type="checkbox" name="TF"><br>Transition Time: <input name="TD" maxlength="5"
Default Target brightness: <input name="TB" type="number" min="0" max="255" size="2"> ms<br>Enable Palette transitions: <input type="checkbox" name="PF">
required><br>Mode: <select name="TW"><option value="0">Wait and set</option> <h3>Timed light</h3>Default Duration: <input name="TL" type="number" min="1"
<option value="1">Fade</option><option value="2">Fade Color</option><option max="255" required> min<br>Default Target brightness: <input name="TB"
value="3">Sunrise</option></select><h3>Advanced</h3>Palette blending: <select type="number" min="0" max="255" required><br>Mode: <select name="TW"><option
name="PB"><option value="0">Linear (wrap if moving)</option><option value="1"> value="0">Wait and set</option><option value="1">Fade</option><option value="2">
Linear (always wrap)</option><option value="2">Linear (never wrap)</option> Fade Color</option><option value="3">Sunrise</option></select><h3>Advanced</h3>
<option value="3">None (not recommended)</option></select><br> Palette blending: <select name="PB"><option value="0">Linear (wrap if moving)
Reverse LED order (rotate 180): <input type="checkbox" name="RV"><br> </option><option value="1">Linear (always wrap)</option><option value="2">
Skip first LED: <input type="checkbox" name="SL"><hr><button type="button" Linear (never wrap)</option><option value="3">None (not recommended)</option>
</select><br>Reverse LED order (rotate 180): <input type="checkbox" name="RV">
<br>Skip first LED: <input type="checkbox" name="SL"><hr><button type="button"
onclick="B()">Back</button><button type="submit">Save</button></form></body> onclick="B()">Back</button><button type="submit">Save</button></form></body>
</html>)====="; </html>)=====";
@ -213,7 +215,7 @@ type="checkbox" name="ES"><br>DMX start address: <input name="DA" type="number"
min="0" max="510" required><br>DMX mode: <select name="DM"><option value="0"> min="0" max="510" required><br>DMX mode: <select name="DM"><option value="0">
Disabled</option><option value="1">Single RGB</option><option value="2"> Disabled</option><option value="1">Single RGB</option><option value="2">
Single DRGB</option><option value="3">Effect</option><option value="4">Multi RGB Single DRGB</option><option value="3">Effect</option><option value="4">Multi RGB
</option><option value="5">Multi DRGB</option></select><br><a </option><option value="5">Dimmer + Multi RGB</option></select><br><a
href="https://github.com/Aircoookie/WLED/wiki/E1.31-DMX" target="_blank"> href="https://github.com/Aircoookie/WLED/wiki/E1.31-DMX" target="_blank">
E1.31 info</a><br>Timeout: <input name="ET" type="number" min="1" max="65000" E1.31 info</a><br>Timeout: <input name="ET" type="number" min="1" max="65000"
required> ms<br>Force max brightness: <input type="checkbox" name="FB"><br> required> ms<br>Force max brightness: <input type="checkbox" name="FB"><br>

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2007190 #define VERSION 2008100
// ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS). // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).