Skip to content

Commit

Permalink
LVGL remove embedded typicons font (#20872)
Browse files Browse the repository at this point in the history
  • Loading branch information
s-hadinger authored Mar 4, 2024
1 parent 2437220 commit d4720d9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tasmota/lvgl_berry/tasmota_lv_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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 },
Expand Down

0 comments on commit d4720d9

Please sign in to comment.