pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-04 04:40:50 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
mverch67 2025-07-29 21:06:19 +02:00
parent 0e1872398a
commit 6cdb92b7a8
1 changed files with 652 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,7 +483,7 @@ void menuHandler::positionBaseMenu()
} else } else
#endif #endif
{ {
optionsArrayPtr = optionsArray; bannerOptions.optionsArrayPtr = optionsArray;
options = 3; options = 3;
} }
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -502,14 +502,16 @@ void menuHandler::positionBaseMenu()
} else if (selected == CompassCalibrate) { } else if (selected == CompassCalibrate) {
accelerometerThread->calibrate(30); accelerometerThread->calibrate(30);
#endif #endif
else { else
{
menuQueue = menu_none; menuQueue = menu_none;
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::nodeListMenu() void
menuHandler::nodeListMenu()
{ {
enum optionsNumbers { Back, Favorite, TraceRoute, Verify, Reset, enumEnd }; enum optionsNumbers { Back, Favorite, TraceRoute, Verify, Reset, enumEnd };
static const char *optionsArray[] = {"Back", "Add Favorite", "Trace Route", "Key Verification", "Reset NodeDB"}; static const char *optionsArray[] = {"Back", "Add Favorite", "Trace Route", "Key Verification", "Reset NodeDB"};
@ -840,7 +842,8 @@ void menuHandler::shutdownMenu()
bannerOptions.optionsCount = 2; bannerOptions.optionsCount = 2;
bannerOptions.bannerCallback = [](int selected) -> void { bannerOptions.bannerCallback = [](int selected) -> void {
if (selected == 1) { if (selected == 1) {
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0}; InputEvent event = {
.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
inputBroker->injectInputEvent(&event); inputBroker->injectInputEvent(&event);
} else { } else {
menuQueue = power_menu; menuQueue = power_menu;