From 319030d9e16e833cf8bff569a9ecfa452165ea27 Mon Sep 17 00:00:00 2001
From: "James A. Jerkins" <evergreen@jamesjerkinscomputer.com>
Date: Thu, 23 Dec 2021 20:30:14 -0600
Subject: Add airplane mode feature

Implements 'Airplane mode' feature to disable and enable bluetooth/ble
Adds airplaneMode as a non-persisted setting
Adds a setting menu for switching airplane mode on and off
Displays an airplane symbol on the Digital watch face and the
    PineTimeStyle watch face when airplane mode is enabled
Always enables bluetooth/ble on boot (disable airplane mode)
Alphabetizes the settings menu options
Style cleanups

Closes #632
---
 src/displayapp/fonts/README.md                |  2 +-
 src/displayapp/fonts/jetbrains_mono_bold_20.c | 74 ++++++++++++++++-----------
 2 files changed, 44 insertions(+), 32 deletions(-)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index 8a260846..40ecd3e2 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -13,7 +13,7 @@
 * Do not enable font compression and horizontal subpixel hinting
 * Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x20-0x7f, 0x410-0x44f`
 * Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
-  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015`
+  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf072`
 * Click on Convert, and download the file `jetbrains_mono_bold_20.c` and copy it in `src/DisplayApp/Fonts`
 * Add the font .c file path to src/CMakeLists.txt
 * Add an LV_FONT_DECLARE line in src/libs/lv_conf.h
diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c
index d8705528..944e47a1 100644
--- a/src/displayapp/fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c
@@ -840,6 +840,16 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xf8, 0xf, 0x80, 0xf8, 0x3e, 0x0, 0xff, 0xf0,
     0x0, 0x3f, 0x80, 0x0,
 
+    /* U+F072 "" */
+    0x1, 0xc0, 0x0, 0x7, 0xc0, 0x0, 0x7, 0x80,
+    0x0, 0xf, 0x80, 0x0, 0x1f, 0x0, 0x0, 0x1f,
+    0x0, 0x38, 0x3e, 0x0, 0x78, 0x7e, 0x0, 0x7f,
+    0xff, 0xe0, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xf3,
+    0xff, 0xff, 0xe7, 0xff, 0xff, 0xdf, 0xff, 0xfc,
+    0x3c, 0x3f, 0x0, 0x70, 0x7c, 0x0, 0x1, 0xf0,
+    0x0, 0x3, 0xe0, 0x0, 0x7, 0x80, 0x0, 0xf,
+    0x0, 0x0, 0x1c, 0x0, 0x0,
+
     /* U+F095 "" */
     0x0, 0x0, 0x0, 0x0, 0x3e, 0x0, 0x7, 0xf0,
     0x0, 0x7f, 0x0, 0x7, 0xf0, 0x0, 0xff, 0x0,
@@ -1220,31 +1230,32 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 3028, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
     {.bitmap_index = 3056, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
     {.bitmap_index = 3104, .adv_w = 360, .box_w = 23, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 3148, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3201, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3220, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3270, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3306, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3354, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 3394, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3437, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3475, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3513, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3551, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3589, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3627, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3663, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 3701, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3730, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 3768, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3834, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3883, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3933, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3993, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 4046, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 4107, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4162, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4215, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
+    {.bitmap_index = 3148, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3209, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3262, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3281, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3331, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3367, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3415, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 3455, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3498, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3536, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3574, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3612, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3650, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3688, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3724, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 3762, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3791, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 3829, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3895, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3944, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3994, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4054, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4107, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4168, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4223, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4276, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
 };
 
 /*---------------------
@@ -1253,10 +1264,11 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
 
 static const uint16_t unicode_list_2[] = {
     0x0, 0x14, 0x16, 0x23, 0x26, 0x27, 0x28, 0x39,
-    0x47, 0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x6d, 0x94,
-    0x128, 0x184, 0x1e5, 0x1fb, 0x200, 0x21d, 0x23f, 0x240,
-    0x241, 0x242, 0x243, 0x251, 0x292, 0x293, 0x2f1, 0x3dc,
-    0x3fc, 0x45c, 0x54a, 0x55f, 0x568, 0x59e, 0x59f, 0x6a8
+    0x47, 0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x6d, 0x71,
+    0x94, 0x128, 0x184, 0x1e5, 0x1fb, 0x200, 0x21d, 0x23f,
+    0x240, 0x241, 0x242, 0x243, 0x251, 0x292, 0x293, 0x2f1,
+    0x3dc, 0x3fc, 0x45c, 0x54a, 0x55f, 0x568, 0x59e, 0x59f,
+    0x6a8
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -1272,7 +1284,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 61441, .range_length = 1705, .glyph_id_start = 160,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 40, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 41, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
@@ -1321,7 +1333,7 @@ lv_font_t jetbrains_mono_bold_20 = {
 #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 = -3,
     .underline_thickness = 1,
 #endif
-- 
cgit v1.2.3-70-g09d2


From 1eaf258a633969abdd0e41fbcac9e17fe38eb409 Mon Sep 17 00:00:00 2001
From: medeyko <vladimir.medeyko@gmail.com>
Date: Mon, 7 Feb 2022 17:17:12 +0300
Subject: Update jetbrains_mono_bold_20.c

Fix 0 (zero) symbol. For more details, #988
---
 src/displayapp/fonts/jetbrains_mono_bold_20.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c
index 944e47a1..6cd7aead 100644
--- a/src/displayapp/fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c
@@ -88,8 +88,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xe, 0x3, 0x80, 0xc0, 0x70, 0x18, 0xe, 0x0,
 
     /* U+0030 "0" */
-    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
-    0xdf, 0xf7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
+    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
+    0xdf, 0xb7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
     /* U+0031 "1" */
-- 
cgit v1.2.3-70-g09d2


From 43399b3832df7375f9139d7bd3c082a49549c616 Mon Sep 17 00:00:00 2001
From: medeyko <vladimir.medeyko@gmail.com>
Date: Mon, 7 Feb 2022 17:25:56 +0300
Subject: Update README.md

---
 src/displayapp/fonts/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index 40ecd3e2..5007060e 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -31,6 +31,23 @@ Add new symbols:
 static constexpr const char* newSymbol = "\xEF\x86\x85";
 ```
 
+#### Fix the zero symbol
+If you don't wish the inner dot of the 0 (zero) symbol to stick to the boundary), edit `src/displayapp/fonts/jetbrains_mono_bold_20.c` and replace:
+
+    /* U+0030 "0" */
+    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
+    0xdf, 0xf7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
+    0x8f, 0xc0,
+
+with
+
+    /* U+0030 "0" */
+    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
+    0xdf, 0xb7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
+    0x8f, 0xc0,
+
+(there are two changes: 7f -> 7e and f7 -> b7)
+
 ## Simple method to generate a font
 
 If you want to generate a basic font containing only numbers and letters, you can use the above settings but instead of specifying a range, simply list the characters you need in the Symbols field and leave the range blank. This is the approach used for the PineTimeStyle watchface.
-- 
cgit v1.2.3-70-g09d2


From dd28359571088cc850d315b5c3689c69f54e5838 Mon Sep 17 00:00:00 2001
From: medeyko <vladimir.medeyko@gmail.com>
Date: Mon, 7 Feb 2022 17:31:18 +0300
Subject: Update README.md

remove unnecessary )
---
 src/displayapp/fonts/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index 5007060e..a5f66b10 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -32,7 +32,7 @@ static constexpr const char* newSymbol = "\xEF\x86\x85";
 ```
 
 #### Fix the zero symbol
-If you don't wish the inner dot of the 0 (zero) symbol to stick to the boundary), edit `src/displayapp/fonts/jetbrains_mono_bold_20.c` and replace:
+If you don't wish the inner dot of the 0 (zero) symbol to stick to the boundary, edit `src/displayapp/fonts/jetbrains_mono_bold_20.c` and replace:
 
     /* U+0030 "0" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
-- 
cgit v1.2.3-70-g09d2


From dd47ba9782cb7a7a2268da5b493e6d385bdf08af Mon Sep 17 00:00:00 2001
From: medeyko <vladimir.medeyko@gmail.com>
Date: Mon, 7 Feb 2022 18:29:28 +0300
Subject: Update README.md

More imperative tone
---
 src/displayapp/fonts/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index a5f66b10..b4737681 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -31,8 +31,7 @@ Add new symbols:
 static constexpr const char* newSymbol = "\xEF\x86\x85";
 ```
 
-#### Fix the zero symbol
-If you don't wish the inner dot of the 0 (zero) symbol to stick to the boundary, edit `src/displayapp/fonts/jetbrains_mono_bold_20.c` and replace:
+Then fix an error that happens during the font conversion (the inner dot of the 'zero' symbol sticks to the boundary): edit `src/displayapp/fonts/jetbrains_mono_bold_20.c` and replace:
 
     /* U+0030 "0" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
-- 
cgit v1.2.3-70-g09d2


From 204ad7ca2a8bf30caee7bc9b7395001c0d720b10 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 27 Feb 2022 14:30:47 +0200
Subject: Update font readme, update fonts, add missing files

---
 src/displayapp/fonts/JetBrainsMono-Bold.ttf    | Bin 173264 -> 210128 bytes
 src/displayapp/fonts/JetBrainsMono-Regular.ttf | Bin 0 -> 203952 bytes
 src/displayapp/fonts/README.md                 |  58 ++--
 src/displayapp/fonts/jetbrains_mono_42.c       |  20 +-
 src/displayapp/fonts/jetbrains_mono_76.c       |  44 +--
 src/displayapp/fonts/jetbrains_mono_bold_20.c  | 362 ++++++++++++-------------
 src/displayapp/fonts/open_sans_light.c         |   2 +-
 7 files changed, 248 insertions(+), 238 deletions(-)
 create mode 100644 src/displayapp/fonts/JetBrainsMono-Regular.ttf

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/JetBrainsMono-Bold.ttf b/src/displayapp/fonts/JetBrainsMono-Bold.ttf
index 0cd1cb66..0a928091 100644
Binary files a/src/displayapp/fonts/JetBrainsMono-Bold.ttf and b/src/displayapp/fonts/JetBrainsMono-Bold.ttf differ
diff --git a/src/displayapp/fonts/JetBrainsMono-Regular.ttf b/src/displayapp/fonts/JetBrainsMono-Regular.ttf
new file mode 100644
index 00000000..8da8aa40
Binary files /dev/null and b/src/displayapp/fonts/JetBrainsMono-Regular.ttf differ
diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index b4737681..c8fb0d35 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -7,20 +7,12 @@
 ## Generate the fonts:
 
 * Open the [LVGL font converter](https://lvgl.io/tools/fontconverter)
-* Name : jetbrains_mono_bold_20
-* Size : 20
-* Bpp : 1 bit-per-pixel
-* Do not enable font compression and horizontal subpixel hinting
-* Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x20-0x7f, 0x410-0x44f`
-* Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
-  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf072`
-* Click on Convert, and download the file `jetbrains_mono_bold_20.c` and copy it in `src/DisplayApp/Fonts`
-* Add the font .c file path to src/CMakeLists.txt
-* Add an LV_FONT_DECLARE line in src/libs/lv_conf.h
+* Enter the settings for the font that you wish to convert
+* Click on Convert, download the file and place it in `src/DisplayApp/Fonts`
 
-Add new symbols:
+### How to add new symbols:
 
-* Browse the [cheatsheet](https://fontawesome.com/cheatsheet/free/solid) and find your new symbols
+* Browse [this cheatsheet](https://fontawesome.com/cheatsheet/free/solid) and pick symbols
 * For each symbol, add its hex code (0xf641 for the 'Ad' icon, for example) to the *Range* list (Remember to keep this
   readme updated with newest range list)
 * Convert this hex value into a UTF-8 code
@@ -31,7 +23,18 @@ Add new symbols:
 static constexpr const char* newSymbol = "\xEF\x86\x85";
 ```
 
-Then fix an error that happens during the font conversion (the inner dot of the 'zero' symbol sticks to the boundary): edit `src/displayapp/fonts/jetbrains_mono_bold_20.c` and replace:
+### Small font
+
+* Name: jetbrains_mono_bold_20
+* Size: 20
+* Bpp: 1 bit-per-pixel
+* Do not enable font compression or horizontal subpixel rendering
+* Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x20-0x7e, 0x410-0x44f`
+* Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
+  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf072`
+* Fix an error in the font conversion.
+
+Replace the following:
 
     /* U+0030 "0" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
@@ -47,25 +50,34 @@ with
 
 (there are two changes: 7f -> 7e and f7 -> b7)
 
-## Simple method to generate a font
 
-If you want to generate a basic font containing only numbers and letters, you can use the above settings but instead of specifying a range, simply list the characters you need in the Symbols field and leave the range blank. This is the approach used for the PineTimeStyle watchface.
-This works well for fonts which will only be used to display numbers, but will fail if you try to add a colon or other punctuation.
+### Medium font
+
+* Name: jetbrains_mono_42
+* Size: 42
+* Bpp: 1 bit-per-pixel
+* Do not enable font compression or horizontal subpixel rendering
+* 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
+* Do not enable font compression or horizontal subpixel rendering
+* Load the file `JetBrainsMono-Regular.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x25, 0x2D, 0x2F, 0x30-0x3a`
+
+### PineTimeStyle font
 
-* Open the [LVGL font converter](https://lvgl.io/tools/fontconverter)
 * Name : open_sans_light
 * Size : 150
 * Bpp : 1 bit-per-pixel
-* Do not enable font compression and horizontal subpixel hinting
+* Do not enable font compression or horizontal subpixel rendering
 * Load the file `open_sans_light.tff` (use the file in this repo to ensure the version matches) and specify the following symbols : `0123456789`
-* Click on Convert, and download the file `open_sans_light.c` and copy it in `src/DisplayApp/Fonts`
-* Add the font .c file path to src/CMakeLists.txt (search for jetbrains to find the appropriate location/format)
-* Add an LV_FONT_DECLARE line in src/libs/lv_conf.h (as above)
 
 #### Navigation font
 
 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 creat a ttf file the
+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
 
 You can also use the online LVGL tool to create the .c
@@ -74,5 +86,3 @@ ttf file : navigation.ttf name : lv_font_navi_80 size : 80px Bpp : 2 bit-per-pix
 
 $lv_font_conv --font navigation.ttf -r '0xe900-0xe929' --size 80 --format lvgl --bpp 2 --no-prefilter -o
 lv_font_navi_80.c
-
-#### I use the method above to create the other ttf
diff --git a/src/displayapp/fonts/jetbrains_mono_42.c b/src/displayapp/fonts/jetbrains_mono_42.c
index 6f25f5ab..b5218b95 100644
--- a/src/displayapp/fonts/jetbrains_mono_42.c
+++ b/src/displayapp/fonts/jetbrains_mono_42.c
@@ -61,13 +61,13 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xff, 0xf8,
 
     /* U+0032 "2" */
