diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_demo.c b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_demo.c index c4818399f32b29f199d5048d5cdb59a030dc0b70..17d01e09cc40100c652a117a3b8604106dd4a34e 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_demo.c +++ b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_demo.c @@ -10,7 +10,7 @@ #include #include #include -#define DBG_TAG "LVGL" +#define DBG_TAG "LVGL.demo" #define DBG_LVL DBG_INFO #include diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c index 4a3ea2601b509119ba0ea275cb9f9207e2f7ffc6..1d0c35e1584e5e6319a43876a0ddef8ac8ffc4bc 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c +++ b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c @@ -11,13 +11,13 @@ #include //#define DRV_DEBUG -#define LOG_TAG "lvgl.disp" +#define LOG_TAG "LVGL.port.disp" #include /*A static or global variable to store the buffers*/ static lv_disp_draw_buf_t disp_buf; -rt_device_t lcd_device = 0; +static rt_device_t lcd_device = RT_NULL; static struct rt_device_graphic_info info; static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ @@ -41,7 +41,7 @@ static void DMA_TransferComplete(DMA_HandleTypeDef *han) if(y_fill_act > y2_fill) { - lv_disp_flush_ready(&disp_drv); + lv_disp_flush_ready(&disp_drv); } else { @@ -51,16 +51,16 @@ static void DMA_TransferComplete(DMA_HandleTypeDef *han) (uint32_t)&((uint32_t *)info.framebuffer)[y_fill_act * info.width + x1_flush], (x2_flush - x1_flush + 1)) != HAL_OK) { - LOG_E("lvgl dma start error"); - while(1); + LOG_E("HAL_DMA_Start_IT error"); + RT_ASSERT(0); } } } static void DMA_TransferError(DMA_HandleTypeDef *han) { - LOG_E("dma transfer error"); - while(1); + LOG_E("DMA_TransferError"); + RT_ASSERT(0); } void DMA_STREAM_IRQHANDLER(void) @@ -95,7 +95,8 @@ static void lvgl_dma_config(void) if (HAL_DMA_Init(&DmaHandle) != HAL_OK) { - while(1); + LOG_E("HAL_DMA_Init error"); + RT_ASSERT(0); } HAL_DMA_RegisterCallback(&DmaHandle, HAL_DMA_XFER_CPLT_CB_ID, DMA_TransferComplete); @@ -130,8 +131,8 @@ static void lcd_fb_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_colo (uint32_t)&((uint32_t *)info.framebuffer)[y_fill_act * info.width + x1_flush], (x2_flush - x1_flush + 1)) != HAL_OK) { - LOG_E("dma start it error"); - while(1); + LOG_E("HAL_DMA_Start_IT error"); + RT_ASSERT(0); } } diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_indev.c b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_indev.c index b190a32a914a117877c2126755f1616511cebbc5..50022c4edbfbfc31a35dd4cebb657dbad5f564f1 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_indev.c +++ b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_indev.c @@ -37,7 +37,7 @@ void lv_port_indev_init(void) { static lv_indev_drv_t indev_drv; - lv_indev_drv_init(&indev_drv); /*Basic initialization*/ + lv_indev_drv_init(&indev_drv); /*Basic initialization*/ indev_drv.type = LV_INDEV_TYPE_POINTER; indev_drv.read_cb = input_read; diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c index c8d09a8e949019d31e554bfb792a07b4be2c27a5..d72e6ae7baa71d50c43e9b98dbdfd2669e18da7f 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c @@ -11,7 +11,7 @@ #include #include #include -#define DBG_TAG "LVGL" +#define DBG_TAG "LVGL.demo" #define DBG_LVL DBG_INFO #include