Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into mdev

Browse Source
This commit is contained in:
Ewoud
2023-03-26 21:19:11 +02:00
parent 049d0f901d 13678cb8d5
commit 5611a54a1a
11 changed files with 5141 additions and 5083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/cfg.cpp
View File

@@ -367,6 +367,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
int tdd = light_tr["dur"] | -1;
if (tdd >= 0) transitionDelay = transitionDelayDefault = tdd * 100;
CJSON(strip.paletteFade, light_tr["pal"]);
CJSON(randomPaletteChangeTime, light_tr[F("rpc")]);
JsonObject light_nl = light["nl"];
CJSON(nightlightMode, light_nl["mode"]);
@@ -848,6 +849,7 @@ void serializeConfig() {
light_tr["mode"] = fadeTransition;
light_tr["dur"] = transitionDelayDefault / 100;
light_tr["pal"] = strip.paletteFade;
light_tr[F("rpc")] = randomPaletteChangeTime;
JsonObject light_nl = light.createNestedObject("nl");
light_nl["mode"] = nightlightMode;