Merge branch 'Flipper-XFW:dev' into dev

This commit is contained in:
47LeCoste
2023-12-01 15:54:58 +01:00
committed by GitHub
40 changed files with 405 additions and 103 deletions
+4 -4
View File
@@ -10,7 +10,7 @@ XtremeSettings xtreme_settings = {
.anim_speed = 100, // 100%
.cycle_anims = 0, // Meta.txt
.unlock_anims = false, // OFF
.fallback_anim = true, // ON
.credits_anim = true, // ON
.menu_style = MenuStyleWii, // Wii
.lock_on_boot = false, // OFF
.bad_pins_format = false, // OFF
@@ -69,8 +69,8 @@ void XTREME_SETTINGS_LOAD() {
x->unlock_anims = b;
}
flipper_format_rewind(file);
if(flipper_format_read_bool(file, "fallback_anim", &b, 1)) {
x->fallback_anim = b;
if(flipper_format_read_bool(file, "credits_anim", &b, 1)) {
x->credits_anim = b;
}
flipper_format_rewind(file);
if(flipper_format_read_uint32(file, "menu_style", &u, 1)) {
@@ -209,7 +209,7 @@ void XTREME_SETTINGS_SAVE() {
flipper_format_write_uint32(file, "anim_speed", &x->anim_speed, 1);
flipper_format_write_int32(file, "cycle_anims", &x->cycle_anims, 1);
flipper_format_write_bool(file, "unlock_anims", &x->unlock_anims, 1);
flipper_format_write_bool(file, "fallback_anim", &x->fallback_anim, 1);
flipper_format_write_bool(file, "credits_anim", &x->credits_anim, 1);
e = x->menu_style;
flipper_format_write_uint32(file, "menu_style", &e, 1);
flipper_format_write_bool(file, "bad_pins_format", &x->bad_pins_format, 1);
+1 -1
View File
@@ -57,7 +57,7 @@ typedef struct {
uint32_t anim_speed;
int32_t cycle_anims;
bool unlock_anims;
bool fallback_anim;
bool credits_anim;
MenuStyle menu_style;
bool lock_on_boot;
bool bad_pins_format;