Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-30 15:17:33 +08:00
Code Issues Actions 123 Packages Projects Releases Wiki Activity

fix(conf) mismatched macro judgment (#2843)

Browse Source 
* fix(Kconfig) remove duplicate LV_BUILD_EXAMPLES configuration

* feat(refr) add reset of FPS statistics

* fix(conf) mismatched macro judgment

Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
This commit is contained in:
_VIFEXTech
2021-11-29 18:42:08 +08:00
committed by GitHub
parent ad947d3085
commit 216298d6e9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lv_conf_template.h
+3 -3
View File
@@ -219,16 +219,16 @@
* Others * Others
*-----------*/ *-----------*/
/*1: Show CPU usage and FPS count in the right bottom corner*/ /*1: Show CPU usage and FPS count*/
#define LV_USE_PERF_MONITOR 0 #define LV_USE_PERF_MONITOR 0
#if LV_USE_PERF_MONITOR #if LV_USE_PERF_MONITOR
#define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT #define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
#endif #endif
/*1: Show the used memory and the memory fragmentation in the left bottom corner /*1: Show the used memory and the memory fragmentation
* Requires LV_MEM_CUSTOM = 0*/ * Requires LV_MEM_CUSTOM = 0*/
#define LV_USE_MEM_MONITOR 0 #define LV_USE_MEM_MONITOR 0
#if LV_USE_PERF_MONITOR #if LV_USE_MEM_MONITOR
#define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT #define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
#endif #endif
src/lv_conf_internal.h
+3 -3
View File
@@ -594,7 +594,7 @@
* Others * Others
*-----------*/ *-----------*/
/*1: Show CPU usage and FPS count in the right bottom corner*/ /*1: Show CPU usage and FPS count*/
#ifndef LV_USE_PERF_MONITOR #ifndef LV_USE_PERF_MONITOR
#ifdef CONFIG_LV_USE_PERF_MONITOR #ifdef CONFIG_LV_USE_PERF_MONITOR
#define LV_USE_PERF_MONITOR CONFIG_LV_USE_PERF_MONITOR #define LV_USE_PERF_MONITOR CONFIG_LV_USE_PERF_MONITOR
@@ -612,7 +612,7 @@
#endif #endif
#endif #endif
/*1: Show the used memory and the memory fragmentation in the left bottom corner /*1: Show the used memory and the memory fragmentation
* Requires LV_MEM_CUSTOM = 0*/ * Requires LV_MEM_CUSTOM = 0*/
#ifndef LV_USE_MEM_MONITOR #ifndef LV_USE_MEM_MONITOR
#ifdef CONFIG_LV_USE_MEM_MONITOR #ifdef CONFIG_LV_USE_MEM_MONITOR
@@ -621,7 +621,7 @@
#define LV_USE_MEM_MONITOR 0 #define LV_USE_MEM_MONITOR 0
#endif #endif
#endif #endif
#if LV_USE_PERF_MONITOR #if LV_USE_MEM_MONITOR
#ifndef LV_USE_MEM_MONITOR_POS #ifndef LV_USE_MEM_MONITOR_POS
#ifdef CONFIG_LV_USE_MEM_MONITOR_POS #ifdef CONFIG_LV_USE_MEM_MONITOR_POS
#define LV_USE_MEM_MONITOR_POS CONFIG_LV_USE_MEM_MONITOR_POS #define LV_USE_MEM_MONITOR_POS CONFIG_LV_USE_MEM_MONITOR_POS