From b252998b62776cbb2faaab998e82329a785ff017 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 22 Feb 2021 09:48:23 +0100 Subject: [PATCH 1/2] fix(anim) handle edge cases in lv_anim_path_bounce --- src/lv_misc/lv_anim.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lv_misc/lv_anim.c b/src/lv_misc/lv_anim.c index 41357dfe5..22ec2978a 100644 --- a/src/lv_misc/lv_anim.c +++ b/src/lv_misc/lv_anim.c @@ -361,13 +361,17 @@ lv_anim_value_t lv_anim_path_bounce(const lv_anim_path_t * path, const lv_anim_t t = 1024 - t; diff = diff / 40; } - else { + else if(t >= 921 && t <= 1024) { /*Fall back*/ t -= 921; t = t * 10; /*to [0..1024] range*/ diff = diff / 40; } + if(t > 1024) t = 1024; + if(t < 0) t = 0; + + int32_t step = _lv_bezier3(t, 1024, 800, 500, 0); int32_t new_value; From 3ddf26923fdbe92bfd6e6d35bf76204d22846b2f Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 22 Feb 2021 09:54:38 +0100 Subject: [PATCH 2/2] fix warning --- src/lv_misc/lv_anim.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lv_misc/lv_anim.c b/src/lv_misc/lv_anim.c index 22ec2978a..5ad6b76b5 100644 --- a/src/lv_misc/lv_anim.c +++ b/src/lv_misc/lv_anim.c @@ -369,7 +369,6 @@ lv_anim_value_t lv_anim_path_bounce(const lv_anim_path_t * path, const lv_anim_t } if(t > 1024) t = 1024; - if(t < 0) t = 0; int32_t step = _lv_bezier3(t, 1024, 800, 500, 0);