From 8e5061852ff1b602706a3d6da9173c55305ddda9 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Sun, 10 Oct 2021 00:30:11 +0200 Subject: [PATCH] Added #ifndef LV_FONT_DEFAULT --- include/lv_conf_v7.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/lv_conf_v7.h b/include/lv_conf_v7.h index 117d7f8e..1a702541 100644 --- a/include/lv_conf_v7.h +++ b/include/lv_conf_v7.h @@ -546,13 +546,19 @@ typedef void* lv_font_user_data_t; LV_FONT_DECLARE(HASP_FONT_3) \ LV_FONT_DECLARE(HASP_FONT_4) \ +#ifndef LV_FONT_DEFAULT #define LV_FONT_DEFAULT &HASP_FONT_2 //&lv_font_montserrat_16 -#else -#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(unscii_8_icon); -#define LV_FONT_DEFAULT &unscii_8_icon //&lv_font_unscii_8 -//#define LV_FONT_DEFAULT my_font #endif +#else + +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(unscii_8_icon); +#ifndef LV_FONT_DEFAULT +#define LV_FONT_DEFAULT &unscii_8_icon //&lv_font_unscii_8 +#endif + +#endif // LV_HIGH_RESOURCE_MCU + /*================ * THEME USAGE *================*/