Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2021-02-22 11:16:27 +01:00
commit b6bbadd006
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lv_misc/lv_anim.c
View File

@ -378,14 +378,15 @@ lv_anim_value_t lv_anim_path_bounce(const lv_anim_path_t * path, const lv_anim_t
t = 1024 - t; t = 1024 - t;
diff = diff / 40; diff = diff / 40;
} }
else { else if(t >= 921 && t <= 1024) {
/*Fall back*/ /*Fall back*/
t -= 921; t -= 921;
t = t * 10; /*to [0..1024] range*/ t = t * 10; /*to [0..1024] range*/
diff = diff / 40; diff = diff / 40;
} }
int32_t step = lv_bezier3(t, 1024, 800, 500, 0); if(t > 1024) t = 1024;
int32_t step = _lv_bezier3(t, 1024, 800, 500, 0);
int32_t new_value; int32_t new_value;
new_value = step * diff; new_value = step * diff;