From 7ec09c80a50f5c5b455d76b44496452b8f235795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Kristan?= <blaz@kristan-sp.si>
Date: Fri, 4 Jun 2021 06:54:27 +0200
Subject: [PATCH] Changed boot preset apply logic.

---
 wled00/button.cpp      | 2 +-
 wled00/html_settings.h | 2 +-
 wled00/wled.cpp        | 7 ++++---
 wled00/wled.h          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/wled00/button.cpp b/wled00/button.cpp
index 01462b0fc..afe10e02a 100644
--- a/wled00/button.cpp
+++ b/wled00/button.cpp
@@ -96,7 +96,7 @@ void handleAnalog(uint8_t b)
 
   if (buttonType[b] == BTN_TYPE_ANALOG_INVERTED) aRead = 255 - aRead;
 
-  // remove noise & reduce frequency of UI updates
+  // remove noise & reduce frequency of UI updates (3*13mV)
   aRead &= 0xFC;
 
   if (oldRead[b] == aRead) return;  // no change in reading
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 55ec4404f..697ca90fa 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -354,7 +354,7 @@ Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250"
 required><br><h3>Button actions</h3><table style="margin:0 auto" id="macros">
 <thead><tr><td>push<br>switch</td><td>short<br>on-&gt;off</td><td>long<br>
 off-&gt;on</td><td>double<br>N/A</td></tr></thead><tbody></tbody></table><div>
-For analog button set <i>duble</i> to:<ul><li>250=global brightness</li><li>
+For analog button set <i>double</i> to:<ul><li>250=global brightness</li><li>
 249=effect speed</li><li>248=effect intensity</li><li>247=palette</li><li>
 200=primary color hue</li><li>0..32=segment X opacity</li></ul>More details: <a 
 href="https://github.com/Aircoookie/WLED/wiki/Macros#analog-button" 
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index d479c84c0..82b78c1cd 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -442,14 +442,15 @@ void WLED::beginStrip()
   strip.setBrightness(0);
   strip.setShowCallback(handleOverlayDraw);
 
-  if (bootPreset > 0) {
-    applyPreset(bootPreset);
-  } else if (turnOnAtBoot) {
+  if (turnOnAtBoot) {
     if (briS > 0) bri = briS;
     else if (bri == 0) bri = 128;
   } else {
     briLast = briS; bri = 0;
   }
+  if (bootPreset > 0) {
+    applyPreset(bootPreset);
+  }
   colorUpdated(NOTIFIER_CALL_MODE_INIT);
 
   // init relay pin
diff --git a/wled00/wled.h b/wled00/wled.h
index 8fc2c8020..6e2d80069 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2106031
+#define VERSION 2106041
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG