From f28efdd9f3b0ba8efdb2ff6a4f44267470098810 Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Sat, 18 May 2019 18:14:21 -0700 Subject: [PATCH] Change int32_t to int16_t in animation functions to fix warnings --- src/lv_core/lv_style.c | 6 +++--- src/lv_objx/lv_bar.c | 10 +++++----- src/lv_objx/lv_btn.c | 16 ++++++++-------- src/lv_objx/lv_ddlist.c | 4 ++-- src/lv_objx/lv_page.c | 6 ++---- src/lv_objx/lv_preload.c | 22 +++++++++++----------- src/lv_objx/lv_preload.h | 4 ++-- 7 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/lv_core/lv_style.c b/src/lv_core/lv_style.c index 2d6b67fda..9e3f8ad38 100644 --- a/src/lv_core/lv_style.c +++ b/src/lv_core/lv_style.c @@ -31,7 +31,7 @@ * STATIC PROTOTYPES **********************/ #if LV_USE_ANIMATION -static void style_animator(lv_style_anim_dsc_t * dsc, int32_t val); +static void style_animator(lv_style_anim_dsc_t * dsc, int16_t val); static void style_animation_common_end_cb(lv_anim_t * a); #endif @@ -316,9 +316,9 @@ void lv_style_anim_set_styles(lv_anim_t * a, lv_style_t * to_anim, const lv_styl /** * Used by the style animations to set the values of a style according to start and end style. * @param dsc the 'animated variable' set by lv_style_anim_create() - * @param val the current state of the animation between 0 and LV_STYLE_ANIM_RES + * @param val the current state of the animation between 0 and LV_ANIM_RESOLUTION */ -static void style_animator(lv_style_anim_dsc_t * dsc, int32_t val) +static void style_animator(lv_style_anim_dsc_t * dsc, int16_t val) { const lv_style_t * start = &dsc->style_start; const lv_style_t * end = &dsc->style_end; diff --git a/src/lv_objx/lv_bar.c b/src/lv_objx/lv_bar.c index d53593855..2ecdd142d 100644 --- a/src/lv_objx/lv_bar.c +++ b/src/lv_objx/lv_bar.c @@ -30,7 +30,7 @@ static bool lv_bar_design(lv_obj_t * bar, const lv_area_t * mask, lv_design_mode_t mode); static lv_res_t lv_bar_signal(lv_obj_t * bar, lv_signal_t sign, void * param); -static void lv_bar_animate(void * bar, int32_t value); +static void lv_bar_anim(void * bar, int16_t value); static void lv_bar_anim_ready(lv_anim_t * a); /********************** @@ -158,9 +158,9 @@ void lv_bar_set_value(lv_obj_t * bar, int16_t value, bool anim) a.var = bar; a.start = LV_BAR_ANIM_STATE_START; a.end = LV_BAR_ANIM_STATE_END; - a.exec_cb = (lv_anim_exec_cb_t)lv_bar_animate; - a.path_cb = lv_anim_path_linear; - a.ready_cb = lv_bar_anim_ready; + a.exec_cb = (lv_anim_exec_cb_t)lv_bar_anim; + a.path_cb = lv_anim_path_linear; + a.ready_cb = lv_bar_anim_ready; a.act_time = 0; a.time = ext->anim_time; a.playback = 0; @@ -475,7 +475,7 @@ static lv_res_t lv_bar_signal(lv_obj_t * bar, lv_signal_t sign, void * param) return res; } -static void lv_bar_animate(void * bar, int32_t value) +static void lv_bar_anim(void * bar, int16_t value) { lv_bar_ext_t * ext = lv_obj_get_ext_attr(bar); ext->anim_state = value; diff --git a/src/lv_objx/lv_btn.c b/src/lv_objx/lv_btn.c index a8f72ad38..1d3700712 100644 --- a/src/lv_objx/lv_btn.c +++ b/src/lv_objx/lv_btn.c @@ -35,7 +35,7 @@ static bool lv_btn_design(lv_obj_t * btn, const lv_area_t * mask, lv_design_mode static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param); #if LV_USE_ANIMATION && LV_BTN_INK_EFFECT -static void lv_btn_ink_effect_anim(lv_obj_t * btn, int32_t val); +static void lv_btn_ink_effect_anim(lv_obj_t * btn, int16_t val); static void lv_btn_ink_effect_anim_ready(lv_anim_t * a); #endif @@ -517,9 +517,9 @@ static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param) a.var = btn; a.start = 0; a.end = LV_BTN_INK_VALUE_MAX; - a.exec_cb = (lv_anim_exec_cb_t)lv_btn_ink_effect_anim; - a.path_cb = lv_anim_path_linear; - a.ready_cb = lv_btn_ink_effect_anim_ready; + a.exec_cb = (lv_anim_exec_cb_t)lv_btn_ink_effect_anim; + a.path_cb = lv_anim_path_linear; + a.ready_cb = lv_btn_ink_effect_anim_ready; a.act_time = 0; a.time = ext->ink_in_time; a.playback = 0; @@ -586,9 +586,9 @@ static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param) a.var = ink_obj; a.start = LV_BTN_INK_VALUE_MAX; a.end = 0; - a.exec_cb = (lv_anim_exec_cb_t)lv_btn_ink_effect_anim; - a.path_cb = lv_anim_path_linear; - a.ready_cb = lv_btn_ink_effect_anim_ready; + a.exec_cb = (lv_anim_exec_cb_t)lv_btn_ink_effect_anim; + a.path_cb = lv_anim_path_linear; + a.ready_cb = lv_btn_ink_effect_anim_ready; a.act_time = 0; a.time = ext->ink_out_time; a.playback = 0; @@ -632,7 +632,7 @@ static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param) * @param btn pointer to the animated button * @param val the new radius */ -static void lv_btn_ink_effect_anim(lv_obj_t * btn, int32_t val) +static void lv_btn_ink_effect_anim(lv_obj_t * btn, int16_t val) { if(btn) { ink_act_value = val; diff --git a/src/lv_objx/lv_ddlist.c b/src/lv_objx/lv_ddlist.c index ff6beda09..0d2a92465 100644 --- a/src/lv_objx/lv_ddlist.c +++ b/src/lv_objx/lv_ddlist.c @@ -46,7 +46,7 @@ static void lv_ddlist_pos_current_option(lv_obj_t * ddlist); static void lv_ddlist_refr_width(lv_obj_t* ddlist); static void lv_ddlist_anim_ready_cb(lv_anim_t * a); static void lv_ddlist_anim_finish(lv_obj_t* ddlist); -static void lv_ddlist_adjust_height(lv_obj_t * ddlist, int32_t height); +static void lv_ddlist_adjust_height(lv_obj_t * ddlist, int16_t height); /********************** * STATIC VARIABLES @@ -937,7 +937,7 @@ static void lv_ddlist_anim_finish(lv_obj_t* ddlist) * @param ddlist Drop down list object * @param height New drop down list height */ -static void lv_ddlist_adjust_height(lv_obj_t * ddlist, int32_t height) +static void lv_ddlist_adjust_height(lv_obj_t * ddlist, int16_t height) { lv_obj_set_height(ddlist, height); lv_ddlist_pos_current_option(ddlist); diff --git a/src/lv_objx/lv_page.c b/src/lv_objx/lv_page.c index 361e33977..641e20261 100644 --- a/src/lv_objx/lv_page.c +++ b/src/lv_objx/lv_page.c @@ -40,7 +40,7 @@ static bool lv_page_design(lv_obj_t * page, const lv_area_t * mask, lv_design_mo static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mode_t mode); static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param); static lv_res_t lv_page_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, void * param); -static void edge_flash_anim(void * page, int32_t v); +static void edge_flash_anim(void * page, int16_t v); static void edge_flash_anim_end(lv_anim_t * a); static void scrl_def_event_cb(lv_obj_t * scrl, lv_event_t event); @@ -435,10 +435,8 @@ void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, uint16_t anim_time) * because it can overide the current changes*/ lv_anim_del(page, (lv_anim_exec_cb_t)lv_obj_set_x); lv_anim_del(page, (lv_anim_exec_cb_t)lv_obj_set_y); - lv_anim_del(page, (lv_anim_exec_cb_t)lv_obj_set_pos); lv_anim_del(ext->scrl, (lv_anim_exec_cb_t)lv_obj_set_x); lv_anim_del(ext->scrl, (lv_anim_exec_cb_t)lv_obj_set_y); - lv_anim_del(ext->scrl, (lv_anim_exec_cb_t)lv_obj_set_pos); #endif const lv_style_t * style = lv_page_get_style(page, LV_PAGE_STYLE_BG); @@ -1195,7 +1193,7 @@ static void lv_page_sb_refresh(lv_obj_t * page) } } -static void edge_flash_anim(void * page, int32_t v) +static void edge_flash_anim(void * page, int16_t v) { lv_page_ext_t * ext = lv_obj_get_ext_attr(page); ext->edge_flash.state = v; diff --git a/src/lv_objx/lv_preload.c b/src/lv_objx/lv_preload.c index 4d8c0b874..5986c8c8f 100644 --- a/src/lv_objx/lv_preload.c +++ b/src/lv_objx/lv_preload.c @@ -127,7 +127,7 @@ lv_obj_t * lv_preload_create(lv_obj_t * par, const lv_obj_t * copy) * @param preload pointer to a preload object * @param deg length of the arc */ -void lv_preload_set_arc_length(lv_obj_t * preload, uint16_t deg) +void lv_preload_set_arc_length(lv_obj_t * preload, int16_t deg) { lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); @@ -189,9 +189,9 @@ void lv_preload_set_anim_type(lv_obj_t * preload, lv_preload_type_t type) a.start = 0; a.end = 360; } - a.exec_cb = (lv_anim_exec_cb_t)lv_preload_spinner_anim; - a.path_cb = lv_anim_path_ease_in_out; - a.ready_cb = NULL; + a.exec_cb = (lv_anim_exec_cb_t)lv_preload_spinner_anim; + a.path_cb = lv_anim_path_ease_in_out; + a.ready_cb = NULL; a.act_time = 0; a.time = ext->time; a.playback = 0; @@ -211,9 +211,9 @@ void lv_preload_set_anim_type(lv_obj_t * preload, lv_preload_type_t type) b.start = ext->arc_length; b.end = 360 - ext->arc_length; } - b.exec_cb = (lv_anim_exec_cb_t)lv_preload_set_arc_length; - b.path_cb = lv_anim_path_ease_in_out; - b.ready_cb = NULL; + b.exec_cb = (lv_anim_exec_cb_t)lv_preload_set_arc_length; + b.path_cb = lv_anim_path_ease_in_out; + b.ready_cb = NULL; b.act_time = 0; b.time = ext->time; b.playback = 1; @@ -237,9 +237,9 @@ void lv_preload_set_anim_type(lv_obj_t * preload, lv_preload_type_t type) a.start = 0; a.end = 360; } - a.exec_cb = (lv_anim_exec_cb_t)lv_preload_spinner_anim; - a.path_cb = lv_anim_path_ease_in_out; - a.ready_cb = NULL; + a.exec_cb = (lv_anim_exec_cb_t)lv_preload_spinner_anim; + a.path_cb = lv_anim_path_ease_in_out; + a.ready_cb = NULL; a.act_time = 0; a.time = ext->time; a.playback = 0; @@ -328,7 +328,7 @@ lv_preload_dir_t lv_preload_get_anim_dir(lv_obj_t * preload) { * @param ptr pointer to preloader * @param val the current desired value [0..360] */ -void lv_preload_spinner_anim(void * ptr, int32_t val) +void lv_preload_spinner_anim(void * ptr, int16_t val) { lv_obj_t * preload = ptr; lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); diff --git a/src/lv_objx/lv_preload.h b/src/lv_objx/lv_preload.h index 3590f3d1c..25b1b37b9 100644 --- a/src/lv_objx/lv_preload.h +++ b/src/lv_objx/lv_preload.h @@ -92,7 +92,7 @@ lv_obj_t * lv_preload_create(lv_obj_t * par, const lv_obj_t * copy); * @param preload pointer to a preload object * @param deg length of the arc */ -void lv_preload_set_arc_length(lv_obj_t * preload, uint16_t deg); +void lv_preload_set_arc_length(lv_obj_t * preload, int16_t deg); /** * Set the spin time of the arc @@ -175,7 +175,7 @@ lv_preload_dir_t lv_preload_get_anim_dir(lv_obj_t * preload); * @param type which style should be get * @return style pointer to the style * */ -void lv_preload_spinner_anim(void * ptr, int32_t val); +void lv_preload_spinner_anim(void * ptr, int16_t val); /********************** * MACROS