Merge branch 'master' into dev

2021-07-01 13:41:23 +02:00
parent 9f885407f5 3754088a44
commit b58efa3df0
18 changed files with 2382 additions and 1896 deletions
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -455,11 +455,8 @@ void WLED::beginStrip()
  colorUpdated(NOTIFIER_CALL_MODE_INIT);

  // init relay pin
-  if (rlyPin>=0) digitalWrite(rlyPin, (bri ? rlyMde : !rlyMde));
-
-  // disable button if it is "pressed" unintentionally
-  //if (btnPin>=0 && buttonType == BTN_TYPE_PUSH && isButtonPressed())
-  //  buttonType = BTN_TYPE_NONE;
+  if (rlyPin>=0)
+    digitalWrite(rlyPin, (rlyMde ? bri : !bri));
 }

 void WLED::initAP(bool resetAP)