diff --git a/lv_conf_template.h b/lv_conf_template.h index 3bb880070..3392da779 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -160,8 +160,8 @@ #define LV_DITHER_GRADIENT 0 #if LV_DITHER_GRADIENT /*Add support for error diffusion dithering. - *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing. - *The increase in memory consumption is (24 bits * object's width)*/ + *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing. + *The increase in memory consumption is (24 bits * object's width)*/ #define LV_DITHER_ERROR_DIFFUSION 0 #endif @@ -726,7 +726,7 @@ /*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 + #define LV_DEMO_WIDGETS_SLIDESHOW 0 #endif /*Demonstrate the usage of encoder and keyboard*/ @@ -735,8 +735,8 @@ /*Benchmark your system*/ #define LV_USE_DEMO_BENCHMARK 0 #if LV_USE_DEMO_BENCHMARK -/*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ -#define LV_DEMO_BENCHMARK_RGB565A8 0 + /*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ + #define LV_DEMO_BENCHMARK_RGB565A8 0 #endif /*Stress test for LVGL*/ diff --git a/scripts/code-format.cfg b/scripts/code-format.cfg index 159ef46c8..4b03b8090 100644 --- a/scripts/code-format.cfg +++ b/scripts/code-format.cfg @@ -38,5 +38,4 @@ --exclude=../src/extra/libs/sjpg/tjpgdcnf.h --exclude=../src/misc/lv_style_gen.c --exclude=../src/misc/lv_style_gen.h ---exclude=../src/lv_conf_internal.h --exclude=../tests/src/test_cases/_test_template.c diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 97807fe37..110bb6319 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -388,8 +388,8 @@ #endif #if LV_DITHER_GRADIENT /*Add support for error diffusion dithering. - *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing. - *The increase in memory consumption is (24 bits * object's width)*/ + *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing. + *The increase in memory consumption is (24 bits * object's width)*/ #ifndef LV_DITHER_ERROR_DIFFUSION #ifdef CONFIG_LV_DITHER_ERROR_DIFFUSION #define LV_DITHER_ERROR_DIFFUSION CONFIG_LV_DITHER_ERROR_DIFFUSION @@ -2342,14 +2342,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 + #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 -#endif /*Demonstrate the usage of encoder and keyboard*/ #ifndef LV_USE_DEMO_KEYPAD_AND_ENCODER @@ -2369,15 +2369,15 @@ #endif #endif #if LV_USE_DEMO_BENCHMARK -/*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ -#ifndef LV_DEMO_BENCHMARK_RGB565A8 - #ifdef CONFIG_LV_DEMO_BENCHMARK_RGB565A8 - #define LV_DEMO_BENCHMARK_RGB565A8 CONFIG_LV_DEMO_BENCHMARK_RGB565A8 - #else - #define LV_DEMO_BENCHMARK_RGB565A8 0 + /*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ + #ifndef LV_DEMO_BENCHMARK_RGB565A8 + #ifdef CONFIG_LV_DEMO_BENCHMARK_RGB565A8 + #define LV_DEMO_BENCHMARK_RGB565A8 CONFIG_LV_DEMO_BENCHMARK_RGB565A8 + #else + #define LV_DEMO_BENCHMARK_RGB565A8 0 + #endif #endif #endif -#endif /*Stress test for LVGL*/ #ifndef LV_USE_DEMO_STRESS