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

screen.cpp button handling cleanup

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-07 19:33:49 -05:00
parent 934613cddb
commit 4d292982d2
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/graphics/Screen.cpp
View File

@ -1390,6 +1390,7 @@ void Screen::setFrames(FrameFocus focus)
indicatorIcons.push_back(icon_mail);
}
fsi.positions.home = numframes;
normalFrames[numframes++] = graphics::UIRenderer::drawDeviceFocused;
indicatorIcons.push_back(icon_home);
@ -1795,28 +1796,21 @@ int Screen::handleInputEvent(const InputEvent *event)
inputIntercepted = true;
}
// Only allow BUTTON_PRESSED and BUTTON_LONG_PRESSED to trigger frame changes if no module is handling input
if (!inputIntercepted) {
if (event->inputEvent == INPUT_BROKER_MSG_BUTTON_PRESSED) {
showNextFrame();
return 0;
} else if (event->inputEvent == INPUT_BROKER_MSG_BUTTON_LONG_PRESSED) {
// Optional: Define alternate screen action or no-op
return 0;
}
}
// If no modules are using the input, move between frames
if (!inputIntercepted) {
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
showPrevFrame();
} else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
} else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT) ||
event->inputEvent == INPUT_BROKER_MSG_BUTTON_PRESSED) {
showNextFrame();
} else if (event->inputEvent ==
static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT) ||
event->inputEvent == INPUT_BROKER_MSG_BUTTON_DOUBLE_PRESSED) {
event->inputEvent == INPUT_BROKER_MSG_BUTTON_DOUBLE_PRESSED ||
event->inputEvent == INPUT_BROKER_MSG_BUTTON_LONG_PRESSED) {
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.home) {
setOn(false);
#if HAS_TFT
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.memory) {
} else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.memory) {
showOverlayBanner("Switch to MUI?\nYES\nNO", 30000, 2, [](int selected) -> void {
if (selected == 0) {
config.display.displaymode = meshtastic_Config_DisplayConfig_DisplayMode_COLOR;
@ -1825,10 +1819,9 @@ int Screen::handleInputEvent(const InputEvent *event)
rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
}
});
}
#endif
#if HAS_GPS
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.gps) {
} else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.gps) {
showOverlayBanner("Toggle GPS\nENABLED\nDISABLED", 30000, 2, [](int selected) -> void {
if (selected == 0) {
config.position.gps_enabled = true;
@ -1838,8 +1831,8 @@ int Screen::handleInputEvent(const InputEvent *event)
gps->disable();
}
});
}
#endif
}
}
}
}

1
src/graphics/Screen.h
View File

@ -617,6 +617,7 @@ class Screen : public concurrency::OSThread
uint8_t deviceFocused = 255;
uint8_t memory = 255;
uint8_t gps = 255;
uint8_t home = 255;
} positions;
uint8_t frameCount = 0;