From f20862d34b1c8bb478dad6705a8e2a2fb47cf46d Mon Sep 17 00:00:00 2001 From: HarukiToreda Date: Tue, 20 Oct 2026 23:58:40 -0400 Subject: [PATCH] Trunk Fix --- .../niche/InkHUD/Applets/System/Menu/MenuApplet.cpp | 9 +++++---- .../niche/InkHUD/Applets/System/Menu/MenuApplet.h | 2 +- src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp index 0477ed7881..a4e693ff2b 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp @@ -1546,7 +1546,8 @@ void InkHUD::MenuApplet::showPage(MenuPage page) addInfoRow("Battery left: " + left); } - // Memory: a label row ("Heap 89/153K 58%" or "Flash 1.2/14M 9%") with a full-width usage bar underneath, as on baseUI's system screen + // Memory: a label row ("Heap 89/153K 58%" or "Flash 1.2/14M 9%") with a full-width usage bar underneath, as on baseUI's + // system screen auto addUsageRow = [&](const char *name, uint64_t usedBytes, uint64_t totalBytes) { const uint32_t usedK = usedBytes / 1024, totalK = totalBytes / 1024; MenuItem bar = MenuItem::Usage(usedK, totalK); @@ -1692,13 +1693,13 @@ void InkHUD::MenuApplet::showPage(MenuPage page) items.push_back(MenuItem::Header("Buzzer")); const uint8_t mode = config.device.buzzer_mode; - nodeConfigLabels.emplace_back(std::string("Mode: ") + - (mode < BUZZER_MODE_COUNT ? BUZZER_MODE_LABELS[mode] : "Custom")); + nodeConfigLabels.emplace_back(std::string("Mode: ") + (mode < BUZZER_MODE_COUNT ? BUZZER_MODE_LABELS[mode] : "Custom")); items.push_back( MenuItem(nodeConfigLabels.back().c_str(), MenuAction::NO_ACTION, MenuPage::NODE_CONFIG_EXT_NOTIFICATION_BUZZER_MODE)); items.push_back(MenuItem("Alert Message", MenuAction::TOGGLE_EXT_NOTIFICATION_MESSAGE_BUZZER, - MenuPage::NODE_CONFIG_EXT_NOTIFICATION, &moduleConfig.external_notification.alert_message_buzzer)); + MenuPage::NODE_CONFIG_EXT_NOTIFICATION, + &moduleConfig.external_notification.alert_message_buzzer)); items.push_back(MenuItem("Alert Bell", MenuAction::TOGGLE_EXT_NOTIFICATION_BELL_BUZZER, MenuPage::NODE_CONFIG_EXT_NOTIFICATION, &moduleConfig.external_notification.alert_bell_buzzer)); diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h index 909c012100..d906e59cb7 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h @@ -57,7 +57,7 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread void populateRecentsPage(); // Create menu items: a choice of values for settings.recentlyActiveSeconds void populateDisplayTimeoutPage(); // Create menu items for config.display.screen_on_secs int onPowerStatusUpdate(const meshtastic::Status *status); // Track battery discharge for the runtime estimate - void populateBuzzerModePage(); // Create menu items for config.device.buzzer_mode + void populateBuzzerModePage(); // Create menu items for config.device.buzzer_mode void populateRemoveWaypointPage(); // Create menu items: one per waypoint in the active WaypointListApplet void populateGeofenceWaypointPage(); diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h index 4ab3f4ca63..f70b03597e 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h @@ -30,7 +30,7 @@ class MenuItem MenuAction action = NO_ACTION; MenuPage nextPage = EXIT; bool *checkState = nullptr; - bool isHeader = false; // Non-selectable section label + bool isHeader = false; // Non-selectable section label int8_t usagePercent = -1; // 0-100: draw a full-width usage bar instead of text. -1: no bar // Various constructors, depending on the intended function of the item