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

Create LoRa Menu, move Region Picker into submenu, add Dismiss Frame option

Browse Source
This commit is contained in:
Jason P 2025-07-19 07:36:58 -05:00
parent ff8275e0dd
commit 7e067f5bf5
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/Screen.cpp
View File

@ -1107,6 +1107,10 @@ void Screen::dismissCurrentFrame()
LOG_DEBUG("Dismiss WiFi Screen");
dismissedFrames.wifi = true;
dismissed = true;
} else if (currentFrame == framesetInfo.positions.lora) {
LOG_INFO("Dismiss LoRa");
dismissedFrames.lora = true;
dismissed = true;
} else if (currentFrame == framesetInfo.positions.system) {
LOG_INFO("Dismiss Memory");
dismissedFrames.system = true;
@ -1416,7 +1420,7 @@ int Screen::handleInputEvent(const InputEvent *event)
} else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.clock) {
menuHandler::clockMenu();
} else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.lora) {
menuHandler::LoraRegionPicker();
menuHandler::loraMenu();
} else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.textMessage) {
if (devicestate.rx_text_message.from) {
menuHandler::messageResponseMenu();

19
src/graphics/draw/MenuHandler.cpp
View File

@ -23,6 +23,25 @@ menuHandler::screenMenus menuHandler::menuQueue = menu_none;
bool test_enabled = false;
uint8_t test_count = 0;
void menuHandler::loraMenu()
{
static const char *optionsArray[] = {"Back", "Region Picker", "Dismiss Frame"};
enum optionsNumbers { Back = 0, lora_picker = 1, DismissCurrentFrame = 2 };
BannerOverlayOptions bannerOptions;
bannerOptions.message = "LoRa Actions";
bannerOptions.optionsArrayPtr = optionsArray;
bannerOptions.optionsCount = 3;
bannerOptions.bannerCallback = [](int selected) -> void {
if (selected == Back) {
menuHandler::menuQueue = menuHandler::clock_menu;
screen->runNow();
} else if (selected == DismissCurrentFrame) {
menuHandler::menuQueue = menuHandler::DismissCurrentFrame;
}
};
screen->showOverlayBanner(bannerOptions);
}
void menuHandler::LoraRegionPicker(uint32_t duration)
{
static const char *optionsArray[] = {"Back",

1
src/graphics/draw/MenuHandler.h
View File

@ -42,6 +42,7 @@ class menuHandler
static screenMenus menuQueue;
static void LoraRegionPicker(uint32_t duration = 30000);
static void loraMenu();
static void handleMenuSwitch(OLEDDisplay *display);
static void clockMenu();
static void TZPicker();