github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

47
env_support/rt-thread/lv_rt_thread_conf.h
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,29 +45,20 @@
#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
*====================*/ *====================*/
#ifdef ARCH_CPU_BIG_ENDIAN #ifdef ARCH_CPU_BIG_ENDIAN
# define LV_BIG_ENDIAN_SYSTEM 1 #define LV_BIG_ENDIAN_SYSTEM 1
#else #else
# define LV_BIG_ENDIAN_SYSTEM 0 #define LV_BIG_ENDIAN_SYSTEM 0
#endif #endif
#ifdef rt_align /* >= RT-Thread v5.0.0 */ #ifdef rt_align /* >= RT-Thread v5.0.0 */
# define LV_ATTRIBUTE_MEM_ALIGN rt_align(RT_ALIGN_SIZE) #define LV_ATTRIBUTE_MEM_ALIGN rt_align(RT_ALIGN_SIZE)
#else #else
# define LV_ATTRIBUTE_MEM_ALIGN ALIGN(RT_ALIGN_SIZE) #define LV_ATTRIBUTE_MEM_ALIGN ALIGN(RT_ALIGN_SIZE)
#endif #endif
/*================== /*==================
@@ -77,7 +66,7 @@
*==================*/ *==================*/
#ifdef PKG_LVGL_USING_EXAMPLES #ifdef PKG_LVGL_USING_EXAMPLES
# define LV_BUILD_EXAMPLES 1 #define LV_BUILD_EXAMPLES 1
#endif #endif
/*--END OF LV_RT_THREAD_CONF_H--*/ /*--END OF LV_RT_THREAD_CONF_H--*/

14
env_support/rt-thread/lv_rt_thread_port.c
View File

@@ -19,13 +19,17 @@
#include <rtdbg.h> #include <rtdbg.h>
#ifndef PKG_LVGL_THREAD_STACK_SIZE #ifndef PKG_LVGL_THREAD_STACK_SIZE
#define PKG_LVGL_THREAD_STACK_SIZE 4096 #define PKG_LVGL_THREAD_STACK_SIZE 4096
#endif /* PKG_LVGL_THREAD_STACK_SIZE */ #endif /* PKG_LVGL_THREAD_STACK_SIZE */
#ifndef PKG_LVGL_THREAD_PRIO #ifndef PKG_LVGL_THREAD_PRIO
#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);
@@ -33,9 +37,9 @@ extern void lv_user_gui_init(void);
static struct rt_thread lvgl_thread; static struct rt_thread lvgl_thread;
#ifdef rt_align #ifdef rt_align
rt_align(RT_ALIGN_SIZE) rt_align(RT_ALIGN_SIZE)
#else #else
ALIGN(RT_ALIGN_SIZE) ALIGN(RT_ALIGN_SIZE)
#endif #endif
static rt_uint8_t lvgl_thread_stack[PKG_LVGL_THREAD_STACK_SIZE]; static rt_uint8_t lvgl_thread_stack[PKG_LVGL_THREAD_STACK_SIZE];
@@ -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)
{ {