diff --git a/src/HomeSpan.h b/src/HomeSpan.h index ad1628a..666d943 100644 --- a/src/HomeSpan.h +++ b/src/HomeSpan.h @@ -712,7 +712,7 @@ class SpanButton : PushButton { }; SpanButton(int pin, uint16_t longTime=2000, uint16_t singleTime=5, uint16_t doubleTime=200, pressTest_t pressed=GROUNDED); - SpanButton(int pin, pressTest_t pressed=GROUNDED, uint16_t longTime=2000, uint16_t singleTime=5, uint16_t doubleTime=200) : SpanButton(pin,longTime,singleTime,doubleTime,pressed){}; + SpanButton(int pin, pressTest_t pressed, uint16_t longTime=2000, uint16_t singleTime=5, uint16_t doubleTime=200) : SpanButton(pin,longTime,singleTime,doubleTime,pressed){}; }; diff --git a/src/Utils.cpp b/src/Utils.cpp index f75dbca..48ac668 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -209,8 +209,10 @@ void PushButton::reset(){ ////////////////////////////////////// void PushButton::configureTouch(uint16_t measureTime, uint16_t sleepTime, uint16_t thresh){ +#ifndef CONFIG_IDF_TARGET_ESP32C3 touchSetCycles(measureTime,sleepTime); touchThreshold=thresh; +#endif } ////////////////////////////////////// diff --git a/src/Utils.h b/src/Utils.h index fbcdda3..82e2a2b 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -99,7 +99,10 @@ class PushButton{ static boolean GROUNDED(int pin){return(!digitalRead(pin));} static boolean POWERED(int pin){return(digitalRead(pin));} + +#ifndef CONFIG_IDF_TARGET_ESP32C3 static boolean TOUCH(int pin){return(touchRead(pin)