From da9e53c2f44f9af44d473059e48bf7d6ddd3cafc Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Thu, 5 May 2022 02:59:55 +0800
Subject: [PATCH] fix(config): fix typo in LV_USE_PERF_MONITOR and
 LV_USE_MEM_MONITOR (#3313)

and order macro in lv_conf_kconfig.h as Kconfig and lv_conf_template.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 Kconfig               |  4 +-
 src/lv_conf_kconfig.h | 88 +++++++++++++++++++++----------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Kconfig b/Kconfig
index a39144309f..2c6bea4bdf 100644
--- a/Kconfig
+++ b/Kconfig
@@ -390,7 +390,7 @@ menu "LVGL configuration"
                     bool "Left middle"
                 config LV_PERF_MONITOR_ALIGN_RIGHT_MID
                     bool "Right middle"
-                config LV_PERF_MONITOR_ALIGN_BOTTOM_CENTER
+                config LV_PERF_MONITOR_ALIGN_CENTER
                     bool "Center"
             endchoice
 
@@ -419,7 +419,7 @@ menu "LVGL configuration"
                     bool "Left middle"
                 config LV_MEM_MONITOR_ALIGN_RIGHT_MID
                     bool "Right middle"
-                config LV_MEM_MONITOR_ALIGN_BOTTOM_CENTER
+                config LV_MEM_MONITOR_ALIGN_CENTER
                     bool "Center"
             endchoice
 
diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h
index 7424789eb1..7742fe77bf 100644
--- a/src/lv_conf_kconfig.h
+++ b/src/lv_conf_kconfig.h
@@ -41,6 +41,50 @@ extern "C" {
 #  define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_KILOBYTES * 1024U)
 #endif
 
+/*------------------
+ * MONITOR POSITION
+ *-----------------*/
+
+#ifdef CONFIG_LV_PERF_MONITOR_ALIGN_TOP_LEFT
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_TOP_LEFT
+#elif defined(CONFIG_LV_USE_PERF_MONITOR_ALIGN_TOP_MID)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_TOP_MID
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_TOP_RIGHT)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_TOP_RIGHT
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_BOTTOM_LEFT)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_BOTTOM_MID)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_MID
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_LEFT_MID)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_LEFT_MID
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_RIGHT_MID)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_RIGHT_MID
+#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_CENTER)
+#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_CENTER
+#endif
+
+#ifdef CONFIG_LV_MEM_MONITOR_ALIGN_TOP_LEFT
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_TOP_LEFT
+#elif defined(CONFIG_LV_USE_MEM_MONITOR_ALIGN_TOP_MID)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_TOP_MID
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_TOP_RIGHT)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_TOP_RIGHT
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_BOTTOM_MID)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_MID
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_BOTTOM_RIGHT)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_LEFT_MID)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_LEFT_MID
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_RIGHT_MID)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_RIGHT_MID
+#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_CENTER)
+#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_CENTER
+#endif
+
 /********************
  * FONT SELECTION
  *******************/
@@ -131,50 +175,6 @@ extern "C" {
 #  define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO
 #endif
 
-/*------------------
- * MONITOR POSITION
- *-----------------*/
-
-#ifdef CONFIG_LV_PERF_MONITOR_ALIGN_TOP_LEFT
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_TOP_LEFT
-#elif defined(CONFIG_LV_USE_PERF_MONITOR_ALIGN_TOP_MID)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_TOP_MID
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_TOP_RIGHT)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_TOP_RIGHT
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_BOTTOM_LEFT)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_BOTTOM_MID)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_MID
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_LEFT_MID)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_LEFT_MID
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_RIGHT_MID)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_RIGHT_MID
-#elif defined(CONFIG_LV_PERF_MONITOR_ALIGN_CENTER)
-#  define CONFIG_LV_USE_PERF_MONITOR_POS LV_ALIGN_CENTER
-#endif
-
-#ifdef CONFIG_LV_MEM_MONITOR_ALIGN_TOP_LEFT
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_TOP_LEFT
-#elif defined(CONFIG_LV_USE_MEM_MONITOR_ALIGN_TOP_MID)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_TOP_MID
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_TOP_RIGHT)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_TOP_RIGHT
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_BOTTOM_MID)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_MID
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_BOTTOM_RIGHT)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_LEFT_MID)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_LEFT_MID
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_RIGHT_MID)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_RIGHT_MID
-#elif defined(CONFIG_LV_MEM_MONITOR_ALIGN_CENTER)
-#  define CONFIG_LV_USE_MEM_MONITOR_POS LV_ALIGN_CENTER
-#endif
-
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif