diff --git a/Kconfig b/Kconfig index eb23953c4a..d4c59600df 100644 --- a/Kconfig +++ b/Kconfig @@ -155,6 +155,9 @@ menu "LVGL configuration" endmenu menu "GPU" + config LV_USE_EXTERNAL_RENDERER + bool + config LV_USE_GPU_STM32_DMA2D bool "Enable STM32 DMA2D (aka Chrom Art) GPU." config LV_GPU_DMA2D_CMSIS_INCLUDE @@ -179,12 +182,18 @@ menu "LVGL configuration" selected. 0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init(). + config LV_USE_GPU_NXP_VG_LITE bool "Use NXP's VG-Lite GPU iMX RTxxx platforms." config LV_USE_GPU_SDL bool "Use SDL renderer API" + select LV_USE_EXTERNAL_RENDERER default n + config LV_GPU_SDL_INCLUDE_PATH + string "include path of SDL header" + depends on LV_USE_GPU_SDL + default "SDL2/SDL.h" endmenu menu "Logging" @@ -284,6 +293,10 @@ menu "LVGL configuration" config LV_USE_ASSERT_OBJ bool "Check NULL, the object's type and existence (e.g. not deleted). (Slow)." + + config LV_ASSERT_HANDLER_INCLUDE + string "Header to include for the custom assert function" + default "assert.h" endmenu menu "Others" @@ -291,7 +304,8 @@ menu "LVGL configuration" bool "Show CPU usage and FPS count in the right bottom corner." config LV_USE_MEM_MONITOR - bool "Show the used memory and the memory fragmentation in the left bottom corner. Requires LV_MEM_CUSTOM = 0" + bool "Show the used memory and the memory fragmentation in the left bottom corner." + depends on !LV_MEM_CUSTOM config LV_USE_REFR_DEBUG bool "Draw random colored rectangles over the redrawn areas." @@ -299,6 +313,11 @@ menu "LVGL configuration" config LV_SPRINTF_CUSTOM bool "Change the built-in (v)snprintf functions" + config LV_SPRINTF_INCLUDE + string "Header to include for the custom sprintf function" + depends on LV_SPRINTF_CUSTOM + default "stdio.h" + config LV_SPRINTF_USE_FLOAT bool "Enable float in built-in (v)snprintf functions" depends on !LV_SPRINTF_CUSTOM @@ -306,12 +325,24 @@ menu "LVGL configuration" config LV_USE_USER_DATA bool "Add a 'user_data' to drivers and objects." default y + + config LV_ENABLE_GC + bool "Enable garbage collector" + + config LV_GC_INCLUDE + string "Header to include for the garbage collector related things" + depends on LV_ENABLE_GC + default "gc.h" endmenu menu "Compiler settings" config LV_BIG_ENDIAN_SYSTEM bool "For big endian systems set to 1" + config LV_ATTRIBUTE_MEM_ALIGN_SIZE + int "Required alignment size for buffers" + default 1 + config LV_ATTRIBUTE_FAST_MEM_USE_IRAM bool "Set IRAM as LV_ATTRIBUTE_FAST_MEM" help @@ -368,46 +399,31 @@ menu "LVGL configuration" config LV_FONT_MONTSERRAT_48 bool "Enable Montserrat 48" + config LV_FONT_MONTSERRAT_12_SUBPX + bool "Enable Montserrat 12 sub-pixel" + config LV_FONT_MONTSERRAT_28_COMPRESSED + bool "Enable Montserrat 28 compressed" + config LV_FONT_DEJAVU_16_PERSIAN_HEBREW + bool "Enable Dejavu 16 Persian, Hebrew, Arabic letters" + config LV_FONT_SIMSUN_16_CJK + bool "Enable Simsun 16 CJK" + config LV_FONT_UNSCII_8 bool "Enable UNSCII 8 (Perfect monospace font)" default y if LV_CONF_MINIMAL config LV_FONT_UNSCII_16 bool "Enable UNSCII 16 (Perfect monospace font)" - config LV_FONT_MONTSERRAT12SUBPX - bool "Enable Montserrat 12 sub-pixel" - config LV_FONT_MONTSERRAT28COMPRESSED - bool "Enable Montserrat 28 compressed" - config LV_FONT_DEJAVU_16_PERSIAN_HEBREW - bool "Enable Dejavu 16 Persian, Hebrew, Arabic letters" - config LV_FONT_SIMSUN_16_CJK - bool "Enable Simsun 16 CJK" + config LV_FONT_CUSTOM + bool "Enable the custom font" + config LV_FONT_CUSTOM_DECLARE + string "Header to include for the custom font" + depends on LV_FONT_CUSTOM endmenu - config LV_FONT_FMT_TXT_LARGE - bool "Enable it if you have fonts with a lot of characters." - help - The limit depends on the font size, font face and bpp - but with > 10,000 characters if you see issues probably you - need to enable it. - - config LV_USE_FONT_COMPRESSED - bool "Sets support for compressed fonts." - - config LV_USE_FONT_SUBPX - bool "Enable subpixel rendering." - - config LV_FONT_SUBPX_BGR - bool "Use BGR instead RGB for sub-pixel rendering." - depends on LV_USE_FONT_SUBPX - help - Set the pixel order of the display. - Important only if "subpx fonts" are used. - With "normal" font it doesn't matter. - choice LV_FONT_DEFAULT prompt "Select theme default title font" - default LV_FONT_DEFAULT_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_MONTSERRAT_14 if !LV_CONF_MINIMAL default LV_FONT_DEFAULT_UNSCII_8 if LV_CONF_MINIMAL help Select theme default title font @@ -472,46 +488,46 @@ menu "LVGL configuration" config LV_FONT_DEFAULT_MONTSERRAT_48 bool "Montserrat 48" select LV_FONT_MONTSERRAT_48 - config LV_FONT_DEFAULT_UNSCII_8 - bool "UNSCII 8 (Perfect monospace font)" - select LV_FONT_UNSCII_8 - config LV_FONT_DEFAULT_UNSCII_16 - bool "UNSCII 16 (Perfect monospace font)" - select LV_FONT_UNSCII_16 - config LV_FONT_DEFAULT_MONTSERRAT12SUBPX + config LV_FONT_DEFAULT_MONTSERRAT_12_SUBPX bool "Montserrat 12 sub-pixel" - select LV_FONT_MONTSERRAT12SUBPX - config LV_FONT_DEFAULT_MONTSERRAT28COMPRESSED + select LV_FONT_MONTSERRAT_12_SUBPX + config LV_FONT_DEFAULT_MONTSERRAT_28_COMPRESSED bool "Montserrat 28 compressed" - select LV_FONT_MONTSERRAT28COMPRESSED + select LV_FONT_MONTSERRAT_28_COMPRESSED config LV_FONT_DEFAULT_DEJAVU_16_PERSIAN_HEBREW bool "Dejavu 16 Persian, Hebrew, Arabic letters" select LV_FONT_DEJAVU_16_PERSIAN_HEBREW config LV_FONT_DEFAULT_SIMSUN_16_CJK bool "Simsun 16 CJK" select LV_FONT_SIMSUN_16_CJK + config LV_FONT_DEFAULT_UNSCII_8 + bool "UNSCII 8 (Perfect monospace font)" + select LV_FONT_UNSCII_8 + config LV_FONT_DEFAULT_UNSCII_16 + bool "UNSCII 16 (Perfect monospace font)" + select LV_FONT_UNSCII_16 endchoice - endmenu - menu "Themes" - config LV_USE_THEME_DEFAULT - bool "A simple, impressive and very complete theme" - default y - config LV_THEME_DEFAULT_DARK - bool "Yes to set dark mode, No to set light mode" - default y - depends on LV_USE_THEME_DEFAULT - config LV_THEME_DEFAULT_GROW - bool "Enable grow on press" - default y - depends on LV_USE_THEME_DEFAULT - config LV_THEME_DEFAULT_TRANSITION_TIME - int "Default transition time in [ms]" - default 80 - depends on LV_USE_THEME_DEFAULT - config LV_USE_THEME_BASIC - bool "A very simple theme that is a good starting point for a custom theme" - default y + config LV_FONT_FMT_TXT_LARGE + bool "Enable it if you have fonts with a lot of characters." + help + The limit depends on the font size, font face and bpp + but with > 10,000 characters if you see issues probably you + need to enable it. + + config LV_USE_FONT_COMPRESSED + bool "Sets support for compressed fonts." + + config LV_USE_FONT_SUBPX + bool "Enable subpixel rendering." + + config LV_FONT_SUBPX_BGR + bool "Use BGR instead RGB for sub-pixel rendering." + depends on LV_USE_FONT_SUBPX + help + Set the pixel order of the display. + Important only if "subpx fonts" are used. + With "normal" font it doesn't matter. endmenu menu "Text Settings" @@ -603,9 +619,6 @@ menu "LVGL configuration" config LV_USE_CHECKBOX bool "Check Box" default y if !LV_CONF_MINIMAL - config LV_USE_CHART - bool "Chart." - default y if !LV_CONF_MINIMAL config LV_USE_DROPDOWN bool "Drop down list. Requires: lv_label." select LV_USE_LABEL @@ -617,18 +630,17 @@ menu "LVGL configuration" config LV_USE_LABEL bool "Label." default y if !LV_CONF_MINIMAL - config LV_LABEL_TEXT_SEL + config LV_LABEL_TEXT_SELECTION bool "Enable selecting text of the label." depends on LV_USE_LABEL + default y config LV_LABEL_LONG_TXT_HINT bool "Store extra some info in labels (12 bytes) to speed up drawing of very long texts." depends on LV_USE_LABEL + default y config LV_USE_LINE bool "Line." default y if !LV_CONF_MINIMAL - config LV_USE_METER - bool "Meter." - default y if !LV_CONF_MINIMAL config LV_USE_ROLLER bool "Roller. Requires: lv_label." select LV_USE_LABEL @@ -642,15 +654,14 @@ menu "LVGL configuration" select LV_USE_BAR default y if !LV_CONF_MINIMAL config LV_USE_SWITCH - bool "Switch. Dependencies: lv_slider." - select LV_USE_SLIDER + bool "Switch." default y if !LV_CONF_MINIMAL config LV_USE_TEXTAREA bool "Text area. Requires: lv_label." select LV_USE_LABEL default y if !LV_CONF_MINIMAL - config LV_TEXTAREA_DEF_PWN_SHOW_TIME - int "Text area def. pwn show time [ms]." + config LV_TEXTAREA_DEF_PWD_SHOW_TIME + int "Text area def. pwd show time [ms]." default 1500 depends on LV_USE_TEXTAREA config LV_USE_TABLE @@ -658,10 +669,9 @@ menu "LVGL configuration" default y if !LV_CONF_MINIMAL endmenu - menu "Extra components" - config LV_USE_ANIMIMG + menu "Extra Widgets" + config LV_USE_ANIMIMG bool "Anim image." - select LV_USE_IMG default y if !LV_CONF_MINIMAL config LV_USE_CALENDAR bool "Calendar." @@ -671,43 +681,141 @@ menu "LVGL configuration" depends on LV_USE_CALENDAR config LV_USE_CALENDAR_HEADER_ARROW bool "Use calendar header arrow" + depends on LV_USE_CALENDAR default y config LV_USE_CALENDAR_HEADER_DROPDOWN bool "Use calendar header dropdown" + depends on LV_USE_CALENDAR default y + config LV_USE_CHART + bool "Chart." + default y if !LV_CONF_MINIMAL config LV_USE_COLORWHEEL bool "Colorwheel." + default y if !LV_CONF_MINIMAL config LV_USE_IMGBTN bool "Imgbtn." + default y if !LV_CONF_MINIMAL config LV_USE_KEYBOARD bool "Keyboard." + default y if !LV_CONF_MINIMAL config LV_USE_LED bool "LED." + default y if !LV_CONF_MINIMAL config LV_USE_LIST bool "List." + default y if !LV_CONF_MINIMAL + config LV_USE_METER + bool "Meter." + default y if !LV_CONF_MINIMAL config LV_USE_MSGBOX bool "Msgbox." + default y if !LV_CONF_MINIMAL config LV_USE_SPINBOX bool "Spinbox." + default y if !LV_CONF_MINIMAL config LV_USE_SPINNER bool "Spinner." + default y if !LV_CONF_MINIMAL config LV_USE_TABVIEW bool "Tabview." + default y if !LV_CONF_MINIMAL config LV_USE_TILEVIEW bool "Tileview" + default y if !LV_CONF_MINIMAL config LV_USE_WIN bool "Win" + default y if !LV_CONF_MINIMAL config LV_USE_SPAN bool "span" + default y if !LV_CONF_MINIMAL + config LV_SPAN_SNIPPET_STACK_SIZE + int "Maximum number of span descriptor" + default 64 + depends on LV_USE_SPAN + endmenu + + menu "Themes" + config LV_USE_THEME_DEFAULT + bool "A simple, impressive and very complete theme" + default y if !LV_CONF_MINIMAL + config LV_THEME_DEFAULT_DARK + bool "Yes to set dark mode, No to set light mode" + depends on LV_USE_THEME_DEFAULT + config LV_THEME_DEFAULT_GROW + bool "Enable grow on press" + default y + depends on LV_USE_THEME_DEFAULT + config LV_THEME_DEFAULT_TRANSITION_TIME + int "Default transition time in [ms]" + default 80 + depends on LV_USE_THEME_DEFAULT + config LV_USE_THEME_BASIC + bool "A very simple theme that is a good starting point for a custom theme" + default y if !LV_CONF_MINIMAL endmenu menu "Layouts" config LV_USE_FLEX bool "A layout similar to Flexbox in CSS." - default y + default y if !LV_CONF_MINIMAL config LV_USE_GRID bool "A layout similar to Grid in CSS." - default y + default y if !LV_CONF_MINIMAL + endmenu + + menu "3rd Party Libraries" + config LV_USE_FS_STDIO + int "File system on top of stdio API" + default 0 + config LV_FS_STDIO_PATH + string "Set the working directory" + depends on LV_USE_FS_STDIO + + config LV_USE_FS_POSIX + int "File system on top of posix API" + default 0 + config LV_FS_POSIX_PATH + string "Set the working directory" + depends on LV_USE_FS_POSIX + + config LV_USE_FS_FATFS + int "File system on top of FatFS" + default 0 + + config LV_USE_PNG + bool "PNG decoder library" + + config LV_USE_BMP + bool "BMP decoder library" + + config LV_USE_SJPG + bool "JPG + split JPG decoder library" + + config LV_USE_GIF + bool "GIF decoder library" + + config LV_USE_QRCODE + bool "QR code library" + + config LV_USE_FREETYPE + bool "FreeType library" + config LV_FREETYPE_CACHE_SIZE + int "Memory used by FreeType to cache characters [bytes] (-1: no caching)" + depends on LV_USE_FREETYPE + default 16384 + endmenu + + menu "Others" + config LV_USE_SNAPSHOT + bool "Enable API to take snapshot" + default y if !LV_CONF_MINIMAL + endmenu + + menu "Examples" + config LV_BUILD_EXAMPLES + bool "Enable the examples to be built" + default y if !LV_CONF_MINIMAL endmenu endmenu diff --git a/lv_conf_template.h b/lv_conf_template.h index 15f19a2f7b..0b7021e002 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -149,23 +149,13 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ /*Use NXP's VG-Lite GPU iMX RTxxx platforms*/ #define LV_USE_GPU_NXP_VG_LITE 0 -/*Use SDL renderer API*/ -#ifndef LV_USE_GPU_SDL -# ifdef CONFIG_LV_USE_GPU_SDL -# define LV_USE_GPU_SDL CONFIG_LV_USE_GPU_SDL -# else -# define LV_USE_GPU_SDL 0 -# endif -#endif -#if LV_USE_GPU_SDL -# define LV_USE_EXTERNAL_RENDERER 1 -# ifndef LV_GPU_SDL_INCLUDE -# define LV_GPU_SDL_INCLUDE_PATH -# endif -#endif +/*Use exnternal renderer*/ +#define LV_USE_EXTERNAL_RENDERER 0 -#ifndef LV_USE_EXTERNAL_RENDERER -# define LV_USE_EXTERNAL_RENDERER 0 +/*Use SDL renderer API*/ +#define LV_USE_GPU_SDL 0 +#if LV_USE_GPU_SDL +# define LV_GPU_SDL_INCLUDE_PATH #endif /*------------- @@ -250,9 +240,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ #endif /*LV_ENABLE_GC*/ -/*1: Enable API to take snapshot for object*/ -#define LV_USE_SNAPSHOT 1 - /*===================== * COMPILER SETTINGS *====================*/ @@ -270,7 +257,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ #define LV_ATTRIBUTE_FLUSH_READY /*Required alignment size for buffers*/ -#define LV_ATTRIBUTE_MEM_ALIGN_SIZE +#define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1 /*Will be added where memories needs to be aligned (with -Os data might not be aligned to boundary by default). * E.g. __attribute__((aligned(4)))*/ @@ -518,7 +505,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_THEME_DEFAULT_GROW 1 /*Default transition time in [ms]*/ -# define LV_THEME_DEFAULT_TRANSITON_TIME 80 +# define LV_THEME_DEFAULT_TRANSITION_TIME 80 #endif /*LV_USE_THEME_DEFAULT*/ /*A very simple theme that is a good starting point for a custom theme*/ @@ -574,6 +561,13 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_FREETYPE_CACHE_SIZE (16 * 1024) #endif +/*----------- + * Others + *----------*/ + +/*1: Enable API to take snapshot for object*/ +#define LV_USE_SNAPSHOT 1 + /*================== * EXAMPLES diff --git a/src/extra/themes/default/lv_theme_default.c b/src/extra/themes/default/lv_theme_default.c index be8b826475..921c32dbe2 100644 --- a/src/extra/themes/default/lv_theme_default.c +++ b/src/extra/themes/default/lv_theme_default.c @@ -29,7 +29,7 @@ #define DARK_COLOR_TEXT lv_palette_lighten(LV_PALETTE_GREY, 5) #define DARK_COLOR_GREY lv_color_hex(0x2f3237) -#define TRANSITION_TIME LV_THEME_DEFAULT_TRANSITON_TIME +#define TRANSITION_TIME LV_THEME_DEFAULT_TRANSITION_TIME #define BORDER_WIDTH lv_disp_dpx(theme.disp, 2) #define OUTLINE_WIDTH lv_disp_dpx(theme.disp, 3) diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index efde8c6589..a89c780140 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -347,40 +347,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # endif #endif -/*Use SDL renderer API*/ -#ifndef LV_USE_GPU_SDL -# ifdef CONFIG_LV_USE_GPU_SDL -#ifndef LV_USE_GPU_SDL -# ifdef CONFIG_LV_USE_GPU_SDL -# define LV_USE_GPU_SDL CONFIG_LV_USE_GPU_SDL -# else -# define LV_USE_GPU_SDL CONFIG_LV_USE_GPU_SDL -# endif -#endif -# else -# define LV_USE_GPU_SDL 0 -# endif -#endif -#if LV_USE_GPU_SDL -#ifndef LV_USE_EXTERNAL_RENDERER -# ifdef CONFIG_LV_USE_EXTERNAL_RENDERER -# define LV_USE_EXTERNAL_RENDERER CONFIG_LV_USE_EXTERNAL_RENDERER -# else -# define LV_USE_EXTERNAL_RENDERER 1 -# endif -#endif -# ifndef LV_GPU_SDL_INCLUDE -#ifndef LV_GPU_SDL_INCLUDE_PATH -# 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 -# endif -#endif -# endif -#endif - -#ifndef LV_USE_EXTERNAL_RENDERER +/*Use exnternal renderer*/ #ifndef LV_USE_EXTERNAL_RENDERER # ifdef CONFIG_LV_USE_EXTERNAL_RENDERER # define LV_USE_EXTERNAL_RENDERER CONFIG_LV_USE_EXTERNAL_RENDERER @@ -388,6 +355,23 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # define LV_USE_EXTERNAL_RENDERER 0 # endif #endif + +/*Use SDL renderer API*/ +#ifndef LV_USE_GPU_SDL +# ifdef CONFIG_LV_USE_GPU_SDL +# define LV_USE_GPU_SDL CONFIG_LV_USE_GPU_SDL +# else +# define LV_USE_GPU_SDL 0 +# endif +#endif +#if LV_USE_GPU_SDL +#ifndef LV_GPU_SDL_INCLUDE_PATH +# 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 +# endif +#endif #endif /*------------- @@ -646,15 +630,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ #endif #endif /*LV_ENABLE_GC*/ -/*1: Enable API to take snapshot for object*/ -#ifndef LV_USE_SNAPSHOT -# ifdef CONFIG_LV_USE_SNAPSHOT -# define LV_USE_SNAPSHOT CONFIG_LV_USE_SNAPSHOT -# else -# define LV_USE_SNAPSHOT 1 -# endif -#endif - /*===================== * COMPILER SETTINGS *====================*/ @@ -700,7 +675,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ # ifdef CONFIG_LV_ATTRIBUTE_MEM_ALIGN_SIZE # define LV_ATTRIBUTE_MEM_ALIGN_SIZE CONFIG_LV_ATTRIBUTE_MEM_ALIGN_SIZE # else -# define LV_ATTRIBUTE_MEM_ALIGN_SIZE +# define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1 # endif #endif @@ -1514,11 +1489,11 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ #endif /*Default transition time in [ms]*/ -#ifndef LV_THEME_DEFAULT_TRANSITON_TIME -# ifdef CONFIG_LV_THEME_DEFAULT_TRANSITON_TIME -# define LV_THEME_DEFAULT_TRANSITON_TIME CONFIG_LV_THEME_DEFAULT_TRANSITON_TIME +#ifndef LV_THEME_DEFAULT_TRANSITION_TIME +# ifdef CONFIG_LV_THEME_DEFAULT_TRANSITION_TIME +# define LV_THEME_DEFAULT_TRANSITION_TIME CONFIG_LV_THEME_DEFAULT_TRANSITION_TIME # else -# define LV_THEME_DEFAULT_TRANSITON_TIME 80 +# define LV_THEME_DEFAULT_TRANSITION_TIME 80 # endif #endif #endif /*LV_USE_THEME_DEFAULT*/ @@ -1660,6 +1635,19 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ #endif #endif +/*----------- + * Others + *----------*/ + +/*1: Enable API to take snapshot for object*/ +#ifndef LV_USE_SNAPSHOT +# ifdef CONFIG_LV_USE_SNAPSHOT +# define LV_USE_SNAPSHOT CONFIG_LV_USE_SNAPSHOT +# else +# define LV_USE_SNAPSHOT 1 +# endif +#endif + /*================== * EXAMPLES diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index f717e2412d..2dfef685e2 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -93,18 +93,18 @@ extern "C" { # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_46 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_48) # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_48 -#elif defined(CONFIG_LV_FONT_DEFAULT_UNSCII_8) -# define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_unscii_8 -#elif defined(CONFIG_LV_FONT_DEFAULT_UNSCII_16) -# define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_unscii_16 -#elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT12SUBPX) +#elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_12_SUBPX) # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_12_subpx -#elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT28COMPRESSED) +#elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_28_COMPRESSED) # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_28_compressed #elif defined(CONFIG_LV_FONT_DEFAULT_DEJAVU_16_PERSIAN_HEBREW) # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_dejavu_16_persian_hebrew #elif defined(CONFIG_LV_FONT_DEFAULT_SIMSUN_16_CJK) # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_simsun_16_cjk +#elif defined(CONFIG_LV_FONT_DEFAULT_UNSCII_8) +# define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_unscii_8 +#elif defined(CONFIG_LV_FONT_DEFAULT_UNSCII_16) +# define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_unscii_16 #endif /*------------------