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

Merge branch 'mdev' into DMX-Input-esp_dmx

Browse Source
This commit is contained in:
Will Tatam
2023-03-30 15:26:05 +01:00
parent 63c31f1adf fd658fcc32
commit db812439ff
26 changed files with 3495 additions and 3413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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"]);
@@ -491,6 +492,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
CJSON(netDebugPrintIP[i], if_ndb_ip[i]);
CJSON(netDebugPrintPort, if_ndb["port"]);
CJSON(netDebugEnabled, if_ndb["enabled"]);
// USER_PRINTF("deserializeConfig %d\n", netDebugEnabled);
pinManager.manageDebugTXPin();
#endif
JsonObject if_ntp = interfaces[F("ntp")];
@@ -853,6 +856,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;
@@ -965,6 +969,7 @@ void serializeConfig() {
}
if_ndb["port"] = netDebugPrintPort;
if_ndb["enabled"] = netDebugEnabled;
// USER_PRINTF("serializeConfig %d\n", netDebugEnabled);
#endif
JsonObject if_ntp = interfaces.createNestedObject("ntp");