From d939316e266702c5c35881998a261772e694eb3d Mon Sep 17 00:00:00 2001 From: lhdjply Date: Thu, 18 Jan 2024 20:30:39 +0800 Subject: [PATCH] chore(api_map): remove unused api and repalce error name api (#5367) Signed-off-by: lhdjply Co-authored-by: Gabor Kiss-Vamosi --- demos/music/lv_demo_music_main.c | 15 +++--- .../others/snapshot/lv_example_snapshot_1.c | 2 +- examples/widgets/image/lv_example_image_3.c | 6 +-- src/lv_api_map.h | 49 +++---------------- .../src/test_cases/draw/test_image_formats.c | 2 +- 5 files changed, 21 insertions(+), 53 deletions(-) diff --git a/demos/music/lv_demo_music_main.c b/demos/music/lv_demo_music_main.c index 40fafbe7c..354c067ab 100644 --- a/demos/music/lv_demo_music_main.c +++ b/demos/music/lv_demo_music_main.c @@ -109,9 +109,9 @@ static const uint16_t rnd_array[30] = {994, 285, 553, 11, 792, 707, 966, 641, 85 * Callback adapter function to convert parameter types to avoid compile-time * warning. */ -static void _image_set_zoom_anim_cb(void * obj, int32_t zoom) +static void _image_set_scale_anim_cb(void * obj, int32_t scale) { - lv_image_set_zoom((lv_obj_t *)obj, (uint16_t)zoom); + lv_image_set_scale((lv_obj_t *)obj, (uint16_t)scale); } /* @@ -281,7 +281,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_anim_set_duration(&a, 1000); lv_anim_set_delay(&a, INTRO_TIME + 1000); lv_anim_set_values(&a, 1, LV_SCALE_NONE); - lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); + lv_anim_set_exec_cb(&a, _image_set_scale_anim_cb); lv_anim_set_completed_cb(&a, NULL); lv_anim_start(&a); @@ -372,7 +372,7 @@ void _lv_demo_music_pause(void) spectrum_i = 0; lv_anim_delete(spectrum_obj, spectrum_anim_cb); lv_obj_invalidate(spectrum_obj); - lv_image_set_zoom(album_image_obj, LV_SCALE_NONE); + lv_image_set_scale(album_image_obj, LV_SCALE_NONE); if(sec_counter_timer) lv_timer_pause(sec_counter_timer); lv_obj_remove_state(play_obj, LV_STATE_CHECKED); } @@ -720,7 +720,8 @@ static void track_load(uint32_t id) lv_anim_set_var(&a, album_image_obj); lv_anim_set_duration(&a, 500); lv_anim_set_values(&a, LV_SCALE_NONE, LV_SCALE_NONE / 2); - lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); + + lv_anim_set_exec_cb(&a, _image_set_scale_anim_cb); lv_anim_set_completed_cb(&a, NULL); lv_anim_start(&a); @@ -731,7 +732,7 @@ static void track_load(uint32_t id) lv_anim_set_duration(&a, 500); lv_anim_set_delay(&a, 100); lv_anim_set_values(&a, LV_SCALE_NONE / 4, LV_SCALE_NONE); - lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); + lv_anim_set_exec_cb(&a, _image_set_scale_anim_cb); lv_anim_set_completed_cb(&a, NULL); lv_anim_start(&a); @@ -921,7 +922,7 @@ static void spectrum_anim_cb(void * a, int32_t v) } if(spectrum[spectrum_i][0] < 4) bar_rot += dir; - lv_image_set_zoom(album_image_obj, LV_SCALE_NONE + spectrum[spectrum_i][0]); + lv_image_set_scale(album_image_obj, LV_SCALE_NONE + spectrum[spectrum_i][0]); } static void start_anim_cb(void * a, int32_t v) diff --git a/examples/others/snapshot/lv_example_snapshot_1.c b/examples/others/snapshot/lv_example_snapshot_1.c index 89e3ab4d1..3eb124011 100644 --- a/examples/others/snapshot/lv_example_snapshot_1.c +++ b/examples/others/snapshot/lv_example_snapshot_1.c @@ -30,7 +30,7 @@ void lv_example_snapshot_1(void) lv_obj_t * snapshot_obj = lv_image_create(root); lv_obj_set_style_bg_color(snapshot_obj, lv_palette_main(LV_PALETTE_PURPLE), 0); lv_obj_set_style_bg_opa(snapshot_obj, LV_OPA_100, 0); - lv_image_set_zoom(snapshot_obj, 128); + lv_image_set_scale(snapshot_obj, 128); lv_image_set_rotation(snapshot_obj, 300); /*Create the container and its children*/ diff --git a/examples/widgets/image/lv_example_image_3.c b/examples/widgets/image/lv_example_image_3.c index b6822a71e..11467930f 100644 --- a/examples/widgets/image/lv_example_image_3.c +++ b/examples/widgets/image/lv_example_image_3.c @@ -6,9 +6,9 @@ static void set_angle(void * img, int32_t v) lv_image_set_rotation(img, v); } -static void set_zoom(void * img, int32_t v) +static void set_scale(void * img, int32_t v) { - lv_image_set_zoom(img, v); + lv_image_set_scale(img, v); } /** @@ -33,7 +33,7 @@ void lv_example_image_3(void) lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); lv_anim_start(&a); - lv_anim_set_exec_cb(&a, set_zoom); + lv_anim_set_exec_cb(&a, set_scale); lv_anim_set_values(&a, 128, 256); lv_anim_set_playback_duration(&a, 3000); lv_anim_start(&a); diff --git a/src/lv_api_map.h b/src/lv_api_map.h index be4ecc888..987d0a8dc 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -37,7 +37,6 @@ extern "C" { #define LV_BTNMATRIX_CTRL_CHECKED LV_BUTTONMATRIX_CTRL_CHECKED #define LV_BTNMATRIX_CTRL_CLICK_TRIG LV_BUTTONMATRIX_CTRL_CLICK_TRIG #define LV_BTNMATRIX_CTRL_POPOVER LV_BUTTONMATRIX_CTRL_POPOVER -#define LV_BTNMATRIX_CTRL_RECOLOR LV_BUTTONMATRIX_CTRL_RECOLOR #define LV_BTNMATRIX_CTRL_CUSTOM_1 LV_BUTTONMATRIX_CTRL_CUSTOM_1 #define LV_BTNMATRIX_CTRL_CUSTOM_2 LV_BUTTONMATRIX_CTRL_CUSTOM_2 @@ -106,16 +105,11 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_indev_set_disp lv_indev_set_display #define lv_indev_get_act lv_indev_active #define lv_scr_act lv_screen_active -#define lv_disp_create lv_display_create #define lv_disp_remove lv_display_delete #define lv_disp_set_default lv_display_set_default #define lv_disp_get_default lv_display_get_default #define lv_disp_get_next lv_display_get_next -#define lv_disp_set_res lv_display_set_resolution -#define lv_disp_set_physical_res lv_display_set_physical_res -#define lv_disp_set_offset lv_display_set_offset #define lv_disp_set_rotation lv_display_set_rotation -#define lv_disp_set_dpi lv_display_set_dpi #define lv_disp_get_hor_res lv_display_get_horizontal_resolution #define lv_disp_get_ver_res lv_display_get_vertical_resolution #define lv_disp_get_physical_hor_res lv_display_get_physical_horizontal_resolution @@ -124,24 +118,14 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_disp_get_offset_y lv_display_get_offset_y #define lv_disp_get_rotation lv_display_get_rotation #define lv_disp_get_dpi lv_display_get_dpi -#define lv_disp_set_flush_cb lv_display_set_flush_cb -#define lv_disp_set_color_format lv_display_set_color_format -#define lv_disp_get_color_format lv_display_get_color_format -#define lv_disp_set_antialiasing lv_display_set_antialiasing #define lv_disp_get_antialiasing lv_display_get_antialiasing #define lv_disp_flush_ready lv_display_flush_ready #define lv_disp_flush_is_last lv_display_flush_is_last -#define lv_disp_is_double_buffered lv_display_is_double_buffered #define lv_disp_get_scr_act lv_display_get_screen_active #define lv_disp_get_scr_prev lv_display_get_screen_prev #define lv_disp_load_scr lv_screen_load #define lv_disp_get_layer_top lv_display_get_layer_top #define lv_disp_get_layer_sys lv_display_get_layer_sys -#define lv_disp_get_layer_bottom lv_display_get_layer_bottom -#define lv_disp_add_event lv_display_add_event -#define lv_disp_get_event_count lv_display_get_event_count -#define lv_disp_get_event_dsc lv_display_get_event_dsc -#define lv_disp_remove_event lv_display_delete_event #define lv_disp_send_event lv_display_send_event #define lv_disp_set_theme lv_display_set_theme #define lv_disp_get_theme lv_display_get_theme @@ -149,13 +133,8 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_disp_trig_activity lv_display_trigger_activity #define lv_disp_enable_invalidation lv_display_enable_invalidation #define lv_disp_is_invalidation_enabled lv_display_is_invalidation_enabled -#define lv_disp_set_user_data lv_display_set_user_data -#define lv_disp_set_driver_data lv_display_set_driver_data -#define lv_disp_get_user_data lv_display_get_user_data -#define lv_disp_get_driver_data lv_display_get_driver_data #define _lv_disp_refr_timer _lv_display_refr_timer #define _lv_disp_get_refr_timer lv_display_get_refr_timer -#define lv_disp_render_mode_t lv_display_render_mode_t #define lv_timer_del lv_timer_delete @@ -172,19 +151,17 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_img_set_src lv_image_set_src #define lv_img_set_offset_x lv_image_set_offset_x #define lv_img_set_offset_y lv_image_set_offset_y -#define lv_img_set_angle lv_image_set_angle +#define lv_img_set_angle lv_image_set_rotation #define lv_img_set_pivot lv_image_set_pivot -#define lv_img_set_zoom lv_image_set_zoom +#define lv_img_set_zoom lv_image_set_scale #define lv_img_set_antialias lv_image_set_antialias -#define lv_img_set_size_mode lv_image_set_size_mode #define lv_img_get_src lv_image_get_src #define lv_img_get_offset_x lv_image_get_offset_x #define lv_img_get_offset_y lv_image_get_offset_y -#define lv_img_get_angle lv_image_get_angle +#define lv_img_get_angle lv_image_get_rotation #define lv_img_get_pivot lv_image_get_pivot -#define lv_img_get_zoom lv_image_get_zoom +#define lv_img_get_zoom lv_image_get_scale #define lv_img_get_antialias lv_image_get_antialias -#define lv_img_get_size_mode lv_image_get_size_mode #define lv_list_set_btn_text lv_list_set_button_text #define lv_list_get_btn_text lv_list_get_button_text @@ -208,20 +185,13 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_btnmatrix_has_button_ctrl lv_buttonmatrix_has_button_ctrl #define lv_btnmatrix_get_one_checked lv_buttonmatrix_get_one_checked -#define lv_tabview_get_tab_btns lv_tabview_get_tab_buttons -#define lv_tabview_get_act lv_tabview_get_active +#define lv_tabview_get_tab_btns lv_tabview_get_tab_bar +#define lv_tabview_get_tab_act lv_tabview_get_tab_active #define lv_tabview_set_act lv_tabview_set_active #define lv_tileview_get_tile_act lv_tileview_get_tile_active -#define lv_obj_set_tile_id lv_obj_set_tile_by_index -#define lv_obj_set_tile lv_obj_set_tile - -#define lv_msgbox_get_btns lv_msgbox_get_buttons - -#define lv_image_set_angle lv_image_set_rotation -#define lv_image_get_angle lv_image_get_rotation -#define lv_image_set_zoom lv_image_set_scale -#define lv_image_get_zoom lv_image_get_scale +#define lv_obj_set_tile_id lv_tileview_set_tile_by_index +#define lv_obj_set_tile lv_tileview_set_tile #define lv_roller_set_visible_row_cnt lv_roller_set_visible_row_count #define lv_roller_get_option_cnt lv_roller_get_option_count @@ -241,11 +211,9 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define LV_STYLE_ANIM_TIME LV_STYLE_ANIM_DURATION #define LV_STYLE_IMG_OPA LV_STYLE_IMAGE_OPA #define LV_STYLE_IMG_RECOLOR LV_STYLE_IMAGE_RECOLOR -#define LV_STYLE_IMG_RECOLOR_FILTERED LV_STYLE_IMAGE_RECOLOR_FILTERED #define LV_STYLE_IMG_RECOLOR_OPA LV_STYLE_IMAGE_RECOLOR_OPA #define LV_STYLE_SHADOW_OFS_X LV_STYLE_SHADOW_OFFSET_X #define LV_STYLE_SHADOW_OFS_Y LV_STYLE_SHADOW_OFFSET_Y -#define LV_STYLE_TRANSFORM_ZOOM LV_STYLE_TRANSFORM_SCALE #define LV_STYLE_TRANSFORM_ANGLE LV_STYLE_TRANSFORM_ROTATION #define lv_obj_get_style_anim_time lv_obj_get_style_anim_duration @@ -255,7 +223,6 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_obj_get_style_img_recolor_opa lv_obj_get_style_image_recolor_opa #define lv_obj_get_style_shadow_ofs_x lv_obj_get_style_shadow_offset_x #define lv_obj_get_style_shadow_ofs_y lv_obj_get_style_shadow_offset_y -#define lv_obj_get_style_transform_zoom lv_obj_get_style_transform_scale #define lv_obj_get_style_transform_angle lv_obj_get_style_transform_rotation #define lv_obj_set_style_anim_time lv_obj_set_style_anim_duration diff --git a/tests/src/test_cases/draw/test_image_formats.c b/tests/src/test_cases/draw/test_image_formats.c index db3ffed54..d4971a533 100644 --- a/tests/src/test_cases/draw/test_image_formats.c +++ b/tests/src/test_cases/draw/test_image_formats.c @@ -246,7 +246,7 @@ static void img_create(const char * name, const void * img_src, bool rotate, boo lv_image_set_src(img, img_src); lv_obj_set_style_image_recolor(img, lv_palette_main(LV_PALETTE_RED), 0); /*For A8*/ if(recolor) lv_obj_set_style_image_recolor_opa(img, LV_OPA_70, 0); - if(rotate) lv_image_set_angle(img, 450); + if(rotate) lv_image_set_rotation(img, 450); lv_obj_t * label = lv_label_create(cont); lv_label_set_text(label, name);