pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-29 20:49:50 +00:00
Code Issues Actions 6 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

161
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,15 +502,17 @@ 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"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -533,10 +535,10 @@ void menuHandler::nodeListMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::resetNodeDBMenu() void menuHandler::resetNodeDBMenu()
{ {
static const char *optionsArray[] = {"Back", "Confirm"}; static const char *optionsArray[] = {"Back", "Confirm"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
bannerOptions.message = "Confirm Reset NodeDB"; bannerOptions.message = "Confirm Reset NodeDB";
@ -551,10 +553,10 @@ void menuHandler::resetNodeDBMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::compassNorthMenu() void menuHandler::compassNorthMenu()
{ {
enum optionsNumbers { Back, Dynamic, Fixed, Freeze }; enum optionsNumbers { Back, Dynamic, Fixed, Freeze };
static const char *optionsArray[] = {"Back", "Dynamic", "Fixed Ring", "Freeze Heading"}; static const char *optionsArray[] = {"Back", "Dynamic", "Fixed Ring", "Freeze Heading"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -587,11 +589,11 @@ void menuHandler::compassNorthMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
#if !MESHTASTIC_EXCLUDE_GPS #if !MESHTASTIC_EXCLUDE_GPS
void menuHandler::GPSToggleMenu() void menuHandler::GPSToggleMenu()
{ {
static const char *optionsArray[] = {"Back", "Enabled", "Disabled"}; static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -616,11 +618,11 @@ void menuHandler::GPSToggleMenu()
}; };
bannerOptions.InitialSelected = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED ? 1 : 2; bannerOptions.InitialSelected = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED ? 1 : 2;
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
#endif #endif
void menuHandler::BluetoothToggleMenu() void menuHandler::BluetoothToggleMenu()
{ {
static const char *optionsArray[] = {"Back", "Enabled", "Disabled"}; static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
bannerOptions.message = "Toggle Bluetooth"; bannerOptions.message = "Toggle Bluetooth";
@ -634,10 +636,10 @@ void menuHandler::BluetoothToggleMenu()
}; };
bannerOptions.InitialSelected = config.bluetooth.enabled ? 1 : 2; bannerOptions.InitialSelected = config.bluetooth.enabled ? 1 : 2;
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::BuzzerModeMenu() void menuHandler::BuzzerModeMenu()
{ {
static const char *optionsArray[] = {"All Enabled", "Disabled", "Notifications", "System Only"}; static const char *optionsArray[] = {"All Enabled", "Disabled", "Notifications", "System Only"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
bannerOptions.message = "Buzzer Mode"; bannerOptions.message = "Buzzer Mode";
@ -649,10 +651,10 @@ void menuHandler::BuzzerModeMenu()
}; };
bannerOptions.InitialSelected = config.device.buzzer_mode; bannerOptions.InitialSelected = config.device.buzzer_mode;
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::BrightnessPickerMenu() void menuHandler::BrightnessPickerMenu()
{ {
static const char *optionsArray[] = {"Back", "Low", "Medium", "High"}; static const char *optionsArray[] = {"Back", "Low", "Medium", "High"};
// Get current brightness level to set initial selection // Get current brightness level to set initial selection
@ -697,10 +699,10 @@ void menuHandler::BrightnessPickerMenu()
}; };
bannerOptions.InitialSelected = currentSelection; bannerOptions.InitialSelected = currentSelection;
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::switchToMUIMenu() void menuHandler::switchToMUIMenu()
{ {
static const char *optionsArray[] = {"No", "Yes"}; static const char *optionsArray[] = {"No", "Yes"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
bannerOptions.message = "Switch to MUI?"; bannerOptions.message = "Switch to MUI?";
@ -715,10 +717,10 @@ void menuHandler::switchToMUIMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::TFTColorPickerMenu(OLEDDisplay *display) void menuHandler::TFTColorPickerMenu(OLEDDisplay * display)
{ {
static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal", static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
"Pink", "White"}; "Pink", "White"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -809,10 +811,10 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
#endif #endif
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::rebootMenu() void menuHandler::rebootMenu()
{ {
static const char *optionsArray[] = {"Back", "Confirm"}; static const char *optionsArray[] = {"Back", "Confirm"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
bannerOptions.message = "Reboot Device?"; bannerOptions.message = "Reboot Device?";
@ -829,10 +831,10 @@ void menuHandler::rebootMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::shutdownMenu() void menuHandler::shutdownMenu()
{ {
static const char *optionsArray[] = {"Back", "Confirm"}; static const char *optionsArray[] = {"Back", "Confirm"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
bannerOptions.message = "Shutdown Device?"; bannerOptions.message = "Shutdown Device?";
@ -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;
@ -848,19 +851,19 @@ void menuHandler::shutdownMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::addFavoriteMenu() void menuHandler::addFavoriteMenu()
{ {
screen->showNodePicker("Node To Favorite", 30000, [](uint32_t nodenum) -> void { screen->showNodePicker("Node To Favorite", 30000, [](uint32_t nodenum) -> void {
LOG_WARN("Nodenum: %u", nodenum); LOG_WARN("Nodenum: %u", nodenum);
nodeDB->set_favorite(true, nodenum); nodeDB->set_favorite(true, nodenum);
screen->setFrames(graphics::Screen::FOCUS_PRESERVE); screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
}); });
} }
void menuHandler::removeFavoriteMenu() void menuHandler::removeFavoriteMenu()
{ {
static const char *optionsArray[] = {"Back", "Yes"}; static const char *optionsArray[] = {"Back", "Yes"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -880,20 +883,20 @@ void menuHandler::removeFavoriteMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::traceRouteMenu() void menuHandler::traceRouteMenu()
{ {
screen->showNodePicker("Node to Trace", 30000, [](uint32_t nodenum) -> void { screen->showNodePicker("Node to Trace", 30000, [](uint32_t nodenum) -> void {
LOG_INFO("Menu: Node picker selected node 0x%08x, traceRouteModule=%p", nodenum, traceRouteModule); LOG_INFO("Menu: Node picker selected node 0x%08x, traceRouteModule=%p", nodenum, traceRouteModule);
if (traceRouteModule) { if (traceRouteModule) {
traceRouteModule->startTraceRoute(nodenum); traceRouteModule->startTraceRoute(nodenum);
} }
}); });
} }
void menuHandler::testMenu() void menuHandler::testMenu()
{ {
static const char *optionsArray[] = {"Back", "Number Picker"}; static const char *optionsArray[] = {"Back", "Number Picker"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -908,16 +911,16 @@ void menuHandler::testMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::numberTest() void menuHandler::numberTest()
{ {
screen->showNumberPicker("Pick a number\n ", 30000, 4, screen->showNumberPicker("Pick a number\n ", 30000, 4,
[](int number_picked) -> void { LOG_WARN("Nodenum: %u", number_picked); }); [](int number_picked) -> void { LOG_WARN("Nodenum: %u", number_picked); });
} }
void menuHandler::wifiBaseMenu() void menuHandler::wifiBaseMenu()
{ {
enum optionsNumbers { Back, Wifi_toggle }; enum optionsNumbers { Back, Wifi_toggle };
static const char *optionsArray[] = {"Back", "WiFi Toggle"}; static const char *optionsArray[] = {"Back", "WiFi Toggle"};
@ -932,10 +935,10 @@ void menuHandler::wifiBaseMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::wifiToggleMenu() void menuHandler::wifiToggleMenu()
{ {
enum optionsNumbers { Back, Wifi_toggle }; enum optionsNumbers { Back, Wifi_toggle };
static const char *optionsArray[] = {"Back", "Disable"}; static const char *optionsArray[] = {"Back", "Disable"};
@ -952,10 +955,10 @@ void menuHandler::wifiToggleMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::notificationsMenu() void menuHandler::notificationsMenu()
{ {
enum optionsNumbers { Back, BuzzerActions }; enum optionsNumbers { Back, BuzzerActions };
static const char *optionsArray[] = {"Back", "Buzzer Actions"}; static const char *optionsArray[] = {"Back", "Buzzer Actions"};
static int optionsEnumArray[] = {Back, BuzzerActions}; static int optionsEnumArray[] = {Back, BuzzerActions};
@ -976,10 +979,10 @@ void menuHandler::notificationsMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::screenOptionsMenu() void menuHandler::screenOptionsMenu()
{ {
// Check if brightness is supported // Check if brightness is supported
bool hasSupportBrightness = false; bool hasSupportBrightness = false;
#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107) #if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107)
@ -1026,10 +1029,10 @@ void menuHandler::screenOptionsMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::powerMenu() void menuHandler::powerMenu()
{ {
enum optionsNumbers { Back, Reboot, Shutdown, MUI }; enum optionsNumbers { Back, Reboot, Shutdown, MUI };
static const char *optionsArray[4] = {"Back"}; static const char *optionsArray[4] = {"Back"};
@ -1068,16 +1071,16 @@ void menuHandler::powerMenu()
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::keyVerificationInitMenu() void menuHandler::keyVerificationInitMenu()
{ {
screen->showNodePicker("Node to Verify", 30000, screen->showNodePicker("Node to Verify", 30000,
[](uint32_t selected) -> void { keyVerificationModule->sendInitialRequest(selected); }); [](uint32_t selected) -> void { keyVerificationModule->sendInitialRequest(selected); });
} }
void menuHandler::keyVerificationFinalPrompt() void menuHandler::keyVerificationFinalPrompt()
{ {
char message[40] = {0}; char message[40] = {0};
memset(message, 0, sizeof(message)); memset(message, 0, sizeof(message));
sprintf(message, "Verification: \n"); sprintf(message, "Verification: \n");
@ -1099,10 +1102,10 @@ void menuHandler::keyVerificationFinalPrompt()
}; };
screen->showOverlayBanner(options); screen->showOverlayBanner(options);
} }
} }
void menuHandler::handleMenuSwitch(OLEDDisplay *display) void menuHandler::handleMenuSwitch(OLEDDisplay * display)
{ {
if (menuQueue != menu_none) if (menuQueue != menu_none)
test_count = 0; test_count = 0;
switch (menuQueue) { switch (menuQueue) {
@ -1199,12 +1202,12 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
break; break;
} }
menuQueue = menu_none; menuQueue = menu_none;
} }
void menuHandler::saveUIConfig() void menuHandler::saveUIConfig()
{ {
nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig); nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
} }
} // namespace graphics } // namespace graphics