From 48ee005d4d01e8dae7a9c41487253557c6d8b474 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Thu, 25 Aug 2022 21:32:08 +0200 Subject: [PATCH] fix(format): fix lv_conf_internal.h formatting by pre-commit hook fixes #3585 --- .pre-commit-config.yaml | 7 ++++++- src/lv_conf_internal.h | 36 +++++++++++++----------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7c9b2bfd8..612bbf922 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,4 +24,9 @@ repos: src/ | tests/ ) - types_or: ["c", "header"] \ No newline at end of file + exclude: | + (?x)^( + src/extra/libs/ | + src/lv_conf_internal.h + ) + types_or: ["c", "header"] diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index d6e8c7650..0065d7afc 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -309,7 +309,7 @@ #if LV_USE_DRAW_SW /*Enable complex draw engine. - *Required to draw shadow, gradient, rounded corners, circles, arc, skew lines, image transformations or any masks*/ + *Required to draw shadow, gradient, rounded corners, circles, arc, skew lines, image transformations or any masks*/ #ifndef LV_DRAW_SW_COMPLEX #ifdef _LV_KCONFIG_PRESENT #ifdef CONFIG_LV_DRAW_SW_COMPLEX @@ -323,9 +323,9 @@ #endif /* If a widget has `style_opa < 255` (not `bg_opa`, `text_opa` etc) or not NORMAL blend mode - * it is buffered into a "simple" layer before rendering. The widget can be buffered in smaller chunks. - * "Transformed layers" (if `transform_angle/zoom` are set) use larger buffers - * and can't be drawn in chunks. */ + * it is buffered into a "simple" layer before rendering. The widget can be buffered in smaller chunks. + * "Transformed layers" (if `transform_angle/zoom` are set) use larger buffers + * and can't be drawn in chunks. */ /*The target buffer size for simple layer chunks.*/ #ifndef LV_DRAW_SW_LAYER_SIMPLE_BUF_SIZE @@ -369,10 +369,10 @@ #endif /*Default gradient buffer size. - *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again. - *LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE sets the size of this cache in bytes. - *If the cache is too small the map will be allocated only while it's required for the drawing. - *0 mean no caching.*/ + *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again. + *LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE sets the size of this cache in bytes. + *If the cache is too small the map will be allocated only while it's required for the drawing. + *0 mean no caching.*/ #ifndef LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE #ifdef CONFIG_LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE #define LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE CONFIG_LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE @@ -382,8 +382,8 @@ #endif /*Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display) - *LV_DRAW_SW_GRADIENT_DITHER implies allocating one or two more lines of the object's rendering surface - *The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */ + *LV_DRAW_SW_GRADIENT_DITHER implies allocating one or two more lines of the object's rendering surface + *The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */ #ifndef LV_DRAW_SW_GRADIENT_DITHER #ifdef CONFIG_LV_DRAW_SW_GRADIENT_DITHER #define LV_DRAW_SW_GRADIENT_DITHER CONFIG_LV_DRAW_SW_GRADIENT_DITHER @@ -393,8 +393,8 @@ #endif #if LV_DRAW_SW_GRADIENT_DITHER /*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_DRAW_SW_GRADIENT_DITHER_ERROR_DIFFUSION #ifdef CONFIG_LV_DRAW_SW_GRADIENT_DITHER_ERROR_DIFFUSION #define LV_DRAW_SW_GRADIENT_DITHER_ERROR_DIFFUSION CONFIG_LV_DRAW_SW_GRADIENT_DITHER_ERROR_DIFFUSION @@ -585,7 +585,7 @@ #endif /*1: Enable print timestamp; - *0: Disable print timestamp*/ + *0: Disable print timestamp*/ #ifndef LV_LOG_USE_TIMESTAMP #ifdef _LV_KCONFIG_PRESENT #ifdef CONFIG_LV_LOG_USE_TIMESTAMP @@ -2269,16 +2269,6 @@ #endif #endif -/*1: Enable a database where values can be stored in a global place. - * Requires: lv_msg */ -#ifndef LV_USE_DB - #ifdef CONFIG_LV_USE_DB - #define LV_USE_DB CONFIG_LV_USE_DB - #else - #define LV_USE_DB 0 - #endif -#endif - /*1: Enable Pinyin input method*/ /*Requires: lv_keyboard*/ #ifndef LV_USE_IME_PINYIN