-    0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
-    0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
+    0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfc, 0x1f,
+    0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
     0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
     0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
     0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
-    0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
-    0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
+    0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7c, 0x0,
+    0x1f, 0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e,
     0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
     0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
     0xff, 0xf8,
@@ -75,12 +75,12 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     /* U+0033 "3" */
     0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
     0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
-    0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
-    0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
-    0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
-    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+    0x0, 0x3, 0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0,
+    0x7, 0x80, 0x1, 0xfc, 0x0, 0x3f, 0xe0, 0x7,
+    0xfe, 0x0, 0xff, 0xe0, 0x0, 0x3e, 0x0, 0x3,
+    0xc0, 0x0, 0x7c, 0x0, 0x7, 0x80, 0x0, 0xf0,
     0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
-    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+    0xf, 0xf0, 0x1, 0xff, 0x0, 0x79, 0xe0, 0x1f,
     0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
     0xfe, 0x0,
 
@@ -245,7 +245,7 @@ lv_font_t jetbrains_mono_42 = {
 #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 = -7,
     .underline_thickness = 2,
 #endif
diff --git a/src/displayapp/fonts/jetbrains_mono_76.c b/src/displayapp/fonts/jetbrains_mono_76.c
index 9c92e144..2200e393 100644
--- a/src/displayapp/fonts/jetbrains_mono_76.c
+++ b/src/displayapp/fonts/jetbrains_mono_76.c
@@ -175,30 +175,30 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 
     /* U+0032 "2" */
-    0x0, 0x7, 0xfc, 0x0, 0x0, 0x1f, 0xff, 0xe0,
+    0x0, 0xf, 0xfc, 0x0, 0x0, 0x1f, 0xff, 0xe0,
     0x0, 0x1f, 0xff, 0xfe, 0x0, 0xf, 0xff, 0xff,
-    0xe0, 0x7, 0xff, 0xff, 0xfc, 0x3, 0xff, 0xff,
-    0xff, 0x81, 0xff, 0xc0, 0x7f, 0xe0, 0xff, 0x80,
+    0xc0, 0x7, 0xff, 0xff, 0xf8, 0x3, 0xff, 0xff,
+    0xff, 0x1, 0xff, 0xc0, 0x7f, 0xe0, 0xff, 0x80,
     0x7, 0xfc, 0x3f, 0xc0, 0x0, 0xff, 0x1f, 0xe0,
     0x0, 0x1f, 0xe7, 0xf0, 0x0, 0x3, 0xf9, 0xfc,
-    0x0, 0x0, 0xfe, 0xff, 0x0, 0x0, 0x1f, 0xff,
+    0x0, 0x0, 0xfe, 0xff, 0x0, 0x0, 0x3f, 0xff,
     0x80, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x1, 0xff,
     0xf8, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x1f,
     0xc0, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x1,
     0xfc, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0,
-    0x3f, 0xc0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
-    0x7, 0xf8, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
-    0x0, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x7, 0xf8, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0,
     0x0, 0x1f, 0xe0, 0x0, 0x0, 0xf, 0xf0, 0x0,
-    0x0, 0x7, 0xfc, 0x0, 0x0, 0x3, 0xfe, 0x0,
-    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x7f, 0xc0,
-    0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0, 0x1f, 0xf0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x3, 0xfe, 0x0,
+    0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x1f, 0xe0,
     0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x7, 0xfc,
     0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x1, 0xff,
     0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x7f,
     0xc0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0, 0x1f,
-    0xf8, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x7,
-    0xfe, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0, 0x0,
+    0xf0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x7,
+    0xfc, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0,
     0xff, 0x80, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0,
     0x3f, 0xe0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
     0xf, 0xf8, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
@@ -214,22 +214,22 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xff, 0x80, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
     0x7, 0xf0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0,
     0x1, 0xfc, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
-    0x0, 0x7f, 0x80, 0x0, 0x0, 0x1f, 0xc0, 0x0,
-    0x0, 0xf, 0xe0, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x3f, 0xc0, 0x0,
+    0x0, 0x1f, 0xe0, 0x0, 0x0, 0x7, 0xf0, 0x0,
     0x0, 0x3, 0xf8, 0x0, 0x0, 0x1, 0xfc, 0x0,
-    0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x7f, 0x80,
     0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x1f, 0xe0,
-    0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x1, 0xff,
     0xfc, 0x0, 0x0, 0x7f, 0xff, 0xc0, 0x0, 0x1f,
     0xff, 0xf8, 0x0, 0x7, 0xff, 0xff, 0x0, 0x1,
-    0xff, 0xff, 0xe0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
-    0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xe0,
+    0xff, 0xff, 0xe0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0x1f, 0xe0,
     0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0xfe,
     0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x7,
     0xf0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
     0x7f, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0,
     0x7, 0xf0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0,
-    0x0, 0x7f, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x80,
+    0x0, 0x7f, 0xfe, 0x0, 0x0, 0x1f, 0xff, 0x80,
     0x0, 0x7, 0xff, 0xe0, 0x0, 0x1, 0xff, 0xf8,
     0x0, 0x0, 0x7f, 0xff, 0x0, 0x0, 0x3f, 0xdf,
     0xc0, 0x0, 0xf, 0xe7, 0xf8, 0x0, 0x7, 0xf9,
@@ -466,10 +466,10 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 878, .adv_w = 730, .box_w = 34, .box_h = 56, .ofs_x = 7, .ofs_y = 0},
     {.bitmap_index = 1116, .adv_w = 730, .box_w = 34, .box_h = 57, .ofs_x = 6, .ofs_y = 0},
     {.bitmap_index = 1359, .adv_w = 730, .box_w = 34, .box_h = 57, .ofs_x = 5, .ofs_y = -1},
-    {.bitmap_index = 1602, .adv_w = 730, .box_w = 32, .box_h = 56, .ofs_x = 6, .ofs_y = 0},
+    {.bitmap_index = 1602, .adv_w = 730, .box_w = 32, .box_h = 56, .ofs_x = 5, .ofs_y = 0},
     {.bitmap_index = 1826, .adv_w = 730, .box_w = 32, .box_h = 57, .ofs_x = 7, .ofs_y = -1},
     {.bitmap_index = 2054, .adv_w = 730, .box_w = 36, .box_h = 58, .ofs_x = 5, .ofs_y = -1},
-    {.bitmap_index = 2315, .adv_w = 730, .box_w = 36, .box_h = 56, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 2315, .adv_w = 730, .box_w = 36, .box_h = 56, .ofs_x = 6, .ofs_y = 0},
     {.bitmap_index = 2567, .adv_w = 730, .box_w = 36, .box_h = 58, .ofs_x = 5, .ofs_y = -1},
     {.bitmap_index = 2828, .adv_w = 730, .box_w = 36, .box_h = 57, .ofs_x = 5, .ofs_y = 0},
     {.bitmap_index = 3085, .adv_w = 730, .box_w = 13, .box_h = 44, .ofs_x = 16, .ofs_y = -1}
