Fix touch pin
This commit is contained in:
parent
4cdb18907f
commit
930ded6767
@ -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;
|
||||||
}
|
}
|
||||||
@ -314,4 +316,4 @@ void handleIO()
|
|||||||
}
|
}
|
||||||
offMode = true;
|
offMode = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user