From 86525c35bac6630275515a9688a2fe33a7f54fe6 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sat, 15 Jan 2022 19:57:10 +0100 Subject: [PATCH] chore(lv_conf): add comment about the widgets demo might require more memory --- lv_conf_template.h | 2 +- scripts/code-format.cfg | 1 + src/lv_conf_internal.h | 74 ++++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index 5819d09d4..a11643bce 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -637,7 +637,7 @@ * DEMO USAGE ====================*/ -/*Show some widget*/ +/*Show some widget. It might be required to increase `LV_MEM_SIZE` */ #define LV_USE_DEMO_WIDGETS 0 #if LV_USE_DEMO_WIDGETS #define LV_DEMO_WIDGETS_SLIDESHOW 0 diff --git a/scripts/code-format.cfg b/scripts/code-format.cfg index e6a88fe82..d82d5c1b9 100644 --- a/scripts/code-format.cfg +++ b/scripts/code-format.cfg @@ -32,3 +32,4 @@ --exclude=../src/extra/libs/sjpg/tjpgd.c --exclude=../src/extra/libs/sjpg/tjpgd.h --exclude=../src/extra/libs/sjpg/tjpgdcnf.h +--exclude=../src/lv_conf_internal.h diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 74c77a28a..a3def3c53 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -2032,7 +2032,7 @@ * DEMO USAGE ====================*/ -/*Show some widget*/ +/*Show some widget. It might be required to increase `LV_MEM_SIZE` */ #ifndef LV_USE_DEMO_WIDGETS #ifdef CONFIG_LV_USE_DEMO_WIDGETS #define LV_USE_DEMO_WIDGETS CONFIG_LV_USE_DEMO_WIDGETS @@ -2041,14 +2041,14 @@ #endif #endif #if LV_USE_DEMO_WIDGETS - #ifndef LV_DEMO_WIDGETS_SLIDESHOW - #ifdef CONFIG_LV_DEMO_WIDGETS_SLIDESHOW - #define LV_DEMO_WIDGETS_SLIDESHOW CONFIG_LV_DEMO_WIDGETS_SLIDESHOW - #else - #define LV_DEMO_WIDGETS_SLIDESHOW 0 - #endif +#ifndef LV_DEMO_WIDGETS_SLIDESHOW + #ifdef CONFIG_LV_DEMO_WIDGETS_SLIDESHOW + #define LV_DEMO_WIDGETS_SLIDESHOW CONFIG_LV_DEMO_WIDGETS_SLIDESHOW + #else + #define LV_DEMO_WIDGETS_SLIDESHOW 0 #endif #endif +#endif /*Demonstrate the usage of encoder and keyboard*/ #ifndef LV_USE_DEMO_KEYPAD_AND_ENCODER @@ -2086,42 +2086,42 @@ #endif #endif #if LV_USE_DEMO_MUSIC - #ifndef LV_DEMO_MUSIC_SQUARE - #ifdef CONFIG_LV_DEMO_MUSIC_SQUARE - #define LV_DEMO_MUSIC_SQUARE CONFIG_LV_DEMO_MUSIC_SQUARE - #else - #define LV_DEMO_MUSIC_SQUARE 0 - #endif +#ifndef LV_DEMO_MUSIC_SQUARE + #ifdef CONFIG_LV_DEMO_MUSIC_SQUARE + #define LV_DEMO_MUSIC_SQUARE CONFIG_LV_DEMO_MUSIC_SQUARE + #else + #define LV_DEMO_MUSIC_SQUARE 0 #endif - #ifndef LV_DEMO_MUSIC_LANDSCAPE - #ifdef CONFIG_LV_DEMO_MUSIC_LANDSCAPE - #define LV_DEMO_MUSIC_LANDSCAPE CONFIG_LV_DEMO_MUSIC_LANDSCAPE - #else - #define LV_DEMO_MUSIC_LANDSCAPE 0 - #endif +#endif +#ifndef LV_DEMO_MUSIC_LANDSCAPE + #ifdef CONFIG_LV_DEMO_MUSIC_LANDSCAPE + #define LV_DEMO_MUSIC_LANDSCAPE CONFIG_LV_DEMO_MUSIC_LANDSCAPE + #else + #define LV_DEMO_MUSIC_LANDSCAPE 0 #endif - #ifndef LV_DEMO_MUSIC_ROUND - #ifdef CONFIG_LV_DEMO_MUSIC_ROUND - #define LV_DEMO_MUSIC_ROUND CONFIG_LV_DEMO_MUSIC_ROUND - #else - #define LV_DEMO_MUSIC_ROUND 0 - #endif +#endif +#ifndef LV_DEMO_MUSIC_ROUND + #ifdef CONFIG_LV_DEMO_MUSIC_ROUND + #define LV_DEMO_MUSIC_ROUND CONFIG_LV_DEMO_MUSIC_ROUND + #else + #define LV_DEMO_MUSIC_ROUND 0 #endif - #ifndef LV_DEMO_MUSIC_LARGE - #ifdef CONFIG_LV_DEMO_MUSIC_LARGE - #define LV_DEMO_MUSIC_LARGE CONFIG_LV_DEMO_MUSIC_LARGE - #else - #define LV_DEMO_MUSIC_LARGE 0 - #endif +#endif +#ifndef LV_DEMO_MUSIC_LARGE + #ifdef CONFIG_LV_DEMO_MUSIC_LARGE + #define LV_DEMO_MUSIC_LARGE CONFIG_LV_DEMO_MUSIC_LARGE + #else + #define LV_DEMO_MUSIC_LARGE 0 #endif - #ifndef LV_DEMO_MUSIC_AUTO_PLAY - #ifdef CONFIG_LV_DEMO_MUSIC_AUTO_PLAY - #define LV_DEMO_MUSIC_AUTO_PLAY CONFIG_LV_DEMO_MUSIC_AUTO_PLAY - #else - #define LV_DEMO_MUSIC_AUTO_PLAY 0 - #endif +#endif +#ifndef LV_DEMO_MUSIC_AUTO_PLAY + #ifdef CONFIG_LV_DEMO_MUSIC_AUTO_PLAY + #define LV_DEMO_MUSIC_AUTO_PLAY CONFIG_LV_DEMO_MUSIC_AUTO_PLAY + #else + #define LV_DEMO_MUSIC_AUTO_PLAY 0 #endif #endif +#endif