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

Add logging

Browse Source
This commit is contained in:
fvanroie 2021-03-17 13:34:18 +01:00
parent 0523c37598
commit 496a4af2ec
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hasp/hasp_attribute.cpp
View File

@ -13,7 +13,6 @@
#include "hasplib.h" #include "hasplib.h"
LV_FONT_DECLARE(unscii_8_icon); LV_FONT_DECLARE(unscii_8_icon);
extern lv_font_t* haspFonts[8];
extern const char** btnmatrix_default_map; // memory pointer to lvgl default btnmatrix map extern const char** btnmatrix_default_map; // memory pointer to lvgl default btnmatrix map
#if 0 #if 0
@ -454,10 +453,8 @@ static lv_font_t* haspPayloadToFont(const char* payload)
uint8_t var = atoi(payload); uint8_t var = atoi(payload);
switch(var) { switch(var) {
case 0: case 0 ... 7:
case 1: LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_12_nokern);
case 2:
case 3:
return hasp_get_font(var); return hasp_get_font(var);
case 8: case 8:
@ -467,22 +464,25 @@ static lv_font_t* haspPayloadToFont(const char* payload)
#ifdef LV_FONT_CUSTOM_12 #ifdef LV_FONT_CUSTOM_12
case 12: case 12:
return LV_THEME_DEFAULT_FONT_SMALL; return &robotocondensed_regular_12_nokern;
#endif #endif
#ifdef LV_FONT_CUSTOM_16 #ifdef LV_FONT_CUSTOM_16
case 16: case 16:
return LV_THEME_DEFAULT_FONT_NORMAL; LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16_nokern);
return &robotocondensed_regular_16_nokern;
#endif #endif
#ifdef LV_FONT_CUSTOM_22 #ifdef LV_FONT_CUSTOM_22
case 22: case 22:
return LV_THEME_DEFAULT_FONT_SUBTITLE; LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_22_nokern);
return &robotocondensed_regular_22_nokern;
#endif #endif
#ifdef LV_FONT_CUSTOM_28 #ifdef LV_FONT_CUSTOM_28
case 28: case 28:
return LV_THEME_DEFAULT_FONT_TITLE; LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_28_nokern);
return &robotocondensed_regular_28_nokern;
#endif #endif
#endif #endif
@ -885,6 +885,7 @@ static void hasp_local_style_attr(lv_obj_t* obj, const char* attr_p, uint16_t at
case ATTR_TEXT_FONT: { case ATTR_TEXT_FONT: {
lv_font_t* font = haspPayloadToFont(payload); lv_font_t* font = haspPayloadToFont(payload);
if(font) { if(font) {
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, *font);
uint8_t count = 3; uint8_t count = 3;
if(check_obj_type(obj, LV_HASP_ROLLER)) count = my_roller_get_visible_row_count(obj); if(check_obj_type(obj, LV_HASP_ROLLER)) count = my_roller_get_visible_row_count(obj);
lv_obj_set_style_local_text_font(obj, part, state, font); lv_obj_set_style_local_text_font(obj, part, state, font);

2
src/hasp_oobe.cpp
View File

@ -28,8 +28,6 @@ static bool oobeAutoCalibrate = true;
static lv_obj_t* oobepage[2]; static lv_obj_t* oobepage[2];
static lv_obj_t* oobekb; static lv_obj_t* oobekb;
extern lv_font_t * defaultFont;
lv_obj_t* pwd_ta; lv_obj_t* pwd_ta;
static inline void oobeSetPage(uint8_t pageid) static inline void oobeSetPage(uint8_t pageid)

1
src/main_arduino.cpp
View File

@ -56,6 +56,7 @@ 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