pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 06:02:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

trunk fmt

Browse Source
This commit is contained in:
dylan 2025-06-05 01:25:25 -07:00
parent 1426f93ade
commit 3eee1f3c56
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/input/TrackballInterruptBase.cpp
View File

@ -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;

17
src/input/TrackballInterruptImpl1.cpp
View File

@ -26,15 +26,13 @@ void TrackballInterruptImpl1::init()
char eventLeft = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
char eventRight = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
char eventPressed = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
char eventcancel =
static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL);
char eventcancel = static_cast<char>(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();

5
src/modules/CannedMessageModule.h
View File

@ -92,10 +92,7 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
return false;
}
}
bool isUIVisibleAndInterceptingInput()
{
return this->interceptingKeyboardInput();
}
bool isUIVisibleAndInterceptingInput() { return this->interceptingKeyboardInput(); }
protected:
virtual int32_t runOnce() override;