chore(rt-thread): env adapts to the latest functions in v9 (#4863)

Signed-off-by: lhdjply <lhdjply@126.com>
This commit is contained in:
lhdjply
2023-11-27 14:28:29 +08:00
committed by GitHub
parent 5c11abc859
commit 6e36f71f57
2 changed files with 28 additions and 33 deletions

View File

@@ -13,32 +13,30 @@
#ifdef __RTTHREAD__ #ifdef __RTTHREAD__
#include <lvgl.h>
#define LV_RTTHREAD_INCLUDE <rtthread.h> #define LV_RTTHREAD_INCLUDE <rtthread.h>
#include LV_RTTHREAD_INCLUDE #include LV_RTTHREAD_INCLUDE
/*========================= /*=========================
MEMORY SETTINGS STDLIB WRAPPER SETTINGS
*=========================*/ *=========================*/
#ifdef RT_USING_HEAP #ifdef RT_USING_HEAP
# define LV_MEM_CUSTOM 1 #define LV_USE_STDLIB_MALLOC LV_STDLIB_RTTHREAD
# define LV_MEM_CUSTOM_INCLUDE LV_RTTHREAD_INCLUDE
# define LV_MEM_CUSTOM_ALLOC rt_malloc
# define LV_MEM_CUSTOM_FREE rt_free
# define LV_MEM_CUSTOM_REALLOC rt_realloc
#endif #endif
/*==================== #define LV_USE_STDLIB_STRING LV_STDLIB_RTTHREAD
HAL SETTINGS
*====================*/
#define LV_TICK_CUSTOM 1 #if LV_USE_FLOAT == 0
#define LV_TICK_CUSTOM_INCLUDE LV_RTTHREAD_INCLUDE #define LV_USE_STDLIB_SPRINTF LV_STDLIB_RTTHREAD
#define LV_TICK_CUSTOM_SYS_TIME_EXPR (rt_tick_get_millisecond()) /*Expression evaluating to current system time in ms*/ #endif
/*======================= /*=================
* FEATURE CONFIGURATION * OPERATING SYSTEM
*=======================*/ *=================*/
#define LV_USE_OS LV_OS_RTTHREAD
/*------------- /*-------------
* Asserts * Asserts
@@ -47,15 +45,6 @@
#define LV_ASSERT_HANDLER_INCLUDE LV_RTTHREAD_INCLUDE #define LV_ASSERT_HANDLER_INCLUDE LV_RTTHREAD_INCLUDE
#define LV_ASSERT_HANDLER RT_ASSERT(0); #define LV_ASSERT_HANDLER RT_ASSERT(0);
/*-------------
* Others
*-----------*/
#define LV_SPRINTF_CUSTOM 1
#define LV_SPRINTF_INCLUDE LV_RTTHREAD_INCLUDE
#define LV_SNPRINTF rt_snprintf
#define LV_VSNPRINTF rt_vsnprintf
/*===================== /*=====================
* COMPILER SETTINGS * COMPILER SETTINGS
*====================*/ *====================*/

View File

@@ -26,6 +26,10 @@
#define PKG_LVGL_THREAD_PRIO (RT_THREAD_PRIORITY_MAX*2/3) #define PKG_LVGL_THREAD_PRIO (RT_THREAD_PRIORITY_MAX*2/3)
#endif /* PKG_LVGL_THREAD_PRIO */ #endif /* PKG_LVGL_THREAD_PRIO */
#ifndef PKG_LVGL_DISP_REFR_PERIOD
#define PKG_LVGL_DISP_REFR_PERIOD 33
#endif /* PKG_LVGL_DISP_REFR_PERIOD */
extern void lv_port_disp_init(void); extern void lv_port_disp_init(void);
extern void lv_port_indev_init(void); extern void lv_port_indev_init(void);
extern void lv_user_gui_init(void); extern void lv_user_gui_init(void);
@@ -56,6 +60,8 @@ static void lvgl_thread_entry(void *parameter)
lv_port_indev_init(); lv_port_indev_init();
lv_user_gui_init(); lv_user_gui_init();
lv_tick_set_cb(&rt_tick_get_millisecond);
/* handle the tasks of LVGL */ /* handle the tasks of LVGL */
while(1) while(1)
{ {