From 6e36f71f57d72c227b0d3d7d067f985dd8d87a1f Mon Sep 17 00:00:00 2001
From: lhdjply <lhdjply@126.com>
Date: Mon, 27 Nov 2023 14:28:29 +0800
Subject: [PATCH] chore(rt-thread): env adapts to the latest functions in v9
 (#4863)

Signed-off-by: lhdjply <lhdjply@126.com>
---
 env_support/rt-thread/lv_rt_thread_conf.h | 47 +++++++++--------------
 env_support/rt-thread/lv_rt_thread_port.c | 14 +++++--
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/env_support/rt-thread/lv_rt_thread_conf.h b/env_support/rt-thread/lv_rt_thread_conf.h
index cfec7b997..7bd08c6e4 100644
--- a/env_support/rt-thread/lv_rt_thread_conf.h
+++ b/env_support/rt-thread/lv_rt_thread_conf.h
@@ -13,32 +13,30 @@
 
 #ifdef __RTTHREAD__
 
+#include <lvgl.h>
+
 #define LV_RTTHREAD_INCLUDE <rtthread.h>
 #include LV_RTTHREAD_INCLUDE
 
 /*=========================
-   MEMORY SETTINGS
+   STDLIB WRAPPER SETTINGS
  *=========================*/
 
 #ifdef RT_USING_HEAP
-#  define LV_MEM_CUSTOM 1
-#  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
+    #define LV_USE_STDLIB_MALLOC    LV_STDLIB_RTTHREAD
 #endif
 
-/*====================
-   HAL SETTINGS
- *====================*/
+#define LV_USE_STDLIB_STRING    LV_STDLIB_RTTHREAD
 
-#define LV_TICK_CUSTOM 1
-#define LV_TICK_CUSTOM_INCLUDE LV_RTTHREAD_INCLUDE
-#define LV_TICK_CUSTOM_SYS_TIME_EXPR (rt_tick_get_millisecond())    /*Expression evaluating to current system time in ms*/
+#if LV_USE_FLOAT == 0
+    #define LV_USE_STDLIB_SPRINTF   LV_STDLIB_RTTHREAD
+#endif
 
-/*=======================
- * FEATURE CONFIGURATION
- *=======================*/
+/*=================
+ * OPERATING SYSTEM
+ *=================*/
+
+#define LV_USE_OS   LV_OS_RTTHREAD
 
 /*-------------
  * Asserts
@@ -47,29 +45,20 @@
 #define LV_ASSERT_HANDLER_INCLUDE LV_RTTHREAD_INCLUDE
 #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
  *====================*/
 
 #ifdef ARCH_CPU_BIG_ENDIAN
-#  define LV_BIG_ENDIAN_SYSTEM 1
+    #define LV_BIG_ENDIAN_SYSTEM 1
 #else
-#  define LV_BIG_ENDIAN_SYSTEM 0
+    #define LV_BIG_ENDIAN_SYSTEM 0
 #endif
 
 #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
-#  define LV_ATTRIBUTE_MEM_ALIGN ALIGN(RT_ALIGN_SIZE)
+    #define LV_ATTRIBUTE_MEM_ALIGN ALIGN(RT_ALIGN_SIZE)
 #endif
 
 /*==================
@@ -77,7 +66,7 @@
 *==================*/
 
 #ifdef PKG_LVGL_USING_EXAMPLES
-#  define LV_BUILD_EXAMPLES 1
+    #define LV_BUILD_EXAMPLES 1
 #endif
 
 /*--END OF LV_RT_THREAD_CONF_H--*/
diff --git a/env_support/rt-thread/lv_rt_thread_port.c b/env_support/rt-thread/lv_rt_thread_port.c
index 98d11a4ec..4e49344ab 100644
--- a/env_support/rt-thread/lv_rt_thread_port.c
+++ b/env_support/rt-thread/lv_rt_thread_port.c
@@ -19,13 +19,17 @@
 #include <rtdbg.h>
 
 #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 */
 
 #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 */
 
+#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_indev_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;
 
 #ifdef rt_align
-rt_align(RT_ALIGN_SIZE)
+    rt_align(RT_ALIGN_SIZE)
 #else
-ALIGN(RT_ALIGN_SIZE)
+    ALIGN(RT_ALIGN_SIZE)
 #endif
 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_user_gui_init();
 
+    lv_tick_set_cb(&rt_tick_get_millisecond);
+
     /* handle the tasks of LVGL */
     while(1)
     {