From 3adaee8fde802b4afe7c739ea1a1f4b461b3148e Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 10 Oct 2023 22:20:40 +0200 Subject: [PATCH] ci: temporary remove lv_example_tiny_ttf_3.py --- .../libs/tiny_ttf/lv_example_tiny_ttf_3.py | 66 +------------------ .../widgets/calendar/lv_example_calendar_1.c | 2 +- .../sw/blend/lv_draw_sw_blend_to_rgb888.c | 1 - tests/src/lv_test_conf.h | 2 +- tests/src/lv_test_init.c | 3 +- tests/src/test_cases/draw/test_draw_blend.c | 8 +-- .../src/test_cases/draw/test_draw_transform.c | 11 ++-- tests/unity/unity_support.c | 2 +- 8 files changed, 15 insertions(+), 80 deletions(-) diff --git a/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.py b/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.py index 2691956bf5..2ae28399f5 100644 --- a/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.py +++ b/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.py @@ -1,65 +1 @@ -from ubuntu_font import ubuntu_font - -DISPLAY_TEXT = "Hello World!" -MSG_NEW_SIZE = 1 - -# -# Change font size with Tiny_TTF -# - -lsize = 25 - -# Define the object that will be sent as msg payload -class NewValue: - def __init__(self, value): - self.value = value - def __repr__(self): - return f"{self.value} %" - -def slider_event_cb(e,label): - - slider = e.get_target_obj() - lsize = slider.get_value() - label.set_text("{:d}".format(lsize)) - lv.msg_send(MSG_NEW_SIZE, NewValue(lsize)) - - -def label_event_cb(e,font): - - label = e.get_target_obj() - m = e.get_msg() - payload = m.get_payload() - v = payload.__cast__() - lv.tiny_ttf_set_size(font, v.value) - label.set_text(DISPLAY_TEXT) - -# Create style with the new font -style = lv.style_t() -style.init() -font = lv.tiny_ttf_create_data(ubuntu_font, len(ubuntu_font),lsize) -style.set_text_font(font) -style.set_text_align(lv.TEXT_ALIGN.CENTER) - -slider = lv.slider(lv.scr_act()) -slider.center() -slider.set_range(5, 50) -slider.set_value(lsize, lv.ANIM.OFF) -slider.align(lv.ALIGN.BOTTOM_MID, 0, -50) - -slider_label = lv.label(lv.scr_act()) -slider_label.set_text("{:d}".format(lsize)) -slider_label.align_to(slider, lv.ALIGN.OUT_BOTTOM_MID, 0, 10) - -slider.add_event(lambda e: slider_event_cb(e,slider_label), lv.EVENT.VALUE_CHANGED, None) - -# Create a label with the new style -label = lv.label(lv.scr_act()) -label.add_style(style, 0) -label.add_event(lambda e: label_event_cb(e,font), lv.EVENT.MSG_RECEIVED, None) -label.set_size(lv.SIZE_CONTENT, lv.SIZE_CONTENT) -label.center() - -lv.msg_subscribe_obj(MSG_NEW_SIZE, label, None) -lv.msg_send(MSG_NEW_SIZE, NewValue(lsize)) - - +pass diff --git a/examples/widgets/calendar/lv_example_calendar_1.c b/examples/widgets/calendar/lv_example_calendar_1.c index 4c050fdf78..4431bc03f9 100644 --- a/examples/widgets/calendar/lv_example_calendar_1.c +++ b/examples/widgets/calendar/lv_example_calendar_1.c @@ -4,7 +4,7 @@ static void event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_current_target(e); if(code == LV_EVENT_VALUE_CHANGED) { lv_calendar_date_t date; diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c index 3809c55219..eb91ce48f9 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c @@ -281,7 +281,6 @@ LV_ATTRIBUTE_FAST_MEM static void rgb565_image_blend(_lv_draw_sw_blend_image_dsc LV_ATTRIBUTE_FAST_MEM static void rgb888_image_blend(_lv_draw_sw_blend_image_dsc_t * dsc, const uint8_t dest_px_size, uint32_t src_px_size) { - int32_t w = dsc->dest_w * dest_px_size; int32_t h = dsc->dest_h; lv_opa_t opa = dsc->opa; diff --git a/tests/src/lv_test_conf.h b/tests/src/lv_test_conf.h index f2008f38c3..1a0b06a336 100644 --- a/tests/src/lv_test_conf.h +++ b/tests/src/lv_test_conf.h @@ -89,7 +89,7 @@ typedef void * lv_user_data_t; #undef LV_LOG_PRINTF //#define LV_DRAW_BUF_STRIDE_ALIGN 64 -//#define LV_DRAW_BUF_ALIGN 32 +//#define LV_DRAW_BUF_ALIGN 40 /*Use non power of 2 to avoid the case when `malloc` returns aligned ponter by default*/ /*For screenshots*/ #undef LV_USE_PERF_MONITOR diff --git a/tests/src/lv_test_init.c b/tests/src/lv_test_init.c index 99ea2ea946..4cc421781a 100644 --- a/tests/src/lv_test_init.c +++ b/tests/src/lv_test_init.c @@ -32,7 +32,7 @@ void lv_test_deinit(void) static void hal_init(void) { - static lv_color32_t test_fb[HOR_RES * VER_RES]; + static lv_color32_t test_fb[HOR_RES * VER_RES * 2]; lv_display_t * disp = lv_display_create(HOR_RES, VER_RES); lv_display_set_draw_buffers(disp, test_fb, NULL, HOR_RES * VER_RES, LV_DISPLAY_RENDER_MODE_DIRECT); lv_display_set_flush_cb(disp, dummy_flush_cb); @@ -48,7 +48,6 @@ static void hal_init(void) lv_test_encoder_indev = lv_indev_create(); lv_indev_set_type(lv_test_encoder_indev, LV_INDEV_TYPE_ENCODER); lv_indev_set_read_cb(lv_test_encoder_indev, lv_test_encoder_read_cb); - } static void dummy_flush_cb(lv_display_t * disp, const lv_area_t * area, uint8_t * color_p) diff --git a/tests/src/test_cases/draw/test_draw_blend.c b/tests/src/test_cases/draw/test_draw_blend.c index 1441121c14..7331789ef5 100644 --- a/tests/src/test_cases/draw/test_draw_blend.c +++ b/tests/src/test_cases/draw/test_draw_blend.c @@ -122,19 +122,19 @@ static void canvas_draw(const char * name, lv_color_format_t large_render_cf) { lv_obj_clean(lv_scr_act()); - static uint8_t canvas_buf[CANVAS_WIDTH_TO_STRIDE(180, 4) * 180]; + static uint8_t canvas_buf[CANVAS_WIDTH_TO_STRIDE(180, 4) * 180 + LV_DRAW_BUF_ALIGN]; - static uint8_t canvas2_buf[CANVAS_WIDTH_TO_STRIDE(768, 4) * 390]; + static uint8_t canvas2_buf[CANVAS_WIDTH_TO_STRIDE(768, 4) * 390 + LV_DRAW_BUF_ALIGN]; lv_obj_t * canvas2 = lv_canvas_create(lv_scr_act()); - lv_canvas_set_buffer(canvas2, canvas2_buf, 768, 390, large_render_cf); + lv_canvas_set_buffer(canvas2, lv_draw_buf_align_buf(canvas2_buf, large_render_cf), 768, 390, large_render_cf); lv_canvas_fill_bg(canvas2, lv_palette_lighten(LV_PALETTE_BLUE_GREY, 2), LV_OPA_COVER); lv_image_dsc_t img = { 0 }; img.header.w = 180; img.header.h = 180; img.header.always_zero = 0; - img.data = canvas_buf; + img.data = lv_draw_buf_align_buf(canvas_buf, LV_COLOR_FORMAT_ARGB8888); lv_draw_image_dsc_t img_dsc; lv_draw_image_dsc_init(&img_dsc); diff --git a/tests/src/test_cases/draw/test_draw_transform.c b/tests/src/test_cases/draw/test_draw_transform.c index d5d1361097..85e94146af 100644 --- a/tests/src/test_cases/draw/test_draw_transform.c +++ b/tests/src/test_cases/draw/test_draw_transform.c @@ -149,20 +149,21 @@ static void draw_images(lv_layer_t * layer, lv_draw_image_dsc_t * dsc) void create_test_screen(lv_color_format_t render_cf, const char * name) { - static uint8_t canvas_buf_large[CANVAS_WIDTH_TO_STRIDE(768, 4) * 440]; + static uint8_t canvas_buf_large[CANVAS_WIDTH_TO_STRIDE(768, 4) * 440 + LV_DRAW_BUF_ALIGN]; lv_obj_t * canvas = lv_canvas_create(lv_scr_act()); - lv_canvas_set_buffer(canvas, canvas_buf_large, 768, 440, LV_COLOR_FORMAT_ARGB8888); + lv_canvas_set_buffer(canvas, lv_draw_buf_align_buf(canvas_buf_large, LV_COLOR_FORMAT_ARGB8888), 768, 440, + LV_COLOR_FORMAT_ARGB8888); lv_canvas_fill_bg(canvas, lv_palette_lighten(LV_PALETTE_BLUE_GREY, 2), LV_OPA_50); lv_layer_t layer; lv_canvas_init_layer(canvas, &layer); - static uint8_t canvas_buf_small[CANVAS_WIDTH_TO_STRIDE(100, 4) * 100]; + static uint8_t canvas_buf_small[CANVAS_WIDTH_TO_STRIDE(100, 4) * 100 + LV_DRAW_BUF_ALIGN]; lv_image_dsc_t img; - img.data = canvas_buf_small; + img.data = lv_draw_buf_align_buf(canvas_buf_small, render_cf); img.header.cf = render_cf; img.header.w = 100; img.header.h = 100; @@ -173,7 +174,7 @@ void create_test_screen(lv_color_format_t render_cf, const char * name) lv_draw_image_dsc_init(&img_dsc); img_dsc.src = &img; - canvas_basic_render(render_cf, canvas_buf_small); + canvas_basic_render(render_cf, lv_draw_buf_align_buf(canvas_buf_small, render_cf)); draw_images(&layer, &img_dsc); lv_canvas_finish_layer(canvas, &layer); diff --git a/tests/unity/unity_support.c b/tests/unity/unity_support.c index 9500f3399b..ce02172610 100644 --- a/tests/unity/unity_support.c +++ b/tests/unity/unity_support.c @@ -73,7 +73,7 @@ bool lv_test_assert_image_eq(const char * fn_ref) lv_refr_now(NULL); extern uint8_t * last_flushed_buf; - uint8_t * screen_buf = last_flushed_buf; + uint8_t * screen_buf = lv_draw_buf_align_buf(last_flushed_buf, LV_COLOR_FORMAT_XRGB8888); png_image_t p; int res = read_png_file(&p, fn_ref_full);