jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

LVGL fix montserrat-10 and icons-10 (#20901)

Browse Source
This commit is contained in:
s-hadinger 2024-03-09 22:09:41 +01:00 committed by GitHub
parent 16afaf3c59
commit 3429ebd359
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/lvgl_berry/tasmota_lv_conf.h
View File

@ -429,6 +429,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(lv_font_icons_10) \
LV_FONT_DECLARE(lv_font_icons_12) \ LV_FONT_DECLARE(lv_font_icons_12) \
LV_FONT_DECLARE(lv_font_icons_14) \ LV_FONT_DECLARE(lv_font_icons_14) \
LV_FONT_DECLARE(lv_font_icons_16) \ LV_FONT_DECLARE(lv_font_icons_16) \
@ -441,6 +442,7 @@
// LV_FONT_DECLARE(montserrat_tasmota_20) \ // LV_FONT_DECLARE(montserrat_tasmota_20) \
// LV_FONT_DECLARE(typicons24) \ // LV_FONT_DECLARE(typicons24) \
#define FONT_ICONS_10 1
#define FONT_ICONS_12 1 #define FONT_ICONS_12 1
#define FONT_ICONS_14 0 #define FONT_ICONS_14 0
#define FONT_ICONS_16 0 #define FONT_ICONS_16 0

6
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_lvgl.ino
View File

@ -284,6 +284,12 @@ extern "C" {
// icons Font for sizes not covered by montserrat // icons Font for sizes not covered by montserrat
// if montserrat is defined, use it, else import icons font // if montserrat is defined, use it, else import icons font
const lv_font_table_t lv_icons_fonts[] = { const lv_font_table_t lv_icons_fonts[] = {
#ifdef LV_FONT_MONTSERRAT_TASMOTA_10
{ 10, &lv_font_montserrat_tasmota_10 },
#elif defined(FONT_ICONS_10)
{ 10, &lv_font_icons_10 },
#endif
#ifdef LV_FONT_MONTSERRAT_TASMOTA_12 #ifdef LV_FONT_MONTSERRAT_TASMOTA_12
{ 12, &lv_font_montserrat_tasmota_12 }, { 12, &lv_font_montserrat_tasmota_12 },
#elif defined(FONT_ICONS_12) #elif defined(FONT_ICONS_12)