diff --git a/library.json b/library.json index 31a87f814..d1cdb16c7 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.7.2", + "version": "7.8.0", "keywords": "graphics, gui, embedded, tft, lvgl", "description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.", "repository": { diff --git a/library.properties b/library.properties index 3ddc574c3..b96e1590a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.7.2 +version=7.8.0 author=kisvegabor maintainer=kisvegabor,embeddedt,pete-pjb sentence=Full-featured Graphics Library for Embedded Systems diff --git a/lv_conf_template.h b/lv_conf_template.h index 7e2aeb3a0..f2f9fa247 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.7.2-dev + * Configuration file for v7.8.0-dev */ /* diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index c24c0131a..5bf85131d 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -19,6 +19,10 @@ /* Handle special Kconfig options */ #include "lv_conf_kconfig.h" +#ifdef CONFIG_LV_CONF_SKIP +#define LV_CONF_SKIP +#endif + /* If "lv_conf.h" is available from here try to use it later.*/ #if defined __has_include # if __has_include("lv_conf.h") @@ -1318,7 +1322,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ /* Support bidirectional texts. * Allows mixing Left-to-Right and Right-to-Left texts. - * The direction will be processed according to the Unicode Bidirectional Algorithm: + * The direction will be processed according to the Unicode Bidirectioanl Algorithm: * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ #ifndef LV_USE_BIDI # ifdef CONFIG_LV_USE_BIDI diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index c9a5ce8db..5757c94db 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -30,9 +30,9 @@ extern "C" { *******************/ #ifndef LV_MEM_SIZE - #if defined (CONFIG_LV_MEM_SIZE_BYTES) - #define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_BYTES * 1024U) - #endif +#if defined (CONFIG_LV_MEM_SIZE_BYTES) +#define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_BYTES * 1024U) +#endif #endif /******************* @@ -40,11 +40,11 @@ extern "C" { *******************/ #ifndef LV_COLOR_TRANSP - #if defined (CONFIG_LV_COLOR_TRANSP_HEX) - #define CONFIG_LV_COLOR_TRANSP lv_color_hex(CONFIG_LV_COLOR_TRANSP_HEX) - #else - #define CONFIG_LV_COLOR_TRANSP LV_COLOR_LIME - #endif +#if defined (CONFIG_LV_COLOR_TRANSP_HEX) +#define CONFIG_LV_COLOR_TRANSP lv_color_hex(CONFIG_LV_COLOR_TRANSP_HEX) +#else +#define CONFIG_LV_COLOR_TRANSP LV_COLOR_LIME +#endif #endif /******************* @@ -52,31 +52,31 @@ extern "C" { *******************/ #ifndef LV_THEME_DEFAULT_INIT - #if defined (CONFIG_LV_THEME_DEFAULT_INIT_EMPTY) - #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_empty_init - #elif defined (CONFIG_LV_THEME_DEFAULT_INIT_TEMPLATE) - #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_template_init - #elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MATERIAL) - #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_material_init - #elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MONO) - #define LV_THEME_DEFAULT_INIT lv_theme_mono_init - #endif +#if defined (CONFIG_LV_THEME_DEFAULT_INIT_EMPTY) +#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_empty_init +#elif defined (CONFIG_LV_THEME_DEFAULT_INIT_TEMPLATE) +#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_template_init +#elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MATERIAL) +#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_material_init +#elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MONO) +#define LV_THEME_DEFAULT_INIT lv_theme_mono_init +#endif #endif /******************* * COLOR SELECTION *******************/ - + #ifndef LV_THEME_DEFAULT_COLOR_PRIMARY - #ifdef CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY - #define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY) - #endif +#ifdef CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY +#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY) #endif - +#endif + #ifndef LV_THEME_DEFAULT_COLOR_SECONDARY - #ifdef CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY - #define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY) - #endif +#ifdef CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY +#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY) +#endif #endif /******************** @@ -92,255 +92,255 @@ extern "C" { * SMALL FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_SMALL - #if defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_simsun_16_cjk +#endif #endif /*------------------ * NORMAL FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_NORMAL - #if defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_simsun_16_cjk +#endif #endif /*------------------ * SUBTITLE FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_SUBTITLE - #if defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_simsun_16_cjk +#endif #endif /*------------------ * TITLE FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_TITLE - #if defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_simsun_16_cjk +#endif #endif /*------------------ * TEXT ENCODING *-----------------*/ #ifndef LV_TEXT_ENC - #ifdef CONFIG_LV_TXT_ENC_UTF8 - #define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 - #elif defined CONFIG_LV_TXT_ENC_ASCII - #define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII - #endif +#ifdef CONFIG_LV_TXT_ENC_UTF8 +#define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 +#elif defined CONFIG_LV_TXT_ENC_ASCII +#define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII +#endif #endif /*------------------ @@ -348,13 +348,13 @@ extern "C" { *-----------------*/ #ifndef LV_BIDI_BASE_DIR_DEF - #ifdef CONFIG_LV_BIDI_DIR_LTR - #define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_LTR - #elif defined CONFIG_LV_BIDI_DIR_RTL - #define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_RTL - #elif defined CONFIG_LV_BIDI_DIR_AUTO - #define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO - #endif +#ifdef CONFIG_LV_BIDI_DIR_LTR +#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_LTR +#elif defined CONFIG_LV_BIDI_DIR_RTL +#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_RTL +#elif defined CONFIG_LV_BIDI_DIR_AUTO +#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO +#endif #endif /*------------------ @@ -362,13 +362,13 @@ extern "C" { *-----------------*/ #ifndef LV_USE_EXT_CLICK_AREA - #ifdef CONFIG_LV_USE_EXT_CLICK_AREA_OFF - #define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF - #elif defined CONFIG_LV_USE_EXT_CLICK_AREA_TINY - #define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY - #elif defined CONFIG_LV_USE_EXT_CLICK_AREA_FULL - #define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_FULL - #endif +#ifdef CONFIG_LV_USE_EXT_CLICK_AREA_OFF +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF +#elif defined CONFIG_LV_USE_EXT_CLICK_AREA_TINY +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY +#elif defined CONFIG_LV_USE_EXT_CLICK_AREA_FULL +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_FULL +#endif #endif /*------------------ @@ -376,13 +376,13 @@ extern "C" { *-----------------*/ #ifndef LV_LINEMETER_PRECISE - #ifdef CONFIG_LV_LINEMETER_PRECISE_NO_EXTRA_PRECISION - #define CONFIG_LV_LINEMETER_PRECISE 0 - #elif defined CONFIG_LV_LINEMETER_PRECISE_SOME_EXTRA_PRECISION - #define CONFIG_LV_LINEMETER_PRECISE 1 - #elif defined CONFIG_LV_LINEMETER_PRECISE_BEST_PRECISION - #define CONFIG_LV_LINEMETER_PRECISE 2 - #endif +#ifdef CONFIG_LV_LINEMETER_PRECISE_NO_EXTRA_PRECISION +#define CONFIG_LV_LINEMETER_PRECISE 0 +#elif defined CONFIG_LV_LINEMETER_PRECISE_SOME_EXTRA_PRECISION +#define CONFIG_LV_LINEMETER_PRECISE 1 +#elif defined CONFIG_LV_LINEMETER_PRECISE_BEST_PRECISION +#define CONFIG_LV_LINEMETER_PRECISE 2 +#endif #endif @@ -391,13 +391,13 @@ extern "C" { *-----------------*/ #ifndef LV_SPINNER_DEF_ANIM - #ifdef CONFIG_LV_SPINNER_TYPE_SPINNING_ARC - #define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC - #elif defined CONFIG_LV_SPINNER_TYPE_FILLSPIN_ARC - #define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_FILLSPIN_ARC - #elif defined CONFIG_LV_SPINNER_TYPE_CONSTANT_ARC - #define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_CONSTANT_ARC - #endif +#ifdef CONFIG_LV_SPINNER_TYPE_SPINNING_ARC +#define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC +#elif defined CONFIG_LV_SPINNER_TYPE_FILLSPIN_ARC +#define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_FILLSPIN_ARC +#elif defined CONFIG_LV_SPINNER_TYPE_CONSTANT_ARC +#define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_CONSTANT_ARC +#endif #endif #ifdef __cplusplus diff --git a/src/lv_conf_zephyr.h b/src/lv_conf_zephyr.h index a140ccd61..e4e338f2b 100644 --- a/src/lv_conf_zephyr.h +++ b/src/lv_conf_zephyr.h @@ -6,44 +6,44 @@ #ifdef __ZEPHYR__ -#include + #include -#define LV_MEM_CUSTOM 1 + #define LV_MEM_CUSTOM 1 -#define LV_MEMCPY_MEMSET_STD 1 + #define LV_MEMCPY_MEMSET_STD 1 -#ifdef CONFIG_LVGL_MEM_POOL_HEAP_KERNEL + #ifdef CONFIG_LVGL_MEM_POOL_HEAP_KERNEL -#define LV_MEM_CUSTOM_INCLUDE "kernel.h" -#define LV_MEM_CUSTOM_ALLOC k_malloc -#define LV_MEM_CUTOM_FREE k_free + #define LV_MEM_CUSTOM_INCLUDE "kernel.h" + #define LV_MEM_CUSTOM_ALLOC k_malloc + #define LV_MEM_CUTOM_FREE k_free -#elif defined(CONFIG_LVGL_MEM_POOL_HEAP_LIB_C) + #elif defined(CONFIG_LVGL_MEM_POOL_HEAP_LIB_C) -#define LV_MEM_CUSTOM_INCLUDE "stdlib.h" -#define LV_MEM_CUSTOM_ALLOC malloc -#define LV_MEM_CUTOM_FREE free + #define LV_MEM_CUSTOM_INCLUDE "stdlib.h" + #define LV_MEM_CUSTOM_ALLOC malloc + #define LV_MEM_CUTOM_FREE free -#else + #else -#define LV_MEM_CUSTOM_INCLUDE "lvgl_mem.h" -#define LV_MEM_CUSTOM_ALLOC lvgl_malloc -#define LV_MEM_CUTOM_FREE lvgl_free - -#endif - -#define LV_ENABLE_GC 0 - -#define LV_TICK_CUSTOM 1 -#define LV_TICK_CUSTOM_INCLUDE "kernel.h" -#define LV_TICK_CUSTOM_SYS_TIME_EXPR (k_uptime_get_32()) - -#define LV_SPRINTF_CUSTOM 1 - -#if LV_SPRINTF_CUSTOM -#define LV_SPRINTF_INCLUDE "stdio.h" -#define lv_snprintf snprintf -#define lv_vsnprintf vsnprintf -#endif + #define LV_MEM_CUSTOM_INCLUDE "lvgl_mem.h" + #define LV_MEM_CUSTOM_ALLOC lvgl_malloc + #define LV_MEM_CUTOM_FREE lvgl_free + + #endif + + #define LV_ENABLE_GC 0 + + #define LV_TICK_CUSTOM 1 + #define LV_TICK_CUSTOM_INCLUDE "kernel.h" + #define LV_TICK_CUSTOM_SYS_TIME_EXPR (k_uptime_get_32()) + + #define LV_SPRINTF_CUSTOM 1 + + #if LV_SPRINTF_CUSTOM + #define LV_SPRINTF_INCLUDE "stdio.h" + #define lv_snprintf snprintf + #define lv_vsnprintf vsnprintf + #endif #endif diff --git a/src/lv_core/lv_refr.c b/src/lv_core/lv_refr.c index 1c0d74d17..0c25671ee 100644 --- a/src/lv_core/lv_refr.c +++ b/src/lv_core/lv_refr.c @@ -55,8 +55,8 @@ static void lv_refr_vdb_flush(void); static uint32_t px_num; static lv_disp_t * disp_refr; /*Display being refreshed*/ #if LV_USE_PERF_MONITOR -static uint32_t fps_sum_cnt; -static uint32_t fps_sum_all; + static uint32_t fps_sum_cnt; + static uint32_t fps_sum_all; #endif /********************** diff --git a/src/lv_draw/lv_draw_triangle.c b/src/lv_draw/lv_draw_triangle.c index 162b8d28e..e5775a7e2 100644 --- a/src/lv_draw/lv_draw_triangle.c +++ b/src/lv_draw/lv_draw_triangle.c @@ -65,7 +65,7 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are uint16_t pcnt = 0; p[0] = points[0]; for(i = 0; i < point_cnt - 1; i++) { - if(points[i].x != points[i+1].x ||points[i].y != points[i+1].y) { + if(points[i].x != points[i + 1].x || points[i].y != points[i + 1].y) { p[pcnt] = points[i]; pcnt++; } diff --git a/src/lv_font/lv_font_unscii_16.c b/src/lv_font/lv_font_unscii_16.c index 7b3f69340..16bfc255d 100644 --- a/src/lv_font/lv_font_unscii_16.c +++ b/src/lv_font/lv_font_unscii_16.c @@ -7,7 +7,7 @@ ******************************************************************************/ #ifndef LV_FONT_UNSCII_16 -#define LV_FONT_UNSCII_16 1 + #define LV_FONT_UNSCII_16 1 #endif #if LV_FONT_UNSCII_16 @@ -583,8 +583,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { /*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = -{ +static const lv_font_fmt_txt_cmap_t cmaps[] = { { .range_start = 32, .range_length = 96, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY diff --git a/src/lv_font/lv_font_unscii_8.c b/src/lv_font/lv_font_unscii_8.c index b08fb0090..4438d82e5 100644 --- a/src/lv_font/lv_font_unscii_8.c +++ b/src/lv_font/lv_font_unscii_8.c @@ -7,7 +7,7 @@ ******************************************************************************/ #ifndef LV_FONT_UNSCII_8 -#define LV_FONT_UNSCII_8 1 + #define LV_FONT_UNSCII_8 1 #endif #if LV_FONT_UNSCII_8 @@ -419,8 +419,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { /*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = -{ +static const lv_font_fmt_txt_cmap_t cmaps[] = { { .range_start = 32, .range_length = 96, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/lv_gpu/lv_gpu_stm32_dma2d.c index 74b0a7201..d94e87abf 100644 --- a/src/lv_gpu/lv_gpu_stm32_dma2d.c +++ b/src/lv_gpu/lv_gpu_stm32_dma2d.c @@ -226,7 +226,8 @@ void lv_gpu_stm32_dma2d_wait_cb(lv_disp_drv_t * drv) while(DMA2D->CR & DMA2D_CR_START_Msk) { drv->wait_cb(drv); } - } else { + } + else { while(DMA2D->CR & DMA2D_CR_START_Msk); } } @@ -241,8 +242,8 @@ static void invalidate_cache(void) if(disp->driver.clean_dcache_cb) disp->driver.clean_dcache_cb(&disp->driver); else { #if __CORTEX_M >= 0x07 - if((SCB->CCR) & (uint32_t)SCB_CCR_DC_Msk) - SCB_CleanInvalidateDCache(); + if((SCB->CCR) & (uint32_t)SCB_CCR_DC_Msk) + SCB_CleanInvalidateDCache(); #endif } } diff --git a/src/lv_misc/lv_txt_ap.c b/src/lv_misc/lv_txt_ap.c index 4c68a2773..1a868ee2d 100644 --- a/src/lv_misc/lv_txt_ap.c +++ b/src/lv_misc/lv_txt_ap.c @@ -211,11 +211,10 @@ static uint32_t lv_ap_get_char_index(uint16_t c) for(uint8_t i = 0; ap_chars_map[i].char_end_form; i++) { if(c == (ap_chars_map[i].char_offset + LV_AP_ALPHABET_BASE_CODE)) return i; - else if (c == ap_chars_map[i].char_end_form //is it an End form + else if(c == ap_chars_map[i].char_end_form //is it an End form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Begining form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_middle_form_offset) //is it a middle form - || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) //is it an isolated form - { + || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) { //is it an isolated form return i; } } diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index 4b2105bab..95e7557b8 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -860,12 +860,14 @@ static lv_res_t lv_arc_signal(lv_obj_t * arc, lv_signal_t sign, void * param) res = lv_event_send(arc, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RES_OK) return res; } - }else if(sign == LV_SIGNAL_GET_EDITABLE) { + } + else if(sign == LV_SIGNAL_GET_EDITABLE) { #if LV_USE_GROUP bool * editable = (bool *)param; *editable = true; #endif - }else if(sign == LV_SIGNAL_CLEANUP) { + } + else if(sign == LV_SIGNAL_CLEANUP) { lv_obj_clean_style_list(arc, LV_ARC_PART_KNOB); lv_obj_clean_style_list(arc, LV_ARC_PART_INDIC); } diff --git a/src/lv_widgets/lv_slider.c b/src/lv_widgets/lv_slider.c index 0c12bff66..5c77f1ef1 100644 --- a/src/lv_widgets/lv_slider.c +++ b/src/lv_widgets/lv_slider.c @@ -400,7 +400,8 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par ext->left_knob_focus = 0; lv_group_set_editing(g, false); } - } else { + } + else { lv_group_set_editing(g, false); } } diff --git a/src/lv_widgets/lv_slider.h b/src/lv_widgets/lv_slider.h index 0a04a731d..2f0d86a44 100644 --- a/src/lv_widgets/lv_slider.h +++ b/src/lv_widgets/lv_slider.h @@ -49,7 +49,7 @@ typedef struct { lv_area_t right_knob_area; int16_t * value_to_set; /* Which bar value to set */ uint8_t dragging : 1; /*1: the slider is being dragged*/ - uint8_t left_knob_focus :1; /*1: with encoder now the right knob can be adjusted*/ + uint8_t left_knob_focus : 1; /*1: with encoder now the right knob can be adjusted*/ } lv_slider_ext_t; /** Built-in styles of slider*/