From 563cf986d608c5540a56e068142039835b0f804b Mon Sep 17 00:00:00 2001 From: Patrik Burleson Date: Thu, 8 Sep 2022 07:31:57 +0200 Subject: [PATCH 1/2] change update the Battery info --- .../scenes/desktop_settings_scene_start.c | 1 + applications/power/power_service/power.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c index e1a926793..13aca3151 100644 --- a/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c +++ b/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c @@ -41,6 +41,7 @@ const uint32_t displayBatteryPercentage_value[BATTERY_VIEW_COUNT] = {0, 1, 2, 3, static void desktop_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) { DesktopSettingsApp* app = context; view_dispatcher_send_custom_event(app->view_dispatcher, index); + } static void desktop_settings_scene_start_battery_view_changed(VariableItem* item) { diff --git a/applications/power/power_service/power.c b/applications/power/power_service/power.c index bf8524e82..83c666434 100644 --- a/applications/power/power_service/power.c +++ b/applications/power/power_service/power.c @@ -171,11 +171,6 @@ static void power_check_charging_state(Power* power) { static bool power_update_info(Power* power) { PowerInfo info; - - DesktopSettings* settings = malloc(sizeof(DesktopSettings)); - LOAD_DESKTOP_SETTINGS(settings); - power->displayBatteryPercentage = settings->displayBatteryPercentage; - free(settings); info.gauge_is_ok = furi_hal_power_gauge_is_ok(); info.charge = furi_hal_power_get_pct(); @@ -256,6 +251,11 @@ int32_t power_srv(void* p) { Power* power = power_alloc(); power_update_info(power); furi_record_create(RECORD_POWER, power); + + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + LOAD_DESKTOP_SETTINGS(settings); + power->displayBatteryPercentage = settings->displayBatteryPercentage; + free(settings); while(1) { // Update data from gauge and charger @@ -271,7 +271,13 @@ int32_t power_srv(void* p) { power_check_battery_level_change(power); // Update battery view port - if(need_refresh) view_port_update(power->battery_view_port); + if(need_refresh) { + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + LOAD_DESKTOP_SETTINGS(settings); + power->displayBatteryPercentage = settings->displayBatteryPercentage; + free(settings); + view_port_update(power->battery_view_port); + } // Check OTG status and disable it in case of fault if(furi_hal_power_is_otg_enabled()) { From b52c63f6da5c57e993f77d1422469a902ae3927d Mon Sep 17 00:00:00 2001 From: Patrik Burleson Date: Thu, 8 Sep 2022 12:52:18 +0200 Subject: [PATCH 2/2] change update the Battery info --- .../desktop_settings/desktop_settings.h | 1 + .../scenes/desktop_settings_scene_start.c | 38 +++++++++++++++ applications/gui/canvas.c | 3 ++ applications/gui/canvas.h | 3 +- applications/power/power_service/power.c | 47 ++++++++++++++++++- applications/power/power_service/power_i.h | 1 + 6 files changed, 91 insertions(+), 2 deletions(-) diff --git a/applications/desktop/desktop_settings/desktop_settings.h b/applications/desktop/desktop_settings/desktop_settings.h index 800847d56..cfd07b563 100644 --- a/applications/desktop/desktop_settings/desktop_settings.h +++ b/applications/desktop/desktop_settings/desktop_settings.h @@ -46,4 +46,5 @@ typedef struct { PinCode pin_code; uint8_t is_locked; uint32_t auto_lock_delay_ms; + uint8_t displayBatteryPercentage; } DesktopSettings; diff --git a/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c index 17a08f097..7ae99aa24 100644 --- a/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c +++ b/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c @@ -8,6 +8,7 @@ #define SCENE_EVENT_SELECT_FAVORITE_SECONDARY 1 #define SCENE_EVENT_SELECT_PIN_SETUP 2 #define SCENE_EVENT_SELECT_AUTO_LOCK_DELAY 3 +#define SCENE_EVENT_SELECT_BATTERY_DISPLAY 4 #define AUTO_LOCK_DELAY_COUNT 9 const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = { @@ -25,12 +26,32 @@ const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = { const uint32_t auto_lock_delay_value[AUTO_LOCK_DELAY_COUNT] = {0, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000}; +#define BATTERY_VIEW_COUNT 5 + +const char* const battery_view_count_text[BATTERY_VIEW_COUNT] = { + "Bar", + "%", + "Inv. %", + "Retro 3", + "Retro 5", +}; + +const uint32_t displayBatteryPercentage_value[BATTERY_VIEW_COUNT] = {0, 1, 2, 3, 4}; + static void desktop_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) { DesktopSettingsApp* app = context; view_dispatcher_send_custom_event(app->view_dispatcher, index); } +static void desktop_settings_scene_start_battery_view_changed(VariableItem* item) { + DesktopSettingsApp* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + + variable_item_set_current_value_text(item, battery_view_count_text[index]); + app->settings.displayBatteryPercentage = index; +} + static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* item) { DesktopSettingsApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); @@ -65,6 +86,20 @@ void desktop_settings_scene_start_on_enter(void* context) { app->settings.auto_lock_delay_ms, auto_lock_delay_value, AUTO_LOCK_DELAY_COUNT); variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, auto_lock_delay_text[value_index]); + + item = variable_item_list_add( + variable_item_list, + "Battery View", + BATTERY_VIEW_COUNT, + desktop_settings_scene_start_battery_view_changed, + app); + + value_index = value_index_uint32( + app->settings.displayBatteryPercentage, + displayBatteryPercentage_value, + BATTERY_VIEW_COUNT); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, battery_view_count_text[value_index]); view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewVarItemList); } @@ -92,6 +127,9 @@ bool desktop_settings_scene_start_on_event(void* context, SceneManagerEvent even case SCENE_EVENT_SELECT_AUTO_LOCK_DELAY: consumed = true; break; + case SCENE_EVENT_SELECT_BATTERY_DISPLAY: + consumed = true; + break; } } return consumed; diff --git a/applications/gui/canvas.c b/applications/gui/canvas.c index 1e275aafb..75a193a48 100644 --- a/applications/gui/canvas.c +++ b/applications/gui/canvas.c @@ -12,6 +12,7 @@ const CanvasFontParameters canvas_font_params[FontTotalNumber] = { [FontSecondary] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2}, [FontKeyboard] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2}, [FontBigNumbers] = {.leading_default = 18, .leading_min = 16, .height = 15, .descender = 0}, + [FontBatteryPercent] = {.leading_default = 11, .leading_min = 9, .height = 6, .descender = 0}, }; Canvas* canvas_init() { @@ -132,6 +133,8 @@ void canvas_set_font(Canvas* canvas, Font font) { u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mr); } else if(font == FontBigNumbers) { u8g2_SetFont(&canvas->fb, u8g2_font_profont22_tn); + } else if(font == FontBatteryPercent) { + u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tf); //u8g2_font_micro_tr); } else { furi_crash(NULL); } diff --git a/applications/gui/canvas.h b/applications/gui/canvas.h index 4923e2e66..370da679f 100644 --- a/applications/gui/canvas.h +++ b/applications/gui/canvas.h @@ -25,7 +25,8 @@ typedef enum { FontSecondary, FontKeyboard, FontBigNumbers, - + FontBatteryPercent, + // Keep last for fonts number calculation FontTotalNumber, } Font; diff --git a/applications/power/power_service/power.c b/applications/power/power_service/power.c index 040c966c8..83c666434 100644 --- a/applications/power/power_service/power.c +++ b/applications/power/power_service/power.c @@ -1,5 +1,6 @@ #include "power_i.h" #include "views/power_off.h" +#include "desktop/desktop_settings/desktop_settings.h" #include #include @@ -14,7 +15,51 @@ void power_draw_battery_callback(Canvas* canvas, void* context) { canvas_draw_icon(canvas, 0, 0, &I_Battery_26x8); if(power->info.gauge_is_ok) { - canvas_draw_box(canvas, 2, 2, (power->info.charge + 4) / 5, 4); + + char batteryPercentile[5]; + snprintf(batteryPercentile, sizeof(batteryPercentile), "%d", power->info.charge); + strcat(batteryPercentile, "%"); + + if((power->displayBatteryPercentage == 1) && (power->state != PowerStateCharging)) { //if display battery percentage, black background white text + canvas_set_font(canvas, FontBatteryPercent); + canvas_set_color(canvas, ColorBlack); + canvas_draw_box(canvas, 1, 1, 22, 6); + canvas_set_color(canvas, ColorWhite); + canvas_draw_str_aligned(canvas, 12, 4, AlignCenter, AlignCenter, batteryPercentile); + } else if((power->displayBatteryPercentage == 2) && (power->state != PowerStateCharging)) { //if display inverted percentage, white background black text + canvas_set_font(canvas, FontBatteryPercent); + canvas_set_color(canvas, ColorBlack); + canvas_draw_str_aligned(canvas, 12, 4, AlignCenter, AlignCenter, batteryPercentile); + } else if((power->displayBatteryPercentage == 3) && (power->state != PowerStateCharging)) { //Retro style segmented display, 3 parts + if(power->info.charge > 25) { + canvas_draw_box(canvas, 2, 2, 6, 4); + } + if(power->info.charge > 50) { + canvas_draw_box(canvas, 9, 2, 6, 4); + } + if(power->info.charge > 75) { + canvas_draw_box(canvas, 16, 2, 6, 4); + } + } else if((power->displayBatteryPercentage == 4) && (power->state != PowerStateCharging)) { //Retro style segmented display, 5 parts + if(power->info.charge > 10) { + canvas_draw_box(canvas, 2, 2, 3, 4); + } + if(power->info.charge > 30) { + canvas_draw_box(canvas, 6, 2, 3, 4); + } + if(power->info.charge > 50) { + canvas_draw_box(canvas, 10, 2, 3, 4); + } + if(power->info.charge > 70) { + canvas_draw_box(canvas, 14, 2, 3, 4); + } + if(power->info.charge > 90) { + canvas_draw_box(canvas, 18, 2, 3, 4); + } + } else { //default bar display, added here to serve as fallback/default behaviour. + canvas_draw_box(canvas, 2, 2, (power->info.charge + 4) / 5, 4); + } + if(power->state == PowerStateCharging) { canvas_set_bitmap_mode(canvas, 1); canvas_set_color(canvas, ColorWhite); diff --git a/applications/power/power_service/power_i.h b/applications/power/power_service/power_i.h index 66ced885b..084318d84 100644 --- a/applications/power/power_service/power_i.h +++ b/applications/power/power_service/power_i.h @@ -36,6 +36,7 @@ struct Power { bool battery_low; bool show_low_bat_level_message; + uint8_t displayBatteryPercentage; uint8_t battery_level; uint8_t power_off_timeout;