pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-18 19:23:19 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Finalize merge conflict fix

Browse Source
This commit is contained in:
Jason P 2025-08-17 07:14:24 -05:00
parent 358227a23e
commit 3de8ab0477
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ menuHandler::screenMenus menuHandler::menuQueue = menu_none;
bool test_enabled = false; bool test_enabled = false;
uint8_t test_count = 0; uint8_t test_count = 0;
void menuHandler::loraMenu() void menuHandler::loraMenu()
{ {
static const char *optionsArray[] = {"Back", "Region Picker"}; static const char *optionsArray[] = {"Back", "Region Picker"};
@ -41,6 +40,9 @@ void menuHandler::loraMenu()
} else if (selected == lora_picker) { } else if (selected == lora_picker) {
menuHandler::menuQueue = menuHandler::lora_picker; menuHandler::menuQueue = menuHandler::lora_picker;
} }
};
screen->showOverlayBanner(bannerOptions);
}
void menuHandler::OnboardMessage() void menuHandler::OnboardMessage()
{ {
@ -59,7 +61,6 @@ void menuHandler::OnboardMessage()
bannerOptions.bannerCallback = [](int selected) -> void { bannerOptions.bannerCallback = [](int selected) -> void {
menuHandler::menuQueue = menuHandler::no_timeout_lora_picker; menuHandler::menuQueue = menuHandler::no_timeout_lora_picker;
screen->runNow(); screen->runNow();
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }