github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(kconfig) sync Kconfig with the latest lv_conf_template.h (#2662)

Browse Source 
* fix(conf): correct LV_USE_EXTERNAL_RENDERER and LV_USE_GPU_SDL related setting

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* fix(Kconfig): typo error in the font and theme related setting

and correct the default value and sequence

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* fix(Kconfig): Add the missing misc config

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* fix(Kconfig): sync widget and theme in Kconfig with lv_conf_template.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* fix(Kconfig): add the option for 3rd party library and examples

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2021-10-15 02:34:16 -07:00
committed by GitHub
parent a5793c70a9
commit 4baaa6fe07
5 changed files with 243 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/extra/themes/default/lv_theme_default.c
View File

@@ -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)

84
src/lv_conf_internal.h
View File

@@ -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 <SDL2/SDL.h>
# 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 <SDL2/SDL.h>
# 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

12
src/lv_conf_kconfig.h
View File

@@ -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
/*------------------