Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '0_15' into suspend

Browse Source
This commit is contained in:
Blaz Kristan
2024-01-04 17:33:07 +01:00
parent bc85520f5e bd20c83919
commit fc6e7c81d3
32 changed files with 1194 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/presets.cpp
View File

@@ -29,7 +29,7 @@ static void doSaveState() {
if (!requestJSONBufferLock(10)) return; // will set fileDoc
initPresetsFile(); // just in case if someone deleted presets.json using /edit
JsonObject sObj = doc.to<JsonObject>();
JsonObject sObj = pDoc->to<JsonObject>();
DEBUG_PRINTLN(F("Serialize current state"));
if (playlistSave) {
@@ -44,7 +44,7 @@ static void doSaveState() {
/*
#ifdef WLED_DEBUG
DEBUG_PRINTLN(F("Serialized preset"));
serializeJson(doc,Serial);
serializeJson(*pDoc,Serial);
DEBUG_PRINTLN();
#endif
*/
@@ -85,9 +85,9 @@ bool getPresetName(byte index, String& name)
{
if (!requestJSONBufferLock(9)) return false;
bool presetExists = false;
if (readObjectFromFileUsingId(getFileName(), index, &doc))
if (readObjectFromFileUsingId(getFileName(), index, pDoc))
{
JsonObject fdo = doc.as<JsonObject>();
JsonObject fdo = pDoc->as<JsonObject>();
if (fdo["n"]) {
name = (const char*)(fdo["n"]);
presetExists = true;