From 40e9c6b9e0a9f6a125bca3d45d301619e6230fbb Mon Sep 17 00:00:00 2001
From: "Man, Jianting (Meco)" <920369182@qq.com>
Date: Thu, 12 May 2022 03:35:28 -0400
Subject: [PATCH] chore(rt.thread): improve rt-thread marcos (#3355)

---
 env_support/rt-thread/SConscript          |  4 ++--
 env_support/rt-thread/lv_rt_thread_conf.h | 12 +-----------
 env_support/rt-thread/lv_rt_thread_port.c | 16 ++++++++--------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/env_support/rt-thread/SConscript b/env_support/rt-thread/SConscript
index defae78ff..378c36f3b 100644
--- a/env_support/rt-thread/SConscript
+++ b/env_support/rt-thread/SConscript
@@ -32,7 +32,7 @@ for root, dirs, files in os.walk(lvgl_src_cwd):
             inc = inc + [current_path]
 
 
-if GetDepend('PKG_USING_LVGL_EXAMPLES'):
+if GetDepend('PKG_LVGL_USING_EXAMPLES'):
     lvgl_src_cwd = lvgl_cwd + 'examples/'
     inc = inc + [lvgl_src_cwd]
     for root, dirs, files in os.walk(lvgl_src_cwd):
@@ -42,7 +42,7 @@ if GetDepend('PKG_USING_LVGL_EXAMPLES'):
             if check_h_hpp_exsit(current_path):
                 inc = inc + [current_path]
 
-if GetDepend('PKG_USING_LVGL_DEMOS'):
+if GetDepend('PKG_LVGL_USING_DEMOS'):
     lvgl_src_cwd = lvgl_cwd + 'demos/'
     inc = inc + [lvgl_src_cwd]
     for root, dirs, files in os.walk(lvgl_src_cwd):
diff --git a/env_support/rt-thread/lv_rt_thread_conf.h b/env_support/rt-thread/lv_rt_thread_conf.h
index d18bfb479..4cdf476fa 100644
--- a/env_support/rt-thread/lv_rt_thread_conf.h
+++ b/env_support/rt-thread/lv_rt_thread_conf.h
@@ -40,16 +40,6 @@
  * FEATURE CONFIGURATION
  *=======================*/
 
-/*-------------
- * Logging
- *-----------*/
-
-#ifdef PKG_LVGL_ENABLE_LOG
-#  define LV_USE_LOG 1
-#else
-#  define LV_USE_LOG 0
-#endif
-
 /*-------------
  * Asserts
  *-----------*/
@@ -83,7 +73,7 @@
 * EXAMPLES
 *==================*/
 
-#ifdef PKG_USING_LVGL_EXAMPLES
+#ifdef PKG_LVGL_USING_EXAMPLES
 #  define LV_BUILD_EXAMPLES 1
 #endif
 
diff --git a/env_support/rt-thread/lv_rt_thread_port.c b/env_support/rt-thread/lv_rt_thread_port.c
index 60218c34a..16b6ed10f 100644
--- a/env_support/rt-thread/lv_rt_thread_port.c
+++ b/env_support/rt-thread/lv_rt_thread_port.c
@@ -18,20 +18,20 @@
 #define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
 
-#ifndef LVGL_THREAD_STACK_SIZE
-#define LVGL_THREAD_STACK_SIZE 4096
-#endif /* LVGL_THREAD_STACK_SIZE */
+#ifndef PKG_LVGL_THREAD_STACK_SIZE
+#define PKG_LVGL_THREAD_STACK_SIZE 4096
+#endif /* PKG_LVGL_THREAD_STACK_SIZE */
 
-#ifndef LVGL_THREAD_PRIO
-#define LVGL_THREAD_PRIO (RT_THREAD_PRIORITY_MAX*2/3)
-#endif /* LVGL_THREAD_PRIO */
+#ifndef PKG_LVGL_THREAD_PRIO
+#define PKG_LVGL_THREAD_PRIO (RT_THREAD_PRIORITY_MAX*2/3)
+#endif /* PKG_LVGL_THREAD_PRIO */
 
 extern void lv_port_disp_init(void);
 extern void lv_port_indev_init(void);
 extern void lv_user_gui_init(void);
 
 static struct rt_thread lvgl_thread;
-static rt_uint8_t lvgl_thread_stack[LVGL_THREAD_STACK_SIZE];
+static rt_uint8_t lvgl_thread_stack[PKG_LVGL_THREAD_STACK_SIZE];
 
 #if LV_USE_LOG
 static void lv_rt_log(const char *buf)
@@ -63,7 +63,7 @@ static int lvgl_thread_init(void)
     rt_err_t err;
 
     err = rt_thread_init(&lvgl_thread, "LVGL", lvgl_thread_entry, RT_NULL,
-           &lvgl_thread_stack[0], sizeof(lvgl_thread_stack), LVGL_THREAD_PRIO, 0);
+           &lvgl_thread_stack[0], sizeof(lvgl_thread_stack), PKG_LVGL_THREAD_PRIO, 0);
     if(err != RT_EOK)
     {
         LOG_E("Failed to create LVGL thread");