diff --git a/Kconfig b/Kconfig index 5ceb017c69..6eb4c23025 100644 --- a/Kconfig +++ b/Kconfig @@ -1026,8 +1026,8 @@ menu "LVGL configuration" config LV_USE_BMP bool "BMP decoder library" - config LV_USE_SJPG - bool "JPG + split JPG decoder library" + config LV_USE_JPG + bool "JPG decoder library" config LV_USE_GIF bool "GIF decoder library" diff --git a/demos/benchmark/lv_demo_benchmark.c b/demos/benchmark/lv_demo_benchmark.c index 3a0766f1b6..6d6987497d 100644 --- a/demos/benchmark/lv_demo_benchmark.c +++ b/demos/benchmark/lv_demo_benchmark.c @@ -9,7 +9,7 @@ #include "lv_demo_benchmark.h" #if LV_USE_DEMO_BENCHMARK -#include "../../src/disp/lv_disp_private.h" +#include "../../src/display/lv_display_private.h" /********************* * DEFINES @@ -74,7 +74,7 @@ static lv_style_t style_common; static bool scene_with_opa = true; static uint32_t last_flush_cb_call; static uint32_t render_start_time; -static void (*flush_cb_ori)(lv_disp_t *, const lv_area_t *, uint8_t *); +static void (*flush_cb_ori)(lv_display_t *, const lv_area_t *, uint8_t *); static uint32_t disp_ori_timer_period; static uint32_t anim_ori_timer_period; @@ -100,10 +100,10 @@ static void benchmark_event_remove(void); static void show_scene_report(void); static void calc_scene_statistics(void); -static lv_res_t load_next_scene(void); +static lv_result_t load_next_scene(void); static void next_scene_timer_cb(lv_timer_t * timer); static void single_scene_finsih_timer_cb(lv_timer_t * timer); -static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * pxmap); +static void dummy_flush_cb(lv_display_t * drv, const lv_area_t * area, uint8_t * pxmap); static void generate_report(void); static void rect_create(lv_style_t * style); @@ -666,7 +666,7 @@ void lv_demo_benchmark(lv_demo_benchmark_mode_t _mode) benchmark_init(); if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { - while(load_next_scene() == LV_RES_OK) { + while(load_next_scene() == LV_RESULT_OK) { uint32_t i; for(i = 0; i < RENDER_REPEAT_CNT; i++) { /*Wait a little to be sure something happens with the animations*/ @@ -733,9 +733,9 @@ void lv_demo_benchmark_run_scene(lv_demo_benchmark_mode_t _mode, uint16_t scene_ static void benchmark_init(void) { - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); - lv_disp_add_event(disp, benchmark_event_cb, LV_EVENT_ALL, NULL); + lv_display_add_event(disp, benchmark_event_cb, LV_EVENT_ALL, NULL); flush_cb_ori = disp->flush_cb; disp->flush_cb = dummy_flush_cb; @@ -785,12 +785,12 @@ static void benchmark_event_cb(lv_event_t * e) static void benchmark_event_remove(void) { - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); uint32_t i; - for(i = 0; i < lv_disp_get_event_count(disp); i++) { - lv_event_dsc_t * dsc = lv_disp_get_event_dsc(disp, i); + for(i = 0; i < lv_display_get_event_count(disp); i++) { + lv_event_dsc_t * dsc = lv_display_get_event_dsc(disp, i); if(lv_event_dsc_get_cb(dsc) == benchmark_event_cb) { - lv_disp_remove_event(disp, i); + lv_display_remove_event(disp, i); return; } } @@ -827,9 +827,9 @@ static void calc_scene_statistics(void) } } -static lv_res_t load_next_scene(void) +static lv_result_t load_next_scene(void) { - if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RES_INV; + if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RESULT_INVALID; lv_obj_clean(scene_bg); @@ -841,14 +841,14 @@ static lv_res_t load_next_scene(void) scene_with_opa = true; } - if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RES_INV; + if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RESULT_INVALID; last_flush_cb_call = 0; rnd_reset(); scenes[scene_act].create_cb(); lv_label_set_text_fmt(title, "%s%s", scenes[scene_act].name, scene_with_opa ? " + opa" : ""); - return LV_RES_OK; + return LV_RESULT_OK; } static void next_scene_timer_cb(lv_timer_t * timer) @@ -857,9 +857,9 @@ static void next_scene_timer_cb(lv_timer_t * timer) calc_scene_statistics(); show_scene_report(); - lv_res_t res = load_next_scene(); + lv_result_t res = load_next_scene(); - if(res == LV_RES_INV) { + if(res == LV_RESULT_INVALID) { lv_timer_del(timer); generate_report(); } @@ -870,7 +870,7 @@ static void single_scene_finsih_timer_cb(lv_timer_t * timer) LV_UNUSED(timer); calc_scene_statistics(); - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); disp->flush_cb = flush_cb_ori; if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { @@ -886,13 +886,13 @@ static void single_scene_finsih_timer_cb(lv_timer_t * timer) lv_obj_invalidate(lv_scr_act()); } -static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * pxmap) +static void dummy_flush_cb(lv_display_t * drv, const lv_area_t * area, uint8_t * pxmap) { LV_UNUSED(area); if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_AND_DRIVER) { /*Measure the time since render start after flushing*/ - bool last = lv_disp_flush_is_last(drv); + bool last = lv_display_flush_is_last(drv); flush_cb_ori(drv, area, pxmap); if(last) { @@ -908,7 +908,7 @@ static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * px } } else if(mode == LV_DEMO_BENCHMARK_MODE_REAL) { - bool last = lv_disp_flush_is_last(drv); + bool last = lv_display_flush_is_last(drv); flush_cb_ori(drv, area, pxmap); /*Measure the time since the previous last flush (full render)*/ @@ -929,10 +929,10 @@ static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * px } } else if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { - bool last = lv_disp_flush_is_last(drv); + bool last = lv_display_flush_is_last(drv); /*Just bypass the driver and measure the pure rendering time*/ - lv_disp_flush_ready(drv); + lv_display_flush_ready(drv); if(last) { uint32_t t = lv_tick_elaps(render_start_time); @@ -950,7 +950,7 @@ static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * px static void generate_report(void) { - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); disp->flush_cb = flush_cb_ori; if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { @@ -1114,7 +1114,7 @@ static void img_create(lv_style_t * style, const void * src, bool rotate, bool z lv_image_set_src(obj, src); lv_obj_set_style_image_recolor(obj, lv_color_hex(rnd_next(0, 0xFFFFF0)), 0); - if(rotate) lv_image_set_angle(obj, rnd_next(0, 3599)); + if(rotate) lv_image_set_rotation(obj, rnd_next(0, 3599)); if(zoom) lv_image_set_zoom(obj, rnd_next(IMG_ZOOM_MIN, IMG_ZOOM_MAX)); lv_image_set_antialias(obj, aa); diff --git a/demos/multilang/lv_demo_multilang.c b/demos/multilang/lv_demo_multilang.c index ebc444be6f..4271df69ec 100644 --- a/demos/multilang/lv_demo_multilang.c +++ b/demos/multilang/lv_demo_multilang.c @@ -249,8 +249,8 @@ static void inactive_timer_cb(lv_timer_t * t) return; } - if(lv_disp_get_inactive_time(NULL) > 8000) { - lv_disp_trig_activity(NULL); + if(lv_display_get_inactive_time(NULL) > 8000) { + lv_display_trig_activity(NULL); lv_obj_scroll_by(cont, 100, 0, LV_ANIM_ON); lv_obj_add_flag(lv_layer_top(), LV_OBJ_FLAG_CLICKABLE); scrolled = true; diff --git a/demos/music/lv_demo_music_main.c b/demos/music/lv_demo_music_main.c index 42a7449c1b..b52c78188b 100644 --- a/demos/music/lv_demo_music_main.c +++ b/demos/music/lv_demo_music_main.c @@ -281,7 +281,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_anim_set_var(&a, album_image_obj); lv_anim_set_time(&a, 1000); lv_anim_set_delay(&a, INTRO_TIME + 1000); - lv_anim_set_values(&a, 1, LV_ZOOM_NONE); + lv_anim_set_values(&a, 1, LV_SCALE_NONE); lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); lv_anim_set_ready_cb(&a, NULL); lv_anim_start(&a); @@ -305,7 +305,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_anim_set_var(&a, logo); lv_anim_set_time(&a, 400); lv_anim_set_delay(&a, INTRO_TIME + 800); - lv_anim_set_values(&a, LV_ZOOM_NONE, 10); + lv_anim_set_values(&a, LV_SCALE_NONE, 10); lv_anim_set_ready_cb(&a, lv_obj_del_anim_ready_cb); lv_anim_start(&a); @@ -373,7 +373,7 @@ void _lv_demo_music_pause(void) spectrum_i = 0; lv_anim_del(spectrum_obj, spectrum_anim_cb); lv_obj_invalidate(spectrum_obj); - lv_image_set_zoom(album_image_obj, LV_ZOOM_NONE); + lv_image_set_zoom(album_image_obj, LV_SCALE_NONE); if(sec_counter_timer) lv_timer_pause(sec_counter_timer); lv_obj_clear_state(play_obj, LV_STATE_CHECKED); } @@ -720,7 +720,7 @@ static void track_load(uint32_t id) lv_anim_set_path_cb(&a, lv_anim_path_linear); lv_anim_set_var(&a, album_image_obj); lv_anim_set_time(&a, 500); - lv_anim_set_values(&a, LV_ZOOM_NONE, LV_ZOOM_NONE / 2); + 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_ready_cb(&a, NULL); lv_anim_start(&a); @@ -731,7 +731,7 @@ static void track_load(uint32_t id) lv_anim_set_var(&a, album_image_obj); lv_anim_set_time(&a, 500); lv_anim_set_delay(&a, 100); - lv_anim_set_values(&a, LV_ZOOM_NONE / 4, LV_ZOOM_NONE); + 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_ready_cb(&a, NULL); lv_anim_start(&a); @@ -924,7 +924,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_ZOOM_NONE + spectrum[spectrum_i][0]); + lv_image_set_zoom(album_image_obj, LV_SCALE_NONE + spectrum[spectrum_i][0]); } static void start_anim_cb(void * a, int32_t v) diff --git a/demos/stress/lv_demo_stress.c b/demos/stress/lv_demo_stress.c index ab2e176210..8a73e393ca 100644 --- a/demos/stress/lv_demo_stress.c +++ b/demos/stress/lv_demo_stress.c @@ -62,8 +62,8 @@ static void obj_test_task_cb(lv_timer_t * tmr) switch(state) { case -1: { - lv_res_t res = lv_mem_test(); - if(res != LV_RES_OK) { + lv_result_t res = lv_mem_test(); + if(res != LV_RESULT_OK) { LV_LOG_ERROR("Memory integrity error"); } diff --git a/demos/transform/lv_demo_transform.c b/demos/transform/lv_demo_transform.c index 11f787bdab..9ea6baa7b4 100644 --- a/demos/transform/lv_demo_transform.c +++ b/demos/transform/lv_demo_transform.c @@ -87,7 +87,7 @@ void lv_demo_transform(void) card_to_transform = card_create(); lv_obj_center(card_to_transform); - lv_coord_t disp_w = lv_disp_get_hor_res(NULL); + lv_coord_t disp_w = lv_display_get_horizontal_resolution(NULL); lv_obj_t * arc = lv_arc_create(lv_scr_act()); lv_obj_set_size(arc, disp_w - 20, disp_w - 20); lv_arc_set_range(arc, 0, 270); @@ -148,14 +148,14 @@ static void arc_event_cb(lv_event_t * e) lv_obj_t * arc = lv_event_get_target(e); int32_t v = lv_arc_get_angle_end(arc); - lv_obj_set_style_transform_angle(card_to_transform, v * 10, 0); + lv_obj_set_style_transform_rotation(card_to_transform, v * 10, 0); } static void slider_event_cb(lv_event_t * e) { lv_obj_t * slider = lv_event_get_target(e); int32_t v = lv_slider_get_value(slider); - lv_obj_set_style_transform_zoom(card_to_transform, v, 0); + lv_obj_set_style_transform_scale(card_to_transform, v, 0); } #endif diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c index b759a2ddc4..7e53d54eb8 100644 --- a/demos/widgets/lv_demo_widgets.c +++ b/demos/widgets/lv_demo_widgets.c @@ -1284,7 +1284,7 @@ static void slider_event_cb(lv_event_t * e) lv_snprintf(buf, sizeof(buf), "%"LV_PRId32, lv_slider_get_value(obj)); lv_point_t text_size; - lv_txt_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); + lv_text_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); lv_area_t txt_area; txt_area.x1 = draw_task->area.x1 + lv_area_get_width(&draw_task->area) / 2 - text_size.x / 2; @@ -1437,7 +1437,7 @@ static void chart_event_cb(lv_event_t * e) lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, ser->y_points[base_dsc->id2]); lv_point_t text_size; - lv_txt_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); + lv_text_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); lv_area_t txt_area; if(lv_chart_get_type(obj) == LV_CHART_TYPE_BAR) { diff --git a/docs/overview/style-props.md b/docs/overview/style-props.md index 3e9a383563..d1a674bbc8 100644 --- a/docs/overview/style-props.md +++ b/docs/overview/style-props.md @@ -120,8 +120,8 @@ Move the object with this value in Y direction. Applied after layouts, aligns an
  • Ext. draw No
    • -### transform_zoom -Zoom an objects. The value 256 (or `LV_ZOOM_NONE`) means normal size, 128 half size, 512 double size, and so on +### transform_scale +Zoom an objects. The value 256 (or `LV_SCALE_NONE`) means normal size, 128 half size, 512 double size, and so on -### transform_angle +### transform_rotation Rotate an objects. The value is interpreted in 0.1 degree units. E.g. 450 means 45 deg.