fix(conf): mode LV_USE_SYSMON and LV_USE_PEFRF/MEM_MONITOR closer (#5314)

2024-01-15 13:50:01 +01:00
parent b1d1498790
commit c7bece7d98
6 changed files with 157 additions and 159 deletions
--- a/128
+++ b/128
@@ -493,70 +493,6 @@ menu "LVGL configuration"
 				bool "Use float as lv_value_precise_t."
 				default n

-			config LV_USE_PERF_MONITOR
-				bool "Show CPU usage and FPS count."
-				depends on LV_USE_SYSMON
-
-			choice
-				prompt "Performance monitor position."
-				depends on LV_USE_PERF_MONITOR
-				default LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT
-
-				config LV_PERF_MONITOR_ALIGN_TOP_LEFT
-					bool "Top left"
-				config LV_PERF_MONITOR_ALIGN_TOP_MID
-					bool "Top middle"
-				config LV_PERF_MONITOR_ALIGN_TOP_RIGHT
-					bool "Top right"
-				config LV_PERF_MONITOR_ALIGN_BOTTOM_LEFT
-					bool "Bottom left"
-				config LV_PERF_MONITOR_ALIGN_BOTTOM_MID
-					bool "Bottom middle"
-				config LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT
-					bool "Bottom right"
-				config LV_PERF_MONITOR_ALIGN_LEFT_MID
-					bool "Left middle"
-				config LV_PERF_MONITOR_ALIGN_RIGHT_MID
-					bool "Right middle"
-				config LV_PERF_MONITOR_ALIGN_CENTER
-					bool "Center"
-			endchoice
-
-			config LV_USE_PERF_MONITOR_LOG_MODE
-				bool "Prints performance data using log"
-				depends on LV_USE_PERF_MONITOR
-				default n
-
-			config LV_USE_MEM_MONITOR
-				bool "Show the used memory and the memory fragmentation."
-				depends on !LV_MEM_CUSTOM
-				depends on LV_USE_SYSMON
-
-			choice
-				prompt "Memory monitor position."
-				depends on LV_USE_MEM_MONITOR
-				default LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT
-
-				config LV_MEM_MONITOR_ALIGN_TOP_LEFT
-					bool "Top left"
-				config LV_MEM_MONITOR_ALIGN_TOP_MID
-					bool "Top middle"
-				config LV_MEM_MONITOR_ALIGN_TOP_RIGHT
-					bool "Top right"
-				config LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT
-					bool "Bottom left"
-				config LV_MEM_MONITOR_ALIGN_BOTTOM_MID
-					bool "Bottom middle"
-				config LV_MEM_MONITOR_ALIGN_BOTTOM_RIGHT
-					bool "Bottom right"
-				config LV_MEM_MONITOR_ALIGN_LEFT_MID
-					bool "Left middle"
-				config LV_MEM_MONITOR_ALIGN_RIGHT_MID
-					bool "Right middle"
-				config LV_MEM_MONITOR_ALIGN_CENTER
-					bool "Center"
-			endchoice
-
 			config LV_USE_REFR_DEBUG
 				bool "Draw random colored rectangles over the redrawn areas."

@@ -1192,6 +1128,70 @@ menu "LVGL configuration"
 			bool "Enable system monitor component"
 			default n

+		config LV_USE_PERF_MONITOR
+			bool "Show CPU usage and FPS count."
+			depends on LV_USE_SYSMON
+
+		choice
+			prompt "Performance monitor position."
+			depends on LV_USE_PERF_MONITOR
+			default LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT
+
+			config LV_PERF_MONITOR_ALIGN_TOP_LEFT
+				bool "Top left"
+			config LV_PERF_MONITOR_ALIGN_TOP_MID
+				bool "Top middle"
+			config LV_PERF_MONITOR_ALIGN_TOP_RIGHT
+				bool "Top right"
+			config LV_PERF_MONITOR_ALIGN_BOTTOM_LEFT
+				bool "Bottom left"
+			config LV_PERF_MONITOR_ALIGN_BOTTOM_MID
+				bool "Bottom middle"
+			config LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT
+				bool "Bottom right"
+			config LV_PERF_MONITOR_ALIGN_LEFT_MID
+				bool "Left middle"
+			config LV_PERF_MONITOR_ALIGN_RIGHT_MID
+				bool "Right middle"
+			config LV_PERF_MONITOR_ALIGN_CENTER
+				bool "Center"
+		endchoice
+
+		config LV_USE_PERF_MONITOR_LOG_MODE
+			bool "Prints performance data using log"
+			depends on LV_USE_PERF_MONITOR
+			default n
+
+		config LV_USE_MEM_MONITOR
+			bool "Show the used memory and the memory fragmentation."
+			depends on !LV_MEM_CUSTOM
+			depends on LV_USE_SYSMON
+
+		choice
+			prompt "Memory monitor position."
+			depends on LV_USE_MEM_MONITOR
+			default LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT
+
+			config LV_MEM_MONITOR_ALIGN_TOP_LEFT
+				bool "Top left"
+			config LV_MEM_MONITOR_ALIGN_TOP_MID
+				bool "Top middle"
+			config LV_MEM_MONITOR_ALIGN_TOP_RIGHT
+				bool "Top right"
+			config LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT
+				bool "Bottom left"
+			config LV_MEM_MONITOR_ALIGN_BOTTOM_MID
+				bool "Bottom middle"
+			config LV_MEM_MONITOR_ALIGN_BOTTOM_RIGHT
+				bool "Bottom right"
+			config LV_MEM_MONITOR_ALIGN_LEFT_MID
+				bool "Left middle"
+			config LV_MEM_MONITOR_ALIGN_RIGHT_MID
+				bool "Right middle"
+			config LV_MEM_MONITOR_ALIGN_CENTER
+				bool "Center"
+		endchoice
+
 		config LV_USE_MONKEY
 			bool "Enable Monkey test"
 			default n