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

fix(conf) better support bool option from Kconfign (#2555)

Browse Source 
* fix(arc) format code

Signed-off-by: FASTSHIFT <vifextech@foxmail.com>

* fix(Kconfig) add missing LV_BUILD_EXAMPLES configuration

Signed-off-by: FASTSHIFT <vifextech@foxmail.com>

* fix(fsdrv): remove the seek call in fs_open (#2736)

since the file should be located at zero after open

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

* docs(os) add example and clarify some poinits

* fix(draw border):border draw error if border width > radius (#2739)

* fix(label) consider base dir lv_label_get_letter_pos in special cases

related to https://github.com/lvgl/lvgl/issues/2712#issuecomment-953463193

* improve lv_conf_internal_gen.py for better Kconfig support

Co-authored-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com>
Co-authored-by: guoweilkd <guowei15@xiaomi.com>
Co-authored-by: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
This commit is contained in:
_VIFEXTech
2021-11-05 22:41:47 +08:00
committed by Gabor Kiss-Vamosi
parent 607dfeceb6
commit abcf5660a9
4 changed files with 601 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Kconfig
View File

@@ -836,4 +836,8 @@ menu "LVGL configuration"
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL
endmenu endmenu
config LV_BUILD_EXAMPLES
bool "Enable the examples to be built with the library."
default y
endmenu endmenu

2
lv_conf_template.h
View File

@@ -407,7 +407,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
#define LV_USE_ARC 1 #define LV_USE_ARC 1
#define LV_USE_ANIMIMG 1 #define LV_USE_ANIMIMG 1
#define LV_USE_BAR 1 #define LV_USE_BAR 1

80
scripts/lv_conf_internal_gen.py
View File

@@ -59,6 +59,9 @@ fout.write(
# endif # endif
#endif #endif
#ifdef CONFIG_LV_COLOR_DEPTH
# define _LV_KCONFIG_PRESENT
#endif
/*---------------------------------- /*----------------------------------
* Start parsing lv_conf_template.h * Start parsing lv_conf_template.h
@@ -68,44 +71,65 @@ fout.write(
started = 0 started = 0
for i in fin.read().splitlines(): for line in fin.read().splitlines():
if not started: if not started:
if '#define LV_CONF_H' in i: if '#define LV_CONF_H' in line:
started = 1 started = 1
continue continue
else: else:
continue continue
if '/*--END OF LV_CONF_H--*/' in i: break if '/*--END OF LV_CONF_H--*/' in line: break
r = re.search(r'^ *# *define ([^\s]+).*$', i) #Is there a #define in this line?
r = re.search(r'^[\s]*#[\s]*define[\s]+([^\s]+).*$', line) # \s means any white space character
#ifndef LV_USE_BTN /*Only if not defined in lv_conf.h*/
# ifdef CONFIG_LV_USE_BTN /*Use KConfig value if set*/
# define LV_USE_BTN CONFIG_LV_USE_BTN
# else
# define LV_USE_BTN 1 /*Use default value*/
# endif
#endif
if r: if r:
line = re.sub('\(.*?\)', '', r[1], 1) #remove parentheses from macros name = r[1]
dr = re.sub('.*# *define', '', i, 1) name = re.sub('\(.*?\)', '', name, 1) #remove parentheses from macros. E.g. MY_FUNC(5) -> MY_FUNC
d = "# define" + dr
name_and_value = re.sub('.*# *define', '', line, 1)
fout.write(
f'#ifndef {line}\n' #If the value should be 1 (enabled) by default use a more complex structure for Kconfig checks because
f'# ifdef CONFIG_{line.upper()}\n' #if a not defined CONFIG_... value should be interpreted as 0 and not the LVGL default
f'# define {line} CONFIG_{line.upper()}\n' is_one = re.search(r'.*#.*define +[A-Z0-9_]+ +1[^0-9]*', line)
f'# else\n' if(is_one):
f'{d}\n' #1. Use the value if already set from lv_conf.h or anything else (i.e. do nothing)
f'# endif\n' #2. In Kconfig environment use the CONFIG_... value if set, else use 0
f'#endif\n' #3. In not Kconfig environment use the LVGL's default value
)
elif re.search('^ *typedef .*;.*$', i): fout.write(
f'#ifndef {name}\n'
f'# ifdef _LV_KCONFIG_PRESENT\n'
f'# ifdef CONFIG_{name.upper()}\n'
f'# define {name} CONFIG_{name.upper()}\n'
f'# else\n'
f'# define {name} 0\n'
f'# endif\n'
f'# else\n'
f'# define {name_and_value}\n'
f'# endif\n'
f'#endif\n'
)
else:
#1. Use the value if already set from lv_conf.h or anything else (i.e. do nothing)
#2. Use the Kconfig value if set
#3. Use the LVGL's default value
fout.write(
f'#ifndef {name}\n'
f'# ifdef CONFIG_{name.upper()}\n'
f'# define {name} CONFIG_{name.upper()}\n'
f'# else\n'
f'# define {name_and_value}\n'
f'# endif\n'
f'#endif\n'
)
elif re.search('^ *typedef .*;.*$', line):
continue #ignore typedefs to avoide redeclaration continue #ignore typedefs to avoide redeclaration
else: else:
fout.write(f'{i}\n') fout.write(f'{line}\n')
fout.write( fout.write(
''' '''
@@ -116,6 +140,8 @@ fout.write(
LV_EXPORT_CONST_INT(LV_DPI_DEF); LV_EXPORT_CONST_INT(LV_DPI_DEF);
#undef _LV_KCONFIG_PRESENT
/*If running without lv_conf.h add typdesf with default value*/ /*If running without lv_conf.h add typdesf with default value*/
#ifdef 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*/

841
src/lv_conf_internal.h
View File

File diff suppressed because it is too large Load Diff