Merge branch 'dev' of github.com:blazoncek/WLED into dev

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

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