From 2566106a56db87d58739d707b279731cd9ec2654 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Mon, 16 Jan 2023 20:16:38 +0000 Subject: [PATCH] Fix cycle anims setting --- .../services/desktop/animations/animation_manager.c | 8 ++++---- applications/services/desktop/desktop.c | 1 + applications/services/desktop/desktop_settings.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index cadd50ded..37cd4fd53 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -197,8 +197,8 @@ static void animation_manager_start_new_idle(AnimationManager* animation_manager StorageAnimation* new_animation = animation_manager_select_idle_animation(animation_manager); animation_manager_replace_current_animation(animation_manager, new_animation); - const BubbleAnimation* bubble_animation = - animation_storage_get_bubble_animation(animation_manager->current_animation); + // const BubbleAnimation* bubble_animation = + // animation_storage_get_bubble_animation(animation_manager->current_animation); animation_manager->state = AnimationManagerStateIdle; DesktopSettings* settings = malloc(sizeof(DesktopSettings)); DESKTOP_SETTINGS_LOAD(settings); @@ -511,8 +511,8 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m animation_manager->idle_animation_timer, animation_manager->freezed_animation_time_left); } else { - const BubbleAnimation* animation = animation_storage_get_bubble_animation( - animation_manager->current_animation); + // const BubbleAnimation* animation = animation_storage_get_bubble_animation( + // animation_manager->current_animation); DesktopSettings* settings = malloc(sizeof(DesktopSettings)); DESKTOP_SETTINGS_LOAD(settings); furi_timer_start( diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c index b0f3eac34..719ed3018 100644 --- a/applications/services/desktop/desktop.c +++ b/applications/services/desktop/desktop.c @@ -324,6 +324,7 @@ int32_t desktop_srv(void* p) { if(!desktop->settings.cycle_animations_s) { desktop->settings.cycle_animations_s = 3601; + DESKTOP_SETTINGS_SAVE(&desktop->settings); } desktop_main_set_sfw_mode_state(desktop->main_view, desktop->settings.sfw_mode); diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h index dd9231b39..35299a295 100644 --- a/applications/services/desktop/desktop_settings.h +++ b/applications/services/desktop/desktop_settings.h @@ -64,5 +64,5 @@ typedef struct { uint8_t displayBatteryPercentage; bool is_sfwmode; uint8_t sfw_mode; - uint8_t cycle_animations_s; + uint32_t cycle_animations_s; } DesktopSettings;