From 747c920420b0a1c4b30746ac23efb36c199df580 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Sun, 19 Mar 2023 11:23:59 +0100 Subject: [PATCH] Bugfix. - white overrides & CCT --- wled00/data/settings_leds.htm | 25 +- wled00/html_settings.h | 939 +++++++++++++++++----------------- 2 files changed, 482 insertions(+), 482 deletions(-) diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index e6bbde58d..19cd819d5 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -143,7 +143,7 @@ function UI(change=false) { - var isRGBW = false, memu = 0; + let isRGBW = false, gRGBW = false, memu = 0; gId('ampwarning').style.display = (d.Sf.MA.value > 7200) ? 'inline':'none'; @@ -184,7 +184,7 @@ if (t > 31 && t < 48) d.getElementsByName("LC"+n)[0].value = 1; // for sanity change analog count just to 1 LED } gId("rf"+n).onclick = (t == 31) ? (()=>{return false}) : (()=>{}); // prevent change for TM1814 - isRGBW = ((t > 17 && t < 22) || t == 30 || t == 31 || (t > 40 && t < 46 && t != 43) || t == 88); // RGBW checkbox, TYPE_xxxx values from const.h + gRGBW |= isRGBW = ((t > 17 && t < 22) || t == 30 || t == 31 || (t > 40 && t < 46 && t != 43) || t == 88); // RGBW checkbox, TYPE_xxxx values from const.h gId("co"+n).style.display = ((t >= 80 && t < 96) || (t >= 40 && t < 48)) ? "none":"inline"; // hide color order for PWM gId("dig"+n+"w").style.display = (t == 30 || t == 31) ? "inline":"none"; // show swap channels dropdown if (!(t == 30 || t == 31)) d.getElementsByName("WO"+n)[0].value = 0; // reset swapping @@ -197,11 +197,11 @@ gId("psd"+n).innerHTML = (t >= 40 && t < 48) ? "Index:":"Start:"; // change analog start description } } - // display white channel calculation method - var myC = d.querySelectorAll('.wc'), - l = myC.length; - for (i = 0; i < l; i++) { - myC[i].style.display = (isRGBW) ? 'inline':'none'; + // display global white channel overrides + gId("wc").style.display = (gRGBW) ? 'inline':'none'; + if (!gRGBW) { + d.Sf.AW.selectedIndex = 0; + d.Sf.CR.checked = false; } // check for pin conflicts var LCs = d.getElementsByTagName("input"); @@ -660,8 +660,8 @@ Length: Sunrise

White management

- White Balance correction:
- + White Balance correction:
+
Global override for Auto-calculate white:

- CCT additive blending: % +
+ Calculate CCT from RGB:
+ CCT additive blending: % +

Advanced

Palette blending: