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

fix(build): remove lv_ prefix from path

Browse Source
This commit is contained in:
Xiang Xiao
2021-03-23 23:19:14 +08:00
parent 04990aefe5
commit 8dd3c76305
8 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Kconfig
View File

@@ -66,7 +66,7 @@ menu "LVGL configuration"
range 0x000000 0xFFFFFF range 0x000000 0xFFFFFF
default 0x00FF00 default 0x00FF00
help help
See lv_misc/lv_color.h for some color values examples. See misc/lv_color.h for some color values examples.
config LV_ANTIALIAS config LV_ANTIALIAS
bool "Enable anti-aliasing (lines, and radiuses will be smoothed)." bool "Enable anti-aliasing (lines, and radiuses will be smoothed)."
@@ -844,7 +844,7 @@ menu "LVGL configuration"
default 0xFF0000 if !LV_THEME_DEFAULT_INIT_MONO default 0xFF0000 if !LV_THEME_DEFAULT_INIT_MONO
default 0x000000 if LV_THEME_DEFAULT_INIT_MONO default 0x000000 if LV_THEME_DEFAULT_INIT_MONO
help help
See lv_misc/lv_color.h for some color values examples. See misc/lv_color.h for some color values examples.
When using LV_THEME_MONO the suggested values to use are When using LV_THEME_MONO the suggested values to use are
0x000000 (LV_COLOR_BLACK) or 0xFFFFFF (LV_COLOR_WHITE). 0x000000 (LV_COLOR_BLACK) or 0xFFFFFF (LV_COLOR_WHITE).
If LV_THEME_DEFAULT_COLOR_PRIMARY is 0x000000 (LV_COLOR_BLACK) If LV_THEME_DEFAULT_COLOR_PRIMARY is 0x000000 (LV_COLOR_BLACK)
@@ -857,7 +857,7 @@ menu "LVGL configuration"
default 0x0000FF if !LV_THEME_DEFAULT_INIT_MONO default 0x0000FF if !LV_THEME_DEFAULT_INIT_MONO
default 0xFFFFFF if LV_THEME_DEFAULT_INIT_MONO default 0xFFFFFF if LV_THEME_DEFAULT_INIT_MONO
help help
See lv_misc/lv_color.h for some color values examples. See misc/lv_color.h for some color values examples.
When using LV_THEME_MONO the suggested values to use are When using LV_THEME_MONO the suggested values to use are
0x000000 (LV_COLOR_BLACK) or 0xFFFFFF (LV_COLOR_WHITE). 0x000000 (LV_COLOR_BLACK) or 0xFFFFFF (LV_COLOR_WHITE).
If LV_THEME_DEFAULT_COLOR_PRIMARY is 0x000000 (LV_COLOR_BLACK) If LV_THEME_DEFAULT_COLOR_PRIMARY is 0x000000 (LV_COLOR_BLACK)

30
component.mk
View File

@@ -2,22 +2,20 @@
COMPONENT_SRCDIRS := . COMPONENT_SRCDIRS := .
COMPONENT_SRCDIRS += src COMPONENT_SRCDIRS += src
COMPONENT_SRCDIRS += src/lv_core COMPONENT_SRCDIRS += src/core
COMPONENT_SRCDIRS += src/lv_draw COMPONENT_SRCDIRS += src/draw
COMPONENT_SRCDIRS += src/lv_font COMPONENT_SRCDIRS += src/font
COMPONENT_SRCDIRS += src/lv_gpu COMPONENT_SRCDIRS += src/gpu
COMPONENT_SRCDIRS += src/lv_hal COMPONENT_SRCDIRS += src/hal
COMPONENT_SRCDIRS += src/lv_misc COMPONENT_SRCDIRS += src/misc
COMPONENT_SRCDIRS += src/lv_themes COMPONENT_SRCDIRS += src/widgets
COMPONENT_SRCDIRS += src/lv_widgets
COMPONENT_ADD_INCLUDEDIRS := . COMPONENT_ADD_INCLUDEDIRS := .
COMPONENT_ADD_INCLUDEDIRS += src COMPONENT_ADD_INCLUDEDIRS += src
COMPONENT_ADD_INCLUDEDIRS += src/lv_core COMPONENT_ADD_INCLUDEDIRS += src/core
COMPONENT_ADD_INCLUDEDIRS += src/lv_draw COMPONENT_ADD_INCLUDEDIRS += src/draw
COMPONENT_ADD_INCLUDEDIRS += src/lv_font COMPONENT_ADD_INCLUDEDIRS += src/font
COMPONENT_ADD_INCLUDEDIRS += src/lv_gpu COMPONENT_ADD_INCLUDEDIRS += src/gpu
COMPONENT_ADD_INCLUDEDIRS += src/lv_hal COMPONENT_ADD_INCLUDEDIRS += src/hal
COMPONENT_ADD_INCLUDEDIRS += src/lv_misc COMPONENT_ADD_INCLUDEDIRS += src/misc
COMPONENT_ADD_INCLUDEDIRS += src/lv_themes COMPONENT_ADD_INCLUDEDIRS += src/widgets
COMPONENT_ADD_INCLUDEDIRS += src/lv_widgets

2
docs/CODING_STYLE.md
View File