@@ -541,7 +541,7 @@ lv_font_t jetbrains_mono_76 = {
 #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 = -12,
     .underline_thickness = 4,
 #endif
diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c
index 6cd7aead..cc67532a 100644
--- a/src/displayapp/fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c
@@ -32,9 +32,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xef, 0xdf, 0xbf, 0x7e, 0xfd, 0xc0,
 
     /* U+0023 "#" */
-    0x8, 0xc3, 0x10, 0x66, 0x3f, 0xf7, 0xfe, 0x23,
-    0x4, 0x61, 0x88, 0x31, 0x1f, 0xfb, 0xff, 0x19,
-    0x82, 0x30, 0xc4, 0x0,
+    0x8, 0xc3, 0x18, 0x62, 0x3f, 0xf7, 0xfe, 0x23,
+    0xc, 0x61, 0x88, 0xff, 0xdf, 0xf8, 0x8c, 0x11,
+    0x86, 0x30, 0xc4, 0x0,
 
     /* U+0024 "$" */
     0x8, 0x2, 0x0, 0x81, 0xfc, 0x7f, 0xba, 0x7e,
@@ -93,11 +93,11 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x8f, 0xc0,
 
     /* U+0031 "1" */
-    0x1e, 0x3f, 0x3b, 0x99, 0xc8, 0xe0, 0x70, 0x38,
+    0x1e, 0x3f, 0x3f, 0x99, 0xc8, 0xe0, 0x70, 0x38,
     0x1c, 0xe, 0x7, 0x3, 0x81, 0xcf, 0xff, 0xfc,
 
     /* U+0032 "2" */
-    0x3e, 0x3f, 0xbc, 0xfc, 0x70, 0x38, 0x1c, 0x1c,
+    0x3e, 0x3f, 0xbd, 0xfc, 0x70, 0x38, 0x1c, 0x1c,
     0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0xf, 0xff, 0xfc,
 
     /* U+0033 "3" */
@@ -122,7 +122,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     /* U+0037 "7" */
     0xff, 0xff, 0xfe, 0x1f, 0x86, 0x3, 0x80, 0xe0,
     0x30, 0x1c, 0x6, 0x3, 0x80, 0xc0, 0x70, 0x1c,
-    0x6, 0x0,
+    0xe, 0x0,
 
     /* U+0038 "8" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xdc, 0xe3,
@@ -157,7 +157,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x30, 0x30, 0x0, 0x0, 0x70, 0x70,
 
     /* U+0040 "@" */
-    0x1f, 0x7, 0xf9, 0xc3, 0x70, 0x3c, 0x7, 0x8f,
+    0x1f, 0x7, 0xf9, 0xc3, 0x70, 0x3c, 0x7, 0x8e,
     0xf3, 0xfe, 0x63, 0xcc, 0x79, 0x8f, 0x31, 0xe6,
     0x3c, 0xff, 0x8e, 0xf8, 0x3, 0x80, 0x3e, 0x3,
     0xc0,
@@ -168,8 +168,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xf0, 0x30,
 
     /* U+0042 "B" */
-    0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xcf,
-    0xe3, 0xfc, 0xe3, 0xb8, 0x7e, 0x1f, 0x8f, 0xff,
+    0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xef,
+    0xe3, 0xfc, 0xe3, 0xf8, 0x7e, 0x1f, 0x8f, 0xff,
     0xbf, 0xc0,
 
     /* U+0043 "C" */
@@ -217,9 +217,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xc0, 0xe0, 0x70, 0x38, 0x1c, 0xf, 0xff, 0xfc,
 
     /* U+004D "M" */
-    0xe1, 0xf8, 0x7f, 0x3f, 0xcf, 0xd2, 0xf7, 0xbd,
-    0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0,
-    0xf0, 0x30,
+    0xf3, 0xfc, 0xfd, 0x3f, 0xcf, 0xff, 0xff, 0xfe,
+    0xdf, 0xb7, 0xe1, 0xf8, 0x7e, 0x1f, 0x87, 0xe1,
+    0xf8, 0x70,
 
     /* U+004E "N" */
     0xe1, 0xf0, 0xfc, 0x7e, 0x3f, 0x9e, 0xcf, 0x67,
@@ -245,7 +245,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xb8, 0x70,
 
     /* U+0053 "S" */
-    0x3f, 0x1f, 0xee, 0x3f, 0x87, 0xe0, 0x3c, 0x7,
+    0x3f, 0x1f, 0xee, 0x3f, 0x87, 0xe0, 0x3e, 0x7,
     0xf0, 0xfe, 0x3, 0xc0, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
@@ -260,7 +260,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
 
     /* U+0056 "V" */
     0xc0, 0xf8, 0x7e, 0x1d, 0x86, 0x61, 0x9c, 0xe7,
-    0x38, 0xcc, 0x33, 0xf, 0xc3, 0xf0, 0x78, 0x1e,
+    0x38, 0xcc, 0x33, 0xe, 0xc3, 0xf0, 0x78, 0x1e,
     0x7, 0x80,
 
     /* U+0057 "W" */
@@ -314,8 +314,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x7f, 0xf7, 0x70,
 
     /* U+0063 "c" */
-    0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x7, 0x3, 0x81,
-    0xc7, 0xe3, 0xbf, 0x8f, 0x80,
+    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
+    0x3, 0x87, 0xf3, 0xdf, 0xe3, 0xf0,
 
     /* U+0064 "d" */
     0x3, 0x81, 0xc0, 0xe7, 0x77, 0xff, 0x1f, 0x8f,
@@ -382,12 +382,12 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xe,
 
     /* U+0072 "r" */
-    0xee, 0x7f, 0xb9, 0xfc, 0x7e, 0x3f, 0x3, 0x81,
+    0xee, 0x7f, 0xb8, 0xfc, 0x7e, 0x3f, 0x3, 0x81,
     0xc0, 0xe0, 0x70, 0x38, 0x0,
 
     /* U+0073 "s" */
     0x1f, 0x1f, 0xf7, 0x1d, 0xc0, 0x7c, 0xf, 0xe0,
-    0x3c, 0x7, 0x71, 0xdf, 0xe3, 0xf0,
+    0x3c, 0x7, 0x71, 0xdf, 0xf3, 0xf0,
 
     /* U+0074 "t" */
     0x1c, 0x7, 0x1, 0xc3, 0xff, 0xff, 0xc7, 0x1,
@@ -399,12 +399,12 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xc7, 0xe3, 0xbf, 0x8f, 0x80,
 
     /* U+0076 "v" */
-    0xe0, 0xf8, 0x76, 0x19, 0x86, 0x73, 0x8c, 0xc3,
+    0xc0, 0xf8, 0x7e, 0x1d, 0x86, 0x73, 0x8c, 0xc3,
     0x30, 0xfc, 0x1e, 0x7, 0x81, 0xe0,
 
     /* U+0077 "w" */
-    0xe6, 0x36, 0x66, 0x66, 0x66, 0xf6, 0x6f, 0x66,
-    0x96, 0x69, 0x62, 0x94, 0x39, 0xc3, 0x9c, 0x39,
+    0xc6, 0x36, 0x66, 0x66, 0x66, 0xf6, 0x6f, 0x66,
+    0x96, 0x69, 0x62, 0x94, 0x29, 0x43, 0x9c, 0x39,
     0xc0,
 
     /* U+0078 "x" */
@@ -412,7 +412,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xe0, 0xfc, 0x73, 0x9c, 0xee, 0x1c,
 
     /* U+0079 "y" */
-    0xe1, 0xf8, 0x76, 0x19, 0xce, 0x73, 0x8c, 0xc3,
+    0xe0, 0xf8, 0x76, 0x19, 0xce, 0x73, 0x8c, 0xc3,
     0xf0, 0x7c, 0x1e, 0x7, 0x80, 0xe0, 0x30, 0x1c,
     0x6, 0x3, 0x80,
 
@@ -421,17 +421,17 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xe0, 0xe0, 0x7f, 0xff, 0xe0,
 
     /* U+007B "{" */
-    0x3, 0x87, 0xc3, 0x81, 0xc0, 0xe0, 0x70, 0x38,
+    0x7, 0x87, 0xc3, 0x81, 0xc0, 0xe0, 0x70, 0x38,
     0x1c, 0xfc, 0x7e, 0x3, 0x81, 0xc0, 0xe0, 0x70,
-    0x38, 0x1c, 0xf, 0x81, 0xc0,
+    0x30, 0x1c, 0xf, 0x83, 0xc0,
 
     /* U+007C "|" */
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
 
     /* U+007D "}" */
-    0xf0, 0x3e, 0x1, 0xc0, 0x70, 0x1c, 0x7, 0x1,
-    0xc0, 0x70, 0xf, 0xc3, 0xf1, 0xc0, 0x70, 0x1c,
-    0x7, 0x1, 0xc0, 0x70, 0xf8, 0x3c, 0x0,
+    0xf0, 0x7c, 0xe, 0x7, 0x3, 0x81, 0xc0, 0xe0,
+    0x70, 0x1f, 0x8f, 0xce, 0x7, 0x3, 0x81, 0xc0,
+    0x60, 0x70, 0xf8, 0x78, 0x0,
 
     /* U+007E "~" */
     0x78, 0xff, 0x3c, 0xcf, 0x3f, 0xc7, 0x80,
@@ -447,8 +447,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xbf, 0xc0,
 
     /* U+0412 "В" */
-    0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xcf,
-    0xe3, 0xfc, 0xe3, 0xb8, 0x7e, 0x1f, 0x8f, 0xff,
+    0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xef,
+    0xe3, 0xfc, 0xe3, 0xf8, 0x7e, 0x1f, 0x8f, 0xff,
     0xbf, 0xc0,
 
     /* U+0413 "Г" */
@@ -470,9 +470,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x66, 0x66, 0x66, 0x6c, 0x63,
 
     /* U+0417 "З" */
-    0x1f, 0xf, 0xf3, 0xc7, 0x0, 0x60, 0x1c, 0x1e,
-    0x3, 0xf0, 0xe, 0x0, 0xe0, 0x1f, 0x83, 0xf8,
-    0xf7, 0xfc, 0x3e, 0x0,
+    0x3f, 0x1f, 0xef, 0x1f, 0x87, 0x1, 0xc7, 0xc1,
+    0xf8, 0xf, 0x1, 0xc0, 0x7e, 0x1f, 0xcf, 0x7f,
+    0x8f, 0x80,
 
     /* U+0418 "И" */
     0xc3, 0xe3, 0xf1, 0xf8, 0xfc, 0xde, 0x6f, 0x37,
@@ -494,9 +494,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xf8, 0x70,
 
     /* U+041C "М" */
-    0xe1, 0xf8, 0x7f, 0x3f, 0xcf, 0xd2, 0xf7, 0xbd,
-    0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0,
-    0xf0, 0x30,
+    0xf3, 0xfc, 0xfd, 0x3f, 0xcf, 0xff, 0xff, 0xfe,
+    0xdf, 0xb7, 0xe1, 0xf8, 0x7e, 0x1f, 0x87, 0xe1,
+    0xf8, 0x70,
 
     /* U+041D "Н" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0xff,
@@ -546,7 +546,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xff, 0xf0, 0x1c, 0x7, 0x1, 0xc0,
 
     /* U+0427 "Ч" */
-    0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0xce,
+    0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xff, 0x3f, 0x81, 0xc0, 0xe0, 0x70, 0x38, 0x1c,
 
     /* U+0428 "Ш" */
@@ -593,8 +593,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x1f, 0x87, 0xe3, 0xff, 0xf3, 0xdc,
 
     /* U+0431 "б" */
-    0x1f, 0x3f, 0x9c, 0x1c, 0xe, 0xe7, 0xfb, 0x8f,
-    0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
+    0x1f, 0x3f, 0x9c, 0x1c, 0xe, 0xe7, 0xfb, 0x9f,
+    0xc7, 0xe3, 0xf1, 0xf8, 0xfe, 0xf7, 0xf1, 0xf0,
 
     /* U+0432 "в" */
     0xff, 0x3f, 0xee, 0x3b, 0x8e, 0xfe, 0x3f, 0xee,
@@ -619,7 +619,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x70,
 
     /* U+0437 "з" */
-    0x3f, 0x1f, 0xfe, 0x1c, 0x7, 0x1f, 0x87, 0xe0,
+    0x3f, 0x1f, 0xfe, 0x1c, 0x7, 0x1f, 0x7, 0xe0,
     0x1c, 0x7, 0xe1, 0xdf, 0xe3, 0xf0,
 
     /* U+0438 "и" */
@@ -632,8 +632,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xc7, 0xc3,
 
     /* U+043A "к" */
-    0xe1, 0xf8, 0xee, 0x33, 0x9c, 0xfe, 0x3f, 0x8e,
-    0x73, 0x9c, 0xe3, 0xb8, 0x6e, 0x1c,
+    0xe1, 0xf8, 0xee, 0x3b, 0x9c, 0xfe, 0x3f, 0x8e,
+    0x73, 0x8c, 0xe3, 0xb8, 0x6e, 0x1c,
 
     /* U+043B "л" */
     0x3f, 0xcf, 0xf3, 0x9c, 0xe7, 0x39, 0xce, 0x73,
@@ -644,7 +644,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xc,
 
     /* U+043D "н" */
-    0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0xff, 0xff,
+    0xe3, 0xf1, 0xf8, 0xfc, 0x7f, 0xff, 0xff, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xe0,
 
     /* U+043E "о" */
@@ -661,15 +661,15 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x80,
 
     /* U+0441 "с" */
-    0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x7, 0x3, 0x81,
-    0xc7, 0xe3, 0xbf, 0x8f, 0x80,
+    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
+    0x3, 0x87, 0xf3, 0xdf, 0xe3, 0xf0,
 
     /* U+0442 "т" */
     0xff, 0xff, 0xf0, 0xe0, 0x38, 0xe, 0x3, 0x80,
     0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0,
 
     /* U+0443 "у" */
-    0xe1, 0xf8, 0x76, 0x19, 0xce, 0x73, 0x8c, 0xc3,
+    0xe0, 0xf8, 0x76, 0x19, 0xce, 0x73, 0x8c, 0xc3,
     0xf0, 0x7c, 0x1e, 0x7, 0x80, 0xe0, 0x30, 0x1c,
     0x6, 0x3, 0x80,
 
@@ -688,7 +688,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xc0, 0x70,
 
     /* U+0447 "ч" */
-    0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3b, 0xfc, 0xfe,
+    0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0xfd, 0xfe,
     0x7, 0x3, 0x81, 0xc0, 0xe0,
 
     /* U+0448 "ш" */
@@ -714,8 +714,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x1f, 0x87, 0xe1, 0xff, 0xef, 0xf0,
 
     /* U+044D "э" */
-    0x3e, 0x3f, 0xb8, 0xe0, 0x70, 0xf8, 0x7c, 0xf,
-    0xc7, 0xe7, 0xbf, 0x8f, 0x80,
+    0x1f, 0x1f, 0xe6, 0x3c, 0x7, 0xf, 0xc3, 0xf0,
+    0x1d, 0x87, 0x73, 0xdf, 0xe1, 0xf0,
 
     /* U+044E "ю" */
     0xc7, 0xb3, 0xfc, 0xcf, 0x33, 0xfc, 0xff, 0x3c,
@@ -1123,139 +1123,139 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 975, .adv_w = 192, .box_w = 5, .box_h = 3, .ofs_x = 3, .ofs_y = 13},
     {.bitmap_index = 977, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
     {.bitmap_index = 991, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1007, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1020, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1036, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1049, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1067, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
-    {.bitmap_index = 1084, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1100, .adv_w = 192, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1120, .adv_w = 192, .box_w = 8, .box_h = 19, .ofs_x = 1, .ofs_y = -4},
-    {.bitmap_index = 1139, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1157, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1177, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1191, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1204, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1217, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 2, .ofs_y = -4},
-    {.bitmap_index = 1234, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
-    {.bitmap_index = 1251, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1264, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1278, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1296, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1309, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1323, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1340, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1354, .adv_w = 192, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
-    {.bitmap_index = 1373, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1386, .adv_w = 192, .box_w = 9, .box_h = 18, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 1407, .adv_w = 192, .box_w = 3, .box_h = 18, .ofs_x = 5, .ofs_y = -2},
-    {.bitmap_index = 1414, .adv_w = 192, .box_w = 10, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 1437, .adv_w = 192, .box_w = 10, .box_h = 5, .ofs_x = 1, .ofs_y = 5},
-    {.bitmap_index = 1444, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1462, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1480, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1498, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1514, .adv_w = 192, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 1538, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1554, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1575, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1595, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1611, .adv_w = 192, .box_w = 9, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1633, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1651, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1669, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1687, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1703, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1719, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1735, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1753, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1771, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1789, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1807, .adv_w = 192, .box_w = 10, .box_h = 16, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 1827, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1845, .adv_w = 192, .box_w = 10, .box_h = 17, .ofs_x = 2, .ofs_y = -3},
-    {.bitmap_index = 1867, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1883, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1901, .adv_w = 192, .box_w = 11, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 1923, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1944, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1962, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 1980, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1996, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2014, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2032, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2046, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2062, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2076, .adv_w = 192, .box_w = 8, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2087, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 2107, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2120, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 2137, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2151, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2164, .adv_w = 192, .box_w = 9, .box_h = 16, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2182, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2196, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2210, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2224, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2237, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2250, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2263, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 2, .ofs_y = -4},
-    {.bitmap_index = 2280, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2293, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2307, .adv_w = 192, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
-    {.bitmap_index = 2326, .adv_w = 192, .box_w = 10, .box_h = 18, .ofs_x = 1, .ofs_y = -4},
-    {.bitmap_index = 2349, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2363, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = -3},
-    {.bitmap_index = 2381, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2394, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2408, .adv_w = 192, .box_w = 11, .box_h = 13, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 2426, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 2443, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2457, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 2471, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2484, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2498, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 2511, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2561, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2610, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2658, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2708, .adv_w = 240, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 2737, .adv_w = 360, .box_w = 23, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 2792, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2831, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2874, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
-    {.bitmap_index = 2902, .adv_w = 280, .box_w = 18, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2950, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2989, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3028, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
-    {.bitmap_index = 3056, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3104, .adv_w = 360, .box_w = 23, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 3148, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3209, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3262, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3281, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3331, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3367, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3415, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 3455, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3498, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3536, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3574, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3612, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3650, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3688, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3724, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 3762, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3791, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 3829, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3895, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3944, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3994, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4054, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 4107, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 4168, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4223, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4276, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
+    {.bitmap_index = 1007, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1021, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1037, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1050, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1068, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
+    {.bitmap_index = 1085, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1101, .adv_w = 192, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1121, .adv_w = 192, .box_w = 8, .box_h = 19, .ofs_x = 1, .ofs_y = -4},
+    {.bitmap_index = 1140, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1158, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1178, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1192, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1205, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1218, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 2, .ofs_y = -4},
+    {.bitmap_index = 1235, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
+    {.bitmap_index = 1252, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1265, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1279, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1297, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1310, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1324, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1341, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1355, .adv_w = 192, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
+    {.bitmap_index = 1374, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1387, .adv_w = 192, .box_w = 9, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 1408, .adv_w = 192, .box_w = 3, .box_h = 18, .ofs_x = 5, .ofs_y = -2},
+    {.bitmap_index = 1415, .adv_w = 192, .box_w = 9, .box_h = 18, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 1436, .adv_w = 192, .box_w = 10, .box_h = 5, .ofs_x = 1, .ofs_y = 5},
+    {.bitmap_index = 1443, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1461, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1479, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1497, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1513, .adv_w = 192, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 1537, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1553, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1574, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1592, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1608, .adv_w = 192, .box_w = 9, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1630, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1648, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1666, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1684, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1700, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1716, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1732, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1750, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1768, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1786, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1804, .adv_w = 192, .box_w = 10, .box_h = 16, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 1824, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1842, .adv_w = 192, .box_w = 10, .box_h = 17, .ofs_x = 2, .ofs_y = -3},
+    {.bitmap_index = 1864, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1880, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1898, .adv_w = 192, .box_w = 11, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 1920, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1941, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1959, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 1977, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1993, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2011, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2029, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2043, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2059, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2073, .adv_w = 192, .box_w = 8, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2084, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 2104, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2117, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 2134, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2148, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2161, .adv_w = 192, .box_w = 9, .box_h = 16, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2179, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2193, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2207, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2221, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2234, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2247, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2260, .adv_w = 192, .box_w = 9, .box_h = 15, .ofs_x = 2, .ofs_y = -4},
+    {.bitmap_index = 2277, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2291, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2305, .adv_w = 192, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
+    {.bitmap_index = 2324, .adv_w = 192, .box_w = 10, .box_h = 18, .ofs_x = 1, .ofs_y = -4},
+    {.bitmap_index = 2347, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2361, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = -3},
+    {.bitmap_index = 2379, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2392, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2406, .adv_w = 192, .box_w = 11, .box_h = 13, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 2424, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 2441, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2455, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 2469, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2483, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2497, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 2510, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2560, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2609, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2657, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2707, .adv_w = 240, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 2736, .adv_w = 360, .box_w = 23, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 2791, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2830, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2873, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
+    {.bitmap_index = 2901, .adv_w = 280, .box_w = 18, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2949, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2988, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3027, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
+    {.bitmap_index = 3055, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3103, .adv_w = 360, .box_w = 23, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 3147, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3208, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3261, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3280, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3330, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3366, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3414, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 3454, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3497, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3535, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3573, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3611, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3649, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3687, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3723, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 3761, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3790, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 3828, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3894, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3943, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3993, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4053, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4106, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4167, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4222, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4275, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
 };
 
 /*---------------------
diff --git a/src/displayapp/fonts/open_sans_light.c b/src/displayapp/fonts/open_sans_light.c
index 15f0ddf6..84b78690 100644
--- a/src/displayapp/fonts/open_sans_light.c
+++ b/src/displayapp/fonts/open_sans_light.c
@@ -1248,7 +1248,7 @@ lv_font_t open_sans_light = {
 #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 = -11,
     .underline_thickness = 7,
 #endif
-- 
cgit v1.2.3-70-g09d2


From 13c66dd54b6ffcd3ea529457c3d5a0864ca1bdae Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 27 Feb 2022 14:53:06 +0200
Subject: Further updates to font readme.

---
 src/displayapp/fonts/README.md                     |  33 +-
 .../fonts/jetbrains_mono_extrabold_compressed.c    | 772 +++++++++++----------
 src/displayapp/fonts/lv_font_sys_48.c              |   2 +-
 3 files changed, 419 insertions(+), 388 deletions(-)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index c8fb0d35..2e900d12 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -29,9 +29,9 @@ static constexpr const char* newSymbol = "\xEF\x86\x85";
 * Size: 20
 * Bpp: 1 bit-per-pixel
 * Do not enable font compression or horizontal subpixel rendering
-* Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x20-0x7e, 0x410-0x44f`
+* Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range: `0x20-0x7e, 0x410-0x44f`
 * Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
-  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf072`
+  range: `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf072`
 * Fix an error in the font conversion.
 
 Replace the following:
@@ -50,29 +50,44 @@ with
 
 (there are two changes: 7f -> 7e and f7 -> b7)
 
-
 ### Medium font
 
 * Name: jetbrains_mono_42
 * Size: 42
 * Bpp: 1 bit-per-pixel
 * Do not enable font compression or horizontal subpixel rendering
-* 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`
+* 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
 * Do not enable font compression or horizontal subpixel rendering
-* Load the file `JetBrainsMono-Regular.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x25, 0x2D, 0x2F, 0x30-0x3a`
+* Load the file `JetBrainsMono-Regular.tff` (use the file in this repo to ensure the version matches) and specify the following range: `0x25, 0x2D, 0x2F, 0x30-0x3a`
+
+### Digital watchface font
+
+* Name: jetbrains_mono_extrabold_compressed
+* Size: 80
+* Bpp: 1 bit-per-pixel
+* Do not enable font compression or horizontal subpixel rendering
+* Load the file `JetBrainsMono-ExtraBold.tff` (use the file in this repo to ensure the version matches) and specify the following range: `0x30-0x3a`
 
 ### PineTimeStyle font
 
-* Name : open_sans_light
-* Size : 150
-* Bpp : 1 bit-per-pixel
+* Name: open_sans_light
+* Size: 150
+* Bpp: 1 bit-per-pixel
+* Do not enable font compression or horizontal subpixel rendering
+* Load the file `open_sans_light.tff` (use the file in this repo to ensure the version matches) and specify the following symbols: `0123456789`
+
+### Symbols font (Used in QuickSettings for example)
+
+* Name: lv_font_sys_48
+* Size: 48
+* Bpp: 1 bit-per-pixel
 * Do not enable font compression or horizontal subpixel rendering
-* Load the file `open_sans_light.tff` (use the file in this repo to ensure the version matches) and specify the following symbols : `0123456789`
+* 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
 
diff --git a/src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c b/src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c
index c9917e40..ab0a5c4e 100644
--- a/src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c
+++ b/src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c
@@ -1,11 +1,15 @@
-#include "lvgl/lvgl.h"
-
 /*******************************************************************************
  * Size: 80 px
  * Bpp: 1
  * Opts: 
  ******************************************************************************/
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
 #ifndef JETBRAINS_MONO_EXTRABOLD_COMPRESSED
 #define JETBRAINS_MONO_EXTRABOLD_COMPRESSED 1
 #endif
@@ -17,418 +21,412 @@
  *----------------*/
 
 /*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
-    /* U+30 "0" */
-    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
-    0xfe, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xc0, 0x0,
-    0x3f, 0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff,
-    0xfe, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x80, 0x3f,
-    0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff,
-    0xf8, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x1f, 0xff,
-    0xff, 0xff, 0xff, 0x1f, 0xff, 0xe0, 0x3f, 0xff,
-    0xcf, 0xff, 0xc0, 0x7, 0xff, 0xe7, 0xff, 0xc0,
-    0x1, 0xff, 0xf7, 0xff, 0xc0, 0x0, 0x7f, 0xff,
-    0xff, 0xe0, 0x0, 0x3f, 0xff, 0xff, 0xe0, 0x0,
-    0xf, 0xff, 0xff, 0xf0, 0x0, 0x7, 0xff, 0xff,
-    0xf8, 0x0, 0x3, 0xff, 0xff, 0xfc, 0x0, 0x1,
-    0xff, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff, 0xff,
-    0x0, 0x0, 0x7f, 0xff, 0xff, 0x80, 0x0, 0x3f,
-    0xff, 0xff, 0xc0, 0x70, 0x1f, 0xff, 0xff, 0xe0,
-    0x7c, 0xf, 0xff, 0xff, 0xf0, 0x7f, 0x7, 0xff,
-    0xff, 0xf8, 0x3f, 0x83, 0xff, 0xff, 0xfc, 0x1f,
-    0xc1, 0xff, 0xff, 0xfe, 0xf, 0xe0, 0xff, 0xff,
-    0xff, 0x7, 0xf0, 0x7f, 0xff, 0xff, 0x83, 0xf8,
-    0x3f, 0xff, 0xff, 0xc1, 0xfc, 0x1f, 0xff, 0xff,
-    0xe0, 0xfe, 0xf, 0xff, 0xff, 0xf0, 0x7f, 0x7,
-    0xff, 0xff, 0xf8, 0x3f, 0x83, 0xff, 0xff, 0xfc,
-    0x1f, 0xc1, 0xff, 0xff, 0xfe, 0xf, 0xe0, 0xff,
-    0xff, 0xff, 0x3, 0xe0, 0x7f, 0xff, 0xff, 0x80,
-    0xe0, 0x3f, 0xff, 0xff, 0xc0, 0x0, 0x1f, 0xff,
-    0xff, 0xe0, 0x0, 0xf, 0xff, 0xff, 0xf0, 0x0,
-    0x7, 0xff, 0xff, 0xf8, 0x0, 0x3, 0xff, 0xff,
-    0xfc, 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0,
-    0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xff, 0xff,
-    0xc0, 0x0, 0x7f, 0xf9, 0xff, 0xf0, 0x0, 0x7f,
-    0xfc, 0xff, 0xfc, 0x0, 0x7f, 0xfe, 0x7f, 0xff,
-    0x80, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xff,
-    0x7, 0xff, 0xff, 0xff, 0xff, 0x3, 0xff, 0xff,
-    0xff, 0xff, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80,
-    0x3f, 0xff, 0xff, 0xff, 0x80, 0xf, 0xff, 0xff,
-    0xff, 0x80, 0x3, 0xff, 0xff, 0xff, 0x0, 0x0,
-    0x7f, 0xff, 0xff, 0x0, 0x0, 0xf, 0xff, 0xfc,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
-
-    /* U+31 "1" */
-    0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0xf, 0xff,
-    0xe0, 0x0, 0x0, 0x3f, 0xff, 0xe0, 0x0, 0x0,
-    0x7f, 0xff, 0xe0, 0x0, 0x1, 0xff, 0xff, 0xe0,
-    0x0, 0x3, 0xff, 0xff, 0xe0, 0x0, 0x7, 0xff,
-    0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xe0, 0x0,
-    0x3f, 0xff, 0xff, 0xe0, 0x0, 0x7f, 0xff, 0xff,
-    0xe0, 0x0, 0x7f, 0xff, 0xff, 0xe0, 0x0, 0x7f,
-    0xfd, 0xff, 0xe0, 0x0, 0x7f, 0xf9, 0xff, 0xe0,
-    0x0, 0x7f, 0xf1, 0xff, 0xe0, 0x0, 0x7f, 0xe1,
-    0xff, 0xe0, 0x0, 0x7f, 0x81, 0xff, 0xe0, 0x0,
-    0x7f, 0x1, 0xff, 0xe0, 0x0, 0x7c, 0x1, 0xff,
-    0xe0, 0x0, 0x78, 0x1, 0xff, 0xe0, 0x0, 0x60,
-    0x1, 0xff, 0xe0, 0x0, 0x40, 0x1, 0xff, 0xe0,
-    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
-    0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
-    0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff,
-    0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
-    0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0,
-    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
-    0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
-    0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff,
-    0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
-    0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0,
-    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
-    0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
-    0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff,
-    0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
-    0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0,
-    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
-    0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0030 "0" */
+    0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff,
+    0xe0, 0x0, 0x1, 0xff, 0xff, 0xf0, 0x0, 0xf,
+    0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xf8,
+    0x0, 0xff, 0xff, 0xff, 0xf8, 0x3, 0xff, 0xff,
+    0xff, 0xf8, 0xf, 0xff, 0xff, 0xff, 0xf8, 0x3f,
+    0xff, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff,
+    0xf1, 0xff, 0xfc, 0x7, 0xff, 0xf3, 0xff, 0xe0,
+    0x3, 0xff, 0xe7, 0xff, 0x80, 0x3, 0xff, 0xdf,
+    0xfe, 0x0, 0x3, 0xff, 0xff, 0xfc, 0x0, 0x3,
+    0xff, 0xff, 0xf0, 0x0, 0x7, 0xff, 0xff, 0xe0,
+    0x0, 0xf, 0xff, 0xff, 0xc0, 0x0, 0x1f, 0xff,
+    0xff, 0x80, 0x0, 0x3f, 0xff, 0xff, 0x0, 0x0,
+    0x7f, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff, 0xfc,
+    0x0, 0x1, 0xff, 0xff, 0xf8, 0x0, 0x3, 0xff,
+    0xff, 0xf0, 0x0, 0x7, 0xff, 0xff, 0xe0, 0x7c,
+    0xf, 0xff, 0xff, 0xc1, 0xfe, 0x1f, 0xff, 0xff,
+    0x87, 0xfc, 0x3f, 0xff, 0xff, 0x1f, 0xfc, 0x7f,
+    0xff, 0xfe, 0x3f, 0xf8, 0xff, 0xff, 0xfc, 0x7f,
+    0xf1, 0xff, 0xff, 0xf8, 0xff, 0xe3, 0xff, 0xff,
+    0xf1, 0xff, 0xc7, 0xff, 0xff, 0xe1, 0xff, 0xf,
+    0xff, 0xff, 0xc1, 0xfc, 0x1f, 0xff, 0xff, 0x81,
+    0xf0, 0x3f, 0xff, 0xff, 0x0, 0x0, 0x7f, 0xff,
+    0xfe, 0x0, 0x0, 0xff, 0xff, 0xfc, 0x0, 0x1,
+    0xff, 0xff, 0xf8, 0x0, 0x3, 0xff, 0xff, 0xf0,
+    0x0, 0x7, 0xff, 0xff, 0xe0, 0x0, 0xf, 0xff,
+    0xff, 0xc0, 0x0, 0x1f, 0xff, 0xff, 0x80, 0x0,
+    0x3f, 0xff, 0xff, 0x0, 0x0, 0x7f, 0xff, 0xfe,
+    0x0, 0x0, 0xff, 0xff, 0xfe, 0x0, 0x1, 0xff,
+    0xff, 0xfc, 0x0, 0x7, 0xff, 0xbf, 0xfc, 0x0,
+    0x1f, 0xfe, 0x7f, 0xfc, 0x0, 0x7f, 0xfc, 0xff,
+    0xfe, 0x3, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+    0xe1, 0xff, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff,
+    0xff, 0xff, 0x1, 0xff, 0xff, 0xff, 0xfc, 0x1,
+    0xff, 0xff, 0xff, 0xf0, 0x1, 0xff, 0xff, 0xff,
+    0xc0, 0x1, 0xff, 0xff, 0xff, 0x0, 0x0, 0xff,
+    0xff, 0xf8, 0x0, 0x0, 0x7f, 0xff, 0xc0, 0x0,
+    0x0, 0x1f, 0xfc, 0x0, 0x0,
+
+    /* U+0031 "1" */
+    0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x0, 0x1f,
+    0xff, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x0,
+    0x7, 0xff, 0xff, 0x80, 0x0, 0x7f, 0xff, 0xfe,
+    0x0, 0x3, 0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff,
+    0xff, 0xe0, 0x1, 0xff, 0xff, 0xff, 0x80, 0xf,
+    0xff, 0xff, 0xfe, 0x0, 0x3f, 0xff, 0xff, 0xf8,
+    0x0, 0xff, 0xfd, 0xff, 0xe0, 0x3, 0xff, 0xc7,
+    0xff, 0x80, 0xf, 0xfe, 0x1f, 0xfe, 0x0, 0x3f,
+    0xe0, 0x7f, 0xf8, 0x0, 0xff, 0x1, 0xff, 0xe0,
+    0x3, 0xf8, 0x7, 0xff, 0x80, 0xf, 0x80, 0x1f,
+    0xfe, 0x0, 0x3c, 0x0, 0x7f, 0xf8, 0x0, 0xe0,
+    0x1, 0xff, 0xe0, 0x2, 0x0, 0x7, 0xff, 0x80,
+    0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0, 0x7f,
+    0xf8, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
+    0x7, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xfe, 0x0,
+    0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0, 0x1, 0xff,
+    0xe0, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0,
+    0x1f, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0,
+    0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff,
+    0x80, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0,
+    0x7f, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
+    0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xfe,
+    0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0, 0x1,
+    0xff, 0xe0, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0,
+    0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xf8,
+    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x7,
+    0xff, 0x80, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0,
+    0x0, 0x7f, 0xf8, 0x0, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff,
+    0xc0,
 
-    /* U+32 "2" */
-    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
-    0xfc, 0x0, 0x0, 0x1f, 0xff, 0xff, 0x80, 0x0,
-    0x3f, 0xff, 0xff, 0xf0, 0x0, 0x3f, 0xff, 0xff,
-    0xfc, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x0, 0x3f,
-    0xff, 0xff, 0xff, 0xc0, 0x3f, 0xff, 0xff, 0xff,
-    0xf0, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x1f, 0xff,
-    0xff, 0xff, 0xfe, 0x1f, 0xff, 0xe0, 0x7f, 0xff,
-    0x8f, 0xff, 0xc0, 0xf, 0xff, 0xc7, 0xff, 0xc0,
-    0x3, 0xff, 0xe7, 0xff, 0xc0, 0x0, 0xff, 0xfb,
-    0xff, 0xc0, 0x0, 0x7f, 0xfd, 0xff, 0xe0, 0x0,
-    0x1f, 0xfe, 0xff, 0xf0, 0x0, 0xf, 0xff, 0x0,
-    0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x3,
-    0xff, 0xc0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
-    0x0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff,
-    0xf8, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
-    0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0xfe,
-    0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0,
-    0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0,
-    0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f,
-    0xff, 0x80, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0,
-    0x0, 0x7f, 0xff, 0x80, 0x0, 0x0, 0x7f, 0xff,
-    0x80, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0, 0x0,
-    0xff, 0xff, 0x80, 0x0, 0x0, 0xff, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xff, 0x80, 0x0, 0x0, 0xff,
-    0xff, 0x80, 0x0, 0x1, 0xff, 0xff, 0x0, 0x0,
-    0x1, 0xff, 0xff, 0x0, 0x0, 0x1, 0xff, 0xff,
-    0x0, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x0, 0x3,
-    0xff, 0xfe, 0x0, 0x0, 0x3, 0xff, 0xfe, 0x0,
-    0x0, 0x3, 0xff, 0xfc, 0x0, 0x0, 0x3, 0xff,
-    0xfc, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0,
-    0x0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff,
-    0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff,
-    0xdf, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff,
-    0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfb,
-    0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff,
-    0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f,
+    /* U+0032 "2" */
+    0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff,
+    0xe0, 0x0, 0x1, 0xff, 0xff, 0xf8, 0x0, 0xf,
+    0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xf8,
+    0x0, 0xff, 0xff, 0xff, 0xfc, 0x3, 0xff, 0xff,
+    0xff, 0xf8, 0xf, 0xff, 0xff, 0xff, 0xf8, 0x1f,
+    0xff, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff,
+    0xf0, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xfc,
+    0xf, 0xff, 0xe7, 0xff, 0xe0, 0xf, 0xff, 0xcf,
+    0xff, 0x80, 0xf, 0xff, 0xff, 0xfe, 0x0, 0xf,
+    0xff, 0xff, 0xfc, 0x0, 0x1f, 0xff, 0xff, 0xf0,
+    0x0, 0x1f, 0xff, 0xff, 0xe0, 0x0, 0x3f, 0xff,
+    0xff, 0xc0, 0x0, 0x7f, 0xf8, 0x0, 0x0, 0x0,
+    0xff, 0xf0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
+    0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
+    0x0, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0,
+    0x7f, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0,
+    0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0xf, 0xff,
+    0xc0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0,
+    0xff, 0xfc, 0x0, 0x0, 0x3, 0xff, 0xf8, 0x0,
+    0x0, 0xf, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff,
+    0x80, 0x0, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x3,
+    0xff, 0xfc, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x0,
+    0x0, 0x3f, 0xff, 0xc0, 0x0, 0x0, 0xff, 0xff,
+    0x0, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x0, 0xf,
+    0xff, 0xf0, 0x0, 0x0, 0x3f, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xff, 0x0, 0x0, 0x3, 0xff, 0xf8,
+    0x0, 0x0, 0xf, 0xff, 0xe0, 0x0, 0x0, 0x3f,
+    0xff, 0x80, 0x0, 0x0, 0xff, 0xfe, 0x0, 0x0,
+    0x3, 0xff, 0xf8, 0x0, 0x0, 0xf, 0xff, 0xe0,
+    0x0, 0x0, 0x3f, 0xff, 0x80, 0x0, 0x0, 0xff,
+    0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff,
+    0xfb, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff,
+    0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xdf,
     0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff,
-    0xff, 0xc0,
+    0xff, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff,
+    0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xfb,
+    0xff, 0xff, 0xff, 0xff, 0xf0,
 
-    /* U+33 "3" */
-    0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf, 0xff, 0xff,
-    0xff, 0xff, 0x7, 0xff, 0xff, 0xff, 0xff, 0x83,
-    0xff, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff,
-    0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x7f,
+    /* U+0033 "3" */
+    0x1f, 0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff,
+    0xff, 0xf0, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0xff,
+    0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff,
+    0x83, 0xff, 0xff, 0xff, 0xff, 0x7, 0xff, 0xff,
+    0xff, 0xfe, 0xf, 0xff, 0xff, 0xff, 0xfc, 0x1f,
     0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xff,
-    0xfc, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf, 0xff,
-    0xff, 0x8f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff,
-    0x80, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
-    0x1f, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff, 0x80,
-    0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f,
-    0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0,
-    0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfe,
-    0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0,
-    0x3f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfc, 0x0,
-    0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0, 0xf,
-    0xff, 0xf8, 0x0, 0x0, 0x7, 0xff, 0xff, 0x0,
-    0x0, 0x3, 0xff, 0xff, 0xe0, 0x0, 0x1, 0xff,
-    0xff, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xfe, 0x0,
-    0x0, 0x7f, 0xff, 0xff, 0x80, 0x0, 0x3f, 0xff,
-    0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xf0, 0x0,
-    0xf, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x0, 0xff,
-    0xfe, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0,
-    0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x1, 0xff,
-    0xe0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
-    0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x1f, 0xfe,
-    0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff, 0xc0,
-    0x0, 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0,
-    0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xff, 0xff,
-    0xc0, 0x0, 0x7f, 0xf9, 0xff, 0xf0, 0x0, 0x7f,
-    0xfc, 0xff, 0xfc, 0x0, 0x7f, 0xfe, 0x7f, 0xff,
-    0x80, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xff,
-    0xf, 0xff, 0xff, 0xff, 0xff, 0x3, 0xff, 0xff,
-    0xff, 0xff, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80,
-    0x3f, 0xff, 0xff, 0xff, 0x80, 0xf, 0xff, 0xff,
-    0xff, 0x80, 0x3, 0xff, 0xff, 0xff, 0x0, 0x0,
-    0x7f, 0xff, 0xff, 0x0, 0x0, 0xf, 0xff, 0xfc,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
+    0xf0, 0x0, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x0,
+    0xf, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfc, 0x0,
+    0x0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff,
+    0xc0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
+    0x7f, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
+    0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xfe,
+    0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0, 0x1,
+    0xff, 0xf8, 0x0, 0x0, 0x3, 0xff, 0xfe, 0x0,
+    0x0, 0x7, 0xff, 0xff, 0x0, 0x0, 0xf, 0xff,
+    0xff, 0x80, 0x0, 0x1f, 0xff, 0xff, 0x80, 0x0,
+    0x3f, 0xff, 0xff, 0x80, 0x0, 0x7f, 0xff, 0xff,
+    0x80, 0x0, 0xff, 0xff, 0xff, 0x80, 0x1, 0xff,
+    0xff, 0xff, 0x0, 0x3, 0xff, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x7f,
+    0xfc, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0,
+    0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf0,
+    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x3,
+    0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0,
+    0x0, 0xf, 0xff, 0x0, 0x0, 0x0, 0x1f, 0xfe,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xc0, 0x0,
+    0x7f, 0xff, 0xff, 0x80, 0x0, 0xff, 0xff, 0xff,
+    0x0, 0x1, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff,
+    0xff, 0xfe, 0x0, 0xf, 0xff, 0xbf, 0xfe, 0x0,
+    0x3f, 0xfe, 0x7f, 0xff, 0x1, 0xff, 0xfc, 0xff,
+    0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0xff, 0xff, 0xff, 0xff, 0x81, 0xff, 0xff,
+    0xff, 0xff, 0x1, 0xff, 0xff, 0xff, 0xfc, 0x1,
+    0xff, 0xff, 0xff, 0xf0, 0x0, 0xff, 0xff, 0xff,
+    0x80, 0x0, 0xff, 0xff, 0xfe, 0x0, 0x0, 0x7f,
+    0xff, 0xf0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
 
-    /* U+34 "4" */
+    /* U+0034 "4" */
     0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x1f,
     0xff, 0x80, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0,
     0x3, 0xff, 0xe0, 0x0, 0x0, 0x1f, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xfc, 0x0, 0x0, 0x3, 0xff,
-    0xe0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
-    0xff, 0xfc, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x3, 0xff,
+    0xe0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
+    0xff, 0xfc, 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0,
     0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xff, 0xfc,
-    0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0x3f,
-    0xff, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
-    0x7, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x1f,
+    0xff, 0x0, 0x0, 0x0, 0xff, 0xfc, 0x0, 0x0,
+    0x7, 0xff, 0xe0, 0x0, 0x0, 0x1f, 0xff, 0x0,
     0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x7, 0xff,
-    0xc0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x1,
-    0xff, 0xf8, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
-    0x0, 0x3f, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xf8,
-    0x0, 0x0, 0xf, 0xff, 0xc0, 0x0, 0x0, 0x3f,
-    0xfe, 0x0, 0xff, 0xf1, 0xff, 0xf0, 0x3, 0xff,
-    0xcf, 0xff, 0xc0, 0xf, 0xff, 0x7f, 0xfe, 0x0,
-    0x3f, 0xfd, 0xff, 0xf0, 0x0, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
+    0xff, 0xf8, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0,
+    0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0xff, 0xf8,
+    0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x3f,
+    0xff, 0x0, 0xff, 0xf0, 0xff, 0xf8, 0x3, 0xff,
+    0xc7, 0xff, 0xc0, 0xf, 0xff, 0x3f, 0xff, 0x0,
+    0x3f, 0xfd, 0xff, 0xf8, 0x0, 0xff, 0xf7, 0xff,
     0xc0, 0x3, 0xff, 0xff, 0xfe, 0x0, 0xf, 0xff,
-    0xff, 0xf0, 0x0, 0x3f, 0xff, 0xff, 0x80, 0x0,
+    0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xc0, 0x0,
     0xff, 0xff, 0xfe, 0x0, 0x3, 0xff, 0xff, 0xf8,
     0x0, 0xf, 0xff, 0xff, 0xe0, 0x0, 0x3f, 0xff,
+    0xff, 0x80, 0x0, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0,
-    0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0, 0x3f,
+    0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3f,
     0xfc, 0x0, 0x0, 0x0, 0xff, 0xf0, 0x0, 0x0,
     0x3, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, 0x0,
     0x0, 0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0xff,
     0xf0, 0x0, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x0,
     0xf, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfc, 0x0,
-    0x0, 0x0, 0xff, 0xf0,
+    0x0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff,
+    0xc0,
 
-    /* U+35 "5" */
-    0x3f, 0xff, 0xff, 0xff, 0xfe, 0x1f, 0xff, 0xff,
-    0xff, 0xff, 0xf, 0xff, 0xff, 0xff, 0xff, 0x87,
-    0xff, 0xff, 0xff, 0xff, 0xc3, 0xff, 0xff, 0xff,
-    0xff, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff,
-    0xff, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff,
-    0xfc, 0x3f, 0xff, 0xff, 0xff, 0xfe, 0x1f, 0xff,
-    0xff, 0xff, 0xff, 0xf, 0xff, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff, 0xc0,
-    0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x0,
-    0xff, 0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0,
-    0x0, 0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x1f,
-    0xfe, 0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0,
-    0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff,
-    0xc0, 0x7f, 0x80, 0x1, 0xff, 0xe1, 0xff, 0xf8,
-    0x0, 0xff, 0xf1, 0xff, 0xff, 0x0, 0x7f, 0xf9,
-    0xff, 0xff, 0xc0, 0x3f, 0xfd, 0xff, 0xff, 0xf0,
-    0x1f, 0xff, 0xff, 0xff, 0xfc, 0xf, 0xff, 0xff,
-    0xff, 0xff, 0x7, 0xff, 0xff, 0xff, 0xff, 0xc3,
-    0xff, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xfc, 0x7,
-    0xff, 0xf8, 0xff, 0xf8, 0x0, 0xff, 0xfc, 0x0,
-    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0xf,
-    0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
-    0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xff,
-    0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
-    0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x1f, 0xfe,
-    0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff, 0xc0,
-    0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0x0, 0x1,
-    0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xfb, 0xff,
-    0xe0, 0x0, 0xff, 0xf9, 0xff, 0xf8, 0x0, 0xff,
-    0xfc, 0xff, 0xff, 0x81, 0xff, 0xfe, 0x3f, 0xff,
-    0xff, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xff,
-    0x7, 0xff, 0xff, 0xff, 0xff, 0x1, 0xff, 0xff,
-    0xff, 0xff, 0x0, 0x7f, 0xff, 0xff, 0xff, 0x0,
-    0x1f, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff, 0xff,
-    0xff, 0x0, 0x0, 0xff, 0xff, 0xfe, 0x0, 0x0,
-    0x1f, 0xff, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0,
+    /* U+0035 "5" */
+    0x7f, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, 0xff,
+    0xff, 0xc7, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xff,
+    0xff, 0xff, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xf1,
+    0xff, 0xff, 0xff, 0xff, 0xc7, 0xff, 0xff, 0xff,
+    0xff, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff,
+    0xff, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xc7,
+    0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0x0, 0x0,
+    0x0, 0x7f, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xe0,
+    0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x1f,
+    0xfe, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
+    0x1, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff, 0x80,
+    0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0, 0x7f,
+    0xf8, 0x1f, 0xf0, 0x1, 0xff, 0xe1, 0xff, 0xf0,
+    0x7, 0xff, 0x9f, 0xff, 0xf0, 0x1f, 0xfe, 0xff,
+    0xff, 0xe0, 0x7f, 0xfb, 0xff, 0xff, 0xc1, 0xff,
+    0xff, 0xff, 0xff, 0x87, 0xff, 0xff, 0xff, 0xff,
+    0x1f, 0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0xff,
+    0xff, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xff,
+    0xf0, 0x3f, 0xff, 0x9f, 0xff, 0x0, 0x3f, 0xfe,
+    0x7f, 0xf8, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x1,
+    0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, 0xc0, 0x0,
+    0x0, 0xf, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfc,
+    0x0, 0x0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x3,
+    0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0,
+    0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xf0,
+    0x0, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0xf,
+    0xff, 0xff, 0xf0, 0x0, 0x3f, 0xff, 0xff, 0xc0,
+    0x0, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff, 0xff,
+    0xfe, 0x0, 0x1f, 0xfe, 0xff, 0xfc, 0x0, 0xff,
+    0xf9, 0xff, 0xfc, 0xf, 0xff, 0xe7, 0xff, 0xff,
+    0xff, 0xff, 0xf, 0xff, 0xff, 0xff, 0xfc, 0x3f,
+    0xff, 0xff, 0xff, 0xe0, 0x7f, 0xff, 0xff, 0xff,
+    0x80, 0xff, 0xff, 0xff, 0xfc, 0x1, 0xff, 0xff,
+    0xff, 0xe0, 0x3, 0xff, 0xff, 0xfe, 0x0, 0x3,
+    0xff, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff, 0x0,
+    0x0, 0x1, 0xff, 0xc0, 0x0,
 
-    /* U+36 "6" */
-    0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x7,
-    0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0,
-    0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f,
-    0xfe, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0,
-    0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x7, 0xff,
-    0xc0, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0,
+    /* U+0036 "6" */
+    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x1f,
+    0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff,
+    0x80, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0,
+    0x7, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0,
+    0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x3,
+    0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0,
+    0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
     0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc,
-    0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0,
-    0xf, 0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xc0,
-    0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x1,
-    0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0,
-    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0xf,
-    0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
-    0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xff,
-    0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x3f, 0xc0,
-    0x0, 0x1f, 0xfe, 0x3f, 0xfe, 0x0, 0xf, 0xff,
-    0xbf, 0xff, 0xe0, 0x3, 0xff, 0xdf, 0xff, 0xfc,
-    0x1, 0xff, 0xef, 0xff, 0xff, 0x80, 0x7f, 0xff,
-    0xff, 0xff, 0xf0, 0x3f, 0xff, 0xff, 0xff, 0xfe,
-    0xf, 0xff, 0xff, 0xff, 0xff, 0x87, 0xff, 0xff,
-    0xff, 0xff, 0xf1, 0xff, 0xff, 0x3, 0xff, 0xfc,
-    0x7f, 0xff, 0x0, 0x3f, 0xff, 0x9f, 0xff, 0x0,
-    0x3, 0xff, 0xef, 0xff, 0xc0, 0x0, 0xff, 0xfb,
-    0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0,
-    0x7, 0xff, 0xff, 0xfc, 0x0, 0x0, 0xff, 0xff,
-    0xff, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xc0, 0x0,
-    0xf, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff,
-    0xfc, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0,
-    0x3f, 0xff, 0xff, 0xe0, 0x0, 0x1f, 0xff, 0x7f,
-    0xf8, 0x0, 0x7, 0xff, 0xdf, 0xfe, 0x0, 0x3,
-    0xff, 0xe7, 0xff, 0xc0, 0x0, 0xff, 0xf9, 0xff,
-    0xfc, 0x0, 0xff, 0xfe, 0x3f, 0xff, 0xc0, 0xff,
-    0xff, 0xf, 0xff, 0xff, 0xff, 0xff, 0xc1, 0xff,
-    0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff,
-    0xf0, 0x7, 0xff, 0xff, 0xff, 0xf8, 0x0, 0xff,
-    0xff, 0xff, 0xfe, 0x0, 0x1f, 0xff, 0xff, 0xfe,
-    0x0, 0x3, 0xff, 0xff, 0xff, 0x0, 0x0, 0x3f,
-    0xff, 0xff, 0x0, 0x0, 0x3, 0xff, 0xff, 0x0,
-    0x0, 0x0, 0xf, 0xfc, 0x0, 0x0,
-
-    /* U+37 "7" */
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0,
+    0x3f, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0,
+    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x1f,
+    0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff,
+    0x87, 0xf8, 0x0, 0x7, 0xff, 0x8f, 0xff, 0x0,
+    0x7, 0xff, 0xcf, 0xff, 0xe0, 0x3, 0xff, 0xdf,
+    0xff, 0xf8, 0x3, 0xff, 0xef, 0xff, 0xfe, 0x1,
+    0xff, 0xff, 0xff, 0xff, 0x81, 0xff, 0xff, 0xff,
+    0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x7f,
+    0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0x81, 0xff,
+    0xff, 0x3f, 0xff, 0x0, 0x3f, 0xff, 0x9f, 0xff,
+    0x0, 0x7, 0xff, 0xdf, 0xff, 0x80, 0x3, 0xff,
+    0xef, 0xff, 0x80, 0x0, 0xff, 0xff, 0xff, 0xc0,
+    0x0, 0x7f, 0xff, 0xff, 0xc0, 0x0, 0x1f, 0xff,
+    0xff, 0xe0, 0x0, 0xf, 0xff, 0xff, 0xf0, 0x0,
+    0x7, 0xff, 0xff, 0xf8, 0x0, 0x3, 0xff, 0xff,
+    0xfc, 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0,
+    0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xfb, 0xff,
+    0xc0, 0x0, 0x7f, 0xfd, 0xff, 0xf0, 0x0, 0x7f,
+    0xfc, 0xff, 0xf8, 0x0, 0x3f, 0xfe, 0x3f, 0xfe,
+    0x0, 0x3f, 0xff, 0x1f, 0xff, 0xc0, 0x7f, 0xff,
+    0x7, 0xff, 0xff, 0xff, 0xff, 0x83, 0xff, 0xff,
+    0xff, 0xff, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80,
+    0x3f, 0xff, 0xff, 0xff, 0xc0, 0xf, 0xff, 0xff,
+    0xff, 0xc0, 0x3, 0xff, 0xff, 0xff, 0x80, 0x0,
+    0xff, 0xff, 0xff, 0x80, 0x0, 0x1f, 0xff, 0xff,
+    0x0, 0x0, 0x3, 0xff, 0xfe, 0x0, 0x0, 0x0,
+    0x3f, 0xf8, 0x0, 0x0,
+
+    /* U+0037 "7" */
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xe0, 0x0, 0xf, 0xff, 0xff, 0xe0, 0x0, 0x1f,
-    0xfe, 0xff, 0xe0, 0x0, 0x1f, 0xfe, 0xff, 0xe0,
-    0x0, 0x3f, 0xfc, 0xff, 0xe0, 0x0, 0x3f, 0xfc,
-    0xff, 0xe0, 0x0, 0x7f, 0xf8, 0xff, 0xe0, 0x0,
-    0x7f, 0xf8, 0xff, 0xe0, 0x0, 0xff, 0xf8, 0xff,
-    0xe0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x1, 0xff,
-    0xf0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
-    0x3, 0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0xc0,
-    0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x7,
-    0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0,
-    0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xfc, 0x0, 0x3, 0xff,
+    0xff, 0xfe, 0x0, 0x1, 0xff, 0xef, 0xff, 0x0,
+    0x1, 0xff, 0xf7, 0xff, 0x80, 0x0, 0xff, 0xf3,
+    0xff, 0xc0, 0x0, 0xff, 0xf9, 0xff, 0xe0, 0x0,
+    0x7f, 0xfc, 0xff, 0xf0, 0x0, 0x7f, 0xfc, 0x7f,
+    0xf8, 0x0, 0x3f, 0xfe, 0x3f, 0xfc, 0x0, 0x3f,
+    0xfe, 0x1f, 0xfe, 0x0, 0x1f, 0xff, 0x0, 0x0,
+    0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff,
+    0x80, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0,
+    0x7, 0xff, 0xc0, 0x0, 0x0, 0x3, 0xff, 0xe0,
+    0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x1,
+    0xff, 0xf0, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff,
+    0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0,
+    0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0xfe,
     0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
-    0x1f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0,
-    0x0, 0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x7f,
-    0xfc, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
-    0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8,
-    0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x1,
-    0xff, 0xf0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
+    0x1f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff, 0x80,
+    0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x7,
+    0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
     0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x3, 0xff,
-    0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0,
-    0x7, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, 0x80,
-    0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x1f,
-    0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0,
-    0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe,
+    0xe0, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0,
+    0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8,
     0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0,
-    0x7f, 0xfc, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0,
-    0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff,
-    0xf8, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0,
-    0x1, 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, 0xe0,
+    0x7f, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0,
+    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x1f,
+    0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff,
+    0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0,
+    0x3, 0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0xe0,
+    0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x1,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0,
     0x0, 0x0,
 
-    /* U+38 "8" */
-    0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff,
-    0xff, 0x80, 0x0, 0x7, 0xff, 0xff, 0xf8, 0x0,
-    0x7, 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff,
-    0xff, 0xf0, 0x1, 0xff, 0xff, 0xff, 0xfe, 0x0,
-    0xff, 0xff, 0xff, 0xff, 0xc0, 0x7f, 0xff, 0xff,
-    0xff, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf,
-    0xff, 0xe0, 0x3f, 0xff, 0xc3, 0xff, 0xe0, 0x3,
-    0xff, 0xf0, 0xff, 0xf0, 0x0, 0x7f, 0xfc, 0x7f,
-    0xf8, 0x0, 0xf, 0xff, 0x9f, 0xfe, 0x0, 0x3,
-    0xff, 0xe7, 0xff, 0x0, 0x0, 0x7f, 0xf9, 0xff,
-    0xc0, 0x0, 0x1f, 0xfe, 0x7f, 0xf0, 0x0, 0x7,
-    0xff, 0x9f, 0xfc, 0x0, 0x1, 0xff, 0xe7, 0xff,
-    0x0, 0x0, 0x7f, 0xf9, 0xff, 0xc0, 0x0, 0x1f,
-    0xfe, 0x3f, 0xf8, 0x0, 0xf, 0xff, 0xf, 0xfe,
-    0x0, 0x3, 0xff, 0xc3, 0xff, 0xc0, 0x1, 0xff,
-    0xe0, 0x7f, 0xf8, 0x0, 0xff, 0xf8, 0xf, 0xff,
-    0x80, 0xff, 0xfc, 0x1, 0xff, 0xff, 0xff, 0xfe,
-    0x0, 0x3f, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff,
-    0xff, 0xff, 0x0, 0x0, 0x7f, 0xff, 0xff, 0x0,
-    0x0, 0x3, 0xff, 0xfe, 0x0, 0x0, 0x7, 0xff,
-    0xff, 0xf0, 0x0, 0x7, 0xff, 0xff, 0xff, 0x80,
-    0x7, 0xff, 0xff, 0xff, 0xf0, 0x3, 0xff, 0xff,
-    0xff, 0xff, 0x1, 0xff, 0xf8, 0xf, 0xff, 0xe0,
-    0xff, 0xf8, 0x0, 0x7f, 0xf8, 0x3f, 0xfc, 0x0,
-    0xf, 0xff, 0x1f, 0xfe, 0x0, 0x1, 0xff, 0xe7,
-    0xff, 0x80, 0x0, 0x7f, 0xfb, 0xff, 0xc0, 0x0,
-    0xf, 0xfe, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff,
-    0xfc, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0,
-    0x3f, 0xff, 0xff, 0xc0, 0x0, 0xf, 0xff, 0xff,
-    0xf0, 0x0, 0x3, 0xff, 0xff, 0xfe, 0x0, 0x1,
-    0xff, 0xff, 0xff, 0x80, 0x0, 0x7f, 0xff, 0xff,
-    0xf0, 0x0, 0x3f, 0xff, 0x7f, 0xfe, 0x0, 0x1f,
-    0xff, 0x9f, 0xff, 0xe0, 0x3f, 0xff, 0xe3, 0xff,
-    0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-    0xfc, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0x3, 0xff,
-    0xff, 0xff, 0xff, 0x0, 0x7f, 0xff, 0xff, 0xff,
-    0x80, 0xf, 0xff, 0xff, 0xff, 0xc0, 0x1, 0xff,
-    0xff, 0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xe0,
-    0x0, 0x1, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x7,
-    0xff, 0x80, 0x0,
-
-    /* U+39 "9" */
-    0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x3, 0xff,
-    0xff, 0x0, 0x0, 0x3, 0xff, 0xff, 0xf0, 0x0,
-    0x3, 0xff, 0xff, 0xff, 0x0, 0x1, 0xff, 0xff,
-    0xff, 0xe0, 0x1, 0xff, 0xff, 0xff, 0xfc, 0x0,
-    0x7f, 0xff, 0xff, 0xff, 0x80, 0x3f, 0xff, 0xff,
-    0xff, 0xf0, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf,
-    0xff, 0xff, 0xff, 0xff, 0x83, 0xff, 0xfc, 0xf,
-    0xff, 0xf1, 0xff, 0xf8, 0x0, 0xff, 0xfc, 0x7f,
-    0xfc, 0x0, 0xf, 0xff, 0x9f, 0xff, 0x0, 0x3,
-    0xff, 0xef, 0xff, 0x80, 0x0, 0x7f, 0xfb, 0xff,
-    0xe0, 0x0, 0x1f, 0xff, 0xff, 0xf0, 0x0, 0x3,
-    0xff, 0xff, 0xfc, 0x0, 0x0, 0xff, 0xff, 0xff,
-    0x0, 0x0, 0x3f, 0xff, 0xff, 0xc0, 0x0, 0xf,
-    0xff, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff, 0xfc,
-    0x0, 0x0, 0xff, 0xff, 0xff, 0x80, 0x0, 0x7f,
-    0xff, 0xff, 0xe0, 0x0, 0x1f, 0xff, 0x7f, 0xf8,
-    0x0, 0xf, 0xff, 0xdf, 0xff, 0x0, 0x3, 0xff,
-    0xe7, 0xff, 0xf0, 0x3, 0xff, 0xf8, 0xff, 0xff,
-    0x3, 0xff, 0xfe, 0x3f, 0xff, 0xff, 0xff, 0xff,
-    0x87, 0xff, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff,
-    0xff, 0xff, 0xf0, 0x3f, 0xff, 0xff, 0xff, 0xf8,
-    0x7, 0xff, 0xff, 0xdf, 0xfe, 0x0, 0xff, 0xff,
-    0xef, 0xff, 0x80, 0x1f, 0xff, 0xf7, 0xff, 0xc0,
-    0x1, 0xff, 0xf1, 0xff, 0xf0, 0x0, 0xf, 0xf0,
+    /* U+0038 "8" */
+    0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff,
+    0xfc, 0x0, 0x0, 0x1f, 0xff, 0xff, 0x80, 0x0,
+    0x1f, 0xff, 0xff, 0xf0, 0x0, 0x3f, 0xff, 0xff,
+    0xfc, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x0, 0x3f,
+    0xff, 0xff, 0xff, 0xc0, 0x3f, 0xff, 0xff, 0xff,
+    0xf0, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x1f, 0xff,
+    0xff, 0xff, 0xfe, 0xf, 0xff, 0xe0, 0x7f, 0xff,
+    0x7, 0xff, 0xc0, 0xf, 0xff, 0x87, 0xff, 0xc0,
+    0x3, 0xff, 0xe3, 0xff, 0xe0, 0x1, 0xff, 0xf1,
+    0xff, 0xe0, 0x0, 0x7f, 0xf8, 0xff, 0xf0, 0x0,
+    0x3f, 0xfc, 0x7f, 0xf8, 0x0, 0x1f, 0xfe, 0x3f,
+    0xfc, 0x0, 0xf, 0xff, 0x1f, 0xfe, 0x0, 0x7,
+    0xff, 0x8f, 0xff, 0x80, 0x7, 0xff, 0xc3, 0xff,
+    0xc0, 0x3, 0xff, 0xc1, 0xff, 0xf0, 0x3, 0xff,
+    0xe0, 0x7f, 0xfc, 0x3, 0xff, 0xe0, 0x3f, 0xff,
+    0x3, 0xff, 0xf0, 0xf, 0xff, 0xe7, 0xff, 0xf0,
+    0x3, 0xff, 0xff, 0xff, 0xf0, 0x0, 0xff, 0xff,
+    0xff, 0xf0, 0x0, 0x1f, 0xff, 0xff, 0xf0, 0x0,
+    0x7, 0xff, 0xff, 0xf0, 0x0, 0x1, 0xff, 0xff,
+    0xf0, 0x0, 0x3, 0xff, 0xff, 0xfc, 0x0, 0x3,
+    0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff,
+    0xe0, 0x3, 0xff, 0xff, 0xff, 0xf8, 0x3, 0xff,
+    0xf0, 0xff, 0xfe, 0x3, 0xff, 0xf0, 0x1f, 0xff,
+    0x83, 0xff, 0xe0, 0x7, 0xff, 0xe3, 0xff, 0xe0,
+    0x1, 0xff, 0xf1, 0xff, 0xe0, 0x0, 0x7f, 0xfc,
+    0xff, 0xf0, 0x0, 0x1f, 0xfe, 0xff, 0xf0, 0x0,
+    0x7, 0xff, 0xff, 0xf8, 0x0, 0x3, 0xff, 0xff,
+    0xfc, 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0,
+    0xff, 0xff, 0xff, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xc0, 0x0, 0x7f, 0xff, 0xff, 0xe0, 0x0, 0x3f,
+    0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0x7f, 0xfe,
+    0x0, 0x3f, 0xff, 0x3f, 0xff, 0xc0, 0x7f, 0xff,
+    0x9f, 0xff, 0xff, 0xff, 0xff, 0xc7, 0xff, 0xff,
+    0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xc0,
+    0x7f, 0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff,
+    0xff, 0xe0, 0x7, 0xff, 0xff, 0xff, 0xe0, 0x1,
+    0xff, 0xff, 0xff, 0xc0, 0x0, 0x3f, 0xff, 0xff,
+    0x80, 0x0, 0x7, 0xff, 0xff, 0x0, 0x0, 0x0,
+    0x3f, 0xf8, 0x0, 0x0,
+
+    /* U+0039 "9" */
+    0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x7, 0xff,
+    0xfc, 0x0, 0x0, 0xf, 0xff, 0xff, 0x80, 0x0,
+    0x1f, 0xff, 0xff, 0xf0, 0x0, 0x1f, 0xff, 0xff,
+    0xfc, 0x0, 0x1f, 0xff, 0xff, 0xff, 0x0, 0x1f,
+    0xff, 0xff, 0xff, 0xc0, 0x1f, 0xff, 0xff, 0xff,
+    0xf0, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x1f, 0xff,
+    0xff, 0xff, 0xfe, 0xf, 0xff, 0xf0, 0x7f, 0xff,
+    0x8f, 0xff, 0xe0, 0xf, 0xff, 0xc7, 0xff, 0xc0,
+    0x1, 0xff, 0xf3, 0xff, 0xe0, 0x0, 0xff, 0xfb,
+    0xff, 0xe0, 0x0, 0x3f, 0xfd, 0xff, 0xf0, 0x0,
+    0x1f, 0xff, 0xff, 0xf0, 0x0, 0x7, 0xff, 0xff,
+    0xf8, 0x0, 0x3, 0xff, 0xff, 0xfc, 0x0, 0x1,
+    0xff, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x7f, 0xff, 0xff, 0x80, 0x0, 0x3f,
+    0xff, 0xff, 0xe0, 0x0, 0x3f, 0xff, 0xff, 0xf0,
+    0x0, 0x1f, 0xff, 0x7f, 0xfc, 0x0, 0x1f, 0xff,
+    0x3f, 0xfe, 0x0, 0xf, 0xff, 0x9f, 0xff, 0xc0,
+    0x1f, 0xff, 0xc7, 0xff, 0xf8, 0x3f, 0xff, 0xe3,
+    0xff, 0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff,
+    0xff, 0xf0, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0x1f,
+    0xff, 0xff, 0xff, 0xf8, 0x7, 0xff, 0xff, 0xbf,
+    0xfc, 0x1, 0xff, 0xff, 0xbf, 0xfc, 0x0, 0x7f,
+    0xff, 0xbf, 0xfe, 0x0, 0xf, 0xff, 0x1f, 0xfe,
+    0x0, 0x1, 0xfe, 0x1f, 0xff, 0x0, 0x0, 0x0,
+    0xf, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff, 0x80,
+    0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x7,
+    0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
+    0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0x3, 0xff,
+    0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
+    0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0,
     0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0,
-    0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xf,
-    0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0,
-    0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff,
-    0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0,
-    0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff,
-    0x80, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0,
-    0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8,
-    0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x0,
-    0x1f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff, 0x80,
-    0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0x3,
-    0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0,
-    0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x0, 0x3f,
-    0xff, 0x0, 0x0, 0x0, 0xf, 0xff, 0x80, 0x0,
-    0x0, 0x7, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0x3f,
+    0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0,
+    0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xff,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
+    0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, 0x80,
+    0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x7,
+    0xff, 0xc0, 0x0, 0x0,
 
-    /* U+3A ":" */
+    /* U+003A ":" */
     0x7, 0xe0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe,
-    0x7f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe,
-    0x7f, 0xfe, 0x3f, 0xfc, 0x1f, 0xf8, 0x7, 0xe0,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0x3f, 0xfc,
+    0x1f, 0xf8, 0x7, 0xe0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x7, 0xe0, 0x1f, 0xf8,
-    0x3f, 0xfc, 0x7f, 0xfe, 0x7f, 0xfe, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xe0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0xfc,
+    0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0x3f, 0xfc,
     0x1f, 0xf8, 0x7, 0xe0
 };
 
@@ -439,17 +437,17 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
 
 static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-    {.bitmap_index = 0, .adv_w = 768, .box_w = 41, .box_h = 59, .ofs_x = 4, .ofs_y = -1},
-    {.bitmap_index = 303, .adv_w = 768, .box_w = 40, .box_h = 58, .ofs_x = 6, .ofs_y = 0},
-    {.bitmap_index = 593, .adv_w = 768, .box_w = 41, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
-    {.bitmap_index = 891, .adv_w = 768, .box_w = 41, .box_h = 59, .ofs_x = 3, .ofs_y = -1},
-    {.bitmap_index = 1194, .adv_w = 768, .box_w = 38, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
-    {.bitmap_index = 1470, .adv_w = 768, .box_w = 41, .box_h = 58, .ofs_x = 4, .ofs_y = -1},
-    {.bitmap_index = 1768, .adv_w = 768, .box_w = 42, .box_h = 59, .ofs_x = 3, .ofs_y = -1},
-    {.bitmap_index = 2078, .adv_w = 768, .box_w = 40, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
-    {.bitmap_index = 2368, .adv_w = 768, .box_w = 42, .box_h = 60, .ofs_x = 3, .ofs_y = -1},
-    {.bitmap_index = 2683, .adv_w = 768, .box_w = 42, .box_h = 59, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 2993, .adv_w = 768, .box_w = 16, .box_h = 46, .ofs_x = 16, .ofs_y = -1}
+    {.bitmap_index = 0, .adv_w = 768, .box_w = 39, .box_h = 60, .ofs_x = 5, .ofs_y = -1},
+    {.bitmap_index = 293, .adv_w = 768, .box_w = 38, .box_h = 59, .ofs_x = 6, .ofs_y = 0},
+    {.bitmap_index = 574, .adv_w = 768, .box_w = 39, .box_h = 60, .ofs_x = 4, .ofs_y = 0},
+    {.bitmap_index = 867, .adv_w = 768, .box_w = 39, .box_h = 59, .ofs_x = 4, .ofs_y = -1},
+    {.bitmap_index = 1155, .adv_w = 768, .box_w = 38, .box_h = 59, .ofs_x = 4, .ofs_y = 0},
+    {.bitmap_index = 1436, .adv_w = 768, .box_w = 38, .box_h = 60, .ofs_x = 5, .ofs_y = -1},
+    {.bitmap_index = 1721, .adv_w = 768, .box_w = 41, .box_h = 60, .ofs_x = 4, .ofs_y = -1},
+    {.bitmap_index = 2029, .adv_w = 768, .box_w = 41, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
+    {.bitmap_index = 2327, .adv_w = 768, .box_w = 41, .box_h = 60, .ofs_x = 4, .ofs_y = -1},
+    {.bitmap_index = 2635, .adv_w = 768, .box_w = 41, .box_h = 60, .ofs_x = 4, .ofs_y = -1},
+    {.bitmap_index = 2943, .adv_w = 768, .box_w = 16, .box_h = 46, .ofs_x = 16, .ofs_y = -1}
 };
 
 /*---------------------
@@ -473,9 +471,14 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
  *  ALL CUSTOM DATA
  *--------------------*/
 
+#if LV_VERSION_CHECK(8, 0, 0)
 /*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
 static lv_font_fmt_txt_dsc_t font_dsc = {
-    .glyph_bitmap = gylph_bitmap,
+#endif
+    .glyph_bitmap = glyph_bitmap,
     .glyph_dsc = glyph_dsc,
     .cmaps = cmaps,
     .kern_dsc = NULL,
@@ -483,7 +486,10 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
     .cmap_num = 1,
     .bpp = 1,
     .kern_classes = 0,
-    .bitmap_format = 0
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
 };
 
 
@@ -492,16 +498,26 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
  *----------------*/
 
 /*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t jetbrains_mono_extrabold_compressed = {
+#else
 lv_font_t jetbrains_mono_extrabold_compressed = {
+#endif
     .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height = 60,          /*The maximum line height required by the font*/
+    .line_height = 61,          /*The maximum line height required by the font*/
     .base_line = 1,             /*Baseline measured from the bottom of the line*/
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
+    .underline_position = -12,
+    .underline_thickness = 4,
 #endif
     .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
 };
 
+
+
 #endif /*#if JETBRAINS_MONO_EXTRABOLD_COMPRESSED*/
 
diff --git a/src/displayapp/fonts/lv_font_sys_48.c b/src/displayapp/fonts/lv_font_sys_48.c
index 19f3ec2d..ca007e30 100644
--- a/src/displayapp/fonts/lv_font_sys_48.c
+++ b/src/displayapp/fonts/lv_font_sys_48.c
@@ -311,7 +311,7 @@ lv_font_t lv_font_sys_48 = {
 #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
-- 
cgit v1.2.3-70-g09d2


From 04d21dcd932c7e75b2d45314b2f68d9ba91c5d68 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 27 Feb 2022 15:02:02 +0200
Subject: Add ExtraBold font ttf

---
 src/displayapp/fonts/JetBrainsMono-ExtraBold.ttf | Bin 0 -> 210688 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/displayapp/fonts/JetBrainsMono-ExtraBold.ttf

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/JetBrainsMono-ExtraBold.ttf b/src/displayapp/fonts/JetBrainsMono-ExtraBold.ttf
new file mode 100644
index 00000000..f85a85b5
Binary files /dev/null and b/src/displayapp/fonts/JetBrainsMono-ExtraBold.ttf differ
-- 
cgit v1.2.3-70-g09d2


From 61a9a97e267799f76c64279887a9845d4760a77c Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 1 Mar 2022 01:09:48 +0200
Subject: Update navigation font readme section

---
 src/displayapp/fonts/README.md         | 16 ++++++----------
 src/displayapp/fonts/lv_font_navi_80.c |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/displayapp/fonts')

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
-- 
cgit v1.2.3-70-g09d2


From 78365548f70d9a6ef9a040d8e0039e640e386dc3 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sat, 2 Apr 2022 16:03:20 +0300
Subject: Replace airplane mode with a bluetooth toggle

---
 src/CMakeLists.txt                                 |  2 +-
 src/components/settings/Settings.h                 |  2 +-
 src/displayapp/Apps.h                              |  2 +-
 src/displayapp/DisplayApp.cpp                      |  6 +-
 src/displayapp/fonts/README.md                     |  2 +-
 src/displayapp/fonts/jetbrains_mono_bold_20.c      | 72 +++++++----------
 src/displayapp/screens/BleIcon.cpp                 |  6 +-
 src/displayapp/screens/BleIcon.h                   |  2 +-
 src/displayapp/screens/PineTimeStyle.cpp           |  7 +-
 src/displayapp/screens/Symbols.h                   |  1 -
 src/displayapp/screens/WatchFaceDigital.cpp        |  2 +-
 .../screens/settings/SettingAirplaneMode.cpp       | 93 ----------------------
 .../screens/settings/SettingAirplaneMode.h         | 31 --------
 .../screens/settings/SettingBluetooth.cpp          | 93 ++++++++++++++++++++++
 src/displayapp/screens/settings/SettingBluetooth.h | 31 ++++++++
 src/displayapp/screens/settings/Settings.cpp       |  2 +-
 16 files changed, 168 insertions(+), 186 deletions(-)
 delete mode 100644 src/displayapp/screens/settings/SettingAirplaneMode.cpp
 delete mode 100644 src/displayapp/screens/settings/SettingAirplaneMode.h
 create mode 100644 src/displayapp/screens/settings/SettingBluetooth.cpp
 create mode 100644 src/displayapp/screens/settings/SettingBluetooth.h

(limited to 'src/displayapp/fonts')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff0c9b0c..077546a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -449,7 +449,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingSetTime.cpp
         displayapp/screens/settings/SettingChimes.cpp
         displayapp/screens/settings/SettingShakeThreshold.cpp
-        displayapp/screens/settings/SettingAirplaneMode.cpp
+        displayapp/screens/settings/SettingBluetooth.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 24a82607..44a1a85c 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -237,7 +237,7 @@ namespace Pinetime {
 
       uint8_t appMenu = 0;
       uint8_t settingsMenu = 0;
-      /* airplaneMode is intentionally not saved with the other watch settings and initialized
+      /* ble state is intentionally not saved with the other watch settings and initialized
        * to off (false) on every boot because we always want ble to be enabled on startup
        */
       bool bleRadioEnabled = true;
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index dc9e6253..8aad9535 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -38,7 +38,7 @@ namespace Pinetime {
       SettingSetTime,
       SettingChimes,
       SettingShakeThreshold,
-      SettingAirplaneMode,
+      SettingBluetooth,
       Error
     };
   }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index f6d27477..9ce29da6 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -49,7 +49,7 @@
 #include "displayapp/screens/settings/SettingSetTime.h"
 #include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
-#include "displayapp/screens/settings/SettingAirplaneMode.h"
+#include "displayapp/screens/settings/SettingBluetooth.h"
 
 #include "libs/lv_conf.h"
 
@@ -434,8 +434,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController, motionController, *systemTask);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
-    case Apps::SettingAirplaneMode:
-      currentScreen = std::make_unique<Screens::SettingAirplaneMode>(this, settingsController);
+    case Apps::SettingBluetooth:
+      currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::BatteryInfo:
diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index 7e6203ff..c7a8e2bf 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -31,7 +31,7 @@ static constexpr const char* newSymbol = "\xEF\x86\x85";
 * Do not enable font compression or horizontal subpixel rendering
 * Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range: `0x20-0x7e, 0x410-0x44f`
 * Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
-  range: `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf072`
+  range: `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015`
 * Fix an error in the font conversion.
 
 Replace the following:
diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c
index cc67532a..5c40d494 100644
--- a/src/displayapp/fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c
@@ -840,16 +840,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xf8, 0xf, 0x80, 0xf8, 0x3e, 0x0, 0xff, 0xf0,
     0x0, 0x3f, 0x80, 0x0,
 
-    /* U+F072 "" */
-    0x1, 0xc0, 0x0, 0x7, 0xc0, 0x0, 0x7, 0x80,
-    0x0, 0xf, 0x80, 0x0, 0x1f, 0x0, 0x0, 0x1f,
-    0x0, 0x38, 0x3e, 0x0, 0x78, 0x7e, 0x0, 0x7f,
-    0xff, 0xe0, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xf3,
-    0xff, 0xff, 0xe7, 0xff, 0xff, 0xdf, 0xff, 0xfc,
-    0x3c, 0x3f, 0x0, 0x70, 0x7c, 0x0, 0x1, 0xf0,
-    0x0, 0x3, 0xe0, 0x0, 0x7, 0x80, 0x0, 0xf,
-    0x0, 0x0, 0x1c, 0x0, 0x0,
-
     /* U+F095 "" */
     0x0, 0x0, 0x0, 0x0, 0x3e, 0x0, 0x7, 0xf0,
     0x0, 0x7f, 0x0, 0x7, 0xf0, 0x0, 0xff, 0x0,
@@ -1230,32 +1220,31 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 3027, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
     {.bitmap_index = 3055, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
     {.bitmap_index = 3103, .adv_w = 360, .box_w = 23, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 3147, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3208, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3261, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3280, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3330, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3366, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3414, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 3454, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3497, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3535, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3573, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3611, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3649, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3687, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3723, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 3761, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3790, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 3828, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3894, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3943, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3993, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4053, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 4106, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 4167, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4222, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4275, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
+    {.bitmap_index = 3147, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3200, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3219, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3269, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3305, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3353, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 3393, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3436, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3474, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3512, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3550, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3588, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3626, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3662, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 3700, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3729, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 3767, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3833, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3882, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3932, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3992, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4045, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4106, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4161, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4214, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
 };
 
 /*---------------------
@@ -1264,11 +1253,10 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
 
 static const uint16_t unicode_list_2[] = {
     0x0, 0x14, 0x16, 0x23, 0x26, 0x27, 0x28, 0x39,
-    0x47, 0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x6d, 0x71,
-    0x94, 0x128, 0x184, 0x1e5, 0x1fb, 0x200, 0x21d, 0x23f,
-    0x240, 0x241, 0x242, 0x243, 0x251, 0x292, 0x293, 0x2f1,
-    0x3dc, 0x3fc, 0x45c, 0x54a, 0x55f, 0x568, 0x59e, 0x59f,
-    0x6a8
+    0x47, 0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x6d, 0x94,
+    0x128, 0x184, 0x1e5, 0x1fb, 0x200, 0x21d, 0x23f, 0x240,
+    0x241, 0x242, 0x243, 0x251, 0x292, 0x293, 0x2f1, 0x3dc,
+    0x3fc, 0x45c, 0x54a, 0x55f, 0x568, 0x59e, 0x59f, 0x6a8
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -1284,7 +1272,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 61441, .range_length = 1705, .glyph_id_start = 160,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 41, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 40, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
diff --git a/src/displayapp/screens/BleIcon.cpp b/src/displayapp/screens/BleIcon.cpp
index 019f8039..780a14cf 100644
--- a/src/displayapp/screens/BleIcon.cpp
+++ b/src/displayapp/screens/BleIcon.cpp
@@ -2,11 +2,7 @@
 #include "displayapp/screens/Symbols.h"
 using namespace Pinetime::Applications::Screens;
 
-const char* BleIcon::GetIcon(bool isRadioEnabled, bool isConnected) {
-  if(!isRadioEnabled) {
-    return Symbols::airplane;
-  }
-
+const char* BleIcon::GetIcon(bool isConnected) {
   if (isConnected) {
     return Symbols::bluetooth;
   }
diff --git a/src/displayapp/screens/BleIcon.h b/src/displayapp/screens/BleIcon.h
index d32dfad7..d9a46541 100644
--- a/src/displayapp/screens/BleIcon.h
+++ b/src/displayapp/screens/BleIcon.h
@@ -7,7 +7,7 @@ namespace Pinetime {
     namespace Screens {
       class BleIcon {
       public:
-        static const char* GetIcon(bool isRadioEnabled, bool isConnected);
+        static const char* GetIcon(bool isConnected);
       };
     }
   }
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 44bf47a4..e807289c 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -345,11 +345,10 @@ void PineTimeStyle::SetBatteryIcon() {
 
 
 void PineTimeStyle::AlignIcons() {
-  bool isBleIconVisible = IsBleIconVisible(bleRadioEnabled.Get(), bleState.Get());
-  if (notificationState.Get() && isBleIconVisible) {
+  if (notificationState.Get() && bleState.Get()) {
     lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 8, 25);
     lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
-  } else if (notificationState.Get() && !isBleIconVisible) {
+  } else if (notificationState.Get() && !bleState.Get()) {
     lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
   } else {
     lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
@@ -375,7 +374,7 @@ void PineTimeStyle::Refresh() {
   bleState = bleController.IsConnected();
   bleRadioEnabled = bleController.IsRadioEnabled();
   if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
-    lv_label_set_text(bleIcon, BleIcon::GetIcon(bleRadioEnabled.Get(), bleState.Get()));
+    lv_label_set_text(bleIcon, BleIcon::GetIcon(bleState.Get()));
     AlignIcons();
   }
 
diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h
index 5ba8f953..e68a7af6 100644
--- a/src/displayapp/screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
@@ -44,7 +44,6 @@ namespace Pinetime {
         static constexpr const char* chartLine = "\xEF\x88\x81";
         static constexpr const char* eye = "\xEF\x81\xAE";
         static constexpr const char* home = "\xEF\x80\x95";
-        static constexpr const char* airplane = "\xEF\x81\xB2";
 
         // lv_font_sys_48.c
         static constexpr const char* settings = "\xEE\xA4\x82"; // e902
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index 59bde839..6a914884 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -121,7 +121,7 @@ void WatchFaceDigital::Refresh() {
   bleState = bleController.IsConnected();
   bleRadioEnabled = bleController.IsRadioEnabled();
   if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
-    lv_label_set_text(bleIcon, BleIcon::GetIcon(bleRadioEnabled.Get(), bleState.Get()));
+    lv_label_set_text(bleIcon, BleIcon::GetIcon(bleState.Get()));
   }
   lv_obj_realign(batteryIcon);
   lv_obj_realign(batteryPlug);
diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.cpp b/src/displayapp/screens/settings/SettingAirplaneMode.cpp
deleted file mode 100644
index 85172787..00000000
--- a/src/displayapp/screens/settings/SettingAirplaneMode.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "displayapp/screens/settings/SettingAirplaneMode.h"
-#include <lvgl/lvgl.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/Messages.h"
-#include "displayapp/screens/Styles.h"
-#include "displayapp/screens/Screen.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  static void OnAirplaneModeEnabledEvent(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<SettingAirplaneMode*>(obj->user_data);
-    screen->OnAirplaneModeEnabled(obj, event);
-  }
-
-  static void OnAirplaneModeDisabledEvent(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<SettingAirplaneMode*>(obj->user_data);
-    screen->OnAirplaneModeDisabled(obj, event);
-  }
-}
-
-SettingAirplaneMode::SettingAirplaneMode(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
-  : Screen(app), settingsController {settingsController} {
-
-  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
-
-  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
-  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
-  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
-  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
-
-  lv_obj_set_pos(container1, 10, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 20);
-  lv_obj_set_height(container1, LV_VER_RES - 50);
-  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
-
-  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_text_static(title, "Airplane mode");
-  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
-
-  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  lv_label_set_text_static(icon, Symbols::airplane);
-  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
-
-  cbEnabled = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text(cbEnabled, " Enable");
-  cbEnabled->user_data = this;
-  lv_obj_set_event_cb(cbEnabled, OnAirplaneModeEnabledEvent);
-  SetRadioButtonStyle(cbEnabled);
-
-  cbDisabled = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text(cbDisabled, " Disable");
-  cbDisabled->user_data = this;
-  lv_obj_set_event_cb(cbDisabled, OnAirplaneModeDisabledEvent);
-  SetRadioButtonStyle(cbDisabled);
-
-  if (settingsController.GetBleRadioEnabled()) {
-    lv_checkbox_set_checked(cbDisabled, true);
-    priorMode = true;
-  } else {
-    lv_checkbox_set_checked(cbEnabled, true);
-    priorMode = false;
-  }
-}
-
-SettingAirplaneMode::~SettingAirplaneMode() {
-  lv_obj_clean(lv_scr_act());
-  // Do not call SaveSettings - see src/components/settings/Settings.h
-  if (priorMode != settingsController.GetBleRadioEnabled()) {
-    app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
-  }
-}
-
-void SettingAirplaneMode::OnAirplaneModeEnabled(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    lv_checkbox_set_checked(cbEnabled, true);
-    lv_checkbox_set_checked(cbDisabled, false);
-    settingsController.SetBleRadioEnabled(false);
-  }
-}
-
-void SettingAirplaneMode::OnAirplaneModeDisabled(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    lv_checkbox_set_checked(cbEnabled, false);
-    lv_checkbox_set_checked(cbDisabled, true);
-    settingsController.SetBleRadioEnabled(true);
-  }
-}
-
diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.h b/src/displayapp/screens/settings/SettingAirplaneMode.h
deleted file mode 100644
index b3478c64..00000000
--- a/src/displayapp/screens/settings/SettingAirplaneMode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <array>
-#include <cstdint>
-#include <lvgl/lvgl.h>
-
-#include "components/settings/Settings.h"
-#include "displayapp/screens/Screen.h"
-
-namespace Pinetime {
-
-  namespace Applications {
-    namespace Screens {
-
-      class SettingAirplaneMode : public Screen {
-      public:
-        SettingAirplaneMode(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
-        ~SettingAirplaneMode() override;
-
-        void OnAirplaneModeEnabled(lv_obj_t* object, lv_event_t event);
-        void OnAirplaneModeDisabled(lv_obj_t* object, lv_event_t event);
-
-      private:
-        Controllers::Settings& settingsController;
-        lv_obj_t* cbEnabled;
-        lv_obj_t* cbDisabled;
-        bool priorMode;
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingBluetooth.cpp b/src/displayapp/screens/settings/SettingBluetooth.cpp
new file mode 100644
index 00000000..ab1af223
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingBluetooth.cpp
@@ -0,0 +1,93 @@
+#include "displayapp/screens/settings/SettingBluetooth.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/Messages.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void OnBluetoothDisabledEvent(lv_obj_t* obj, lv_event_t event) {
+    auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
+    screen->OnBluetoothDisabled(obj, event);
+  }
+
+  static void OnBluetoothEnabledEvent(lv_obj_t* obj, lv_event_t event) {
+    auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
+    screen->OnBluetoothEnabled(obj, event);
+  }
+}
+
+SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), settingsController {settingsController} {
+
+  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+
+  lv_obj_set_pos(container1, 10, 60);
+  lv_obj_set_width(container1, LV_HOR_RES - 20);
+  lv_obj_set_height(container1, LV_VER_RES - 50);
+  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_text_static(title, "Bluetooth");
+  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
+
+  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  lv_label_set_text_static(icon, Symbols::bluetooth);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+  cbEnabled = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text(cbEnabled, " Enabled");
+  cbEnabled->user_data = this;
+  lv_obj_set_event_cb(cbEnabled, OnBluetoothEnabledEvent);
+  SetRadioButtonStyle(cbEnabled);
+
+  cbDisabled = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text(cbDisabled, " Disabled");
+  cbDisabled->user_data = this;
+  lv_obj_set_event_cb(cbDisabled, OnBluetoothDisabledEvent);
+  SetRadioButtonStyle(cbDisabled);
+
+  if (settingsController.GetBleRadioEnabled()) {
+    lv_checkbox_set_checked(cbEnabled, true);
+    priorMode = true;
+  } else {
+    lv_checkbox_set_checked(cbDisabled, true);
+    priorMode = false;
+  }
+}
+
+SettingBluetooth::~SettingBluetooth() {
+  lv_obj_clean(lv_scr_act());
+  // Do not call SaveSettings - see src/components/settings/Settings.h
+  if (priorMode != settingsController.GetBleRadioEnabled()) {
+    app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
+  }
+}
+
+void SettingBluetooth::OnBluetoothDisabled(lv_obj_t* object, lv_event_t event) {
+  if (event == LV_EVENT_VALUE_CHANGED) {
+    lv_checkbox_set_checked(cbEnabled, false);
+    lv_checkbox_set_checked(cbDisabled, true);
+    settingsController.SetBleRadioEnabled(false);
+  }
+}
+
+void SettingBluetooth::OnBluetoothEnabled(lv_obj_t* object, lv_event_t event) {
+  if (event == LV_EVENT_VALUE_CHANGED) {
+    lv_checkbox_set_checked(cbEnabled, true);
+    lv_checkbox_set_checked(cbDisabled, false);
+    settingsController.SetBleRadioEnabled(true);
+  }
+}
+
diff --git a/src/displayapp/screens/settings/SettingBluetooth.h b/src/displayapp/screens/settings/SettingBluetooth.h
new file mode 100644
index 00000000..12bb459a
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingBluetooth.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingBluetooth : public Screen {
+      public:
+        SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        ~SettingBluetooth() override;
+
+        void OnBluetoothEnabled(lv_obj_t* object, lv_event_t event);
+        void OnBluetoothDisabled(lv_obj_t* object, lv_event_t event);
+
+      private:
+        Controllers::Settings& settingsController;
+        lv_obj_t* cbEnabled;
+        lv_obj_t* cbDisabled;
+        bool priorMode;
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index dce0c071..bc7efcc2 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -64,7 +64,7 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
     {Symbols::clock, "Chimes", Apps::SettingChimes},
     {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
     {Symbols::check, "Firmware", Apps::FirmwareValidation},
-    {Symbols::airplane, "Airplane mode", Apps::SettingAirplaneMode}
+    {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth}
   }};
 
   return std::make_unique<Screens::List>(2, 4, app, settingsController, applications);
-- 
cgit v1.2.3-70-g09d2