Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

makefile and test fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-04-06 12:15:51 +02:00
parent c3b2b57062
commit ff8afc8b0c
5 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lv_conf_template.h
View File

@ -367,6 +367,7 @@ typedef void * lv_font_user_data_t;
#define LV_USE_THEME_EMPTY 0 /*No theme, you can apply your styles as you need*/
#define LV_USE_THEME_TEMPLATE 0 /*Simple to the create your theme based on it*/
#define LV_USE_THEME_MATERIAL 1 /*A fast and impressive theme*/
#define LV_USE_THEME_MONO 0 /*Mono-color theme for monochrome displays*/
#define LV_THEME_DEFAULT_INIT lv_theme_material_init
#define LV_THEME_DEFAULT_COLOR_PRIMARY LV_COLOR_RED

3
src/lv_conf_internal.h
View File

@ -532,6 +532,9 @@
#ifndef LV_USE_THEME_MATERIAL
#define LV_USE_THEME_MATERIAL 1 /*A fast and impressive theme*/
#endif
#ifndef LV_USE_THEME_MONO
#define LV_USE_THEME_MONO 0 /*Mono-color theme for monochrome displays*/
#endif
#ifndef LV_THEME_DEFAULT_INIT
#define LV_THEME_DEFAULT_INIT lv_theme_material_init

17
src/lv_font/lv_font.mk
View File

@ -1,9 +1,18 @@
CSRCS += lv_font.c
CSRCS += lv_font_fmt_txt.c
CSRCS += lv_font_roboto_12.c
CSRCS += lv_font_roboto_16.c
CSRCS += lv_font_roboto_22.c
CSRCS += lv_font_roboto_28.c
CSRCS += lv_font_montserrat_12.c
CSRCS += lv_font_montserrat_14.c
CSRCS += lv_font_montserrat_16.c
CSRCS += lv_font_montserrat_18.c
CSRCS += lv_font_montserrat_20.c
CSRCS += lv_font_montserrat_22.c
CSRCS += lv_font_montserrat_14.c
CSRCS += lv_font_montserrat_26.c
CSRCS += lv_font_montserrat_28.c
CSRCS += lv_font_montserrat_30.c
CSRCS += lv_font_montserrat_32.c
CSRCS += lv_font_montserrat_12_subpx.c
CSRCS += lv_font_montserrat_28_compressed.c
CSRCS += lv_font_unscii_8.c
DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font

2
src/lv_misc/lv_math.c
View File

