Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 12:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Shorter charge cap var name (for format)

Browse Source
This commit is contained in:
Willy-JL
2023-05-28 20:42:11 +01:00
parent 9fe6dbe0cd
commit 11c443b79a
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
View File

@@ -54,10 +54,8 @@ static void xtreme_app_scene_misc_lcd_color_changed(VariableItem* item) {
notification_message(app->notification, &sequence_display_backlight_on); notification_message(app->notification, &sequence_display_backlight_on);
} }
const char* const charge_cap_names[] = const char* const charge_cap_names[] = {"50%", "60%", "70%", "80%", "90%", "100%"};
{"50%", "60%", "70%", "80%", "90%", "100%"}; const int32_t charge_cap_values[COUNT_OF(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) { static void xtreme_app_scene_misc_charge_cap_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item); XtremeApp* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(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_index(item, value_index);
variable_item_set_current_value_text(item, charge_cap_names[value_index]); variable_item_set_current_value_text(item, charge_cap_names[value_index]);
variable_item_list_set_enter_callback( variable_item_list_set_enter_callback(
var_item_list, xtreme_app_scene_misc_var_item_list_callback, app); var_item_list, xtreme_app_scene_misc_var_item_list_callback, app);

11
applications/services/power/power_service/power.c
View File

@@ -474,19 +474,18 @@ static void power_check_battery_level_change(Power* power) {
static void power_check_charge_cap(Power* power) { static void power_check_charge_cap(Power* power) {
if(power->info.charge >= XTREME_SETTINGS()->charge_cap) { if(power->info.charge >= XTREME_SETTINGS()->charge_cap) {
if(!power->info.is_charge_cap_suppressing_charging) { // Suppress charging if charge reaches custom cap if(!power->info.is_charge_capped) { // Suppress charging if charge reaches custom cap
power->info.is_charge_cap_suppressing_charging = true; power->info.is_charge_capped = true;
furi_hal_power_suppress_charge_enter(); furi_hal_power_suppress_charge_enter();
} }
} else { } else {
if(power->info.is_charge_cap_suppressing_charging) { // Start charging again if charge below custom cap if(power->info.is_charge_capped) { // Start charging again if charge below custom cap
power->info.is_charge_cap_suppressing_charging = false; power->info.is_charge_capped = false;
furi_hal_power_suppress_charge_exit(); furi_hal_power_suppress_charge_exit();
} }
} }
} }
void power_trigger_ui_update(Power* power) { void power_trigger_ui_update(Power* power) {
view_port_update(power->battery_view_port); view_port_update(power->battery_view_port);
} }
@@ -506,7 +505,7 @@ int32_t power_srv(void* p) {
} }
power_auto_shutdown_arm(power); power_auto_shutdown_arm(power);
power_update_info(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); furi_record_create(RECORD_POWER, power);
while(1) { while(1) {

2
applications/services/power/power_service/power.h
View File

@@ -48,7 +48,7 @@ typedef struct {
typedef struct { typedef struct {
bool gauge_is_ok; bool gauge_is_ok;
bool is_charging; bool is_charging;
bool is_charge_cap_suppressing_charging; bool is_charge_capped;
float current_charger; float current_charger;
float current_gauge; float current_gauge;