diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-30 20:36:09 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-30 20:36:09 (GMT) |
| commit | e1cb4f64097a7d084f178f762546cecb5bd3c6be (patch) | |
| tree | 5e6aad673049abbde3e9e06cf06b73a7e8803ade /src/libs | |
| parent | 2c75c4575c8e16da7a46ed75f952d20e703bd70f (diff) | |
only use neofont15
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/lv_conf.h | 13 | ||||
| m--------- | src/libs/lvgl | 0 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index dfec64a..32b4f4d 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -413,10 +413,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in * LV_FONT_DECLARE(my_font_2) */ -#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont0) \ - LV_FONT_DECLARE(neofont1) \ - LV_FONT_DECLARE(neofont15) \ - LV_FONT_DECLARE(neofont2) \ +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont15) \ LV_FONT_DECLARE(lv_font_sys_48) /* Enable it if you have fonts with a lot of characters. @@ -477,10 +474,10 @@ typedef void* lv_font_user_data_t; #define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0xffffff) #define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0xaaaaaa) #define LV_THEME_DEFAULT_FLAG 0//LV_THEME_MATERIAL_FLAG_DARK -#define LV_THEME_DEFAULT_FONT_SMALL &neofont1 -#define LV_THEME_DEFAULT_FONT_NORMAL &neofont1 -#define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont1 -#define LV_THEME_DEFAULT_FONT_TITLE &neofont1 +#define LV_THEME_DEFAULT_FONT_SMALL &neofont15 +#define LV_THEME_DEFAULT_FONT_NORMAL &neofont15 +#define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont15 +#define LV_THEME_DEFAULT_FONT_TITLE &neofont15 /*================= * Text settings diff --git a/src/libs/lvgl b/src/libs/lvgl -Subproject 23430cf20e32294549fff9b2879a9466dacc19b +Subproject d2ea09a907e87c191dd050523a262c4ec1a863a |