lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix touch pin

Browse Source
This commit is contained in:
cschwinne 2022-02-09 19:59:17 +01:00
parent 4cdb18907f
commit 930ded6767
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/button.cpp
View File

@ -72,21 +72,23 @@ void doublePressAction(uint8_t b)
bool isButtonPressed(uint8_t i) bool isButtonPressed(uint8_t i)
{ {
if (btnPin[i]<0) return false; if (btnPin[i]<0) return false;
uint8_t pin = btnPin[i];
switch (buttonType[i]) { switch (buttonType[i]) {
case BTN_TYPE_NONE: case BTN_TYPE_NONE:
case BTN_TYPE_RESERVED: case BTN_TYPE_RESERVED:
break; break;
case BTN_TYPE_PUSH: case BTN_TYPE_PUSH:
case BTN_TYPE_SWITCH: case BTN_TYPE_SWITCH:
if (digitalRead(btnPin[i]) == LOW) return true; if (digitalRead(pin) == LOW) return true;
break; break;
case BTN_TYPE_PUSH_ACT_HIGH: case BTN_TYPE_PUSH_ACT_HIGH:
case BTN_TYPE_PIR_SENSOR: case BTN_TYPE_PIR_SENSOR:
if (digitalRead(btnPin[i]) == HIGH) return true; if (digitalRead(pin) == HIGH) return true;
break; break;
case BTN_TYPE_TOUCH: case BTN_TYPE_TOUCH:
#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) #if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3)
if (touchRead(btnPin[i]) <= touchThreshold) return true; if (touchRead(pin) <= touchThreshold) return true;
#endif #endif
break; break;
} }