diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0f0d7401d..080e70d08 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,10 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide" - ] -} +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 280b70463..ac081a3f2 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -97,6 +97,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { uint8_t s = 0; // bus iterator if (fromFS) busses.removeAll(); // can't safely manipulate busses directly in network callback uint32_t mem = 0; + bool busesChanged = false; for (JsonObject elm : ins) { if (s >= WLED_MAX_BUSSES) break; uint8_t pins[5] = {255, 255, 255, 255, 255}; @@ -126,10 +127,11 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { } else { if (busConfigs[s] != nullptr) delete busConfigs[s]; busConfigs[s] = new BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode); - doInitBusses = true; + busesChanged = true; } s++; } + doInitBusses = busesChanged; // finalization done in beginStrip() } if (hw_led["rev"]) busses.getBus(0)->reversed = true; //set 0.11 global reversed setting for first bus diff --git a/wled00/set.cpp b/wled00/set.cpp index f338b558e..cde16b801 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -86,6 +86,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) Bus::setAutoWhiteMode(request->arg(F("AW")).toInt()); strip.setTargetFps(request->arg(F("FR")).toInt()); + bool busesChanged = 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 char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; //strip length @@ -120,8 +121,9 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) // actual finalization is done in WLED::loop() (removing old busses and adding new) if (busConfigs[s] != nullptr) delete busConfigs[s]; busConfigs[s] = new BusConfig(type, pins, start, length, colorOrder | (channelSwap<<4), request->hasArg(cv), skip, awmode); - doInitBusses = true; + busesChanged = true; } + //doInitBusses = busesChanged; // we will do that below to ensure all input data is processed ColorOrderMap com = {}; for (uint8_t s = 0; s < WLED_MAX_COLOR_ORDER_MAPPINGS; s++) { @@ -197,6 +199,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) if (t >= 0 && t < 4) strip.paletteBlend = t; t = request->arg(F("BF")).toInt(); if (t > 0) briMultiplier = t; + + doInitBusses = busesChanged; } //UI