diff --git a/include/lv_conf.h b/include/lv_conf.h index d97f5249..8069c2ff 100644 --- a/include/lv_conf.h +++ b/include/lv_conf.h @@ -256,7 +256,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in * Log settings *===============*/ -#define LV_USE_PERF_MONITOR 1 +#define LV_USE_PERF_MONITOR 0 /*1: Enable the log module*/ #define LV_USE_LOG 1 // set back to 0 before release !! @@ -328,14 +328,14 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in /* Robot fonts with bpp = 4 * https://fonts.google.com/specimen/Roboto */ -#define LV_FONT_ROBOTO_12 LV_HIGH_RESOURCE_MCU -#define LV_FONT_ROBOTO_16 LV_HIGH_RESOURCE_MCU -#define LV_FONT_ROBOTO_22 LV_HIGH_RESOURCE_MCU -#define LV_FONT_ROBOTO_28 LV_HIGH_RESOURCE_MCU +#define LV_FONT_MONTSERRAT_12 LV_HIGH_RESOURCE_MCU +#define LV_FONT_MONTSERRAT_16 LV_HIGH_RESOURCE_MCU +#define LV_FONT_MONTSERRAT_22 LV_HIGH_RESOURCE_MCU +#define LV_FONT_MONTSERRAT_28 0 // LV_HIGH_RESOURCE_MCU /* Demonstrate special features */ -#define LV_FONT_ROBOTO_12_SUBPX 0 -#define LV_FONT_ROBOTO_28_COMPRESSED 0 /*bpp = 3*/ +#define LV_FONT_MONTSERRAT_12_SUBPX 0 +#define LV_FONT_MONTSERRAT_28_COMPRESSED LV_HIGH_RESOURCE_MCU /*bpp = 3*/ /*Pixel perfect monospace font * http://pelulamu.net/unscii/ */ @@ -369,8 +369,8 @@ typedef void* lv_font_user_data_t; /*Always set a default font from the built-in fonts*/ #if LV_HIGH_RESOURCE_MCU>0 -#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_roboto_16); -#define LV_FONT_DEFAULT &lv_font_roboto_16 +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_montserrat_16); +#define LV_FONT_DEFAULT &lv_font_montserrat_16 #else #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(unscii_8_icon); #define LV_FONT_DEFAULT &unscii_8_icon //&lv_font_unscii_8 @@ -389,15 +389,15 @@ typedef void* lv_font_user_data_t; #define LV_THEME_DEFAULT_COLOR_SECONDARY LV_COLOR_BLUE #define LV_THEME_DEFAULT_FLAGS 0 //LV_THEME_MATERIAL_FLAG_NONE #if LV_HIGH_RESOURCE_MCU -#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_roboto_12 -#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_roboto_16 -#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_roboto_22 -#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_roboto_28 +#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 +#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16 +#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_22 +#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28_compressed #else -#define LV_THEME_DEFAULT_FONT_SMALL LV_FONT_DEFAULT // &lv_font_roboto_12 -#define LV_THEME_DEFAULT_FONT_NORMAL LV_FONT_DEFAULT // &lv_font_roboto_16 -#define LV_THEME_DEFAULT_FONT_SUBTITLE LV_FONT_DEFAULT // &lv_font_roboto_22 -#define LV_THEME_DEFAULT_FONT_TITLE LV_FONT_DEFAULT // &lv_font_roboto_28 +#define LV_THEME_DEFAULT_FONT_SMALL LV_FONT_DEFAULT // &lv_font_montserrat_12 +#define LV_THEME_DEFAULT_FONT_NORMAL LV_FONT_DEFAULT // &lv_font_montserrat_16 +#define LV_THEME_DEFAULT_FONT_SUBTITLE LV_FONT_DEFAULT // &lv_font_montserrat_22 +#define LV_THEME_DEFAULT_FONT_TITLE LV_FONT_DEFAULT // &lv_font_montserrat_28_compressed #endif #define LV_USE_THEME_EMPTY 1 diff --git a/lib/lvgl b/lib/lvgl index 09968c12..a2367fc1 160000 --- a/lib/lvgl +++ b/lib/lvgl @@ -1 +1 @@ -Subproject commit 09968c1274d99da8a065501f7bde1790bd5f2af4 +Subproject commit a2367fc1691b91edf79010db2eea656a40083b12 diff --git a/src/hasp_attribute.cpp b/src/hasp_attribute.cpp index 91190307..c527d7eb 100644 --- a/src/hasp_attribute.cpp +++ b/src/hasp_attribute.cpp @@ -364,16 +364,16 @@ static void hasp_local_style_attr(lv_obj_t * obj, const char * attr_p, const cha lv_obj_set_style_local_value_font(obj, part, state, &unscii_8_icon); break; case 12: - lv_obj_set_style_local_value_font(obj, part, state, &lv_font_roboto_12); + lv_obj_set_style_local_value_font(obj, part, state, &lv_font_montserrat_12); break; case 16: - lv_obj_set_style_local_value_font(obj, part, state, &lv_font_roboto_16); + lv_obj_set_style_local_value_font(obj, part, state, &lv_font_montserrat_16); break; case 22: - lv_obj_set_style_local_value_font(obj, part, state, &lv_font_roboto_22); + lv_obj_set_style_local_value_font(obj, part, state, &lv_font_montserrat_22); break; case 28: - lv_obj_set_style_local_value_font(obj, part, state, &lv_font_roboto_28); + lv_obj_set_style_local_value_font(obj, part, state, &lv_font_montserrat_28_compressed); break; } return; @@ -408,16 +408,16 @@ static void hasp_local_style_attr(lv_obj_t * obj, const char * attr_p, const cha lv_obj_set_style_local_text_font(obj, part, state, &unscii_8_icon); break; case 12: - lv_obj_set_style_local_text_font(obj, part, state, &lv_font_roboto_12); + lv_obj_set_style_local_text_font(obj, part, state, &lv_font_montserrat_12); break; case 16: - lv_obj_set_style_local_text_font(obj, part, state, &lv_font_roboto_16); + lv_obj_set_style_local_text_font(obj, part, state, &lv_font_montserrat_16); break; case 22: - lv_obj_set_style_local_text_font(obj, part, state, &lv_font_roboto_22); + lv_obj_set_style_local_text_font(obj, part, state, &lv_font_montserrat_22); break; case 28: - lv_obj_set_style_local_text_font(obj, part, state, &lv_font_roboto_28); + lv_obj_set_style_local_text_font(obj, part, state, &lv_font_montserrat_28_compressed); break; } return; @@ -617,7 +617,7 @@ static void hasp_process_obj_attribute2(lv_obj_t * obj, const char * attr, const // OK static void hasp_process_obj_attribute3(lv_obj_t * obj, const char * attr, const char * payload, bool update) { - int16_t val = atoi(payload); + // int16_t val = atoi(payload); if(!strcmp_P(attr, PSTR("vis"))) { return update ? lv_obj_set_hidden(obj, !is_true(payload)) : hasp_out_int(obj, attr, !lv_obj_get_hidden(obj)); @@ -691,7 +691,7 @@ static void hasp_process_obj_attribute4(lv_obj_t * obj, const char * attr, const // OK static void hasp_process_obj_attribute6(lv_obj_t * obj, const char * attr, const char * payload, bool update) { - int16_t val = atoi(payload); + // int16_t val = atoi(payload); if(!strcmp_P(attr, PSTR("hidden"))) { return update ? lv_obj_set_hidden(obj, is_true(payload)) : hasp_out_int(obj, attr, lv_obj_get_hidden(obj));