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

Change cycle anims setting to control anim length

Browse Source
This commit is contained in:
Willy-JL
2023-01-16 20:02:40 +00:00
parent cf2a1265db
commit f2c1921638
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
applications/services/desktop/animations/animation_manager.c
View File

@@ -118,12 +118,9 @@ static void animation_manager_check_blocking_callback(const void* message, void*
static void animation_manager_timer_callback(void* context) {
furi_assert(context);
AnimationManager* animation_manager = context;
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
if(!settings->dont_cycle_animations && animation_manager->new_idle_callback) {
if(animation_manager->new_idle_callback) {
animation_manager->new_idle_callback(animation_manager->context);
}
free(settings);
}
static void animation_manager_interact_callback(void* context) {
@@ -203,7 +200,10 @@ static void animation_manager_start_new_idle(AnimationManager* animation_manager
const BubbleAnimation* bubble_animation =
animation_storage_get_bubble_animation(animation_manager->current_animation);
animation_manager->state = AnimationManagerStateIdle;
furi_timer_start(animation_manager->idle_animation_timer, bubble_animation->duration * 1000);
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
furi_timer_start(animation_manager->idle_animation_timer, (settings->cycle_animations_s - 1) * 1000);
free(settings);
}
static bool animation_manager_check_blocking(AnimationManager* animation_manager) {
@@ -513,8 +513,11 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
} else {
const BubbleAnimation* animation = animation_storage_get_bubble_animation(
animation_manager->current_animation);
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
furi_timer_start(
animation_manager->idle_animation_timer, animation->duration * 1000);
animation_manager->idle_animation_timer, (settings->cycle_animations_s - 1) * 1000);
free(settings);
}
}
} else {

4
applications/services/desktop/desktop.c
View File

@@ -322,6 +322,10 @@ int32_t desktop_srv(void* p) {
DESKTOP_SETTINGS_SAVE(&desktop->settings);
}
if(!desktop->settings.cycle_animations_s) {
desktop->settings.cycle_animations_s = 3601;
}
desktop_main_set_sfw_mode_state(desktop->main_view, desktop->settings.sfw_mode);
scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain);

2
applications/services/desktop/desktop_settings.h
View File

@@ -64,5 +64,5 @@ typedef struct {
uint8_t displayBatteryPercentage;
bool is_sfwmode;
uint8_t sfw_mode;
uint8_t dont_cycle_animations;
uint8_t cycle_animations_s;
} DesktopSettings;