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

Move charge cap setting, more values, fix build

Browse Source
This commit is contained in:
Willy-JL
2023-05-28 21:04:25 +01:00
parent 11c443b79a
commit 3a21b12818
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
+23 -21
View File
@@ -45,6 +45,17 @@ static void xtreme_app_scene_misc_butthurt_timer_changed(VariableItem* item) {
app->require_reboot = true;
}
#define CHARGE_CAP_INTV 5
static void xtreme_app_scene_misc_charge_cap_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item);
char cap_str[6];
uint32_t value = (variable_item_get_current_value_index(item) + 1) * CHARGE_CAP_INTV;
snprintf(cap_str, 6, "%lu%%", value);
variable_item_set_current_value_text(item, cap_str);
XTREME_SETTINGS()->charge_cap = value;
app->save_settings = true;
}
static void xtreme_app_scene_misc_lcd_color_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
@@ -54,16 +65,6 @@ 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};
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);
variable_item_set_current_value_text(item, charge_cap_names[index]);
XTREME_SETTINGS()->charge_cap = charge_cap_values[index];
app->save_settings = true;
}
void xtreme_app_scene_misc_on_enter(void* context) {
XtremeApp* app = context;
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
@@ -106,6 +107,18 @@ 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, butthurt_timer_names[value_index]);
char cap_str[6];
value_index = xtreme_settings->charge_cap / CHARGE_CAP_INTV;
snprintf(cap_str, 6, "%lu%%", (uint32_t)value_index * CHARGE_CAP_INTV);
item = variable_item_list_add(
var_item_list,
"Charge Cap",
100 / CHARGE_CAP_INTV,
xtreme_app_scene_misc_charge_cap_changed,
app);
variable_item_set_current_value_index(item, value_index - 1);
variable_item_set_current_value_text(item, cap_str);
item = variable_item_list_add(var_item_list, "RGB Backlight", 1, NULL, app);
variable_item_set_current_value_text(item, xtreme_settings->rgb_backlight ? "ON" : "OFF");
@@ -120,17 +133,6 @@ void xtreme_app_scene_misc_on_enter(void* context) {
variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index));
variable_item_set_locked(item, !xtreme_settings->rgb_backlight, "Needs RGB\nBacklight!");
item = variable_item_list_add(
var_item_list,
"Charge Cap %",
COUNT_OF(charge_cap_names),
xtreme_app_scene_misc_charge_cap_changed,
app);
value_index = value_index_uint32(
xtreme_settings->anim_speed, charge_cap_values, COUNT_OF(charge_cap_names));
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);
lib/xtreme/settings.c
+4 -4
View File
@@ -29,8 +29,8 @@ XtremeSettings xtreme_settings = {
.bad_bt = false, // USB
.bad_bt_remember = false, // OFF
.butthurt_timer = 21600, // 6 H
.rgb_backlight = false, // OFF
.charge_cap = 100, // 100%
.rgb_backlight = false, // OFF
};
void XTREME_SETTINGS_LOAD() {
@@ -91,9 +91,9 @@ void XTREME_SETTINGS_LOAD() {
flipper_format_rewind(file);
flipper_format_read_int32(file, "butthurt_timer", &x->butthurt_timer, 1);
flipper_format_rewind(file);
flipper_format_read_bool(file, "rgb_backlight", &x->rgb_backlight, 1);
flipper_format_rewind(file);
flipper_format_read_uint32(file, "charge_cap", &x->charge_cap, 1);
flipper_format_rewind(file);
flipper_format_read_bool(file, "rgb_backlight", &x->rgb_backlight, 1);
}
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
@@ -129,8 +129,8 @@ void XTREME_SETTINGS_SAVE() {
flipper_format_write_bool(file, "bad_bt", &x->bad_bt, 1);
flipper_format_write_bool(file, "bad_bt_remember", &x->bad_bt_remember, 1);
flipper_format_write_int32(file, "butthurt_timer", &x->butthurt_timer, 1);
flipper_format_write_bool(file, "rgb_backlight", &x->rgb_backlight, 1);
flipper_format_write_uint32(file, "charge_cap", &x->charge_cap, 1);
flipper_format_write_bool(file, "rgb_backlight", &x->rgb_backlight, 1);
}
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
lib/xtreme/xtreme.h
+1 -1
View File
@@ -37,8 +37,8 @@ typedef struct {
bool bad_bt;
bool bad_bt_remember;
int32_t butthurt_timer;
bool rgb_backlight;
uint32_t charge_cap;
bool rgb_backlight;
} XtremeSettings;
void XTREME_SETTINGS_SAVE();