post-merge changes

reconciling disagreements between MM and AC source code
2022-12-06 16:07:12 +01:00
parent 3160a0b090
commit 191bbf93f3
5 changed files with 8 additions and 5 deletions
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -176,8 +176,11 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
          btnPin[i] = -1;
          pinManager.deallocatePin(hw_btn_pin,PinOwner::Button);
        } else { // WLEDMM end
+        if (disablePullUp) {
+          pinMode(btnPin[i], INPUT);
+        } else {
          pinMode(btnPin[i], buttonType[i]==BTN_TYPE_PUSH_ACT_HIGH ? INPUT_PULLDOWN : INPUT_PULLUP);
-        }
+        } }
        #else
        pinMode(btnPin[i], INPUT_PULLUP);
        #endif