summaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-27 08:32:54 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-27 08:32:54 (GMT)
commitc8694c78c6cc05ae09e862e7ecd09407c7a3c3b7 (patch)
tree6bb1cc86276aef2d4f6f8a23727cc23e8bb4e7e0 /src/libs
parent1f39379a6519055d5633a560d041be6a69d4a2f5 (diff)
parentea4e6d8ad74ea982ad29c047c86bdac95a4ca539 (diff)
Merge ../InfiniSim/InfiniTime into ultraredux
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/lv_conf.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index 73b2d50..58a8593 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -413,7 +413,8 @@ 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(neofont1) \
+#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont0) \
+ LV_FONT_DECLARE(neofont1) \
LV_FONT_DECLARE(neofont2) \
LV_FONT_DECLARE(lv_font_sys_48)
@@ -476,9 +477,9 @@ typedef void* lv_font_user_data_t;
#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 &neofont1
-#define LV_THEME_DEFAULT_FONT_NORMAL &neofont2
-#define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont2
-#define LV_THEME_DEFAULT_FONT_TITLE &neofont2
+#define LV_THEME_DEFAULT_FONT_NORMAL &neofont1
+#define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont1
+#define LV_THEME_DEFAULT_FONT_TITLE &neofont1
/*=================
* Text settings