Skip to content

Improve Boot preset handling #5573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willmmiles merged 14 commits into from
May 15, 2026
Merged

Improve Boot preset handling #5573

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f0e182b
Fix boot preset live data override handling
smitty078 May 7, 2026
88994e9
Merge branch 'wled:main' into boot-preset-handling
smitty078 May 7, 2026
83065c1
Initial implementation to apply the same improvements to boot playlist
smitty078 May 7, 2026
c8f50e6
Add TODO for boot preset and playlist scenarios
smitty078 May 7, 2026
0cd7097
Changes to implementation based on discussion.
smitty078 May 9, 2026
cfe7bad
call releaseJSONBufferLock() before returning so that the JSON buffer…
smitty078 May 9, 2026
b185a02
Merge branch 'wled:main' into boot-preset-handling
smitty078 May 11, 2026
8793db3
revert whitespace correction to avoid conflicts with other PRs
smitty078 May 11, 2026
722d6e8
Numerous changes based on conversation
smitty078 May 13, 2026
6641724
Consistency check to eliminate unneccesary conflicts
smitty078 May 13, 2026
a1a22ec
Merge branch 'wled:main' into boot-preset-handling-new
smitty078 May 13, 2026
f5ef3f9
Final conflict resolution
smitty078 May 13, 2026
741037a
Fix missing semi-colon and another error. Thanks coderabbit
smitty078 May 13, 2026
8e501d9
Do not reassign callMode, revert whitespace error
smitty078 May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions wled00/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
if (root["win"].isNull() && getVal(root["ps"], presetCycCurr, 1, 250) && presetCycCurr > 0 && presetCycCurr < 251 && presetCycCurr != currentPreset) {
DEBUG_PRINTF_P(PSTR("Preset select: %d\n"), presetCycCurr);
// b) preset ID only or preset that does not change state (use embedded cycling limits if they exist in getVal())
if (callMode == CALL_MODE_INIT) callMode = CALL_MODE_DIRECT_CHANGE // avoid propogating CALL_MODE_INIT, which may cause accidental recursion.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
applyPreset(presetCycCurr, callMode); // async load from file system (only preset ID was specified)
return stateResponse;
} else presetCycCurr = currentPreset; // restore presetCycCurr
Expand Down
6 changes: 3 additions & 3 deletions wled00/presets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ void handlePresets()
changePreset = true;
} else {
if (!fdo["seg"].isNull() || !fdo["on"].isNull() || !fdo["bri"].isNull() || !fdo["nl"].isNull() || !fdo["ps"].isNull() || !fdo[F("playlist")].isNull()) changePreset = true;
if (!(tmpMode == CALL_MODE_BUTTON_PRESET && fdo["ps"].is<const char *>() && strchr(fdo["ps"].as<const char *>(),'~') != strrchr(fdo["ps"].as<const char *>(),'~')))
fdo.remove("ps"); // remove load request for presets to prevent recursive crash (if not called by button and contains preset cycling string "1~5~")
if (!(tmpMode == CALL_MODE_INIT || (tmpMode == CALL_MODE_BUTTON_PRESET && fdo["ps"].is<const char *>() && strchr(fdo["ps"].as<const char *>(),'~') != strrchr(fdo["ps"].as<const char *>(),'~'))))
fdo.remove("ps"); // remove load request for presets to prevent recursive crash (if not called by boot preset or button which contains preset cycling string "1~5~")
deserializeState(fdo, CALL_MODE_NO_NOTIFY, tmpPreset); // may change presetToApply by calling applyPreset()
}
if (!errorFlag && tmpPreset < 255 && changePreset) currentPreset = tmpPreset;
Expand Down Expand Up @@ -282,4 +282,4 @@ void deletePreset(byte index) {
writeObjectToFileUsingId(getPresetsFileName(), index, &empty);
presetsModifiedTime = toki.second(); //unix time
updateFSInfo();
}
}w
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
6 changes: 6 additions & 0 deletions wled00/wled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,12 @@ void WLED::setup()

if (needsCfgSave) serializeConfigToFS(); // usermods required new parameters; need to wait for strip to be initialised #4752

if (bootPreset > 0) {
handlePresets(); // handle boot preset
handlePlaylist(); // handle playlist if preset queued one
handlePresets(); // handle presets again to give a chance for anything queued by the boot preset or playlist
}

if (strcmp(multiWiFi[0].clientSSID, DEFAULT_CLIENT_SSID) == 0 && !configBackupExists())
showWelcomePage = true;

Expand Down