Update configs

.github/workflows/build.yaml

@@ -35,6 +35,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
       - name: Cache pip
         uses: actions/cache@v2
         with:

include/hasp_conf.h

@@ -192,7 +192,7 @@
 
 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
 #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
-#include "lv_zifont.h"
+// #include "lv_zifont.h"
 #endif
 #endif
 

platformio.ini

@@ -65,8 +65,8 @@ build_flags =
 
     ; -- Hasp build options ----------------------------
     -D HASP_VER_MAJ=0
-    -D HASP_VER_MIN=6
-    -D HASP_VER_REV=3
+    -D HASP_VER_MIN=7
+    -D HASP_VER_REV=0
     ${override.build_flags}
 
 ; -- Shared library dependencies in all environments

src/hasp/hasp.cpp

@@ -501,6 +501,7 @@ void haspSetup(void)
     LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, haspFonts[0]);
     // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16);
 
+/* ZiFonts
 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
 #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
 
@@ -521,6 +522,7 @@ void haspSetup(void)
 
 #endif
 #endif
+*/
 
     if(haspFonts[0] == nullptr) haspFonts[0] = LV_THEME_DEFAULT_FONT_SMALL;
     if(haspFonts[1] == nullptr) haspFonts[1] = LV_THEME_DEFAULT_FONT_NORMAL;
@@ -534,7 +536,7 @@ void haspSetup(void)
 
     lv_ft_info_t info;
     info.name   = "L:/mdi.ttf";
-    info.weight = 12;
+    info.weight = 48;
     info.style  = FT_FONT_STYLE_NORMAL;
     lv_ft_font_init(&info);
     haspFonts[7] = info.font;

user_setups/esp32/_esp32.ini

@@ -36,6 +36,12 @@ build_flags =
     -D HASP_USE_GIFDECODE=0
 ; -- 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=65536  ; max bytes in cache when using PSRAM
 
 lib_ignore =
     GxTFT

user_setups/esp32/lolin-d32-pro_ili9341.ini

@@ -28,18 +28,11 @@ build_flags =
     -D TFT_BCKL=32  ; Configurable via web UI (default 32)
     -D TOUCH_CS=12  ; Default for TFT connector
 ;endregion
-
-    -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
     
 ;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ;git+https://gitlab.freedesktop.org/freetype/freetype.git
 
 lib_ignore =
     ${env.lib_ignore}