github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(config): fix the style issue in lv_conf_template.h (#3469)

Browse Source 
* chore(config): fix the style issue in lv_conf_template.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* chore(format): don't exclude lv_conf_internal.h from code-format.cfg

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-07-11 20:06:31 +08:00
committed by GitHub
parent 5923494b79
commit 0e367d0a76
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lv_conf_template.h
View File

@@ -726,7 +726,7 @@
/*Show some widget. It might be required to increase `LV_MEM_SIZE` */ /*Show some widget. It might be required to increase `LV_MEM_SIZE` */
#define LV_USE_DEMO_WIDGETS 0 #define LV_USE_DEMO_WIDGETS 0
#if LV_USE_DEMO_WIDGETS #if LV_USE_DEMO_WIDGETS
#define LV_DEMO_WIDGETS_SLIDESHOW 0 #define LV_DEMO_WIDGETS_SLIDESHOW 0
#endif #endif
/*Demonstrate the usage of encoder and keyboard*/ /*Demonstrate the usage of encoder and keyboard*/
@@ -735,8 +735,8 @@
/*Benchmark your system*/ /*Benchmark your system*/
#define LV_USE_DEMO_BENCHMARK 0 #define LV_USE_DEMO_BENCHMARK 0
#if LV_USE_DEMO_BENCHMARK #if LV_USE_DEMO_BENCHMARK
/*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ /*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/
#define LV_DEMO_BENCHMARK_RGB565A8 0 #define LV_DEMO_BENCHMARK_RGB565A8 0
#endif #endif
/*Stress test for LVGL*/ /*Stress test for LVGL*/

1
scripts/code-format.cfg
View File

@@ -38,5 +38,4 @@
--exclude=../src/extra/libs/sjpg/tjpgdcnf.h --exclude=../src/extra/libs/sjpg/tjpgdcnf.h
--exclude=../src/misc/lv_style_gen.c --exclude=../src/misc/lv_style_gen.c
--exclude=../src/misc/lv_style_gen.h --exclude=../src/misc/lv_style_gen.h
--exclude=../src/lv_conf_internal.h
--exclude=../tests/src/test_cases/_test_template.c --exclude=../tests/src/test_cases/_test_template.c

10
src/lv_conf_internal.h
View File

@@ -2342,13 +2342,13 @@
#endif #endif
#endif #endif
#if LV_USE_DEMO_WIDGETS #if LV_USE_DEMO_WIDGETS
#ifndef LV_DEMO_WIDGETS_SLIDESHOW #ifndef LV_DEMO_WIDGETS_SLIDESHOW
#ifdef CONFIG_LV_DEMO_WIDGETS_SLIDESHOW #ifdef CONFIG_LV_DEMO_WIDGETS_SLIDESHOW
#define LV_DEMO_WIDGETS_SLIDESHOW CONFIG_LV_DEMO_WIDGETS_SLIDESHOW #define LV_DEMO_WIDGETS_SLIDESHOW CONFIG_LV_DEMO_WIDGETS_SLIDESHOW
#else #else
#define LV_DEMO_WIDGETS_SLIDESHOW 0 #define LV_DEMO_WIDGETS_SLIDESHOW 0
#endif #endif
#endif #endif
#endif #endif
/*Demonstrate the usage of encoder and keyboard*/ /*Demonstrate the usage of encoder and keyboard*/
@@ -2369,14 +2369,14 @@
#endif #endif
#endif #endif
#if LV_USE_DEMO_BENCHMARK #if LV_USE_DEMO_BENCHMARK
/*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ /*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/
#ifndef LV_DEMO_BENCHMARK_RGB565A8 #ifndef LV_DEMO_BENCHMARK_RGB565A8
#ifdef CONFIG_LV_DEMO_BENCHMARK_RGB565A8 #ifdef CONFIG_LV_DEMO_BENCHMARK_RGB565A8
#define LV_DEMO_BENCHMARK_RGB565A8 CONFIG_LV_DEMO_BENCHMARK_RGB565A8 #define LV_DEMO_BENCHMARK_RGB565A8 CONFIG_LV_DEMO_BENCHMARK_RGB565A8
#else #else
#define LV_DEMO_BENCHMARK_RGB565A8 0 #define LV_DEMO_BENCHMARK_RGB565A8 0
#endif #endif
#endif #endif
#endif #endif
/*Stress test for LVGL*/ /*Stress test for LVGL*/