From 3e6728fedb66383ef9881ba47933c327e95f159c Mon Sep 17 00:00:00 2001 From: cschwinne Date: Sun, 28 Nov 2021 01:21:17 +0100 Subject: [PATCH] Only do auto white calc for busses with white channel Revert auto white to global setting Rounded /settings buttons by blazoncek Removed obsolete script from /settings --- wled00/FX_fcn.cpp | 3 +- wled00/bus_manager.h | 25 +- wled00/cfg.cpp | 5 +- wled00/data/settings.htm | 12 +- wled00/data/settings_leds.htm | 29 +- wled00/html_settings.h | 61 +- wled00/html_ui.h | 1589 +++++++++++++++++---------------- wled00/json.cpp | 2 +- wled00/set.cpp | 7 +- wled00/wled.h | 2 +- wled00/xml.cpp | 3 +- 11 files changed, 869 insertions(+), 869 deletions(-) diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index 7c82bf68..a232a2d3 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -1153,4 +1153,5 @@ uint32_t WS2812FX::gamma32(uint32_t color) WS2812FX* WS2812FX::instance = nullptr; int16_t Bus::_cct = -1; -uint8_t Bus::_cctBlend = 0; \ No newline at end of file +uint8_t Bus::_cctBlend = 0; +uint8_t Bus::_autoWhiteMode = RGBW_MODE_DUAL; \ No newline at end of file diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h index 4863014d..bc6b2221 100644 --- a/wled00/bus_manager.h +++ b/wled00/bus_manager.h @@ -49,11 +49,10 @@ struct BusConfig { uint8_t skipAmount; bool refreshReq; uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255}; - uint8_t autoWhite; - BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0, uint8_t aw = 0) { + BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0) { refreshReq = (bool) GET_BIT(busType,7); type = busType & 0x7F; // bit 7 may be/is hacked to include refresh info (1=refresh in off state, 0=no refresh) - count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipAmount = skip; autoWhite = aw; + count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipAmount = skip; uint8_t nPins = 1; if (type >= TYPE_NET_DDP_RGB && type < 96) nPins = 4; //virtual network bus. 4 "pins" store IP address else if (type > 47) nPins = 2; @@ -77,10 +76,9 @@ struct BusConfig { //parent class of BusDigital, BusPwm, and BusNetwork class Bus { public: - Bus(uint8_t type, uint16_t start, uint8_t aw) { + Bus(uint8_t type, uint16_t start) { _type = type; _start = start; - _autoWhiteMode = isRgbw(_type) ? aw : RGBW_MODE_MANUAL_ONLY; }; virtual ~Bus() {} //throw the bus under the bus @@ -96,7 +94,6 @@ class Bus { virtual void setColorOrder() {} virtual uint8_t getColorOrder() { return COL_ORDER_RGB; } virtual uint8_t skippedLeds() { return 0; } - inline uint8_t getAutoWhiteMode() { return _autoWhiteMode; } inline uint16_t getStart() { return _start; } inline void setStart(uint16_t start) { _start = start; } inline uint8_t getType() { return _type; } @@ -110,7 +107,7 @@ class Bus { if (type > TYPE_ONOFF && type <= TYPE_ANALOG_5CH && type != TYPE_ANALOG_3CH) return true; return false; } - static void setCCT(uint16_t cct) { + static void setCCT(uint16_t cct) { _cct = cct; } static void setCCTBlend(uint8_t b) { @@ -121,6 +118,8 @@ class Bus { if (_cctBlend > WLED_MAX_CCT_BLEND) _cctBlend = WLED_MAX_CCT_BLEND; #endif } + inline static void setAutoWhiteMode(uint8_t m) { if (m < 4) _autoWhiteMode = m; } + inline static uint8_t getAutoWhiteMode() { return _autoWhiteMode; } bool reversed = false; @@ -131,7 +130,7 @@ class Bus { uint16_t _len = 1; bool _valid = false; bool _needsRefresh = false; - uint8_t _autoWhiteMode = 0; + static uint8_t _autoWhiteMode; static int16_t _cct; static uint8_t _cctBlend; @@ -152,7 +151,7 @@ class Bus { class BusDigital : public Bus { public: - BusDigital(BusConfig &bc, uint8_t nr) : Bus(bc.type, bc.start, bc.autoWhite) { + BusDigital(BusConfig &bc, uint8_t nr) : Bus(bc.type, bc.start) { if (!IS_DIGITAL(bc.type) || !bc.count) return; if (!pinManager.allocatePin(bc.pins[0], true, PinOwner::BusDigital)) return; _pins[0] = bc.pins[0]; @@ -194,7 +193,7 @@ class BusDigital : public Bus { } void setPixelColor(uint16_t pix, uint32_t c) { - c = autoWhiteCalc(c); + if (_type == TYPE_SK6812_RGBW || _type == TYPE_TM1814) c = autoWhiteCalc(c); if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT if (reversed) pix = _len - pix -1; else pix += _skip; @@ -259,7 +258,7 @@ class BusDigital : public Bus { class BusPwm : public Bus { public: - BusPwm(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) { + BusPwm(BusConfig &bc) : Bus(bc.type, bc.start) { _valid = false; if (!IS_PWM(bc.type)) return; uint8_t numPins = NUM_PWM_PINS(bc.type); @@ -296,7 +295,7 @@ class BusPwm : public Bus { if (_type == TYPE_ANALOG_3CH && _cct >= 1900) { c = colorBalanceFromKelvin(_cct, c); //color correction from CCT } - c = autoWhiteCalc(c); + if (_type != TYPE_ANALOG_3CH) c = autoWhiteCalc(c); uint8_t r = R(c); uint8_t g = G(c); uint8_t b = B(c); @@ -408,7 +407,7 @@ class BusPwm : public Bus { class BusNetwork : public Bus { public: - BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) { + BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start) { _valid = false; // switch (bc.type) { // case TYPE_NET_ARTNET_RGB: diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index b3067406..3f1e1690 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -79,7 +79,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { CJSON(strip.ablMilliampsMax, hw_led[F("maxpwr")]); CJSON(strip.milliampsPerLed, hw_led[F("ledma")]); - uint8_t rgbwMode = hw_led[F("rgbwm")] | RGBW_MODE_DUAL; // use global setting (legacy) + Bus::setAutoWhiteMode(hw_led[F("rgbwm")] | Bus::getAutoWhiteMode()); CJSON(correctWB, hw_led["cct"]); CJSON(cctFromRgb, hw_led[F("cr")]); CJSON(strip.cctBlending, hw_led[F("cb")]); @@ -109,12 +109,11 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { uint16_t start = elm["start"] | 0; if (length==0 || start + length > MAX_LEDS) continue; // zero length or we reached max. number of LEDs, just stop uint8_t ledType = elm["type"] | TYPE_WS2812_RGB; - uint8_t awMode = elm[F("rgbwm")] | rgbwMode; bool reversed = elm["rev"]; bool refresh = elm["ref"] | false; ledType |= refresh << 7; // hack bit 7 to indicate strip requires off refresh s++; - BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, awMode); + BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst); mem += BusManager::memUsage(bc); if (mem <= MAX_LED_MEMORY && busses.getNumBusses() <= WLED_MAX_BUSSES) busses.add(bc); // finalization will be done in WLED::beginStrip() } diff --git a/wled00/data/settings.htm b/wled00/data/settings.htm index 6cb09f83..66fcaeae 100644 --- a/wled00/data/settings.htm +++ b/wled00/data/settings.htm @@ -17,23 +17,15 @@ color: #fff; font-family: Verdana, Helvetica, sans-serif; border: 1px solid #333; + border-radius: var(--h); font-size: 6vmin; height: var(--h); width: 95%; margin-top: 2vh; } - - +
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 6060f7db..34ccf90e 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -170,7 +170,6 @@ gId("dig"+n+"r").style.display = (t>=80 && t<96) ? "none":"inline"; // hide reversed for virtual gId("dig"+n+"s").style.display = ((t>=80 && t<96) || (t > 40 && t < 48)) ? "none":"inline"; // hide skip 1st for virtual & analog gId("dig"+n+"f").style.display = (t>=16 && t<32 || t>=50 && t<64) ? "inline":"none"; // hide refresh - gId("dig"+n+"a").style.display = (isRGBW) ? "inline":"none"; // auto calculate white gId("rev"+n).innerHTML = (t > 40 && t < 48) ? "Inverted output":"Reversed (rotated 180°)"; // change reverse text for analog gId("psd"+n).innerHTML = (t > 40 && t < 48) ? "Index:":"Start:"; // change analog start description } @@ -306,10 +305,11 @@ ${i+1}: - + - + + @@ -334,8 +334,7 @@ ${i+1}:

Reversed:

Skip 1st LED:
-

Off Refresh:  
-

Auto-calculate white channel from RGB:
 
+

Off Refresh:
`; f.insertAdjacentHTML("beforeend", cn); } @@ -402,9 +401,9 @@ ${i+1}: } if (!o.files) { - alert("This browser doesn't seem to support the `files` property of file inputs."); + alert("This browser doesn't support the `files` property of file inputs."); } else if (!o.files[0]) { - alert("Please select a JSON file before clicking 'Apply'"); + alert("Please select a JSON file first!"); } else { f = o.files[0]; fr = new FileReader(); @@ -510,9 +509,6 @@ ${i+1}:
Make a segment for each output:
Custom bus start indices:
- White Balance correction:
- Calculate CCT from RGB:
- CCT additive blending: %%
Touch threshold:
@@ -554,6 +550,19 @@ ${i+1}: +

White management

+ White Balance correction:
+ + Auto-calculate white channel from RGB:
+ +
+ Calculate CCT from RGB:
+ CCT additive blending: %%

Advanced

Palette blending: