Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 22:30:49 +08:00
Code Issues Actions 59 Packages Projects Releases Wiki Activity

arch(driver): new driver architecture with new color format support

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-02-20 20:50:58 +01:00
parent df789ed3c7
commit 124f9b0f9f
425 changed files with 25232 additions and 24168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/CMakeLists.txt
+11 -6
View File
@@ -18,6 +18,7 @@ include(CTest)
set(LVGL_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LVGL_TEST_OPTIONS_MINIMAL_MONOCHROME
-DLV_TEST_OPTION=1
)
@@ -30,29 +31,33 @@ set(LVGL_TEST_OPTIONS_16BIT
-DLV_TEST_OPTION=3
)
set(LVGL_TEST_OPTIONS_FULL_32BIT
set(LVGL_TEST_OPTIONS_FULL_24BIT
-DLV_TEST_OPTION=4
)
set(LVGL_TEST_OPTIONS_FULL_32BIT
-DLV_TEST_OPTION=5
)
set(LVGL_TEST_OPTIONS_TEST_SYSHEAP
-DLV_TEST_OPTION=4
-DLV_TEST_OPTION=5
-DLVGL_CI_USING_SYS_HEAP
-Wno-unused-but-set-variable # unused variables are common in the dual-heap arrangement
)
set(LVGL_TEST_OPTIONS_TEST_DEFHEAP
-DLV_TEST_OPTION=4
-DLV_TEST_OPTION=5
-DLVGL_CI_USING_DEF_HEAP
-fsanitize=address
--coverage
)
if (OPTIONS_MINIMAL_MONOCHROME)
set (BUILD_OPTIONS ${LVGL_TEST_OPTIONS_MINIMAL_MONOCHROME})
elseif (OPTIONS_NORMAL_8BIT)
if (OPTIONS_NORMAL_8BIT)
set (BUILD_OPTIONS ${LVGL_TEST_OPTIONS_NORMAL_8BIT})
elseif (OPTIONS_16BIT)
set (BUILD_OPTIONS ${LVGL_TEST_OPTIONS_16BIT})
elseif (OPTIONS_24BIT)
set (BUILD_OPTIONS ${LVGL_TEST_OPTIONS_24BIT})
elseif (OPTIONS_FULL_32BIT)
set (BUILD_OPTIONS ${LVGL_TEST_OPTIONS_FULL_32BIT})
elseif (OPTIONS_TEST_SYSHEAP)
tests/main.py
+1 -1
View File
@@ -12,9 +12,9 @@ lvgl_test_dir = os.path.dirname(os.path.realpath(__file__))
# Key values must match variable names in CMakeLists.txt.
build_only_options = {
'OPTIONS_MINIMAL_MONOCHROME': 'Minimal config monochrome',
'OPTIONS_NORMAL_8BIT': 'Normal config, 8 bit color depth',
'OPTIONS_16BIT': 'Minimal config, 16 bit color depth',
'OPTIONS_24BIT': 'Normal config, 24 bit color depth',
'OPTIONS_FULL_32BIT': 'Full config, 32 bit color depth',
}
tests/src/lv_test_conf.h
+6 -1
View File
@@ -73,10 +73,15 @@ typedef void * lv_user_data_t;
* TEST CONFIGS
***********************/
#if !(defined(LV_TEST_OPTION)) || LV_TEST_OPTION == 4
#define LV_USE_DEV_VERSION
#if !(defined(LV_TEST_OPTION)) || LV_TEST_OPTION == 5
#define LV_COLOR_DEPTH 32
#define LV_DPI_DEF 160
#include "lv_test_conf_full.h"
#elif LV_TEST_OPTION == 4
#define LV_COLOR_DEPTH 24
#define LV_DPI_DEF 120
#elif LV_TEST_OPTION == 3
#define LV_COLOR_DEPTH 16
#define LV_DPI_DEF 90
tests/src/lv_test_indev.c
+6 -10
View File
@@ -15,9 +15,9 @@ static bool mouse_pressed;
static bool key_pressed;
static bool enc_pressed;
void lv_test_mouse_read_cb(lv_indev_drv_t * drv, lv_indev_data_t * data)
void lv_test_mouse_read_cb(lv_indev_t * indev, lv_indev_data_t * data)
{
LV_UNUSED(drv);
LV_UNUSED(indev);
data->point.x = x_act;
data->point.y = y_act;
data->state = mouse_pressed ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
@@ -56,10 +56,9 @@ void lv_test_mouse_click_at(lv_coord_t x, lv_coord_t y)
lv_test_indev_wait(50);
}
void lv_test_keypad_read_cb(lv_indev_drv_t * drv, lv_indev_data_t * data)
void lv_test_keypad_read_cb(lv_indev_t * indev, lv_indev_data_t * data)
{
LV_UNUSED(drv);
LV_UNUSED(indev);
data->key = key_act;
data->state = key_pressed ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
}
@@ -86,9 +85,9 @@ void lv_test_key_hit(uint32_t k)
lv_test_indev_wait(50);
}
void lv_test_encoder_read_cb(lv_indev_drv_t * drv, lv_indev_data_t * data)
void lv_test_encoder_read_cb(lv_indev_t * indev, lv_indev_data_t * data)
{
LV_UNUSED(drv);
LV_UNUSED(indev);
data->enc_diff = diff_act;
data->state = enc_pressed ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
diff_act = 0;
@@ -105,7 +104,6 @@ void lv_test_encoder_turn(int32_t d)
lv_test_indev_wait(50);
}
void lv_test_encoder_press(void)
{
enc_pressed = true;
@@ -126,7 +124,6 @@ void lv_test_encoder_click(void)
lv_test_indev_wait(50);
}
void lv_test_indev_wait(uint32_t ms)
{
uint32_t t = lv_tick_get();
@@ -136,5 +133,4 @@ void lv_test_indev_wait(uint32_t ms)
}
}
#endif
tests/src/lv_test_indev.h
+3 -3
View File
@@ -9,7 +9,7 @@ extern "C" {
#include <stdio.h>
#include "../lvgl.h"
void lv_test_mouse_read_cb(lv_indev_drv_t * drv, lv_indev_data_t * data);
void lv_test_mouse_read_cb(lv_indev_t * indev, lv_indev_data_t * data);
void lv_test_mouse_move_to(lv_coord_t x, lv_coord_t y);
void lv_test_mouse_move_by(lv_coord_t x, lv_coord_t y);
@@ -17,14 +17,14 @@ void lv_test_mouse_press(void);
void lv_test_mouse_release(void);
void lv_test_mouse_click_at(lv_coord_t x, lv_coord_t y);
void lv_test_keypad_read_cb(lv_indev_drv_t * drv, lv_indev_data_t * data);
void lv_test_keypad_read_cb(lv_indev_t * indev, lv_indev_data_t * data);
void lv_test_key_press(uint32_t k);
void lv_test_key_release(void);
void lv_test_key_hit(uint32_t k);
/* encoder read callback */
void lv_test_encoder_read_cb(lv_indev_drv_t * drv, lv_indev_data_t * data) ;
void lv_test_encoder_read_cb(lv_indev_t * indev, lv_indev_data_t * data) ;
/* Simulate encoder rotation, use positive parameter to rotate to the right
* and negative to rotate to the left */
tests/src/lv_test_init.c
+15 -28
View File
@@ -12,7 +12,7 @@
#define VER_RES 480
static void hal_init(void);
static void dummy_flush_cb(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p);
static void dummy_flush_cb(lv_disp_t * disp, const lv_area_t * area, lv_color_t * color_p);
lv_indev_t * lv_test_mouse_indev;
lv_indev_t * lv_test_keypad_indev;
@@ -36,38 +36,25 @@ void lv_test_deinit(void)
static void hal_init(void)
{
static lv_disp_draw_buf_t draw_buf;
lv_disp_t * disp = lv_disp_create(HOR_RES, VER_RES);
lv_disp_set_draw_buffers(disp, disp_buf1, NULL, HOR_RES * VER_RES, LV_DISP_RENDER_MODE_FULL);
lv_disp_set_flush_cb(disp, dummy_flush_cb);
lv_disp_draw_buf_init(&draw_buf, disp_buf1, NULL, HOR_RES * VER_RES);
static lv_disp_drv_t disp_drv;
lv_disp_drv_init(&disp_drv);
disp_drv.draw_buf = &draw_buf;
disp_drv.flush_cb = dummy_flush_cb;
disp_drv.hor_res = HOR_RES;
disp_drv.ver_res = VER_RES;
lv_disp_drv_register(&disp_drv);
lv_test_mouse_indev = lv_indev_create();
lv_indev_set_type(lv_test_mouse_indev, LV_INDEV_TYPE_POINTER);
lv_indev_set_read_cb(lv_test_mouse_indev, lv_test_mouse_read_cb);
static lv_indev_drv_t indev_mouse_drv;
lv_indev_drv_init(&indev_mouse_drv);
indev_mouse_drv.type = LV_INDEV_TYPE_POINTER;
indev_mouse_drv.read_cb = lv_test_mouse_read_cb;
lv_test_mouse_indev = lv_indev_drv_register(&indev_mouse_drv);
lv_test_keypad_indev = lv_indev_create();
lv_indev_set_type(lv_test_keypad_indev, LV_INDEV_TYPE_KEYPAD);
lv_indev_set_read_cb(lv_test_keypad_indev, lv_test_keypad_read_cb);
static lv_indev_drv_t indev_keypad_drv;
lv_indev_drv_init(&indev_keypad_drv);
indev_keypad_drv.type = LV_INDEV_TYPE_KEYPAD;
indev_keypad_drv.read_cb = lv_test_keypad_read_cb;
lv_test_keypad_indev = lv_indev_drv_register(&indev_keypad_drv);
static lv_indev_drv_t indev_encoder_drv;
lv_indev_drv_init(&indev_encoder_drv);
indev_encoder_drv.type = LV_INDEV_TYPE_ENCODER;
indev_encoder_drv.read_cb = lv_test_encoder_read_cb;
lv_test_encoder_indev = lv_indev_drv_register(&indev_encoder_drv);
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_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p)
static void dummy_flush_cb(lv_disp_t * disp, const lv_area_t * area, lv_color_t * color_p)
{
LV_UNUSED(area);
LV_UNUSED(color_p);
@@ -79,7 +66,7 @@ static void dummy_flush_cb(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_
}
}
lv_disp_flush_ready(disp_drv);
lv_disp_flush_ready(disp);
}
uint32_t custom_tick_get(void)
tests/src/test_assets/test_animimg001.c
+2 -2
View File
@@ -536,8 +536,8 @@ const lv_img_dsc_t test_animimg001 = {
.header.always_zero = 0,
.header.w = 130,
.header.h = 170,
.data_size = 22100 * LV_IMG_PX_SIZE_ALPHA_BYTE,
.header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA,
.data_size = 22100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE,
.header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA,
.data = test_animimg001_map,
};
tests/src/test_assets/test_animimg002.c
+2 -2
View File
@@ -536,8 +536,8 @@ const lv_img_dsc_t test_animimg002 = {
.header.always_zero = 0,
.header.w = 130,
.header.h = 170,
.data_size = 22100 * LV_IMG_PX_SIZE_ALPHA_BYTE,
.header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA,
.data_size = 22100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE,
.header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA,
.data = test_animimg002_map,
};
tests/src/test_assets/test_animimg003.c
+2 -2
View File
@@ -536,8 +536,8 @@ const lv_img_dsc_t test_animimg003 = {
.header.always_zero = 0,
.header.w = 130,
.header.h = 170,
.data_size = 22100 * LV_IMG_PX_SIZE_ALPHA_BYTE,
.header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA,
.data_size = 22100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE,
.header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA,
.data = test_animimg003_map,
};
tests/src/test_assets/test_img_caret_down.c
+2 -2
View File
@@ -51,8 +51,8 @@ const lv_img_dsc_t test_img_caret_down = {
.header.always_zero = 0,
.header.w = 13,
.header.h = 8,
.data_size = 104 * LV_IMG_PX_SIZE_ALPHA_BYTE,
.header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA,
.data_size = 104 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE,
.header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA,
.data = test_img_caret_down_map,
};
tests/src/test_cases/test_arc.c
+1 -1
View File
@@ -134,7 +134,7 @@ void test_arc_click_area_with_adv_hittest(void)
lv_obj_set_size(arc, 100, 100);
lv_obj_set_style_arc_width(arc, 10, 0);
lv_obj_add_flag(arc, LV_OBJ_FLAG_ADV_HITTEST);
lv_obj_add_event_cb(arc, dummy_event_cb, LV_EVENT_PRESSED, NULL);
lv_obj_add_event(arc, dummy_event_cb, LV_EVENT_PRESSED, NULL);
lv_obj_set_ext_click_area(arc, 5);
/*No click detected at the middle*/
tests/src/test_cases/test_barcode.c
+6 -6
View File
@@ -25,16 +25,16 @@ void test_barcode_normal(void)
lv_obj_set_height(barcode, 50);
lv_obj_center(barcode);
lv_color_t dark_color = lv_color_black();
lv_color_t light_color = lv_color_white();
lv_color32_t dark_color = lv_color_to32(lv_color_black());
lv_color32_t light_color = lv_color_to32(lv_color_white());
uint16_t scale = 2;
lv_barcode_set_dark_color(barcode, lv_color_black());
lv_barcode_set_light_color(barcode, lv_color_white());
lv_barcode_set_dark_color(barcode, dark_color);
lv_barcode_set_light_color(barcode, light_color);
lv_barcode_set_scale(barcode, scale);
TEST_ASSERT_EQUAL_COLOR(lv_barcode_get_dark_color(barcode), dark_color);
TEST_ASSERT_EQUAL_COLOR(lv_barcode_get_light_color(barcode), light_color);
TEST_ASSERT_EQUAL_COLOR32(lv_barcode_get_dark_color(barcode), dark_color);
TEST_ASSERT_EQUAL_COLOR32(lv_barcode_get_light_color(barcode), light_color);
TEST_ASSERT_EQUAL(lv_barcode_get_scale(barcode), scale);
lv_res_t res = lv_barcode_update(barcode, "https://lvgl.io");
tests/src/test_cases/test_btnmatrix.c
+18 -19
View File
@@ -302,7 +302,7 @@ void test_btn_matrix_pressed_event_works(void)
{
static const char * btn_map[] = {"A", "B", "\n", "C", "D", ""};
lv_btnmatrix_set_map(btnm, btn_map);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_PRESSED, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_PRESSED, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_PRESSED;
/* Click button index 0. */
@@ -315,7 +315,7 @@ void test_btn_matrix_release_event_works(void)
static const char * btn_map[] = {"A", "B", "\n", "C", "D", ""};
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_RELEASED, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_RELEASED, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_RELEASED;
@@ -338,7 +338,7 @@ void test_btn_matrix_key_event_works(void)
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_update_layout(btnm); /*The force calculating the button areas*/
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_KEY, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_KEY, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_KEY;
@@ -346,28 +346,28 @@ void test_btn_matrix_key_event_works(void)
/* Select the first button. */
lv_btnmatrix_set_selected_btn(btnm, 0);
keyCode = LV_KEY_RIGHT;
lv_event_send(btnm, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(btnm, LV_EVENT_KEY, &keyCode);
TEST_ASSERT_TRUE(event_triggered);
uint16_t btnId = lv_btnmatrix_get_selected_btn(btnm);
TEST_ASSERT_EQUAL_INT(1, btnId);
event_triggered = false;
keyCode = LV_KEY_LEFT;
lv_event_send(btnm, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(btnm, LV_EVENT_KEY, &keyCode);
TEST_ASSERT_TRUE(event_triggered);
btnId = lv_btnmatrix_get_selected_btn(btnm);
TEST_ASSERT_EQUAL_INT(0, btnId);
event_triggered = false;
keyCode = LV_KEY_DOWN;
lv_event_send(btnm, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(btnm, LV_EVENT_KEY, &keyCode);
TEST_ASSERT_TRUE(event_triggered);
btnId = lv_btnmatrix_get_selected_btn(btnm);
TEST_ASSERT_EQUAL_INT(2, btnId);
event_triggered = false;
keyCode = LV_KEY_UP;
lv_event_send(btnm, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(btnm, LV_EVENT_KEY, &keyCode);
TEST_ASSERT_TRUE(event_triggered);
btnId = lv_btnmatrix_get_selected_btn(btnm);
TEST_ASSERT_EQUAL_INT(0, btnId);
@@ -376,7 +376,7 @@ void test_btn_matrix_key_event_works(void)
btnmObj->btn_id_sel = LV_BTNMATRIX_BTN_NONE;
lv_btnmatrix_set_btn_ctrl(btnm, 0, LV_BTNMATRIX_CTRL_HIDDEN);
keyCode = LV_KEY_DOWN;
lv_event_send(btnm, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(btnm, LV_EVENT_KEY, &keyCode);
TEST_ASSERT_TRUE(event_triggered);
event_triggered = false;
}
@@ -384,18 +384,17 @@ void test_btn_matrix_key_event_works(void)
void test_btn_matrix_pressing_event_works(void)
{
lv_btnmatrix_t * btnmObj = (lv_btnmatrix_t *)btnm;
lv_indev_t dummyIndev = {0};
static const char * btn_map[] = {"A", "B", "\n", "C", "D", ""};
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_PRESSING, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_PRESSING, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_PRESSING;
/* Select a button before raising a simulated event.
* This is done to increase code coverage. */
btnmObj->btn_id_sel = 3;
/* Send a dummy lv_indev_t object as param to avoid crashing during build. */
lv_event_send(btnm, LV_EVENT_PRESSING, &dummyIndev);
lv_obj_send_event(btnm, LV_EVENT_PRESSING, lv_test_mouse_indev);
TEST_ASSERT_TRUE(event_triggered);
}
@@ -406,13 +405,13 @@ void test_btn_matrix_long_press_repeat_event_works(void)
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_LONG_PRESSED_REPEAT, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_LONG_PRESSED_REPEAT, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_LONG_PRESSED_REPEAT;
/* Select a button before raising a simulated event.
* This is done to increase code coverage. */
btnmObj->btn_id_sel = 0;
lv_event_send(btnm, LV_EVENT_LONG_PRESSED_REPEAT, NULL);
lv_obj_send_event(btnm, LV_EVENT_LONG_PRESSED_REPEAT, NULL);
TEST_ASSERT_TRUE(event_triggered);
}
@@ -422,10 +421,10 @@ void test_btn_matrix_press_lost_event_works(void)
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_PRESS_LOST, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_PRESS_LOST, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_PRESS_LOST;
lv_event_send(btnm, LV_EVENT_PRESS_LOST, NULL);
lv_obj_send_event(btnm, LV_EVENT_PRESS_LOST, NULL);
TEST_ASSERT_TRUE(event_triggered);
}
@@ -436,13 +435,13 @@ void test_btn_matrix_defocused_event_works(void)
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_DEFOCUSED, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_DEFOCUSED, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_DEFOCUSED;
/* Select a button before raising a simulated event.
* This is done to increase code coverage. */
btnmObj->btn_id_sel = 0;
lv_event_send(btnm, LV_EVENT_DEFOCUSED, NULL);
lv_obj_send_event(btnm, LV_EVENT_DEFOCUSED, NULL);
TEST_ASSERT_TRUE(event_triggered);
}
@@ -452,10 +451,10 @@ void test_btn_matrix_focused_event_works(void)
lv_btnmatrix_set_map(btnm, btn_map);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_obj_add_event_cb(btnm, event_handler, LV_EVENT_FOCUSED, NULL);
lv_obj_add_event(btnm, event_handler, LV_EVENT_FOCUSED, NULL);
/* Set expected event code before the event is raised. */
exp_evt_code = LV_EVENT_FOCUSED;
lv_event_send(btnm, LV_EVENT_FOCUSED, NULL);
lv_obj_send_event(btnm, LV_EVENT_FOCUSED, NULL);
TEST_ASSERT_TRUE(event_triggered);
}
tests/src/test_cases/test_calendar.c
+1 -1
View File
@@ -185,7 +185,7 @@ void test_calendar_event_key_down_gui(void)
lv_calendar_set_showed_date(calendar, 2022, 9);
lv_event_send(calendar, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(calendar, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL_SCREENSHOT("calendar_07.png");
}
tests/src/test_cases/test_checkbox.c
+1 -1
View File
@@ -40,7 +40,7 @@ void test_checkbox_should_call_event_handler_on_click_when_enabled(void)
checkbox = lv_checkbox_create(active_screen);
lv_obj_add_state(checkbox, LV_STATE_CHECKED);
lv_obj_add_event_cb(checkbox, event_handler, LV_EVENT_ALL, NULL);
lv_obj_add_event(checkbox, event_handler, LV_EVENT_ALL, NULL);
lv_test_mouse_click_at(checkbox->coords.x1, checkbox->coords.y1);
tests/src/test_cases/test_colorwheel.c
+6 -6
View File
@@ -116,7 +116,7 @@ void test_colorwheel_event_keys_right_and_up_increment_value_by_one(void)
lv_color_hsv_t hsv_cur = lv_colorwheel_get_hsv(colorwheel);
lv_event_send(colorwheel, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(colorwheel, LV_EVENT_KEY, &keyCode);
lv_color_hsv_t hsv_new = lv_colorwheel_get_hsv(colorwheel);
@@ -127,7 +127,7 @@ void test_colorwheel_event_keys_right_and_up_increment_value_by_one(void)
hsv_cur = hsv_new;
keyCode = LV_KEY_UP;
lv_event_send(colorwheel, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(colorwheel, LV_EVENT_KEY, &keyCode);
hsv_new = lv_colorwheel_get_hsv(colorwheel);
@@ -138,7 +138,7 @@ void test_colorwheel_event_keys_right_and_up_increment_value_by_one(void)
hsv_cur = hsv_new;
keyCode = LV_KEY_UP;
lv_event_send(colorwheel, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(colorwheel, LV_EVENT_KEY, &keyCode);
hsv_new = lv_colorwheel_get_hsv(colorwheel);
@@ -154,7 +154,7 @@ void test_colorwheel_event_keys_left_and_down_decrement_value_by_one(void)
lv_color_hsv_t hsv_cur = lv_colorwheel_get_hsv(colorwheel);
lv_event_send(colorwheel, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(colorwheel, LV_EVENT_KEY, &keyCode);
lv_color_hsv_t hsv_new = lv_colorwheel_get_hsv(colorwheel);
@@ -165,7 +165,7 @@ void test_colorwheel_event_keys_left_and_down_decrement_value_by_one(void)
hsv_cur = hsv_new;
keyCode = LV_KEY_DOWN;
lv_event_send(colorwheel, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(colorwheel, LV_EVENT_KEY, &keyCode);
hsv_new = lv_colorwheel_get_hsv(colorwheel);
@@ -176,7 +176,7 @@ void test_colorwheel_event_keys_left_and_down_decrement_value_by_one(void)
hsv_cur = hsv_new;
keyCode = LV_KEY_DOWN;
lv_event_send(colorwheel, LV_EVENT_KEY, &keyCode);
lv_obj_send_event(colorwheel, LV_EVENT_KEY, &keyCode);
hsv_new = lv_colorwheel_get_hsv(colorwheel);
tests/src/test_cases/test_dropdown.c
+2 -2
View File
@@ -169,7 +169,7 @@ void test_dropdown_keypad(void)
lv_obj_set_pos(dd1, 20, 20);
lv_dropdown_set_options(dd1, "1\n2\n3\n4\n5\n6\n7\n8");
lv_group_add_obj(g, dd1);
lv_obj_add_event_cb(dd1, dd_event, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_add_event(dd1, dd_event, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_set_pos(dd2, 300, 20);
@@ -272,7 +272,7 @@ void test_dropdown_encoder(void)
lv_obj_set_pos(dd1, 20, 20);
lv_dropdown_set_options(dd1, "1\n2\n3\n4\n5\n6\n7\n8");
lv_group_add_obj(g, dd1);
lv_obj_add_event_cb(dd1, dd_event, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_add_event(dd1, dd_event, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_set_pos(dd2, 300, 20);
tests/src/test_cases/test_event.c
+1 -1
View File
@@ -21,7 +21,7 @@ static const lv_obj_class_t event_object_deletion_class = {
void test_event_object_deletion(void)
{
lv_obj_t * obj = lv_obj_class_create_obj(&event_object_deletion_class, lv_scr_act());
lv_event_send(obj, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_send_event(obj, LV_EVENT_VALUE_CHANGED, NULL);
}
#endif
tests/src/test_cases/test_led.c
+3 -3
View File
@@ -40,13 +40,13 @@ void test_led_set_color_works(void)
/* Test by changing colors randomly. */
lv_led_set_color(led, lv_palette_main(LV_PALETTE_AMBER));
TEST_ASSERT_EQUAL(lv_palette_main(LV_PALETTE_AMBER).full, ledObj->color.full);
TEST_ASSERT_EQUAL_COLOR(lv_palette_main(LV_PALETTE_AMBER), ledObj->color);
lv_led_set_color(led, lv_palette_main(LV_PALETTE_GREY));
TEST_ASSERT_EQUAL(lv_palette_main(LV_PALETTE_GREY).full, ledObj->color.full);
TEST_ASSERT_EQUAL_COLOR(lv_palette_main(LV_PALETTE_GREY), ledObj->color);
lv_led_set_color(led, lv_palette_main(LV_PALETTE_RED));
TEST_ASSERT_EQUAL(lv_palette_main(LV_PALETTE_RED).full, ledObj->color.full);
TEST_ASSERT_EQUAL_COLOR(lv_palette_main(LV_PALETTE_RED), ledObj->color);
}
void test_led_set_brightness_works(void)
tests/src/test_cases/test_line.c
+1 -1
View File
@@ -76,7 +76,7 @@ static void line_event_cb(lv_event_t * e)
void test_line_should_update_extra_draw_size_based_on_style(void)
{
/* Setup an event handler for line extra draw size event */
lv_obj_add_event_cb(line, line_event_cb, LV_EVENT_ALL, NULL);
lv_obj_add_event(line, line_event_cb, LV_EVENT_ALL, NULL);
/* Trigger the extra draw size event */
lv_obj_refresh_ext_draw_size(line);
tests/src/test_cases/test_msg.c
+1 -1
View File
@@ -44,7 +44,7 @@ void test_add_entry_and_send_msg(void)
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_msg_subscribe_obj((lv_msg_id_t)&value, label, NULL);
lv_obj_add_event_cb(label, event_cb, LV_EVENT_MSG_RECEIVED, NULL);
lv_obj_add_event(label, event_cb, LV_EVENT_MSG_RECEIVED, NULL);
value = 300;
lv_msg_update_value(&value);
tests/src/test_cases/test_msgbox.c
+1 -1
View File
@@ -196,7 +196,7 @@ void test_msgbox_close_click_event(void)
// Msgbox close button is a lv_btn widget
close_btn = lv_msgbox_get_close_btn(msgbox);
lv_event_send(close_btn, LV_EVENT_CLICKED, NULL);
lv_obj_send_event(close_btn, LV_EVENT_CLICKED, NULL);
}
#endif
tests/src/test_cases/test_slider.c
+7 -7
View File
@@ -49,13 +49,13 @@ void test_slider_event_keys_right_and_up_increment_value_by_one(void)
lv_slider_set_value(slider, 10, LV_ANIM_OFF);
int32_t value = lv_slider_get_value(slider);
lv_event_send(slider, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(slider, LV_EVENT_KEY, (void *) &key);
int32_t new_value = lv_slider_get_value(slider);
TEST_ASSERT_EQUAL_INT32(value + 1, new_value);
key = LV_KEY_UP;
lv_event_send(slider, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(slider, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL_INT32(new_value + 1, lv_slider_get_value(slider));
}
@@ -65,13 +65,13 @@ void test_slider_event_keys_left_and_down_decrement_value_by_one(void)
lv_slider_set_value(slider, 10, LV_ANIM_OFF);
int32_t value = lv_slider_get_value(slider);
lv_event_send(slider, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(slider, LV_EVENT_KEY, (void *) &key);
int32_t new_value = lv_slider_get_value(slider);
TEST_ASSERT_EQUAL_INT32(value - 1, new_value);
key = LV_KEY_DOWN;
lv_event_send(slider, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(slider, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL_INT32(new_value - 1, lv_slider_get_value(slider));
}
@@ -81,7 +81,7 @@ void test_slider_event_invalid_key_should_not_change_values(void)
lv_slider_set_value(slider, 10, LV_ANIM_OFF);
int32_t value = lv_slider_get_value(slider);
lv_event_send(slider, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(slider, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL_INT32(value, lv_slider_get_value(slider));
}
@@ -187,7 +187,7 @@ void test_normal_mode_slider_hit_test(void)
};
lv_slider_set_value(sliderNormalMode, 100, LV_ANIM_OFF);
lv_event_send(sliderNormalMode, LV_EVENT_HIT_TEST, (void *) &info);
lv_obj_send_event(sliderNormalMode, LV_EVENT_HIT_TEST, (void *) &info);
/* point can click slider */
TEST_ASSERT(info.res);
@@ -205,7 +205,7 @@ void test_slider_range_event_hit_test(void)
.res = false,
.point = &point
};
lv_event_send(sliderRangeMode, LV_EVENT_HIT_TEST, (void *) &info);
lv_obj_send_event(sliderRangeMode, LV_EVENT_HIT_TEST, (void *) &info);
/* point can click slider in the left knob */
TEST_ASSERT(info.res);
tests/src/test_cases/test_snapshot.c
+1 -1
View File
@@ -21,7 +21,7 @@ void test_snapshot_should_not_leak_memory(void)
initial_available_memory = monitor.free_size;
for(idx = 0; idx < NUM_SNAPSHOTS; idx++) {
snapshots[idx] = lv_snapshot_take(lv_scr_act(), LV_IMG_CF_TRUE_COLOR_ALPHA);
snapshots[idx] = lv_snapshot_take(lv_scr_act(), LV_COLOR_FORMAT_NATIVE_ALPHA);
TEST_ASSERT_NOT_NULL(snapshots[idx]);
}
tests/src/test_cases/test_spinbox.c
+5 -5
View File
@@ -160,27 +160,27 @@ void test_spinbox_event_key(void)
/* Spinbox should increment it's value by one after receiving the LV_KEY_UP event */
lv_spinbox_set_value(spinbox_events, 0);
uint32_t key = LV_KEY_UP;
lv_event_send(spinbox_events, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(spinbox_events, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL(1, lv_spinbox_get_value(spinbox_events));
/* Spinbox should decrement it's value by one after receiving the LV_KEY_DOWN event */
key = LV_KEY_DOWN;
lv_event_send(spinbox_events, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(spinbox_events, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL(0, lv_spinbox_get_value(spinbox_events));
/* Spinbox should multiply it's step vale by 10 after receiving the LV_KEY_LEFT event */
int32_t step = lv_spinbox_get_step(spinbox_events);
key = LV_KEY_LEFT;
lv_event_send(spinbox_events, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(spinbox_events, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL(step * 10, lv_spinbox_get_step(spinbox_events));
/* Spinbox should divide it's step vale by 10 after receiving the LV_KEY_RIGHT event */
step = lv_spinbox_get_step(spinbox_events);
key = LV_KEY_RIGHT;
lv_event_send(spinbox_events, LV_EVENT_KEY, (void *) &key);
lv_obj_send_event(spinbox_events, LV_EVENT_KEY, (void *) &key);
TEST_ASSERT_EQUAL(step / 10, lv_spinbox_get_step(spinbox_events));
}
@@ -278,7 +278,7 @@ void test_spinbox_event_release(void)
/* Set cursor in least significant decimal digit */
lv_spinbox_set_cursor_pos(spinbox_events, 0);
lv_event_send(spinbox_events, LV_EVENT_RELEASED, NULL);
lv_obj_send_event(spinbox_events, LV_EVENT_RELEASED, NULL);
TEST_ASSERT_EQUAL(1, lv_spinbox_get_step(spinbox_events));
}
tests/src/test_cases/test_style.c
+2 -2
View File
@@ -77,7 +77,7 @@ void test_inherit_meta(void)
lv_obj_t * grandchild = lv_label_create(child);
lv_obj_set_style_text_color(parent, lv_color_hex(0xff0000), LV_PART_MAIN);
lv_obj_set_local_style_prop_meta(child, LV_STYLE_TEXT_COLOR, LV_STYLE_PROP_META_INHERIT, LV_PART_MAIN);
TEST_ASSERT_EQUAL_HEX(lv_color_hex(0xff0000).full, lv_obj_get_style_text_color(grandchild, LV_PART_MAIN).full);
TEST_ASSERT_EQUAL_COLOR(lv_color_hex(0xff0000), lv_obj_get_style_text_color(grandchild, LV_PART_MAIN));
}
void test_id_meta_overrun(void)
@@ -103,7 +103,7 @@ void test_inherit_meta_with_lower_precedence_style(void)
lv_style_set_text_color(&style, lv_color_hex(0xffffff));
lv_obj_set_local_style_prop_meta(child, LV_STYLE_TEXT_COLOR, LV_STYLE_PROP_META_INHERIT, LV_PART_MAIN);
lv_obj_add_style(child, &style, LV_PART_MAIN);
TEST_ASSERT_EQUAL_HEX(lv_color_hex(0xff0000).full, lv_obj_get_style_text_color(grandchild, LV_PART_MAIN).full);
TEST_ASSERT_EQUAL_COLOR(lv_color_hex(0xff0000), lv_obj_get_style_text_color(grandchild, LV_PART_MAIN));
}
const lv_style_const_prop_t const_style_props[] = {
tests/src/test_cases/test_switch.c
+1 -1
View File
@@ -122,7 +122,7 @@ void test_switch_should_update_extra_draw_size_after_editing_padding(void)
/* See #2330 for context */
void test_switch_should_trigger_value_changed_event_only_once(void)
{
lv_obj_add_event_cb(sw, event_handler, LV_EVENT_ALL, NULL);
lv_obj_add_event(sw, event_handler, LV_EVENT_ALL, NULL);
mouse_click_on_switch();
TEST_ASSERT_EQUAL(1, value_changed_event_cnt);
tests/src/test_cases/test_table.c
+1 -1
View File
@@ -152,7 +152,7 @@ static void draw_part_event_cb(lv_event_t * e)
void test_table_rendering(void)
{
lv_obj_center(table);
lv_obj_add_event_cb(table, draw_part_event_cb, LV_EVENT_DRAW_PART_BEGIN, NULL);
lv_obj_add_event(table, draw_part_event_cb, LV_EVENT_DRAW_PART_BEGIN, NULL);
lv_obj_set_style_border_side(table, LV_BORDER_SIDE_FULL, LV_PART_ITEMS);
lv_obj_set_style_pad_all(table, 10, LV_PART_ITEMS);
lv_obj_set_style_border_width(table, 5, LV_PART_ITEMS);
tests/unity/unity_support.c
+1 -1
View File
@@ -147,7 +147,7 @@ bool lv_test_assert_img_eq(const char * fn_ref)
" .header.w = 800,\n"
" .header.h = 480,\n"
" .header.always_zero = 0,\n"
" .header.cf = LV_IMG_CF_TRUE_COLOR,\n"
" .header.cf = LV_COLOR_FORMAT_NATIVE,\n"
" .data_size = 800 * 480 * 4,\n"
" .data = (const uint8_t *) test_screenshot_error_data};\n\n"
"static inline void test_screenshot_error_show(void)\n"
tests/unity/unity_support.h
+13 -10
View File
@@ -18,22 +18,25 @@ bool lv_test_assert_img_eq(const char * fn_ref);
#else
# define TEST_ASSERT_EQUAL_SCREENSHOT(path) if(LV_HOR_RES != 800 || LV_VER_RES != 480) { \
TEST_IGNORE_MESSAGE("Requires 800x480 resolution"); \
} else { \
TEST_ASSERT(lv_test_assert_img_eq(path)); \
}
TEST_IGNORE_MESSAGE("Requires 800x480 resolution"); \
} else { \
TEST_ASSERT(lv_test_assert_img_eq(path)); \
}
# define TEST_ASSERT_EQUAL_SCREENSHOT_MESSAGE(path, msg) if(LV_HOR_RES != 800 || LV_VER_RES != 480) { \
TEST_PRINTF(msg); \
TEST_IGNORE_MESSAGE("Requires 800x480 resolution"); \
} else { \
TEST_ASSERT_MESSAGE(lv_test_assert_img_eq(path), msg); \
}
TEST_PRINTF(msg); \
TEST_IGNORE_MESSAGE("Requires 800x480 resolution"); \
} else { \
TEST_ASSERT_MESSAGE(lv_test_assert_img_eq(path), msg); \
}
#endif
# define TEST_ASSERT_EQUAL_COLOR(c1, c2) TEST_ASSERT_EQUAL_UINT32(c1.full, c2.full)
# define TEST_ASSERT_EQUAL_COLOR(c1, c2) TEST_ASSERT_EQUAL_UINT32(lv_color_to_int(c1), lv_color_to_int(c2))
# define TEST_ASSERT_EQUAL_COLOR_MESSAGE(c1, c2, msg) TEST_ASSERT_EQUAL_UINT32_MESSAGE(c1.full, c2.full, msg)
# define TEST_ASSERT_EQUAL_COLOR32(c1, c2) TEST_ASSERT_EQUAL_UINT32(lv_color32_to_int(c1), lv_color32_to_int(c2))
# define TEST_ASSERT_EQUAL_COLOR32_MESSAGE(c1, c2, msg) TEST_ASSERT_EQUAL_UINT32_MESSAGE(c1.full, c2.full, msg)
#ifdef __cplusplus
} /*extern "C"*/
#endif