fix long-press handling on alternate button

1.2-legacy
Kevin Hester 2020-10-24 08:44:54 +08:00
rodzic 0767c8be03
commit d4e95e95a6
1 zmienionych plików z 9 dodań i 4 usunięć

Wyświetl plik

@ -179,7 +179,7 @@ class ButtonThread : public OSThread
#ifdef BUTTON_PIN_ALT
userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
userButtonAlt.attachClick(userButtonPressed);
userButton.attachDuringLongPress(userButtonPressedLong);
userButtonAlt.attachDuringLongPress(userButtonPressedLong);
wakeOnIrq(BUTTON_PIN_ALT, FALLING);
#endif
}
@ -196,9 +196,10 @@ class ButtonThread : public OSThread
#endif
#ifdef BUTTON_PIN_ALT
userButtonAlt.tick();
canSleep &= userButton.isIdle();
canSleep &= userButtonAlt.isIdle();
#endif
// if(!canSleep) DEBUG_MSG("Supressing sleep!\n");
// if (!canSleep) DEBUG_MSG("Supressing sleep!\n");
//else DEBUG_MSG("sleep ok\n");
return 5;
}
@ -209,7 +210,11 @@ class ButtonThread : public OSThread
// DEBUG_MSG("press!\n");
powerFSM.trigger(EVENT_PRESS);
}
static void userButtonPressedLong() { screen->adjustBrightness(); }
static void userButtonPressedLong()
{
DEBUG_MSG("Long press!\n");
screen->adjustBrightness();
}
};
static Periodic *ledPeriodic;