diff --git a/src/lv_objx/lv_preload.c b/src/lv_objx/lv_preload.c index 31664299e..7bff32e65 100644 --- a/src/lv_objx/lv_preload.c +++ b/src/lv_objx/lv_preload.c @@ -80,7 +80,7 @@ lv_obj_t * lv_preload_create(lv_obj_t * par, const lv_obj_t * copy) /*Initialize the allocated 'ext' */ ext->arc_length = LV_PRELOAD_DEF_ARC_LENGTH; ext->anim_type = LV_PRELOAD_DEF_ANIM; - ext->anim_direction = LV_PRELOAD_DIRECTION_FORWARD; + ext->anim_dir = LV_PRELOAD_DIR_FORWARD; /*The signal and design functions are not copied so set them here*/ lv_obj_set_signal_cb(new_preload, lv_preload_signal); @@ -106,12 +106,12 @@ lv_obj_t * lv_preload_create(lv_obj_t * par, const lv_obj_t * copy) lv_preload_ext_t * copy_ext = lv_obj_get_ext_attr(copy); ext->arc_length = copy_ext->arc_length; ext->time = copy_ext->time; - ext->anim_direction = copy_ext->anim_direction; + ext->anim_dir = copy_ext->anim_dir; /*Refresh the style with new signal function*/ lv_obj_refresh_style(new_preload); } - lv_preload_set_animation_type(new_preload, ext->anim_type); + lv_preload_set_anim_type(new_preload, ext->anim_type); LV_LOG_INFO("preload created"); @@ -144,7 +144,7 @@ void lv_preload_set_spin_time(lv_obj_t * preload, uint16_t time) lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); ext->time = time; - lv_preload_set_animation_type(preload, ext->anim_type); + lv_preload_set_anim_type(preload, ext->anim_type); } /*===================== * Setter functions @@ -168,7 +168,7 @@ void lv_preload_set_style(lv_obj_t * preload, lv_preload_style_t type, const lv_ * @param preload pointer to pre loader object * @param type animation type of the preload * */ -void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) +void lv_preload_set_anim_type(lv_obj_t * preload, lv_preload_type_t type) { #if LV_USE_ANIMATION lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); @@ -180,7 +180,7 @@ void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) ext->anim_type = LV_PRELOAD_TYPE_FILLSPIN_ARC; lv_anim_t a; a.var = preload; - if( ext->anim_direction == LV_PRELOAD_DIRECTION_FORWARD ) { + if( ext->anim_dir == LV_PRELOAD_DIR_FORWARD ) { /* Clockwise */ a.start = 360; a.end = 0; @@ -189,7 +189,7 @@ void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) a.start = 0; a.end = 360; } - a.fp = (lv_anim_fp_t)lv_preload_spinner_animation; + a.fp = (lv_anim_fp_t)lv_preload_spinner_anim; a.path = lv_anim_path_ease_in_out; a.end_cb = NULL; a.act_time = 0; @@ -202,7 +202,7 @@ void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) lv_anim_t b; b.var = preload; - if( ext->anim_direction == LV_PRELOAD_DIRECTION_FORWARD ) { + if( ext->anim_dir == LV_PRELOAD_DIR_FORWARD ) { /* Clockwise */ b.start = 360 - ext->arc_length; b.end = ext->arc_length; @@ -228,7 +228,7 @@ void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) ext->anim_type = LV_PRELOAD_TYPE_SPINNING_ARC; lv_anim_t a; a.var = preload; - if( ext->anim_direction == LV_PRELOAD_DIRECTION_FORWARD ) { + if( ext->anim_dir == LV_PRELOAD_DIR_FORWARD ) { /* Clockwise */ a.start = 360; a.end = 0; @@ -237,7 +237,7 @@ void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) a.start = 0; a.end = 360; } - a.fp = (lv_anim_fp_t)lv_preload_spinner_animation; + a.fp = (lv_anim_fp_t)lv_preload_spinner_anim; a.path = lv_anim_path_ease_in_out; a.end_cb = NULL; a.act_time = 0; @@ -254,11 +254,11 @@ void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type) #endif // LV_USE_ANIMATION } -void lv_preload_set_animation_direction(lv_obj_t * preload, lv_preload_direction_t direction) { +void lv_preload_set_anim_dir(lv_obj_t * preload, lv_preload_dir_t dir) { lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); - ext->anim_direction = direction; - lv_preload_set_animation_type(preload, ext->anim_type); + ext->anim_dir = dir; + lv_preload_set_anim_type(preload, ext->anim_type); } /*===================== @@ -308,15 +308,15 @@ const lv_style_t * lv_preload_get_style(const lv_obj_t * preload, lv_preload_sty * @param preload pointer to pre loader object * @return animation type * */ -lv_preload_type_t lv_preload_get_animation_type(lv_obj_t * preload) +lv_preload_type_t lv_preload_get_anim_type(lv_obj_t * preload) { lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); return ext->anim_type; } -lv_preload_direction_t lv_preload_get_animation_direction(lv_obj_t * preload) { +lv_preload_dir_t lv_preload_get_anim_dir(lv_obj_t * preload) { lv_preload_ext_t * ext = lv_obj_get_ext_attr(preload); - return ext->anim_direction; + return ext->anim_dir; } /*===================== @@ -328,7 +328,7 @@ lv_preload_direction_t lv_preload_get_animation_direction(lv_obj_t * preload) { * @param ptr pointer to preloader * @param val the current desired value [0..360] */ -void lv_preload_spinner_animation(void * ptr, int32_t val) +void lv_preload_spinner_anim(void * ptr, int32_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 d6fc4d3ea..3590f3d1c 100644 --- a/src/lv_objx/lv_preload.h +++ b/src/lv_objx/lv_preload.h @@ -48,10 +48,10 @@ enum { typedef uint8_t lv_preload_type_t; enum { - LV_PRELOAD_DIRECTION_FORWARD, - LV_PRELOAD_DIRECTION_BACKWARD, + LV_PRELOAD_DIR_FORWARD, + LV_PRELOAD_DIR_BACKWARD, }; -typedef uint8_t lv_preload_direction_t; +typedef uint8_t lv_preload_dir_t; /*Data of pre loader*/ typedef struct @@ -61,7 +61,7 @@ typedef struct uint16_t arc_length; /*Length of the spinning indicator in degree*/ uint16_t time; /*Time of one round*/ lv_preload_type_t anim_type:1; /*Type of the arc animation*/ - lv_preload_direction_t anim_direction:1; /*Animation Direction*/ + lv_preload_dir_t anim_dir:1; /*Animation Direction*/ } lv_preload_ext_t; /*Styles*/ @@ -118,14 +118,14 @@ void lv_preload_set_style(lv_obj_t * preload, lv_preload_style_t type, const lv_ * @param preload pointer to pre loader object * @param type animation type of the preload * */ -void lv_preload_set_animation_type(lv_obj_t * preload, lv_preload_type_t type); +void lv_preload_set_anim_type(lv_obj_t * preload, lv_preload_type_t type); /** * Set the animation direction of a preloader * @param preload pointer to pre loader object * @param direction animation direction of the preload */ -void lv_preload_set_animation_direction(lv_obj_t * preload, lv_preload_direction_t direction); +void lv_preload_set_anim_dir(lv_obj_t * preload, lv_preload_dir_t dir); /*===================== * Getter functions @@ -156,14 +156,14 @@ const lv_style_t * lv_preload_get_style(const lv_obj_t * preload, lv_preload_sty * @param preload pointer to pre loader object * @return animation type * */ -lv_preload_type_t lv_preload_get_animation_type(lv_obj_t * preload); +lv_preload_type_t lv_preload_get_anim_type(lv_obj_t * preload); /** * Get the animation direction of a preloader * @param preload pointer to pre loader object * @return animation direction */ -lv_preload_direction_t lv_preload_get_animation_direction(lv_obj_t * preload); +lv_preload_dir_t lv_preload_get_anim_dir(lv_obj_t * preload); /*===================== * Other functions @@ -175,7 +175,7 @@ lv_preload_direction_t lv_preload_get_animation_direction(lv_obj_t * preload); * @param type which style should be get * @return style pointer to the style * */ -void lv_preload_spinner_animation(void * ptr, int32_t val); +void lv_preload_spinner_anim(void * ptr, int32_t val); /********************** * MACROS