diff options
| author | JF <jf@codingfield.com> | 2021-05-21 09:38:38 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-05-21 09:38:38 (GMT) |
| commit | de69905c0647997091d9e385538c96de30be93e6 (patch) | |
| tree | 4775001d808da520c93a7552da1bea80e7714a30 /src/libs | |
| parent | a80e782f267cd2424d22da23d809c0c6a8ff8761 (diff) | |
| parent | 7c9513be8a3bf36fda5706cb0fb1bd6232d42ffd (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/lv_conf.h | 1 | ||||
| m--------- | src/libs/lvgl | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 2a5b605..761baba 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -415,6 +415,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in #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(lv_font_sys_48) diff --git a/src/libs/lvgl b/src/libs/lvgl -Subproject 1b6501dc3babf39538f4a02aa9fb14c2aaebca2 +Subproject 23430cf20e32294549fff9b2879a9466dacc19b |