Merge pull request #5339 from mysterywolf/469

[stm32][f469]update lvgl demo
This commit is contained in:
guo 2021-12-07 09:38:30 +08:00 committed by GitHub
commit be089df128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 13 deletions

View File

@ -10,7 +10,7 @@
#include <rtthread.h>
#include <lvgl.h>
#include <lv_port_indev.h>
#define DBG_TAG "LVGL"
#define DBG_TAG "LVGL.demo"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>

View File

@ -11,13 +11,13 @@
#include <lcd_port.h>
//#define DRV_DEBUG
#define LOG_TAG "lvgl.disp"
#define LOG_TAG "LVGL.port.disp"
#include <drv_log.h>
/*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);
}
}

View File

@ -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;

View File

@ -11,7 +11,7 @@
#include <lvgl.h>
#include <lv_port_indev.h>
#include <lv_demo_calendar.h>
#define DBG_TAG "LVGL"
#define DBG_TAG "LVGL.demo"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>