summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2022-03-01 01:09:48 +0200
committerJF <JF002@users.noreply.github.com>2022-03-08 21:34:20 +0100
commit61a9a97e267799f76c64279887a9845d4760a77c (patch)
tree05bab7ad4b3256e1fe22be17c043951e297c432f
parent04d21dcd932c7e75b2d45314b2f68d9ba91c5d68 (diff)
Update navigation font readme section
-rw-r--r--src/displayapp/fonts/README.md16
-rw-r--r--src/displayapp/fonts/lv_font_navi_80.c2
2 files changed, 7 insertions, 11 deletions
diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index 2e900d12..7e6203ff 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -59,6 +59,7 @@ with
* Load the file `JetBrainsMono-Regular.tff` (use the file in this repo to ensure the version matches) and specify the following range: `0x25, 0x30-0x3a`
### Large font
+
* Name: jetbrains_mono_76
* Size: 76
* Bpp: 1 bit-per-pixel
@@ -87,17 +88,12 @@ with
* Size: 48
* Bpp: 1 bit-per-pixel
* Do not enable font compression or horizontal subpixel rendering
-* Load the file `icons_sys_48.tff` (use the file in this repo to ensure the version matches) and specify the following range: `0xe902, 0xe904-0xe907, 0xe90b-0xe90c`
-
-#### Navigation font
+* Load the file `icons_sys_48.tff` and specify the following range: `0xe902, 0xe904-0xe907, 0xe90b-0xe90c`
-To create the navigtion.ttf I use the web app [icomoon](https://icomoon.io/app)
-this app can import the svg files from the folder *src/displayapp/icons/navigation/unique* and create a ttf file the
-project for the site is *lv_font_navi_80.json* you can import it to add or remove icons
+### Navigation font
-You can also use the online LVGL tool to create the .c
+`navigtion.ttf` is created with the web app [icomoon](https://icomoon.io/app) by importing the svg files from `src/displayapp/icons/navigation/unique` and generating the font. `lv_font_navi_80.json` is a project file for the site, which you can import to add or remove icons.
-ttf file : navigation.ttf name : lv_font_navi_80 size : 80px Bpp : 2 bit-per-pixel range : 0xe900-0xe929
+This font must be generated with the `lv_font_conv` tool, which has additional options not available in the online converter.
-$lv_font_conv --font navigation.ttf -r '0xe900-0xe929' --size 80 --format lvgl --bpp 2 --no-prefilter -o
-lv_font_navi_80.c
+`lv_font_conv --font navigation.ttf -r '0xe900-0xe929' --size 80 --format lvgl --bpp 2 -o lv_font_navi_80.c`
diff --git a/src/displayapp/fonts/lv_font_navi_80.c b/src/displayapp/fonts/lv_font_navi_80.c
index d5a8400e..8fd3979f 100644
--- a/src/displayapp/fonts/lv_font_navi_80.c
+++ b/src/displayapp/fonts/lv_font_navi_80.c
@@ -2623,7 +2623,7 @@ lv_font_t lv_font_navi_80 = {
#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
.subpx = LV_FONT_SUBPX_NONE,
#endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
.underline_position = 0,
.underline_thickness = 0,
#endif