Merge branch 'master' into dev

2021-06-25 15:52:59 +02:00
parent e9d07eadaa af9aa7d201
commit 2424df0d18
23 changed files with 1045 additions and 986 deletions
--- 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);