From 11c443b79ac88ba7edcde4102651c747e44a13b3 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 28 May 2023 20:42:11 +0100
Subject: [PATCH] Shorter charge cap var name (for format)

---
 .../main/xtreme_app/scenes/xtreme_app_scene_misc.c    |  7 ++-----
 applications/services/power/power_service/power.c     | 11 +++++------
 applications/services/power/power_service/power.h     |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
index 77df1ec31..2e3984439 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
@@ -54,10 +54,8 @@ static void xtreme_app_scene_misc_lcd_color_changed(VariableItem* item) {
     notification_message(app->notification, &sequence_display_backlight_on);
 }
 
-const char* const charge_cap_names[] =
-    {"50%", "60%", "70%", "80%", "90%", "100%"};
-const int32_t charge_cap_values[COUNT_OF(charge_cap_names)] =
-    {50, 60, 70, 80, 90, 100};
+const char* const charge_cap_names[] = {"50%", "60%", "70%", "80%", "90%", "100%"};
+const int32_t charge_cap_values[COUNT_OF(charge_cap_names)] = {50, 60, 70, 80, 90, 100};
 static void xtreme_app_scene_misc_charge_cap_changed(VariableItem* item) {
     XtremeApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -133,7 +131,6 @@ void xtreme_app_scene_misc_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, charge_cap_names[value_index]);
 
-
     variable_item_list_set_enter_callback(
         var_item_list, xtreme_app_scene_misc_var_item_list_callback, app);
 
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index aeb646a52..423f767b9 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -474,19 +474,18 @@ static void power_check_battery_level_change(Power* power) {
 
 static void power_check_charge_cap(Power* power) {
     if(power->info.charge >= XTREME_SETTINGS()->charge_cap) {
-        if(!power->info.is_charge_cap_suppressing_charging) { // Suppress charging if charge reaches custom cap
-            power->info.is_charge_cap_suppressing_charging = true;
+        if(!power->info.is_charge_capped) { // Suppress charging if charge reaches custom cap
+            power->info.is_charge_capped = true;
             furi_hal_power_suppress_charge_enter();
         }
     } else {
-        if(power->info.is_charge_cap_suppressing_charging) { // Start charging again if charge below custom cap
-            power->info.is_charge_cap_suppressing_charging = false;
+        if(power->info.is_charge_capped) { // Start charging again if charge below custom cap
+            power->info.is_charge_capped = false;
             furi_hal_power_suppress_charge_exit();
         }
     }
 }
 
-
 void power_trigger_ui_update(Power* power) {
     view_port_update(power->battery_view_port);
 }
@@ -506,7 +505,7 @@ int32_t power_srv(void* p) {
     }
     power_auto_shutdown_arm(power);
     power_update_info(power);
-    power->info.is_charge_cap_suppressing_charging = false; // default false
+    power->info.is_charge_capped = false; // default false
     furi_record_create(RECORD_POWER, power);
 
     while(1) {
diff --git a/applications/services/power/power_service/power.h b/applications/services/power/power_service/power.h
index 01e61827a..8a9d5947d 100644
--- a/applications/services/power/power_service/power.h
+++ b/applications/services/power/power_service/power.h
@@ -48,7 +48,7 @@ typedef struct {
 typedef struct {
     bool gauge_is_ok;
     bool is_charging;
-    bool is_charge_cap_suppressing_charging;
+    bool is_charge_capped;
 
     float current_charger;
     float current_gauge;