Resolve Conflicts between PIN_BUtton and the Rotary Select and keep screen powered during plugin operation. Forward Port from 1.2 firmware fix.

This commit is contained in:
Thomas Göttgens
2022-03-25 12:27:14 +01:00
parent 8bfe277269
commit e320850707
6 changed files with 24 additions and 5 deletions

View File

@@ -147,7 +147,11 @@ class ButtonThread : public concurrency::OSThread
static void userButtonPressed()
{
// DEBUG_MSG("press!\n");
powerFSM.trigger(EVENT_PRESS);
#ifdef BUTTON_PIN
if ((BUTTON_PIN != radioConfig.preferences.rotary1_pin_press) || !radioConfig.preferences.canned_message_module_enabled) {
powerFSM.trigger(EVENT_PRESS);
}
#endif
}
static void userButtonPressedLong()
{