From f1f7fb7f49b132400f2bbc9c8e09e0fd17df6efc Mon Sep 17 00:00:00 2001 From: Diego Miguel Date: Thu, 3 Mar 2022 21:34:51 +0100 Subject: [PATCH] Add whitespace char to Teko font --- src/displayapp/fonts/teko_28.c | 140 +++++++++++++++++---------------- 1 file changed, 74 insertions(+), 66 deletions(-) diff --git a/src/displayapp/fonts/teko_28.c b/src/displayapp/fonts/teko_28.c index cfa40eeb..e72d7ddb 100644 --- a/src/displayapp/fonts/teko_28.c +++ b/src/displayapp/fonts/teko_28.c @@ -22,6 +22,9 @@ /*Store the image of the glyphs*/ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + 0x0, + /* U+0030 "0" */ 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, @@ -300,68 +303,69 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_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 = 162, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 16, .adv_w = 95, .box_w = 4, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 25, .adv_w = 130, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 41, .adv_w = 144, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 57, .adv_w = 146, .box_w = 9, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 78, .adv_w = 144, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 94, .adv_w = 158, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 110, .adv_w = 115, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 126, .adv_w = 161, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 142, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 158, .adv_w = 154, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 179, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 197, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 213, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 231, .adv_w = 141, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 247, .adv_w = 136, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 263, .adv_w = 157, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 279, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 297, .adv_w = 89, .box_w = 2, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 302, .adv_w = 135, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 318, .adv_w = 155, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 336, .adv_w = 121, .box_w = 6, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 350, .adv_w = 213, .box_w = 10, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 373, .adv_w = 169, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 391, .adv_w = 161, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 407, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 423, .adv_w = 161, .box_w = 7, .box_h = 21, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 442, .adv_w = 163, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 460, .adv_w = 146, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 476, .adv_w = 125, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 494, .adv_w = 163, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 510, .adv_w = 143, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 531, .adv_w = 246, .box_w = 15, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 565, .adv_w = 150, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 586, .adv_w = 143, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 604, .adv_w = 122, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 620, .adv_w = 147, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 633, .adv_w = 147, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 650, .adv_w = 146, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 663, .adv_w = 147, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 680, .adv_w = 148, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 693, .adv_w = 88, .box_w = 5, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 705, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 721, .adv_w = 149, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 738, .adv_w = 71, .box_w = 2, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 743, .adv_w = 71, .box_w = 3, .box_h = 23, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 752, .adv_w = 146, .box_w = 8, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 771, .adv_w = 71, .box_w = 2, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 776, .adv_w = 225, .box_w = 12, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 797, .adv_w = 149, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 810, .adv_w = 152, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 823, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 839, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 855, .adv_w = 95, .box_w = 5, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 864, .adv_w = 133, .box_w = 6, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 875, .adv_w = 88, .box_w = 5, .box_h = 17, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 886, .adv_w = 149, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 899, .adv_w = 125, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 913, .adv_w = 227, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 938, .adv_w = 141, .box_w = 9, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 954, .adv_w = 138, .box_w = 8, .box_h = 18, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 972, .adv_w = 119, .box_w = 6, .box_h = 14, .ofs_x = 1, .ofs_y = 0} + {.bitmap_index = 0, .adv_w = 58, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1, .adv_w = 162, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 17, .adv_w = 95, .box_w = 4, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 26, .adv_w = 130, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 42, .adv_w = 144, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 58, .adv_w = 146, .box_w = 9, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 79, .adv_w = 144, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 95, .adv_w = 158, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 111, .adv_w = 115, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 127, .adv_w = 161, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 143, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 159, .adv_w = 154, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 180, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 198, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 214, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 232, .adv_w = 141, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 248, .adv_w = 136, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 264, .adv_w = 157, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 280, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 298, .adv_w = 89, .box_w = 2, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 303, .adv_w = 135, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 319, .adv_w = 155, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 337, .adv_w = 121, .box_w = 6, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 351, .adv_w = 213, .box_w = 10, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 374, .adv_w = 169, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 392, .adv_w = 161, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 408, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 424, .adv_w = 161, .box_w = 7, .box_h = 21, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 443, .adv_w = 163, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 461, .adv_w = 146, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 477, .adv_w = 125, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 495, .adv_w = 163, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 511, .adv_w = 143, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 532, .adv_w = 246, .box_w = 15, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 566, .adv_w = 150, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 587, .adv_w = 143, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 605, .adv_w = 122, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 621, .adv_w = 147, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 634, .adv_w = 147, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 651, .adv_w = 146, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 664, .adv_w = 147, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 681, .adv_w = 148, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 694, .adv_w = 88, .box_w = 5, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 706, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 722, .adv_w = 149, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 739, .adv_w = 71, .box_w = 2, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 744, .adv_w = 71, .box_w = 3, .box_h = 23, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 753, .adv_w = 146, .box_w = 8, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 772, .adv_w = 71, .box_w = 2, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 777, .adv_w = 225, .box_w = 12, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 798, .adv_w = 149, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 811, .adv_w = 152, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 824, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 840, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 856, .adv_w = 95, .box_w = 5, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 865, .adv_w = 133, .box_w = 6, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 876, .adv_w = 88, .box_w = 5, .box_h = 17, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 887, .adv_w = 149, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 900, .adv_w = 125, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 914, .adv_w = 227, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 939, .adv_w = 141, .box_w = 9, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 955, .adv_w = 138, .box_w = 8, .box_h = 18, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 973, .adv_w = 119, .box_w = 6, .box_h = 14, .ofs_x = 1, .ofs_y = 0} }; /*--------------------- @@ -374,15 +378,19 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { static const lv_font_fmt_txt_cmap_t cmaps[] = { { - .range_start = 48, .range_length = 10, .glyph_id_start = 1, + .range_start = 32, .range_length = 1, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY }, { - .range_start = 65, .range_length = 26, .glyph_id_start = 11, + .range_start = 48, .range_length = 10, .glyph_id_start = 2, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY }, { - .range_start = 97, .range_length = 26, .glyph_id_start = 37, + .range_start = 65, .range_length = 26, .glyph_id_start = 12, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + }, + { + .range_start = 97, .range_length = 26, .glyph_id_start = 38, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY } }; @@ -405,7 +413,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .cmaps = cmaps, .kern_dsc = NULL, .kern_scale = 0, - .cmap_num = 3, + .cmap_num = 4, .bpp = 1, .kern_classes = 0, .bitmap_format = 0,