diff options
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/lv_conf.h | 19 | ||||
| m--------- | src/libs/lvgl | 0 | ||||
| -rw-r--r-- | src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h | 1 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 73109c5..eece755 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -413,12 +413,11 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in * LV_FONT_DECLARE(my_font_2) */ -#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(jetbrains_mono_bold_20) \ - LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \ - LV_FONT_DECLARE(jetbrains_mono_42) \ - LV_FONT_DECLARE(jetbrains_mono_76) \ - LV_FONT_DECLARE(open_sans_light) \ - LV_FONT_DECLARE(lv_font_sys_48) +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont0) \ + LV_FONT_DECLARE(neofont1) \ + LV_FONT_DECLARE(neofont15) \ + LV_FONT_DECLARE(neofont2) \ + LV_FONT_DECLARE(neofont3) /* Enable it if you have fonts with a lot of characters. * The limit depends on the font size, font face and bpp @@ -478,10 +477,10 @@ typedef void* lv_font_user_data_t; #define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0xffffff) #define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0xaaaaaa) #define LV_THEME_DEFAULT_FLAG 0//LV_THEME_MATERIAL_FLAG_DARK -#define LV_THEME_DEFAULT_FONT_SMALL &jetbrains_mono_bold_20 -#define LV_THEME_DEFAULT_FONT_NORMAL &jetbrains_mono_bold_20 -#define LV_THEME_DEFAULT_FONT_SUBTITLE &jetbrains_mono_bold_20 -#define LV_THEME_DEFAULT_FONT_TITLE &jetbrains_mono_bold_20 +#define LV_THEME_DEFAULT_FONT_SMALL &neofont15 +#define LV_THEME_DEFAULT_FONT_NORMAL &neofont15 +#define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont15 +#define LV_THEME_DEFAULT_FONT_TITLE &neofont15 /*================= * Text settings diff --git a/src/libs/lvgl b/src/libs/lvgl -Subproject e100d920f823e4308b8b43d7eb4130afa74f272 +Subproject 23430cf20e32294549fff9b2879a9466dacc19b diff --git a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h index b3f2341..8fbd44a 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h @@ -702,6 +702,7 @@ #define MYNEWT_VAL_BLE_SM_BONDING (1) #endif +// The following macro appears not to be used in InfiniTime! #ifndef MYNEWT_VAL_BLE_SM_IO_CAP #define MYNEWT_VAL_BLE_SM_IO_CAP (BLE_HS_IO_DISPLAY_ONLY) #endif |