diff --git a/Kconfig b/Kconfig index 3561e062e..11447f631 100644 --- a/Kconfig +++ b/Kconfig @@ -58,7 +58,7 @@ menu "LVGL configuration" Requires `LV_COLOR_DEPTH = 32` colors and the screen's style should be modified: `style.body.opa = ...`. - config LV_COLOR_TRANSP + config LV_COLOR_TRANSP_HEX hex "Images pixels with this color will not be drawn (with chroma keying)." depends on LV_COLOR_SCREEN_TRANSP range 0x000000 0xFFFFFF @@ -332,7 +332,7 @@ menu "LVGL configuration" bool "Enable Montserrat 12" config LV_FONT_MONTSERRAT_14 bool "Enable Montserrat 14" - default y + default y if !LV_CONF_MINIMAL config LV_FONT_MONTSERRAT_16 bool "Enable Montserrat 16" config LV_FONT_MONTSERRAT_18 @@ -369,6 +369,7 @@ menu "LVGL configuration" bool "Enable Montserrat 48" 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 @@ -383,7 +384,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_SMALL prompt "Select theme default small font" - default LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 + default LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_SMALL_UNSCII_8 if LV_CONF_MINIMAL help Select theme default small font @@ -472,7 +474,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_NORMAL prompt "Select theme default normal font" - default LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 + default LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_NORMAL_UNSCII_8 if LV_CONF_MINIMAL help Select theme default normal font @@ -561,7 +564,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_SUBTITLE prompt "Select theme default subtitle font" - default LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 + default LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_SUBTITLE_UNSCII_8 if LV_CONF_MINIMAL help Select theme default subtitle font @@ -650,7 +654,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_TITLE prompt "Select theme default title font" - default LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 + default LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_TITLE_UNSCII_8 if LV_CONF_MINIMAL help Select theme default title font @@ -751,7 +756,8 @@ menu "LVGL configuration" choice LV_THEME_DEFAULT_INIT prompt "Select theme default init" - default LV_THEME_DEFAULT_INIT_MATERIAL + default LV_THEME_DEFAULT_INIT_MATERIAL if !LV_CONF_MINIMAL + default LV_THEME_DEFAULT_INIT_EMPTY if LV_CONF_MINIMAL help Select theme default init diff --git a/scripts/lv_conf_checker.py b/scripts/lv_conf_checker.py index bed793bf2..bc3e008ec 100755 --- a/scripts/lv_conf_checker.py +++ b/scripts/lv_conf_checker.py @@ -38,6 +38,10 @@ fout.write( /* 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") diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index e3f91e800..c9a5ce8db 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -10,14 +10,20 @@ extern "C" { #endif -#if defined ESP_PLATFORM -#include "sdkconfig.h" -#include "esp_attr.h" -#endif - -#ifdef __NuttX__ -#include -#endif +#ifdef LV_CONF_KCONFIG_EXTERNAL_INCLUDE +# include LV_CONF_KCONFIG_EXTERNAL_INCLUDE +#else + +# if defined ESP_PLATFORM +# include "sdkconfig.h" +# include "esp_attr.h" +# endif + +# ifdef __NuttX__ +# include +# endif + +#endif /*LV_CONF_KCONFIG_EXTERNAL_INCLUDE*/ /******************* * LV_MEM_SIZE diff --git a/src/lv_conf_zephyr.h b/src/lv_conf_zephyr.h new file mode 100644 index 000000000..a140ccd61 --- /dev/null +++ b/src/lv_conf_zephyr.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2020 Jan Van Winkel + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifdef __ZEPHYR__ + +#include + +#define LV_MEM_CUSTOM 1 + +#define LV_MEMCPY_MEMSET_STD 1 + +#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 + +#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 + +#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 + +#endif