From d4720d9378208091dbf6b06d827ebc28cb5f58f9 Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Mon, 4 Mar 2024 13:04:11 +0100 Subject: [PATCH] LVGL remove embedded typicons font (#20872) --- CHANGELOG.md | 1 + tasmota/lvgl_berry/tasmota_lv_conf.h | 2 +- tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a4d7c7a..69ebe5bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. ### Breaking Changed - Drop support for old (insecure) fingerprint format (#20842) +- LVGL remove embedded typicons font ### Changed diff --git a/tasmota/lvgl_berry/tasmota_lv_conf.h b/tasmota/lvgl_berry/tasmota_lv_conf.h index 283195106..7b7cdef02 100644 --- a/tasmota/lvgl_berry/tasmota_lv_conf.h +++ b/tasmota/lvgl_berry/tasmota_lv_conf.h @@ -424,7 +424,7 @@ LV_FONT_DECLARE(robotocondensed_regular_40_latin1) \ LV_FONT_DECLARE(robotocondensed_regular_44_latin1) \ LV_FONT_DECLARE(robotocondensed_regular_48_latin1) \ - LV_FONT_DECLARE(typicons24) \ + // LV_FONT_DECLARE(typicons24) \ #define ROBOTOCONDENSED_REGULAR_12_LATIN1 1 #define ROBOTOCONDENSED_REGULAR_14_LATIN1 0 diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino index dcd4a7a0d..27148cbd6 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino @@ -272,11 +272,11 @@ extern "C" { { 0, nullptr} }; - // typicons Font - const lv_font_table_t lv_typicons_fonts[] = { - { 24, &typicons24 }, - { 0, nullptr} - }; + // // typicons Font + // const lv_font_table_t lv_typicons_fonts[] = { + // { 24, &typicons24 }, + // { 0, nullptr} + // }; // robotocondensed-latin1 const lv_font_table_t lv_robotocondensed_fonts[] = { @@ -326,7 +326,7 @@ extern "C" { const lv_font_names_t lv_embedded_fonts[] = { { "montserrat", lv_montserrat_fonts }, { "seg7", lv_seg7_fonts }, - { "typicons", lv_typicons_fonts }, + // { "typicons", lv_typicons_fonts }, { "unscii", lv_unscii_fonts}, #ifdef USE_LVGL_HASPMOTA { "robotocondensed", lv_robotocondensed_fonts },