diff --git a/wled00/button.cpp b/wled00/button.cpp index f296ea455..01462b0fc 100644 --- a/wled00/button.cpp +++ b/wled00/button.cpp @@ -38,7 +38,6 @@ bool isButtonPressed(uint8_t i) if (digitalRead(btnPin[i]) == LOW) return true; break; case BTN_TYPE_PUSH_ACT_HIGH: - case BTN_TYPE_SWITCH_ACT_HIGH: case BTN_TYPE_PIR_SENSOR: if (digitalRead(btnPin[i]) == HIGH) return true; break; @@ -182,7 +181,7 @@ void handleButton() } //button is not momentary, but switch. This is only suitable on pins whose on-boot state does not matter (NOT gpio0) - if (buttonType[b] == BTN_TYPE_SWITCH || buttonType[b] == BTN_TYPE_SWITCH_ACT_HIGH || buttonType[b] == BTN_TYPE_PIR_SENSOR) { + if (buttonType[b] == BTN_TYPE_SWITCH || buttonType[b] == BTN_TYPE_PIR_SENSOR) { handleSwitch(b); continue; } diff --git a/wled00/const.h b/wled00/const.h index 93d860fba..8d73ce145 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -158,11 +158,10 @@ #define BTN_TYPE_PUSH 2 #define BTN_TYPE_PUSH_ACT_HIGH 3 #define BTN_TYPE_SWITCH 4 -#define BTN_TYPE_SWITCH_ACT_HIGH 5 +#define BTN_TYPE_PIR_SENSOR 5 #define BTN_TYPE_TOUCH 6 #define BTN_TYPE_ANALOG 7 #define BTN_TYPE_ANALOG_INVERTED 8 -#define BTN_TYPE_PIR_SENSOR 9 //Ethernet board types #define WLED_NUM_ETH_TYPES 5 diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index ebaaa5d2b..5a88a55a1 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -304,12 +304,11 @@ Reverse (rotated 180°): c += ``; c += ``; c += ``; - c += ``; - c += ``; + c += ``; + c += ``; c += ``; c += ``; c += ``; - c += ``; c += ``; c += ` ×
`; gId("btns").innerHTML = c; diff --git a/wled00/html_settings.h b/wled00/html_settings.h index d2dc5e349..55ec4404f 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -74,7 +74,7 @@ Do not enable if WiFi is working correctly, increases power consumption.
LED Settings