From 806221bc3f3ea9a29543f6b9decf1365721caf30 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Sun, 28 Mar 2021 17:31:05 +0200
Subject: [PATCH] Move RGBW activation to wled.cpp

---
 wled00/set.cpp  | 5 +++--
 wled00/wled.cpp | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wled00/set.cpp b/wled00/set.cpp
index f5ff02db..04e5827c 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -88,7 +88,6 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     uint8_t colorOrder, type;
     uint16_t length, start;
     uint8_t pins[5] = {255, 255, 255, 255, 255};
-    useRGBW = false;
 
     for (uint8_t s = 0; s < WLED_MAX_BUSSES; s++) {
       char lp[4] = "L0"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
@@ -106,7 +105,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
         pins[i] = (request->arg(lp).length() > 0) ? request->arg(lp).toInt() : 255;
       }
       type = request->arg(lt).toInt();
-      //if (BusManager::isRgbw(type)) useRGBW = true; //30fps
+      //if (isRgbw(type)) useRGBW = true; //30fps
+      //useRGBW = true;
       
       if (request->hasArg(lc) && request->arg(lc).toInt() > 0) {
         length = request->arg(lc).toInt();
@@ -120,6 +120,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       if (busConfigs[s] != nullptr) delete busConfigs[s];
       busConfigs[s] = new BusConfig(type, pins, start, length, colorOrder, request->hasArg(cv));
       //if (BusManager::isRgbw(type)) useRGBW = true; //20fps
+      //useRGBW = true;
       doInitBusses = true;
     }
 
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 77de4200..f5ff81c6 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -241,10 +241,12 @@ void WLED::loop()
     doInitBusses = false;
     busses.removeAll();
     uint32_t mem = 0;
+    //useRGBW = false;
     for (uint8_t i = 0; i < WLED_MAX_BUSSES; i++) {
       if (busConfigs[i] == nullptr) break;
       mem += busses.memUsage(*busConfigs[i]);
       if (mem <= MAX_LED_MEMORY) busses.add(*busConfigs[i]);
+      //if (BusManager::isRgbw(busConfigs[i]->type)) useRGBW = true;
       delete busConfigs[i]; busConfigs[i] = nullptr;
     }
     strip.finalizeInit(useRGBW, ledCount, skipFirstLed);