pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-09 22:52:07 +00:00
Code Issues Actions 5 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) {} 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, void TrackballInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress,
uint8_t pinMenuParam, uint8_t pinMenuParam, char eventDown, char eventUp, char eventLeft, char eventRight,
char eventDown, char eventUp, char eventLeft, char eventRight, char eventPressed, char eventPressed, char eventmenu, void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(),
char eventmenu, void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(),
void (*onIntRight)(), void (*onIntPress)(), void (*onMenuPress)()) void (*onIntRight)(), void (*onIntPress)(), void (*onMenuPress)())
{ {
this->_pinDown = pinDown; this->_pinDown = pinDown;

15
src/input/TrackballInterruptImpl1.cpp
View File

@ -26,15 +26,13 @@ void TrackballInterruptImpl1::init()
char eventLeft = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT); char eventLeft = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
char eventRight = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT); char eventRight = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
char eventPressed = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT); char eventPressed = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
char eventcancel = char eventcancel = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL);
static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL);
TrackballInterruptBase::init(pinDown, pinUp, pinLeft, pinRight, pinPress, pinmenu, TrackballInterruptBase::init(pinDown, pinUp, pinLeft, pinRight, pinPress, pinmenu, eventDown, eventUp, eventLeft, eventRight,
eventDown, eventUp, eventLeft, eventRight, eventPressed, eventPressed, eventcancel, TrackballInterruptImpl1::handleIntDown,
eventcancel, TrackballInterruptImpl1::handleIntUp, TrackballInterruptImpl1::handleIntLeft,
TrackballInterruptImpl1::handleIntDown, TrackballInterruptImpl1::handleIntUp, TrackballInterruptImpl1::handleIntRight, TrackballInterruptImpl1::handleIntPressed,
TrackballInterruptImpl1::handleIntLeft, TrackballInterruptImpl1::handleIntRight, TrackballInterruptImpl1::handleMenuPressed);
TrackballInterruptImpl1::handleIntPressed, TrackballInterruptImpl1::handleMenuPressed);
inputBroker->registerSource(this); inputBroker->registerSource(this);
#endif #endif
} }
@ -64,7 +62,6 @@ void TrackballInterruptImpl1::handleMenuPressed()
{ {
bool activateMenuAction = false; bool activateMenuAction = false;
if (cannedMessageModule && cannedMessageModule->isUIVisibleAndInterceptingInput()) { if (cannedMessageModule && cannedMessageModule->isUIVisibleAndInterceptingInput()) {
activateMenuAction = true; activateMenuAction = true;
} }

5
src/modules/CannedMessageModule.h
View File

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