jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-24 11:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Omit bitmap fonts

Browse Source
This commit is contained in:
fvanroie 2023-01-17 01:42:04 +01:00
parent be7d8050b1
commit 38d308a07b
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hasp/hasp.cpp
View File

@ -585,6 +585,7 @@ void haspSetup(void)
haspFonts[3] = get_font("32");
#endif
// Check for failed font pointers
if(haspFonts[0] == nullptr) haspFonts[0] = LV_FONT_DEFAULT;
if(haspFonts[1] == nullptr) haspFonts[1] = LV_FONT_DEFAULT;
if(haspFonts[2] == nullptr) haspFonts[2] = LV_FONT_DEFAULT;

7
src/hasp/hasp_attribute.cpp
View File

@ -239,7 +239,7 @@ static lv_font_t* haspPayloadToFont(const char* payload)
else if(var == 8)
return &unscii_8_icon;
#ifndef ARDUINO_ARCH_ESP8266
#if !defined(ARDUINO_ARCH_ESP8266) && (HASP_USE_FREETYPE == 0)
#ifdef HASP_FONT_1
else if(var == HASP_FONT_SIZE_1)
@ -266,11 +266,10 @@ static lv_font_t* haspPayloadToFont(const char* payload)
// return &HASP_FONT_5;
// #endif
#endif // ARDUINO_ARCH_ESP8266
#endif
}
return get_font(payload);
return get_font(payload);
}
static hasp_attribute_type_t hasp_process_label_long_mode(lv_obj_t* obj, const char* payload, char** text, bool update)

10
src/hasp/hasp_font.cpp
View File

@ -1,3 +1,6 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include <string.h>
#include "hasplib.h"
@ -24,10 +27,13 @@ typedef struct
#include "font/hasp_font_loader.h"
#if defined(ARDUINO_ARCH_ESP32) && (HASP_USE_FREETYPE > 0) // && defined(ESP32S3)
// #if ESP_FLASH_SIZE > 4
extern const uint8_t OPENHASP_TTF_START[] asm("_binary_data_openhasp_ttf_start");
extern const uint8_t OPENHASP_TTF_END[] asm("_binary_data_openhasp_ttf_end");
// extern const uint8_t OPENHASPLITE_TTF_START[] asm("_binary_data_openhasplite_ttf_start");
// extern const uint8_t OPENHASPLITE_TTF_END[] asm("_binary_data_openhasplite_ttf_end");
// #else
// extern const uint8_t OPENHASP_TTF_START[] asm("_binary_data_openhasplite_ttf_start");
// extern const uint8_t OPENHASP_TTF_END[] asm("_binary_data_openhasplite_ttf_end");
// #endif
#endif
static lv_ll_t hasp_fonts_ll;