From c5fb8fffc62851e7248d7409de82f54e8af1cdca Mon Sep 17 00:00:00 2001 From: fvanroie Date: Mon, 25 Apr 2022 17:52:41 +0200 Subject: [PATCH] Fix Linux compile error --- src/hasp/hasp_font.cpp | 21 ++++++++++----------- user_setups/esp32/_esp32.ini | 10 +++++----- user_setups/esp32s2/_esp32s2.ini | 10 +++++----- user_setups/win32/windows_sdl_64bits.ini | 10 +++++----- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/hasp/hasp_font.cpp b/src/hasp/hasp_font.cpp index 56a02f20..91651add 100644 --- a/src/hasp/hasp_font.cpp +++ b/src/hasp/hasp_font.cpp @@ -28,26 +28,23 @@ void font_setup() { _lv_ll_init(&hasp_fonts_ll, sizeof(hasp_font_info_t)); - // initialize the FreeType renderer -// #ifdef 1 || USE_LVGL_FREETYPE +#if(HASP_USE_FREETYPE > 0) // initialize the FreeType renderer + #if defined(ARDUINO_ARCH_ESP32) - -#if(HASP_USE_FREETYPE > 0) - - if(lv_freetype_init(USE_LVGL_FREETYPE_MAX_FACES, USE_LVGL_FREETYPE_MAX_SIZES, - hasp_use_psram() ? USE_LVGL_FREETYPE_MAX_BYTES_PSRAM : USE_LVGL_FREETYPE_MAX_BYTES)) { + if(lv_freetype_init(LVGL_FREETYPE_MAX_FACES, LVGL_FREETYPE_MAX_SIZES, + hasp_use_psram() ? LVGL_FREETYPE_MAX_BYTES_PSRAM : LVGL_FREETYPE_MAX_BYTES)) { LOG_VERBOSE(TAG_FONT, F("FreeType v%d.%d.%d " D_SERVICE_STARTED), FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH); } else { LOG_ERROR(TAG_FONT, F("FreeType " D_SERVICE_START_FAILED)); } -#else - LOG_VERBOSE(TAG_FONT, F("FreeType " D_SERVICE_DISABLED)); -#endif - #elif defined(WINDOWS) || defined(POSIX) #else #endif + +#else + LOG_VERBOSE(TAG_FONT, F("FreeType " D_SERVICE_DISABLED)); +#endif // HASP_USE_FREETYPE } size_t font_split_payload(const char* payload) @@ -70,7 +67,9 @@ void font_clear_list() if(hasp_font_info_t* font_p = (hasp_font_info_t*)node) { if(font_p->font) { if(font_p->font->user_data) { // It's a FreeType font +#if(HASP_USE_FREETYPE > 0) lv_ft_font_destroy(font_p->font); +#endif } else { // It's a binary font hasp_font_free(font_p->font); } diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini index 606b6a3f..051a5bb3 100644 --- a/user_setups/esp32/_esp32.ini +++ b/user_setups/esp32/_esp32.ini @@ -36,11 +36,11 @@ build_flags = ; -- LittleFS build options ------------------------ ;-D CONFIG_LITTLEFS_FOR_IDF_3_2 ; obsolete in IDF 3.3 ; -- FreeType build options ------------------------ - -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache - -D USE_LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache - -D USE_LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache - -D USE_LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache - -D USE_LVGL_FREETYPE_MAX_BYTES_PSRAM=131072 ; max bytes in cache when using PSRAM + -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache + -D LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache + -D LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache + -D LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache + -D LVGL_FREETYPE_MAX_BYTES_PSRAM=131072 ; max bytes in cache when using PSRAM ; -- SimpleFTpServer build options ----------------- -D HASP_USE_FTP=1 -D FTP_SERVER_DEBUG diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini index dab93bc5..4ee060a8 100644 --- a/user_setups/esp32s2/_esp32s2.ini +++ b/user_setups/esp32s2/_esp32s2.ini @@ -49,11 +49,11 @@ build_flags = ; -- LittleFS build options ------------------------ ;-D CONFIG_LITTLEFS_FOR_IDF_3_2 ; obsolete in IDF 3.3 ; -- FreeType build options ------------------------ - -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache - -D USE_LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache - -D USE_LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache - -D USE_LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache - -D USE_LVGL_FREETYPE_MAX_BYTES_PSRAM=131072 ; max bytes in cache when using PSRAM + -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache + -D LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache + -D LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache + -D LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache + -D LVGL_FREETYPE_MAX_BYTES_PSRAM=131072 ; max bytes in cache when using PSRAM lib_ignore = GxTFT diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini index cfa7a72e..6b4efd45 100644 --- a/user_setups/win32/windows_sdl_64bits.ini +++ b/user_setups/win32/windows_sdl_64bits.ini @@ -38,11 +38,11 @@ build_flags = -D PROGMEM= ; No PROGMEM available ; -- FreeType build options ------------------------ - -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache - -D USE_LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache - -D USE_LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache - -D USE_LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache - -D USE_LVGL_FREETYPE_MAX_BYTES_PSRAM=65536 ; max bytes in cache when using PSRAM + -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache + -D LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache + -D LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache + -D LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache + -D LVGL_FREETYPE_MAX_BYTES_PSRAM=65536 ; max bytes in cache when using PSRAM ;-D LV_LOG_LEVEL=LV_LOG_LEVEL_INFO ;-D LV_LOG_PRINTF=1