From b9c3bdf7ebea45bae93de107495baca532be85c0 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Fri, 4 Oct 2024 21:07:22 -0400 Subject: [PATCH] [lvgl][ci] add lvgl 8.3-latest check --- .../online-packages/multimedia/lvgl-latest.attach | 2 -- .../multimedia/lvgl/lvgl-latest.attach} | 3 +++ .../online-packages/multimedia/lvgl/lvgl-v8.3-latest.attach | 5 +++++ .../online-packages/multimedia/lvgl/lvgl-v8.3.11.attach | 5 +++++ .../online-packages/multimedia/lvgl/lvgl-v8.4-latest.attach | 5 +++++ bsp/stm32/stm32f407-rt-spark/board/ports/lvgl/lv_port_disp.c | 4 ++-- 6 files changed, 20 insertions(+), 4 deletions(-) delete mode 100644 bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl-latest.attach rename bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/{peripheral/lvgl.attach => online-packages/multimedia/lvgl/lvgl-latest.attach} (51%) create mode 100644 bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3-latest.attach create mode 100644 bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3.11.attach create mode 100644 bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.4-latest.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl-latest.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl-latest.attach deleted file mode 100644 index 2b54c20149..0000000000 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl-latest.attach +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_BSP_USING_LVGL=y -CONFIG_PKG_LVGL_USING_LATEST_VERSION=y diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lvgl.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-latest.attach similarity index 51% rename from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lvgl.attach rename to bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-latest.attach index d90eeb40ae..4f88012327 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lvgl.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-latest.attach @@ -1,2 +1,5 @@ +# scons: --strict + CONFIG_BSP_USING_LVGL=y CONFIG_BSP_USING_LVGL_DEMO=y +CONFIG_PKG_LVGL_USING_LATEST=y diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3-latest.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3-latest.attach new file mode 100644 index 0000000000..a78c274465 --- /dev/null +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3-latest.attach @@ -0,0 +1,5 @@ +# scons: --strict + +CONFIG_BSP_USING_LVGL=y +CONFIG_BSP_USING_LVGL_DEMO=y +CONFIG_PKG_LVGL_USING_V8_3_LATEST=y diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3.11.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3.11.attach new file mode 100644 index 0000000000..e1305a8091 --- /dev/null +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.3.11.attach @@ -0,0 +1,5 @@ +# scons: --strict + +CONFIG_BSP_USING_LVGL=y +CONFIG_BSP_USING_LVGL_DEMO=y +CONFIG_PKG_LVGL_USING_V080311=y diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.4-latest.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.4-latest.attach new file mode 100644 index 0000000000..7179f1247b --- /dev/null +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/online-packages/multimedia/lvgl/lvgl-v8.4-latest.attach @@ -0,0 +1,5 @@ +# scons: --strict + +CONFIG_BSP_USING_LVGL=y +CONFIG_BSP_USING_LVGL_DEMO=y +CONFIG_PKG_LVGL_USING_V8_4_LATEST=y diff --git a/bsp/stm32/stm32f407-rt-spark/board/ports/lvgl/lv_port_disp.c b/bsp/stm32/stm32f407-rt-spark/board/ports/lvgl/lv_port_disp.c index ff5ac4e9a4..e2d27ba551 100644 --- a/bsp/stm32/stm32f407-rt-spark/board/ports/lvgl/lv_port_disp.c +++ b/bsp/stm32/stm32f407-rt-spark/board/ports/lvgl/lv_port_disp.c @@ -26,7 +26,7 @@ #define MY_DISP_VER_RES 240 #endif -#if (PKG_LVGL_VER_NUM >= 0x0803FF) +#if (PKG_LVGL_VER_NUM >= 0x090000) #define LV_DISP_TYPE lv_display_t #define lv_COLOR_TYPE uint8_t #else @@ -101,7 +101,7 @@ void lv_port_disp_init(void) * Register the display in LVGL *----------------------------------*/ -#if (PKG_LVGL_VER_NUM >= 0x0803FF) +#if (PKG_LVGL_VER_NUM >= 0x090000) lv_display_t *display = lv_display_create(MY_DISP_HOR_RES, MY_DISP_VER_RES); lv_display_set_buffers(display, buf_1, NULL, sizeof(buf_1), LV_DISPLAY_RENDER_MODE_PARTIAL); /*Initialize the display buffer.*/