pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-13 16:55:08 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Finished plumbing

Browse Source
This commit is contained in:
Ben Meadors 2025-07-01 16:08:08 -05:00
parent aa3ae912ea
commit 4d92dea461
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/Screen.cpp
View File

@ -596,7 +596,7 @@ int32_t Screen::runOnce()
if (displayHeight == 0) { if (displayHeight == 0) {
displayHeight = dispdev->getHeight(); displayHeight = dispdev->getHeight();
} }
menuHandler::handleMenuSwitch(); menuHandler::handleMenuSwitch(dispdev);
// Show boot screen for first logo_timeout seconds, then switch to normal operation. // Show boot screen for first logo_timeout seconds, then switch to normal operation.
// serialSinceMsec adjusts for additional serial wait time during nRF52 bootup // serialSinceMsec adjusts for additional serial wait time during nRF52 bootup
@ -1262,7 +1262,7 @@ int Screen::handleInputEvent(const InputEvent *event)
setFastFramerate(); // Draw ASAP setFastFramerate(); // Draw ASAP
ui->update(); ui->update();
menuHandler::handleMenuSwitch(); menuHandler::handleMenuSwitch(dispdev);
return 0; return 0;
} }
/* /*

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

@ -571,7 +571,7 @@ void menuHandler::switchToMUIMenu()
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::TFTColorPickerMenu() 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"};
@ -674,7 +674,7 @@ void menuHandler::removeFavoriteMenu()
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);
} }
void menuHandler::handleMenuSwitch() void menuHandler::handleMenuSwitch(OLEDDisplay *display)
{ {
switch (menuQueue) { switch (menuQueue) {
case menu_none: case menu_none:
@ -713,7 +713,7 @@ void menuHandler::handleMenuSwitch()
switchToMUIMenu(); switchToMUIMenu();
break; break;
case tftcolormenupicker: case tftcolormenupicker:
TFTColorPickerMenu(); TFTColorPickerMenu(display);
break; break;
case reboot_menu: case reboot_menu:
rebootMenu(); rebootMenu();

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

@ -26,7 +26,7 @@ class menuHandler
static screenMenus menuQueue; static screenMenus menuQueue;
static void LoraRegionPicker(uint32_t duration = 30000); static void LoraRegionPicker(uint32_t duration = 30000);
static void handleMenuSwitch(); static void handleMenuSwitch(OLEDDisplay *display);
static void clockMenu(); static void clockMenu();
static void TZPicker(); static void TZPicker();
static void TwelveHourPicker(); static void TwelveHourPicker();
@ -40,7 +40,7 @@ class menuHandler
static void GPSToggleMenu(); static void GPSToggleMenu();
static void BuzzerModeMenu(); static void BuzzerModeMenu();
static void switchToMUIMenu(); static void switchToMUIMenu();
static void TFTColorPickerMenu(); static void TFTColorPickerMenu(OLEDDisplay *display);
static void nodeListMenu(); static void nodeListMenu();
static void resetNodeDBMenu(); static void resetNodeDBMenu();
static void rebootMenu(); static void rebootMenu();