From 7805b40fd249ff7c136dd4826bb71bed0ce61d3d Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 3 Sep 2022 18:17:03 +0200 Subject: [PATCH] Enable Freetype in ini files --- platformio.ini | 11 +++++++++-- user_setups/esp32/_esp32.ini | 5 +++-- user_setups/esp32s2/_esp32s2.ini | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 0784fe9e..900fde82 100644 --- a/platformio.ini +++ b/platformio.ini @@ -46,7 +46,13 @@ build_flags = -Os ; Code Size Optimization ;-Og ; Code Debug Optimization ;-w ; Suppress warnings - -D CORE_DEBUG_LEVEL=0 ; 0=Silent, 1=Errors, 2=Warnings + ;-D CORE_DEBUG_LEVEL=3 ; 0=Silent, 1=Errors, 2=Warnings + ;-D LOG_LOCAL_LEVEL=5 ; Verbose + -D LOG_MAXIMUM_LEVEL_VERBOSE + -D LOG_DEFAULT_LEVEL_WARNING + -D LOG_TIMESTAMP_SOURCE_SYSTEM + -D CONFIG_ARDUHAL_ESP_LOG=1 + -D CONFIG_LOG_COLORS=1 -I include ; include lv_conf.h and hasp_conf.h ; -- littlevgl build options ------------------------------ -D LV_CONF_INCLUDE_SIMPLE ; for lvgl @@ -55,6 +61,7 @@ build_flags = -D LV_SYMBOL_DEF_H ; don't load default symbol defines -D LODEPNG_NO_COMPILE_ALLOCATORS ; use PSram functions -D LV_PNG_USE_LV_FILESYSTEM=1 ; use lvgl filesystem api, drive L:\ + -D LV_USE_FILESYSTEM=1 ; -- ESP build options ------------------------------------ -D SPIFFS_TEMPORAL_FD_CACHE ; speedup opening recent files ; -- ArduinoJson build options ---------------------------- @@ -79,8 +86,8 @@ lib_deps = ;git+https://github.com/andrethomas/TasmotaSlave.git ;git+https://github.com/lvgl/lvgl.git git+https://github.com/lvgl/lvgl.git#release/v7 - ;git+https://github.com/lvgl/lv_fs_if.git#release/v7 ;lvgl/lvgl@^7.11.0 ; from PIO library + ;git+https://github.com/lvgl/lv_fs_if.git#release/v7 git+https://github.com/lvgl/lv_lib_png.git#release/v7 git+https://github.com/lvgl/lv_lib_bmp.git#release/v7 git+https://github.com/lvgl/lv_lib_gif.git#release/v7 diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini index 383b0a8b..3309d5ed 100644 --- a/user_setups/esp32/_esp32.ini +++ b/user_setups/esp32/_esp32.ini @@ -10,6 +10,7 @@ board_build.embed_files = data/style.css.gz data/script.js.gz data/cert/x509_crt_bundle.bin + build_flags = ${env.build_flags} -D HTTP_UPLOAD_BUFLEN=1024 ; lower http upload buffer @@ -22,7 +23,7 @@ build_flags = -D LV_ATTRIBUTE_TASK_HANDLER=IRAM_ATTR -D LV_USE_FS_IF=1 ;-D LV_FS_PC_PATH="//littlefs" ; this needs to match the vfs mount pount - -D LV_USE_FREETYPE=0 + -D LV_USE_FREETYPE=1 ; -- ArduinoJson build options ---------------------------- -D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments ; -- tft_espi build options ------------------------ @@ -39,7 +40,7 @@ build_flags = -D HASP_USE_BMPDECODE=1 -D HASP_USE_JPGDECODE=0 -D HASP_USE_GIFDECODE=0 - -D HASP_USE_FREETYPE=0 + -D HASP_USE_FREETYPE=1 ; -- LittleFS build options ------------------------ ;-D CONFIG_LITTLEFS_FOR_IDF_3_2 ; obsolete in IDF 3.3 ; -- FreeType build options ------------------------ diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini index ca601f21..a4b2d735 100644 --- a/user_setups/esp32s2/_esp32s2.ini +++ b/user_setups/esp32s2/_esp32s2.ini @@ -19,7 +19,7 @@ monitor_filters = esp32_exception_decoder build_flags = ${env.build_flags} -D ESP32S2 - -D HTTP_UPLOAD_BUFLEN=1024 ; lower http upload buffer + -D HTTP_UPLOAD_BUFLEN=512 ; lower http upload buffer -D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages -D HASP_CONSOLE_BUFFER=256 ; maximum length of a console/telnet command -D NO_GLOBAL_HTTPUPDATE ; dont instantiate httpUpdate