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

fix(conf) make a better style alignment in lv_conf_internal.h (#2652)

Browse Source 
and reorder Kconfig and src/lv_conf_kconfig.h as lv_conf_template.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2021-10-12 09:15:05 -07:00
committed by GitHub
parent 8debe10cd2
commit 7124ef7761
5 changed files with 388 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Kconfig
View File

@@ -2,14 +2,6 @@
menu "LVGL configuration" menu "LVGL configuration"
config LV_ATTRIBUTE_FAST_MEM_USE_IRAM
bool "Set IRAM as LV_ATTRIBUTE_FAST_MEM"
help
Set this option to configure IRAM as LV_ATTRIBUTE_FAST_MEM
config LV_CONF_MINIMAL
bool "LVGL minimal configuration."
# Define CONFIG_LV_CONF_SKIP so we can use LVGL # Define CONFIG_LV_CONF_SKIP so we can use LVGL
# without lv_conf.h file, the lv_conf_internal.h and # without lv_conf.h file, the lv_conf_internal.h and
# lv_conf_kconfig.h files are used instead. # lv_conf_kconfig.h files are used instead.
@@ -17,6 +9,9 @@ menu "LVGL configuration"
bool bool
default y default y
config LV_CONF_MINIMAL
bool "LVGL minimal configuration."
menu "Color settings" menu "Color settings"
choice choice
prompt "Color depth." prompt "Color depth."
@@ -97,12 +92,10 @@ menu "LVGL configuration"
default 30 default 30
config LV_TICK_CUSTOM config LV_TICK_CUSTOM
bool bool "Use a custom tick source"
prompt "Use a custom tick source"
config LV_TICK_CUSTOM_INCLUDE config LV_TICK_CUSTOM_INCLUDE
string string "Header for the system time function"
prompt "Header for the system time function"
default "Arduino.h" default "Arduino.h"
depends on LV_TICK_CUSTOM depends on LV_TICK_CUSTOM
@@ -319,6 +312,11 @@ menu "LVGL configuration"
config LV_BIG_ENDIAN_SYSTEM config LV_BIG_ENDIAN_SYSTEM
bool "For big endian systems set to 1" bool "For big endian systems set to 1"
config LV_ATTRIBUTE_FAST_MEM_USE_IRAM
bool "Set IRAM as LV_ATTRIBUTE_FAST_MEM"
help
Set this option to configure IRAM as LV_ATTRIBUTE_FAST_MEM
config LV_USE_LARGE_COORD config LV_USE_LARGE_COORD
bool "Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t" bool "Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t"
endmenu endmenu

10
scripts/lv_conf_internal_gen.py
View File

@@ -36,7 +36,7 @@ fout.write(
#endif #endif
/*If "lv_conf.h" is available from here try to use it later.*/ /*If "lv_conf.h" is available from here try to use it later.*/
#if defined __has_include #ifdef __has_include
# if __has_include("lv_conf.h") # if __has_include("lv_conf.h")
# ifndef LV_CONF_INCLUDE_SIMPLE # ifndef LV_CONF_INCLUDE_SIMPLE
# define LV_CONF_INCLUDE_SIMPLE # define LV_CONF_INCLUDE_SIMPLE
@@ -45,8 +45,8 @@ fout.write(
#endif #endif
/*If lv_conf.h is not skipped include it*/ /*If lv_conf.h is not skipped include it*/
#if !defined(LV_CONF_SKIP) #ifndef LV_CONF_SKIP
# if defined(LV_CONF_PATH) /*If there is a path defined for lv_conf.h use it*/ # ifdef LV_CONF_PATH /*If there is a path defined for lv_conf.h use it*/
# define __LV_TO_STR_AUX(x) #x # define __LV_TO_STR_AUX(x) #x
# define __LV_TO_STR(x) __LV_TO_STR_AUX(x) # define __LV_TO_STR(x) __LV_TO_STR_AUX(x)
# include __LV_TO_STR(LV_CONF_PATH) # include __LV_TO_STR(LV_CONF_PATH)
@@ -117,12 +117,10 @@ fout.write(
LV_EXPORT_CONST_INT(LV_DPI_DEF); LV_EXPORT_CONST_INT(LV_DPI_DEF);
/*If running without lv_conf.h add typdesf with default value*/ /*If running without lv_conf.h add typdesf with default value*/
#if defined(LV_CONF_SKIP) #ifdef LV_CONF_SKIP
# if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /*Disable warnings for Visual Studio*/ # if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /*Disable warnings for Visual Studio*/
# define _CRT_SECURE_NO_WARNINGS # define _CRT_SECURE_NO_WARNINGS
# endif # endif
#endif /*defined(LV_CONF_SKIP)*/ #endif /*defined(LV_CONF_SKIP)*/
#endif /*LV_CONF_INTERNAL_H*/ #endif /*LV_CONF_INTERNAL_H*/

12
src/lv_conf_internal.h
View File

@@ -19,7 +19,7 @@
#endif #endif
/*If "lv_conf.h" is available from here try to use it later.*/ /*If "lv_conf.h" is available from here try to use it later.*/
#if defined __has_include #ifdef __has_include
# if __has_include("lv_conf.h") # if __has_include("lv_conf.h")
# ifndef LV_CONF_INCLUDE_SIMPLE # ifndef LV_CONF_INCLUDE_SIMPLE
# define LV_CONF_INCLUDE_SIMPLE # define LV_CONF_INCLUDE_SIMPLE
@@ -28,8 +28,8 @@
#endif #endif
/*If lv_conf.h is not skipped include it*/ /*If lv_conf.h is not skipped include it*/
#if !defined(LV_CONF_SKIP) #ifndef LV_CONF_SKIP
# if defined(LV_CONF_PATH) /*If there is a path defined for lv_conf.h use it*/ # ifdef LV_CONF_PATH /*If there is a path defined for lv_conf.h use it*/
# define __LV_TO_STR_AUX(x) #x # define __LV_TO_STR_AUX(x) #x
# define __LV_TO_STR(x) __LV_TO_STR_AUX(x) # define __LV_TO_STR(x) __LV_TO_STR_AUX(x)
# include __LV_TO_STR(LV_CONF_PATH) # include __LV_TO_STR(LV_CONF_PATH)
@@ -1650,7 +1650,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
# endif # endif
#endif #endif
#if LV_USE_FREETYPE #if LV_USE_FREETYPE
/*Memory used by FreeType to cache characters [bytes]*/ /*Memory used by FreeType to cache characters [bytes] (-1: no caching)*/
#ifndef LV_FREETYPE_CACHE_SIZE #ifndef LV_FREETYPE_CACHE_SIZE
# ifdef CONFIG_LV_FREETYPE_CACHE_SIZE # ifdef CONFIG_LV_FREETYPE_CACHE_SIZE
# define LV_FREETYPE_CACHE_SIZE CONFIG_LV_FREETYPE_CACHE_SIZE # define LV_FREETYPE_CACHE_SIZE CONFIG_LV_FREETYPE_CACHE_SIZE
@@ -1683,12 +1683,10 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
LV_EXPORT_CONST_INT(LV_DPI_DEF); LV_EXPORT_CONST_INT(LV_DPI_DEF);
/*If running without lv_conf.h add typdesf with default value*/ /*If running without lv_conf.h add typdesf with default value*/
#if defined(LV_CONF_SKIP) #ifdef LV_CONF_SKIP
# if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /*Disable warnings for Visual Studio*/ # if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /*Disable warnings for Visual Studio*/
# define _CRT_SECURE_NO_WARNINGS # define _CRT_SECURE_NO_WARNINGS
# endif # endif
#endif /*defined(LV_CONF_SKIP)*/ #endif /*defined(LV_CONF_SKIP)*/
#endif /*LV_CONF_INTERNAL_H*/ #endif /*LV_CONF_INTERNAL_H*/

156
src/lv_conf_kconfig.h
View File

@@ -11,7 +11,7 @@ extern "C" {
# include LV_CONF_KCONFIG_EXTERNAL_INCLUDE # include LV_CONF_KCONFIG_EXTERNAL_INCLUDE
#else #else
# if defined ESP_PLATFORM # ifdef ESP_PLATFORM
# include "sdkconfig.h" # include "sdkconfig.h"
# include "esp_attr.h" # include "esp_attr.h"
# endif # endif
@@ -22,26 +22,20 @@ extern "C" {
#endif /*LV_CONF_KCONFIG_EXTERNAL_INCLUDE*/ #endif /*LV_CONF_KCONFIG_EXTERNAL_INCLUDE*/
/*******************
* LV_MEM_SIZE
*******************/
#ifndef LV_MEM_SIZE
#if defined (CONFIG_LV_MEM_SIZE_KILOBYTES)
#define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_KILOBYTES * 1024U)
#endif
#endif
/******************* /*******************
* LV COLOR CHROMA KEY * LV COLOR CHROMA KEY
*******************/ *******************/
#ifndef LV_COLOR_CHROMA_KEY #ifdef CONFIG_LV_COLOR_CHROMA_KEY_HEX
#if defined (CONFIG_LV_COLOR_CHROMA_KEY_HEX) # define CONFIG_LV_COLOR_CHROMA_KEY lv_color_hex(CONFIG_LV_COLOR_CHROMA_KEY_HEX)
#define CONFIG_LV_COLOR_CHROMA_KEY lv_color_hex(CONFIG_LV_COLOR_CHROMA_KEY_HEX)
#else
#define CONFIG_LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /* pure green */
#endif #endif
/*******************
* LV_MEM_SIZE
*******************/
#ifdef CONFIG_LV_MEM_SIZE_KILOBYTES
# define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_KILOBYTES * 1024U)
#endif #endif
/******************** /********************
@@ -57,87 +51,81 @@ extern "C" {
/*------------------ /*------------------
* DEFAULT FONT * DEFAULT FONT
*-----------------*/ *-----------------*/
#ifndef LV_THEME_DEFAULT_FONT #ifdef CONFIG_LV_FONT_DEFAULT_MONTSERRAT_8
#if defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_8 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_8
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_8 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_10)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_10 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_10
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_10 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_12)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_12 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_12
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_12 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_14)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_14 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_14
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_14 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_16)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_16 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_16
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_16 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_18)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_18 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_18
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_18 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_20)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_20 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_20
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_20 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_22)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_22 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_22
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_22 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_24)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_24 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_24
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_24 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_26
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_26 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_28)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_28 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_28
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_28 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_30)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_30 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_30
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_30 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_32)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_32 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_32
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_32 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_34)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_34 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_34
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_34 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_36)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_36 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_36
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_36 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_38)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_38 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_38
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_38 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_40)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_40 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_40
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_40 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_42)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_42 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_42
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_42 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_44)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_44 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_44
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_44 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_46)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_46 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_46
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_46 #elif defined(CONFIG_LV_FONT_DEFAULT_MONTSERRAT_48)
#elif defined CONFIG_LV_FONT_DEFAULT_MONTSERRAT_48 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_48
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_48 #elif defined(CONFIG_LV_FONT_DEFAULT_UNSCII_8)
#elif defined CONFIG_LV_FONT_DEFAULT_UNSCII_8 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_unscii_8
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_unscii_8 #elif defined(CONFIG_LV_FONT_DEFAULT_UNSCII_16)
#elif defined CONFIG_LV_FONT_DEFAULT_UNSCII_16 # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_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_MONTSERRAT12SUBPX # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_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_MONTSERRAT28COMPRESSED # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_28_compressed
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_montserrat_28_compressed #elif defined(CONFIG_LV_FONT_DEFAULT_DEJAVU_16_PERSIAN_HEBREW)
#elif defined CONFIG_LV_FONT_DEFAULT_DEJAVU_16_PERSIAN_HEBREW # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_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)
#elif defined CONFIG_LV_FONT_DEFAULT_SIMSUN_16_CJK # define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_simsun_16_cjk
#define CONFIG_LV_THEME_DEFAULT_FONT &lv_font_simsun_16_cjk
#endif
#endif #endif
/*------------------ /*------------------
* TEXT ENCODING * TEXT ENCODING
*-----------------*/ *-----------------*/
#ifndef LV_TEXT_ENC
#ifdef CONFIG_LV_TXT_ENC_UTF8 #ifdef CONFIG_LV_TXT_ENC_UTF8
#define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 # define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8
#elif defined CONFIG_LV_TXT_ENC_ASCII #elif defined(CONFIG_LV_TXT_ENC_ASCII)
#define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII # define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII
#endif
#endif #endif
/*------------------ /*------------------
* BIDI DIRECTION * BIDI DIRECTION
*-----------------*/ *-----------------*/
#ifndef LV_BIDI_BASE_DIR_DEF
#ifdef CONFIG_LV_BASE_DIR_LTR #ifdef CONFIG_LV_BASE_DIR_LTR
#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_LTR # define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_LTR
#elif defined CONFIG_LV_BASE_DIR_RTL #elif defined(CONFIG_LV_BASE_DIR_RTL)
#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_RTL # define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_RTL
#elif defined CONFIG_LV_BASE_DIR_AUTO #elif defined(CONFIG_LV_BASE_DIR_AUTO)
#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO # define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO
#endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus