diff options
| -rw-r--r-- | src/displayapp/fonts/neofont.c | 2 | ||||
| -rw-r--r-- | src/displayapp/fonts/neofont.h | 2 | ||||
| -rw-r--r-- | src/libs/lv_conf.h | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/displayapp/fonts/neofont.c b/src/displayapp/fonts/neofont.c index 538b16b..e2e67e7 100644 --- a/src/displayapp/fonts/neofont.c +++ b/src/displayapp/fonts/neofont.c @@ -532,7 +532,7 @@ static const uint8_t * neofont1_glyph_bitmap_cb(const lv_font_t * font, uint32_t } /*Describe the properties of a font*/ -lv_font_t neofont1 = { +const lv_font_t neofont1 = { .get_glyph_dsc = neofont1_glyph_dsc_cb, /*Set a callback to get info about gylphs*/ .get_glyph_bitmap = neofont1_glyph_bitmap_cb, /*Set a callback to get bitmap of a glyp*/ .line_height = 12, /*The real line height where any text fits*/ diff --git a/src/displayapp/fonts/neofont.h b/src/displayapp/fonts/neofont.h index b6064b5..94d9e59 100644 --- a/src/displayapp/fonts/neofont.h +++ b/src/displayapp/fonts/neofont.h @@ -9,7 +9,7 @@ extern "C" { #endif extern const lv_font_t neofont0; -// extern const lv_font_t neofont1; +extern const lv_font_t neofont1; // extern const lv_font_t neofont2; extern const lv_font_t neofont3; diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 73b2d50..c1af42d 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -413,8 +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(neofont1) \ - LV_FONT_DECLARE(neofont2) \ +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont2) \ LV_FONT_DECLARE(lv_font_sys_48) /* Enable it if you have fonts with a lot of characters. @@ -475,7 +474,7 @@ 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_SMALL &neofont2 #define LV_THEME_DEFAULT_FONT_NORMAL &neofont2 #define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont2 #define LV_THEME_DEFAULT_FONT_TITLE &neofont2 |