From 64923e5d8227b85b8a998a7257e1973670f8e4f6 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Wed, 17 Nov 2021 05:08:40 +0100 Subject: [PATCH] Limit freetype library to ESP32 for now --- lib/lv_lib_freetype/lv_freetype.c | 6 +++++- src/hasp/hasp.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/lv_lib_freetype/lv_freetype.c b/lib/lv_lib_freetype/lv_freetype.c index 3c00d8b6..61f20d5f 100644 --- a/lib/lv_lib_freetype/lv_freetype.c +++ b/lib/lv_lib_freetype/lv_freetype.c @@ -3,6 +3,8 @@ * */ +#if defined(ARDUINO_ARCH_ESP32) + /********************* * INCLUDES *********************/ @@ -466,4 +468,6 @@ void FT_loop_task(void *pvParameters) { xQueueSendToBack(FTResponseQueue, &response, portMAX_DELAY); // send back response } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp index f11e6caa..045beacc 100644 --- a/src/hasp/hasp.cpp +++ b/src/hasp/hasp.cpp @@ -496,9 +496,10 @@ void haspSetup(void) if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE; if(haspFonts[3] == nullptr) haspFonts[3] = LV_THEME_DEFAULT_FONT_TITLE; - // haspFonts[0] = lv_font_load("E:/font_1.fnt"); - // haspFonts[2] = lv_font_load("E:/font_2.fnt"); + // haspFonts[0] = lv_font_load("E:/font_1.fnt"); + // haspFonts[2] = lv_font_load("E:/font_2.fnt"); +#if defined(ARDUINO_ARCH_ESP32) lv_ft_info_t info1; info1.name = "L:/arial.ttf"; info1.weight = 48; @@ -521,6 +522,7 @@ void haspSetup(void) haspFonts[6] = info3.font; haspFonts[7] = hasp_font_load("L:/RobotoCondensedRegular.bin"); +#endif hasp_set_theme(haspThemeId);