mirror of
https://github.com/meshtastic/firmware.git
synced 2026-11-07 06:44:33 -05:00
Trunk Fix
This commit is contained in:
1 parent
57b34f2708
commit
f20862d34b
3 files changed
+7
-6
No files matched your search
@@ -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));
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user