Merge pull request #1335 from meshtastic/patch-1176

Fix #1126
pull/1336/head
Thomas Göttgens 2022-03-29 14:01:27 +02:00 zatwierdzone przez GitHub
commit 3b8455ff6e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 2 dodań i 27 usunięć

Wyświetl plik

@ -83,10 +83,6 @@ class ButtonThread : public concurrency::OSThread
pinMode(BUTTON_PIN_TOUCH, INPUT_PULLUP_SENSE); pinMode(BUTTON_PIN_TOUCH, INPUT_PULLUP_SENSE);
#endif #endif
userButtonTouch.attachClick(touchPressed); userButtonTouch.attachClick(touchPressed);
userButtonTouch.attachDuringLongPress(touchPressedLong);
userButtonTouch.attachDoubleClick(touchDoublePressed);
userButtonTouch.attachLongPressStart(touchPressedLongStart);
userButtonTouch.attachLongPressStop(touchPressedLongStop);
wakeOnIrq(BUTTON_PIN_TOUCH, FALLING); wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
#endif #endif
@ -122,28 +118,7 @@ class ButtonThread : public concurrency::OSThread
screen->forceDisplay(); screen->forceDisplay();
DEBUG_MSG("touch press!\n"); DEBUG_MSG("touch press!\n");
} }
static void touchDoublePressed()
{
DEBUG_MSG("touch double press!\n");
}
static void touchPressedLong()
{
DEBUG_MSG("touch press long!\n");
}
static void touchDoublePressedLong()
{
DEBUG_MSG("touch double pressed!\n");
}
static void touchPressedLongStart()
{
DEBUG_MSG("touch long press start!\n");
}
static void touchPressedLongStop()
{
DEBUG_MSG("touch long press stop!\n");
}
static void userButtonPressed() static void userButtonPressed()
{ {
// DEBUG_MSG("press!\n"); // DEBUG_MSG("press!\n");
@ -221,4 +196,4 @@ class ButtonThread : public concurrency::OSThread
} }
}; };
} }