@ -113,8 +113,6 @@ int32_t lv_bezier3(uint32_t t, int32_t u0, int32_t u1, int32_t u2, int32_t u3)
*/
void lv_sqrt(uint32_t x, lv_sqrt_res_t * q, uint32_t mask)
{
static volatile cnt = 0;
cnt++;
x = x << 8; /*To get 4 bit precision. (sqrt(256) = 16 = 4 bit)*/
uint32_t root = 0;

72
tests/build.py
View File

@ -81,12 +81,12 @@ minimal_monochrome = {
"LV_USE_ASSERT_STR":0,
"LV_USE_ASSERT_OBJ":0,
"LV_USE_ASSERT_STYLE":0,
"LV_FONT_ROBOTO_12":0,
"LV_FONT_ROBOTO_16":0,
"LV_FONT_ROBOTO_22":0,
"LV_FONT_ROBOTO_28":0,
"LV_FONT_ROBOTO_12_SUBPX":0,
"LV_FONT_ROBOTO_28_COMPRESSED":0,
"LV_FONT_MONTSERRAT_12":0,
"LV_FONT_MONTSERRAT_16":0,
"LV_FONT_MONTSERRAT_22":0,
"LV_FONT_MONTSERRAT_28":0,
"LV_FONT_MONTSERRAT_12_SUBPX":0,
"LV_FONT_MONTSERRAT_28_COMPRESSED":0,
"LV_FONT_UNSCII_8":1,
"LV_USE_BIDI": 0,
"LV_USE_OBJ_REALIGN": 0,
@ -144,22 +144,22 @@ all_obj_minimal_features = {
"LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"",
"LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"",
"LV_THEME_DEFAULT_FLAGS" : "\\\"LV_THEME_MATERIAL_FLAG_NONE\\\"",
"LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_roboto_16\\\"",
"LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_roboto_16\\\"",
"LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_roboto_16\\\"",
"LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_roboto_16\\\"",
"LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_montserrat_16\\\"",
"LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_montserrat_16\\\"",
"LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_montserrat_16\\\"",
"LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_16\\\"",
"LV_USE_DEBUG":0,
"LV_USE_ASSERT_NULL":0,
"LV_USE_ASSERT_MEM":0,
"LV_USE_ASSERT_STR":0,
"LV_USE_ASSERT_OBJ":0,
"LV_USE_ASSERT_STYLE":0,
"LV_FONT_ROBOTO_12":0,
"LV_FONT_ROBOTO_16":1,
"LV_FONT_ROBOTO_22":0,
"LV_FONT_ROBOTO_28":0,
"LV_FONT_ROBOTO_12_SUBPX":0,
"LV_FONT_ROBOTO_28_COMPRESSED":0,
"LV_FONT_MONTSERRAT_12":0,
"LV_FONT_MONTSERRAT_16":1,
"LV_FONT_MONTSERRAT_22":0,
"LV_FONT_MONTSERRAT_28":0,
"LV_FONT_MONTSERRAT_12_SUBPX":0,
"LV_FONT_MONTSERRAT_28_COMPRESSED":0,
"LV_FONT_UNSCII_8":0,
"LV_USE_BIDI": 0,
"LV_USE_OBJ_REALIGN": 0,
@ -220,10 +220,10 @@ all_obj_all_features = {
"LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"",
"LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"",
"LV_THEME_DEFAULT_FLAGS" : "\\\"LV_THEME_MATERIAL_FLAG_NONE\\\"",
"LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_roboto_12\\\"",
"LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_roboto_16\\\"",
"LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_roboto_22\\\"",
"LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_roboto_28\\\"",
"LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_montserrat_12\\\"",
"LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_montserrat_16\\\"",
"LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_montserrat_22\\\"",
"LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_28\\\"",
"LV_LOG_PRINTF":0,
"LV_USE_DEBUG":0,
"LV_USE_ASSERT_NULL":0,
@ -231,12 +231,12 @@ all_obj_all_features = {
"LV_USE_ASSERT_STR":0,
"LV_USE_ASSERT_OBJ":0,
"LV_USE_ASSERT_STYLE":0,
"LV_FONT_ROBOTO_12":1,
"LV_FONT_ROBOTO_16":1,
"LV_FONT_ROBOTO_22":1,
"LV_FONT_ROBOTO_28":1,
"LV_FONT_ROBOTO_12_SUBPX":1,
"LV_FONT_ROBOTO_28_COMPRESSED":1,
"LV_FONT_MONTSERRAT_12":1,
"LV_FONT_MONTSERRAT_16":1,
"LV_FONT_MONTSERRAT_22":1,
"LV_FONT_MONTSERRAT_28":1,
"LV_FONT_MONTSERRAT_12_SUBPX":1,
"LV_FONT_MONTSERRAT_28_COMPRESSED":1,
"LV_FONT_UNSCII_8":1,
"LV_USE_ARC":1,
"LV_USE_BAR":1,
@ -300,10 +300,10 @@ advanced_features = {
"LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"",
"LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"",
"LV_THEME_DEFAULT_FLAGS" : "\\\"LV_THEME_MATERIAL_FLAG_NONE\\\"",
"LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_roboto_12\\\"",
"LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_roboto_16\\\"",
"LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_roboto_22\\\"",
"LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_roboto_28\\\"",
"LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_montserrat_12\\\"",
"LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_montserrat_16\\\"",
"LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_montserrat_22\\\"",
"LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_28\\\"",
"LV_LOG_PRINTF":1,
"LV_USE_DEBUG":1,
"LV_USE_ASSERT_NULL":1,
@ -311,12 +311,12 @@ advanced_features = {
"LV_USE_ASSERT_STR":1,
"LV_USE_ASSERT_OBJ":1,
"LV_USE_ASSERT_STYLE":1,
"LV_FONT_ROBOTO_12":1,
"LV_FONT_ROBOTO_16":1,
"LV_FONT_ROBOTO_22":1,
"LV_FONT_ROBOTO_28":1,
"LV_FONT_ROBOTO_12_SUBPX":1,
"LV_FONT_ROBOTO_28_COMPRESSED":1,
"LV_FONT_MONTSERRAT_12":1,
"LV_FONT_MONTSERRAT_16":1,
"LV_FONT_MONTSERRAT_22":1,
"LV_FONT_MONTSERRAT_28":1,
"LV_FONT_MONTSERRAT_12_SUBPX":1,
"LV_FONT_MONTSERRAT_28_COMPRESSED":1,
"LV_FONT_UNSCII_8":1,
"LV_USE_BIDI": 1,
"LV_USE_OBJ_REALIGN": 1,