rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-02 08:00:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for null screen

Browse Source
This commit is contained in:
Jonathan Bennett
2025-05-17 22:03:23 -05:00
parent 212005bfe9
commit f1440a27d7
14 changed files with 85 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/input/ScanAndSelect.cpp
View File

@@ -84,7 +84,8 @@ int32_t ScanAndSelectInput::runOnce()
// Dismiss the alert screen several seconds after it appears
if (!Throttle::isWithinTimespanMs(alertingSinceMs, durationAlertMs)) {
alertingNoMessage = false;
screen->endAlert();
if (screen)
screen->endAlert();
}
}
@@ -183,13 +184,15 @@ void ScanAndSelectInput::alertNoMessage()
alertingSinceMs = millis();
// Graphics code: the alert frame to show on screen
screen->startAlert([](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
display->setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
display->setFont(FONT_SMALL);
int16_t textX = display->getWidth() / 2;
int16_t textY = display->getHeight() / 2;
display->drawString(textX + x, textY + y, "No Canned Messages");
});
if (screen) {
screen->startAlert([](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
display->setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
display->setFont(FONT_SMALL);
int16_t textX = display->getWidth() / 2;
int16_t textY = display->getHeight() / 2;
display->drawString(textX + x, textY + y, "No Canned Messages");
});
}
}
// Remove the canned message frame from screen