@@ -1,7 +1,7 @@
# Coding style # Coding style
## File format ## File format
Use [lv_misc/lv_templ.c](https://github.com/lvgl/lvgl/blob/master/src/lv_misc/lv_templ.c) and [lv_misc/lv_templ.h](https://github.com/lvgl/lvgl/blob/master/src/lv_misc/lv_templ.h) Use [misc/lv_templ.c](https://github.com/lvgl/lvgl/blob/master/src/misc/lv_templ.c) and [misc/lv_templ.h](https://github.com/lvgl/lvgl/blob/master/src/misc/lv_templ.h)
## Naming conventions ## Naming conventions
* Words are separated by '_' * Words are separated by '_'

46
scripts/code-format.cfg
View File

@@ -24,26 +24,26 @@
--preserve-date --preserve-date
--formatted --formatted
--exclude=lv_conf_internal.h --exclude=lv_conf_internal.h
--exclude=../src/lv_font/lv_font_montserrat_12.c --exclude=../src/font/lv_font_montserrat_12.c
--exclude=../src/lv_font/lv_font_montserrat_14.c --exclude=../src/font/lv_font_montserrat_14.c
--exclude=../src/lv_font/lv_font_montserrat_16.c --exclude=../src/font/lv_font_montserrat_16.c
--exclude=../src/lv_font/lv_font_montserrat_18.c --exclude=../src/font/lv_font_montserrat_18.c
--exclude=../src/lv_font/lv_font_montserrat_20.c --exclude=../src/font/lv_font_montserrat_20.c
--exclude=../src/lv_font/lv_font_montserrat_22.c --exclude=../src/font/lv_font_montserrat_22.c
--exclude=../src/lv_font/lv_font_montserrat_24.c --exclude=../src/font/lv_font_montserrat_24.c
--exclude=../src/lv_font/lv_font_montserrat_26.c --exclude=../src/font/lv_font_montserrat_26.c
--exclude=../src/lv_font/lv_font_montserrat_28.c --exclude=../src/font/lv_font_montserrat_28.c
--exclude=../src/lv_font/lv_font_montserrat_30.c --exclude=../src/font/lv_font_montserrat_30.c
--exclude=../src/lv_font/lv_font_montserrat_32.c --exclude=../src/font/lv_font_montserrat_32.c
--exclude=../src/lv_font/lv_font_montserrat_34.c --exclude=../src/font/lv_font_montserrat_34.c
--exclude=../src/lv_font/lv_font_montserrat_36.c --exclude=../src/font/lv_font_montserrat_36.c
--exclude=../src/lv_font/lv_font_montserrat_38.c --exclude=../src/font/lv_font_montserrat_38.c
--exclude=../src/lv_font/lv_font_montserrat_40.c --exclude=../src/font/lv_font_montserrat_40.c
--exclude=../src/lv_font/lv_font_montserrat_42.c --exclude=../src/font/lv_font_montserrat_42.c
--exclude=../src/lv_font/lv_font_montserrat_44.c --exclude=../src/font/lv_font_montserrat_44.c
--exclude=../src/lv_font/lv_font_montserrat_46.c --exclude=../src/font/lv_font_montserrat_46.c
--exclude=../src/lv_font/lv_font_montserrat_48.c --exclude=../src/font/lv_font_montserrat_48.c
--exclude=../src/lv_font/lv_font_montserrat_12_subpx.c --exclude=../src/font/lv_font_montserrat_12_subpx.c
--exclude=../src/lv_font/lv_font_montserrat_28_compressed.c --exclude=../src/font/lv_font_montserrat_28_compressed.c
--exclude=../src/lv_font/lv_font_simsun_16_cjk.c --exclude=../src/font/lv_font_simsun_16_cjk.c
--exclude=../src/lv_font/lv_font_dejavu_16_persian_hebrew.c --exclude=../src/font/lv_font_dejavu_16_persian_hebrew.c

4
scripts/style_api_gen.py
View File

@@ -133,7 +133,7 @@ def local_style_set(p):
print("") print("")
base_dir = os.path.abspath(os.path.dirname(__file__)) base_dir = os.path.abspath(os.path.dirname(__file__))
sys.stdout = open(base_dir + '/../src/lv_core/lv_obj_style_gen.h', 'w') sys.stdout = open(base_dir + '/../src/core/lv_obj_style_gen.h', 'w')
for p in props: for p in props:
obj_style_get(p) obj_style_get(p)
@@ -141,7 +141,7 @@ for p in props:
for p in props: for p in props:
local_style_set(p) local_style_set(p)
sys.stdout = open(base_dir + '/../src/lv_misc/lv_style_gen.h', 'w') sys.stdout = open(base_dir + '/../src/misc/lv_style_gen.h', 'w')
for p in props: for p in props:
style_set(p) style_set(p)

2
src/core/lv_obj.c
View File

@@ -108,7 +108,7 @@ void lv_init(void)
LV_LOG_INFO("begin"); LV_LOG_INFO("begin");
/*Initialize the lv_misc modules*/ /*Initialize the misc modules*/
lv_mem_init(); lv_mem_init();
_lv_timer_core_init(); _lv_timer_core_init();

2
src/font/lv_symbol_def.h
View File

@@ -91,7 +91,7 @@ extern "C" {
/* /*
* The following list is generated using * The following list is generated using
* cat src/lv_font/lv_symbol_def.h | sed -E -n 's/^#define\s+LV_(SYMBOL_\w+).*".*$/ _LV_STR_\1,/p' * cat src/font/lv_symbol_def.h | sed -E -n 's/^#define\s+LV_(SYMBOL_\w+).*".*$/ _LV_STR_\1,/p'
*/ */
enum { enum {
_LV_STR_SYMBOL_AUDIO, _LV_STR_SYMBOL_AUDIO,

2
src/gpu/lv_gpu_nxp_vglite.h
View File

@@ -37,7 +37,7 @@ extern "C" {
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
#include "lv_misc/lv_area.h" #include "misc/lv_area.h"
/********************* /*********************
* DEFINES * DEFINES