mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 07:49:52 +03:00
Merge branch 'esp32_dev' of https://github.com/proddy/EMS-ESP into esp32_dev
This commit is contained in:
@@ -136,13 +136,13 @@ bool PButton::check(void) {
|
|||||||
dblClickWaiting_ = false;
|
dblClickWaiting_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// added code: raise OnLongPress event when only when the button is released
|
// added code: raise OnLongPress event when the button is released
|
||||||
if (state_ == pullMode_ && longPressHappened_ && !vLongPressHappened_) {
|
if (state_ == pullMode_ && longPressHappened_ && !vLongPressHappened_) {
|
||||||
resultEvent = 3;
|
resultEvent = 3;
|
||||||
longPressHappened_ = false;
|
longPressHappened_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// added code: raise OnLongPress event when only when the button is released
|
// added code: raise OnVLongPress event when the button is released, only for pin 0
|
||||||
if (state_ == pullMode_ && vLongPressHappened_) {
|
if (state_ == pullMode_ && vLongPressHappened_) {
|
||||||
resultEvent = 4;
|
resultEvent = 4;
|
||||||
vLongPressHappened_ = false;
|
vLongPressHappened_ = false;
|
||||||
@@ -164,7 +164,10 @@ bool PButton::check(void) {
|
|||||||
// Trigger "long" hold
|
// Trigger "long" hold
|
||||||
if ((millisRes - downTime_) >= VLongPressDelay_) {
|
if ((millisRes - downTime_) >= VLongPressDelay_) {
|
||||||
if (vLongPressHappened_ == false) {
|
if (vLongPressHappened_ == false) {
|
||||||
// resultEvent = 4;
|
// raise OnVLongPress, only for pin 0 wait for release
|
||||||
|
if (pin_) {
|
||||||
|
resultEvent = 4;
|
||||||
|
}
|
||||||
vLongPressHappened_ = true;
|
vLongPressHappened_ = true;
|
||||||
// longPressHappened_ = false;
|
// longPressHappened_ = false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user