libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-01-19 11:33:31 +08:00
Code Issues Releases Wiki Activity

[simulator][lvgl] 处理注释

Browse Source
This commit is contained in:
Meco Man 2021-12-16 01:19:00 -05:00
parent e72eb1ae95
commit d4a72f29c7
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/qemu-vexpress-a9/drivers/drv_clcd.c
View File

@ -109,7 +109,7 @@ int drv_clcd_hw_init(void)
_lcd.width = CLCD_WIDTH; _lcd.width = CLCD_WIDTH;
_lcd.height = CLCD_HEIGHT; _lcd.height = CLCD_HEIGHT;
_lcd.fb = rt_malloc_align(_lcd.width * _lcd.height * 2, 32); _lcd.fb = rt_malloc(_lcd.width * _lcd.height * 2);
if (_lcd.fb == NULL) if (_lcd.fb == NULL)
{ {
rt_kprintf("initialize frame buffer failed!\n"); rt_kprintf("initialize frame buffer failed!\n");

2
bsp/qemu-vexpress-a9/drivers/lvgl/lv_demo.c
View File

@ -23,9 +23,11 @@
static void lvgl_thread(void *parameter) static void lvgl_thread(void *parameter)
{ {
/* display demo; you may replace with your LVGL application at here */
extern void lv_demo_music(void); extern void lv_demo_music(void);
lv_demo_music(); lv_demo_music();
/* handle the tasks of LVGL */
while(1) while(1)
{ {
lv_task_handler(); lv_task_handler();

4
bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_disp.c
View File

@ -116,14 +116,14 @@ void lv_port_disp_init(void)
RT_ASSERT(info.bits_per_pixel == 8 || info.bits_per_pixel == 16 || RT_ASSERT(info.bits_per_pixel == 8 || info.bits_per_pixel == 16 ||
info.bits_per_pixel == 24 || info.bits_per_pixel == 32); info.bits_per_pixel == 24 || info.bits_per_pixel == 32);
fbuf1 = rt_malloc_align(info.width * info.height * sizeof(lv_color_t), 32); fbuf1 = rt_malloc(info.width * info.height * sizeof(lv_color_t));
if (fbuf1 == RT_NULL) if (fbuf1 == RT_NULL)
{ {
rt_kprintf("Error: alloc disp buf fail\n"); rt_kprintf("Error: alloc disp buf fail\n");
return; return;
} }
fbuf2 = rt_malloc_align(info.width * info.height * sizeof(lv_color_t), 32); fbuf2 = rt_malloc(info.width * info.height * sizeof(lv_color_t));
if (fbuf2 == RT_NULL) if (fbuf2 == RT_NULL)
{ {
rt_kprintf("Error: alloc disp buf fail\n"); rt_kprintf("Error: alloc disp buf fail\n");

18
bsp/simulator/drivers/lvgl/lv_demo.c
View File

@ -12,11 +12,8 @@
#define DBG_LVL DBG_INFO #define DBG_LVL DBG_INFO
#include <rtdbg.h> #include <rtdbg.h>
#include <lvgl.h> #include <lvgl.h>
#include <lv_port_disp.h>
#include <win32drv.h> #include <win32drv.h>
#define IDI_LVGL 101
#ifndef LV_THREAD_STACK_SIZE #ifndef LV_THREAD_STACK_SIZE
#define LV_THREAD_STACK_SIZE 4096 #define LV_THREAD_STACK_SIZE 4096
#endif #endif
@ -28,28 +25,25 @@
static void lvgl_thread(void *parameter) static void lvgl_thread(void *parameter)
{ {
/* initialize win32 driver; don't put this in lv_port_disp() */ /* initialize win32 driver; don't put this in lv_port_disp() */
if (!lv_win32_init( if (!lv_win32_init(GetModuleHandleW(NULL), SW_SHOW, BSP_LCD_WIDTH, BSP_LCD_HEIGHT, NULL))
GetModuleHandleW(NULL),
SW_SHOW,
BSP_LCD_WIDTH,
BSP_LCD_HEIGHT,
LoadIconW(GetModuleHandleW(NULL), MAKEINTRESOURCE(IDI_LVGL))))
{ {
LOG_E("lv_win32_init failure!"); LOG_E("lv_win32_init failure!");
return; return;
} }
lv_win32_add_all_input_devices_to_group(NULL); lv_win32_add_all_input_devices_to_group(NULL);
/* display demo */ /* display demo; you may replace with your LVGL application at here */
extern void lv_demo_music(void); extern void lv_demo_music(void);
lv_demo_music(); lv_demo_music();
/* handle the tasks of LVGL */
while (!lv_win32_quit_signal) while (!lv_win32_quit_signal)
{ {
lv_task_handler(); lv_task_handler();
Sleep(1); rt_thread_mdelay(1);
} }
LOG_W("LVGL simulator window closed!");
} }
static int lvgl_demo_init(void) static int lvgl_demo_init(void)

2
bsp/simulator/drivers/lvgl/lv_port_disp.h
View File

@ -14,8 +14,6 @@
extern "C" { extern "C" {
#endif #endif
#include <win32drv.h>
void lv_port_disp_init(void); void lv_port_disp_init(void);
#ifdef __cplusplus #ifdef __cplusplus

2
bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c
View File

@ -29,8 +29,10 @@ static void lvgl_thread(void *parameter)
const lv_point_t points_array[] = {{200,35},{0,0},{70,35},{0,0}}; const lv_point_t points_array[] = {{200,35},{0,0},{70,35},{0,0}};
lv_indev_set_button_points(button_indev, points_array); lv_indev_set_button_points(button_indev, points_array);
/* display demo; you may replace with your LVGL application at here */
lv_demo_calendar(); lv_demo_calendar();
/* handle the tasks of LVGL */
while(1) while(1)
{ {
lv_task_handler(); lv_task_handler();