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

Remove some font logging for esp8266

Browse Source
This commit is contained in:
fvanroie 2021-03-18 01:53:48 +01:00
parent 6b5c3c1d12
commit 0f52d808ea
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hasp/hasp.cpp
View File

@ -93,8 +93,7 @@ lv_obj_t* kb;
// lv_font_t * defaultFont; // lv_font_t * defaultFont;
lv_obj_t* pages[HASP_NUM_PAGES]; lv_obj_t* pages[HASP_NUM_PAGES];
static lv_font_t* haspFonts[4] = {LV_THEME_DEFAULT_FONT_SMALL, LV_THEME_DEFAULT_FONT_NORMAL, static lv_font_t* haspFonts[4] = {nullptr, nullptr, nullptr, nullptr};
LV_THEME_DEFAULT_FONT_SUBTITLE, LV_THEME_DEFAULT_FONT_TITLE};
uint8_t current_page = 1; uint8_t current_page = 1;
/** /**
@ -363,12 +362,13 @@ void haspSetup(void)
/* ********** Font Initializations ********** */ /* ********** Font Initializations ********** */
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16_nokern);
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, nullptr); LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, nullptr);
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, haspFonts[1]); LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, haspFonts[1]);
// LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16_nokern);
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
lv_font_t* hasp_font = nullptr; // required or font init will crash lv_font_t* hasp_font = nullptr; // required or font init will crash
lv_zifont_init(); lv_zifont_init();
@ -381,7 +381,7 @@ void haspSetup(void)
haspFonts[0] = hasp_font; // save it haspFonts[0] = hasp_font; // save it
} }
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16_nokern); // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16_nokern);
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, *hasp_font); LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, *hasp_font);
#endif #endif

2
src/hasp/hasp_attribute.cpp
View File

@ -454,7 +454,7 @@ static lv_font_t* haspPayloadToFont(const char* payload)
switch(var) { switch(var) {
case 0 ... 7: case 0 ... 7:
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_12_nokern); // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_12_nokern);
return hasp_get_font(var); return hasp_get_font(var);
case 8: case 8:

1
src/main_arduino.cpp
View File

@ -56,7 +56,6 @@ void setup()
#if HASP_USE_CONFIG > 0 #if HASP_USE_CONFIG > 0
configSetup(); // also runs debugPreSetup(), debugSetup() and debugStart() configSetup(); // also runs debugPreSetup(), debugSetup() and debugStart()
#endif #endif
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16_nokern);
guiSetup(); guiSetup();
debugSetup(); // Init the console debugSetup(); // Init the console