Ledmaps improvements
index.js: - add global ledmap variable - updateLen conditional draw parameter - draw black out not mapped json.cpp: - add "ledmap" in (de)serializeState (not info) - use loadedLedmap wled.cpp/h: - loadLedMap is boolean, use loadedLedmap for ledmap - show * password liveviewws2D: colorAmp settings2D: add id and name, change max to 255
This commit is contained in:
@@ -448,7 +448,9 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
||||
|
||||
usermods.readFromJsonState(root);
|
||||
|
||||
loadLedmap = root[F("ledmap")] | loadLedmap;
|
||||
//WLEDMM
|
||||
loadedLedmap = root[F("ledmap")] | loadedLedmap;
|
||||
loadLedmap = loadedLedmap>=0; //WLEDMM included 0 to switch back to default
|
||||
|
||||
byte ps = root[F("psave")];
|
||||
if (ps > 0 && ps < 251) savePreset(ps, nullptr, root);
|
||||
@@ -617,6 +619,7 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
|
||||
seg0["stop"] = 0;
|
||||
}
|
||||
}
|
||||
root[F("ledmap")] = loadedLedmap; //WLEDMM ledmaps will be stored in json
|
||||
}
|
||||
|
||||
// begin WLEDMM
|
||||
@@ -872,7 +875,6 @@ void serializeInfo(JsonObject root)
|
||||
default: root[F("e32flashtext")] = F(" (other)"); break;
|
||||
}
|
||||
#endif
|
||||
root[F("ledmap")] = loadedLedmap; //WLEDMM ledmaps will be stored in json/info
|
||||
// end WLEDMM
|
||||
|
||||
root[F("uptime")] = millis()/1000 + rolloverMillis*4294967;
|
||||
|
||||
Reference in New Issue
Block a user