From 6b246b2fed308a83d09a425d726cc1a698ba7f0c Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 1 Jul 2020 10:53:23 +0200 Subject: [PATCH] fix default theme colors --- lv_conf_template.h | 4 ++-- src/lv_conf_internal.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index 945761c86..828413eab 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -428,8 +428,8 @@ typedef void * lv_font_user_data_t; #define LV_THEME_DEFAULT_INCLUDE /*Include a header for the init. function*/ #define LV_THEME_DEFAULT_INIT lv_theme_material_init -#define LV_THEME_DEFAULT_COLOR_PRIMARY LV_COLOR_RED -#define LV_THEME_DEFAULT_COLOR_SECONDARY LV_COLOR_BLUE +#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1) +#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6) #define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_LIGHT #define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_16 #define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16 diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index d6c9163b6..ef86888a8 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -391,10 +391,10 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ #endif #if LV_TICK_CUSTOM == 1 #ifndef LV_TICK_CUSTOM_INCLUDE -#define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the sys time function*/ +#define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ #endif #ifndef LV_TICK_CUSTOM_SYS_TIME_EXPR -#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current sys time in ms*/ +#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ #endif #endif /*LV_TICK_CUSTOM*/ @@ -638,10 +638,10 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ #define LV_THEME_DEFAULT_INIT lv_theme_material_init #endif #ifndef LV_THEME_DEFAULT_COLOR_PRIMARY -#define LV_THEME_DEFAULT_COLOR_PRIMARY LV_COLOR_RED +#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1) #endif #ifndef LV_THEME_DEFAULT_COLOR_SECONDARY -#define LV_THEME_DEFAULT_COLOR_SECONDARY LV_COLOR_BLUE +#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6) #endif #ifndef LV_THEME_DEFAULT_FLAG #define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_LIGHT @@ -702,7 +702,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ /* Support bidirectional texts. * Allows mixing Left-to-Right and Right-to-Left texts. - * The direction will be processed according to the Unicode Bidirectional Algorithm: + * The direction will be processed according to the Unicode Bidirectioanl Algorithm: * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ #ifndef LV_USE_BIDI #define LV_USE_BIDI 0