jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit freetype library to ESP32 for now

Browse Source
This commit is contained in:
fvanroie 2021-11-17 05:08:40 +01:00
parent b6ede246b8
commit 64923e5d82
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lv_lib_freetype/lv_freetype.c
View File

@ -3,6 +3,8 @@
* *
*/ */
#if defined(ARDUINO_ARCH_ESP32)
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
@ -466,4 +468,6 @@ void FT_loop_task(void *pvParameters) {
xQueueSendToBack(FTResponseQueue, &response, portMAX_DELAY); // send back response xQueueSendToBack(FTResponseQueue, &response, portMAX_DELAY); // send back response
} }
} }
} }
#endif

6
src/hasp/hasp.cpp
View File

@ -496,9 +496,10 @@ void haspSetup(void)
if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE; if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE;
if(haspFonts[3] == nullptr) haspFonts[3] = LV_THEME_DEFAULT_FONT_TITLE; if(haspFonts[3] == nullptr) haspFonts[3] = LV_THEME_DEFAULT_FONT_TITLE;
// haspFonts[0] = lv_font_load("E:/font_1.fnt"); // haspFonts[0] = lv_font_load("E:/font_1.fnt");
// haspFonts[2] = lv_font_load("E:/font_2.fnt"); // haspFonts[2] = lv_font_load("E:/font_2.fnt");
#if defined(ARDUINO_ARCH_ESP32)
lv_ft_info_t info1; lv_ft_info_t info1;
info1.name = "L:/arial.ttf"; info1.name = "L:/arial.ttf";
info1.weight = 48; info1.weight = 48;
@ -521,6 +522,7 @@ void haspSetup(void)
haspFonts[6] = info3.font; haspFonts[6] = info3.font;
haspFonts[7] = hasp_font_load("L:/RobotoCondensedRegular.bin"); haspFonts[7] = hasp_font_load("L:/RobotoCondensedRegular.bin");
#endif
hasp_set_theme(haspThemeId); hasp_set_theme(haspThemeId);