From 6180c2f948144a8aed9f6a825a984b25276af760 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Thu, 3 Feb 2022 20:21:09 +0100 Subject: [PATCH 1/4] Fix for overallocated LiveView buffer. --- wled00/ws.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wled00/ws.cpp b/wled00/ws.cpp index 4fd23392a..99cdf4ff1 100644 --- a/wled00/ws.cpp +++ b/wled00/ws.cpp @@ -131,8 +131,8 @@ bool sendLiveLedsWs(uint32_t wsClient) if (!wsc || wsc->queueLength() > 0) return false; //only send if queue free uint16_t used = strip.getLengthTotal(); - uint16_t n = (used -1) /MAX_LIVE_LEDS_WS +1; //only serve every n'th LED if count over MAX_LIVE_LEDS - AsyncWebSocketMessageBuffer * wsBuf = ws.makeBuffer(2 + MIN(used, MAX_LIVE_LEDS_WS)*3); + uint16_t n = (used/MAX_LIVE_LEDS_WS) +1; //only serve every n'th LED if count over MAX_LIVE_LEDS_WS + AsyncWebSocketMessageBuffer * wsBuf = ws.makeBuffer(2 + (used*3)/n); if (!wsBuf) return false; //out of memory uint8_t* buffer = wsBuf->get(); buffer[0] = 'L'; From b33c5798ee3289a6f0c37b31d419e65ebde977e5 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Thu, 3 Feb 2022 23:37:30 +0100 Subject: [PATCH 2/4] Changelog update --- CHANGELOG.md | 10 +++++++++- wled00/wled.h | 2 +- wled00/ws.cpp | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d83f625f0..6895caf35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,17 @@ ### Builds after release 0.12.0 +#### Build 2202030 + +- Switched to binary format for WebSockets peek (PR #2516) +- Playlist bugfix +- Added `extractModeName()` utility function +- Added serial out (PR #2517) +- Added configurable baud rate + #### Build 2201260 -- Initial ESP32-C3 and ESP32-S2 support (PRs #2452, ) +- Initial ESP32-C3 and ESP32-S2 support (PRs #2452, #2454, #2502) - Full segment sync (PR #2427) - Allow overriding of color order by ranges (PR #2463) - Added white channel to Peek diff --git a/wled00/wled.h b/wled00/wled.h index b34ed7972..17eaaa7a2 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2201280 +#define VERSION 2202030 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG diff --git a/wled00/ws.cpp b/wled00/ws.cpp index 99cdf4ff1..5d26a07c6 100644 --- a/wled00/ws.cpp +++ b/wled00/ws.cpp @@ -131,7 +131,7 @@ bool sendLiveLedsWs(uint32_t wsClient) if (!wsc || wsc->queueLength() > 0) return false; //only send if queue free uint16_t used = strip.getLengthTotal(); - uint16_t n = (used/MAX_LIVE_LEDS_WS) +1; //only serve every n'th LED if count over MAX_LIVE_LEDS_WS + uint16_t n = ((used -1)/MAX_LIVE_LEDS_WS) +1; //only serve every n'th LED if count over MAX_LIVE_LEDS_WS AsyncWebSocketMessageBuffer * wsBuf = ws.makeBuffer(2 + (used*3)/n); if (!wsBuf) return false; //out of memory uint8_t* buffer = wsBuf->get(); From 04d59322520b37fc3ca3de76976971c531e176e8 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Fri, 4 Feb 2022 10:10:37 +0100 Subject: [PATCH 3/4] Un-F()-ed some strings (that were either occuring at least 4 times, or were F()-ed in some places and not in others) --- wled00/cfg.cpp | 36 ++++++++++++++++++------------------ wled00/json.cpp | 12 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index f033909c6..7c7fbc4d1 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -76,7 +76,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { JsonObject hw = doc[F("hw")]; // initialize LED pins and lengths prior to other HW (except for ethernet) - JsonObject hw_led = hw[F("led")]; + JsonObject hw_led = hw["led"]; CJSON(strip.ablMilliampsMax, hw_led[F("maxpwr")]); CJSON(strip.milliampsPerLed, hw_led[F("ledma")]); @@ -105,7 +105,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (i>4) break; } - uint16_t length = elm[F("len")] | 1; + uint16_t length = elm["len"] | 1; uint8_t colorOrder = (int)elm[F("order")]; uint8_t skipFirst = elm[F("skip")]; uint16_t start = elm["start"] | 0; @@ -130,8 +130,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { uint8_t s = 0; for (JsonObject entry : hw_com) { if (s > WLED_MAX_COLOR_ORDER_MAPPINGS) break; - uint16_t start = entry[F("start")] | 0; - uint16_t len = entry[F("len")] | 0; + uint16_t start = entry["start"] | 0; + uint16_t len = entry["len"] | 0; uint8_t colorOrder = (int)entry[F("order")]; com.add(start, len, colorOrder); s++; @@ -229,29 +229,29 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (light_gc_col > 1.5) strip.gammaCorrectCol = true; else if (light_gc_col > 0.5) strip.gammaCorrectCol = false; - JsonObject light_tr = light[F("tr")]; - CJSON(fadeTransition, light_tr[F("mode")]); + JsonObject light_tr = light["tr"]; + CJSON(fadeTransition, light_tr["mode"]); int tdd = light_tr["dur"] | -1; if (tdd >= 0) transitionDelayDefault = tdd * 100; CJSON(strip.paletteFade, light_tr["pal"]); JsonObject light_nl = light["nl"]; - CJSON(nightlightMode, light_nl[F("mode")]); + CJSON(nightlightMode, light_nl["mode"]); byte prev = nightlightDelayMinsDefault; - CJSON(nightlightDelayMinsDefault, light_nl[F("dur")]); + CJSON(nightlightDelayMinsDefault, light_nl["dur"]); if (nightlightDelayMinsDefault != prev) nightlightDelayMins = nightlightDelayMinsDefault; CJSON(nightlightTargetBri, light_nl[F("tbri")]); CJSON(macroNl, light_nl["macro"]); - JsonObject def = doc[F("def")]; + JsonObject def = doc["def"]; CJSON(bootPreset, def["ps"]); CJSON(turnOnAtBoot, def["on"]); // true CJSON(briS, def["bri"]); // 128 JsonObject interfaces = doc["if"]; - JsonObject if_sync = interfaces[F("sync")]; + JsonObject if_sync = interfaces["sync"]; CJSON(udpPort, if_sync[F("port0")]); // 21324 CJSON(udpPort2, if_sync[F("port1")]); // 65506 @@ -289,7 +289,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { CJSON(e131Universe, if_live_dmx[F("uni")]); CJSON(e131SkipOutOfSequence, if_live_dmx[F("seqskip")]); CJSON(DMXAddress, if_live_dmx[F("addr")]); - CJSON(DMXMode, if_live_dmx[F("mode")]); + CJSON(DMXMode, if_live_dmx["mode"]); tdd = if_live[F("timeout")] | -1; if (tdd >= 0) realtimeTimeoutMs = tdd * 100; @@ -581,7 +581,7 @@ void serializeConfig() { if (!bus || bus->getLength()==0) break; JsonObject ins = hw_led_ins.createNestedObject(); ins["start"] = bus->getStart(); - ins[F("len")] = bus->getLength(); + ins["len"] = bus->getLength(); JsonArray ins_pin = ins.createNestedArray("pin"); uint8_t pins[5]; uint8_t nPins = bus->getPins(pins); @@ -591,7 +591,7 @@ void serializeConfig() { ins[F("skip")] = bus->skippedLeds(); ins["type"] = bus->getType() & 0x7F; ins["ref"] = bus->isOffRefreshRequired(); - ins[F("rgbw")] = bus->isRgbw(); + //ins[F("rgbw")] = bus->isRgbw(); } JsonArray hw_com = hw.createNestedArray(F("com")); @@ -601,8 +601,8 @@ void serializeConfig() { if (!entry) break; JsonObject co = hw_com.createNestedObject(); - co[F("start")] = entry->start; - co[F("len")] = entry->len; + co["start"] = entry->start; + co["len"] = entry->len; co[F("order")] = entry->colorOrder; } @@ -649,12 +649,12 @@ void serializeConfig() { light_gc["col"] = (strip.gammaCorrectCol) ? 2.8 : 1.0; JsonObject light_tr = light.createNestedObject("tr"); - light_tr[F("mode")] = fadeTransition; + light_tr["mode"] = fadeTransition; light_tr["dur"] = transitionDelayDefault / 100; light_tr["pal"] = strip.paletteFade; JsonObject light_nl = light.createNestedObject("nl"); - light_nl[F("mode")] = nightlightMode; + light_nl["mode"] = nightlightMode; light_nl["dur"] = nightlightDelayMinsDefault; light_nl[F("tbri")] = nightlightTargetBri; light_nl["macro"] = macroNl; @@ -699,7 +699,7 @@ void serializeConfig() { if_live_dmx[F("uni")] = e131Universe; if_live_dmx[F("seqskip")] = e131SkipOutOfSequence; if_live_dmx[F("addr")] = DMXAddress; - if_live_dmx[F("mode")] = DMXMode; + if_live_dmx["mode"] = DMXMode; if_live[F("timeout")] = realtimeTimeoutMs / 100; if_live[F("maxbri")] = arlsForceMaxBri; diff --git a/wled00/json.cpp b/wled00/json.cpp index 58ce9195b..eb3c092c7 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -33,7 +33,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId) uint16_t start = elem["start"] | seg.start; int stop = elem["stop"] | -1; if (stop < 0) { - uint16_t len = elem[F("len")]; + uint16_t len = elem["len"]; stop = (len > 0) ? start + len : seg.stop; } @@ -281,8 +281,8 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId) JsonObject nl = root["nl"]; nightlightActive = nl["on"] | nightlightActive; - nightlightDelayMins = nl[F("dur")] | nightlightDelayMins; - nightlightMode = nl[F("mode")] | nightlightMode; + nightlightDelayMins = nl["dur"] | nightlightDelayMins; + nightlightMode = nl["mode"] | nightlightMode; nightlightTargetBri = nl[F("tbri")] | nightlightTargetBri; JsonObject udpn = root["udpn"]; @@ -403,7 +403,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool fo root["start"] = seg.start; root["stop"] = seg.stop; } - if (!forPreset) root[F("len")] = seg.stop - seg.start; + if (!forPreset) root["len"] = seg.stop - seg.start; root["grp"] = seg.grouping; root[F("spc")] = seg.spacing; root[F("of")] = seg.offset; @@ -465,8 +465,8 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme JsonObject nl = root.createNestedObject("nl"); nl["on"] = nightlightActive; - nl[F("dur")] = nightlightDelayMins; - nl[F("mode")] = nightlightMode; + nl["dur"] = nightlightDelayMins; + nl["mode"] = nightlightMode; nl[F("tbri")] = nightlightTargetBri; if (nightlightActive) { nl[F("rem")] = (nightlightDelayMs - (millis() - nightlightStartTime)) / 1000; // seconds remaining From 97f8eea302f1ad123fd60f3050cbe6dea687501b Mon Sep 17 00:00:00 2001 From: cschwinne Date: Fri, 4 Feb 2022 13:28:00 +0100 Subject: [PATCH 4/4] Refactored isRgbw to hasWhiteChannel() --- wled00/FX.h | 8 ++++++-- wled00/FX_fcn.cpp | 6 +++--- wled00/alexa.cpp | 2 +- wled00/button.cpp | 2 +- wled00/ir.cpp | 38 +++++++++++++++++++------------------- wled00/json.cpp | 6 +++--- wled00/wled.cpp | 2 +- wled00/wled_eeprom.cpp | 2 +- wled00/xml.cpp | 2 +- 9 files changed, 36 insertions(+), 32 deletions(-) diff --git a/wled00/FX.h b/wled00/FX.h index 80abca559..c186fdeb2 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -660,8 +660,6 @@ class WS2812FX { deserializeMap(uint8_t n=0); bool - isRgbw = false, - isOffRefreshRequred = false, //periodic refresh is required for the strip to remain off. gammaCorrectBri = false, gammaCorrectCol = true, applyToAllSelected = true, @@ -864,6 +862,8 @@ class WS2812FX { uint16_t _cumulativeFps = 2; bool + _isOffRefreshRequired = false, //periodic refresh is required for the strip to remain off. + _hasWhiteChannel = false, _triggered; mode_ptr _mode[MODE_COUNT]; // SRAM footprint: 4 bytes per element @@ -925,6 +925,10 @@ class WS2812FX { uint16_t realPixelIndex(uint16_t i), transitionProgress(uint8_t tNr); + + public: + inline bool hasWhiteChannel(void) {return _hasWhiteChannel;} + inline bool isOffRefreshRequired(void) {return _isOffRefreshRequired;} }; //10 names per line diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index d091dbdb5..42a183a7c 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -68,7 +68,7 @@ void WS2812FX::finalizeInit(void) { RESET_RUNTIME; - isRgbw = isOffRefreshRequred = false; + _hasWhiteChannel = _isOffRefreshRequired = false; //if busses failed to load, add default (fresh install, FS issue, ...) if (busses.getNumBusses() == 0) { @@ -93,9 +93,9 @@ void WS2812FX::finalizeInit(void) if (bus == nullptr) continue; if (bus->getStart() + bus->getLength() > MAX_LEDS) break; //RGBW mode is enabled if at least one of the strips is RGBW - isRgbw |= bus->isRgbw(); + _hasWhiteChannel |= bus->isRgbw(); //refresh is required to remain off if at least one of the strips requires the refresh. - isOffRefreshRequred |= bus->isOffRefreshRequired(); + _isOffRefreshRequired |= bus->isOffRefreshRequired(); uint16_t busEnd = bus->getStart() + bus->getLength(); if (busEnd > _length) _length = busEnd; #ifdef ESP8266 diff --git a/wled00/alexa.cpp b/wled00/alexa.cpp index 097ef2ac7..1f85f7ab1 100644 --- a/wled00/alexa.cpp +++ b/wled00/alexa.cpp @@ -83,7 +83,7 @@ void onAlexaChange(EspalexaDevice* dev) seg.setCCT(k, segid); if (seg.cct != cctPrev) effectChanged = true; //send UDP col[0]= 0; col[1]= 0; col[2]= 0; col[3]= 255; - } else if (strip.isRgbw) { + } else if (strip.hasWhiteChannel()) { switch (ct) { //these values empirically look good on RGBW case 199: col[0]=255; col[1]=255; col[2]=255; col[3]=255; break; case 234: col[0]=127; col[1]=127; col[2]=127; col[3]=255; break; diff --git a/wled00/button.cpp b/wled00/button.cpp index 3dd616132..b55df8d0b 100644 --- a/wled00/button.cpp +++ b/wled00/button.cpp @@ -302,7 +302,7 @@ void handleIO() // turn off built-in LED if strip is turned off // this will break digital bus so will need to be reinitialised on On PinOwner ledPinOwner = pinManager.getPinOwner(LED_BUILTIN); - if (!strip.isOffRefreshRequred && (ledPinOwner == PinOwner::None || ledPinOwner == PinOwner::BusDigital)) { + if (!strip.isOffRefreshRequired() && (ledPinOwner == PinOwner::None || ledPinOwner == PinOwner::BusDigital)) { pinMode(LED_BUILTIN, OUTPUT); digitalWrite(LED_BUILTIN, HIGH); } diff --git a/wled00/ir.cpp b/wled00/ir.cpp index 79ebdbe4e..321b72bc2 100644 --- a/wled00/ir.cpp +++ b/wled00/ir.cpp @@ -363,20 +363,20 @@ void decodeIR40(uint32_t code) case IR40_MAGENTA : colorFromUint24(COLOR_MAGENTA); break; case IR40_PINK : colorFromUint24(COLOR_PINK); break; case IR40_WARMWHITE2 : { - if (strip.isRgbw) { colorFromUint32(COLOR2_WARMWHITE2); effectCurrent = 0; } - else colorFromUint24(COLOR_WARMWHITE2); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_WARMWHITE2); effectCurrent = 0; } + else colorFromUint24(COLOR_WARMWHITE2); } break; case IR40_WARMWHITE : { - if (strip.isRgbw) { colorFromUint32(COLOR2_WARMWHITE); effectCurrent = 0; } - else colorFromUint24(COLOR_WARMWHITE); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_WARMWHITE); effectCurrent = 0; } + else colorFromUint24(COLOR_WARMWHITE); } break; case IR40_WHITE : { - if (strip.isRgbw) { colorFromUint32(COLOR2_NEUTRALWHITE); effectCurrent = 0; } - else colorFromUint24(COLOR_NEUTRALWHITE); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_NEUTRALWHITE); effectCurrent = 0; } + else colorFromUint24(COLOR_NEUTRALWHITE); } break; case IR40_COLDWHITE : { - if (strip.isRgbw) { colorFromUint32(COLOR2_COLDWHITE); effectCurrent = 0; } - else colorFromUint24(COLOR_COLDWHITE); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_COLDWHITE); effectCurrent = 0; } + else colorFromUint24(COLOR_COLDWHITE); } break; case IR40_COLDWHITE2 : { - if (strip.isRgbw) { colorFromUint32(COLOR2_COLDWHITE2); effectCurrent = 0; } - else colorFromUint24(COLOR_COLDWHITE2); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_COLDWHITE2); effectCurrent = 0; } + else colorFromUint24(COLOR_COLDWHITE2); } break; case IR40_WPLUS : relativeChangeWhite(10); break; case IR40_WMINUS : relativeChangeWhite(-10, 5); break; case IR40_WOFF : whiteLast = col[3]; col[3] = 0; break; @@ -420,22 +420,22 @@ void decodeIR44(uint32_t code) case IR44_MAGENTA : colorFromUint24(COLOR_MAGENTA); break; case IR44_PINK : colorFromUint24(COLOR_PINK); break; case IR44_WHITE : { - if (strip.isRgbw) { + if (strip.hasWhiteChannel()) { if (col[3] > 0) col[3] = 0; else { colorFromUint32(COLOR2_NEUTRALWHITE); effectCurrent = 0; } } else colorFromUint24(COLOR_NEUTRALWHITE); } break; case IR44_WARMWHITE2 : { - if (strip.isRgbw) { colorFromUint32(COLOR2_WARMWHITE2); effectCurrent = 0; } - else colorFromUint24(COLOR_WARMWHITE2); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_WARMWHITE2); effectCurrent = 0; } + else colorFromUint24(COLOR_WARMWHITE2); } break; case IR44_WARMWHITE : { - if (strip.isRgbw) { colorFromUint32(COLOR2_WARMWHITE); effectCurrent = 0; } - else colorFromUint24(COLOR_WARMWHITE); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_WARMWHITE); effectCurrent = 0; } + else colorFromUint24(COLOR_WARMWHITE); } break; case IR44_COLDWHITE : { - if (strip.isRgbw) { colorFromUint32(COLOR2_COLDWHITE); effectCurrent = 0; } - else colorFromUint24(COLOR_COLDWHITE); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_COLDWHITE); effectCurrent = 0; } + else colorFromUint24(COLOR_COLDWHITE); } break; case IR44_COLDWHITE2 : { - if (strip.isRgbw) { colorFromUint32(COLOR2_COLDWHITE2); effectCurrent = 0; } - else colorFromUint24(COLOR_COLDWHITE2); } break; + if (strip.hasWhiteChannel()) {colorFromUint32(COLOR2_COLDWHITE2); effectCurrent = 0; } + else colorFromUint24(COLOR_COLDWHITE2); } break; case IR44_REDPLUS : relativeChange(&effectCurrent, 1, 0, MODE_COUNT); break; case IR44_REDMINUS : relativeChange(&effectCurrent, -1, 0); break; case IR44_GREENPLUS : relativeChange(&effectPalette, 1, 0, strip.getPaletteCount() -1); break; diff --git a/wled00/json.cpp b/wled00/json.cpp index eb3c092c7..e7453612c 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -418,7 +418,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool fo // to conserve RAM we will serialize the col array manually // this will reduce RAM footprint from ~300 bytes to 84 bytes per segment char colstr[70]; colstr[0] = '['; colstr[1] = '\0'; //max len 68 (5 chan, all 255) - const char *format = strip.isRgbw ? PSTR("[%u,%u,%u,%u]") : PSTR("[%u,%u,%u]"); + const char *format = strip.hasWhiteChannel() ? PSTR("[%u,%u,%u,%u]") : PSTR("[%u,%u,%u]"); for (uint8_t i = 0; i < 3; i++) { byte segcol[4]; byte* c = segcol; @@ -524,13 +524,13 @@ void serializeInfo(JsonObject root) JsonObject leds = root.createNestedObject("leds"); leds[F("count")] = strip.getLengthTotal(); - leds[F("rgbw")] = strip.isRgbw; + leds[F("rgbw")] = strip.hasWhiteChannel(); leds[F("wv")] = false; leds["cct"] = correctWB || strip.hasCCTBus(); switch (Bus::getAutoWhiteMode()) { case RGBW_MODE_MANUAL_ONLY: case RGBW_MODE_DUAL: - if (strip.isRgbw) leds[F("wv")] = true; + if (strip.hasWhiteChannel()) leds[F("wv")] = true; break; } diff --git a/wled00/wled.cpp b/wled00/wled.cpp index f273bfed3..acc96d537 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -177,7 +177,7 @@ void WLED::loop() yield(); - if (!offMode || strip.isOffRefreshRequred) + if (!offMode || strip.isOffRefreshRequired()) strip.service(); #ifdef ESP8266 else if (!noWifiSleep) diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp index dd9a5c95b..0596351d3 100644 --- a/wled00/wled_eeprom.cpp +++ b/wled00/wled_eeprom.cpp @@ -414,7 +414,7 @@ void deEEP() { JsonArray colarr = segObj.createNestedArray("col"); - byte numChannels = (strip.isRgbw)? 4:3; + byte numChannels = (strip.hasWhiteChannel())? 4:3; for (uint8_t k = 0; k < 3; k++) //k=0 primary (i+2) k=1 secondary (i+6) k=2 tertiary color (i+12) { diff --git a/wled00/xml.cpp b/wled00/xml.cpp index ed32a0538..d126b3beb 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -52,7 +52,7 @@ void XML_response(AsyncWebServerRequest *request, char* dest) oappend(SET_F("")); oappendi(effectPalette); oappend(SET_F("")); - if (strip.isRgbw) { + if (strip.hasWhiteChannel()) { oappendi(col[3]); } else { oappend("-1");