libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5394 from mysterywolf/simu

This commit is contained in:
guo 2021-12-16 16:51:30 +08:00 committed by GitHub
parent d724eed9fc d4a72f29c7
commit a6b62d37d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 1288 additions and 13 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.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)
{
rt_kprintf("initialize frame buffer failed!\n");

3
bsp/qemu-vexpress-a9/drivers/lvgl/SConscript
View File

@ -5,7 +5,6 @@ cwd = GetCurrentDir()
group = []
src = Glob('*.c')
CPPPATH = [cwd]
CPPDEFINES = ['STM32F4']
list = os.listdir(cwd)
for d in list:
@ -13,6 +12,6 @@ for d in list:
if os.path.isfile(os.path.join(path, 'SConscript')):
group = group + SConscript(os.path.join(d, 'SConscript'))
group += DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
group += DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
Return('group')

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

@ -9,7 +9,6 @@
*/
#include <rtthread.h>
#include <lvgl.h>
#include <lv_port_indev.h>
#define DBG_TAG "LVGL.demo"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
@ -24,9 +23,11 @@
static void lvgl_thread(void *parameter)
{
/* display demo; you may replace with your LVGL application at here */
extern void lv_demo_music(void);
lv_demo_music();
/* handle the tasks of LVGL */
while(1)
{
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 ||
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)
{
rt_kprintf("Error: alloc disp buf fail\n");
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)
{
rt_kprintf("Error: alloc disp buf fail\n");

5
bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_indev.h
View File

@ -14,12 +14,7 @@
extern "C" {
#endif
#include <lv_hal_indev.h>
extern lv_indev_t * button_indev;
void lv_port_indev_init(void);
void lv_port_indev_input(rt_int16_t x, rt_int16_t y, lv_indev_state_t state);
#ifdef __cplusplus
} /*extern "C"*/

19
bsp/simulator/Kconfig
View File

@ -26,8 +26,23 @@ config SOC_SIMULATOR
if RT_USING_DFS
config RT_USING_DFS_WINSHAREDIR
bool "Enable shared file system between windows"
default n
bool "Enable shared file system between windows"
default n
endif
config BSP_USING_LVGL
bool "Enable LVGL for LCD"
select PKG_USING_LVGL
select PKG_USING_LV_MUSIC_DEMO
default n
if BSP_USING_LVGL
config BSP_LCD_WIDTH
int "LCD width"
default 800
config BSP_LCD_HEIGHT
int "LCD height"
default 480
endif

6
bsp/simulator/drivers/SConscript
View File

@ -1,4 +1,5 @@
import sys
import os
from building import *
cwd = GetCurrentDir()
@ -34,4 +35,9 @@ if sys.platform[0:5]=="linux": #check whether under linux
group = DefineGroup('Drivers', src, depend = [''],
CPPPATH = CPPPATH, LIBS=LIBS, LIBPATH=LIBPATH, CPPDEFINES = CPPDEFINES)
list = os.listdir(cwd)
for item in list:
if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
group = group + SConscript(os.path.join(item, 'SConscript'))
Return('group')

17
bsp/simulator/drivers/lvgl/SConscript Normal file
View File

@ -0,0 +1,17 @@
from building import *
import os
cwd = GetCurrentDir()
group = []
src = Glob('*.c')
CPPPATH = [cwd]
list = os.listdir(cwd)
for d in list:
path = os.path.join(cwd, d)
if os.path.isfile(os.path.join(path, 'SConscript')):
group = group + SConscript(os.path.join(d, 'SConscript'))
group += DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
Return('group')

30
bsp/simulator/drivers/lvgl/lv_conf.h Normal file
View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2021-10-18 Meco Man First version
*/
#ifndef LV_CONF_H
#define LV_CONF_H
#define LV_USE_PERF_MONITOR 1
#define LV_COLOR_DEPTH 32
# define USE_WIN32DRV 1
# define WIN32DRV_MONITOR_ZOOM 1
/* music player demo */
#include <rtconfig.h>
#define LV_DISP_DEF_REFR_PERIOD 10
#define LV_HOR_RES_MAX BSP_LCD_WIDTH
#define LV_VER_RES_MAX BSP_LCD_HEIGHT
#define LV_USE_DEMO_RTT_MUSIC 1
#define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1
#define LV_FONT_MONTSERRAT_12 1
#define LV_FONT_MONTSERRAT_16 1
#endif

62
bsp/simulator/drivers/lvgl/lv_demo.c Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2021-10-17 Meco Man First version
*/
#include <rtthread.h>
#define DBG_TAG "LVGL.demo"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#include <lvgl.h>
#include <win32drv.h>
#ifndef LV_THREAD_STACK_SIZE
#define LV_THREAD_STACK_SIZE 4096
#endif
#ifndef LV_THREAD_PRIO
#define LV_THREAD_PRIO (RT_THREAD_PRIORITY_MAX*2/3)
#endif
static void lvgl_thread(void *parameter)
{
/* initialize win32 driver; don't put this in lv_port_disp() */
if (!lv_win32_init(GetModuleHandleW(NULL), SW_SHOW, BSP_LCD_WIDTH, BSP_LCD_HEIGHT, NULL))
{
LOG_E("lv_win32_init failure!");
return;
}
lv_win32_add_all_input_devices_to_group(NULL);
/* display demo; you may replace with your LVGL application at here */
extern void lv_demo_music(void);
lv_demo_music();
/* handle the tasks of LVGL */
while (!lv_win32_quit_signal)
{
lv_task_handler();
rt_thread_mdelay(1);
}
LOG_W("LVGL simulator window closed!");
}
static int lvgl_demo_init(void)
{
rt_thread_t tid;
tid = rt_thread_create("LVGL", lvgl_thread, RT_NULL, LV_THREAD_STACK_SIZE, LV_THREAD_PRIO, 10);
if(tid == RT_NULL)
{
LOG_E("Fail to create 'LVGL' thread");
}
rt_thread_startup(tid);
return 0;
}
INIT_APP_EXPORT(lvgl_demo_init);

14
bsp/simulator/drivers/lvgl/lv_port_disp.c Normal file
View File

@ -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_disp_init(void)
{
/* do nothing*/
}

23
bsp/simulator/drivers/lvgl/lv_port_disp.h Normal file
View File

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

14
bsp/simulator/drivers/lvgl/lv_port_indev.c Normal file
View File

@ -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)
{
/* do nothing */
}

23
bsp/simulator/drivers/lvgl/lv_port_indev.h Normal file
View File

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

1007
bsp/simulator/drivers/lvgl/win32drv.c Normal file
View File

File diff suppressed because it is too large Load Diff

67
bsp/simulator/drivers/lvgl/win32drv.h Normal file
View File

@ -0,0 +1,67 @@
/**
* @file win32drv.h
*
*/
#ifndef LV_WIN32DRV_H
#define LV_WIN32DRV_H
/*********************
* INCLUDES
*********************/
#include <lvgl.h>
#if USE_WIN32DRV
#include <Windows.h>
#if _MSC_VER >= 1200
// Disable compilation warnings.
#pragma warning(push)
// nonstandard extension used : bit field types other than int
#pragma warning(disable:4214)
// 'conversion' conversion from 'type1' to 'type2', possible loss of data
#pragma warning(disable:4244)
#endif
#if _MSC_VER >= 1200
// Restore compilation warnings.
#pragma warning(pop)
#endif
/*********************
* DEFINES
*********************/
/**********************
* TYPEDEFS
**********************/
/**********************
* GLOBAL PROTOTYPES
**********************/
EXTERN_C bool lv_win32_quit_signal;
EXTERN_C lv_indev_t* lv_win32_pointer_device_object;
EXTERN_C lv_indev_t* lv_win32_keypad_device_object;
EXTERN_C lv_indev_t* lv_win32_encoder_device_object;
EXTERN_C void lv_win32_add_all_input_devices_to_group(
lv_group_t* group);
EXTERN_C bool lv_win32_init(
HINSTANCE instance_handle,
int show_window_mode,
lv_coord_t hor_res,
lv_coord_t ver_res,
HICON icon_handle);
/**********************
* MACROS
**********************/
#endif /*USE_WIN32DRV*/
#endif /*LV_WIN32DRV_H*/

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}};
lv_indev_set_button_points(button_indev, points_array);
/* display demo; you may replace with your LVGL application at here */
lv_demo_calendar();
/* handle the tasks of LVGL */
while(1)
{
lv_task_handler();