diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6864f9..0877c494 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ### Builds after release 0.12.0 +#### Build 2106250 + +- Fixed preset only disabling on second effect/color change + #### Build 2106241 - BREAKING: Added ability for usermods to force a config save if config incomplete. `readFromConfig()` needs to return a `bool` to indicate if the config is complete diff --git a/wled00/led.cpp b/wled00/led.cpp index 2a9daee4..9abe9412 100644 --- a/wled00/led.cpp +++ b/wled00/led.cpp @@ -111,8 +111,7 @@ void colorUpdated(int callMode) { effectChanged = false; if (realtimeTimeout == UINT32_MAX) realtimeTimeout = 0; - if (isPreset) {isPreset = false;} - else {currentPreset = -1;} + currentPreset = -1; //something changed, so we are no longer in the preset notify(callMode); diff --git a/wled00/presets.cpp b/wled00/presets.cpp index 568ff5fc..cdbd82a3 100644 --- a/wled00/presets.cpp +++ b/wled00/presets.cpp @@ -29,7 +29,6 @@ bool applyPreset(byte index) if (!errorFlag) { currentPreset = index; - isPreset = true; return true; } return false; diff --git a/wled00/wled.h b/wled00/wled.h index b562f452..6c989a1d 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2106240 +#define VERSION 2106250 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -562,7 +562,6 @@ WLED_GLOBAL bool doCloseFile _INIT(false); // presets WLED_GLOBAL int16_t currentPreset _INIT(-1); -WLED_GLOBAL bool isPreset _INIT(false); WLED_GLOBAL byte errorFlag _INIT(0);