From fdf50531747969625e9254eae4f25eac8ff8b256 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 26 Nov 2022 20:50:56 +0100 Subject: [PATCH] Update embedded TTF font --- data/openhasp.ttf | Bin 172228 -> 166852 bytes include/lv_conf_v7.h | 369 ++++++++++++++++--------------- user_setups/esp32s3/_esp32s3.ini | 2 +- 3 files changed, 186 insertions(+), 185 deletions(-) diff --git a/data/openhasp.ttf b/data/openhasp.ttf index a44d5e58b9d92824fcb72cef0802b2991ba860e8..71e793004fb87883a34ead1979e4655daf0da71d 100644 GIT binary patch delta 14297 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 CuP__{ delta 19440 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 X_Q;FxWVh0vcWk=480 && TFT_WIDTH>=480 -#ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1 -#define ROBOTOCONDENSED_REGULAR_24_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1 -#define ROBOTOCONDENSED_REGULAR_32_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 -#define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_64_LATIN1 -#define ROBOTOCONDENSED_REGULAR_64_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1 -#define ROBOTOCONDENSED_REGULAR_16_LATIN1 1 -#endif +#if HASP_USE_FREETYPE<=0 + #if TFT_HEIGHT>=480 && TFT_WIDTH>=480 + #ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1 + #define ROBOTOCONDENSED_REGULAR_24_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1 + #define ROBOTOCONDENSED_REGULAR_32_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 + #define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_64_LATIN1 + #define ROBOTOCONDENSED_REGULAR_64_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1 + #define ROBOTOCONDENSED_REGULAR_16_LATIN1 1 + #endif -#ifndef HASP_FONT_1 -#define HASP_FONT_1 robotocondensed_regular_24_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_2 -#define HASP_FONT_2 robotocondensed_regular_32_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_3 -#define HASP_FONT_3 robotocondensed_regular_48_latin1 /* 10% Width */ -#endif -#ifndef HASP_FONT_4 -#define HASP_FONT_4 robotocondensed_regular_64_latin1 /* 10% Height */ -#endif -#ifndef HASP_FONT_5 -#define HASP_FONT_5 robotocondensed_regular_16_latin1 /* 5% Width */ -#endif + #ifndef HASP_FONT_1 + #define HASP_FONT_1 robotocondensed_regular_24_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_2 + #define HASP_FONT_2 robotocondensed_regular_32_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_3 + #define HASP_FONT_3 robotocondensed_regular_48_latin1 /* 10% Width */ + #endif + #ifndef HASP_FONT_4 + #define HASP_FONT_4 robotocondensed_regular_64_latin1 /* 10% Height */ + #endif + #ifndef HASP_FONT_5 + #define HASP_FONT_5 robotocondensed_regular_16_latin1 /* 5% Width */ + #endif -#ifndef HASP_FONT_SIZE_1 -#define HASP_FONT_SIZE_1 24 -#endif -#ifndef HASP_FONT_SIZE_2 -#define HASP_FONT_SIZE_2 32 -#endif -#ifndef HASP_FONT_SIZE_3 -#define HASP_FONT_SIZE_3 48 -#endif -#ifndef HASP_FONT_SIZE_4 -#define HASP_FONT_SIZE_4 64 -#endif -#ifndef HASP_FONT_SIZE_5 -#define HASP_FONT_SIZE_5 16 -#endif + #ifndef HASP_FONT_SIZE_1 + #define HASP_FONT_SIZE_1 24 + #endif + #ifndef HASP_FONT_SIZE_2 + #define HASP_FONT_SIZE_2 32 + #endif + #ifndef HASP_FONT_SIZE_3 + #define HASP_FONT_SIZE_3 48 + #endif + #ifndef HASP_FONT_SIZE_4 + #define HASP_FONT_SIZE_4 64 + #endif + #ifndef HASP_FONT_SIZE_5 + #define HASP_FONT_SIZE_5 16 + #endif -#elif TFT_HEIGHT>=320 && TFT_WIDTH>=320 -#ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1 -#define ROBOTOCONDENSED_REGULAR_16_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1 -#define ROBOTOCONDENSED_REGULAR_24_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1 -#define ROBOTOCONDENSED_REGULAR_32_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 -#define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_12_LATIN1 -#define ROBOTOCONDENSED_REGULAR_12_LATIN1 1 -#endif + #elif TFT_HEIGHT>=320 && TFT_WIDTH>=320 + #ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1 + #define ROBOTOCONDENSED_REGULAR_16_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1 + #define ROBOTOCONDENSED_REGULAR_24_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1 + #define ROBOTOCONDENSED_REGULAR_32_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 + #define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_12_LATIN1 + #define ROBOTOCONDENSED_REGULAR_12_LATIN1 1 + #endif -#ifndef HASP_FONT_1 -#define HASP_FONT_1 robotocondensed_regular_16_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_2 -#define HASP_FONT_2 robotocondensed_regular_24_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_3 -#define HASP_FONT_3 robotocondensed_regular_32_latin1 /* 10% Width */ -#endif -#ifndef HASP_FONT_4 -#define HASP_FONT_4 robotocondensed_regular_48_latin1 /* 10% Height */ -#endif -#ifndef HASP_FONT_5 -#define HASP_FONT_5 robotocondensed_regular_12_latin1 /* 5% Width */ -#endif + #ifndef HASP_FONT_1 + #define HASP_FONT_1 robotocondensed_regular_16_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_2 + #define HASP_FONT_2 robotocondensed_regular_24_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_3 + #define HASP_FONT_3 robotocondensed_regular_32_latin1 /* 10% Width */ + #endif + #ifndef HASP_FONT_4 + #define HASP_FONT_4 robotocondensed_regular_48_latin1 /* 10% Height */ + #endif + #ifndef HASP_FONT_5 + #define HASP_FONT_5 robotocondensed_regular_12_latin1 /* 5% Width */ + #endif -#ifndef HASP_FONT_SIZE_1 -#define HASP_FONT_SIZE_1 16 -#endif -#ifndef HASP_FONT_SIZE_2 -#define HASP_FONT_SIZE_2 24 -#endif -#ifndef HASP_FONT_SIZE_3 -#define HASP_FONT_SIZE_3 32 -#endif -#ifndef HASP_FONT_SIZE_4 -#define HASP_FONT_SIZE_4 48 -#endif -#ifndef HASP_FONT_SIZE_5 -#define HASP_FONT_SIZE_5 12 -#endif + #ifndef HASP_FONT_SIZE_1 + #define HASP_FONT_SIZE_1 16 + #endif + #ifndef HASP_FONT_SIZE_2 + #define HASP_FONT_SIZE_2 24 + #endif + #ifndef HASP_FONT_SIZE_3 + #define HASP_FONT_SIZE_3 32 + #endif + #ifndef HASP_FONT_SIZE_4 + #define HASP_FONT_SIZE_4 48 + #endif + #ifndef HASP_FONT_SIZE_5 + #define HASP_FONT_SIZE_5 12 + #endif -#elif TFT_HEIGHT>=272 && TFT_WIDTH>=272 -#ifndef ROBOTOCONDENSED_REGULAR_14_LATIN1 -#define ROBOTOCONDENSED_REGULAR_14_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_18_LATIN1 -#define ROBOTOCONDENSED_REGULAR_18_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_28_LATIN1 -#define ROBOTOCONDENSED_REGULAR_28_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_36_LATIN1 -#define ROBOTOCONDENSED_REGULAR_36_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 -#define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 -#endif + #elif TFT_HEIGHT>=272 && TFT_WIDTH>=272 + #ifndef ROBOTOCONDENSED_REGULAR_14_LATIN1 + #define ROBOTOCONDENSED_REGULAR_14_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_18_LATIN1 + #define ROBOTOCONDENSED_REGULAR_18_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_28_LATIN1 + #define ROBOTOCONDENSED_REGULAR_28_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_36_LATIN1 + #define ROBOTOCONDENSED_REGULAR_36_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 + #define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 + #endif -#ifndef HASP_FONT_1 -#define HASP_FONT_1 robotocondensed_regular_14_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_2 -#define HASP_FONT_2 robotocondensed_regular_18_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_3 -#define HASP_FONT_3 robotocondensed_regular_28_latin1 /* 10% Width */ -#endif -#ifndef HASP_FONT_4 -#define HASP_FONT_4 robotocondensed_regular_36_latin1 /* 10% Height */ -#endif -#ifndef HASP_FONT_5 -#define HASP_FONT_5 robotocondensed_regular_48_latin1 /* 5% Width */ -#endif + #ifndef HASP_FONT_1 + #define HASP_FONT_1 robotocondensed_regular_14_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_2 + #define HASP_FONT_2 robotocondensed_regular_18_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_3 + #define HASP_FONT_3 robotocondensed_regular_28_latin1 /* 10% Width */ + #endif + #ifndef HASP_FONT_4 + #define HASP_FONT_4 robotocondensed_regular_36_latin1 /* 10% Height */ + #endif + #ifndef HASP_FONT_5 + #define HASP_FONT_5 robotocondensed_regular_48_latin1 /* 5% Width */ + #endif -#ifndef HASP_FONT_SIZE_1 -#define HASP_FONT_SIZE_1 14 -#endif -#ifndef HASP_FONT_SIZE_2 -#define HASP_FONT_SIZE_2 18 -#endif -#ifndef HASP_FONT_SIZE_3 -#define HASP_FONT_SIZE_3 28 -#endif -#ifndef HASP_FONT_SIZE_4 -#define HASP_FONT_SIZE_4 36 -#endif -#ifndef HASP_FONT_SIZE_5 -#define HASP_FONT_SIZE_5 48 -#endif + #ifndef HASP_FONT_SIZE_1 + #define HASP_FONT_SIZE_1 14 + #endif + #ifndef HASP_FONT_SIZE_2 + #define HASP_FONT_SIZE_2 18 + #endif + #ifndef HASP_FONT_SIZE_3 + #define HASP_FONT_SIZE_3 28 + #endif + #ifndef HASP_FONT_SIZE_4 + #define HASP_FONT_SIZE_4 36 + #endif + #ifndef HASP_FONT_SIZE_5 + #define HASP_FONT_SIZE_5 48 + #endif -#else // smaller than 272 + #else // smaller than 272 -#ifndef HASP_FONT_1 -#define HASP_FONT_1 robotocondensed_regular_12_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_2 -#define HASP_FONT_2 robotocondensed_regular_16_latin1 /* 5% Width */ -#endif -#ifndef HASP_FONT_3 -#define HASP_FONT_3 robotocondensed_regular_24_latin1 /* 10% Width */ -#endif -#ifndef HASP_FONT_4 -#define HASP_FONT_4 robotocondensed_regular_32_latin1 /* 10% Height */ -#endif + #ifndef HASP_FONT_1 + #define HASP_FONT_1 robotocondensed_regular_12_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_2 + #define HASP_FONT_2 robotocondensed_regular_16_latin1 /* 5% Width */ + #endif + #ifndef HASP_FONT_3 + #define HASP_FONT_3 robotocondensed_regular_24_latin1 /* 10% Width */ + #endif + #ifndef HASP_FONT_4 + #define HASP_FONT_4 robotocondensed_regular_32_latin1 /* 10% Height */ + #endif -#ifndef ROBOTOCONDENSED_REGULAR_12_LATIN1 -#define ROBOTOCONDENSED_REGULAR_12_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1 -#define ROBOTOCONDENSED_REGULAR_16_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1 -#define ROBOTOCONDENSED_REGULAR_24_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1 -#define ROBOTOCONDENSED_REGULAR_32_LATIN1 1 -#endif -#ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 -#define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 -#endif - -#ifndef HASP_FONT_SIZE_1 -#define HASP_FONT_SIZE_1 12 -#endif -#ifndef HASP_FONT_SIZE_2 -#define HASP_FONT_SIZE_2 16 -#endif -#ifndef HASP_FONT_SIZE_3 -#define HASP_FONT_SIZE_3 24 -#endif -#ifndef HASP_FONT_SIZE_4 -#define HASP_FONT_SIZE_4 32 -#endif -#ifndef HASP_FONT_SIZE_5 -#define HASP_FONT_SIZE_5 48 -#endif + #ifndef ROBOTOCONDENSED_REGULAR_12_LATIN1 + #define ROBOTOCONDENSED_REGULAR_12_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1 + #define ROBOTOCONDENSED_REGULAR_16_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1 + #define ROBOTOCONDENSED_REGULAR_24_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1 + #define ROBOTOCONDENSED_REGULAR_32_LATIN1 1 + #endif + #ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1 + #define ROBOTOCONDENSED_REGULAR_48_LATIN1 1 + #endif + #ifndef HASP_FONT_SIZE_1 + #define HASP_FONT_SIZE_1 12 + #endif + #ifndef HASP_FONT_SIZE_2 + #define HASP_FONT_SIZE_2 16 + #endif + #ifndef HASP_FONT_SIZE_3 + #define HASP_FONT_SIZE_3 24 + #endif + #ifndef HASP_FONT_SIZE_4 + #define HASP_FONT_SIZE_4 32 + #endif + #ifndef HASP_FONT_SIZE_5 + #define HASP_FONT_SIZE_5 48 + #endif + #endif #endif /* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel. @@ -673,7 +674,7 @@ typedef void* lv_font_user_data_t; // #define HASP_FONT_4 FONT_CONCAT(HASP_FONT_4_base, HASP_CHARACTER_SET) /*Always set a default font from the built-in fonts*/ -#if LV_HIGH_RESOURCE_MCU>0 +#if HASP_USE_FREETYPE<=0 // LV_HIGH_RESOURCE_MCU>0 // #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_montserrat_16); // #define LV_FONT_CUSTOM_12 LV_FONT_DECLARE(robotocondensed_regular_12) @@ -711,7 +712,7 @@ typedef void* lv_font_user_data_t; #define LV_THEME_DEFAULT_COLOR_PRIMARY LV_COLOR_RED #define LV_THEME_DEFAULT_COLOR_SECONDARY LV_COLOR_BLUE #define LV_THEME_DEFAULT_FLAG 0 //LV_THEME_MATERIAL_FLAG_NONE -#if LV_HIGH_RESOURCE_MCU +#if HASP_USE_FREETYPE<=0 //LV_HIGH_RESOURCE_MCU #define LV_THEME_DEFAULT_FONT_SMALL &HASP_FONT_1 //&lv_font_montserrat_12 #define LV_THEME_DEFAULT_FONT_NORMAL &HASP_FONT_2 //&lv_font_montserrat_16 #define LV_THEME_DEFAULT_FONT_SUBTITLE &HASP_FONT_3 //&lv_font_montserrat_22 diff --git a/user_setups/esp32s3/_esp32s3.ini b/user_setups/esp32s3/_esp32s3.ini index be721533..4aa9d5b3 100644 --- a/user_setups/esp32s3/_esp32s3.ini +++ b/user_setups/esp32s3/_esp32s3.ini @@ -52,7 +52,7 @@ build_flags = -D LVGL_FREETYPE_MAX_FACES=16 ; max number of FreeType faces in cache -D LVGL_FREETYPE_MAX_SIZES=16 ; 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 + -D LVGL_FREETYPE_MAX_BYTES_PSRAM=262144 ; max bytes in cache when using PSRAM ; -- SimpleFTpServer build options ----------------- -D HASP_USE_FTP=1 -D FTP_SERVER_DEBUG