diff --git a/Kconfig b/Kconfig index b7e2dfcab..e18ff356b 100644 --- a/Kconfig +++ b/Kconfig @@ -48,6 +48,18 @@ menu "LVGL configuration" Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to non LV_OPA_COVER value + config LV_COLOR_MIX_ROUND_OFS + int "Adjust color mix functions rounding" + default 128 if !LV_COLOR_DEPTH_32 + default 0 if LV_COLOR_DEPTH_32 + range 0 254 + help + 0: no adjustment, get the integer part of the result (round down) + 64: round up from x.75 + 128: round up from half + 192: round up from x.25 + 254: round up + config LV_COLOR_CHROMA_KEY_HEX hex "Images pixels with this color will not be drawn (if they are chroma keyed)." range 0x000000 0xFFFFFF diff --git a/lv_conf_template.h b/lv_conf_template.h index 27b0f6545..1ee1722af 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -34,6 +34,10 @@ *Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to non LV_OPA_COVER value*/ #define LV_COLOR_SCREEN_TRANSP 0 +/* Adjust color mix functions rounding. GPUs might calculate color mix (blending) differently. + * 0: round down, 64: round up from x.75, 128: round up from half, 192: round up from x.25, 254: round up */ +#define LV_COLOR_MIX_ROUND_OFS (LV_COLOR_DEPTH == 32 ? 0: 128) + /*Images pixels with this color will not be drawn if they are chroma keyed)*/ #define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /*pure green*/ diff --git a/scripts/lv_conf_internal_gen.py b/scripts/lv_conf_internal_gen.py index eaa6c68da..ddc3a3eb2 100755 --- a/scripts/lv_conf_internal_gen.py +++ b/scripts/lv_conf_internal_gen.py @@ -59,7 +59,7 @@ fout.write( # endif #endif -#ifdef CONFIG_LV_COLOR_DEPTH +#ifdef CONFIG_LV_COLOR_DEPTH # define _LV_KCONFIG_PRESENT #endif @@ -88,44 +88,44 @@ for line in fin.read().splitlines(): name = r[1] name = re.sub('\(.*?\)', '', name, 1) #remove parentheses from macros. E.g. MY_FUNC(5) -> MY_FUNC - name_and_value = re.sub('.*# *define', '', line, 1) - - #If the value should be 1 (enabled) by default use a more complex structure for Kconfig checks because - #if a not defined CONFIG_... value should be interpreted as 0 and not the LVGL default - is_one = re.search(r'.*#.*define +[A-Z0-9_]+ +1[^0-9]*', line) + name_and_value = re.sub('[\s]*#[\s]*define', '', line, 1) + + #If the value should be 1 (enabled) by default use a more complex structure for Kconfig checks because + #if a not defined CONFIG_... value should be interpreted as 0 and not the LVGL default + is_one = re.search(r'[\s]*#[\s]*define[\s]*[A-Z0-9_]+[\s]+1[\s]*$', line) if(is_one): #1. Use the value if already set from lv_conf.h or anything else (i.e. do nothing) #2. In Kconfig environment use the CONFIG_... value if set, else use 0 #3. In not Kconfig environment use the LVGL's default value - + fout.write( - f'#ifndef {name}\n' - f'# ifdef _LV_KCONFIG_PRESENT\n' - f'# ifdef CONFIG_{name.upper()}\n' - f'# define {name} CONFIG_{name.upper()}\n' - f'# else\n' - f'# define {name} 0\n' - f'# endif\n' - f'# else\n' - f'# define {name_and_value}\n' - f'# endif\n' - f'#endif\n' - ) + f'#ifndef {name}\n' + f'# ifdef _LV_KCONFIG_PRESENT\n' + f'# ifdef CONFIG_{name.upper()}\n' + f'# define {name} CONFIG_{name.upper()}\n' + f'# else\n' + f'# define {name} 0\n' + f'# endif\n' + f'# else\n' + f'# define{name_and_value}\n' + f'# endif\n' + f'#endif\n' + ) else: #1. Use the value if already set from lv_conf.h or anything else (i.e. do nothing) #2. Use the Kconfig value if set #3. Use the LVGL's default value - + fout.write( - f'#ifndef {name}\n' - f'# ifdef CONFIG_{name.upper()}\n' - f'# define {name} CONFIG_{name.upper()}\n' - f'# else\n' - f'# define {name_and_value}\n' - f'# endif\n' - f'#endif\n' - ) - + f'#ifndef {name}\n' + f'# ifdef CONFIG_{name.upper()}\n' + f'# define {name} CONFIG_{name.upper()}\n' + f'# else\n' + f'# define{name_and_value}\n' + f'# endif\n' + f'#endif\n' + ) + elif re.search('^ *typedef .*;.*$', line): continue #ignore typedefs to avoide redeclaration else: diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 97d9029d3..b3e6748bb 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -42,7 +42,7 @@ # endif #endif -#ifdef CONFIG_LV_COLOR_DEPTH +#ifdef CONFIG_LV_COLOR_DEPTH # define _LV_KCONFIG_PRESENT #endif @@ -58,14 +58,10 @@ /*Color depth: 1 (1 byte per pixel), 8 (RGB332), 16 (RGB565), 32 (ARGB8888)*/ #ifndef LV_COLOR_DEPTH -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_COLOR_DEPTH -# define LV_COLOR_DEPTH CONFIG_LV_COLOR_DEPTH -# else -# define LV_COLOR_DEPTH 0 -# endif +# ifdef CONFIG_LV_COLOR_DEPTH +# define LV_COLOR_DEPTH CONFIG_LV_COLOR_DEPTH # else -# define LV_COLOR_DEPTH 16 +# define LV_COLOR_DEPTH 16 # endif #endif @@ -74,7 +70,7 @@ # ifdef CONFIG_LV_COLOR_16_SWAP # define LV_COLOR_16_SWAP CONFIG_LV_COLOR_16_SWAP # else -# define LV_COLOR_16_SWAP 0 +# define LV_COLOR_16_SWAP 0 # endif #endif @@ -85,7 +81,17 @@ # ifdef CONFIG_LV_COLOR_SCREEN_TRANSP # define LV_COLOR_SCREEN_TRANSP CONFIG_LV_COLOR_SCREEN_TRANSP # else -# define LV_COLOR_SCREEN_TRANSP 0 +# define LV_COLOR_SCREEN_TRANSP 0 +# endif +#endif + +/* Adjust color mix functions rounding. GPUs might calculate color mix (blending) differently. + * 0: round down, 64: round up from x.75, 128: round up from half, 192: round up from x.25, 254: round up */ +#ifndef LV_COLOR_MIX_ROUND_OFS +# ifdef CONFIG_LV_COLOR_MIX_ROUND_OFS +# define LV_COLOR_MIX_ROUND_OFS CONFIG_LV_COLOR_MIX_ROUND_OFS +# else +# define LV_COLOR_MIX_ROUND_OFS (LV_COLOR_DEPTH == 32 ? 0: 128) # endif #endif @@ -94,7 +100,7 @@ # ifdef CONFIG_LV_COLOR_CHROMA_KEY # define LV_COLOR_CHROMA_KEY CONFIG_LV_COLOR_CHROMA_KEY # else -# define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /*pure green*/ +# define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /*pure green*/ # endif #endif @@ -107,7 +113,7 @@ # ifdef CONFIG_LV_MEM_CUSTOM # define LV_MEM_CUSTOM CONFIG_LV_MEM_CUSTOM # else -# define LV_MEM_CUSTOM 0 +# define LV_MEM_CUSTOM 0 # endif #endif #if LV_MEM_CUSTOM == 0 @@ -116,7 +122,7 @@ # ifdef CONFIG_LV_MEM_SIZE # define LV_MEM_SIZE CONFIG_LV_MEM_SIZE # else -# define LV_MEM_SIZE (32U * 1024U) /*[bytes]*/ +# define LV_MEM_SIZE (32U * 1024U) /*[bytes]*/ # endif #endif @@ -125,7 +131,7 @@ # ifdef CONFIG_LV_MEM_ADR # define LV_MEM_ADR CONFIG_LV_MEM_ADR # else -# define LV_MEM_ADR 0 /*0: unused*/ +# define LV_MEM_ADR 0 /*0: unused*/ # endif #endif /*Instead of an address give a memory allocator that will be called to get a memory pool for LVGL. E.g. my_malloc*/ @@ -139,28 +145,28 @@ # ifdef CONFIG_LV_MEM_CUSTOM_INCLUDE # define LV_MEM_CUSTOM_INCLUDE CONFIG_LV_MEM_CUSTOM_INCLUDE # else -# define LV_MEM_CUSTOM_INCLUDE /*Header for the dynamic memory function*/ +# define LV_MEM_CUSTOM_INCLUDE /*Header for the dynamic memory function*/ # endif #endif #ifndef LV_MEM_CUSTOM_ALLOC # ifdef CONFIG_LV_MEM_CUSTOM_ALLOC # define LV_MEM_CUSTOM_ALLOC CONFIG_LV_MEM_CUSTOM_ALLOC # else -# define LV_MEM_CUSTOM_ALLOC malloc +# define LV_MEM_CUSTOM_ALLOC malloc # endif #endif #ifndef LV_MEM_CUSTOM_FREE # ifdef CONFIG_LV_MEM_CUSTOM_FREE # define LV_MEM_CUSTOM_FREE CONFIG_LV_MEM_CUSTOM_FREE # else -# define LV_MEM_CUSTOM_FREE free +# define LV_MEM_CUSTOM_FREE free # endif #endif #ifndef LV_MEM_CUSTOM_REALLOC # ifdef CONFIG_LV_MEM_CUSTOM_REALLOC # define LV_MEM_CUSTOM_REALLOC CONFIG_LV_MEM_CUSTOM_REALLOC # else -# define LV_MEM_CUSTOM_REALLOC realloc +# define LV_MEM_CUSTOM_REALLOC realloc # endif #endif #endif /*LV_MEM_CUSTOM*/ @@ -168,14 +174,10 @@ /*Number of the intermediate memory buffer used during rendering and other internal processing mechanisms. *You will see an error log message if there wasn't enough buffers. */ #ifndef LV_MEM_BUF_MAX_NUM -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_MEM_BUF_MAX_NUM -# define LV_MEM_BUF_MAX_NUM CONFIG_LV_MEM_BUF_MAX_NUM -# else -# define LV_MEM_BUF_MAX_NUM 0 -# endif +# ifdef CONFIG_LV_MEM_BUF_MAX_NUM +# define LV_MEM_BUF_MAX_NUM CONFIG_LV_MEM_BUF_MAX_NUM # else -# define LV_MEM_BUF_MAX_NUM 16 +# define LV_MEM_BUF_MAX_NUM 16 # endif #endif @@ -184,7 +186,7 @@ # ifdef CONFIG_LV_MEMCPY_MEMSET_STD # define LV_MEMCPY_MEMSET_STD CONFIG_LV_MEMCPY_MEMSET_STD # else -# define LV_MEMCPY_MEMSET_STD 0 +# define LV_MEMCPY_MEMSET_STD 0 # endif #endif @@ -197,7 +199,7 @@ # ifdef CONFIG_LV_DISP_DEF_REFR_PERIOD # define LV_DISP_DEF_REFR_PERIOD CONFIG_LV_DISP_DEF_REFR_PERIOD # else -# define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/ +# define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/ # endif #endif @@ -206,7 +208,7 @@ # ifdef CONFIG_LV_INDEV_DEF_READ_PERIOD # define LV_INDEV_DEF_READ_PERIOD CONFIG_LV_INDEV_DEF_READ_PERIOD # else -# define LV_INDEV_DEF_READ_PERIOD 30 /*[ms]*/ +# define LV_INDEV_DEF_READ_PERIOD 30 /*[ms]*/ # endif #endif @@ -216,7 +218,7 @@ # ifdef CONFIG_LV_TICK_CUSTOM # define LV_TICK_CUSTOM CONFIG_LV_TICK_CUSTOM # else -# define LV_TICK_CUSTOM 0 +# define LV_TICK_CUSTOM 0 # endif #endif #if LV_TICK_CUSTOM @@ -224,14 +226,14 @@ # ifdef CONFIG_LV_TICK_CUSTOM_INCLUDE # define LV_TICK_CUSTOM_INCLUDE CONFIG_LV_TICK_CUSTOM_INCLUDE # else -# define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ +# define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ # endif #endif #ifndef LV_TICK_CUSTOM_SYS_TIME_EXPR # ifdef CONFIG_LV_TICK_CUSTOM_SYS_TIME_EXPR # define LV_TICK_CUSTOM_SYS_TIME_EXPR CONFIG_LV_TICK_CUSTOM_SYS_TIME_EXPR # else -# define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ +# define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ # endif #endif #endif /*LV_TICK_CUSTOM*/ @@ -239,14 +241,10 @@ /*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings. *(Not so important, you can adjust it to modify default sizes and spaces)*/ #ifndef LV_DPI_DEF -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_DPI_DEF -# define LV_DPI_DEF CONFIG_LV_DPI_DEF -# else -# define LV_DPI_DEF 0 -# endif +# ifdef CONFIG_LV_DPI_DEF +# define LV_DPI_DEF CONFIG_LV_DPI_DEF # else -# define LV_DPI_DEF 130 /*[px/inch]*/ +# define LV_DPI_DEF 130 /*[px/inch]*/ # endif #endif @@ -268,7 +266,7 @@ # define LV_DRAW_COMPLEX 0 # endif # else -# define LV_DRAW_COMPLEX 1 +# define LV_DRAW_COMPLEX 1 # endif #endif #if LV_DRAW_COMPLEX != 0 @@ -280,7 +278,7 @@ # ifdef CONFIG_LV_SHADOW_CACHE_SIZE # define LV_SHADOW_CACHE_SIZE CONFIG_LV_SHADOW_CACHE_SIZE # else -# define LV_SHADOW_CACHE_SIZE 0 +# define LV_SHADOW_CACHE_SIZE 0 # endif #endif @@ -292,7 +290,7 @@ # ifdef CONFIG_LV_CIRCLE_CACHE_SIZE # define LV_CIRCLE_CACHE_SIZE CONFIG_LV_CIRCLE_CACHE_SIZE # else -# define LV_CIRCLE_CACHE_SIZE 4 +# define LV_CIRCLE_CACHE_SIZE 4 # endif #endif @@ -307,7 +305,7 @@ # ifdef CONFIG_LV_IMG_CACHE_DEF_SIZE # define LV_IMG_CACHE_DEF_SIZE CONFIG_LV_IMG_CACHE_DEF_SIZE # else -# define LV_IMG_CACHE_DEF_SIZE 0 +# define LV_IMG_CACHE_DEF_SIZE 0 # endif #endif @@ -316,7 +314,7 @@ # ifdef CONFIG_LV_DISP_ROT_MAX_BUF # define LV_DISP_ROT_MAX_BUF CONFIG_LV_DISP_ROT_MAX_BUF # else -# define LV_DISP_ROT_MAX_BUF (10*1024) +# define LV_DISP_ROT_MAX_BUF (10*1024) # endif #endif @@ -329,7 +327,7 @@ # ifdef CONFIG_LV_USE_GPU_STM32_DMA2D # define LV_USE_GPU_STM32_DMA2D CONFIG_LV_USE_GPU_STM32_DMA2D # else -# define LV_USE_GPU_STM32_DMA2D 0 +# define LV_USE_GPU_STM32_DMA2D 0 # endif #endif #if LV_USE_GPU_STM32_DMA2D @@ -339,7 +337,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_GPU_DMA2D_CMSIS_INCLUDE # define LV_GPU_DMA2D_CMSIS_INCLUDE CONFIG_LV_GPU_DMA2D_CMSIS_INCLUDE # else -# define LV_GPU_DMA2D_CMSIS_INCLUDE +# define LV_GPU_DMA2D_CMSIS_INCLUDE # endif #endif #endif @@ -349,7 +347,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_GPU_NXP_PXP # define LV_USE_GPU_NXP_PXP CONFIG_LV_USE_GPU_NXP_PXP # else -# define LV_USE_GPU_NXP_PXP 0 +# define LV_USE_GPU_NXP_PXP 0 # endif #endif #if LV_USE_GPU_NXP_PXP @@ -362,7 +360,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_GPU_NXP_PXP_AUTO_INIT # define LV_USE_GPU_NXP_PXP_AUTO_INIT CONFIG_LV_USE_GPU_NXP_PXP_AUTO_INIT # else -# define LV_USE_GPU_NXP_PXP_AUTO_INIT 0 +# define LV_USE_GPU_NXP_PXP_AUTO_INIT 0 # endif #endif #endif @@ -372,7 +370,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_GPU_NXP_VG_LITE # define LV_USE_GPU_NXP_VG_LITE CONFIG_LV_USE_GPU_NXP_VG_LITE # else -# define LV_USE_GPU_NXP_VG_LITE 0 +# define LV_USE_GPU_NXP_VG_LITE 0 # endif #endif @@ -381,7 +379,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_EXTERNAL_RENDERER # define LV_USE_EXTERNAL_RENDERER CONFIG_LV_USE_EXTERNAL_RENDERER # else -# define LV_USE_EXTERNAL_RENDERER 0 +# define LV_USE_EXTERNAL_RENDERER 0 # endif #endif @@ -390,7 +388,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_GPU_SDL # define LV_USE_GPU_SDL CONFIG_LV_USE_GPU_SDL # else -# define LV_USE_GPU_SDL 0 +# define LV_USE_GPU_SDL 0 # endif #endif #if LV_USE_GPU_SDL @@ -398,7 +396,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_GPU_SDL_INCLUDE_PATH # define LV_GPU_SDL_INCLUDE_PATH CONFIG_LV_GPU_SDL_INCLUDE_PATH # else -# define LV_GPU_SDL_INCLUDE_PATH +# define LV_GPU_SDL_INCLUDE_PATH # endif #endif #endif @@ -412,7 +410,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_LOG # define LV_USE_LOG CONFIG_LV_USE_LOG # else -# define LV_USE_LOG 0 +# define LV_USE_LOG 0 # endif #endif #if LV_USE_LOG @@ -428,7 +426,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_LOG_LEVEL # define LV_LOG_LEVEL CONFIG_LV_LOG_LEVEL # else -# define LV_LOG_LEVEL LV_LOG_LEVEL_WARN +# define LV_LOG_LEVEL LV_LOG_LEVEL_WARN # endif #endif @@ -438,7 +436,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_LOG_PRINTF # define LV_LOG_PRINTF CONFIG_LV_LOG_PRINTF # else -# define LV_LOG_PRINTF 0 +# define LV_LOG_PRINTF 0 # endif #endif @@ -451,7 +449,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_MEM 0 # endif # else -# define LV_LOG_TRACE_MEM 1 +# define LV_LOG_TRACE_MEM 1 # endif #endif #ifndef LV_LOG_TRACE_TIMER @@ -462,7 +460,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_TIMER 0 # endif # else -# define LV_LOG_TRACE_TIMER 1 +# define LV_LOG_TRACE_TIMER 1 # endif #endif #ifndef LV_LOG_TRACE_INDEV @@ -473,7 +471,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_INDEV 0 # endif # else -# define LV_LOG_TRACE_INDEV 1 +# define LV_LOG_TRACE_INDEV 1 # endif #endif #ifndef LV_LOG_TRACE_DISP_REFR @@ -484,7 +482,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_DISP_REFR 0 # endif # else -# define LV_LOG_TRACE_DISP_REFR 1 +# define LV_LOG_TRACE_DISP_REFR 1 # endif #endif #ifndef LV_LOG_TRACE_EVENT @@ -495,7 +493,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_EVENT 0 # endif # else -# define LV_LOG_TRACE_EVENT 1 +# define LV_LOG_TRACE_EVENT 1 # endif #endif #ifndef LV_LOG_TRACE_OBJ_CREATE @@ -506,7 +504,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_OBJ_CREATE 0 # endif # else -# define LV_LOG_TRACE_OBJ_CREATE 1 +# define LV_LOG_TRACE_OBJ_CREATE 1 # endif #endif #ifndef LV_LOG_TRACE_LAYOUT @@ -517,7 +515,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_LAYOUT 0 # endif # else -# define LV_LOG_TRACE_LAYOUT 1 +# define LV_LOG_TRACE_LAYOUT 1 # endif #endif #ifndef LV_LOG_TRACE_ANIM @@ -528,7 +526,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_LOG_TRACE_ANIM 0 # endif # else -# define LV_LOG_TRACE_ANIM 1 +# define LV_LOG_TRACE_ANIM 1 # endif #endif @@ -541,46 +539,38 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ /*Enable asserts if an operation is failed or an invalid data is found. *If LV_USE_LOG is enabled an error message will be printed on failure*/ #ifndef LV_USE_ASSERT_NULL -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_ASSERT_NULL -# define LV_USE_ASSERT_NULL CONFIG_LV_USE_ASSERT_NULL -# else -# define LV_USE_ASSERT_NULL 0 -# endif +# ifdef CONFIG_LV_USE_ASSERT_NULL +# define LV_USE_ASSERT_NULL CONFIG_LV_USE_ASSERT_NULL # else -# define LV_USE_ASSERT_NULL 1 /*Check if the parameter is NULL. (Very fast, recommended)*/ +# define LV_USE_ASSERT_NULL 1 /*Check if the parameter is NULL. (Very fast, recommended)*/ # endif #endif #ifndef LV_USE_ASSERT_MALLOC -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_ASSERT_MALLOC -# define LV_USE_ASSERT_MALLOC CONFIG_LV_USE_ASSERT_MALLOC -# else -# define LV_USE_ASSERT_MALLOC 0 -# endif +# ifdef CONFIG_LV_USE_ASSERT_MALLOC +# define LV_USE_ASSERT_MALLOC CONFIG_LV_USE_ASSERT_MALLOC # else -# define LV_USE_ASSERT_MALLOC 1 /*Checks is the memory is successfully allocated or no. (Very fast, recommended)*/ +# define LV_USE_ASSERT_MALLOC 1 /*Checks is the memory is successfully allocated or no. (Very fast, recommended)*/ # endif #endif #ifndef LV_USE_ASSERT_STYLE # ifdef CONFIG_LV_USE_ASSERT_STYLE # define LV_USE_ASSERT_STYLE CONFIG_LV_USE_ASSERT_STYLE # else -# define LV_USE_ASSERT_STYLE 0 /*Check if the styles are properly initialized. (Very fast, recommended)*/ +# define LV_USE_ASSERT_STYLE 0 /*Check if the styles are properly initialized. (Very fast, recommended)*/ # endif #endif #ifndef LV_USE_ASSERT_MEM_INTEGRITY # ifdef CONFIG_LV_USE_ASSERT_MEM_INTEGRITY # define LV_USE_ASSERT_MEM_INTEGRITY CONFIG_LV_USE_ASSERT_MEM_INTEGRITY # else -# define LV_USE_ASSERT_MEM_INTEGRITY 0 /*Check the integrity of `lv_mem` after critical operations. (Slow)*/ +# define LV_USE_ASSERT_MEM_INTEGRITY 0 /*Check the integrity of `lv_mem` after critical operations. (Slow)*/ # endif #endif #ifndef LV_USE_ASSERT_OBJ # ifdef CONFIG_LV_USE_ASSERT_OBJ # define LV_USE_ASSERT_OBJ CONFIG_LV_USE_ASSERT_OBJ # else -# define LV_USE_ASSERT_OBJ 0 /*Check the object's type and existence (e.g. not deleted). (Slow)*/ +# define LV_USE_ASSERT_OBJ 0 /*Check the object's type and existence (e.g. not deleted). (Slow)*/ # endif #endif @@ -589,14 +579,14 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ASSERT_HANDLER_INCLUDE # define LV_ASSERT_HANDLER_INCLUDE CONFIG_LV_ASSERT_HANDLER_INCLUDE # else -# define LV_ASSERT_HANDLER_INCLUDE +# define LV_ASSERT_HANDLER_INCLUDE # endif #endif #ifndef LV_ASSERT_HANDLER # ifdef CONFIG_LV_ASSERT_HANDLER # define LV_ASSERT_HANDLER CONFIG_LV_ASSERT_HANDLER # else -# define LV_ASSERT_HANDLER while(1); /*Halt by default*/ +# define LV_ASSERT_HANDLER while(1); /*Halt by default*/ # endif #endif @@ -609,7 +599,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_PERF_MONITOR # define LV_USE_PERF_MONITOR CONFIG_LV_USE_PERF_MONITOR # else -# define LV_USE_PERF_MONITOR 0 +# define LV_USE_PERF_MONITOR 0 # endif #endif #if LV_USE_PERF_MONITOR @@ -617,7 +607,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_PERF_MONITOR_POS # define LV_USE_PERF_MONITOR_POS CONFIG_LV_USE_PERF_MONITOR_POS # else -# define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT +# define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT # endif #endif #endif @@ -628,7 +618,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_MEM_MONITOR # define LV_USE_MEM_MONITOR CONFIG_LV_USE_MEM_MONITOR # else -# define LV_USE_MEM_MONITOR 0 +# define LV_USE_MEM_MONITOR 0 # endif #endif #if LV_USE_PERF_MONITOR @@ -636,7 +626,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_MEM_MONITOR_POS # define LV_USE_MEM_MONITOR_POS CONFIG_LV_USE_MEM_MONITOR_POS # else -# define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT +# define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT # endif #endif #endif @@ -646,7 +636,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_REFR_DEBUG # define LV_USE_REFR_DEBUG CONFIG_LV_USE_REFR_DEBUG # else -# define LV_USE_REFR_DEBUG 0 +# define LV_USE_REFR_DEBUG 0 # endif #endif @@ -655,7 +645,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_SPRINTF_CUSTOM # define LV_SPRINTF_CUSTOM CONFIG_LV_SPRINTF_CUSTOM # else -# define LV_SPRINTF_CUSTOM 0 +# define LV_SPRINTF_CUSTOM 0 # endif #endif #if LV_SPRINTF_CUSTOM @@ -663,21 +653,21 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_SPRINTF_INCLUDE # define LV_SPRINTF_INCLUDE CONFIG_LV_SPRINTF_INCLUDE # else -# define LV_SPRINTF_INCLUDE +# define LV_SPRINTF_INCLUDE # endif #endif #ifndef lv_snprintf # ifdef CONFIG_LV_SNPRINTF # define lv_snprintf CONFIG_LV_SNPRINTF # else -# define lv_snprintf snprintf +# define lv_snprintf snprintf # endif #endif #ifndef lv_vsnprintf # ifdef CONFIG_LV_VSNPRINTF # define lv_vsnprintf CONFIG_LV_VSNPRINTF # else -# define lv_vsnprintf vsnprintf +# define lv_vsnprintf vsnprintf # endif #endif #else /*LV_SPRINTF_CUSTOM*/ @@ -685,7 +675,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_SPRINTF_USE_FLOAT # define LV_SPRINTF_USE_FLOAT CONFIG_LV_SPRINTF_USE_FLOAT # else -# define LV_SPRINTF_USE_FLOAT 0 +# define LV_SPRINTF_USE_FLOAT 0 # endif #endif #endif /*LV_SPRINTF_CUSTOM*/ @@ -698,7 +688,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_USER_DATA 0 # endif # else -# define LV_USE_USER_DATA 1 +# define LV_USE_USER_DATA 1 # endif #endif @@ -708,7 +698,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ENABLE_GC # define LV_ENABLE_GC CONFIG_LV_ENABLE_GC # else -# define LV_ENABLE_GC 0 +# define LV_ENABLE_GC 0 # endif #endif #if LV_ENABLE_GC != 0 @@ -716,7 +706,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_GC_INCLUDE # define LV_GC_INCLUDE CONFIG_LV_GC_INCLUDE # else -# define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ +# define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ # endif #endif #endif /*LV_ENABLE_GC*/ @@ -730,7 +720,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_BIG_ENDIAN_SYSTEM # define LV_BIG_ENDIAN_SYSTEM CONFIG_LV_BIG_ENDIAN_SYSTEM # else -# define LV_BIG_ENDIAN_SYSTEM 0 +# define LV_BIG_ENDIAN_SYSTEM 0 # endif #endif @@ -739,7 +729,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_TICK_INC # define LV_ATTRIBUTE_TICK_INC CONFIG_LV_ATTRIBUTE_TICK_INC # else -# define LV_ATTRIBUTE_TICK_INC +# define LV_ATTRIBUTE_TICK_INC # endif #endif @@ -748,7 +738,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_TIMER_HANDLER # define LV_ATTRIBUTE_TIMER_HANDLER CONFIG_LV_ATTRIBUTE_TIMER_HANDLER # else -# define LV_ATTRIBUTE_TIMER_HANDLER +# define LV_ATTRIBUTE_TIMER_HANDLER # endif #endif @@ -757,7 +747,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_FLUSH_READY # define LV_ATTRIBUTE_FLUSH_READY CONFIG_LV_ATTRIBUTE_FLUSH_READY # else -# define LV_ATTRIBUTE_FLUSH_READY +# define LV_ATTRIBUTE_FLUSH_READY # endif #endif @@ -770,7 +760,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_ATTRIBUTE_MEM_ALIGN_SIZE 0 # endif # else -# define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1 +# define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1 # endif #endif @@ -780,7 +770,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_MEM_ALIGN # define LV_ATTRIBUTE_MEM_ALIGN CONFIG_LV_ATTRIBUTE_MEM_ALIGN # else -# define LV_ATTRIBUTE_MEM_ALIGN +# define LV_ATTRIBUTE_MEM_ALIGN # endif #endif @@ -789,7 +779,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_LARGE_CONST # define LV_ATTRIBUTE_LARGE_CONST CONFIG_LV_ATTRIBUTE_LARGE_CONST # else -# define LV_ATTRIBUTE_LARGE_CONST +# define LV_ATTRIBUTE_LARGE_CONST # endif #endif @@ -798,7 +788,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_LARGE_RAM_ARRAY # define LV_ATTRIBUTE_LARGE_RAM_ARRAY CONFIG_LV_ATTRIBUTE_LARGE_RAM_ARRAY # else -# define LV_ATTRIBUTE_LARGE_RAM_ARRAY +# define LV_ATTRIBUTE_LARGE_RAM_ARRAY # endif #endif @@ -807,7 +797,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_FAST_MEM # define LV_ATTRIBUTE_FAST_MEM CONFIG_LV_ATTRIBUTE_FAST_MEM # else -# define LV_ATTRIBUTE_FAST_MEM +# define LV_ATTRIBUTE_FAST_MEM # endif #endif @@ -816,7 +806,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_DMA # define LV_ATTRIBUTE_DMA CONFIG_LV_ATTRIBUTE_DMA # else -# define LV_ATTRIBUTE_DMA +# define LV_ATTRIBUTE_DMA # endif #endif @@ -826,7 +816,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_EXPORT_CONST_INT # define LV_EXPORT_CONST_INT CONFIG_LV_EXPORT_CONST_INT # else -# define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ +# define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ # endif #endif @@ -835,7 +825,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_LARGE_COORD # define LV_USE_LARGE_COORD CONFIG_LV_USE_LARGE_COORD # else -# define LV_USE_LARGE_COORD 0 +# define LV_USE_LARGE_COORD 0 # endif #endif @@ -849,21 +839,21 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_MONTSERRAT_8 # define LV_FONT_MONTSERRAT_8 CONFIG_LV_FONT_MONTSERRAT_8 # else -# define LV_FONT_MONTSERRAT_8 0 +# define LV_FONT_MONTSERRAT_8 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_10 # ifdef CONFIG_LV_FONT_MONTSERRAT_10 # define LV_FONT_MONTSERRAT_10 CONFIG_LV_FONT_MONTSERRAT_10 # else -# define LV_FONT_MONTSERRAT_10 0 +# define LV_FONT_MONTSERRAT_10 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_12 # ifdef CONFIG_LV_FONT_MONTSERRAT_12 # define LV_FONT_MONTSERRAT_12 CONFIG_LV_FONT_MONTSERRAT_12 # else -# define LV_FONT_MONTSERRAT_12 0 +# define LV_FONT_MONTSERRAT_12 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_14 @@ -874,126 +864,126 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_FONT_MONTSERRAT_14 0 # endif # else -# define LV_FONT_MONTSERRAT_14 1 +# define LV_FONT_MONTSERRAT_14 1 # endif #endif #ifndef LV_FONT_MONTSERRAT_16 # ifdef CONFIG_LV_FONT_MONTSERRAT_16 # define LV_FONT_MONTSERRAT_16 CONFIG_LV_FONT_MONTSERRAT_16 # else -# define LV_FONT_MONTSERRAT_16 0 +# define LV_FONT_MONTSERRAT_16 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_18 # ifdef CONFIG_LV_FONT_MONTSERRAT_18 # define LV_FONT_MONTSERRAT_18 CONFIG_LV_FONT_MONTSERRAT_18 # else -# define LV_FONT_MONTSERRAT_18 0 +# define LV_FONT_MONTSERRAT_18 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_20 # ifdef CONFIG_LV_FONT_MONTSERRAT_20 # define LV_FONT_MONTSERRAT_20 CONFIG_LV_FONT_MONTSERRAT_20 # else -# define LV_FONT_MONTSERRAT_20 0 +# define LV_FONT_MONTSERRAT_20 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_22 # ifdef CONFIG_LV_FONT_MONTSERRAT_22 # define LV_FONT_MONTSERRAT_22 CONFIG_LV_FONT_MONTSERRAT_22 # else -# define LV_FONT_MONTSERRAT_22 0 +# define LV_FONT_MONTSERRAT_22 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_24 # ifdef CONFIG_LV_FONT_MONTSERRAT_24 # define LV_FONT_MONTSERRAT_24 CONFIG_LV_FONT_MONTSERRAT_24 # else -# define LV_FONT_MONTSERRAT_24 0 +# define LV_FONT_MONTSERRAT_24 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_26 # ifdef CONFIG_LV_FONT_MONTSERRAT_26 # define LV_FONT_MONTSERRAT_26 CONFIG_LV_FONT_MONTSERRAT_26 # else -# define LV_FONT_MONTSERRAT_26 0 +# define LV_FONT_MONTSERRAT_26 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_28 # ifdef CONFIG_LV_FONT_MONTSERRAT_28 # define LV_FONT_MONTSERRAT_28 CONFIG_LV_FONT_MONTSERRAT_28 # else -# define LV_FONT_MONTSERRAT_28 0 +# define LV_FONT_MONTSERRAT_28 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_30 # ifdef CONFIG_LV_FONT_MONTSERRAT_30 # define LV_FONT_MONTSERRAT_30 CONFIG_LV_FONT_MONTSERRAT_30 # else -# define LV_FONT_MONTSERRAT_30 0 +# define LV_FONT_MONTSERRAT_30 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_32 # ifdef CONFIG_LV_FONT_MONTSERRAT_32 # define LV_FONT_MONTSERRAT_32 CONFIG_LV_FONT_MONTSERRAT_32 # else -# define LV_FONT_MONTSERRAT_32 0 +# define LV_FONT_MONTSERRAT_32 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_34 # ifdef CONFIG_LV_FONT_MONTSERRAT_34 # define LV_FONT_MONTSERRAT_34 CONFIG_LV_FONT_MONTSERRAT_34 # else -# define LV_FONT_MONTSERRAT_34 0 +# define LV_FONT_MONTSERRAT_34 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_36 # ifdef CONFIG_LV_FONT_MONTSERRAT_36 # define LV_FONT_MONTSERRAT_36 CONFIG_LV_FONT_MONTSERRAT_36 # else -# define LV_FONT_MONTSERRAT_36 0 +# define LV_FONT_MONTSERRAT_36 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_38 # ifdef CONFIG_LV_FONT_MONTSERRAT_38 # define LV_FONT_MONTSERRAT_38 CONFIG_LV_FONT_MONTSERRAT_38 # else -# define LV_FONT_MONTSERRAT_38 0 +# define LV_FONT_MONTSERRAT_38 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_40 # ifdef CONFIG_LV_FONT_MONTSERRAT_40 # define LV_FONT_MONTSERRAT_40 CONFIG_LV_FONT_MONTSERRAT_40 # else -# define LV_FONT_MONTSERRAT_40 0 +# define LV_FONT_MONTSERRAT_40 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_42 # ifdef CONFIG_LV_FONT_MONTSERRAT_42 # define LV_FONT_MONTSERRAT_42 CONFIG_LV_FONT_MONTSERRAT_42 # else -# define LV_FONT_MONTSERRAT_42 0 +# define LV_FONT_MONTSERRAT_42 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_44 # ifdef CONFIG_LV_FONT_MONTSERRAT_44 # define LV_FONT_MONTSERRAT_44 CONFIG_LV_FONT_MONTSERRAT_44 # else -# define LV_FONT_MONTSERRAT_44 0 +# define LV_FONT_MONTSERRAT_44 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_46 # ifdef CONFIG_LV_FONT_MONTSERRAT_46 # define LV_FONT_MONTSERRAT_46 CONFIG_LV_FONT_MONTSERRAT_46 # else -# define LV_FONT_MONTSERRAT_46 0 +# define LV_FONT_MONTSERRAT_46 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_48 # ifdef CONFIG_LV_FONT_MONTSERRAT_48 # define LV_FONT_MONTSERRAT_48 CONFIG_LV_FONT_MONTSERRAT_48 # else -# define LV_FONT_MONTSERRAT_48 0 +# define LV_FONT_MONTSERRAT_48 0 # endif #endif @@ -1002,28 +992,28 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_MONTSERRAT_12_SUBPX # define LV_FONT_MONTSERRAT_12_SUBPX CONFIG_LV_FONT_MONTSERRAT_12_SUBPX # else -# define LV_FONT_MONTSERRAT_12_SUBPX 0 +# define LV_FONT_MONTSERRAT_12_SUBPX 0 # endif #endif #ifndef LV_FONT_MONTSERRAT_28_COMPRESSED # ifdef CONFIG_LV_FONT_MONTSERRAT_28_COMPRESSED # define LV_FONT_MONTSERRAT_28_COMPRESSED CONFIG_LV_FONT_MONTSERRAT_28_COMPRESSED # else -# define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/ +# define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/ # endif #endif #ifndef LV_FONT_DEJAVU_16_PERSIAN_HEBREW # ifdef CONFIG_LV_FONT_DEJAVU_16_PERSIAN_HEBREW # define LV_FONT_DEJAVU_16_PERSIAN_HEBREW CONFIG_LV_FONT_DEJAVU_16_PERSIAN_HEBREW # else -# define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, Perisan letters and all their forms*/ +# define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, Perisan letters and all their forms*/ # endif #endif #ifndef LV_FONT_SIMSUN_16_CJK # ifdef CONFIG_LV_FONT_SIMSUN_16_CJK # define LV_FONT_SIMSUN_16_CJK CONFIG_LV_FONT_SIMSUN_16_CJK # else -# define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ +# define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ # endif #endif @@ -1032,14 +1022,14 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_UNSCII_8 # define LV_FONT_UNSCII_8 CONFIG_LV_FONT_UNSCII_8 # else -# define LV_FONT_UNSCII_8 0 +# define LV_FONT_UNSCII_8 0 # endif #endif #ifndef LV_FONT_UNSCII_16 # ifdef CONFIG_LV_FONT_UNSCII_16 # define LV_FONT_UNSCII_16 CONFIG_LV_FONT_UNSCII_16 # else -# define LV_FONT_UNSCII_16 0 +# define LV_FONT_UNSCII_16 0 # endif #endif @@ -1050,7 +1040,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_CUSTOM_DECLARE # define LV_FONT_CUSTOM_DECLARE CONFIG_LV_FONT_CUSTOM_DECLARE # else -# define LV_FONT_CUSTOM_DECLARE +# define LV_FONT_CUSTOM_DECLARE # endif #endif @@ -1059,7 +1049,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_DEFAULT # define LV_FONT_DEFAULT CONFIG_LV_FONT_DEFAULT # else -# define LV_FONT_DEFAULT &lv_font_montserrat_14 +# define LV_FONT_DEFAULT &lv_font_montserrat_14 # endif #endif @@ -1070,7 +1060,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_FMT_TXT_LARGE # define LV_FONT_FMT_TXT_LARGE CONFIG_LV_FONT_FMT_TXT_LARGE # else -# define LV_FONT_FMT_TXT_LARGE 0 +# define LV_FONT_FMT_TXT_LARGE 0 # endif #endif @@ -1079,7 +1069,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FONT_COMPRESSED # define LV_USE_FONT_COMPRESSED CONFIG_LV_USE_FONT_COMPRESSED # else -# define LV_USE_FONT_COMPRESSED 0 +# define LV_USE_FONT_COMPRESSED 0 # endif #endif @@ -1088,7 +1078,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FONT_SUBPX # define LV_USE_FONT_SUBPX CONFIG_LV_USE_FONT_SUBPX # else -# define LV_USE_FONT_SUBPX 0 +# define LV_USE_FONT_SUBPX 0 # endif #endif #if LV_USE_FONT_SUBPX @@ -1097,7 +1087,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FONT_SUBPX_BGR # define LV_FONT_SUBPX_BGR CONFIG_LV_FONT_SUBPX_BGR # else -# define LV_FONT_SUBPX_BGR 0 /*0: RGB; 1:BGR order*/ +# define LV_FONT_SUBPX_BGR 0 /*0: RGB; 1:BGR order*/ # endif #endif #endif @@ -1116,7 +1106,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_TXT_ENC # define LV_TXT_ENC CONFIG_LV_TXT_ENC # else -# define LV_TXT_ENC LV_TXT_ENC_UTF8 +# define LV_TXT_ENC LV_TXT_ENC_UTF8 # endif #endif @@ -1125,7 +1115,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_TXT_BREAK_CHARS # define LV_TXT_BREAK_CHARS CONFIG_LV_TXT_BREAK_CHARS # else -# define LV_TXT_BREAK_CHARS " ,.;:-_" +# define LV_TXT_BREAK_CHARS " ,.;:-_" # endif #endif @@ -1135,7 +1125,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_TXT_LINE_BREAK_LONG_LEN # define LV_TXT_LINE_BREAK_LONG_LEN CONFIG_LV_TXT_LINE_BREAK_LONG_LEN # else -# define LV_TXT_LINE_BREAK_LONG_LEN 0 +# define LV_TXT_LINE_BREAK_LONG_LEN 0 # endif #endif @@ -1145,7 +1135,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN # define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN CONFIG_LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN # else -# define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 +# define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 # endif #endif @@ -1155,7 +1145,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN # define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN CONFIG_LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN # else -# define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 +# define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 # endif #endif @@ -1164,7 +1154,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_TXT_COLOR_CMD # define LV_TXT_COLOR_CMD CONFIG_LV_TXT_COLOR_CMD # else -# define LV_TXT_COLOR_CMD "#" +# define LV_TXT_COLOR_CMD "#" # endif #endif @@ -1175,7 +1165,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_BIDI # define LV_USE_BIDI CONFIG_LV_USE_BIDI # else -# define LV_USE_BIDI 0 +# define LV_USE_BIDI 0 # endif #endif #if LV_USE_BIDI @@ -1187,7 +1177,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_BIDI_BASE_DIR_DEF # define LV_BIDI_BASE_DIR_DEF CONFIG_LV_BIDI_BASE_DIR_DEF # else -# define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO +# define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO # endif #endif #endif @@ -1198,7 +1188,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_ARABIC_PERSIAN_CHARS # define LV_USE_ARABIC_PERSIAN_CHARS CONFIG_LV_USE_ARABIC_PERSIAN_CHARS # else -# define LV_USE_ARABIC_PERSIAN_CHARS 0 +# define LV_USE_ARABIC_PERSIAN_CHARS 0 # endif #endif @@ -1216,7 +1206,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_ARC 0 # endif # else -# define LV_USE_ARC 1 +# define LV_USE_ARC 1 # endif #endif @@ -1228,7 +1218,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_ANIMIMG 0 # endif # else -# define LV_USE_ANIMIMG 1 +# define LV_USE_ANIMIMG 1 # endif #endif @@ -1240,7 +1230,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_BAR 0 # endif # else -# define LV_USE_BAR 1 +# define LV_USE_BAR 1 # endif #endif @@ -1252,7 +1242,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_BTN 0 # endif # else -# define LV_USE_BTN 1 +# define LV_USE_BTN 1 # endif #endif @@ -1264,7 +1254,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_BTNMATRIX 0 # endif # else -# define LV_USE_BTNMATRIX 1 +# define LV_USE_BTNMATRIX 1 # endif #endif @@ -1276,7 +1266,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_CANVAS 0 # endif # else -# define LV_USE_CANVAS 1 +# define LV_USE_CANVAS 1 # endif #endif @@ -1288,31 +1278,23 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_CHECKBOX 0 # endif # else -# define LV_USE_CHECKBOX 1 +# define LV_USE_CHECKBOX 1 # endif #endif #ifndef LV_USE_DROPDOWN -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_DROPDOWN -# define LV_USE_DROPDOWN CONFIG_LV_USE_DROPDOWN -# else -# define LV_USE_DROPDOWN 0 -# endif +# ifdef CONFIG_LV_USE_DROPDOWN +# define LV_USE_DROPDOWN CONFIG_LV_USE_DROPDOWN # else -# define LV_USE_DROPDOWN 1 /*Requires: lv_label*/ +# define LV_USE_DROPDOWN 1 /*Requires: lv_label*/ # endif #endif #ifndef LV_USE_IMG -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_IMG -# define LV_USE_IMG CONFIG_LV_USE_IMG -# else -# define LV_USE_IMG 0 -# endif +# ifdef CONFIG_LV_USE_IMG +# define LV_USE_IMG CONFIG_LV_USE_IMG # else -# define LV_USE_IMG 1 /*Requires: lv_label*/ +# define LV_USE_IMG 1 /*Requires: lv_label*/ # endif #endif @@ -1324,30 +1306,22 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_LABEL 0 # endif # else -# define LV_USE_LABEL 1 +# define LV_USE_LABEL 1 # endif #endif #if LV_USE_LABEL #ifndef LV_LABEL_TEXT_SELECTION -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_LABEL_TEXT_SELECTION -# define LV_LABEL_TEXT_SELECTION CONFIG_LV_LABEL_TEXT_SELECTION -# else -# define LV_LABEL_TEXT_SELECTION 0 -# endif +# ifdef CONFIG_LV_LABEL_TEXT_SELECTION +# define LV_LABEL_TEXT_SELECTION CONFIG_LV_LABEL_TEXT_SELECTION # else -# define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/ +# define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/ # endif #endif #ifndef LV_LABEL_LONG_TXT_HINT -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_LABEL_LONG_TXT_HINT -# define LV_LABEL_LONG_TXT_HINT CONFIG_LV_LABEL_LONG_TXT_HINT -# else -# define LV_LABEL_LONG_TXT_HINT 0 -# endif +# ifdef CONFIG_LV_LABEL_LONG_TXT_HINT +# define LV_LABEL_LONG_TXT_HINT CONFIG_LV_LABEL_LONG_TXT_HINT # else -# define LV_LABEL_LONG_TXT_HINT 1 /*Store some extra info in labels to speed up drawing of very long texts*/ +# define LV_LABEL_LONG_TXT_HINT 1 /*Store some extra info in labels to speed up drawing of very long texts*/ # endif #endif #endif @@ -1360,19 +1334,15 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_LINE 0 # endif # else -# define LV_USE_LINE 1 +# define LV_USE_LINE 1 # endif #endif #ifndef LV_USE_ROLLER -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_ROLLER -# define LV_USE_ROLLER CONFIG_LV_USE_ROLLER -# else -# define LV_USE_ROLLER 0 -# endif +# ifdef CONFIG_LV_USE_ROLLER +# define LV_USE_ROLLER CONFIG_LV_USE_ROLLER # else -# define LV_USE_ROLLER 1 /*Requires: lv_label*/ +# define LV_USE_ROLLER 1 /*Requires: lv_label*/ # endif #endif #if LV_USE_ROLLER @@ -1380,20 +1350,16 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ROLLER_INF_PAGES # define LV_ROLLER_INF_PAGES CONFIG_LV_ROLLER_INF_PAGES # else -# define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/ +# define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/ # endif #endif #endif #ifndef LV_USE_SLIDER -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_SLIDER -# define LV_USE_SLIDER CONFIG_LV_USE_SLIDER -# else -# define LV_USE_SLIDER 0 -# endif +# ifdef CONFIG_LV_USE_SLIDER +# define LV_USE_SLIDER CONFIG_LV_USE_SLIDER # else -# define LV_USE_SLIDER 1 /*Requires: lv_bar*/ +# define LV_USE_SLIDER 1 /*Requires: lv_bar*/ # endif #endif @@ -1405,31 +1371,23 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_SWITCH 0 # endif # else -# define LV_USE_SWITCH 1 +# define LV_USE_SWITCH 1 # endif #endif #ifndef LV_USE_TEXTAREA -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_USE_TEXTAREA -# define LV_USE_TEXTAREA CONFIG_LV_USE_TEXTAREA -# else -# define LV_USE_TEXTAREA 0 -# endif +# ifdef CONFIG_LV_USE_TEXTAREA +# define LV_USE_TEXTAREA CONFIG_LV_USE_TEXTAREA # else -# define LV_USE_TEXTAREA 1 /*Requires: lv_label*/ +# define LV_USE_TEXTAREA 1 /*Requires: lv_label*/ # endif #endif #if LV_USE_TEXTAREA != 0 #ifndef LV_TEXTAREA_DEF_PWD_SHOW_TIME -# ifdef _LV_KCONFIG_PRESENT -# ifdef CONFIG_LV_TEXTAREA_DEF_PWD_SHOW_TIME -# define LV_TEXTAREA_DEF_PWD_SHOW_TIME CONFIG_LV_TEXTAREA_DEF_PWD_SHOW_TIME -# else -# define LV_TEXTAREA_DEF_PWD_SHOW_TIME 0 -# endif +# ifdef CONFIG_LV_TEXTAREA_DEF_PWD_SHOW_TIME +# define LV_TEXTAREA_DEF_PWD_SHOW_TIME CONFIG_LV_TEXTAREA_DEF_PWD_SHOW_TIME # else -# define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/ +# define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/ # endif #endif #endif @@ -1442,7 +1400,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_TABLE 0 # endif # else -# define LV_USE_TABLE 1 +# define LV_USE_TABLE 1 # endif #endif @@ -1461,7 +1419,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_CALENDAR 0 # endif # else -# define LV_USE_CALENDAR 1 +# define LV_USE_CALENDAR 1 # endif #endif #if LV_USE_CALENDAR @@ -1469,7 +1427,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_CALENDAR_WEEK_STARTS_MONDAY # define LV_CALENDAR_WEEK_STARTS_MONDAY CONFIG_LV_CALENDAR_WEEK_STARTS_MONDAY # else -# define LV_CALENDAR_WEEK_STARTS_MONDAY 0 +# define LV_CALENDAR_WEEK_STARTS_MONDAY 0 # endif #endif # if LV_CALENDAR_WEEK_STARTS_MONDAY @@ -1477,7 +1435,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_CALENDAR_DEFAULT_DAY_NAMES # define LV_CALENDAR_DEFAULT_DAY_NAMES CONFIG_LV_CALENDAR_DEFAULT_DAY_NAMES # else -# define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"} +# define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"} # endif #endif # else @@ -1485,7 +1443,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_CALENDAR_DEFAULT_DAY_NAMES # define LV_CALENDAR_DEFAULT_DAY_NAMES CONFIG_LV_CALENDAR_DEFAULT_DAY_NAMES # else -# define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"} +# define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"} # endif #endif # endif @@ -1494,7 +1452,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_CALENDAR_DEFAULT_MONTH_NAMES # define LV_CALENDAR_DEFAULT_MONTH_NAMES CONFIG_LV_CALENDAR_DEFAULT_MONTH_NAMES # else -# define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"} +# define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"} # endif #endif #ifndef LV_USE_CALENDAR_HEADER_ARROW @@ -1505,7 +1463,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_CALENDAR_HEADER_ARROW 0 # endif # else -# define LV_USE_CALENDAR_HEADER_ARROW 1 +# define LV_USE_CALENDAR_HEADER_ARROW 1 # endif #endif #ifndef LV_USE_CALENDAR_HEADER_DROPDOWN @@ -1516,7 +1474,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_CALENDAR_HEADER_DROPDOWN 0 # endif # else -# define LV_USE_CALENDAR_HEADER_DROPDOWN 1 +# define LV_USE_CALENDAR_HEADER_DROPDOWN 1 # endif #endif #endif /*LV_USE_CALENDAR*/ @@ -1529,7 +1487,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_CHART 0 # endif # else -# define LV_USE_CHART 1 +# define LV_USE_CHART 1 # endif #endif @@ -1541,7 +1499,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_COLORWHEEL 0 # endif # else -# define LV_USE_COLORWHEEL 1 +# define LV_USE_COLORWHEEL 1 # endif #endif @@ -1553,7 +1511,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_IMGBTN 0 # endif # else -# define LV_USE_IMGBTN 1 +# define LV_USE_IMGBTN 1 # endif #endif @@ -1565,7 +1523,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_KEYBOARD 0 # endif # else -# define LV_USE_KEYBOARD 1 +# define LV_USE_KEYBOARD 1 # endif #endif @@ -1577,7 +1535,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_LED 0 # endif # else -# define LV_USE_LED 1 +# define LV_USE_LED 1 # endif #endif @@ -1589,7 +1547,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_LIST 0 # endif # else -# define LV_USE_LIST 1 +# define LV_USE_LIST 1 # endif #endif @@ -1601,7 +1559,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_METER 0 # endif # else -# define LV_USE_METER 1 +# define LV_USE_METER 1 # endif #endif @@ -1613,7 +1571,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_MSGBOX 0 # endif # else -# define LV_USE_MSGBOX 1 +# define LV_USE_MSGBOX 1 # endif #endif @@ -1625,7 +1583,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_SPINBOX 0 # endif # else -# define LV_USE_SPINBOX 1 +# define LV_USE_SPINBOX 1 # endif #endif @@ -1637,7 +1595,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_SPINNER 0 # endif # else -# define LV_USE_SPINNER 1 +# define LV_USE_SPINNER 1 # endif #endif @@ -1649,7 +1607,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_TABVIEW 0 # endif # else -# define LV_USE_TABVIEW 1 +# define LV_USE_TABVIEW 1 # endif #endif @@ -1661,7 +1619,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_TILEVIEW 0 # endif # else -# define LV_USE_TILEVIEW 1 +# define LV_USE_TILEVIEW 1 # endif #endif @@ -1673,7 +1631,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_WIN 0 # endif # else -# define LV_USE_WIN 1 +# define LV_USE_WIN 1 # endif #endif @@ -1685,7 +1643,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_SPAN 0 # endif # else -# define LV_USE_SPAN 1 +# define LV_USE_SPAN 1 # endif #endif #if LV_USE_SPAN @@ -1694,7 +1652,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_SPAN_SNIPPET_STACK_SIZE # define LV_SPAN_SNIPPET_STACK_SIZE CONFIG_LV_SPAN_SNIPPET_STACK_SIZE # else -# define LV_SPAN_SNIPPET_STACK_SIZE 64 +# define LV_SPAN_SNIPPET_STACK_SIZE 64 # endif #endif #endif @@ -1712,7 +1670,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_THEME_DEFAULT 0 # endif # else -# define LV_USE_THEME_DEFAULT 1 +# define LV_USE_THEME_DEFAULT 1 # endif #endif #if LV_USE_THEME_DEFAULT @@ -1722,7 +1680,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_THEME_DEFAULT_DARK # define LV_THEME_DEFAULT_DARK CONFIG_LV_THEME_DEFAULT_DARK # else -# define LV_THEME_DEFAULT_DARK 0 +# define LV_THEME_DEFAULT_DARK 0 # endif #endif @@ -1735,7 +1693,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_THEME_DEFAULT_GROW 0 # endif # else -# define LV_THEME_DEFAULT_GROW 1 +# define LV_THEME_DEFAULT_GROW 1 # endif #endif @@ -1744,7 +1702,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_THEME_DEFAULT_TRANSITION_TIME # define LV_THEME_DEFAULT_TRANSITION_TIME CONFIG_LV_THEME_DEFAULT_TRANSITION_TIME # else -# define LV_THEME_DEFAULT_TRANSITION_TIME 80 +# define LV_THEME_DEFAULT_TRANSITION_TIME 80 # endif #endif #endif /*LV_USE_THEME_DEFAULT*/ @@ -1758,7 +1716,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_THEME_BASIC 0 # endif # else -# define LV_USE_THEME_BASIC 1 +# define LV_USE_THEME_BASIC 1 # endif #endif @@ -1771,7 +1729,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_THEME_MONO 0 # endif # else -# define LV_USE_THEME_MONO 1 +# define LV_USE_THEME_MONO 1 # endif #endif @@ -1788,7 +1746,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_FLEX 0 # endif # else -# define LV_USE_FLEX 1 +# define LV_USE_FLEX 1 # endif #endif @@ -1801,7 +1759,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_GRID 0 # endif # else -# define LV_USE_GRID 1 +# define LV_USE_GRID 1 # endif #endif @@ -1815,7 +1773,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FS_STDIO # define LV_USE_FS_STDIO CONFIG_LV_USE_FS_STDIO # else -# define LV_USE_FS_STDIO '\0' /*Uses fopen, fread, etc*/ +# define LV_USE_FS_STDIO '\0' /*Uses fopen, fread, etc*/ # endif #endif //#define LV_FS_STDIO_PATH "/home/john/" /*Set the working directory. If commented it will be "./" */ @@ -1824,7 +1782,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FS_POSIX # define LV_USE_FS_POSIX CONFIG_LV_USE_FS_POSIX # else -# define LV_USE_FS_POSIX '\0' /*Uses open, read, etc*/ +# define LV_USE_FS_POSIX '\0' /*Uses open, read, etc*/ # endif #endif //#define LV_FS_POSIX_PATH "/home/john/" /*Set the working directory. If commented it will be "./" */ @@ -1833,7 +1791,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FS_WIN32 # define LV_USE_FS_WIN32 CONFIG_LV_USE_FS_WIN32 # else -# define LV_USE_FS_WIN32 '\0' /*Uses CreateFile, ReadFile, etc*/ +# define LV_USE_FS_WIN32 '\0' /*Uses CreateFile, ReadFile, etc*/ # endif #endif //#define LV_FS_WIN32_PATH "C:\\Users\\john\\" /*Set the working directory. If commented it will be ".\\" */ @@ -1842,7 +1800,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FS_FATFS # define LV_USE_FS_FATFS CONFIG_LV_USE_FS_FATFS # else -# define LV_USE_FS_FATFS '\0' /*Uses f_open, f_read, etc*/ +# define LV_USE_FS_FATFS '\0' /*Uses f_open, f_read, etc*/ # endif #endif @@ -1851,7 +1809,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_PNG # define LV_USE_PNG CONFIG_LV_USE_PNG # else -# define LV_USE_PNG 0 +# define LV_USE_PNG 0 # endif #endif @@ -1860,7 +1818,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_BMP # define LV_USE_BMP CONFIG_LV_USE_BMP # else -# define LV_USE_BMP 0 +# define LV_USE_BMP 0 # endif #endif @@ -1870,7 +1828,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_SJPG # define LV_USE_SJPG CONFIG_LV_USE_SJPG # else -# define LV_USE_SJPG 0 +# define LV_USE_SJPG 0 # endif #endif @@ -1879,7 +1837,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_GIF # define LV_USE_GIF CONFIG_LV_USE_GIF # else -# define LV_USE_GIF 0 +# define LV_USE_GIF 0 # endif #endif @@ -1888,7 +1846,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_QRCODE # define LV_USE_QRCODE CONFIG_LV_USE_QRCODE # else -# define LV_USE_QRCODE 0 +# define LV_USE_QRCODE 0 # endif #endif @@ -1897,7 +1855,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_FREETYPE # define LV_USE_FREETYPE CONFIG_LV_USE_FREETYPE # else -# define LV_USE_FREETYPE 0 +# define LV_USE_FREETYPE 0 # endif #endif #if LV_USE_FREETYPE @@ -1906,7 +1864,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_FREETYPE_CACHE_SIZE # define LV_FREETYPE_CACHE_SIZE CONFIG_LV_FREETYPE_CACHE_SIZE # else -# define LV_FREETYPE_CACHE_SIZE (16 * 1024) +# define LV_FREETYPE_CACHE_SIZE (16 * 1024) # endif #endif #endif @@ -1916,7 +1874,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_USE_RLOTTIE # define LV_USE_RLOTTIE CONFIG_LV_USE_RLOTTIE # else -# define LV_USE_RLOTTIE 0 +# define LV_USE_RLOTTIE 0 # endif #endif @@ -1933,7 +1891,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_SNAPSHOT 0 # endif # else -# define LV_USE_SNAPSHOT 1 +# define LV_USE_SNAPSHOT 1 # endif #endif @@ -1951,7 +1909,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_BUILD_EXAMPLES 0 # endif # else -# define LV_BUILD_EXAMPLES 1 +# define LV_BUILD_EXAMPLES 1 # endif #endif diff --git a/src/misc/lv_color.h b/src/misc/lv_color.h index a0178bedb..ca226102a 100644 --- a/src/misc/lv_color.h +++ b/src/misc/lv_color.h @@ -73,23 +73,6 @@ enum { #error "Invalid LV_COLOR_DEPTH in lv_conf.h! Set it to 1, 8, 16 or 32!" #endif -/** - * Adjust color mix functions rounding. - * GPUs might calculate color mix (blending) differently. - * Should be in range of 0..254 - * 0: no adjustment, get the integer part of the result (round down) - * 64: round up from x.75 - * 128: round up from half - * 192: round up from x.25 - * 254: round up*/ -#ifndef LV_COLOR_MIX_ROUND_OFS -#if LV_COLOR_DEPTH == 32 -#define LV_COLOR_MIX_ROUND_OFS 0 -#else -#define LV_COLOR_MIX_ROUND_OFS 128 -#endif -#endif - #if defined(__cplusplus) && !defined(_LV_COLOR_HAS_MODERN_CPP) /** * MSVC compiler's definition of the __cplusplus indicating 199711L regardless to C++ standard version