mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LVGL remove embedded typicons font (#20872)

This commit is contained in:
s-hadinger 2024-03-04 13:04:11 +01:00 committed by GitHub
parent 24372207de
commit d4720d9378
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
### Breaking Changed ### Breaking Changed
- Drop support for old (insecure) fingerprint format (#20842) - Drop support for old (insecure) fingerprint format (#20842)
- LVGL remove embedded typicons font
### Changed ### Changed

2
tasmota/lvgl_berry/tasmota_lv_conf.h
View File

@ -424,7 +424,7 @@
LV_FONT_DECLARE(robotocondensed_regular_40_latin1) \ LV_FONT_DECLARE(robotocondensed_regular_40_latin1) \
LV_FONT_DECLARE(robotocondensed_regular_44_latin1) \ LV_FONT_DECLARE(robotocondensed_regular_44_latin1) \
LV_FONT_DECLARE(robotocondensed_regular_48_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_12_LATIN1 1
#define ROBOTOCONDENSED_REGULAR_14_LATIN1 0 #define ROBOTOCONDENSED_REGULAR_14_LATIN1 0

12
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino
View File

@ -272,11 +272,11 @@ extern "C" {
{ 0, nullptr} { 0, nullptr}
}; };
// typicons Font // // typicons Font
const lv_font_table_t lv_typicons_fonts[] = { // const lv_font_table_t lv_typicons_fonts[] = {
{ 24, &typicons24 }, // { 24, &typicons24 },
{ 0, nullptr} // { 0, nullptr}
}; // };
// robotocondensed-latin1 // robotocondensed-latin1
const lv_font_table_t lv_robotocondensed_fonts[] = { const lv_font_table_t lv_robotocondensed_fonts[] = {
@ -326,7 +326,7 @@ extern "C" {
const lv_font_names_t lv_embedded_fonts[] = { const lv_font_names_t lv_embedded_fonts[] = {
{ "montserrat", lv_montserrat_fonts }, { "montserrat", lv_montserrat_fonts },
{ "seg7", lv_seg7_fonts }, { "seg7", lv_seg7_fonts },
{ "typicons", lv_typicons_fonts }, // { "typicons", lv_typicons_fonts },
{ "unscii", lv_unscii_fonts}, { "unscii", lv_unscii_fonts},
#ifdef USE_LVGL_HASPMOTA #ifdef USE_LVGL_HASPMOTA
{ "robotocondensed", lv_robotocondensed_fonts }, { "robotocondensed", lv_robotocondensed_fonts },