From a6713859b271502c322954d46c8e6e154cbff2ad Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sun, 12 Oct 2025 17:16:07 +0200 Subject: [PATCH] better statusbar --- Firmware/main/src/app_main.cpp | 2 +- Firmware/sdk/core/src/persistent_settings.cpp | 2 +- Firmware/sdk/core/src/status_bar.cpp | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Firmware/main/src/app_main.cpp b/Firmware/main/src/app_main.cpp index 2de476d..81297b4 100644 --- a/Firmware/main/src/app_main.cpp +++ b/Firmware/main/src/app_main.cpp @@ -237,7 +237,7 @@ extern "C" void app_main() { system.registerApp(apps::createTetrisAppFactory()); system.registerApp(apps::createGameboyAppFactory()); - start_task_usage_monitor(); + // start_task_usage_monitor(); system.run(); } diff --git a/Firmware/sdk/core/src/persistent_settings.cpp b/Firmware/sdk/core/src/persistent_settings.cpp index f0fe61e..4b999fe 100644 --- a/Firmware/sdk/core/src/persistent_settings.cpp +++ b/Firmware/sdk/core/src/persistent_settings.cpp @@ -8,7 +8,7 @@ namespace cardboy::sdk { namespace { constexpr std::string_view kNamespace = "settings"; constexpr std::string_view kMuteKey = "mute"; -constexpr std::string_view kAutoLightSleepKey = "auto_light_sleep"; +constexpr std::string_view kAutoLightSleepKey = "autosleep"; [[nodiscard]] std::uint32_t boolToStorage(bool value) { return value ? 1U : 0U; } [[nodiscard]] bool storageToBool(std::uint32_t value) { return value != 0U; } diff --git a/Firmware/sdk/core/src/status_bar.cpp b/Firmware/sdk/core/src/status_bar.cpp index 66ef423..b83974a 100644 --- a/Firmware/sdk/core/src/status_bar.cpp +++ b/Firmware/sdk/core/src/status_bar.cpp @@ -55,11 +55,10 @@ std::string StatusBar::prepareRightText() const { const float fallbackV = services_->battery->voltage(); char buf[64]; if (std::isfinite(current) && std::isfinite(chargeMah)) { - const long currentRounded = std::lround(static_cast(current)); - const long chargeRounded = std::lround(static_cast(chargeMah)); - std::snprintf(buf, sizeof(buf), "CUR %+ldMA CAP %ldMAH", currentRounded, std::max(0L, chargeRounded)); + std::snprintf(buf, sizeof(buf), "cur %.2fmA chr %.2fmAh", static_cast(current), + static_cast(chargeMah)); } else { - std::snprintf(buf, sizeof(buf), "BAT %.2fV", static_cast(fallbackV)); + std::snprintf(buf, sizeof(buf), "vol %.2fV", static_cast(fallbackV)); } right.assign(buf); }