diff --git a/src/input/TrackballInterruptBase.cpp b/src/input/TrackballInterruptBase.cpp index a17c01360..8b8b5b64e 100644 --- a/src/input/TrackballInterruptBase.cpp +++ b/src/input/TrackballInterruptBase.cpp @@ -4,9 +4,8 @@ TrackballInterruptBase::TrackballInterruptBase(const char *name) : concurrency::OSThread(name), _originName(name) {} void TrackballInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress, - uint8_t pinMenuParam, - char eventDown, char eventUp, char eventLeft, char eventRight, char eventPressed, - char eventmenu, void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(), + uint8_t pinMenuParam, char eventDown, char eventUp, char eventLeft, char eventRight, + char eventPressed, char eventmenu, void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(), void (*onIntRight)(), void (*onIntPress)(), void (*onMenuPress)()) { this->_pinDown = pinDown; diff --git a/src/input/TrackballInterruptImpl1.cpp b/src/input/TrackballInterruptImpl1.cpp index e1986b80e..c5b5cdc8c 100644 --- a/src/input/TrackballInterruptImpl1.cpp +++ b/src/input/TrackballInterruptImpl1.cpp @@ -26,15 +26,13 @@ void TrackballInterruptImpl1::init() char eventLeft = static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT); char eventRight = static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT); char eventPressed = static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT); - char eventcancel = - static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL); + char eventcancel = static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL); - TrackballInterruptBase::init(pinDown, pinUp, pinLeft, pinRight, pinPress, pinmenu, - eventDown, eventUp, eventLeft, eventRight, eventPressed, - eventcancel, - TrackballInterruptImpl1::handleIntDown, TrackballInterruptImpl1::handleIntUp, - TrackballInterruptImpl1::handleIntLeft, TrackballInterruptImpl1::handleIntRight, - TrackballInterruptImpl1::handleIntPressed, TrackballInterruptImpl1::handleMenuPressed); + TrackballInterruptBase::init(pinDown, pinUp, pinLeft, pinRight, pinPress, pinmenu, eventDown, eventUp, eventLeft, eventRight, + eventPressed, eventcancel, TrackballInterruptImpl1::handleIntDown, + TrackballInterruptImpl1::handleIntUp, TrackballInterruptImpl1::handleIntLeft, + TrackballInterruptImpl1::handleIntRight, TrackballInterruptImpl1::handleIntPressed, + TrackballInterruptImpl1::handleMenuPressed); inputBroker->registerSource(this); #endif } @@ -64,13 +62,12 @@ void TrackballInterruptImpl1::handleMenuPressed() { bool activateMenuAction = false; - if (cannedMessageModule && cannedMessageModule->isUIVisibleAndInterceptingInput()) { activateMenuAction = true; } if (activateMenuAction) { - + if (trackballInterruptImpl1) { LOG_DEBUG("Menu pressed; Canned Message UI is active and intercepting input. Activating CANCEL."); trackballInterruptImpl1->intMenuHandler(); diff --git a/src/modules/CannedMessageModule.h b/src/modules/CannedMessageModule.h index 090c74492..6911174f6 100644 --- a/src/modules/CannedMessageModule.h +++ b/src/modules/CannedMessageModule.h @@ -92,10 +92,7 @@ class CannedMessageModule : public SinglePortModule, public ObservableinterceptingKeyboardInput(); - } + bool isUIVisibleAndInterceptingInput() { return this->interceptingKeyboardInput(); } protected: virtual int32_t runOnce() override;