From a70eb5604c08d5bd0ebe0f79ec773ef879c809e9 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Fri, 22 Oct 2021 01:38:09 -0400 Subject: [PATCH] [stm32l475] upgrade lvgl porting --- .../board/ports/lvgl/SConscript | 2 +- .../ports/lvgl/{lvgl_demo.c => lv_demo.c} | 49 +---------------- .../board/ports/lvgl/lv_port_disp.c | 55 +++++++++++++++++++ .../board/ports/lvgl/lv_port_disp.h | 23 ++++++++ .../board/ports/lvgl/lv_port_indev.c | 14 +++++ .../board/ports/lvgl/lv_port_indev.h | 23 ++++++++ 6 files changed, 117 insertions(+), 49 deletions(-) rename bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/{lvgl_demo.c => lv_demo.c} (66%) create mode 100644 bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.c create mode 100644 bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.h create mode 100644 bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.c create mode 100644 bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.h diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript index 63fbfd3933..cb74975f39 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript @@ -5,5 +5,5 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('LVGL', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH) +group = DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lvgl_demo.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c similarity index 66% rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lvgl_demo.c rename to bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c index a9de28b40a..5abb7d0c7a 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lvgl_demo.c +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c @@ -10,10 +10,6 @@ #include #include -#include -#define DBG_TAG "LVGL" -#define DBG_LVL DBG_INFO -#include #ifndef LV_THREAD_STACK_SIZE #define LV_THREAD_STACK_SIZE 2048 @@ -26,51 +22,8 @@ static void lv_example_get_started_1(void); static void lv_example_get_started_3(void); -#define MY_DISP_HOR_RES 240 /* 240*240 */ - -/*A static or global variable to store the buffers*/ -static lv_disp_draw_buf_t disp_buf; - -/*Static or global buffer(s). The second buffer is optional*/ -static lv_color_t buf_1[MY_DISP_HOR_RES * 10]; -static lv_color_t buf_2[MY_DISP_HOR_RES * 10]; - -static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ - -/*Flush the content of the internal buffer the specific area on the display - *You can use DMA or any hardware acceleration to do this operation in the background but - *'lv_disp_flush_ready()' has to be called when finished.*/ -static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p) -{ - lcd_fill_array(area->x1, area->y1, area->x2, area->y2, color_p); - - /*IMPORTANT!!! - *Inform the graphics library that you are ready with the flushing*/ - lv_disp_flush_ready(disp_drv); -} - static void lvgl_thread(void *parameter) { - lv_init(); - - /*Initialize `disp_buf` with the buffer(s). With only one buffer use NULL instead buf_2 */ - lv_disp_draw_buf_init(&disp_buf, buf_1, buf_2, MY_DISP_HOR_RES*10); - - lv_disp_drv_init(&disp_drv); /*Basic initialization*/ - - /*Set the resolution of the display*/ - disp_drv.hor_res = MY_DISP_HOR_RES; - disp_drv.ver_res = MY_DISP_HOR_RES; - - /*Set a display buffer*/ - disp_drv.draw_buf = &disp_buf; - - /*Used to copy the buffer's content to the display*/ - disp_drv.flush_cb = disp_flush; - - /*Finally register the driver*/ - lv_disp_drv_register(&disp_drv); - lv_example_get_started_1(); lv_example_get_started_3(); @@ -90,7 +43,7 @@ static int lvgl_demo_init(void) return 0; } -INIT_COMPONENT_EXPORT(lvgl_demo_init); +INIT_APP_EXPORT(lvgl_demo_init); /* ------------------- demo1 ----------------------- */ diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.c new file mode 100644 index 0000000000..ccc64a162d --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.c @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-10-18 Meco Man The first version + */ +#include +#include + +#define MY_DISP_HOR_RES LCD_W + +/*A static or global variable to store the buffers*/ +static lv_disp_draw_buf_t disp_buf; + +/*Static or global buffer(s). The second buffer is optional*/ +static lv_color_t buf_1[MY_DISP_HOR_RES * LCD_W /5]; +static lv_color_t buf_2[MY_DISP_HOR_RES * LCD_W /5]; + +static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ + +/*Flush the content of the internal buffer the specific area on the display + *You can use DMA or any hardware acceleration to do this operation in the background but + *'lv_disp_flush_ready()' has to be called when finished.*/ +static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p) +{ + lcd_fill_array(area->x1, area->y1, area->x2, area->y2, color_p); + + /*IMPORTANT!!! + *Inform the graphics library that you are ready with the flushing*/ + lv_disp_flush_ready(disp_drv); +} + +void lv_port_disp_init(void) +{ + /*Initialize `disp_buf` with the buffer(s). With only one buffer use NULL instead buf_2 */ + lv_disp_draw_buf_init(&disp_buf, buf_1, buf_2, MY_DISP_HOR_RES*10); + + lv_disp_drv_init(&disp_drv); /*Basic initialization*/ + + /*Set the resolution of the display*/ + disp_drv.hor_res = MY_DISP_HOR_RES; + disp_drv.ver_res = MY_DISP_HOR_RES; + + /*Set a display buffer*/ + disp_drv.draw_buf = &disp_buf; + + /*Used to copy the buffer's content to the display*/ + disp_drv.flush_cb = disp_flush; + + /*Finally register the driver*/ + lv_disp_drv_register(&disp_drv); +} diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.h b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.h new file mode 100644 index 0000000000..ef39eb03cd --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-10-18 Meco Man The first version + */ +#ifndef LV_PORT_DISP_H +#define LV_PORT_DISP_H + +#ifdef __cplusplus +extern "C" { +#endif + +void lv_port_disp_init(void); + +#ifdef __cplusplus +} /*extern "C"*/ +#endif + +#endif diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.c new file mode 100644 index 0000000000..8c024c5a14 --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.c @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-10-18 Meco Man The first version + */ + +void lv_port_indev_init(void) +{ + +} diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.h b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.h new file mode 100644 index 0000000000..7599bb899d --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-10-18 Meco Man The first version + */ +#ifndef LV_PORT_INDEV_H +#define LV_PORT_INDEV_H + +#ifdef __cplusplus +extern "C" { +#endif + +void lv_port_indev_init(void); + +#ifdef __cplusplus +} /*extern "C"*/ +#endif + +#endif -- GitLab