From 5ea531d3910d1fac4d6f6e882e2fbc631cab89c7 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Tue, 24 Mar 2026 07:46:40 +0000 Subject: [PATCH] chore: regenerate fonts --- radio/src/fonts/lvgl/lrg/lv_font_he_L.c | 329 ++++++------- radio/src/fonts/lvgl/lrg/lv_font_he_STD.c | 101 ++-- radio/src/fonts/lvgl/lrg/lv_font_he_XS.c | 181 +++---- radio/src/fonts/lvgl/lrg/lv_font_he_XXS.c | 115 ++--- .../src/fonts/lvgl/lrg/lv_font_he_bold_STD.c | 235 ++++----- radio/src/fonts/lvgl/lrg/lv_font_he_bold_XL.c | 460 +++++++++--------- radio/src/fonts/lvgl/sml/lv_font_he_L.c | 187 +++---- radio/src/fonts/lvgl/sml/lv_font_he_STD.c | 101 ++-- radio/src/fonts/lvgl/sml/lv_font_he_XS.c | 92 ++-- radio/src/fonts/lvgl/sml/lv_font_he_XXS.c | 82 ++-- .../src/fonts/lvgl/sml/lv_font_he_bold_STD.c | 135 ++--- radio/src/fonts/lvgl/sml/lv_font_he_bold_XL.c | 256 +++++----- radio/src/fonts/lvgl/std/lv_font_he_L.c | 224 ++++----- radio/src/fonts/lvgl/std/lv_font_he_STD.c | 103 ++-- radio/src/fonts/lvgl/std/lv_font_he_XS.c | 128 ++--- radio/src/fonts/lvgl/std/lv_font_he_XXS.c | 86 ++-- .../src/fonts/lvgl/std/lv_font_he_bold_STD.c | 175 +++---- radio/src/fonts/lvgl/std/lv_font_he_bold_XL.c | 97 ++-- 18 files changed, 1593 insertions(+), 1494 deletions(-) diff --git a/radio/src/fonts/lvgl/lrg/lv_font_he_L.c b/radio/src/fonts/lvgl/lrg/lv_font_he_L.c index 154d787c5..3f613c7c9 100644 --- a/radio/src/fonts/lvgl/lrg/lv_font_he_L.c +++ b/radio/src/fonts/lvgl/lrg/lv_font_he_L.c @@ -2,173 +2,176 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf1,0x32,0xc0,0x14,0x14,0x14,0x01,0x00,0xc8,0x00,0xc0,0x13, -0x12,0x14,0x01,0x00,0x7c,0x01,0xf0,0x0d,0x0d,0x14,0x01,0x00,0xfe,0x01,0x50,0x12, -0x12,0x14,0x00,0x00,0xb2,0x02,0xf0,0x14,0x11,0x14,0x02,0x00,0x5c,0x03,0x90,0x08, -0x04,0x14,0x02,0x00,0x84,0x03,0xb0,0x0a,0x0b,0x15,0x00,0x00,0xf8,0x03,0xc0,0x15, -0x12,0x14,0x02,0x00,0xac,0x04,0x90,0x08,0x00,0xf0,0x15,0x60,0x05,0x90,0x08,0x04, -0x0b,0x02,0x09,0x76,0x05,0xa0,0x11,0x0f,0x1a,0x00,0xfa,0x39,0x06,0x50,0x11,0x0f, -0x14,0x01,0x00,0xcf,0x06,0x80,0x11,0x0f,0x1d,0x01,0xff,0xa9,0x07,0x60,0x16,0x28, -0x00,0xf0,0x15,0x5d,0x08,0xb0,0x16,0x15,0x14,0x00,0x00,0x2f,0x09,0x90,0x08,0x04, -0x1a,0x02,0xfa,0x63,0x09,0xd0,0x0c,0x0a,0x14,0x01,0x00,0xc7,0x09,0xa0,0x15,0x14, -0x14,0x00,0x00,0x8f,0x0a,0x30,0x13,0x78,0x00,0xb1,0x43,0x0b,0x90,0x14,0x10,0x1a, -0x02,0xfa,0x13,0x0c,0x20,0x80,0x00,0xf1,0x1c,0xbd,0x0c,0xa0,0x10,0x10,0x1a,0x00, -0xfa,0x8d,0x0d,0x00,0x12,0x11,0x14,0x00,0x00,0x37,0x0e,0x70,0x13,0x11,0x1a,0x01, -0xfa,0x14,0x0f,0xa0,0x11,0x0f,0x14,0x00,0x00,0xaa,0x0f,0x10,0x18,0x17,0x14,0x00, -0x00,0x90,0x10,0xd0,0x60,0x00,0xb0,0x62,0x11,0xe0,0x13,0x0e,0x0a,0x03,0x11,0x0a, -0xff,0xe1,0xe5,0x00,0x60,0x0e,0xff,0x20,0x00,0xdf,0xfb,0x0a,0x00,0xf0,0x10,0x0f, -0xff,0x10,0x00,0x3f,0xff,0x70,0x00,0x00,0x00,0x1f,0xff,0x00,0x00,0x07,0xff,0xf3, -0x00,0x00,0x00,0x2f,0xfe,0x00,0x00,0x00,0xbf,0xfd,0x00,0x00,0x00,0x5f,0x24,0x00, -0xf0,0x0c,0x1e,0xff,0x90,0x00,0x00,0x8f,0xf8,0x00,0x00,0x00,0x0a,0xff,0xf5,0x00, -0x00,0xdf,0xf4,0x00,0x00,0x02,0xdf,0xff,0xfe,0x10,0x03,0xff,0xd0,0x4a,0x00,0xf2, -0x1a,0xbc,0xff,0xc0,0x0c,0xff,0x60,0x00,0x00,0x7f,0xfb,0x02,0xff,0xf7,0x8f,0xfc, -0x00,0x00,0x00,0xdf,0xf3,0x00,0x6f,0xff,0xff,0xe2,0x00,0x00,0x01,0xff,0xe0,0x00, -0x0a,0xff,0xff,0x30,0x00,0x00,0x05,0xff,0xa0,0x00,0x72,0x00,0x10,0x09,0x6d,0x00, -0x01,0x72,0x00,0x33,0x0c,0xff,0x40,0x72,0x00,0x00,0x85,0x00,0x00,0x72,0x00,0x51, -0x10,0x00,0x3f,0xfe,0x00,0x72,0x00,0x40,0xa0,0x00,0x6f,0xfa,0x0a,0x00,0x61,0x04, -0xff,0xf6,0x00,0xaf,0xf7,0x99,0x01,0x30,0x9f,0xff,0x30,0x7b,0x00,0x10,0x00,0x39, -0x00,0x71,0xd0,0x0e,0xff,0xff,0xff,0xed,0x94,0xca,0x00,0x00,0x01,0x00,0x70,0xc2, -0x00,0x00,0x0a,0xbb,0xbb,0xbc,0x96,0x00,0x02,0xc6,0x01,0x32,0x7f,0xff,0x80,0x09, -0x00,0x33,0x06,0xff,0xe0,0xd9,0x01,0x23,0xef,0xf2,0x09,0x00,0x23,0xaf,0xf5,0x09, -0x00,0x23,0x9f,0xf6,0x09,0x00,0x15,0x8f,0x09,0x00,0x1f,0xf7,0x09,0x00,0x2d,0x20, -0x7b,0xbb,0x01,0x00,0x52,0xef,0xfd,0xb6,0xaf,0xff,0x01,0x00,0x15,0xf9,0x09,0x00, -0x40,0x0e,0xff,0xeb,0x40,0x88,0x00,0x10,0xff,0xf8,0x00,0x40,0x0a,0xbc,0xff,0xfd, -0x33,0x00,0x11,0x02,0x72,0x01,0x22,0x00,0x08,0xb0,0x00,0x22,0x3f,0xfc,0xab,0x00, -0x21,0xf0,0x00,0x6e,0x01,0x10,0x40,0x07,0x00,0x40,0x6f,0xf8,0x00,0x00,0x28,0x01, -0x70,0xb0,0x00,0x00,0x02,0xaf,0xff,0xff,0x14,0x01,0xf0,0x08,0xff,0xef,0xf2,0x00, -0x01,0xff,0xf9,0x17,0xff,0x60,0x00,0x8f,0xfa,0x00,0x4f,0xfa,0x00,0x0d,0xff,0x30, -0x00,0xff,0xd0,0x6f,0x01,0x30,0x0d,0xff,0x10,0xb5,0x01,0x20,0x9f,0xf4,0x52,0x00, -0xc0,0x06,0xff,0x80,0xbf,0xf5,0x00,0x00,0x2f,0xfc,0x0e,0xff,0x20,0x56,0x00,0x13, -0x5f,0x8b,0x00,0x15,0xf6,0x09,0x00,0x10,0x4b,0xae,0x00,0x41,0xbc,0xff,0xfb,0xb4, -0x78,0x00,0x00,0x41,0x00,0x0f,0x09,0x00,0x7d,0x92,0x8f,0xff,0xff,0xff,0xfe,0xc9, -0x40,0x00,0x08,0xb2,0x00,0xa2,0xa1,0x00,0x6b,0xbb,0xbb,0xbb,0xcd,0xff,0xff,0xb0, -0x22,0x00,0x33,0x8f,0xff,0x60,0x7c,0x01,0x14,0xfc,0x34,0x00,0x12,0xf0,0x09,0x00, -0x60,0x0d,0xff,0x23,0xdd,0x90,0x00,0x58,0x02,0x21,0xf4,0x3f,0xeb,0x02,0x5f,0x0b, -0xff,0x43,0xff,0xb0,0x11,0x00,0x49,0x1f,0xfc,0x02,0x00,0x13,0x11,0x00,0xf8,0x01, -0x20,0xd7,0x20,0x6a,0x03,0xd0,0xff,0xd7,0x20,0x00,0x02,0xff,0xff,0xff,0xd7,0x20, -0x03,0x9e,0xff,0x2a,0x03,0x20,0x03,0x9f,0x11,0x02,0x40,0x1b,0xff,0xbe,0x30,0xd5, -0x01,0x00,0xed,0x01,0x10,0xa0,0xcf,0x02,0x11,0xf7,0x24,0x02,0x14,0x60,0xac,0x02, -0x0f,0x0b,0x00,0x1e,0x10,0x3f,0x3c,0x01,0x23,0xeb,0x82,0x09,0x00,0xc1,0xff,0xff, -0x90,0x00,0x3f,0xff,0xbb,0xbb,0xbc,0xef,0xff,0xf9,0x74,0x02,0x00,0x5a,0x02,0x32, -0x30,0x3f,0xfc,0xd1,0x00,0x32,0x90,0x3f,0xfc,0x7b,0x03,0x13,0xc0,0xac,0x00,0x2c, -0xff,0xf0,0x09,0x00,0x2f,0xef,0xf1,0x09,0x00,0x50,0x90,0x5f,0xf9,0x00,0x00,0x3a, -0xdf,0xfc,0x70,0x00,0x09,0x00,0x51,0xaf,0xff,0xff,0xfd,0x10,0x09,0x00,0x40,0xec, -0xef,0xff,0x90,0x09,0x00,0x41,0x63,0x00,0x0a,0xff,0x24,0x00,0x00,0x99,0x00,0x13, -0xf5,0x09,0x00,0x23,0xaf,0xf8,0x09,0x00,0x23,0x7f,0xfa,0x09,0x00,0x23,0x6f,0xfb, -0x09,0x00,0x1d,0x5f,0x09,0x00,0x25,0x6f,0xfb,0x2d,0x00,0x22,0x4f,0xfa,0x3f,0x00, -0x14,0xf7,0x7e,0x00,0x12,0xf4,0x94,0x04,0x41,0x05,0xff,0xf0,0x0c,0x9b,0x03,0xf0, -0x05,0x1d,0xff,0xa0,0x06,0xff,0xf9,0x10,0x00,0x05,0xef,0xff,0x20,0x00,0xbf,0xff, -0xfd,0xcd,0xff,0xff,0xf6,0xa3,0x03,0x00,0x9e,0x02,0x90,0x50,0x00,0x00,0x00,0x39, -0xde,0xfe,0xda,0x60,0xc1,0x03,0x0e,0x02,0x00,0xa1,0x16,0x64,0x6f,0xff,0xff,0xff, -0xec,0x82,0x00,0x06,0x7b,0x01,0x31,0xf7,0x00,0x4b,0x7a,0x01,0x02,0x35,0x04,0x33, -0x2b,0xff,0xf2,0xd4,0x04,0x12,0x80,0x9d,0x00,0x03,0x1f,0x02,0x03,0x03,0x03,0x33, -0x0f,0xff,0x00,0x7a,0x01,0x0f,0x0f,0x00,0x6c,0x80,0xbf,0xff,0xff,0xed,0x95,0x00, -0x00,0x0b,0xc2,0x00,0x82,0xfd,0x30,0x00,0x8b,0xbb,0xbb,0xcf,0xff,0xa0,0x04,0x22, -0x05,0xef,0x75,0x05,0x41,0x01,0xef,0xf8,0x00,0x10,0x00,0x03,0xbb,0x00,0x01,0x74, -0x04,0x00,0x19,0x03,0x02,0x6f,0x05,0x01,0xf8,0x05,0x06,0x2d,0x05,0x13,0x08,0x0f, -0x00,0x32,0x9f,0xf7,0x00,0x76,0x02,0x18,0x50,0xa5,0x05,0x32,0x5f,0xfe,0x00,0x08, -0x06,0x01,0x15,0x01,0x40,0x5e,0xff,0xe1,0x08,0xa6,0x04,0x40,0xff,0xf4,0x00,0xbf, -0x80,0x00,0x10,0xd3,0x87,0x00,0x73,0xfe,0xd9,0x50,0x00,0x00,0x34,0x40,0x6b,0x00, -0x13,0x10,0x34,0x02,0x0f,0x0f,0x00,0x19,0x00,0xbb,0x01,0x32,0xc8,0x20,0x0e,0x11, -0x03,0x92,0x50,0xab,0xbb,0xbb,0xbb,0xce,0xff,0xff,0x20,0xc3,0x00,0x22,0xf8,0x00, -0x75,0x05,0x21,0xc0,0x00,0x97,0x05,0x13,0xfe,0x5b,0x04,0x27,0xd0,0x00,0xa6,0x05, -0x31,0x06,0xff,0x90,0x08,0x00,0x12,0xcf,0x96,0x06,0x23,0x4f,0xfe,0x77,0x04,0x12, -0x60,0xd1,0x00,0x12,0xd0,0x07,0x00,0x01,0xd1,0x00,0x32,0x2d,0xff,0xf5,0x96,0x06, -0x00,0x91,0x03,0x41,0x17,0xef,0xff,0xf4,0x29,0x00,0x21,0xff,0xc2,0x88,0x00,0x21, -0xfe,0x60,0x97,0x00,0x12,0xe7,0x72,0x01,0x02,0xd2,0x00,0x02,0xa8,0x03,0x25,0xed, -0xa6,0xb1,0x03,0x11,0xe5,0xb1,0x03,0x01,0x75,0x01,0x02,0x7f,0x00,0x53,0x4d,0xff, -0xd0,0x3f,0xfc,0x42,0x06,0x03,0x91,0x00,0x14,0x9f,0xbe,0x02,0x23,0x6f,0xf9,0x09, -0x00,0x23,0x4f,0xfa,0x09,0x00,0x2f,0x3f,0xfb,0x09,0x00,0x36,0x11,0xff,0xe2,0x06, -0x33,0xcf,0xfb,0x3f,0x44,0x06,0x06,0x09,0x00,0x90,0x0c,0xff,0xa0,0x00,0x05,0xbe, -0xfe,0xc8,0x10,0xb6,0x00,0x21,0x30,0x0b,0x57,0x01,0x00,0x99,0x05,0x41,0x0c,0xff, -0xfe,0xcd,0x2d,0x02,0x80,0xef,0xfc,0xff,0xe5,0x00,0x02,0xdf,0xfd,0x62,0x01,0x20, -0xff,0xf3,0x51,0x01,0x10,0xf4,0x23,0x01,0x11,0xf8,0x1f,0x02,0x10,0x90,0x36,0x00, -0x13,0x10,0x03,0x03,0x34,0x07,0xff,0xa0,0x06,0x03,0x24,0xcf,0xf4,0x91,0x02,0x24, -0x1f,0xff,0x94,0x02,0x34,0x05,0xff,0xb0,0x15,0x00,0x24,0x9f,0xf6,0x15,0x00,0x03, -0x71,0x02,0x24,0x0f,0xff,0x3e,0x03,0x00,0x15,0x00,0x24,0x6f,0xfb,0xd0,0x02,0x34, -0x0a,0xff,0x70,0x15,0x00,0x24,0xef,0xf3,0x15,0x00,0x10,0x2f,0xf5,0x08,0x60,0xbb, -0xbb,0xbb,0xff,0xf0,0x06,0x53,0x00,0x01,0xac,0x07,0x32,0x00,0xaf,0xf8,0xda,0x03, -0x00,0xef,0x04,0x0f,0x02,0x00,0x1f,0x40,0x0e,0xff,0xec,0x70,0x97,0x08,0x70,0xfb, -0x00,0x0a,0xbc,0xef,0xff,0x50,0x4b,0x00,0x10,0xc0,0xcb,0x00,0x14,0xf0,0x83,0x02, -0x20,0xdf,0xf2,0x35,0x02,0x1f,0xf3,0x05,0x00,0x1a,0x83,0x9b,0xbb,0xbb,0xff,0xf3, -0xdf,0xff,0xff,0x05,0x00,0x21,0x2f,0xff,0x88,0x03,0x44,0xb7,0x10,0x00,0x2f,0xca, -0x07,0x51,0x00,0x2b,0xbd,0xff,0xdb,0x21,0x02,0x51,0x50,0x00,0x0b,0xff,0x10,0x22, -0x02,0x42,0xe0,0x00,0x1f,0xfb,0x23,0x02,0x13,0xf5,0x47,0x08,0x34,0x00,0xaf,0xf9, -0x32,0x01,0x24,0x7f,0xfb,0x9b,0x03,0x24,0x6f,0xfc,0xc4,0x02,0x4c,0x5f,0xfd,0x00, -0xdf,0x0a,0x00,0x00,0x1e,0x00,0x15,0xf5,0x32,0x00,0x12,0xf8,0x6a,0x02,0x14,0xf9, -0x70,0x07,0x41,0xdf,0xf5,0x00,0x4f,0x78,0x01,0x51,0x03,0xff,0xf1,0x00,0x0e,0x30, -0x03,0x00,0x07,0x02,0x70,0x06,0xff,0xfc,0x30,0x00,0x03,0xcf,0x1a,0x00,0x51,0xbf, -0xff,0xfe,0xcc,0xef,0x00,0x03,0x11,0x09,0xb5,0x00,0x01,0xe1,0x02,0x50,0x28,0xce, -0xff,0xda,0x50,0x99,0x00,0x00,0x1f,0x03,0x00,0x5d,0x0a,0x21,0xcf,0xf7,0x58,0x00, -0x43,0xf8,0x00,0x6f,0xfd,0x17,0x04,0x10,0x1f,0xff,0x06,0x00,0xfd,0x09,0x32,0x0a, -0xff,0x80,0x47,0x04,0x33,0x04,0xff,0xe0,0x6f,0x03,0x23,0xef,0xf4,0x2c,0x04,0x23, -0x8f,0xf9,0xa5,0x04,0x00,0xb4,0x0a,0x01,0x91,0x0a,0x32,0x0c,0xff,0x50,0x9a,0x03, -0x00,0x43,0x02,0x01,0x57,0x04,0x00,0x12,0x08,0x02,0x3b,0x02,0x21,0xbf,0xf6,0xdc, -0x01,0x00,0x03,0x06,0x32,0x05,0xff,0xf1,0x0d,0x04,0x11,0x6f,0xb0,0x03,0x00,0x9c, -0x00,0x00,0x4b,0x00,0x40,0x12,0x35,0x8d,0xff,0x7b,0x02,0x01,0x21,0x09,0x22,0xe6, -0x00,0x09,0x00,0x12,0xd7,0x93,0x04,0x22,0xca,0x72,0xf2,0x00,0x00,0x38,0x04,0x43, -0xb7,0x20,0x00,0xdf,0xce,0x05,0x21,0xdf,0xfc,0x39,0x04,0x11,0x60,0xd7,0x01,0x51, -0x3c,0xff,0xf1,0xdf,0xf2,0x26,0x00,0x32,0xf7,0xdf,0xf2,0x64,0x06,0x02,0x08,0x00, -0x22,0x2f,0xfd,0x08,0x00,0xe8,0x1f,0xfe,0xdf,0xfc,0xbb,0xb0,0x00,0x00,0x0f,0xfe, -0xdf,0xff,0xff,0xf1,0x08,0x00,0x02,0xf8,0x03,0x0f,0x08,0x00,0x5f,0x11,0xbf,0xd0, -0x00,0x32,0x10,0x00,0x0b,0x49,0x02,0x41,0x60,0x00,0xbf,0xfd,0xd1,0x00,0x11,0x70, -0x3d,0x01,0x42,0x04,0xdf,0xff,0x20,0x27,0x02,0x21,0xdf,0xf9,0xa5,0x05,0x00,0x86, -0x01,0x22,0xbf,0xf5,0x3f,0x03,0x12,0x2b,0xb6,0x05,0x60,0xcf,0xf3,0xbf,0xfd,0xbb, -0xb2,0xca,0x03,0x10,0x4b,0xc4,0x08,0x00,0xac,0x01,0x11,0xbf,0xe0,0x03,0x12,0x0b, -0x22,0x06,0x05,0x23,0x05,0x05,0x14,0x06,0x05,0xa5,0x09,0x24,0x8f,0xfb,0xef,0x04, -0x13,0x50,0xb8,0x0b,0x22,0xc0,0x06,0xe0,0x09,0x31,0xe2,0x00,0x8f,0x90,0x00,0x33, -0xc1,0x00,0x08,0x02,0x0a,0x32,0x00,0x8f,0xfe,0x1f,0x04,0x11,0x0d,0x79,0x05,0x30, -0x6f,0xfa,0x03,0x3c,0x0b,0x00,0x03,0x02,0x22,0x9f,0xfd,0x33,0x02,0x31,0x0e,0xff, -0x60,0x29,0x02,0x01,0xf5,0x0b,0x21,0xdf,0xf3,0x9e,0x02,0x30,0x01,0xff,0xf1,0x86, -0x01,0x01,0x41,0x0b,0x00,0x07,0x02,0x30,0x3f,0xff,0x40,0x7c,0x05,0x31,0x59,0xff, -0xf9,0xab,0x02,0x31,0xff,0xff,0x80,0xa7,0x05,0x28,0xfe,0x82,0x87,0x06,0x04,0xb9, -0x00,0x0f,0x08,0x00,0x4b,0x32,0x7f,0xff,0x30,0x78,0x0d,0x31,0xbf,0xfe,0x10,0xbe, -0x02,0x31,0x01,0xef,0xfa,0x00,0x05,0x00,0xf7,0x0c,0x00,0x60,0x06,0x42,0xa0,0x00, -0x08,0xff,0xe5,0x02,0x00,0xf4,0x0c,0x41,0x00,0x0b,0xff,0x60,0x8e,0x0d,0x31,0x01, -0xff,0xf2,0x9a,0x02,0x31,0x40,0xaf,0xfc,0x2c,0x03,0x42,0xfe,0xdf,0xff,0x30,0x9a, -0x02,0x22,0xfd,0x30,0xef,0x03,0x14,0xfb,0xfd,0x0c,0x12,0xf3,0x09,0x00,0x03,0xf7, -0x0d,0x00,0xf9,0x00,0x14,0xa0,0x71,0x01,0x03,0x38,0x0b,0x13,0x6f,0x93,0x01,0x00, -0xf1,0x0d,0x12,0x7b,0x0e,0x0c,0x33,0xf7,0x0a,0xff,0x26,0x0a,0x13,0xaf,0xbb,0x0c, -0x11,0x0f,0xba,0x03,0x42,0xa6,0x00,0x00,0xff,0x79,0x04,0x21,0x20,0x0b,0x04,0x06, -0x02,0xc3,0x0c,0x00,0x6b,0x03,0x03,0xe0,0x01,0x14,0x0b,0x77,0x0d,0x24,0x7f,0xf9, -0x82,0x00,0x32,0xa0,0x3f,0xfc,0x93,0x06,0x32,0x03,0xff,0xc0,0xf8,0x07,0x22,0x3f, -0xfc,0x35,0x02,0x02,0x11,0x00,0x00,0x93,0x01,0x11,0xfc,0x19,0x00,0x22,0x90,0x03, -0x29,0x05,0x12,0xf2,0x11,0x00,0x31,0xdf,0xf9,0x00,0x11,0x00,0x21,0xcf,0xfd,0x72, -0x07,0x40,0x03,0xdf,0xff,0x30,0x11,0x00,0x11,0x19,0x4a,0x06,0x30,0x3f,0xfc,0x05, -0xed,0x00,0x00,0x11,0x00,0x41,0x5f,0xfb,0x10,0x00,0x11,0x00,0x10,0xc4,0x57,0x00, -0x02,0x55,0x00,0x06,0xa5,0x07,0x0f,0x11,0x00,0x10,0x0f,0x9e,0x09,0x08,0x33,0x3b, -0xff,0xf2,0x37,0x01,0x13,0x70,0x32,0x0a,0x0f,0x9e,0x09,0x56,0x01,0xb2,0x04,0x21, -0x4f,0xfc,0x19,0x01,0x23,0xef,0xf3,0x42,0x0f,0x21,0x9f,0xf7,0x04,0x02,0x21,0x6f, -0xf9,0xab,0x02,0x23,0x8f,0xf9,0x48,0x09,0x51,0xdf,0xf3,0x05,0xff,0xc0,0x0b,0x07, -0x00,0x4b,0x0f,0x22,0x2f,0xff,0x3c,0x0e,0x00,0x65,0x03,0x22,0xff,0xf2,0x43,0x06, -0x21,0x3f,0xfd,0x19,0x05,0x30,0x1f,0xff,0x10,0x3c,0x07,0x00,0x68,0x05,0x31,0x07, -0xff,0xd0,0xa7,0x01,0x62,0x06,0xff,0xb0,0x28,0xff,0xf8,0xa0,0x09,0x31,0x3f,0xff, -0xef,0x42,0x0f,0x21,0xbf,0xf5,0xea,0x01,0x20,0xfa,0x10,0x50,0x00,0x61,0x20,0x00, -0x0d,0xff,0xd8,0x40,0x39,0x01,0x24,0xe0,0x00,0x8d,0x0f,0x24,0xaf,0xfa,0xa4,0x07, -0x20,0x00,0x5f,0x90,0x01,0x22,0x4f,0xfd,0x4a,0x01,0x21,0xc0,0x00,0x71,0x03,0x55, -0x13,0x59,0xef,0xff,0xe2,0x9e,0x0f,0x21,0xff,0xd3,0x60,0x02,0x01,0x3a,0x02,0x12, -0x70,0xfd,0x09,0x52,0xfe,0xdc,0xa8,0x62,0x00,0x05,0x09,0x02,0x87,0x09,0x02,0x58, -0x05,0x02,0x9b,0x0c,0x31,0x09,0xbb,0xff,0x54,0x05,0x00,0x60,0x00,0x10,0x0c,0xdb, -0x02,0x43,0x02,0x9f,0xff,0x40,0x0b,0x07,0x01,0x7a,0x00,0x01,0x15,0x00,0x02,0x90, -0x00,0x24,0xcf,0xf3,0x3e,0x01,0x13,0x0c,0x05,0x03,0x14,0xf1,0x15,0x00,0x35,0x0d, -0xff,0x20,0x15,0x00,0x1f,0xf2,0x15,0x00,0x05,0x14,0xf2,0x15,0x00,0x00,0x04,0x00, -0x03,0x15,0x00,0x24,0xef,0xf1,0x15,0x00,0x03,0x72,0x08,0x22,0xdf,0xf2,0xc5,0x07, -0x01,0x15,0x00,0x33,0xce,0xff,0xf5,0x15,0x00,0x12,0x0f,0x68,0x03,0x00,0x15,0x00, -0x33,0xfe,0xc7,0x00,0x2a,0x00,0x00,0xd6,0x03,0x10,0x03,0xb6,0x10,0x70,0xfd,0x00, -0x07,0xff,0xf1,0x00,0xef,0xc0,0x06,0x21,0xa0,0x01,0x1d,0x07,0x10,0x40,0x7b,0x01, -0xf0,0x17,0x1f,0xfe,0x00,0x08,0xff,0x50,0x00,0x5f,0xf8,0x00,0x0c,0xff,0x00,0x00, -0x8f,0xf2,0x00,0x0f,0xf9,0x00,0x00,0xcf,0xc0,0x00,0x3f,0xf3,0x00,0x00,0xff,0x60, -0x00,0x6f,0xd0,0x00,0x03,0xff,0x10,0x00, +0x17,0x00,0x01,0x00,0x50,0x04,0x06,0xfe,0xfa,0x0c,0x08,0x00,0xf0,0x05,0x03,0xfe, +0xfa,0x12,0x00,0x00,0x00,0x08,0x06,0xfc,0xfa,0x2a,0x00,0x00,0x00,0x06,0x02,0xfd, +0xfc,0x30,0x08,0x00,0x42,0x04,0xfd,0xfa,0x3c,0x20,0x00,0xf1,0x35,0x0a,0x42,0x00, +0xc0,0x14,0x14,0x14,0x01,0x00,0x0a,0x01,0xc0,0x13,0x12,0x14,0x01,0x00,0xbe,0x01, +0xf0,0x0d,0x0d,0x14,0x01,0x00,0x40,0x02,0x50,0x12,0x12,0x14,0x00,0x00,0xf4,0x02, +0xf0,0x14,0x11,0x14,0x02,0x00,0x9e,0x03,0x90,0x08,0x04,0x14,0x02,0x00,0xc6,0x03, +0xb0,0x0a,0x0b,0x15,0x00,0x00,0x3a,0x04,0xc0,0x15,0x12,0x14,0x02,0x00,0xee,0x04, +0x90,0x08,0x00,0xf0,0x15,0xa2,0x05,0x90,0x08,0x04,0x0b,0x02,0x09,0xb8,0x05,0xa0, +0x11,0x0f,0x1a,0x00,0xfa,0x7b,0x06,0x50,0x11,0x0f,0x14,0x01,0x00,0x11,0x07,0x80, +0x11,0x0f,0x1d,0x01,0xff,0xeb,0x07,0x60,0x16,0x28,0x00,0xf0,0x15,0x9f,0x08,0xb0, +0x16,0x15,0x14,0x00,0x00,0x71,0x09,0x90,0x08,0x04,0x1a,0x02,0xfa,0xa5,0x09,0xd0, +0x0c,0x0a,0x14,0x01,0x00,0x09,0x0a,0xa0,0x15,0x14,0x14,0x00,0x00,0xd1,0x0a,0x30, +0x13,0x78,0x00,0xb1,0x85,0x0b,0x90,0x14,0x10,0x1a,0x02,0xfa,0x55,0x0c,0x20,0x80, +0x00,0xf0,0x1c,0xff,0x0c,0xa0,0x10,0x10,0x1a,0x00,0xfa,0xcf,0x0d,0x00,0x12,0x11, +0x14,0x00,0x00,0x79,0x0e,0x70,0x13,0x11,0x1a,0x01,0xfa,0x56,0x0f,0xa0,0x11,0x0f, +0x14,0x00,0x00,0xec,0x0f,0x10,0x18,0x17,0x14,0x00,0x00,0xd2,0x10,0xd0,0x60,0x00, +0x00,0xde,0x00,0xf2,0x06,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x1d,0xd1, +0x3f,0xf3,0x06,0x60,0x06,0x60,0x3f,0xf3,0x1d,0xd1,0x06,0x00,0xf2,0x0f,0x0c,0xe2, +0x2e,0xc0,0x1f,0xf5,0x5f,0xf1,0x05,0x70,0x07,0x50,0x00,0x06,0x60,0x00,0x00,0x3f, +0xf3,0x00,0x00,0x1d,0xd1,0x00,0x7b,0xbb,0xb7,0xaf,0xff,0xfa,0x06,0x00,0x80,0x00, +0xde,0x00,0x00,0xde,0x00,0x05,0x50,0x30,0x00,0x30,0x0a,0xff,0xe1,0x53,0x00,0x60, +0x0e,0xff,0x20,0x00,0xdf,0xfb,0x0a,0x00,0xf0,0x10,0x0f,0xff,0x10,0x00,0x3f,0xff, +0x70,0x00,0x00,0x00,0x1f,0xff,0x00,0x00,0x07,0xff,0xf3,0x00,0x00,0x00,0x2f,0xfe, +0x00,0x00,0x00,0xbf,0xfd,0x00,0x00,0x00,0x5f,0x24,0x00,0xf0,0x0c,0x1e,0xff,0x90, +0x00,0x00,0x8f,0xf8,0x00,0x00,0x00,0x0a,0xff,0xf5,0x00,0x00,0xdf,0xf4,0x00,0x00, +0x02,0xdf,0xff,0xfe,0x10,0x03,0xff,0xd0,0x4a,0x00,0xf2,0x1a,0xbc,0xff,0xc0,0x0c, +0xff,0x60,0x00,0x00,0x7f,0xfb,0x02,0xff,0xf7,0x8f,0xfc,0x00,0x00,0x00,0xdf,0xf3, +0x00,0x6f,0xff,0xff,0xe2,0x00,0x00,0x01,0xff,0xe0,0x00,0x0a,0xff,0xff,0x30,0x00, +0x00,0x05,0xff,0xa0,0x00,0x72,0x00,0x10,0x09,0x6d,0x00,0x01,0x72,0x00,0x33,0x0c, +0xff,0x40,0x72,0x00,0x00,0x85,0x00,0x00,0x72,0x00,0x51,0x10,0x00,0x3f,0xfe,0x00, +0x72,0x00,0x41,0xa0,0x00,0x6f,0xfa,0xfc,0x00,0x51,0xff,0xf6,0x00,0xaf,0xf7,0x0d, +0x02,0x30,0x9f,0xff,0x30,0x7b,0x00,0x10,0x00,0x39,0x00,0x71,0xd0,0x0e,0xff,0xff, +0xff,0xed,0x94,0xca,0x00,0x00,0x01,0x00,0x70,0xc2,0x00,0x00,0x0a,0xbb,0xbb,0xbc, +0x96,0x00,0x02,0x3a,0x02,0x32,0x7f,0xff,0x80,0x09,0x00,0x33,0x06,0xff,0xe0,0x4d, +0x02,0x23,0xef,0xf2,0x09,0x00,0x23,0xaf,0xf5,0x09,0x00,0x23,0x9f,0xf6,0x09,0x00, +0x15,0x8f,0x09,0x00,0x1f,0xf7,0x09,0x00,0x2d,0x20,0x7b,0xbb,0x01,0x00,0x52,0xef, +0xfd,0xb6,0xaf,0xff,0x01,0x00,0x15,0xf9,0x09,0x00,0x40,0x0e,0xff,0xeb,0x40,0x88, +0x00,0x10,0xff,0xf8,0x00,0x40,0x0a,0xbc,0xff,0xfd,0x33,0x00,0x11,0x02,0x72,0x01, +0x22,0x00,0x08,0xb0,0x00,0x22,0x3f,0xfc,0xab,0x00,0x21,0xf0,0x00,0x6e,0x01,0x10, +0x40,0x07,0x00,0x40,0x6f,0xf8,0x00,0x00,0x28,0x01,0x70,0xb0,0x00,0x00,0x02,0xaf, +0xff,0xff,0x14,0x01,0xf0,0x08,0xff,0xef,0xf2,0x00,0x01,0xff,0xf9,0x17,0xff,0x60, +0x00,0x8f,0xfa,0x00,0x4f,0xfa,0x00,0x0d,0xff,0x30,0x00,0xff,0xd0,0x6f,0x01,0x30, +0x0d,0xff,0x10,0xb5,0x01,0x20,0x9f,0xf4,0x52,0x00,0xc0,0x06,0xff,0x80,0xbf,0xf5, +0x00,0x00,0x2f,0xfc,0x0e,0xff,0x20,0x56,0x00,0x13,0x5f,0x8b,0x00,0x15,0xf6,0x09, +0x00,0x10,0x4b,0xae,0x00,0x41,0xbc,0xff,0xfb,0xb4,0x78,0x00,0x00,0x41,0x00,0x0f, +0x09,0x00,0x7d,0x92,0x8f,0xff,0xff,0xff,0xfe,0xc9,0x40,0x00,0x08,0xb2,0x00,0xa2, +0xa1,0x00,0x6b,0xbb,0xbb,0xbb,0xcd,0xff,0xff,0xb0,0x22,0x00,0x33,0x8f,0xff,0x60, +0x7c,0x01,0x14,0xfc,0x34,0x00,0x12,0xf0,0x09,0x00,0x60,0x0d,0xff,0x23,0xdd,0x90, +0x00,0x58,0x02,0x21,0xf4,0x3f,0xeb,0x02,0x5f,0x0b,0xff,0x43,0xff,0xb0,0x11,0x00, +0x49,0x1f,0xfc,0x02,0x00,0x13,0x11,0x00,0xf8,0x01,0x20,0xd7,0x20,0x6a,0x03,0xd0, +0xff,0xd7,0x20,0x00,0x02,0xff,0xff,0xff,0xd7,0x20,0x03,0x9e,0xff,0x2a,0x03,0x20, +0x03,0x9f,0x11,0x02,0x40,0x1b,0xff,0xbe,0x30,0xd5,0x01,0x00,0xed,0x01,0x10,0xa0, +0xcf,0x02,0x11,0xf7,0x24,0x02,0x14,0x60,0xac,0x02,0x0f,0x0b,0x00,0x1e,0x10,0x3f, +0x3c,0x01,0x23,0xeb,0x82,0x09,0x00,0xc1,0xff,0xff,0x90,0x00,0x3f,0xff,0xbb,0xbb, +0xbc,0xef,0xff,0xf9,0x74,0x02,0x00,0x5a,0x02,0x32,0x30,0x3f,0xfc,0xd1,0x00,0x32, +0x90,0x3f,0xfc,0x7b,0x03,0x13,0xc0,0xac,0x00,0x2c,0xff,0xf0,0x09,0x00,0x2f,0xef, +0xf1,0x09,0x00,0x50,0x90,0x5f,0xf9,0x00,0x00,0x3a,0xdf,0xfc,0x70,0x00,0x09,0x00, +0x51,0xaf,0xff,0xff,0xfd,0x10,0x09,0x00,0x40,0xec,0xef,0xff,0x90,0x09,0x00,0x41, +0x63,0x00,0x0a,0xff,0x24,0x00,0x00,0x99,0x00,0x13,0xf5,0x09,0x00,0x23,0xaf,0xf8, +0x09,0x00,0x23,0x7f,0xfa,0x09,0x00,0x23,0x6f,0xfb,0x09,0x00,0x1d,0x5f,0x09,0x00, +0x25,0x6f,0xfb,0x2d,0x00,0x22,0x4f,0xfa,0x3f,0x00,0x14,0xf7,0x7e,0x00,0x12,0xf4, +0x94,0x04,0x41,0x05,0xff,0xf0,0x0c,0x9b,0x03,0xf0,0x05,0x1d,0xff,0xa0,0x06,0xff, +0xf9,0x10,0x00,0x05,0xef,0xff,0x20,0x00,0xbf,0xff,0xfd,0xcd,0xff,0xff,0xf6,0xa3, +0x03,0x00,0x9e,0x02,0x90,0x50,0x00,0x00,0x00,0x39,0xde,0xfe,0xda,0x60,0xc1,0x03, +0x0e,0x02,0x00,0xa1,0x16,0x64,0x6f,0xff,0xff,0xff,0xec,0x82,0x00,0x06,0x7b,0x01, +0x31,0xf7,0x00,0x4b,0x7a,0x01,0x02,0x35,0x04,0x33,0x2b,0xff,0xf2,0xd4,0x04,0x12, +0x80,0x9d,0x00,0x03,0x1f,0x02,0x03,0x03,0x03,0x33,0x0f,0xff,0x00,0x7a,0x01,0x0f, +0x0f,0x00,0x6c,0x80,0xbf,0xff,0xff,0xed,0x95,0x00,0x00,0x0b,0xc2,0x00,0x82,0xfd, +0x30,0x00,0x8b,0xbb,0xbb,0xcf,0xff,0xa0,0x04,0x22,0x05,0xef,0x75,0x05,0x41,0x01, +0xef,0xf8,0x00,0x10,0x00,0x03,0xbb,0x00,0x01,0x74,0x04,0x00,0x19,0x03,0x02,0x6f, +0x05,0x01,0xf8,0x05,0x06,0x2d,0x05,0x13,0x08,0x0f,0x00,0x32,0x9f,0xf7,0x00,0x76, +0x02,0x18,0x50,0xa5,0x05,0x32,0x5f,0xfe,0x00,0x08,0x06,0x01,0x15,0x01,0x40,0x5e, +0xff,0xe1,0x08,0xa6,0x04,0x40,0xff,0xf4,0x00,0xbf,0x80,0x00,0x10,0xd3,0x87,0x00, +0x73,0xfe,0xd9,0x50,0x00,0x00,0x34,0x40,0x6b,0x00,0x13,0x10,0x34,0x02,0x0f,0x0f, +0x00,0x19,0x00,0xbb,0x01,0x32,0xc8,0x20,0x0e,0x11,0x03,0x92,0x50,0xab,0xbb,0xbb, +0xbb,0xce,0xff,0xff,0x20,0xc3,0x00,0x22,0xf8,0x00,0x75,0x05,0x21,0xc0,0x00,0x97, +0x05,0x13,0xfe,0x5b,0x04,0x27,0xd0,0x00,0xa6,0x05,0x31,0x06,0xff,0x90,0x08,0x00, +0x12,0xcf,0x96,0x06,0x23,0x4f,0xfe,0x77,0x04,0x12,0x60,0xd1,0x00,0x12,0xd0,0x07, +0x00,0x01,0xd1,0x00,0x32,0x2d,0xff,0xf5,0x96,0x06,0x00,0x91,0x03,0x41,0x17,0xef, +0xff,0xf4,0x29,0x00,0x21,0xff,0xc2,0x88,0x00,0x21,0xfe,0x60,0x97,0x00,0x12,0xe7, +0x72,0x01,0x02,0xd2,0x00,0x02,0xa8,0x03,0x25,0xed,0xa6,0xb1,0x03,0x11,0xe5,0xb1, +0x03,0x01,0x75,0x01,0x02,0x7f,0x00,0x53,0x4d,0xff,0xd0,0x3f,0xfc,0x42,0x06,0x03, +0x91,0x00,0x14,0x9f,0xbe,0x02,0x23,0x6f,0xf9,0x09,0x00,0x23,0x4f,0xfa,0x09,0x00, +0x2f,0x3f,0xfb,0x09,0x00,0x36,0x11,0xff,0xe2,0x06,0x33,0xcf,0xfb,0x3f,0x44,0x06, +0x06,0x09,0x00,0x90,0x0c,0xff,0xa0,0x00,0x05,0xbe,0xfe,0xc8,0x10,0xb6,0x00,0x21, +0x30,0x0b,0x57,0x01,0x00,0x99,0x05,0x41,0x0c,0xff,0xfe,0xcd,0x2d,0x02,0x80,0xef, +0xfc,0xff,0xe5,0x00,0x02,0xdf,0xfd,0x62,0x01,0x20,0xff,0xf3,0x51,0x01,0x10,0xf4, +0x23,0x01,0x11,0xf8,0x1f,0x02,0x10,0x90,0x36,0x00,0x13,0x10,0x03,0x03,0x34,0x07, +0xff,0xa0,0x06,0x03,0x24,0xcf,0xf4,0x91,0x02,0x24,0x1f,0xff,0x94,0x02,0x34,0x05, +0xff,0xb0,0x15,0x00,0x24,0x9f,0xf6,0x15,0x00,0x03,0x71,0x02,0x24,0x0f,0xff,0x3e, +0x03,0x00,0x15,0x00,0x24,0x6f,0xfb,0xd0,0x02,0x34,0x0a,0xff,0x70,0x15,0x00,0x24, +0xef,0xf3,0x15,0x00,0x10,0x2f,0xf5,0x08,0x60,0xbb,0xbb,0xbb,0xff,0xf0,0x06,0x53, +0x00,0x01,0xac,0x07,0x32,0x00,0xaf,0xf8,0xda,0x03,0x00,0xef,0x04,0x0f,0x02,0x00, +0x1f,0x40,0x0e,0xff,0xec,0x70,0x97,0x08,0x70,0xfb,0x00,0x0a,0xbc,0xef,0xff,0x50, +0x4b,0x00,0x10,0xc0,0xcb,0x00,0x14,0xf0,0x83,0x02,0x20,0xdf,0xf2,0x35,0x02,0x1f, +0xf3,0x05,0x00,0x1a,0x83,0x9b,0xbb,0xbb,0xff,0xf3,0xdf,0xff,0xff,0x05,0x00,0x21, +0x2f,0xff,0x88,0x03,0x44,0xb7,0x10,0x00,0x2f,0xca,0x07,0x51,0x00,0x2b,0xbd,0xff, +0xdb,0x21,0x02,0x51,0x50,0x00,0x0b,0xff,0x10,0x22,0x02,0x42,0xe0,0x00,0x1f,0xfb, +0x23,0x02,0x13,0xf5,0x47,0x08,0x34,0x00,0xaf,0xf9,0x32,0x01,0x24,0x7f,0xfb,0x9b, +0x03,0x24,0x6f,0xfc,0xc4,0x02,0x4c,0x5f,0xfd,0x00,0xdf,0x0a,0x00,0x00,0x1e,0x00, +0x15,0xf5,0x32,0x00,0x12,0xf8,0x6a,0x02,0x14,0xf9,0x70,0x07,0x41,0xdf,0xf5,0x00, +0x4f,0x78,0x01,0x51,0x03,0xff,0xf1,0x00,0x0e,0x30,0x03,0x00,0x07,0x02,0x70,0x06, +0xff,0xfc,0x30,0x00,0x03,0xcf,0x1a,0x00,0x51,0xbf,0xff,0xfe,0xcc,0xef,0x00,0x03, +0x11,0x09,0xb5,0x00,0x01,0xe1,0x02,0x50,0x28,0xce,0xff,0xda,0x50,0x99,0x00,0x00, +0x1f,0x03,0x00,0x5d,0x0a,0x21,0xcf,0xf7,0x58,0x00,0x43,0xf8,0x00,0x6f,0xfd,0x17, +0x04,0x10,0x1f,0xff,0x06,0x00,0xfd,0x09,0x32,0x0a,0xff,0x80,0x47,0x04,0x33,0x04, +0xff,0xe0,0x6f,0x03,0x23,0xef,0xf4,0x2c,0x04,0x23,0x8f,0xf9,0xa5,0x04,0x00,0xb4, +0x0a,0x01,0x91,0x0a,0x32,0x0c,0xff,0x50,0x9a,0x03,0x00,0x43,0x02,0x01,0x57,0x04, +0x00,0x12,0x08,0x02,0x3b,0x02,0x21,0xbf,0xf6,0xdc,0x01,0x00,0x03,0x06,0x32,0x05, +0xff,0xf1,0x0d,0x04,0x11,0x6f,0xb0,0x03,0x00,0x9c,0x00,0x00,0x4b,0x00,0x40,0x12, +0x35,0x8d,0xff,0x7b,0x02,0x01,0x21,0x09,0x22,0xe6,0x00,0x09,0x00,0x12,0xd7,0x93, +0x04,0x22,0xca,0x72,0xf2,0x00,0x00,0x38,0x04,0x43,0xb7,0x20,0x00,0xdf,0xce,0x05, +0x21,0xdf,0xfc,0x39,0x04,0x11,0x60,0xd7,0x01,0x51,0x3c,0xff,0xf1,0xdf,0xf2,0x26, +0x00,0x32,0xf7,0xdf,0xf2,0x64,0x06,0x02,0x08,0x00,0x22,0x2f,0xfd,0x08,0x00,0xe8, +0x1f,0xfe,0xdf,0xfc,0xbb,0xb0,0x00,0x00,0x0f,0xfe,0xdf,0xff,0xff,0xf1,0x08,0x00, +0x02,0xf8,0x03,0x0f,0x08,0x00,0x5f,0x11,0xbf,0xd0,0x00,0x32,0x10,0x00,0x0b,0x49, +0x02,0x41,0x60,0x00,0xbf,0xfd,0xd1,0x00,0x11,0x70,0x3d,0x01,0x42,0x04,0xdf,0xff, +0x20,0x27,0x02,0x21,0xdf,0xf9,0xa5,0x05,0x00,0x86,0x01,0x22,0xbf,0xf5,0x3f,0x03, +0x12,0x2b,0xb6,0x05,0x60,0xcf,0xf3,0xbf,0xfd,0xbb,0xb2,0xca,0x03,0x10,0x4b,0xc4, +0x08,0x00,0xac,0x01,0x11,0xbf,0xe0,0x03,0x12,0x0b,0x22,0x06,0x05,0x23,0x05,0x05, +0x14,0x06,0x05,0xa5,0x09,0x24,0x8f,0xfb,0xef,0x04,0x13,0x50,0xb8,0x0b,0x22,0xc0, +0x06,0xe0,0x09,0x31,0xe2,0x00,0x8f,0x90,0x00,0x33,0xc1,0x00,0x08,0x02,0x0a,0x32, +0x00,0x8f,0xfe,0x1f,0x04,0x11,0x0d,0x79,0x05,0x30,0x6f,0xfa,0x03,0x3c,0x0b,0x00, +0x03,0x02,0x22,0x9f,0xfd,0x33,0x02,0x31,0x0e,0xff,0x60,0x29,0x02,0x01,0xf5,0x0b, +0x21,0xdf,0xf3,0x9e,0x02,0x30,0x01,0xff,0xf1,0x86,0x01,0x01,0x41,0x0b,0x00,0x07, +0x02,0x30,0x3f,0xff,0x40,0x7c,0x05,0x31,0x59,0xff,0xf9,0xab,0x02,0x31,0xff,0xff, +0x80,0xa7,0x05,0x28,0xfe,0x82,0x87,0x06,0x04,0xb9,0x00,0x0f,0x08,0x00,0x4b,0x32, +0x7f,0xff,0x30,0x78,0x0d,0x31,0xbf,0xfe,0x10,0xbe,0x02,0x31,0x01,0xef,0xfa,0x00, +0x05,0x00,0xf7,0x0c,0x00,0x60,0x06,0x42,0xa0,0x00,0x08,0xff,0xe5,0x02,0x00,0xf4, +0x0c,0x41,0x00,0x0b,0xff,0x60,0x8e,0x0d,0x31,0x01,0xff,0xf2,0x9a,0x02,0x31,0x40, +0xaf,0xfc,0x2c,0x03,0x42,0xfe,0xdf,0xff,0x30,0x9a,0x02,0x22,0xfd,0x30,0xef,0x03, +0x14,0xfb,0xfd,0x0c,0x12,0xf3,0x09,0x00,0x03,0xf7,0x0d,0x00,0xf9,0x00,0x14,0xa0, +0x71,0x01,0x03,0x38,0x0b,0x13,0x6f,0x93,0x01,0x00,0xf1,0x0d,0x12,0x7b,0x0e,0x0c, +0x33,0xf7,0x0a,0xff,0x26,0x0a,0x13,0xaf,0xbb,0x0c,0x11,0x0f,0xba,0x03,0x42,0xa6, +0x00,0x00,0xff,0x79,0x04,0x21,0x20,0x0b,0x04,0x06,0x02,0xc3,0x0c,0x00,0x6b,0x03, +0x03,0xe0,0x01,0x14,0x0b,0x77,0x0d,0x24,0x7f,0xf9,0x82,0x00,0x32,0xa0,0x3f,0xfc, +0x93,0x06,0x32,0x03,0xff,0xc0,0xf8,0x07,0x22,0x3f,0xfc,0x35,0x02,0x02,0x11,0x00, +0x00,0x93,0x01,0x11,0xfc,0x19,0x00,0x22,0x90,0x03,0x29,0x05,0x12,0xf2,0x11,0x00, +0x31,0xdf,0xf9,0x00,0x11,0x00,0x21,0xcf,0xfd,0x72,0x07,0x40,0x03,0xdf,0xff,0x30, +0x11,0x00,0x11,0x19,0x4a,0x06,0x30,0x3f,0xfc,0x05,0xed,0x00,0x00,0x11,0x00,0x41, +0x5f,0xfb,0x10,0x00,0x11,0x00,0x10,0xc4,0x57,0x00,0x02,0x55,0x00,0x06,0xa5,0x07, +0x0f,0x11,0x00,0x10,0x0f,0x9e,0x09,0x08,0x33,0x3b,0xff,0xf2,0x37,0x01,0x13,0x70, +0x32,0x0a,0x0f,0x9e,0x09,0x56,0x01,0xb2,0x04,0x21,0x4f,0xfc,0x19,0x01,0x23,0xef, +0xf3,0x42,0x0f,0x21,0x9f,0xf7,0x04,0x02,0x21,0x6f,0xf9,0xab,0x02,0x23,0x8f,0xf9, +0x48,0x09,0x51,0xdf,0xf3,0x05,0xff,0xc0,0x0b,0x07,0x00,0x4b,0x0f,0x22,0x2f,0xff, +0x3c,0x0e,0x00,0x65,0x03,0x22,0xff,0xf2,0x43,0x06,0x21,0x3f,0xfd,0x19,0x05,0x30, +0x1f,0xff,0x10,0x3c,0x07,0x00,0x68,0x05,0x31,0x07,0xff,0xd0,0xa7,0x01,0x62,0x06, +0xff,0xb0,0x28,0xff,0xf8,0xa0,0x09,0x31,0x3f,0xff,0xef,0x42,0x0f,0x21,0xbf,0xf5, +0xea,0x01,0x20,0xfa,0x10,0x50,0x00,0x61,0x20,0x00,0x0d,0xff,0xd8,0x40,0x39,0x01, +0x24,0xe0,0x00,0x8d,0x0f,0x24,0xaf,0xfa,0xa4,0x07,0x20,0x00,0x5f,0x90,0x01,0x22, +0x4f,0xfd,0x4a,0x01,0x21,0xc0,0x00,0x71,0x03,0x55,0x13,0x59,0xef,0xff,0xe2,0x9e, +0x0f,0x21,0xff,0xd3,0x60,0x02,0x01,0x3a,0x02,0x12,0x70,0xfd,0x09,0x52,0xfe,0xdc, +0xa8,0x62,0x00,0x05,0x09,0x02,0x87,0x09,0x02,0x58,0x05,0x02,0x9b,0x0c,0x31,0x09, +0xbb,0xff,0x54,0x05,0x00,0x60,0x00,0x10,0x0c,0xdb,0x02,0x43,0x02,0x9f,0xff,0x40, +0x0b,0x07,0x01,0x7a,0x00,0x01,0x15,0x00,0x02,0x90,0x00,0x24,0xcf,0xf3,0x3e,0x01, +0x13,0x0c,0x05,0x03,0x14,0xf1,0x15,0x00,0x35,0x0d,0xff,0x20,0x15,0x00,0x1f,0xf2, +0x15,0x00,0x05,0x14,0xf2,0x15,0x00,0x00,0x04,0x00,0x03,0x15,0x00,0x24,0xef,0xf1, +0x15,0x00,0x03,0x72,0x08,0x22,0xdf,0xf2,0xc5,0x07,0x01,0x15,0x00,0x33,0xce,0xff, +0xf5,0x15,0x00,0x12,0x0f,0x68,0x03,0x00,0x15,0x00,0xa0,0xfe,0xc7,0x00,0x00,0x00, +0x00,0x00,0x00,0xdf,0xf2, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_L __FLASH = { -.uncomp_size = 4752, -.comp_size = 2504, +.uncomp_size = 4800, +.comp_size = 2549, .line_height = 34, .base_line = 6, .subpx = 0, @@ -181,11 +184,11 @@ const etxLz4Font lv_font_he_L __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 4920, +.lvglFontBufSize = 4968, }; diff --git a/radio/src/fonts/lvgl/lrg/lv_font_he_STD.c b/radio/src/fonts/lvgl/lrg/lv_font_he_STD.c index f2288301b..359b3aa96 100644 --- a/radio/src/fonts/lvgl/lrg/lv_font_he_STD.c +++ b/radio/src/fonts/lvgl/lrg/lv_font_he_STD.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 22 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 22 --font ../Arimo/Arimo-Regular.ttf -r 0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea,0x5f4 --format lvgl -o lrg/lv_font_he_STD.c --force-fast-kern-format --no-compress --lv-fallback lv_font_en_STD + * Opts: --no-prefilter --bpp 4 --size 22 --font ../Arimo/Arimo-Regular.ttf -r 0x5b0,0x5b4,0x5b6,0x5b7,0x5b8,0x5bc,0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea --format lvgl -o lrg/lv_font_he_STD.c --force-fast-kern-format --no-compress --lv-fallback lv_font_en_STD ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE @@ -22,6 +22,25 @@ /*Store the image of the glyphs*/ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+05B0 "ְ" */ + 0xaa, 0x66, 0x66, 0xaa, + + /* U+05B4 "ִ" */ + 0x66, 0xaa, + + /* U+05B6 "ֶ" */ + 0xd, 0x66, 0xd0, 0x8, 0x43, 0x90, 0x0, 0x66, + 0x0, 0x0, 0xaa, 0x0, + + /* U+05B7 "ַ" */ + 0xcf, 0xfc, 0x12, 0x21, + + /* U+05B8 "ָ" */ + 0xcf, 0xfc, 0x1a, 0xa1, 0x1, 0x10, + + /* U+05BC "ּ" */ + 0x66, 0xaa, + /* U+05D0 "א" */ 0x4, 0xff, 0x20, 0x0, 0x0, 0x4f, 0xc0, 0x0, 0x8f, 0xd0, 0x0, 0x0, 0x6f, 0xa0, 0x0, 0xc, @@ -337,14 +356,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x4f, 0xb0, 0x0, 0x0, 0x8, 0xf7, 0x0, 0xaf, 0x80, 0x0, 0x0, 0x8, 0xf7, 0x4e, 0xff, 0x20, 0x0, 0x0, 0x8, 0xf7, 0x5f, 0xc5, 0x0, 0x0, - 0x0, 0x8, 0xf7, - - /* U+05F4 "״" */ - 0x5, 0xff, 0x10, 0x8f, 0xe0, 0x8, 0xfb, 0x0, - 0xbf, 0x80, 0xb, 0xf6, 0x0, 0xff, 0x20, 0xf, - 0xf0, 0x2, 0xfd, 0x0, 0x2f, 0xa0, 0x5, 0xf7, - 0x0, 0x6f, 0x50, 0x9, 0xf1, 0x0, 0x9e, 0x0, - 0xc, 0xc0, 0x0 + 0x0, 0x8, 0xf7 }; @@ -354,51 +366,58 @@ 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 = 221, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 91, .adv_w = 211, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 176, .adv_w = 149, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 235, .adv_w = 195, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 313, .adv_w = 223, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 391, .adv_w = 91, .box_w = 3, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 411, .adv_w = 114, .box_w = 7, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 460, .adv_w = 232, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 538, .adv_w = 230, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 623, .adv_w = 91, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 6}, - {.bitmap_index = 634, .adv_w = 188, .box_w = 10, .box_h = 17, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 719, .adv_w = 185, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 791, .adv_w = 186, .box_w = 11, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 896, .adv_w = 239, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 981, .adv_w = 242, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1072, .adv_w = 91, .box_w = 3, .box_h = 17, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 1098, .adv_w = 137, .box_w = 7, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1144, .adv_w = 231, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1235, .adv_w = 205, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1313, .adv_w = 219, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 1407, .adv_w = 215, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 1485, .adv_w = 177, .box_w = 11, .box_h = 17, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 1579, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1657, .adv_w = 208, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 1751, .adv_w = 188, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1816, .adv_w = 257, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1920, .adv_w = 243, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 2011, .adv_w = 212, .box_w = 10, .box_h = 7, .ofs_x = 2, .ofs_y = 11} + {.bitmap_index = 0, .adv_w = 0, .box_w = 2, .box_h = 4, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 4, .adv_w = 0, .box_w = 2, .box_h = 2, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 6, .adv_w = 0, .box_w = 6, .box_h = 4, .ofs_x = -3, .ofs_y = -4}, + {.bitmap_index = 18, .adv_w = 0, .box_w = 4, .box_h = 2, .ofs_x = -2, .ofs_y = -3}, + {.bitmap_index = 22, .adv_w = 0, .box_w = 4, .box_h = 3, .ofs_x = -2, .ofs_y = -4}, + {.bitmap_index = 28, .adv_w = 0, .box_w = 2, .box_h = 2, .ofs_x = -1, .ofs_y = 7}, + {.bitmap_index = 30, .adv_w = 221, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 121, .adv_w = 211, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 206, .adv_w = 149, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 265, .adv_w = 195, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 343, .adv_w = 223, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 421, .adv_w = 91, .box_w = 3, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 441, .adv_w = 114, .box_w = 7, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 490, .adv_w = 232, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 568, .adv_w = 230, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 653, .adv_w = 91, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 6}, + {.bitmap_index = 664, .adv_w = 188, .box_w = 10, .box_h = 17, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 749, .adv_w = 185, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 821, .adv_w = 186, .box_w = 11, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 926, .adv_w = 239, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1011, .adv_w = 242, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1102, .adv_w = 91, .box_w = 3, .box_h = 17, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 1128, .adv_w = 137, .box_w = 7, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1174, .adv_w = 231, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1265, .adv_w = 205, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1343, .adv_w = 219, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 1437, .adv_w = 215, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1515, .adv_w = 177, .box_w = 11, .box_h = 17, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 1609, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1687, .adv_w = 208, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 1781, .adv_w = 188, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1846, .adv_w = 257, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1950, .adv_w = 243, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = 0} }; /*--------------------- * CHARACTER MAPPING *--------------------*/ - +static const uint16_t unicode_list_0[] = { + 0x0, 0x4, 0x6, 0x7, 0x8, 0xc +}; /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { - .range_start = 1488, .range_length = 27, .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 = 1456, .range_length = 13, .glyph_id_start = 1, + .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 6, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY }, { - .range_start = 1524, .range_length = 1, .glyph_id_start = 28, + .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY } }; diff --git a/radio/src/fonts/lvgl/lrg/lv_font_he_XS.c b/radio/src/fonts/lvgl/lrg/lv_font_he_XS.c index 3619783f0..7ed708155 100644 --- a/radio/src/fonts/lvgl/lrg/lv_font_he_XS.c +++ b/radio/src/fonts/lvgl/lrg/lv_font_he_XS.c @@ -2,99 +2,102 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf1,0x32,0x50,0x0b,0x0c,0x0b,0x00,0x00,0x42,0x00,0xc0,0x0a, -0x0b,0x0b,0x00,0x00,0x7f,0x00,0xa0,0x07,0x08,0x0b,0x00,0x00,0xab,0x00,0x00,0x0a, -0x0a,0x0b,0x00,0x00,0xe2,0x00,0x70,0x0b,0x09,0x0b,0x01,0x00,0x14,0x01,0xb0,0x04, -0x03,0x0b,0x01,0x00,0x25,0x01,0xd0,0x05,0x06,0x0b,0x00,0x00,0x46,0x01,0xe0,0x0b, -0x0a,0x0b,0x01,0x00,0x7d,0x01,0xc0,0x08,0x00,0x10,0xb4,0x20,0x00,0xf0,0x10,0x06, -0x01,0x05,0xbd,0x01,0xa0,0x09,0x09,0x0e,0x00,0xfd,0xfc,0x01,0x70,0x09,0x09,0x0b, -0x00,0x00,0x2e,0x02,0x90,0x09,0x09,0x11,0x00,0xff,0x7b,0x02,0x30,0x0c,0x28,0x00, -0x40,0xb2,0x02,0x60,0x0c,0x68,0x00,0xc0,0xef,0x02,0xb0,0x04,0x03,0x0e,0x01,0xfd, -0x04,0x03,0x00,0x07,0x50,0x00,0x40,0x25,0x03,0xd0,0x0b,0x18,0x00,0x31,0x62,0x03, -0x80,0x78,0x00,0xb1,0x99,0x03,0x30,0x0b,0x09,0x0e,0x01,0xfd,0xd8,0x03,0x00,0x80, -0x00,0x31,0x0a,0x04,0x10,0x58,0x00,0x40,0x49,0x04,0xd0,0x09,0x20,0x00,0x40,0x80, -0x04,0xa0,0x0a,0x20,0x00,0x31,0xbf,0x04,0xa0,0x68,0x00,0xb1,0xf1,0x04,0x20,0x0d, -0x0d,0x0b,0x00,0x00,0x39,0x05,0x70,0x60,0x00,0xf0,0x45,0x76,0x05,0xe0,0x0a,0x09, -0x06,0x01,0x09,0x08,0xf7,0x00,0x00,0x3f,0x70,0x00,0xcf,0x30,0x00,0x5f,0x50,0x00, -0x2f,0xd0,0x00,0x7f,0x30,0x00,0x0a,0xf9,0x00,0xbf,0x00,0x00,0x9f,0xdf,0x42,0xf9, -0x00,0x02,0xf8,0x1e,0xed,0xe1,0x00,0x07,0xf2,0x03,0xff,0x20,0x00,0x0b,0xf0,0x00, -0x8f,0x70,0x00,0x0e,0xc0,0x00,0x0c,0xf3,0x00,0x1f,0x90,0x00,0x02,0xfe,0x10,0x5f, -0x60,0x00,0x00,0x5f,0xb0,0x0d,0xff,0xfe,0xb4,0x00,0x00,0x67,0x78,0xaf,0xf3,0x2e, -0x01,0x20,0x2f,0xb0,0x06,0x00,0x10,0xce,0x05,0x00,0x20,0x0a,0xf0,0x06,0x00,0x1d, -0xaf,0x0b,0x00,0xff,0x38,0x02,0x88,0x88,0x88,0xdf,0x81,0x4f,0xff,0xff,0xff,0xff, -0x20,0x0d,0xfd,0x40,0x00,0x06,0x8f,0xd0,0x00,0x00,0x07,0xf3,0x00,0x00,0x02,0xf7, -0x00,0x00,0x00,0xea,0x00,0x00,0x18,0xee,0x00,0x02,0xee,0xbf,0x20,0x0a,0xf1,0x3f, -0x50,0x0f,0xb0,0x0f,0x90,0x2f,0x70,0x0c,0xc0,0x5f,0x40,0x09,0xf0,0xaf,0xff,0xff, -0xff,0xf7,0x47,0x77,0x77,0xbf,0x83,0x00,0x00,0x00,0x7f,0x20,0x05,0x00,0x15,0x62, -0xaf,0xff,0xfe,0xb3,0x05,0x77,0x9f,0x00,0x20,0x2f,0xa0,0x9d,0x00,0x9f,0x7f,0x20, -0x00,0x0a,0xf7,0xf2,0x00,0x00,0xaf,0x09,0x00,0x03,0x49,0xf0,0x7f,0x27,0xf2,0x03, -0x00,0xfc,0x03,0x20,0x79,0x30,0x00,0x7f,0xfe,0x92,0x01,0x6e,0xf9,0x00,0x9e,0x43, -0x00,0xf9,0x00,0x01,0xf8,0x03,0x00,0xff,0x0a,0x7f,0xff,0xff,0xd7,0x00,0x7f,0x87, -0x79,0xdf,0xa0,0x7f,0x20,0x00,0x0b,0xf2,0x7f,0x20,0x00,0x05,0xf5,0x7f,0x20,0x00, -0x03,0xf6,0x05,0x00,0x0b,0xf0,0x05,0x9f,0x10,0x3e,0xfd,0x60,0x9f,0x10,0x48,0x6d, -0xf3,0x9f,0x10,0x00,0x03,0xf8,0x9f,0x10,0x00,0x00,0xfb,0x05,0x00,0x10,0xec,0x05, -0x00,0xf3,0x0b,0xfc,0x8f,0x10,0x00,0x00,0xfa,0x7f,0x30,0x00,0x04,0xf8,0x4f,0x90, -0x00,0x0c,0xf2,0x0c,0xfc,0x99,0xef,0x80,0x00,0x8d,0xff,0xc6,0x00,0x97,0x00,0xf3, -0x05,0x25,0xa1,0xaf,0xff,0xec,0x60,0x05,0x77,0x79,0xef,0x70,0x00,0x00,0x00,0xee, -0x00,0x00,0x00,0x09,0xf1,0xf7,0x00,0x2f,0x07,0xf2,0x09,0x00,0x11,0xc0,0x4f,0xff, -0xeb,0x30,0x02,0x77,0x8a,0xff,0x50,0x00,0x00,0x02,0x3f,0x00,0x73,0x07,0xf4,0x00, -0x00,0x00,0x4f,0x60,0x89,0x01,0x22,0x4f,0x60,0x12,0x00,0x70,0x02,0xee,0x02,0x88, -0x8a,0xff,0x50,0x2d,0x00,0x01,0x10,0x03,0x10,0x06,0x49,0x01,0x28,0x6f,0x30,0x09, -0x00,0xf3,0x03,0xff,0xff,0xfc,0x50,0x37,0x77,0x78,0xef,0x40,0x00,0x00,0x02,0xf9, -0x00,0x00,0x00,0x0f,0x90,0x44,0x00,0xf2,0x07,0x8f,0x20,0x00,0x00,0x3f,0xb0,0x00, -0x00,0x3e,0xe1,0x00,0x00,0x8f,0xe3,0x00,0x03,0xff,0xb1,0x00,0x00,0x4c,0x50,0x59, -0x03,0x00,0x35,0x01,0x70,0xea,0x20,0x7f,0x87,0x78,0xaf,0xe1,0x30,0x01,0x10,0xf7, -0x94,0x00,0x10,0xfb,0x05,0x00,0x10,0xec,0x05,0x00,0x1c,0xdc,0x05,0x00,0xf0,0x10, -0x98,0x88,0x88,0xec,0x7f,0xff,0xff,0xff,0xfc,0x3f,0xa0,0x3b,0xff,0xb2,0x00,0x9f, -0x6f,0xe8,0xaf,0xe1,0x01,0xef,0xe1,0x00,0x5f,0x80,0x07,0xf6,0x00,0x00,0xec,0x5d, -0x02,0xf0,0x05,0x0c,0xe0,0x0e,0xb0,0x00,0x00,0xbe,0x03,0xf7,0x00,0x00,0x0b,0xe0, -0x7f,0x30,0x00,0x00,0xbe,0x0b,0xf0,0x0b,0x00,0xbc,0xfb,0x00,0x28,0x88,0xde,0x3f, -0x80,0x05,0xff,0xff,0xe0,0xdb,0x01,0x01,0x03,0x00,0x90,0x0d,0xfd,0x60,0x06,0x8e, -0xf2,0x00,0x04,0xf6,0xcb,0x01,0x55,0x00,0xf8,0x00,0x00,0xf9,0x03,0x00,0xf0,0x08, -0x28,0x88,0xf9,0x5f,0xff,0xf9,0x8f,0xff,0xff,0xfe,0xa2,0x04,0x8f,0xa7,0x78,0xaf, -0xf2,0x06,0xf2,0x00,0x00,0x5f,0x80,0xca,0x02,0xff,0x72,0xfb,0x0c,0xe0,0x00,0x00, -0x0e,0xc0,0xde,0x00,0x00,0x00,0xec,0x0c,0xf0,0x00,0x00,0x0f,0xb0,0x9f,0x30,0x00, -0x03,0xf8,0x05,0xfb,0x00,0x00,0xbf,0x20,0x0b,0xfd,0x89,0xdf,0x80,0x00,0x08,0xdf, -0xfc,0x50,0x00,0x0e,0xd0,0x00,0x02,0xf8,0x08,0xf3,0x00,0x02,0xf8,0x02,0xf9,0x00, -0x03,0xf7,0x00,0xce,0x00,0x04,0xf5,0x00,0x6f,0x40,0x07,0xf3,0x00,0x1f,0xa0,0x0a, -0xf0,0x00,0x0b,0xf0,0x1f,0xa0,0x00,0x05,0xf5,0xaf,0x20,0x00,0x00,0xff,0xf7,0x00, -0x6b,0xce,0xff,0x60,0x00,0xae,0xda,0x60,0x00,0x00,0xdf,0xff,0xfe,0xa2,0x0d,0xe7, -0x78,0xaf,0xf1,0xdc,0x00,0x00,0x5f,0x8d,0xc0,0x00,0x00,0xfb,0xde,0x87,0x00,0x0d, -0xcd,0xff,0xf0,0x00,0xdc,0x00,0x00,0x00,0x0d,0xc0,0x00,0x00,0x09,0x00,0x0a,0xf0, -0x11,0xcf,0xff,0xfe,0xa2,0x0c,0xf7,0x78,0xbf,0xe1,0xce,0x00,0x00,0x5f,0x9c,0xe0, -0x00,0x00,0xdd,0xce,0x00,0x00,0x0b,0xfc,0xff,0xf0,0x00,0xaf,0x68,0x88,0x00,0x0c, -0xf0,0xb6,0x00,0x00,0xa1,0x01,0xf1,0x1a,0x75,0x88,0x89,0xcf,0xc0,0xaf,0xff,0xfd, -0x80,0x00,0x9f,0x50,0x00,0x1f,0x90,0xee,0x00,0x03,0xf7,0x04,0xf8,0x00,0x4f,0x50, -0x0b,0xf0,0x07,0xf3,0x00,0x5f,0x52,0xfd,0x00,0x02,0xfd,0xfd,0x20,0x00,0x1f,0xb4, -0x00,0x1c,0x01,0x3f,0x00,0x1f,0x80,0x09,0x00,0x04,0x00,0x1c,0x04,0x21,0x0f,0xa0, -0x1b,0x04,0x20,0x02,0xfd,0x52,0x04,0xf0,0x03,0x5f,0x90,0x7f,0x40,0x00,0x0a,0xf9, -0xfc,0x00,0x00,0x00,0xdf,0xa1,0x00,0x00,0x00,0x3f,0xc0,0x62,0x02,0x10,0xf8,0xf9, -0x01,0x70,0xbf,0x30,0x28,0x88,0x88,0x9f,0xe0,0x02,0x04,0xa0,0xf0,0xef,0xff,0xff, -0xc5,0x07,0x77,0x77,0x9e,0xf3,0x23,0x00,0xfb,0x14,0x82,0x60,0x00,0x00,0xf9,0x7f, -0x20,0x00,0x2f,0x87,0xf2,0x00,0x06,0xf4,0x7f,0x20,0x00,0xdd,0x07,0xf2,0x00,0xaf, -0x50,0x7f,0x23,0xcf,0x80,0x07,0xf2,0xdf,0x70,0x00,0x7f,0x28,0x20,0xc9,0x02,0x40, -0xaf,0xff,0xec,0x50,0x02,0x03,0x1f,0x60,0x02,0x03,0x16,0xf0,0x0e,0x7f,0x30,0x02, -0xf7,0x00,0x6f,0x44,0xf6,0x00,0x3f,0x60,0x08,0xf2,0x1f,0x90,0x05,0xf4,0x00,0xaf, -0x00,0xec,0x00,0x6f,0x30,0x0c,0xe0,0x0b,0xf0,0x0b,0x5d,0x01,0x90,0x8f,0x8c,0xfb, -0x00,0x0f,0xa0,0x05,0xff,0xc7,0xad,0x01,0xf0,0x18,0x2f,0x80,0x00,0x00,0x9f,0x30, -0x00,0xfb,0x00,0x00,0x7f,0xc0,0x00,0x0c,0xfa,0xbc,0xff,0xd1,0x00,0x00,0x9f,0xfe, -0xc9,0x50,0x00,0x00,0x5f,0xff,0xff,0xfe,0xb4,0x02,0x7d,0xf7,0x78,0x9f,0xf4,0x00, -0xbe,0xf8,0x04,0x70,0x0b,0xe0,0x00,0x00,0xbe,0x00,0xbe,0xe2,0x04,0x00,0x0b,0x00, -0x17,0xaf,0x0b,0x00,0x00,0x6b,0x01,0x91,0x0a,0xf3,0xbf,0x80,0x00,0x00,0xaf,0x7e, -0xa0,0x0e,0x05,0xf0,0x0b,0x77,0x00,0x77,0x00,0x2f,0xc0,0x3f,0xa0,0x05,0xf6,0x06, -0xf4,0x00,0x9f,0x00,0xae,0x00,0x0c,0xa0,0x0d,0x90,0x00,0xf4,0x01,0xf3,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x05,0xff,0xfc,0x05,0x08,0x00,0xc0,0x03,0xff,0xfc, +0x08,0x00,0x00,0x00,0x04,0x05,0xfe,0xfc,0x12,0x08,0x00,0x40,0x01,0xfe,0xfe,0x14, +0x08,0x00,0x42,0x02,0xfe,0xfd,0x18,0x20,0x00,0xf1,0x35,0x05,0x1b,0x00,0x50,0x0b, +0x0c,0x0b,0x00,0x00,0x5d,0x00,0xc0,0x0a,0x0b,0x0b,0x00,0x00,0x9a,0x00,0xa0,0x07, +0x08,0x0b,0x00,0x00,0xc6,0x00,0x00,0x0a,0x0a,0x0b,0x00,0x00,0xfd,0x00,0x70,0x0b, +0x09,0x0b,0x01,0x00,0x2f,0x01,0xb0,0x04,0x03,0x0b,0x01,0x00,0x40,0x01,0xd0,0x05, +0x06,0x0b,0x00,0x00,0x61,0x01,0xe0,0x0b,0x0a,0x0b,0x01,0x00,0x98,0x01,0xc0,0x08, +0x00,0x10,0xcf,0x20,0x00,0xf0,0x10,0x06,0x01,0x05,0xd8,0x01,0xa0,0x09,0x09,0x0e, +0x00,0xfd,0x17,0x02,0x70,0x09,0x09,0x0b,0x00,0x00,0x49,0x02,0x90,0x09,0x09,0x11, +0x00,0xff,0x96,0x02,0x30,0x0c,0x28,0x00,0x40,0xcd,0x02,0x60,0x0c,0x68,0x00,0xc0, +0x0a,0x03,0xb0,0x04,0x03,0x0e,0x01,0xfd,0x1f,0x03,0x00,0x07,0x50,0x00,0x40,0x40, +0x03,0xd0,0x0b,0x18,0x00,0x31,0x7d,0x03,0x80,0x78,0x00,0xb1,0xb4,0x03,0x30,0x0b, +0x09,0x0e,0x01,0xfd,0xf3,0x03,0x00,0x80,0x00,0x31,0x25,0x04,0x10,0x58,0x00,0x40, +0x64,0x04,0xd0,0x09,0x20,0x00,0x40,0x9b,0x04,0xa0,0x0a,0x20,0x00,0x31,0xda,0x04, +0xa0,0x68,0x00,0xb0,0x0c,0x05,0x20,0x0d,0x0d,0x0b,0x00,0x00,0x54,0x05,0x70,0x60, +0x00,0x00,0xe6,0x00,0xf0,0x61,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x00, +0x99,0x11,0x99,0x11,0x00,0x99,0x11,0x00,0x00,0x99,0x89,0x11,0x11,0x09,0x90,0x01, +0x10,0x6f,0xf6,0x6f,0xf6,0x07,0x80,0x00,0x99,0x11,0x08,0xf7,0x00,0x00,0x3f,0x70, +0x00,0xcf,0x30,0x00,0x5f,0x50,0x00,0x2f,0xd0,0x00,0x7f,0x30,0x00,0x0a,0xf9,0x00, +0xbf,0x00,0x00,0x9f,0xdf,0x42,0xf9,0x00,0x02,0xf8,0x1e,0xed,0xe1,0x00,0x07,0xf2, +0x03,0xff,0x20,0x00,0x0b,0xf0,0x00,0x8f,0x70,0x00,0x0e,0xc0,0x00,0x0c,0xf3,0x00, +0x1f,0x90,0x00,0x02,0xfe,0x10,0x5f,0x60,0x00,0x00,0x5f,0xb0,0x0d,0xff,0xfe,0xb4, +0x00,0x00,0x67,0x78,0xaf,0xf3,0x75,0x00,0x20,0x2f,0xb0,0x06,0x00,0x10,0xce,0x05, +0x00,0x20,0x0a,0xf0,0x06,0x00,0x1d,0xaf,0x0b,0x00,0xff,0x38,0x02,0x88,0x88,0x88, +0xdf,0x81,0x4f,0xff,0xff,0xff,0xff,0x20,0x0d,0xfd,0x40,0x00,0x06,0x8f,0xd0,0x00, +0x00,0x07,0xf3,0x00,0x00,0x02,0xf7,0x00,0x00,0x00,0xea,0x00,0x00,0x18,0xee,0x00, +0x02,0xee,0xbf,0x20,0x0a,0xf1,0x3f,0x50,0x0f,0xb0,0x0f,0x90,0x2f,0x70,0x0c,0xc0, +0x5f,0x40,0x09,0xf0,0xaf,0xff,0xff,0xff,0xf7,0x47,0x77,0x77,0xbf,0x83,0x00,0x00, +0x00,0x7f,0x20,0x05,0x00,0x15,0x62,0xaf,0xff,0xfe,0xb3,0x05,0x77,0x9f,0x00,0x20, +0x2f,0xa0,0x9d,0x00,0x9f,0x7f,0x20,0x00,0x0a,0xf7,0xf2,0x00,0x00,0xaf,0x09,0x00, +0x03,0x49,0xf0,0x7f,0x27,0xf2,0x03,0x00,0xfc,0x03,0x20,0x79,0x30,0x00,0x7f,0xfe, +0x92,0x01,0x6e,0xf9,0x00,0x9e,0x43,0x00,0xf9,0x00,0x01,0xf8,0x03,0x00,0xff,0x0a, +0x7f,0xff,0xff,0xd7,0x00,0x7f,0x87,0x79,0xdf,0xa0,0x7f,0x20,0x00,0x0b,0xf2,0x7f, +0x20,0x00,0x05,0xf5,0x7f,0x20,0x00,0x03,0xf6,0x05,0x00,0x0b,0xf0,0x05,0x9f,0x10, +0x3e,0xfd,0x60,0x9f,0x10,0x48,0x6d,0xf3,0x9f,0x10,0x00,0x03,0xf8,0x9f,0x10,0x00, +0x00,0xfb,0x05,0x00,0x10,0xec,0x05,0x00,0xf3,0x0b,0xfc,0x8f,0x10,0x00,0x00,0xfa, +0x7f,0x30,0x00,0x04,0xf8,0x4f,0x90,0x00,0x0c,0xf2,0x0c,0xfc,0x99,0xef,0x80,0x00, +0x8d,0xff,0xc6,0x00,0x97,0x00,0xf3,0x05,0x25,0xa1,0xaf,0xff,0xec,0x60,0x05,0x77, +0x79,0xef,0x70,0x00,0x00,0x00,0xee,0x00,0x00,0x00,0x09,0xf1,0xf7,0x00,0x2f,0x07, +0xf2,0x09,0x00,0x11,0xc0,0x4f,0xff,0xeb,0x30,0x02,0x77,0x8a,0xff,0x50,0x00,0x00, +0x02,0x3f,0x00,0x73,0x07,0xf4,0x00,0x00,0x00,0x4f,0x60,0x89,0x01,0x22,0x4f,0x60, +0x12,0x00,0x70,0x02,0xee,0x02,0x88,0x8a,0xff,0x50,0x2d,0x00,0x01,0x5d,0x03,0x10, +0x06,0x49,0x01,0x28,0x6f,0x30,0x09,0x00,0xf3,0x03,0xff,0xff,0xfc,0x50,0x37,0x77, +0x78,0xef,0x40,0x00,0x00,0x02,0xf9,0x00,0x00,0x00,0x0f,0x90,0x44,0x00,0xf2,0x07, +0x8f,0x20,0x00,0x00,0x3f,0xb0,0x00,0x00,0x3e,0xe1,0x00,0x00,0x8f,0xe3,0x00,0x03, +0xff,0xb1,0x00,0x00,0x4c,0x50,0xa6,0x03,0x00,0x35,0x01,0x70,0xea,0x20,0x7f,0x87, +0x78,0xaf,0xe1,0x30,0x01,0x10,0xf7,0x94,0x00,0x10,0xfb,0x05,0x00,0x10,0xec,0x05, +0x00,0x1c,0xdc,0x05,0x00,0xf0,0x10,0x98,0x88,0x88,0xec,0x7f,0xff,0xff,0xff,0xfc, +0x3f,0xa0,0x3b,0xff,0xb2,0x00,0x9f,0x6f,0xe8,0xaf,0xe1,0x01,0xef,0xe1,0x00,0x5f, +0x80,0x07,0xf6,0x00,0x00,0xec,0x5d,0x02,0xf0,0x05,0x0c,0xe0,0x0e,0xb0,0x00,0x00, +0xbe,0x03,0xf7,0x00,0x00,0x0b,0xe0,0x7f,0x30,0x00,0x00,0xbe,0x0b,0xf0,0x0b,0x00, +0xbc,0xfb,0x00,0x28,0x88,0xde,0x3f,0x80,0x05,0xff,0xff,0xe0,0xdb,0x01,0x01,0x03, +0x00,0x90,0x0d,0xfd,0x60,0x06,0x8e,0xf2,0x00,0x04,0xf6,0xcb,0x01,0x55,0x00,0xf8, +0x00,0x00,0xf9,0x03,0x00,0xf0,0x08,0x28,0x88,0xf9,0x5f,0xff,0xf9,0x8f,0xff,0xff, +0xfe,0xa2,0x04,0x8f,0xa7,0x78,0xaf,0xf2,0x06,0xf2,0x00,0x00,0x5f,0x80,0xca,0x02, +0xff,0x72,0xfb,0x0c,0xe0,0x00,0x00,0x0e,0xc0,0xde,0x00,0x00,0x00,0xec,0x0c,0xf0, +0x00,0x00,0x0f,0xb0,0x9f,0x30,0x00,0x03,0xf8,0x05,0xfb,0x00,0x00,0xbf,0x20,0x0b, +0xfd,0x89,0xdf,0x80,0x00,0x08,0xdf,0xfc,0x50,0x00,0x0e,0xd0,0x00,0x02,0xf8,0x08, +0xf3,0x00,0x02,0xf8,0x02,0xf9,0x00,0x03,0xf7,0x00,0xce,0x00,0x04,0xf5,0x00,0x6f, +0x40,0x07,0xf3,0x00,0x1f,0xa0,0x0a,0xf0,0x00,0x0b,0xf0,0x1f,0xa0,0x00,0x05,0xf5, +0xaf,0x20,0x00,0x00,0xff,0xf7,0x00,0x6b,0xce,0xff,0x60,0x00,0xae,0xda,0x60,0x00, +0x00,0xdf,0xff,0xfe,0xa2,0x0d,0xe7,0x78,0xaf,0xf1,0xdc,0x00,0x00,0x5f,0x8d,0xc0, +0x00,0x00,0xfb,0xde,0x87,0x00,0x0d,0xcd,0xff,0xf0,0x00,0xdc,0x00,0x00,0x00,0x0d, +0xc0,0x00,0x00,0x09,0x00,0x0a,0xf0,0x11,0xcf,0xff,0xfe,0xa2,0x0c,0xf7,0x78,0xbf, +0xe1,0xce,0x00,0x00,0x5f,0x9c,0xe0,0x00,0x00,0xdd,0xce,0x00,0x00,0x0b,0xfc,0xff, +0xf0,0x00,0xaf,0x68,0x88,0x00,0x0c,0xf0,0xb6,0x00,0x00,0xa1,0x01,0xf1,0x1a,0x75, +0x88,0x89,0xcf,0xc0,0xaf,0xff,0xfd,0x80,0x00,0x9f,0x50,0x00,0x1f,0x90,0xee,0x00, +0x03,0xf7,0x04,0xf8,0x00,0x4f,0x50,0x0b,0xf0,0x07,0xf3,0x00,0x5f,0x52,0xfd,0x00, +0x02,0xfd,0xfd,0x20,0x00,0x1f,0xb4,0x00,0x1c,0x01,0x3f,0x00,0x1f,0x80,0x09,0x00, +0x04,0x00,0x1c,0x04,0x21,0x0f,0xa0,0x1b,0x04,0x20,0x02,0xfd,0x52,0x04,0xf0,0x03, +0x5f,0x90,0x7f,0x40,0x00,0x0a,0xf9,0xfc,0x00,0x00,0x00,0xdf,0xa1,0x00,0x00,0x00, +0x3f,0xc0,0x62,0x02,0x10,0xf8,0xf9,0x01,0x70,0xbf,0x30,0x28,0x88,0x88,0x9f,0xe0, +0x02,0x04,0xa0,0xf0,0xef,0xff,0xff,0xc5,0x07,0x77,0x77,0x9e,0xf3,0x23,0x00,0xfb, +0x14,0x82,0x60,0x00,0x00,0xf9,0x7f,0x20,0x00,0x2f,0x87,0xf2,0x00,0x06,0xf4,0x7f, +0x20,0x00,0xdd,0x07,0xf2,0x00,0xaf,0x50,0x7f,0x23,0xcf,0x80,0x07,0xf2,0xdf,0x70, +0x00,0x7f,0x28,0x20,0xc9,0x02,0x40,0xaf,0xff,0xec,0x50,0x02,0x03,0x1f,0x60,0x02, +0x03,0x16,0xf0,0x0e,0x7f,0x30,0x02,0xf7,0x00,0x6f,0x44,0xf6,0x00,0x3f,0x60,0x08, +0xf2,0x1f,0x90,0x05,0xf4,0x00,0xaf,0x00,0xec,0x00,0x6f,0x30,0x0c,0xe0,0x0b,0xf0, +0x0b,0x5d,0x01,0x90,0x8f,0x8c,0xfb,0x00,0x0f,0xa0,0x05,0xff,0xc7,0xad,0x01,0xf0, +0x18,0x2f,0x80,0x00,0x00,0x9f,0x30,0x00,0xfb,0x00,0x00,0x7f,0xc0,0x00,0x0c,0xfa, +0xbc,0xff,0xd1,0x00,0x00,0x9f,0xfe,0xc9,0x50,0x00,0x00,0x5f,0xff,0xff,0xfe,0xb4, +0x02,0x7d,0xf7,0x78,0x9f,0xf4,0x00,0xbe,0xf8,0x04,0x70,0x0b,0xe0,0x00,0x00,0xbe, +0x00,0xbe,0xe2,0x04,0x00,0x0b,0x00,0x17,0xaf,0x0b,0x00,0x00,0x6b,0x01,0xd0,0x0a, +0xf3,0xbf,0x80,0x00,0x00,0xaf,0x7e,0xa0,0x00,0x00,0x0a,0xf0, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_XS __FLASH = { -.uncomp_size = 1657, -.comp_size = 1295, -.line_height = 19, -.base_line = 3, +.uncomp_size = 1709, +.comp_size = 1340, +.line_height = 20, +.base_line = 4, .subpx = 0, .underline_position = -2, .underline_thickness = 1, @@ -105,11 +108,11 @@ const etxLz4Font lv_font_he_XS __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 1825, +.lvglFontBufSize = 1877, }; diff --git a/radio/src/fonts/lvgl/lrg/lv_font_he_XXS.c b/radio/src/fonts/lvgl/lrg/lv_font_he_XXS.c index da1999f8f..d0203402d 100644 --- a/radio/src/fonts/lvgl/lrg/lv_font_he_XXS.c +++ b/radio/src/fonts/lvgl/lrg/lv_font_he_XXS.c @@ -2,66 +2,69 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x0b,0x90,0x07,0x08,0x07,0x00,0x00,0x1c,0x00,0x30,0x07, -0x07,0x07,0x00,0x00,0x35,0x00,0x10,0x05,0x05,0x07,0x00,0x00,0x47,0x00,0xa0,0x06, -0x10,0x00,0x31,0x60,0x00,0xa0,0x18,0x00,0xf1,0x0c,0x79,0x00,0x20,0x03,0x02,0x07, -0x01,0x00,0x80,0x00,0xe0,0x03,0x04,0x08,0x00,0x00,0x90,0x00,0xe0,0x07,0x06,0x07, -0x01,0x00,0xa5,0x00,0xd0,0x40,0x00,0x10,0xc1,0x20,0x00,0xf0,0x18,0x04,0x01,0x03, -0xc5,0x00,0x70,0x06,0x06,0x09,0x00,0xfe,0xe0,0x00,0x50,0x06,0x06,0x07,0x00,0x00, -0xf5,0x00,0x60,0x06,0x06,0x0b,0x00,0xff,0x16,0x01,0x20,0x08,0x07,0x07,0x01,0x00, -0x2f,0x01,0x40,0x08,0x30,0x00,0xf1,0x04,0x4b,0x01,0x20,0x03,0x02,0x09,0x01,0xfe, -0x54,0x01,0xb0,0x04,0x04,0x07,0x00,0x00,0x62,0x01,0xe0,0x48,0x00,0x31,0x7e,0x01, -0x00,0x70,0x00,0xb1,0x97,0x01,0x80,0x07,0x07,0x09,0x00,0xfe,0xb7,0x01,0x50,0x10, -0x00,0x31,0xd0,0x01,0x10,0x58,0x00,0x31,0xeb,0x01,0x90,0x98,0x00,0x31,0x04,0x02, -0x10,0x20,0x00,0x31,0x24,0x02,0x70,0x68,0x00,0xb1,0x39,0x02,0xc0,0x08,0x09,0x07, -0x00,0x00,0x59,0x02,0x50,0x60,0x00,0xf0,0x26,0x75,0x02,0x40,0x07,0x06,0x04,0x01, -0x06,0x0d,0x60,0x02,0xf0,0x02,0xf3,0x05,0xc0,0x02,0xdd,0x09,0x80,0x0c,0x6a,0xce, -0x10,0x1f,0x00,0xd8,0x00,0x4d,0x00,0x2e,0x30,0x8a,0x00,0x05,0xe1,0x4f,0xfe,0xb2, -0x00,0x00,0x19,0xb0,0x00,0x00,0x2e,0x00,0x00,0x01,0xf0,0x00,0x00,0x1f,0x07,0x00, -0xfa,0x12,0x8f,0xff,0xff,0xc0,0x3f,0xc1,0x00,0x0b,0x60,0x00,0x6b,0x00,0x19,0xf0, -0x0e,0x6e,0x25,0xc0,0xa6,0x89,0x06,0xa0,0xcf,0xff,0xff,0x50,0x00,0x0a,0x60,0x00, -0x00,0xa6,0x00,0x07,0x00,0xf4,0x03,0x1f,0xff,0xe9,0x00,0x00,0x02,0xd6,0x0a,0x10, -0x07,0x90,0xf1,0x00,0x7a,0x0f,0x10,0x07,0xa0,0x07,0x00,0x02,0x01,0x00,0xa2,0x10, -0x00,0xae,0x82,0x05,0xe9,0x09,0x70,0x0b,0x50,0x02,0x00,0xc5,0xff,0xfe,0xb1,0xf1, -0x01,0x9a,0xf1,0x00,0x3e,0xf1,0x00,0x2f,0x03,0x00,0xc1,0x0f,0x03,0xee,0x60,0x0f, -0x00,0x03,0xf0,0x0f,0x00,0x00,0xf2,0x04,0x00,0xfb,0x0c,0x10,0x01,0xf0,0x0b,0x91, -0x1a,0xb0,0x02,0xbf,0xea,0x10,0xf1,0xf1,0xf1,0xc1,0xcf,0xfe,0x70,0x00,0x03,0xf3, -0x00,0x00,0xb6,0x00,0x00,0xa7,0x03,0x00,0xc0,0x8f,0xfd,0x50,0x00,0x04,0xf3,0x00, -0x00,0x98,0x00,0x00,0x79,0x06,0x00,0x91,0x04,0xf3,0x8f,0xfd,0x50,0x43,0x00,0x00, -0x97,0x03,0x00,0x91,0x9f,0xff,0xc2,0x00,0x00,0x9a,0x00,0x00,0x5b,0x1b,0x00,0xf4, -0x31,0xe1,0x00,0x7f,0x40,0x0d,0xc2,0x00,0x03,0x00,0x00,0xff,0xff,0xc3,0x0f,0x10, -0x06,0xe0,0xf1,0x00,0x0f,0x1f,0x10,0x00,0xe2,0xf1,0x00,0x0e,0x2f,0x10,0x00,0xe2, -0xff,0xff,0xff,0x20,0x5d,0x2b,0xfd,0x40,0x0b,0xf8,0x16,0xe0,0x05,0xd0,0x00,0xe2, -0x09,0x70,0x00,0xd4,0x0e,0x30,0x00,0xd4,0x2f,0x00,0x00,0xd4,0x6b,0x04,0xff,0xf4, -0xf1,0x01,0x00,0x62,0x4f,0xd2,0x00,0xa9,0x00,0x6b,0x02,0x00,0xf8,0x3c,0x9f,0xfb, -0xbf,0xff,0xfc,0x40,0x0d,0x20,0x06,0xe0,0x2f,0x00,0x00,0xf2,0x3e,0x00,0x00,0xf3, -0x1f,0x10,0x01,0xf0,0x0c,0xa1,0x1a,0xa0,0x02,0xbe,0xea,0x10,0x3f,0x00,0x0c,0x50, -0xc5,0x00,0xc5,0x06,0xb0,0x0e,0x30,0x1f,0x12,0xf0,0x00,0xa7,0xa9,0x01,0x28,0xfc, -0x00,0xce,0xc6,0x00,0x00,0x3f,0xff,0xe8,0x03,0xe0,0x03,0xe4,0x3e,0x00,0x09,0x73, -0xff,0x40,0x98,0x00,0x00,0x09,0x80,0x00,0x00,0x07,0x00,0xe1,0x2f,0xff,0xd7,0x02, -0xf0,0x03,0xe4,0x2f,0x00,0x08,0x92,0xff,0x50,0x7a,0x19,0x00,0xf0,0x05,0x04,0xf3, -0x1f,0xff,0xd5,0x00,0x9a,0x00,0x6b,0x0e,0x40,0x89,0x06,0xc0,0xc5,0x01,0xfc,0xa0, -0x01,0xf1,0xb7,0x01,0x05,0x03,0x00,0xff,0x2a,0x8c,0x00,0x5c,0x00,0xc8,0x07,0xa0, -0x01,0xe6,0xd6,0x00,0x04,0xf8,0x00,0x00,0x07,0xc0,0x00,0x00,0x0b,0x90,0x8f,0xff, -0xff,0x00,0x4f,0xff,0xea,0x00,0x00,0x01,0xd5,0x0e,0x10,0x0b,0x50,0xf1,0x00,0xe2, -0x0f,0x10,0x9b,0x00,0xf2,0xbd,0x10,0x0f,0x48,0x00,0x00,0xf1,0x00,0x00,0x0f,0x10, -0x00,0x00,0x5f,0x01,0x02,0xf0,0x21,0x98,0x01,0xf0,0x0f,0x26,0xb0,0x3e,0x01,0xf0, -0x3e,0x05,0xc0,0x3e,0x00,0xf9,0xe6,0x05,0xc0,0x0d,0x92,0x00,0x98,0x00,0xa8,0x13, -0x8f,0x20,0x06,0xff,0xd9,0x20,0x00,0x9f,0xff,0xfd,0x50,0x07,0x90,0x04,0xf1,0x07, -0x90,0x00,0xc4,0x07,0x90,0x00,0xc5,0x04,0x00,0xf0,0x05,0x0a,0x80,0x00,0xc5,0xad, -0x10,0x00,0xc5,0x07,0x22,0x70,0x2f,0x18,0xa0,0x6a,0x0c,0x40,0x94,0x0d,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x02,0xff,0xfe,0x02,0x08,0x00,0xc3,0x01,0xff,0xfe, +0x03,0x00,0x00,0x00,0x04,0x02,0xfe,0xfe,0x07,0x10,0x00,0x12,0x08,0x20,0x00,0x22, +0xfd,0x0a,0x10,0x00,0xf0,0x0e,0x04,0x0b,0x00,0x90,0x07,0x08,0x07,0x00,0x00,0x27, +0x00,0x30,0x07,0x07,0x07,0x00,0x00,0x40,0x00,0x10,0x05,0x05,0x07,0x00,0x00,0x52, +0x00,0xa0,0x06,0x10,0x00,0x31,0x6b,0x00,0xa0,0x18,0x00,0xf1,0x0c,0x84,0x00,0x20, +0x03,0x02,0x07,0x01,0x00,0x8b,0x00,0xe0,0x03,0x04,0x08,0x00,0x00,0x9b,0x00,0xe0, +0x07,0x06,0x07,0x01,0x00,0xb0,0x00,0xd0,0x40,0x00,0x10,0xcc,0x20,0x00,0xf0,0x01, +0x04,0x01,0x03,0xd0,0x00,0x70,0x06,0x06,0x09,0x00,0xfe,0xeb,0x00,0x50,0x06,0x06, +0x75,0x00,0xf0,0x04,0x01,0x60,0x06,0x06,0x0b,0x00,0xff,0x21,0x01,0x20,0x08,0x07, +0x07,0x01,0x00,0x3a,0x01,0x40,0x08,0x30,0x00,0xf1,0x04,0x56,0x01,0x20,0x03,0x02, +0x09,0x01,0xfe,0x5f,0x01,0xb0,0x04,0x04,0x07,0x00,0x00,0x6d,0x01,0xe0,0x48,0x00, +0x31,0x89,0x01,0x00,0x70,0x00,0xb1,0xa2,0x01,0x80,0x07,0x07,0x09,0x00,0xfe,0xc2, +0x01,0x50,0x10,0x00,0x31,0xdb,0x01,0x10,0x58,0x00,0x31,0xf6,0x01,0x90,0x98,0x00, +0x31,0x0f,0x02,0x10,0x20,0x00,0x31,0x2f,0x02,0x70,0x68,0x00,0xb0,0x44,0x02,0xc0, +0x08,0x09,0x07,0x00,0x00,0x64,0x02,0x50,0x60,0x00,0x00,0xf6,0x00,0xf0,0x32,0x00, +0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x44,0x54,0x44,0x09,0x90,0x04,0x40,0x99, +0xaa,0x22,0x44,0x0d,0x60,0x02,0xf0,0x02,0xf3,0x05,0xc0,0x02,0xdd,0x09,0x80,0x0c, +0x6a,0xce,0x10,0x1f,0x00,0xd8,0x00,0x4d,0x00,0x2e,0x30,0x8a,0x00,0x05,0xe1,0x4f, +0xfe,0xb2,0x00,0x00,0x19,0xb0,0x00,0x00,0x2e,0x00,0x00,0x01,0xf0,0x00,0x00,0x1f, +0x07,0x00,0xfa,0x12,0x8f,0xff,0xff,0xc0,0x3f,0xc1,0x00,0x0b,0x60,0x00,0x6b,0x00, +0x19,0xf0,0x0e,0x6e,0x25,0xc0,0xa6,0x89,0x06,0xa0,0xcf,0xff,0xff,0x50,0x00,0x0a, +0x60,0x00,0x00,0xa6,0x00,0x07,0x00,0xf4,0x03,0x1f,0xff,0xe9,0x00,0x00,0x02,0xd6, +0x0a,0x10,0x07,0x90,0xf1,0x00,0x7a,0x0f,0x10,0x07,0xa0,0x07,0x00,0x02,0x01,0x00, +0xa2,0x10,0x00,0xae,0x82,0x05,0xe9,0x09,0x70,0x0b,0x50,0x02,0x00,0xc5,0xff,0xfe, +0xb1,0xf1,0x01,0x9a,0xf1,0x00,0x3e,0xf1,0x00,0x2f,0x03,0x00,0xc1,0x0f,0x03,0xee, +0x60,0x0f,0x00,0x03,0xf0,0x0f,0x00,0x00,0xf2,0x04,0x00,0xfb,0x0c,0x10,0x01,0xf0, +0x0b,0x91,0x1a,0xb0,0x02,0xbf,0xea,0x10,0xf1,0xf1,0xf1,0xc1,0xcf,0xfe,0x70,0x00, +0x03,0xf3,0x00,0x00,0xb6,0x00,0x00,0xa7,0x03,0x00,0xc0,0x8f,0xfd,0x50,0x00,0x04, +0xf3,0x00,0x00,0x98,0x00,0x00,0x79,0x06,0x00,0x91,0x04,0xf3,0x8f,0xfd,0x50,0x43, +0x00,0x00,0x97,0x03,0x00,0x91,0x9f,0xff,0xc2,0x00,0x00,0x9a,0x00,0x00,0x5b,0x1b, +0x00,0xf4,0x31,0xe1,0x00,0x7f,0x40,0x0d,0xc2,0x00,0x03,0x00,0x00,0xff,0xff,0xc3, +0x0f,0x10,0x06,0xe0,0xf1,0x00,0x0f,0x1f,0x10,0x00,0xe2,0xf1,0x00,0x0e,0x2f,0x10, +0x00,0xe2,0xff,0xff,0xff,0x20,0x5d,0x2b,0xfd,0x40,0x0b,0xf8,0x16,0xe0,0x05,0xd0, +0x00,0xe2,0x09,0x70,0x00,0xd4,0x0e,0x30,0x00,0xd4,0x2f,0x00,0x00,0xd4,0x6b,0x04, +0xff,0xf4,0xf1,0x01,0x00,0x62,0x4f,0xd2,0x00,0xa9,0x00,0x6b,0x02,0x00,0xf8,0x3c, +0x9f,0xfb,0xbf,0xff,0xfc,0x40,0x0d,0x20,0x06,0xe0,0x2f,0x00,0x00,0xf2,0x3e,0x00, +0x00,0xf3,0x1f,0x10,0x01,0xf0,0x0c,0xa1,0x1a,0xa0,0x02,0xbe,0xea,0x10,0x3f,0x00, +0x0c,0x50,0xc5,0x00,0xc5,0x06,0xb0,0x0e,0x30,0x1f,0x12,0xf0,0x00,0xa7,0xa9,0x01, +0x28,0xfc,0x00,0xce,0xc6,0x00,0x00,0x3f,0xff,0xe8,0x03,0xe0,0x03,0xe4,0x3e,0x00, +0x09,0x73,0xff,0x40,0x98,0x00,0x00,0x09,0x80,0x00,0x00,0x07,0x00,0xe1,0x2f,0xff, +0xd7,0x02,0xf0,0x03,0xe4,0x2f,0x00,0x08,0x92,0xff,0x50,0x7a,0x19,0x00,0xf0,0x05, +0x04,0xf3,0x1f,0xff,0xd5,0x00,0x9a,0x00,0x6b,0x0e,0x40,0x89,0x06,0xc0,0xc5,0x01, +0xfc,0xa0,0x01,0xf1,0xb7,0x01,0x05,0x03,0x00,0xff,0x2a,0x8c,0x00,0x5c,0x00,0xc8, +0x07,0xa0,0x01,0xe6,0xd6,0x00,0x04,0xf8,0x00,0x00,0x07,0xc0,0x00,0x00,0x0b,0x90, +0x8f,0xff,0xff,0x00,0x4f,0xff,0xea,0x00,0x00,0x01,0xd5,0x0e,0x10,0x0b,0x50,0xf1, +0x00,0xe2,0x0f,0x10,0x9b,0x00,0xf2,0xbd,0x10,0x0f,0x48,0x00,0x00,0xf1,0x00,0x00, +0x0f,0x10,0x00,0x00,0x5f,0x01,0x02,0xf0,0x21,0x98,0x01,0xf0,0x0f,0x26,0xb0,0x3e, +0x01,0xf0,0x3e,0x05,0xc0,0x3e,0x00,0xf9,0xe6,0x05,0xc0,0x0d,0x92,0x00,0x98,0x00, +0xa8,0x13,0x8f,0x20,0x06,0xff,0xd9,0x20,0x00,0x9f,0xff,0xfd,0x50,0x07,0x90,0x04, +0xf1,0x07,0x90,0x00,0xc4,0x07,0x90,0x00,0xc5,0x04,0x00,0x80,0x0a,0x80,0x00,0xc5, +0xad,0x10,0x00,0xc5, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_XXS __FLASH = { -.uncomp_size = 873, -.comp_size = 767, -.line_height = 12, -.base_line = 2, +.uncomp_size = 924, +.comp_size = 804, +.line_height = 13, +.base_line = 3, .subpx = 0, .underline_position = -1, .underline_thickness = 1, @@ -72,11 +75,11 @@ const etxLz4Font lv_font_he_XXS __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 1041, +.lvglFontBufSize = 1092, }; diff --git a/radio/src/fonts/lvgl/lrg/lv_font_he_bold_STD.c b/radio/src/fonts/lvgl/lrg/lv_font_he_bold_STD.c index 9f29e5e7b..d1d44c924 100644 --- a/radio/src/fonts/lvgl/lrg/lv_font_he_bold_STD.c +++ b/radio/src/fonts/lvgl/lrg/lv_font_he_bold_STD.c @@ -2,126 +2,129 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x16,0x00,0x01,0x00,0xf0,0x2a,0x0f,0x0f,0x0d,0x00,0x00,0x62,0x00,0x10,0x0e,0x0e, -0x0d,0x00,0x00,0xbd,0x00,0x90,0x0a,0x0a,0x0d,0x00,0x00,0xfe,0x00,0xd0,0x0c,0x0d, -0x0d,0x00,0x00,0x53,0x01,0xe0,0x0e,0x0d,0x0d,0x01,0x00,0xa8,0x01,0xa0,0x06,0x04, -0x0d,0x01,0x00,0xc2,0x01,0x10,0x08,0x08,0x0e,0x00,0x00,0xfa,0x01,0x60,0x0f,0x18, -0x00,0x31,0x4f,0x02,0x20,0x08,0x00,0xf0,0x1d,0xa4,0x02,0xa0,0x06,0x04,0x08,0x01, -0x05,0xb4,0x02,0xb0,0x0c,0x0b,0x11,0x00,0xfc,0x12,0x03,0x30,0x0c,0x0b,0x0d,0x00, -0x00,0x5a,0x03,0x90,0x0c,0x0c,0x13,0x00,0xff,0xcc,0x03,0xe0,0x0f,0x0e,0x0d,0x01, -0x00,0x27,0x04,0x00,0x10,0x70,0x00,0xf1,0x04,0x89,0x04,0xa0,0x06,0x04,0x11,0x01, -0xfc,0xab,0x04,0x80,0x09,0x08,0x0d,0x00,0x00,0xdf,0x04,0x60,0x88,0x00,0x40,0x41, -0x05,0xa0,0x0d,0x78,0x00,0xb1,0x96,0x05,0xe0,0x0e,0x0d,0x11,0x01,0xfc,0x05,0x06, -0x50,0x80,0x00,0xb1,0x5a,0x06,0x20,0x0c,0x0c,0x11,0x00,0xfc,0xc0,0x06,0x60,0x20, -0x00,0x31,0x15,0x07,0x60,0x20,0x00,0x31,0x84,0x07,0xb0,0x68,0x00,0xb1,0xcc,0x07, -0xb0,0x11,0x11,0x0d,0x00,0x00,0x3b,0x08,0xd0,0x48,0x00,0xf0,0x39,0x9d,0x08,0xc0, -0x0d,0x0a,0x07,0x02,0x0b,0x04,0xff,0xf3,0x00,0x00,0x1f,0xfe,0x00,0x08,0xff,0xe1, -0x00,0x02,0xff,0xc0,0x00,0x0b,0xff,0xb0,0x00,0x4f,0xfa,0x00,0x00,0x1e,0xff,0x70, -0x07,0xff,0x70,0x00,0x06,0xef,0xff,0x30,0xcf,0xf2,0x00,0x05,0xff,0xff,0xfd,0x7f, -0xfa,0x00,0x00,0xdf,0xf1,0xbf,0xff,0xfc,0x00,0x00,0x1f,0xfb,0x01,0xef,0xfd,0x00, -0x00,0x05,0xff,0x80,0x03,0x3f,0x00,0xa1,0x9f,0xf5,0x00,0x07,0xff,0xe1,0x00,0x0c, -0xff,0x20,0x3f,0x00,0x21,0xff,0xf0,0x3f,0x00,0xf1,0x0d,0x3f,0xfc,0x00,0x00,0x00, -0x4f,0xff,0x30,0x09,0xff,0xff,0xfe,0xb5,0x00,0x00,0x09,0xff,0xff,0xff,0xff,0x90, -0x00,0x05,0x99,0x99,0xad,0xff,0xf4,0x58,0x01,0x21,0xaf,0xfa,0x07,0x00,0x22,0x2f, -0xfc,0x66,0x01,0x12,0xfd,0x07,0x00,0x1f,0xfe,0x07,0x00,0x03,0x90,0x19,0x99,0x99, -0x99,0x9f,0xff,0x92,0x2f,0xff,0x01,0x00,0x13,0xf5,0x07,0x00,0xf0,0x03,0x04,0xff, -0xfa,0x20,0x00,0x04,0xff,0xff,0xd0,0x00,0x02,0x9a,0xff,0xf5,0x00,0x00,0x00,0x5f, -0x53,0x00,0x10,0x0e,0x35,0x00,0xf1,0x18,0x0a,0xff,0x30,0x00,0x01,0x7d,0xff,0x60, -0x00,0x4f,0xff,0xff,0xa0,0x01,0xff,0xf8,0xff,0xe0,0x07,0xff,0x80,0xbf,0xf2,0x0b, -0xff,0x30,0x8f,0xf6,0x0f,0xff,0x00,0x4f,0xf9,0x3f,0xfb,0x00,0x0f,0xfd,0x9f,0x48, -0x00,0x11,0x39,0x06,0x00,0x80,0xf3,0x59,0x99,0x99,0x9b,0xff,0xd9,0x20,0x47,0x00, -0x30,0xf9,0x00,0x00,0xdf,0x00,0x2f,0x90,0x00,0x0d,0x00,0x21,0x70,0x5f,0xff,0xff, -0xfe,0xc7,0x00,0x05,0x54,0x00,0x71,0xfd,0x00,0x39,0x99,0x99,0x9c,0xff,0x1b,0x00, -0xc0,0x06,0xff,0xe0,0x01,0x11,0x00,0x00,0x0e,0xff,0x02,0xff,0xc0,0x4a,0x01,0x00, -0xf8,0x00,0x30,0x0c,0xff,0x12,0x0d,0x00,0x1f,0xcf,0x0d,0x00,0x0e,0x3f,0x10,0x2f, -0xfc,0x02,0x00,0x05,0xff,0x13,0x45,0x00,0x00,0x00,0x7f,0xfb,0x50,0x00,0x7f,0xff, -0xff,0xa4,0x17,0xcf,0xff,0xfb,0x00,0x04,0xff,0xfb,0x00,0x2f,0xfe,0x44,0x00,0x8f, -0xf5,0x00,0x00,0xaf,0xf3,0x00,0x00,0xbf,0x04,0x00,0x03,0x00,0x44,0x01,0x31,0xd9, -0x30,0x02,0xfc,0x00,0x61,0x60,0x2f,0xfe,0x99,0x9a,0xef,0x73,0x00,0x30,0x01,0xdf, -0xf6,0x73,0x00,0x30,0x07,0xff,0x92,0x80,0x00,0x20,0x4f,0xfa,0x0d,0x00,0x3f,0x04, -0xff,0xa2,0x0d,0x00,0x13,0xf0,0x15,0xa0,0x3f,0xfa,0x00,0x9e,0xfe,0xa2,0x03,0xff, -0xa0,0x0c,0xff,0xff,0xe0,0x3f,0xfa,0x00,0xa7,0x7f,0xff,0x73,0xff,0xa0,0x00,0x00, -0x6f,0xfb,0x3f,0xfa,0x00,0x00,0x02,0xff,0xd3,0xff,0xa0,0x6f,0x02,0x00,0x0d,0x00, -0x30,0x01,0xff,0xe3,0x0d,0x00,0x22,0x2f,0xfd,0x6f,0x00,0xfa,0x0c,0xa0,0xff,0xf4, -0x00,0x02,0xef,0xf6,0x0a,0xff,0xfc,0xab,0xff,0xfe,0x00,0x1d,0xff,0xff,0xff,0xfe, -0x30,0x00,0x07,0xcf,0xfe,0xc8,0x10,0x00,0xf0,0x00,0x71,0x01,0x10,0x9f,0xff,0xff, -0xeb,0x60,0x50,0x02,0xd0,0xb0,0x59,0x99,0x9a,0xdf,0xff,0x50,0x00,0x00,0x00,0x9f, -0xfb,0x00,0x60,0x00,0x15,0xd0,0x35,0x02,0x2f,0xff,0xe0,0x0b,0x00,0x24,0x51,0x2f, -0xff,0xff,0xc8,0x10,0x17,0x01,0xd0,0x40,0x19,0x99,0xac,0xff,0xff,0x10,0x00,0x00, -0x02,0xdf,0xf8,0x00,0xdf,0x00,0x16,0xc0,0x27,0x00,0x20,0xf0,0x00,0x37,0x03,0x00, -0xf2,0x01,0x00,0x16,0x00,0x30,0x02,0xef,0xf8,0x2c,0x00,0x20,0xfe,0x12,0xb7,0x00, -0x30,0x40,0x2f,0xff,0xb6,0x00,0x30,0x16,0x64,0x00,0x01,0x03,0x1f,0xfb,0x06,0x00, -0x04,0x61,0xff,0xff,0xff,0xc7,0x00,0x4f,0xc5,0x00,0x10,0x29,0x14,0x03,0x10,0xf3, -0x16,0x00,0x20,0xbf,0xf7,0x06,0x00,0x11,0x6f,0x06,0x00,0x20,0x8f,0xf5,0x06,0x00, -0x61,0xef,0xf2,0x00,0x00,0x00,0x08,0x7a,0x00,0xf1,0x02,0x8f,0xff,0x30,0x00,0x00, -0x3c,0xff,0xf8,0x00,0x00,0x5b,0xff,0xff,0x80,0x00,0x00,0xef,0xf3,0x02,0x80,0xef, -0xf9,0x10,0x00,0x00,0x00,0xc7,0x10,0x4a,0x03,0x10,0xff,0x19,0x01,0x11,0x00,0x1d, -0x03,0xb0,0xfc,0x00,0x2f,0xfe,0x99,0x99,0xcf,0xff,0x80,0x2f,0xfc,0x7b,0x02,0x31, -0xd0,0x2f,0xfc,0xb6,0x00,0x01,0x07,0x00,0x2f,0xdf,0xf1,0x07,0x00,0x09,0x00,0x38, -0x00,0x32,0x99,0xef,0xf1,0x63,0x03,0x04,0x07,0x00,0xb0,0x3f,0xfe,0x00,0x6c,0xff, -0xd8,0x00,0x00,0x9f,0xf7,0xbf,0xd6,0x02,0xf0,0x09,0x01,0xef,0xff,0xff,0xab,0xff, -0xf8,0x00,0x06,0xff,0xfe,0x10,0x05,0xff,0xd0,0x00,0x0e,0xff,0x50,0x00,0x0e,0xff, -0x10,0x02,0x49,0x01,0xd0,0xcf,0xf2,0x00,0x7f,0xf8,0x00,0x00,0x0b,0xff,0x30,0x0c, -0xff,0x40,0x6a,0x02,0x31,0x01,0xff,0xf0,0x0f,0x00,0x30,0x5f,0xfb,0x00,0x0f,0x00, -0xfe,0x08,0x09,0xff,0x70,0x06,0x99,0x9e,0xff,0x30,0xdf,0xf3,0x00,0xbf,0xff,0xff, -0xf3,0x2f,0xff,0x00,0x0b,0xff,0xff,0xff,0x30,0xe1,0x02,0x0c,0x02,0x00,0xf0,0x03, -0x09,0xff,0xea,0x20,0x09,0xff,0xff,0xe0,0x05,0x9b,0xff,0xf6,0x00,0x00,0x7f,0xf9, -0x00,0x00,0x47,0x02,0x2c,0x2f,0xfb,0x04,0x00,0x71,0x29,0x99,0xaf,0xfb,0x3f,0xff, -0xff,0x04,0x00,0x10,0x7f,0x91,0x01,0x42,0xb6,0x00,0x07,0xff,0x14,0x01,0xa0,0x49, -0xdf,0xf9,0x99,0xad,0xff,0xf8,0x00,0x0e,0xfc,0x91,0x04,0x20,0xe0,0x04,0x47,0x01, -0x51,0x0f,0xff,0x10,0x7f,0xf7,0x6a,0x01,0x30,0x09,0xff,0x70,0xa0,0x03,0x31,0x20, -0x8f,0xf8,0x2c,0x01,0x10,0x06,0x76,0x01,0xf1,0x07,0x3f,0xfe,0x00,0x2f,0xff,0x60, -0x00,0x1c,0xff,0x90,0x00,0xbf,0xff,0xca,0xbe,0xff,0xf2,0x00,0x01,0xdf,0xff,0xff, -0xc2,0x04,0xd0,0x7c,0xef,0xfc,0x81,0x00,0x00,0x0d,0xff,0x40,0x00,0x08,0xff,0x70, -0x1e,0x05,0x20,0x8f,0xf7,0xeb,0x00,0xc1,0x09,0xff,0x60,0x0a,0xff,0x60,0x00,0xaf, -0xf4,0x00,0x4f,0xfc,0x14,0x05,0x20,0xef,0xf2,0x2f,0x02,0x50,0x08,0xff,0x80,0x5f, -0xfb,0x34,0x02,0x70,0x0d,0xff,0x60,0x00,0x00,0xbf,0xfd,0xab,0x02,0x10,0x07,0x49, -0x00,0x51,0x7d,0xef,0xff,0xff,0xf5,0x1f,0x05,0x70,0xb2,0x00,0x00,0x8f,0xec,0xa6, -0x10,0xce,0x02,0x01,0xb6,0x00,0x12,0x09,0x43,0x04,0x20,0x9f,0xfb,0xb4,0x00,0x90, -0x09,0xff,0x50,0x00,0x07,0xff,0xe0,0x9f,0xf5,0xb2,0x00,0xf0,0x07,0x09,0xff,0xb9, -0x80,0x00,0xdf,0xf1,0x9f,0xff,0xff,0x00,0x0d,0xff,0x19,0xff,0xff,0xf0,0x00,0xdf, -0xf1,0x00,0x00,0x8d,0x00,0x00,0x3e,0x00,0x0f,0x0d,0x00,0x1e,0x52,0x7f,0xff,0xff, -0xfe,0xa4,0x25,0x01,0x80,0xf9,0x00,0x7f,0xfc,0x99,0xad,0xff,0xf6,0xfd,0x05,0x50, -0x09,0xff,0xc0,0x7f,0xf7,0x6f,0x00,0xf1,0x06,0x07,0xff,0xff,0xf1,0x00,0xdf,0xf1, -0x7f,0xff,0xff,0x10,0x0c,0xff,0x24,0x99,0x99,0x90,0x00,0xef,0xf1,0x00,0x71,0x02, -0x00,0x06,0x00,0x91,0x1c,0xff,0xb0,0x39,0x99,0x99,0xbf,0xff,0xf3,0xf3,0x04,0x10, -0xf6,0x00,0x05,0xa0,0xfd,0x82,0x00,0x00,0x8f,0xfc,0x00,0x00,0x7f,0xf8,0xee,0x00, -0xf0,0x0b,0x8f,0xf6,0x03,0xff,0xf1,0x00,0xaf,0xf5,0x00,0x9f,0xf9,0x00,0xcf,0xf3, -0x00,0x1f,0xff,0x10,0xff,0xf0,0x00,0x0a,0xff,0x59,0xff,0xb0,0x74,0x00,0x70,0xfe, -0x20,0x00,0x06,0xff,0xff,0xa2,0xa6,0x02,0x11,0xa1,0x27,0x05,0x1f,0x80,0x06,0x00, -0x19,0xf0,0x01,0x8f,0xfe,0x10,0x00,0x0a,0xff,0x40,0xbf,0xfb,0x00,0x00,0xcf,0xf3, -0x01,0xef,0xf7,0x87,0x02,0x30,0x03,0xff,0xf4,0x89,0x01,0x50,0x06,0xff,0xe1,0x7f, -0xfa,0xe8,0x01,0x30,0xdf,0xff,0x20,0x44,0x05,0x10,0xfc,0xdb,0x05,0x11,0x2e,0x2e, -0x04,0x00,0x98,0x06,0x01,0x64,0x03,0x92,0xfd,0x10,0x09,0x99,0x99,0x99,0xff,0xfb, -0x00,0x03,0x06,0x11,0x0f,0x07,0x00,0x81,0x30,0xaf,0xff,0xff,0xff,0xea,0x40,0x0a, -0x0d,0x00,0x61,0x50,0x69,0x99,0x99,0x9a,0xff,0xf5,0x03,0x50,0x01,0xff,0xf1,0x05, -0x54,0x4a,0x00,0x11,0x22,0xc2,0x05,0x01,0x4d,0x03,0x20,0x2f,0xfd,0xcf,0x05,0x10, -0x0a,0x68,0x03,0x00,0x44,0x07,0xc0,0x02,0xff,0xc0,0x1a,0xff,0xf5,0x00,0x2f,0xfc, -0x0e,0xff,0xf7,0x50,0x07,0x20,0xff,0xe5,0xe1,0x06,0x30,0x0f,0x91,0x00,0x0d,0x00, -0x15,0x10,0xee,0x06,0x01,0x03,0x06,0x05,0xfb,0x06,0x0f,0xd0,0x04,0x35,0x20,0x4f, -0xfb,0x80,0x06,0xf0,0x07,0x03,0xff,0xc1,0xff,0xe0,0x00,0x6f,0xf8,0x00,0x4f,0xfb, -0x0e,0xff,0x20,0x07,0xff,0x70,0x06,0xff,0x90,0xbf,0xf5,0xa5,0x07,0xf1,0x05,0x8f, -0xf7,0x08,0xff,0x80,0x0c,0xff,0x30,0x0a,0xff,0x50,0x5f,0xfb,0x05,0xff,0xe0,0x00, -0xcf,0xf2,0x02,0xb2,0x01,0xb2,0x0f,0xff,0x00,0x0e,0xff,0xff,0xb5,0x00,0x03,0xff, -0xd0,0x83,0x04,0x20,0xbf,0xf9,0xd4,0x02,0xe1,0x00,0x03,0xbf,0xff,0x20,0x00,0x5f, -0xfd,0x9a,0xbe,0xff,0xff,0x70,0x00,0x13,0x05,0x20,0xfe,0x50,0x10,0x02,0x81,0xed, -0xca,0x73,0x00,0x00,0x00,0x3f,0xff,0xe9,0x06,0x13,0x03,0x5c,0x03,0x91,0x29,0xaf, -0xfe,0x99,0xac,0xff,0xf7,0x00,0x03,0xd7,0x01,0x40,0xd0,0x00,0x3f,0xfb,0x2b,0x00, -0x01,0x0f,0x00,0x31,0x00,0xef,0xf0,0x0f,0x00,0x1d,0x0e,0x0f,0x00,0x30,0x07,0xff, -0x90,0x0f,0x00,0x30,0x3b,0xff,0xf6,0x0f,0x00,0x11,0x05,0x68,0x01,0x51,0xef,0xf0, -0x5f,0xea,0x20,0x1e,0x00,0xf0,0x14,0x04,0xdd,0x70,0x6d,0xd5,0x08,0xff,0x30,0xbf, -0xf1,0x0b,0xfe,0x00,0xef,0xa0,0x0e,0xf8,0x02,0xff,0x50,0x2f,0xf2,0x05,0xfe,0x00, -0x5f,0xc0,0x09,0xf9,0x00,0x9f,0x60,0x0c,0xf3,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x04,0xff,0xfc,0x04,0x08,0x00,0xf0,0x05,0x02,0xff, +0xfc,0x06,0x00,0x00,0x00,0x06,0x04,0xfd,0xfc,0x12,0x00,0x00,0x00,0x04,0x02,0xfe, +0xfd,0x16,0x08,0x00,0x42,0x03,0xfe,0xfc,0x1c,0x20,0x00,0xf0,0x2e,0x07,0x1e,0x00, +0x00,0x0f,0x0f,0x0d,0x00,0x00,0x80,0x00,0x10,0x0e,0x0e,0x0d,0x00,0x00,0xdb,0x00, +0x90,0x0a,0x0a,0x0d,0x00,0x00,0x1c,0x01,0xd0,0x0c,0x0d,0x0d,0x00,0x00,0x71,0x01, +0xe0,0x0e,0x0d,0x0d,0x01,0x00,0xc6,0x01,0xa0,0x06,0x04,0x0d,0x01,0x00,0xe0,0x01, +0x10,0x08,0x08,0x0e,0x00,0x00,0x18,0x02,0x60,0x0f,0x18,0x00,0x31,0x6d,0x02,0x20, +0x08,0x00,0xf0,0x1d,0xc2,0x02,0xa0,0x06,0x04,0x08,0x01,0x05,0xd2,0x02,0xb0,0x0c, +0x0b,0x11,0x00,0xfc,0x30,0x03,0x30,0x0c,0x0b,0x0d,0x00,0x00,0x78,0x03,0x90,0x0c, +0x0c,0x13,0x00,0xff,0xea,0x03,0xe0,0x0f,0x0e,0x0d,0x01,0x00,0x45,0x04,0x00,0x10, +0x70,0x00,0xf1,0x04,0xa7,0x04,0xa0,0x06,0x04,0x11,0x01,0xfc,0xc9,0x04,0x80,0x09, +0x08,0x0d,0x00,0x00,0xfd,0x04,0x60,0x88,0x00,0x40,0x5f,0x05,0xa0,0x0d,0x78,0x00, +0xb1,0xb4,0x05,0xe0,0x0e,0x0d,0x11,0x01,0xfc,0x23,0x06,0x50,0x80,0x00,0xb1,0x78, +0x06,0x20,0x0c,0x0c,0x11,0x00,0xfc,0xde,0x06,0x60,0x20,0x00,0x31,0x33,0x07,0x60, +0x20,0x00,0x31,0xa2,0x07,0xb0,0x68,0x00,0xb0,0xea,0x07,0xb0,0x11,0x11,0x0d,0x00, +0x00,0x59,0x08,0xd0,0x48,0x00,0x00,0xe6,0x00,0xf0,0x58,0x00,0x06,0x00,0x07,0x00, +0x08,0x00,0x0c,0x00,0xaa,0x66,0x66,0xaa,0x66,0xaa,0x0d,0x66,0xd0,0x08,0x43,0x90, +0x00,0x66,0x00,0x00,0xaa,0x00,0xcf,0xfc,0x12,0x21,0x46,0x64,0x9e,0xe9,0x09,0x90, +0x66,0xaa,0x04,0xff,0xf3,0x00,0x00,0x1f,0xfe,0x00,0x08,0xff,0xe1,0x00,0x02,0xff, +0xc0,0x00,0x0b,0xff,0xb0,0x00,0x4f,0xfa,0x00,0x00,0x1e,0xff,0x70,0x07,0xff,0x70, +0x00,0x06,0xef,0xff,0x30,0xcf,0xf2,0x00,0x05,0xff,0xff,0xfd,0x7f,0xfa,0x00,0x00, +0xdf,0xf1,0xbf,0xff,0xfc,0x00,0x00,0x1f,0xfb,0x01,0xef,0xfd,0x00,0x00,0x05,0xff, +0x80,0x03,0x3f,0x00,0xa1,0x9f,0xf5,0x00,0x07,0xff,0xe1,0x00,0x0c,0xff,0x20,0x3f, +0x00,0x21,0xff,0xf0,0x3f,0x00,0xf1,0x0d,0x3f,0xfc,0x00,0x00,0x00,0x4f,0xff,0x30, +0x09,0xff,0xff,0xfe,0xb5,0x00,0x00,0x09,0xff,0xff,0xff,0xff,0x90,0x00,0x05,0x99, +0x99,0xad,0xff,0xf4,0xa9,0x01,0x21,0xaf,0xfa,0x07,0x00,0x21,0x2f,0xfc,0x07,0x00, +0x22,0x0f,0xfd,0x07,0x00,0x1f,0xfe,0x07,0x00,0x03,0x90,0x19,0x99,0x99,0x99,0x9f, +0xff,0x92,0x2f,0xff,0x01,0x00,0x13,0xf5,0x07,0x00,0xf0,0x03,0x04,0xff,0xfa,0x20, +0x00,0x04,0xff,0xff,0xd0,0x00,0x02,0x9a,0xff,0xf5,0x00,0x00,0x00,0x5f,0x53,0x00, +0x10,0x0e,0x35,0x00,0xf1,0x18,0x0a,0xff,0x30,0x00,0x01,0x7d,0xff,0x60,0x00,0x4f, +0xff,0xff,0xa0,0x01,0xff,0xf8,0xff,0xe0,0x07,0xff,0x80,0xbf,0xf2,0x0b,0xff,0x30, +0x8f,0xf6,0x0f,0xff,0x00,0x4f,0xf9,0x3f,0xfb,0x00,0x0f,0xfd,0x9f,0x48,0x00,0x11, +0x39,0x06,0x00,0x80,0xf3,0x59,0x99,0x99,0x9b,0xff,0xd9,0x20,0x47,0x00,0x30,0xf9, +0x00,0x00,0xdf,0x00,0x2f,0x90,0x00,0x0d,0x00,0x21,0x70,0x5f,0xff,0xff,0xfe,0xc7, +0x00,0x05,0x54,0x00,0x71,0xfd,0x00,0x39,0x99,0x99,0x9c,0xff,0x1b,0x00,0xc0,0x06, +0xff,0xe0,0x01,0x11,0x00,0x00,0x0e,0xff,0x02,0xff,0xc0,0x4a,0x01,0x00,0xf8,0x00, +0x30,0x0c,0xff,0x12,0x0d,0x00,0x1f,0xcf,0x0d,0x00,0x0e,0x3f,0x10,0x2f,0xfc,0x02, +0x00,0x05,0xff,0x13,0x45,0x00,0x00,0x00,0x7f,0xfb,0x50,0x00,0x7f,0xff,0xff,0xa4, +0x17,0xcf,0xff,0xfb,0x00,0x04,0xff,0xfb,0x00,0x2f,0xfe,0x44,0x00,0x8f,0xf5,0x00, +0x00,0xaf,0xf3,0x00,0x00,0xbf,0x04,0x00,0x03,0x00,0x44,0x01,0x31,0xd9,0x30,0x02, +0xfc,0x00,0x61,0x60,0x2f,0xfe,0x99,0x9a,0xef,0x73,0x00,0x30,0x01,0xdf,0xf6,0x73, +0x00,0x30,0x07,0xff,0x92,0x80,0x00,0x20,0x4f,0xfa,0x0d,0x00,0x3f,0x04,0xff,0xa2, +0x0d,0x00,0x13,0xf0,0x15,0xa0,0x3f,0xfa,0x00,0x9e,0xfe,0xa2,0x03,0xff,0xa0,0x0c, +0xff,0xff,0xe0,0x3f,0xfa,0x00,0xa7,0x7f,0xff,0x73,0xff,0xa0,0x00,0x00,0x6f,0xfb, +0x3f,0xfa,0x00,0x00,0x02,0xff,0xd3,0xff,0xa0,0x6f,0x02,0x00,0x0d,0x00,0x30,0x01, +0xff,0xe3,0x0d,0x00,0x22,0x2f,0xfd,0x6f,0x00,0xfa,0x0c,0xa0,0xff,0xf4,0x00,0x02, +0xef,0xf6,0x0a,0xff,0xfc,0xab,0xff,0xfe,0x00,0x1d,0xff,0xff,0xff,0xfe,0x30,0x00, +0x07,0xcf,0xfe,0xc8,0x10,0x00,0xf0,0x00,0x71,0x01,0x10,0x9f,0xff,0xff,0xeb,0x60, +0x50,0x02,0xd0,0xb0,0x59,0x99,0x9a,0xdf,0xff,0x50,0x00,0x00,0x00,0x9f,0xfb,0x00, +0x60,0x00,0x15,0xd0,0x35,0x02,0x2f,0xff,0xe0,0x0b,0x00,0x24,0x51,0x2f,0xff,0xff, +0xc8,0x10,0x17,0x01,0xd0,0x40,0x19,0x99,0xac,0xff,0xff,0x10,0x00,0x00,0x02,0xdf, +0xf8,0x00,0xdf,0x00,0x16,0xc0,0x27,0x00,0x20,0xf0,0x00,0x37,0x03,0x00,0xf2,0x01, +0x00,0x16,0x00,0x30,0x02,0xef,0xf8,0x2c,0x00,0x20,0xfe,0x12,0xb7,0x00,0x30,0x40, +0x2f,0xff,0xb6,0x00,0x30,0x16,0x64,0x00,0x01,0x03,0x1f,0xfb,0x06,0x00,0x04,0x61, +0xff,0xff,0xff,0xc7,0x00,0x4f,0xc5,0x00,0x10,0x29,0x14,0x03,0x10,0xf3,0x16,0x00, +0x20,0xbf,0xf7,0x06,0x00,0x11,0x6f,0x06,0x00,0x20,0x8f,0xf5,0x06,0x00,0x61,0xef, +0xf2,0x00,0x00,0x00,0x08,0x7a,0x00,0xf1,0x02,0x8f,0xff,0x30,0x00,0x00,0x3c,0xff, +0xf8,0x00,0x00,0x5b,0xff,0xff,0x80,0x00,0x00,0xef,0xf3,0x02,0x80,0xef,0xf9,0x10, +0x00,0x00,0x00,0xc7,0x10,0x4a,0x03,0x10,0xff,0x19,0x01,0x11,0x00,0x1d,0x03,0xb0, +0xfc,0x00,0x2f,0xfe,0x99,0x99,0xcf,0xff,0x80,0x2f,0xfc,0x7b,0x02,0x31,0xd0,0x2f, +0xfc,0xb6,0x00,0x01,0x07,0x00,0x2f,0xdf,0xf1,0x07,0x00,0x09,0x00,0x38,0x00,0x32, +0x99,0xef,0xf1,0x63,0x03,0x04,0x07,0x00,0xb0,0x3f,0xfe,0x00,0x6c,0xff,0xd8,0x00, +0x00,0x9f,0xf7,0xbf,0xd6,0x02,0xf0,0x09,0x01,0xef,0xff,0xff,0xab,0xff,0xf8,0x00, +0x06,0xff,0xfe,0x10,0x05,0xff,0xd0,0x00,0x0e,0xff,0x50,0x00,0x0e,0xff,0x10,0x02, +0x49,0x01,0xd0,0xcf,0xf2,0x00,0x7f,0xf8,0x00,0x00,0x0b,0xff,0x30,0x0c,0xff,0x40, +0x6a,0x02,0x31,0x01,0xff,0xf0,0x0f,0x00,0x30,0x5f,0xfb,0x00,0x0f,0x00,0xfe,0x08, +0x09,0xff,0x70,0x06,0x99,0x9e,0xff,0x30,0xdf,0xf3,0x00,0xbf,0xff,0xff,0xf3,0x2f, +0xff,0x00,0x0b,0xff,0xff,0xff,0x30,0xe1,0x02,0x0c,0x02,0x00,0xf0,0x03,0x09,0xff, +0xea,0x20,0x09,0xff,0xff,0xe0,0x05,0x9b,0xff,0xf6,0x00,0x00,0x7f,0xf9,0x00,0x00, +0x47,0x02,0x2c,0x2f,0xfb,0x04,0x00,0x71,0x29,0x99,0xaf,0xfb,0x3f,0xff,0xff,0x04, +0x00,0x10,0x7f,0x91,0x01,0x42,0xb6,0x00,0x07,0xff,0x14,0x01,0xa0,0x49,0xdf,0xf9, +0x99,0xad,0xff,0xf8,0x00,0x0e,0xfc,0x91,0x04,0x20,0xe0,0x04,0x47,0x01,0x51,0x0f, +0xff,0x10,0x7f,0xf7,0x6a,0x01,0x30,0x09,0xff,0x70,0xa0,0x03,0x31,0x20,0x8f,0xf8, +0x2c,0x01,0x10,0x06,0x76,0x01,0xf1,0x07,0x3f,0xfe,0x00,0x2f,0xff,0x60,0x00,0x1c, +0xff,0x90,0x00,0xbf,0xff,0xca,0xbe,0xff,0xf2,0x00,0x01,0xdf,0xff,0xff,0xc2,0x04, +0xd0,0x7c,0xef,0xfc,0x81,0x00,0x00,0x0d,0xff,0x40,0x00,0x08,0xff,0x70,0x1e,0x05, +0x20,0x8f,0xf7,0xeb,0x00,0xc1,0x09,0xff,0x60,0x0a,0xff,0x60,0x00,0xaf,0xf4,0x00, +0x4f,0xfc,0x14,0x05,0x20,0xef,0xf2,0x2f,0x02,0x50,0x08,0xff,0x80,0x5f,0xfb,0x34, +0x02,0x70,0x0d,0xff,0x60,0x00,0x00,0xbf,0xfd,0xab,0x02,0x10,0x07,0x49,0x00,0x51, +0x7d,0xef,0xff,0xff,0xf5,0x1f,0x05,0x70,0xb2,0x00,0x00,0x8f,0xec,0xa6,0x10,0xce, +0x02,0x01,0xb6,0x00,0x12,0x09,0x43,0x04,0x20,0x9f,0xfb,0xb4,0x00,0x90,0x09,0xff, +0x50,0x00,0x07,0xff,0xe0,0x9f,0xf5,0xb2,0x00,0xf0,0x07,0x09,0xff,0xb9,0x80,0x00, +0xdf,0xf1,0x9f,0xff,0xff,0x00,0x0d,0xff,0x19,0xff,0xff,0xf0,0x00,0xdf,0xf1,0x00, +0x00,0x8d,0x00,0x00,0x3e,0x00,0x0f,0x0d,0x00,0x1e,0x52,0x7f,0xff,0xff,0xfe,0xa4, +0x25,0x01,0x80,0xf9,0x00,0x7f,0xfc,0x99,0xad,0xff,0xf6,0xfd,0x05,0x50,0x09,0xff, +0xc0,0x7f,0xf7,0x6f,0x00,0xf1,0x06,0x07,0xff,0xff,0xf1,0x00,0xdf,0xf1,0x7f,0xff, +0xff,0x10,0x0c,0xff,0x24,0x99,0x99,0x90,0x00,0xef,0xf1,0x00,0x71,0x02,0x00,0x06, +0x00,0x91,0x1c,0xff,0xb0,0x39,0x99,0x99,0xbf,0xff,0xf3,0xf3,0x04,0x10,0xf6,0x00, +0x05,0xa0,0xfd,0x82,0x00,0x00,0x8f,0xfc,0x00,0x00,0x7f,0xf8,0xee,0x00,0xf0,0x0b, +0x8f,0xf6,0x03,0xff,0xf1,0x00,0xaf,0xf5,0x00,0x9f,0xf9,0x00,0xcf,0xf3,0x00,0x1f, +0xff,0x10,0xff,0xf0,0x00,0x0a,0xff,0x59,0xff,0xb0,0x74,0x00,0x70,0xfe,0x20,0x00, +0x06,0xff,0xff,0xa2,0xa6,0x02,0x11,0xa1,0x27,0x05,0x1f,0x80,0x06,0x00,0x19,0xf0, +0x01,0x8f,0xfe,0x10,0x00,0x0a,0xff,0x40,0xbf,0xfb,0x00,0x00,0xcf,0xf3,0x01,0xef, +0xf7,0x87,0x02,0x30,0x03,0xff,0xf4,0x89,0x01,0x50,0x06,0xff,0xe1,0x7f,0xfa,0xe8, +0x01,0x30,0xdf,0xff,0x20,0x44,0x05,0x10,0xfc,0xdb,0x05,0x11,0x2e,0x2e,0x04,0x00, +0x98,0x06,0x01,0x64,0x03,0x92,0xfd,0x10,0x09,0x99,0x99,0x99,0xff,0xfb,0x00,0x03, +0x06,0x11,0x0f,0x07,0x00,0x81,0x30,0xaf,0xff,0xff,0xff,0xea,0x40,0x0a,0x0d,0x00, +0x61,0x50,0x69,0x99,0x99,0x9a,0xff,0xf5,0x03,0x50,0x01,0xff,0xf1,0x05,0x54,0x4a, +0x00,0x11,0x22,0xc2,0x05,0x01,0x4d,0x03,0x20,0x2f,0xfd,0xcf,0x05,0x10,0x0a,0x68, +0x03,0x00,0x44,0x07,0xc0,0x02,0xff,0xc0,0x1a,0xff,0xf5,0x00,0x2f,0xfc,0x0e,0xff, +0xf7,0x50,0x07,0x20,0xff,0xe5,0xe1,0x06,0x30,0x0f,0x91,0x00,0x0d,0x00,0x15,0x10, +0xee,0x06,0x01,0x03,0x06,0x05,0xfb,0x06,0x0f,0xd0,0x04,0x35,0x20,0x4f,0xfb,0x80, +0x06,0xf0,0x07,0x03,0xff,0xc1,0xff,0xe0,0x00,0x6f,0xf8,0x00,0x4f,0xfb,0x0e,0xff, +0x20,0x07,0xff,0x70,0x06,0xff,0x90,0xbf,0xf5,0xa5,0x07,0xf1,0x05,0x8f,0xf7,0x08, +0xff,0x80,0x0c,0xff,0x30,0x0a,0xff,0x50,0x5f,0xfb,0x05,0xff,0xe0,0x00,0xcf,0xf2, +0x02,0xb2,0x01,0xb2,0x0f,0xff,0x00,0x0e,0xff,0xff,0xb5,0x00,0x03,0xff,0xd0,0x83, +0x04,0x20,0xbf,0xf9,0xd4,0x02,0xe1,0x00,0x03,0xbf,0xff,0x20,0x00,0x5f,0xfd,0x9a, +0xbe,0xff,0xff,0x70,0x00,0x13,0x05,0x20,0xfe,0x50,0x10,0x02,0x81,0xed,0xca,0x73, +0x00,0x00,0x00,0x3f,0xff,0xe9,0x06,0x13,0x03,0x5c,0x03,0x91,0x29,0xaf,0xfe,0x99, +0xac,0xff,0xf7,0x00,0x03,0xd7,0x01,0x40,0xd0,0x00,0x3f,0xfb,0x2b,0x00,0x01,0x0f, +0x00,0x31,0x00,0xef,0xf0,0x0f,0x00,0x1d,0x0e,0x0f,0x00,0x30,0x07,0xff,0x90,0x0f, +0x00,0x30,0x3b,0xff,0xf6,0x0f,0x00,0x11,0x05,0x68,0x01,0xa0,0xef,0xf0,0x5f,0xea, +0x20,0x00,0x00,0x0e,0xff,0x00, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_bold_STD __FLASH = { -.uncomp_size = 2472, -.comp_size = 1754, +.uncomp_size = 2519, +.comp_size = 1798, .line_height = 22, .base_line = 4, .subpx = 0, @@ -134,11 +137,11 @@ const etxLz4Font lv_font_he_bold_STD __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 2640, +.lvglFontBufSize = 2687, }; diff --git a/radio/src/fonts/lvgl/lrg/lv_font_he_bold_XL.c b/radio/src/fonts/lvgl/lrg/lv_font_he_bold_XL.c index 07297d53a..1401b90cb 100644 --- a/radio/src/fonts/lvgl/lrg/lv_font_he_bold_XL.c +++ b/radio/src/fonts/lvgl/lrg/lv_font_he_bold_XL.c @@ -2,239 +2,241 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x16,0x00,0x01,0x00,0xf1,0x31,0x1e,0x1d,0x1b,0x01,0x00,0x88,0x01,0x30,0x1c,0x1a, -0x1b,0x01,0x00,0xe7,0x02,0x10,0x15,0x13,0x1b,0x01,0x00,0xe8,0x03,0xa0,0x19,0x19, -0x1b,0x00,0x00,0x3a,0x05,0xc0,0x1d,0x18,0x1b,0x03,0x00,0x7e,0x06,0x40,0x0d,0x07, -0x1b,0x03,0x00,0xdd,0x06,0x10,0x10,0x0f,0x1c,0x01,0x00,0xaf,0x07,0xd0,0x1e,0x19, -0x1b,0x03,0x00,0x01,0x09,0x40,0x08,0x00,0xf0,0x35,0x53,0x0a,0x40,0x0d,0x07,0x0f, -0x03,0x0c,0x88,0x0a,0x60,0x19,0x16,0x23,0x00,0xf8,0x09,0x0c,0x50,0x18,0x15,0x1b, -0x01,0x00,0x25,0x0d,0x30,0x19,0x17,0x26,0x01,0xff,0xda,0x0e,0xb0,0x1f,0x1a,0x1b, -0x03,0x00,0x39,0x10,0xf0,0x1f,0x1c,0x1b,0x01,0x00,0xb3,0x11,0x40,0x0d,0x07,0x23, -0x03,0xf8,0x2e,0x12,0x00,0x13,0x0f,0x1b,0x01,0x00,0xf9,0x12,0xc0,0x1e,0x18,0x00, -0x40,0x73,0x14,0x30,0x1b,0x78,0x00,0xc0,0xc5,0x15,0xb0,0x1d,0x19,0x23,0x02,0xf8, -0x7b,0x17,0xb0,0x1c,0x80,0x00,0xc0,0xbf,0x18,0x40,0x18,0x18,0x23,0x00,0xf8,0x63, -0x1a,0xd0,0x1a,0x20,0x00,0x40,0xb5,0x1b,0xc0,0x1c,0x20,0x00,0xf1,0x04,0x6b,0x1d, -0x60,0x19,0x16,0x1b,0x00,0x00,0x94,0x1e,0x70,0x23,0x21,0x1b,0x01,0x00,0x52,0x20, -0x90,0x60,0x00,0xd1,0xcc,0x21,0x70,0x1b,0x14,0x0e,0x04,0x16,0x01,0xef,0xff,0xff, -0xf2,0xe7,0x00,0xd0,0x1f,0xff,0xff,0xd0,0x00,0x03,0xff,0xff,0xff,0xc0,0x00,0x00, -0x00,0x09,0x00,0x80,0xfb,0x00,0x00,0x07,0xff,0xff,0xff,0x80,0x0f,0x00,0xf0,0x03, -0x4f,0xff,0xff,0xa0,0x00,0x00,0x0b,0xff,0xff,0xff,0x30,0x00,0x00,0x00,0x06,0xff, -0xff,0xf8,0x19,0x01,0x30,0xff,0xff,0xfe,0x1d,0x00,0x42,0x7f,0xff,0xff,0x70,0x24, -0x00,0x80,0xfa,0x00,0x00,0x00,0x09,0xff,0xff,0xf5,0x16,0x00,0x12,0x8f,0x08,0x00, -0x40,0xbf,0xff,0xff,0x20,0x0f,0x00,0x11,0xcf,0x68,0x00,0x40,0x0f,0xff,0xff,0xf0, -0x0e,0x00,0x11,0x07,0x68,0x00,0x12,0x03,0x32,0x00,0x31,0x00,0x2d,0xff,0x68,0x00, -0xa0,0xaf,0xff,0xff,0x40,0x00,0x00,0x00,0x2e,0xff,0xff,0x68,0x00,0x12,0x3f,0x8a, -0x00,0x11,0x0c,0x0e,0x00,0xd1,0xfe,0x2d,0xff,0xff,0xf4,0x00,0x00,0x00,0x04,0xff, -0xff,0xfc,0x3f,0x12,0x00,0x00,0x81,0x00,0x00,0x32,0x00,0x20,0x20,0x6f,0x0e,0x00, -0x10,0xfb,0x0e,0x00,0x10,0x0e,0xa5,0x00,0x13,0xaf,0x0e,0x00,0x00,0x5d,0x00,0x43, -0xf6,0x00,0x01,0xef,0x63,0x00,0x00,0xa5,0x00,0x10,0x30,0x3f,0x00,0x20,0xff,0x90, -0x0e,0x00,0x11,0x0a,0x88,0x00,0x50,0x08,0xff,0xff,0xff,0x50,0x0f,0x00,0x32,0xef, -0xff,0xfd,0x6b,0x00,0x22,0xfe,0x10,0x0a,0x01,0x82,0xb0,0x00,0x00,0x00,0x2f,0xff, -0xff,0xfc,0x73,0x00,0x01,0x6c,0x00,0x12,0x6f,0x08,0x00,0x12,0x7f,0x33,0x00,0x00, -0xd8,0x00,0x11,0xf3,0x48,0x00,0x10,0xf3,0x0e,0x00,0x00,0x68,0x00,0x10,0xe1,0x48, -0x00,0x11,0xff,0x6d,0x00,0x00,0x68,0x00,0x12,0xa0,0x52,0x01,0x12,0x00,0x13,0x01, -0x33,0xff,0x60,0x04,0x98,0x00,0x83,0x00,0x00,0x0d,0xff,0xff,0xff,0x20,0x7f,0x5a, -0x01,0x01,0x68,0x00,0x31,0xfd,0x00,0x03,0xd5,0x00,0x33,0xed,0xa7,0x30,0xbb,0x00, -0x01,0x01,0x00,0x27,0xfd,0x50,0x0d,0x00,0x28,0xff,0xfa,0x0d,0x00,0x28,0xff,0x90, -0x0d,0x00,0x00,0x1b,0x01,0x10,0x33,0x01,0x00,0x22,0x58,0xef,0xb5,0x00,0x02,0x01, -0x00,0x10,0x0b,0x69,0x00,0x05,0x0e,0x00,0x13,0xef,0xba,0x00,0x13,0x00,0x9e,0x01, -0x03,0x7f,0x00,0x05,0xde,0x01,0x03,0x01,0x00,0x03,0xfe,0x00,0x05,0x0d,0x00,0x15, -0xc0,0x0d,0x00,0x1f,0x0f,0x0d,0x00,0x59,0x22,0x03,0x33,0x01,0x00,0x52,0x3f,0xff, -0xff,0xd3,0x32,0xf3,0x01,0x03,0x07,0x01,0x0f,0x0d,0x00,0x21,0x64,0x00,0x9f,0xff, -0xff,0xda,0x40,0x8c,0x01,0x02,0xfb,0x00,0x20,0x9f,0xff,0x97,0x01,0x04,0x13,0x00, -0x24,0xff,0x10,0x13,0x00,0x10,0xf7,0xd0,0x01,0x35,0x33,0x35,0xcf,0x93,0x00,0x12, -0xdf,0x1d,0x00,0x01,0xf8,0x02,0x15,0xf6,0xa3,0x00,0x03,0x32,0x01,0x12,0xcf,0x04, -0x03,0x01,0xd3,0x02,0x12,0xf2,0x0a,0x00,0x11,0x3f,0x57,0x00,0x00,0x46,0x00,0x04, -0x7d,0x02,0x22,0x5b,0xff,0x0b,0x02,0x23,0x05,0xef,0x6a,0x00,0x02,0x73,0x00,0x12, -0xf5,0x09,0x03,0x00,0x91,0x00,0x00,0x2c,0x00,0x51,0xff,0xd7,0xef,0xff,0xfc,0x9b, -0x01,0x20,0xb0,0x0b,0xa0,0x02,0x10,0x0d,0x52,0x00,0x00,0xb8,0x02,0x10,0x02,0x3b, -0x02,0x10,0x04,0x9a,0x00,0x10,0x6f,0x6b,0x03,0x00,0x7d,0x00,0x02,0x79,0x02,0x30, -0xdf,0xff,0xfe,0x9e,0x00,0x01,0x50,0x00,0x11,0xf2,0xac,0x01,0x00,0x22,0x00,0xb0, -0x54,0xff,0xff,0xf9,0x00,0x00,0x02,0xff,0xff,0xf9,0x8f,0xf3,0x01,0x00,0x30,0x00, -0x27,0xd0,0x2f,0x0e,0x01,0x17,0x62,0x0c,0x00,0x1f,0xf6,0x19,0x00,0x12,0x13,0x60, -0x8d,0x01,0x56,0xbf,0xff,0xff,0x43,0x31,0x5d,0x02,0x03,0xf0,0x00,0x07,0xe6,0x03, -0x0f,0x19,0x00,0xd8,0x12,0xbf,0x99,0x04,0x22,0xca,0x72,0x1e,0x00,0x02,0x01,0x00, -0x17,0xb3,0x0c,0x00,0x27,0xff,0x50,0x0c,0x00,0x17,0xf4,0x0c,0x00,0x31,0xfd,0x00, -0x23,0x4e,0x01,0x36,0x46,0xbf,0xff,0x93,0x03,0x27,0x03,0xef,0x85,0x03,0x44,0x5f, -0xff,0xff,0xe0,0x0c,0x00,0x13,0x0e,0x33,0x05,0x04,0x7a,0x00,0x43,0x03,0x33,0x33, -0x10,0xc3,0x04,0x23,0xf3,0x4f,0xcb,0x02,0x1f,0x09,0x0c,0x00,0xa7,0x4f,0x84,0xff, -0xff,0xf8,0x07,0x00,0x44,0x23,0x80,0x30,0x42,0x01,0x23,0xe9,0x30,0x01,0x05,0x22, -0xe8,0x30,0x51,0x01,0x31,0xff,0xd8,0x30,0x10,0x05,0x00,0x09,0x00,0x12,0x0e,0x95, -0x01,0x22,0xd4,0x5b,0x08,0x00,0x33,0x70,0x01,0x6b,0x05,0x04,0x31,0x01,0x6e,0xff, -0xd9,0x06,0x11,0x1b,0x0f,0x00,0x00,0xee,0x06,0x53,0xfb,0x7c,0x70,0x00,0x09,0x0f, -0x06,0x00,0xc7,0x01,0x02,0xec,0x03,0x10,0x90,0xd9,0x03,0x02,0x37,0x04,0x00,0xb9, -0x01,0x17,0x60,0x29,0x04,0x1f,0x6f,0x0f,0x00,0x3d,0x12,0x4f,0x75,0x02,0x32,0xdc, -0x96,0x10,0x65,0x06,0x02,0x01,0x00,0x14,0xa1,0x19,0x00,0x00,0x01,0x00,0x17,0xe4, -0x19,0x00,0x27,0xff,0xf2,0x19,0x00,0x64,0xff,0xd0,0x04,0xff,0xff,0xfa,0x78,0x02, -0x26,0x40,0x4f,0xdb,0x07,0x14,0xfa,0xe4,0x06,0x00,0x6e,0x04,0x13,0xd0,0x19,0x00, -0x00,0xe3,0x00,0x23,0xff,0x14,0x19,0x00,0x00,0x1c,0x07,0x14,0xf2,0x19,0x00,0x00, -0x27,0x05,0x13,0x34,0x19,0x00,0x00,0x44,0x07,0x14,0xf4,0x19,0x00,0x00,0xbb,0x04, -0x1f,0x44,0x19,0x00,0x9b,0x11,0x40,0xd0,0x07,0x60,0x02,0x7b,0xdf,0xfe,0xc7,0x10, -0x8d,0x05,0x13,0xf5,0x05,0x06,0x12,0x70,0xe9,0x07,0x12,0x09,0x14,0x02,0x07,0x19, -0x00,0x27,0xff,0x20,0x19,0x00,0x12,0xfa,0x19,0x00,0x72,0x9d,0x84,0x47,0xff,0xff, -0xff,0xf0,0x4b,0x00,0x02,0x99,0x01,0x13,0x47,0x06,0x09,0x00,0xb3,0x03,0x14,0xf7, -0x34,0x08,0x00,0x54,0x00,0x14,0xa7,0x19,0x00,0x00,0xcb,0x08,0x04,0x19,0x00,0x00, -0x04,0x08,0x13,0xc7,0x19,0x00,0x00,0x0a,0x06,0x14,0xfd,0x19,0x00,0x00,0x81,0x07, -0x1e,0xe7,0x19,0x00,0x0b,0x32,0x00,0x00,0x5b,0x08,0x03,0x2f,0x02,0x01,0x64,0x00, -0x13,0x95,0x8e,0x02,0x00,0x7d,0x00,0x23,0xf6,0x4f,0xd0,0x07,0x00,0x61,0x06,0x13, -0x31,0x11,0x08,0x00,0x26,0x09,0x62,0xe0,0x0d,0xff,0xff,0xfd,0x20,0xce,0x01,0x10, -0xf9,0x36,0x00,0x51,0xff,0x95,0x44,0x69,0xef,0x21,0x00,0x15,0xef,0x33,0x02,0x17, -0x80,0x4d,0x02,0x11,0xb0,0xe7,0x02,0x05,0x7e,0x08,0x22,0x00,0x02,0xd2,0x04,0x21, -0xfc,0x40,0x6b,0x00,0x63,0x27,0xad,0xef,0xfe,0xdb,0x73,0x51,0x02,0x0f,0xab,0x03, -0x1b,0x42,0x02,0x22,0x22,0x10,0x6e,0x06,0x22,0xec,0x95,0xda,0x00,0x04,0xe2,0x09, -0x05,0x84,0x06,0x36,0xd2,0x00,0x2f,0x3e,0x05,0x16,0x2f,0x9f,0x00,0x01,0x26,0x08, -0x36,0x34,0x8d,0xff,0x30,0x05,0x12,0x8f,0x0e,0x09,0x03,0xfe,0x00,0x13,0xf8,0x0b, -0x00,0x14,0x05,0x8a,0x07,0x01,0x18,0x07,0x05,0x22,0x09,0x09,0x0b,0x00,0x1f,0xfd, -0x0b,0x00,0xea,0x00,0x28,0x04,0x02,0xc1,0x01,0x13,0x04,0x68,0x01,0x16,0x60,0x56, -0x04,0x16,0xb1,0x07,0x02,0x36,0xd1,0x00,0x4f,0x11,0x02,0x00,0x7d,0x01,0x26,0x59, -0xef,0xc6,0x06,0x16,0x9f,0x51,0x01,0x16,0x8f,0x3e,0x07,0x14,0xdf,0x9b,0x02,0x26, -0x00,0x07,0x87,0x01,0x03,0xdf,0x0b,0x0a,0x89,0x00,0x16,0x0f,0xc8,0x01,0x3e,0xef, -0xff,0xfe,0x15,0x00,0x06,0x2a,0x00,0x06,0x3f,0x00,0x11,0x07,0xee,0x08,0x0b,0x69, -0x00,0x06,0x7e,0x00,0x10,0x9f,0x3c,0x09,0x05,0xa8,0x00,0x15,0x40,0xbd,0x00,0x15, -0xa0,0xd2,0x00,0x15,0xc0,0xd2,0x00,0x14,0xa0,0xe7,0x00,0x22,0xfc,0x50,0xfc,0x00, -0x21,0xfe,0xda,0xd2,0x02,0x34,0x25,0x55,0x55,0xfd,0x07,0x14,0x08,0x5b,0x03,0x02, -0x65,0x00,0x1f,0x70,0x17,0x00,0x48,0x01,0x91,0x01,0x12,0x72,0xa6,0x0c,0x02,0x6e, -0x04,0x35,0x10,0x00,0x8f,0x06,0x03,0x14,0x10,0x17,0x00,0x00,0x73,0x01,0x16,0x8f, -0x68,0x08,0x21,0x01,0x33,0x13,0x03,0x26,0x7d,0xff,0x4f,0x08,0x13,0x0a,0xa8,0x0d, -0x03,0x50,0x04,0x05,0x4e,0x08,0x01,0x3a,0x0a,0x05,0x93,0x0c,0x2d,0xf0,0x00,0x7a, -0x01,0x26,0x00,0x2f,0x0c,0x0c,0x16,0x08,0x4d,0x03,0x13,0x01,0x07,0x0e,0x03,0x49, -0x04,0x13,0xd0,0x0b,0x00,0x14,0x7f,0x8f,0x04,0x01,0xad,0x06,0x04,0x08,0x02,0x15, -0x9f,0x2d,0x00,0x34,0x03,0xdf,0xff,0xec,0x00,0x24,0x19,0xff,0x9f,0x00,0x25,0x02, -0x9f,0x0b,0x00,0x15,0x6c,0x5a,0x04,0x01,0x22,0x0d,0x04,0xcc,0x01,0x10,0xdf,0xe2, -0x00,0x15,0x20,0x39,0x0d,0x15,0xe6,0xbd,0x00,0x25,0xfe,0x70,0xbd,0x00,0x15,0xc5, -0xa8,0x09,0x27,0xa7,0x20,0xd5,0x0c,0x01,0x53,0x0d,0x38,0xc8,0x50,0x00,0x1f,0x07, -0x18,0x91,0x0d,0x00,0x28,0xfe,0x30,0x20,0x07,0x18,0xe1,0x0d,0x00,0x10,0xfb,0x0d, -0x00,0x60,0xa3,0x33,0x33,0x33,0x47,0xcf,0x14,0x05,0x04,0x34,0x06,0x10,0x05,0x76, -0x04,0x08,0x41,0x06,0x14,0xc0,0x0d,0x00,0x00,0x2d,0x01,0x15,0xf0,0x0d,0x00,0x17, -0x0e,0x0d,0x00,0x00,0x89,0x04,0x15,0xf1,0x0d,0x00,0x18,0x0a,0x4a,0x07,0x0f,0x0d, -0x00,0x5c,0x11,0xa3,0x1d,0x02,0x12,0x3b,0x0d,0x00,0x06,0x25,0x08,0x0f,0x0d,0x00, -0x21,0x11,0xaf,0x1b,0x02,0x52,0x17,0xbe,0xff,0xec,0x83,0xfc,0x00,0x13,0xf3,0xa9, -0x02,0x11,0xb2,0x2c,0x02,0x32,0xfb,0x02,0xdf,0x29,0x00,0x02,0x69,0x09,0x13,0x4d, -0x37,0x00,0x11,0xf1,0x1c,0x02,0x07,0xd2,0x0e,0x02,0xea,0x01,0x31,0xc6,0x44,0x8f, -0x79,0x06,0x01,0x7f,0x03,0x00,0xbc,0x0c,0x11,0xef,0x2a,0x02,0x13,0xbf,0x1b,0x02, -0x11,0x6f,0xed,0x03,0x13,0x2f,0xa5,0x0d,0x02,0x44,0x10,0x04,0xdd,0x05,0x00,0x99, -0x08,0x01,0xd7,0x02,0x13,0xf1,0xe8,0x00,0x11,0xf4,0x30,0x00,0x13,0xb0,0xb4,0x02, -0x11,0xf5,0x46,0x00,0x13,0x50,0x29,0x04,0x11,0xf6,0xd5,0x08,0x15,0x10,0xcc,0x0d, -0x00,0x84,0x07,0x06,0xda,0x0d,0x14,0x09,0x80,0x03,0x01,0x0e,0x00,0x13,0x0d,0xdb, -0x0f,0x02,0x0e,0x00,0x05,0x38,0x03,0x01,0x0e,0x00,0x14,0x5f,0x18,0x03,0x01,0x0e, -0x00,0x14,0x9f,0xd7,0x02,0x01,0x0e,0x00,0x12,0xdf,0xc6,0x10,0x02,0x0e,0x00,0x20, -0x01,0xff,0x64,0x03,0x00,0x94,0x03,0x51,0x38,0xff,0xff,0xf6,0x06,0x6f,0x00,0x13, -0x07,0x61,0x0d,0x11,0x0a,0xc2,0x00,0x04,0x0e,0x00,0x11,0x0e,0xba,0x00,0x16,0x07, -0x7d,0x0d,0x16,0xf0,0x0e,0x00,0x02,0x00,0x01,0x04,0x0e,0x00,0x0f,0x35,0x0b,0x4b, -0x0f,0x51,0x0b,0x0a,0x61,0x03,0xff,0xff,0xfe,0xc8,0x30,0x7e,0x05,0x00,0xaa,0x03, -0x13,0x03,0x36,0x05,0x12,0x3f,0xea,0x01,0x13,0x03,0xd5,0x01,0x42,0x03,0x33,0x49, -0xff,0x2f,0x01,0x13,0x04,0x70,0x08,0x13,0x0c,0x95,0x07,0x12,0x8f,0xd5,0x03,0x16, -0x07,0xd4,0x0a,0x1a,0x70,0x3d,0x0b,0x0f,0x0f,0x00,0x29,0x52,0x71,0x33,0x33,0x33, -0x37,0x6e,0x09,0x00,0x01,0x00,0x12,0x77,0x07,0x00,0x0f,0x0f,0x00,0x04,0x14,0x70, -0xe4,0x08,0x32,0xed,0xb8,0x50,0x1c,0x11,0x04,0x13,0x04,0x18,0x80,0x0e,0x00,0x28, -0xff,0xfd,0x0e,0x09,0x00,0x23,0x04,0x28,0xef,0xff,0x24,0x04,0x52,0x23,0x34,0xff, -0xff,0xf3,0x78,0x11,0x00,0xeb,0x02,0x13,0x0a,0xcb,0x04,0x11,0x08,0x1f,0x01,0x14, -0x1f,0xc3,0x04,0x10,0xbf,0x25,0x05,0x14,0x6f,0x08,0x05,0x10,0x3f,0xac,0x02,0x14, -0xaf,0x54,0x10,0x10,0x0f,0xc0,0x02,0x04,0x38,0x12,0x02,0x75,0x02,0x05,0xaf,0x05, -0x10,0x0c,0xd0,0x05,0x09,0x0e,0x00,0x1e,0x02,0x1c,0x00,0x08,0x38,0x00,0x15,0xff, -0x33,0x0e,0x25,0xf2,0x00,0xfc,0x11,0x01,0xbb,0x02,0x05,0x1b,0x07,0x10,0x5f,0x8c, -0x00,0x14,0x9f,0xc0,0x02,0x10,0xbf,0xa8,0x00,0x13,0x6f,0xb9,0x05,0x11,0x04,0xc9, -0x07,0x10,0x0f,0x27,0x07,0x02,0x33,0x05,0x12,0xfe,0xa9,0x10,0x40,0xfb,0x64,0x34, -0x7c,0x79,0x02,0x02,0xe7,0x12,0x06,0x0e,0x0a,0x26,0x00,0x4f,0x8e,0x06,0x00,0x3f, -0x00,0x15,0xef,0x2e,0x08,0x05,0xe4,0x05,0x33,0xff,0xff,0xd5,0x8f,0x05,0x24,0x15, -0x9c,0x20,0x0a,0x05,0x89,0x12,0x00,0xc9,0x03,0x14,0x08,0x16,0x13,0x00,0xbd,0x00, -0x13,0x2f,0xc6,0x03,0x01,0xe2,0x03,0x13,0xcf,0xb2,0x00,0x00,0x87,0x00,0x02,0x39, -0x03,0x03,0xa4,0x14,0x12,0x1f,0xdc,0x07,0x02,0xc8,0x09,0x12,0xaf,0xe2,0x04,0x10, -0x3f,0x91,0x00,0x12,0x04,0x1f,0x08,0x11,0x05,0x43,0x04,0x12,0x0e,0xbf,0x03,0x02, -0x63,0x02,0x11,0x8f,0x58,0x06,0x02,0x9a,0x14,0x03,0x43,0x01,0x02,0xd1,0x0f,0x02, -0x99,0x02,0x03,0x96,0x14,0x10,0x6f,0xbe,0x01,0x02,0xf9,0x14,0x01,0xe4,0x06,0x05, -0x9d,0x07,0x10,0x0b,0x39,0x00,0x13,0x0e,0x53,0x08,0x00,0xfc,0x03,0x13,0x08,0x38, -0x04,0x00,0xcb,0x00,0x13,0x13,0xff,0x08,0x00,0x5f,0x00,0x15,0xf9,0x89,0x0a,0x14, -0x3f,0xe1,0x11,0x04,0xc3,0x06,0x03,0xf9,0x08,0x22,0x02,0x6d,0xc4,0x0a,0x55,0x00, -0x01,0xaa,0xbc,0xdf,0x3c,0x01,0x14,0x2f,0xca,0x07,0x11,0x10,0xa0,0x00,0x02,0xaa, -0x02,0x03,0x54,0x06,0x03,0xb5,0x06,0x04,0x19,0x00,0x13,0xb5,0x9a,0x07,0x47,0xfe, -0xdc,0xb8,0x63,0xa7,0x07,0x01,0x3e,0x0b,0x17,0x96,0x3f,0x00,0x47,0xff,0xff,0xa2, -0x00,0x2a,0x0b,0x16,0xf5,0x19,0x00,0x00,0x19,0x01,0x17,0x2f,0x16,0x0e,0x00,0x5e, -0x12,0x00,0xe8,0x06,0x10,0xdf,0xc9,0x00,0x12,0x2f,0xc2,0x02,0x00,0x0c,0x01,0x23, -0xfa,0x02,0xb5,0x00,0x00,0x2f,0x02,0x14,0xe0,0x19,0x00,0x00,0x47,0x00,0x04,0x19, -0x00,0x00,0x14,0x01,0x14,0xf1,0x19,0x00,0x00,0x52,0x01,0x14,0x22,0x19,0x00,0x00, -0x70,0x06,0x11,0x2f,0x4f,0x03,0x02,0x24,0x08,0x11,0x32,0x6b,0x00,0x12,0xe0,0xb6, -0x10,0x0f,0x19,0x00,0x12,0x11,0x30,0xab,0x06,0x16,0x20,0x63,0x15,0x04,0x6f,0x08, -0x04,0x7a,0x08,0x0f,0x19,0x00,0xae,0x17,0xef,0xf3,0x15,0x14,0xef,0x01,0x02,0x17, -0x40,0x7e,0x04,0x18,0xf9,0x8a,0x04,0x17,0xa0,0x0c,0x00,0x10,0xf6,0x0c,0x00,0x03, -0x76,0x04,0x14,0xfe,0x3d,0x04,0x10,0x0a,0x32,0x09,0x03,0x49,0x04,0x00,0x8c,0x01, -0x13,0xa0,0x0c,0x00,0x00,0x8b,0x02,0x14,0xe0,0x0c,0x00,0x00,0xb1,0x01,0x04,0x0c, -0x00,0x00,0x4d,0x12,0x12,0xef,0x25,0x10,0x01,0x9d,0x00,0x03,0x0c,0x00,0x00,0xc8, -0x02,0x1e,0xf4,0x0c,0x00,0x0a,0x24,0x00,0x00,0x3c,0x00,0x01,0xc5,0x12,0x11,0x30, -0x7c,0x04,0x1e,0xf1,0x5f,0x0a,0x02,0xc8,0x14,0x04,0xdd,0x12,0x16,0xff,0xe6,0x0a, -0x10,0x5f,0x82,0x07,0x01,0x3c,0x00,0x21,0x35,0x8d,0xe5,0x00,0x17,0xbf,0x5e,0x05, -0x06,0x0c,0x00,0x16,0x30,0x0c,0x00,0x16,0xd2,0x55,0x13,0x14,0xe7,0x6d,0x13,0x33, -0xfe,0xdb,0x84,0x74,0x0a,0x13,0xf3,0x00,0x05,0x23,0xf1,0x0c,0x1e,0x0c,0x00,0xce, -0x03,0x13,0x02,0xe5,0x15,0x01,0x3c,0x0c,0x03,0x0d,0x0c,0x10,0x2f,0x3d,0x04,0x12, -0x0d,0xba,0x03,0x13,0x3f,0x7f,0x18,0x24,0xff,0x50,0xfe,0x16,0x11,0x9f,0xc9,0x0a, -0x11,0x6f,0x29,0x04,0x11,0x1e,0xed,0x04,0x02,0xad,0x06,0x11,0x06,0x56,0x00,0x12, -0xbf,0x14,0x05,0x10,0xef,0x98,0x00,0x03,0x67,0x05,0x12,0x8f,0x18,0x10,0x13,0xfb, -0x63,0x01,0x22,0xa0,0x3f,0xef,0x03,0x00,0x73,0x00,0x14,0xe9,0x46,0x19,0x02,0xde, -0x08,0x02,0x88,0x05,0x02,0xc9,0x18,0x15,0xe3,0x99,0x17,0x35,0xff,0xf9,0x10,0x0c, -0x00,0x25,0xb6,0x10,0xb2,0x0e,0x08,0xec,0x13,0x0f,0x0c,0x00,0xb3,0x03,0x39,0x19, -0x01,0xfa,0x01,0x23,0xa0,0xaf,0x0a,0x08,0x01,0x43,0x1a,0x11,0xdf,0x35,0x19,0x02, -0x4b,0x01,0x13,0x03,0x54,0x06,0x01,0xa5,0x05,0x13,0x07,0xfe,0x0b,0x01,0x77,0x01, -0x03,0x76,0x1a,0x02,0xe9,0x09,0x12,0x1e,0xe5,0x01,0x11,0xef,0x3f,0x07,0x11,0x3f, -0x24,0x03,0x12,0x2f,0x74,0x05,0x01,0x7f,0x0c,0x13,0x06,0x81,0x04,0x10,0xbf,0x2d, -0x00,0x03,0xf4,0x06,0x00,0xb5,0x06,0x23,0xc1,0xaf,0x99,0x05,0x16,0x04,0x31,0x19, -0x04,0x5a,0x0d,0x14,0xf6,0x51,0x07,0x00,0x06,0x14,0x04,0xf4,0x1b,0x05,0x7f,0x0c, -0x02,0xe7,0x06,0x18,0xf9,0x39,0x19,0x04,0xe6,0x0c,0x04,0xd5,0x1a,0x05,0x58,0x10, -0x05,0x0b,0x0d,0x24,0x00,0x05,0xca,0x0c,0x05,0xff,0x19,0x04,0xd1,0x18,0x10,0x3e, -0x10,0x02,0x27,0x01,0xff,0x0d,0x16,0x16,0x1f,0x0d,0x00,0x27,0xf7,0x01,0x5e,0x08, -0x1f,0x70,0x19,0x00,0x06,0x13,0x5f,0xab,0x08,0x27,0xda,0x72,0x93,0x11,0x00,0x25, -0x0d,0x16,0x5f,0x25,0x00,0x27,0x40,0x05,0x32,0x00,0x17,0x10,0x19,0x00,0x32,0xf9, -0x01,0x33,0x23,0x0e,0x27,0x6b,0xff,0x66,0x16,0x18,0x06,0x2b,0x1a,0x16,0x0d,0x44, -0x11,0x01,0x19,0x03,0x05,0x37,0x1a,0x00,0x51,0x0b,0x44,0x02,0xaa,0xaa,0xa5,0x19, -0x00,0x05,0x45,0x14,0x00,0xf0,0x05,0x05,0x45,0x14,0x00,0x61,0x04,0x04,0x19,0x00, -0x00,0x69,0x03,0x04,0x19,0x00,0x10,0x0a,0xd5,0x06,0x03,0x19,0x00,0x10,0x02,0x96, -0x00,0x04,0x19,0x00,0x10,0xcf,0xfb,0x01,0x03,0x19,0x00,0x10,0x9f,0x53,0x01,0x03, -0x19,0x00,0x01,0x9a,0x12,0x02,0x19,0x00,0x21,0x01,0xaf,0x1a,0x06,0x01,0x19,0x00, -0x12,0x05,0x6d,0x09,0x01,0x19,0x00,0x11,0x0c,0xec,0x00,0x03,0x19,0x00,0x16,0xff, -0xbb,0x08,0x21,0x80,0x0f,0xde,0x0d,0x05,0x19,0x00,0x35,0xfb,0x10,0x00,0x19,0x00, -0x34,0xe5,0x00,0x00,0x19,0x00,0x04,0x44,0x0e,0x00,0x19,0x00,0x13,0x06,0xe5,0x00, -0x16,0x04,0xea,0x0e,0x03,0x7d,0x00,0x0f,0x19,0x00,0x33,0x0f,0xe3,0x12,0x0c,0x1f, -0xd1,0xe3,0x12,0x03,0x1f,0x70,0xe3,0x12,0x0d,0x1f,0xf7,0xe3,0x12,0x02,0x1f,0xfb, -0xe3,0x12,0xa8,0x12,0xbf,0x7c,0x03,0x01,0x0f,0x1e,0x00,0x4f,0x01,0x12,0xb8,0x80, -0x03,0x10,0x0b,0xec,0x05,0x00,0xa9,0x02,0x22,0xf9,0x5f,0x5f,0x05,0x10,0xcf,0x05, -0x04,0x00,0x0e,0x01,0x12,0x72,0x93,0x05,0x01,0xc5,0x10,0x00,0x66,0x02,0x22,0xf5, -0x0f,0x93,0x06,0x01,0xea,0x06,0x00,0x27,0x00,0x21,0x30,0xcf,0x4c,0x00,0x00,0x09, -0x1b,0x02,0x04,0x07,0x12,0x09,0xe2,0x17,0x02,0x1d,0x01,0x00,0x3e,0x00,0x01,0xfc, -0x09,0x01,0xc8,0x05,0x02,0x66,0x0a,0x11,0x03,0x93,0x00,0x02,0x4b,0x0a,0x01,0x13, -0x0a,0x02,0x24,0x0a,0x02,0x14,0x06,0x10,0x5f,0xdd,0x03,0x10,0xdf,0x84,0x02,0x02, -0x66,0x0a,0x10,0x07,0x4e,0x00,0x10,0x0a,0x4a,0x04,0x12,0x08,0xc0,0x08,0x00,0x34, -0x03,0x00,0x91,0x04,0x22,0x93,0x7c,0x88,0x06,0x01,0xbb,0x00,0x15,0x04,0xe6,0x06, -0x03,0xc0,0x04,0x14,0x1f,0x8e,0x09,0x01,0x73,0x00,0x14,0xe0,0xee,0x07,0x12,0xa2, -0x8f,0x03,0x12,0xfb,0x1b,0x06,0x33,0xfe,0xa6,0x10,0xd1,0x04,0x02,0xc8,0x0a,0x15, -0xa2,0x66,0x02,0x11,0xf3,0xa0,0x00,0x03,0xe9,0x01,0x03,0x18,0x05,0x14,0x2f,0x26, -0x02,0x13,0x3d,0x72,0x07,0x03,0xef,0x0e,0x22,0x04,0xaf,0x9e,0x04,0x00,0xe6,0x04, -0x55,0xf6,0x33,0x45,0x68,0xbe,0x05,0x05,0x27,0x9f,0xff,0x24,0x0a,0x03,0x09,0x04, -0x05,0x4a,0x18,0x06,0xca,0x0a,0x00,0x8a,0x00,0x14,0x71,0xa2,0x01,0x02,0xa5,0x02, -0x16,0x94,0x2e,0x04,0x56,0xee,0xdc,0xb9,0x86,0x31,0x07,0x12,0x02,0x2f,0x00,0x27, -0xc9,0x61,0x0e,0x00,0x02,0xa6,0x18,0x28,0x7f,0xff,0x7b,0x11,0x19,0x7f,0x59,0x0d, -0x19,0x7f,0xb0,0x1d,0x64,0x13,0x33,0x7f,0xff,0xff,0x83,0x7e,0x11,0x08,0x2b,0x0e, -0x25,0xff,0x70,0x0e,0x00,0x00,0x10,0x01,0x16,0xa0,0x0e,0x00,0x02,0x45,0x01,0x04, -0x0e,0x00,0x02,0x38,0x1b,0x04,0x0e,0x00,0x19,0x0c,0x0e,0x00,0x00,0x91,0x11,0x0f, -0x0e,0x00,0x2a,0x1f,0x60,0x0e,0x00,0x05,0x02,0x72,0x1d,0x04,0x0e,0x00,0x02,0x77, -0x02,0x03,0x0e,0x00,0x04,0x0d,0x0f,0x01,0x0e,0x00,0x24,0x24,0x8f,0xbc,0x0d,0x00, -0x0e,0x00,0x15,0xbf,0x20,0x0c,0x04,0x0e,0x00,0x19,0xf3,0x0e,0x00,0x18,0x90,0x0e, -0x00,0x26,0xf9,0x00,0x0e,0x00,0x36,0xfe,0xc8,0x20,0x0e,0x00,0xa0,0x00,0x05,0xaa, -0xaa,0xa3,0x00,0x09,0xaa,0xaa,0x90,0x8d,0x02,0x10,0xf1,0x10,0x01,0x12,0xa0,0x15, -0x21,0x10,0x4f,0x88,0x00,0x10,0x1f,0x9b,0x00,0x10,0x8f,0x76,0x00,0x10,0x5f,0x05, -0x00,0x10,0xbf,0x7e,0x04,0x12,0x8f,0x65,0x0a,0x10,0xf2,0xab,0x00,0x31,0xf3,0x00, -0x02,0x24,0x02,0x00,0x05,0x00,0x10,0x06,0xf1,0x00,0x10,0x03,0x05,0x00,0x10,0x09, -0x41,0x02,0x10,0x06,0xba,0x00,0x30,0x0c,0xff,0xfb,0xcc,0x06,0x10,0xfc,0x48,0x03, -0x10,0xf5,0xf7,0x01,0x10,0xf6,0x1d,0x02,0x10,0xf0,0x0f,0x00,0x10,0xf1,0xdb,0x01, -0x10,0xa0,0x96,0x02,0x80,0xa0,0x00,0x00,0xaf,0xff,0x40,0x00,0x00, +0x17,0x00,0x01,0x00,0x50,0x04,0x08,0xfe,0xf8,0x10,0x08,0x00,0xf0,0x05,0x04,0xfe, +0xf9,0x18,0x00,0x00,0x00,0x0a,0x08,0xfb,0xf8,0x40,0x00,0x00,0x00,0x08,0x03,0xfc, +0xfb,0x4c,0x08,0x00,0x42,0x05,0xfc,0xf9,0x60,0x20,0x00,0xf1,0x35,0x0d,0x68,0x00, +0x00,0x1e,0x1d,0x1b,0x01,0x00,0xf0,0x01,0x30,0x1c,0x1a,0x1b,0x01,0x00,0x4f,0x03, +0x10,0x15,0x13,0x1b,0x01,0x00,0x50,0x04,0xa0,0x19,0x19,0x1b,0x00,0x00,0xa2,0x05, +0xc0,0x1d,0x18,0x1b,0x03,0x00,0xe6,0x06,0x40,0x0d,0x07,0x1b,0x03,0x00,0x45,0x07, +0x10,0x10,0x0f,0x1c,0x01,0x00,0x17,0x08,0xd0,0x1e,0x19,0x1b,0x03,0x00,0x69,0x09, +0x40,0x08,0x00,0xf0,0x35,0xbb,0x0a,0x40,0x0d,0x07,0x0f,0x03,0x0c,0xf0,0x0a,0x60, +0x19,0x16,0x23,0x00,0xf8,0x71,0x0c,0x50,0x18,0x15,0x1b,0x01,0x00,0x8d,0x0d,0x30, +0x19,0x17,0x26,0x01,0xff,0x42,0x0f,0xb0,0x1f,0x1a,0x1b,0x03,0x00,0xa1,0x10,0xf0, +0x1f,0x1c,0x1b,0x01,0x00,0x1b,0x12,0x40,0x0d,0x07,0x23,0x03,0xf8,0x96,0x12,0x00, +0x13,0x0f,0x1b,0x01,0x00,0x61,0x13,0xc0,0x1e,0x18,0x00,0x40,0xdb,0x14,0x30,0x1b, +0x78,0x00,0xc0,0x2d,0x16,0xb0,0x1d,0x19,0x23,0x02,0xf8,0xe3,0x17,0xb0,0x1c,0x80, +0x00,0xc0,0x27,0x19,0x40,0x18,0x18,0x23,0x00,0xf8,0xcb,0x1a,0xd0,0x1a,0x20,0x00, +0x40,0x1d,0x1c,0xc0,0x1c,0x20,0x00,0xf0,0x04,0xd3,0x1d,0x60,0x19,0x16,0x1b,0x00, +0x00,0xfc,0x1e,0x70,0x23,0x21,0x1b,0x01,0x00,0xba,0x20,0x90,0x60,0x00,0x00,0xde, +0x00,0xf2,0x0a,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x3e,0xe3,0xaf,0xfa, +0x7f,0xf7,0x04,0x40,0x04,0x40,0x7f,0xf7,0xaf,0xfa,0x3e,0xd3,0x08,0x00,0xf0,0x23, +0x3d,0xd3,0x09,0xfa,0x00,0x9f,0x90,0x2f,0xff,0x32,0xff,0xf2,0x0e,0xfe,0x10,0xef, +0xe0,0x01,0x62,0x00,0x16,0x10,0x00,0x00,0x44,0x00,0x00,0x00,0x07,0xff,0x70,0x00, +0x00,0x0a,0xff,0xa0,0x00,0x00,0x03,0xed,0x30,0x00,0x24,0x44,0x44,0x42,0x8f,0xff, +0xff,0xf8,0x04,0x00,0x40,0x6c,0xcc,0xcc,0xc6,0x08,0x00,0x80,0x47,0x8f,0xf9,0x74, +0x00,0x2f,0xf3,0x00,0x04,0x00,0x03,0x58,0x00,0x61,0xe3,0x01,0xef,0xff,0xff,0xf2, +0x82,0x01,0xd0,0x1f,0xff,0xff,0xd0,0x00,0x03,0xff,0xff,0xff,0xc0,0x00,0x00,0x00, +0x09,0x00,0x10,0xfb,0x54,0x00,0x30,0xff,0xff,0x80,0x0f,0x00,0x20,0x4f,0xff,0x59, +0x00,0xf0,0x04,0x0b,0xff,0xff,0xff,0x30,0x00,0x00,0x00,0x06,0xff,0xff,0xf8,0x00, +0x00,0x00,0x1e,0xff,0xff,0xfe,0x1d,0x00,0x42,0x7f,0xff,0xff,0x70,0x24,0x00,0x80, +0xfa,0x00,0x00,0x00,0x09,0xff,0xff,0xf5,0x16,0x00,0x12,0x8f,0x08,0x00,0x40,0xbf, +0xff,0xff,0x20,0x0f,0x00,0x11,0xcf,0x68,0x00,0x51,0x0f,0xff,0xff,0xf0,0x00,0xad, +0x00,0x00,0x68,0x00,0x12,0x03,0x32,0x00,0x31,0x00,0x2d,0xff,0x68,0x00,0x30,0xaf, +0xff,0xff,0xf3,0x01,0x30,0x2e,0xff,0xff,0x68,0x00,0x12,0x3f,0x8a,0x00,0x11,0x0c, +0x0e,0x00,0x50,0xfe,0x2d,0xff,0xff,0xf4,0x21,0x01,0x41,0xff,0xff,0xfc,0x3f,0x12, +0x00,0x00,0x81,0x00,0x00,0x32,0x00,0x20,0x20,0x6f,0x0e,0x00,0x10,0xfb,0x0e,0x00, +0x10,0x0e,0xa5,0x00,0x13,0xaf,0x0e,0x00,0x00,0x5d,0x00,0x43,0xf6,0x00,0x01,0xef, +0x63,0x00,0x00,0xa5,0x00,0x10,0x30,0x3f,0x00,0x30,0xff,0x90,0x00,0x5f,0x02,0x01, +0x88,0x00,0x50,0x08,0xff,0xff,0xff,0x50,0x0f,0x00,0x32,0xef,0xff,0xfd,0x6b,0x00, +0x22,0xfe,0x10,0x0a,0x01,0x82,0xb0,0x00,0x00,0x00,0x2f,0xff,0xff,0xfc,0x73,0x00, +0x01,0x6c,0x00,0x12,0x6f,0x08,0x00,0x12,0x7f,0x33,0x00,0x00,0xd8,0x00,0x11,0xf3, +0x48,0x00,0x10,0xf3,0x0e,0x00,0x00,0x68,0x00,0x10,0xe1,0x48,0x00,0x12,0xff,0xce, +0x02,0x10,0xff,0x8b,0x00,0x01,0x52,0x01,0x12,0x00,0x13,0x01,0x33,0xff,0x60,0x04, +0x98,0x00,0x83,0x00,0x00,0x0d,0xff,0xff,0xff,0x20,0x7f,0x5a,0x01,0x01,0x68,0x00, +0x31,0xfd,0x00,0x03,0xd5,0x00,0x33,0xed,0xa7,0x30,0xbb,0x00,0x01,0x01,0x00,0x27, +0xfd,0x50,0x0d,0x00,0x28,0xff,0xfa,0x0d,0x00,0x28,0xff,0x90,0x0d,0x00,0x00,0x1b, +0x01,0x10,0x33,0x01,0x00,0x22,0x58,0xef,0xb5,0x00,0x02,0x01,0x00,0x10,0x0b,0x69, +0x00,0x05,0x0e,0x00,0x13,0xef,0xba,0x00,0x13,0x00,0x9e,0x01,0x03,0x7f,0x00,0x05, +0xde,0x01,0x03,0x01,0x00,0x03,0xfe,0x00,0x05,0x0d,0x00,0x15,0xc0,0x0d,0x00,0x1f, +0x0f,0x0d,0x00,0x59,0x22,0x03,0x33,0x01,0x00,0x52,0x3f,0xff,0xff,0xd3,0x32,0xf3, +0x01,0x03,0x07,0x01,0x0f,0x0d,0x00,0x21,0x64,0x00,0x9f,0xff,0xff,0xda,0x40,0x8c, +0x01,0x02,0xfb,0x00,0x20,0x9f,0xff,0x97,0x01,0x04,0x13,0x00,0x24,0xff,0x10,0x13, +0x00,0x10,0xf7,0xd0,0x01,0x35,0x33,0x35,0xcf,0x93,0x00,0x12,0xdf,0x1d,0x00,0x01, +0xf8,0x02,0x15,0xf6,0xa3,0x00,0x03,0x32,0x01,0x12,0xcf,0x04,0x03,0x01,0xd3,0x02, +0x12,0xf2,0x0a,0x00,0x11,0x3f,0x57,0x00,0x00,0x46,0x00,0x04,0x7d,0x02,0x22,0x5b, +0xff,0x0b,0x02,0x23,0x05,0xef,0x6a,0x00,0x02,0x73,0x00,0x12,0xf5,0x09,0x03,0x00, +0x91,0x00,0x00,0x2c,0x00,0x51,0xff,0xd7,0xef,0xff,0xfc,0x9b,0x01,0x20,0xb0,0x0b, +0xa0,0x02,0x10,0x0d,0x52,0x00,0x00,0xb8,0x02,0x10,0x02,0x3b,0x02,0x10,0x04,0x9a, +0x00,0x10,0x6f,0x6b,0x03,0x00,0x7d,0x00,0x02,0x79,0x02,0x30,0xdf,0xff,0xfe,0x9e, +0x00,0x01,0x50,0x00,0x11,0xf2,0xac,0x01,0x00,0x22,0x00,0xb0,0x54,0xff,0xff,0xf9, +0x00,0x00,0x02,0xff,0xff,0xf9,0x8f,0xf3,0x01,0x00,0x30,0x00,0x27,0xd0,0x2f,0x0e, +0x01,0x17,0x62,0x0c,0x00,0x1f,0xf6,0x19,0x00,0x12,0x13,0x60,0x8d,0x01,0x56,0xbf, +0xff,0xff,0x43,0x31,0x5d,0x02,0x03,0xf0,0x00,0x07,0xe6,0x03,0x0f,0x19,0x00,0xd8, +0x12,0xbf,0x99,0x04,0x22,0xca,0x72,0x1e,0x00,0x02,0x01,0x00,0x17,0xb3,0x0c,0x00, +0x27,0xff,0x50,0x0c,0x00,0x17,0xf4,0x0c,0x00,0x31,0xfd,0x00,0x23,0x4e,0x01,0x36, +0x46,0xbf,0xff,0x93,0x03,0x27,0x03,0xef,0x85,0x03,0x44,0x5f,0xff,0xff,0xe0,0x0c, +0x00,0x13,0x0e,0x33,0x05,0x04,0x7a,0x00,0x43,0x03,0x33,0x33,0x10,0xc3,0x04,0x23, +0xf3,0x4f,0xcb,0x02,0x1f,0x09,0x0c,0x00,0xa7,0x4f,0x84,0xff,0xff,0xf8,0x07,0x00, +0x44,0x23,0x80,0x30,0x42,0x01,0x23,0xe9,0x30,0x01,0x05,0x22,0xe8,0x30,0x51,0x01, +0x31,0xff,0xd8,0x30,0x10,0x05,0x00,0x09,0x00,0x12,0x0e,0x95,0x01,0x22,0xd4,0x5b, +0x08,0x00,0x33,0x70,0x01,0x6b,0x05,0x04,0x31,0x01,0x6e,0xff,0xd9,0x06,0x11,0x1b, +0x0f,0x00,0x00,0xee,0x06,0x53,0xfb,0x7c,0x70,0x00,0x09,0x0f,0x06,0x00,0xc7,0x01, +0x02,0xec,0x03,0x10,0x90,0xd9,0x03,0x02,0x37,0x04,0x00,0xb9,0x01,0x17,0x60,0x29, +0x04,0x1f,0x6f,0x0f,0x00,0x3d,0x12,0x4f,0x75,0x02,0x32,0xdc,0x96,0x10,0x65,0x06, +0x02,0x01,0x00,0x14,0xa1,0x19,0x00,0x00,0x01,0x00,0x17,0xe4,0x19,0x00,0x27,0xff, +0xf2,0x19,0x00,0x64,0xff,0xd0,0x04,0xff,0xff,0xfa,0x78,0x02,0x26,0x40,0x4f,0xdb, +0x07,0x14,0xfa,0xe4,0x06,0x00,0x6e,0x04,0x13,0xd0,0x19,0x00,0x00,0xe3,0x00,0x23, +0xff,0x14,0x19,0x00,0x00,0x1c,0x07,0x14,0xf2,0x19,0x00,0x00,0x27,0x05,0x13,0x34, +0x19,0x00,0x00,0x44,0x07,0x14,0xf4,0x19,0x00,0x00,0xbb,0x04,0x1f,0x44,0x19,0x00, +0x9b,0x11,0x40,0xd0,0x07,0x60,0x02,0x7b,0xdf,0xfe,0xc7,0x10,0x8d,0x05,0x13,0xf5, +0x05,0x06,0x12,0x70,0xe9,0x07,0x12,0x09,0x14,0x02,0x07,0x19,0x00,0x27,0xff,0x20, +0x19,0x00,0x12,0xfa,0x19,0x00,0x72,0x9d,0x84,0x47,0xff,0xff,0xff,0xf0,0x4b,0x00, +0x02,0x99,0x01,0x13,0x47,0x06,0x09,0x00,0xb3,0x03,0x14,0xf7,0x34,0x08,0x00,0x54, +0x00,0x14,0xa7,0x19,0x00,0x00,0xcb,0x08,0x04,0x19,0x00,0x00,0x04,0x08,0x13,0xc7, +0x19,0x00,0x00,0x0a,0x06,0x14,0xfd,0x19,0x00,0x00,0x81,0x07,0x1e,0xe7,0x19,0x00, +0x0b,0x32,0x00,0x00,0x5b,0x08,0x03,0x2f,0x02,0x01,0x64,0x00,0x13,0x95,0x8e,0x02, +0x00,0x7d,0x00,0x23,0xf6,0x4f,0xd0,0x07,0x00,0x61,0x06,0x13,0x31,0x11,0x08,0x00, +0x26,0x09,0x62,0xe0,0x0d,0xff,0xff,0xfd,0x20,0xce,0x01,0x10,0xf9,0x36,0x00,0x51, +0xff,0x95,0x44,0x69,0xef,0x21,0x00,0x15,0xef,0x33,0x02,0x17,0x80,0x4d,0x02,0x11, +0xb0,0xe7,0x02,0x05,0x7e,0x08,0x22,0x00,0x02,0xd2,0x04,0x21,0xfc,0x40,0x6b,0x00, +0x63,0x27,0xad,0xef,0xfe,0xdb,0x73,0x51,0x02,0x0f,0xab,0x03,0x1b,0x42,0x02,0x22, +0x22,0x10,0x6e,0x06,0x22,0xec,0x95,0xda,0x00,0x04,0xe2,0x09,0x05,0x84,0x06,0x36, +0xd2,0x00,0x2f,0x3e,0x05,0x16,0x2f,0x9f,0x00,0x01,0x26,0x08,0x36,0x34,0x8d,0xff, +0x30,0x05,0x12,0x8f,0x0e,0x09,0x03,0xfe,0x00,0x13,0xf8,0x0b,0x00,0x14,0x05,0x8a, +0x07,0x01,0x18,0x07,0x05,0x22,0x09,0x09,0x0b,0x00,0x1f,0xfd,0x0b,0x00,0xea,0x00, +0x28,0x04,0x02,0xc1,0x01,0x13,0x04,0x68,0x01,0x16,0x60,0x56,0x04,0x16,0xb1,0x07, +0x02,0x36,0xd1,0x00,0x4f,0x11,0x02,0x00,0x7d,0x01,0x26,0x59,0xef,0xc6,0x06,0x16, +0x9f,0x51,0x01,0x16,0x8f,0x3e,0x07,0x14,0xdf,0x9b,0x02,0x26,0x00,0x07,0x87,0x01, +0x03,0xdf,0x0b,0x0a,0x89,0x00,0x16,0x0f,0xc8,0x01,0x3e,0xef,0xff,0xfe,0x15,0x00, +0x06,0x2a,0x00,0x06,0x3f,0x00,0x11,0x07,0xee,0x08,0x0b,0x69,0x00,0x06,0x7e,0x00, +0x10,0x9f,0x3c,0x09,0x05,0xa8,0x00,0x15,0x40,0xbd,0x00,0x15,0xa0,0xd2,0x00,0x15, +0xc0,0xd2,0x00,0x14,0xa0,0xe7,0x00,0x22,0xfc,0x50,0xfc,0x00,0x21,0xfe,0xda,0xd2, +0x02,0x34,0x25,0x55,0x55,0xfd,0x07,0x14,0x08,0x5b,0x03,0x02,0x65,0x00,0x1f,0x70, +0x17,0x00,0x48,0x01,0x91,0x01,0x12,0x72,0xa6,0x0c,0x02,0x6e,0x04,0x35,0x10,0x00, +0x8f,0x06,0x03,0x14,0x10,0x17,0x00,0x00,0x73,0x01,0x16,0x8f,0x68,0x08,0x21,0x01, +0x33,0x13,0x03,0x26,0x7d,0xff,0x4f,0x08,0x13,0x0a,0xa8,0x0d,0x03,0x50,0x04,0x05, +0x4e,0x08,0x01,0x3a,0x0a,0x05,0x93,0x0c,0x2d,0xf0,0x00,0x7a,0x01,0x26,0x00,0x2f, +0x0c,0x0c,0x16,0x08,0x4d,0x03,0x13,0x01,0x07,0x0e,0x03,0x49,0x04,0x13,0xd0,0x0b, +0x00,0x14,0x7f,0x8f,0x04,0x01,0xad,0x06,0x04,0x08,0x02,0x15,0x9f,0x2d,0x00,0x34, +0x03,0xdf,0xff,0xec,0x00,0x24,0x19,0xff,0x9f,0x00,0x25,0x02,0x9f,0x0b,0x00,0x15, +0x6c,0x5a,0x04,0x01,0x22,0x0d,0x04,0xcc,0x01,0x10,0xdf,0xe2,0x00,0x15,0x20,0x39, +0x0d,0x15,0xe6,0xbd,0x00,0x25,0xfe,0x70,0xbd,0x00,0x15,0xc5,0xa8,0x09,0x27,0xa7, +0x20,0xd5,0x0c,0x01,0x53,0x0d,0x38,0xc8,0x50,0x00,0x1f,0x07,0x18,0x91,0x0d,0x00, +0x28,0xfe,0x30,0x20,0x07,0x18,0xe1,0x0d,0x00,0x10,0xfb,0x0d,0x00,0x60,0xa3,0x33, +0x33,0x33,0x47,0xcf,0x14,0x05,0x04,0x34,0x06,0x10,0x05,0x76,0x04,0x08,0x41,0x06, +0x14,0xc0,0x0d,0x00,0x00,0x2d,0x01,0x15,0xf0,0x0d,0x00,0x17,0x0e,0x0d,0x00,0x00, +0x89,0x04,0x15,0xf1,0x0d,0x00,0x18,0x0a,0x4a,0x07,0x0f,0x0d,0x00,0x5c,0x11,0xa3, +0x1d,0x02,0x12,0x3b,0x0d,0x00,0x06,0x25,0x08,0x0f,0x0d,0x00,0x21,0x11,0xaf,0x1b, +0x02,0x52,0x17,0xbe,0xff,0xec,0x83,0xfc,0x00,0x13,0xf3,0xa9,0x02,0x11,0xb2,0x2c, +0x02,0x32,0xfb,0x02,0xdf,0x29,0x00,0x02,0x69,0x09,0x13,0x4d,0x37,0x00,0x11,0xf1, +0x1c,0x02,0x07,0xd2,0x0e,0x02,0xea,0x01,0x31,0xc6,0x44,0x8f,0x79,0x06,0x01,0x7f, +0x03,0x00,0xbc,0x0c,0x11,0xef,0x2a,0x02,0x13,0xbf,0x1b,0x02,0x11,0x6f,0xed,0x03, +0x13,0x2f,0xa5,0x0d,0x02,0x44,0x10,0x04,0xdd,0x05,0x00,0x99,0x08,0x01,0xd7,0x02, +0x13,0xf1,0xe8,0x00,0x11,0xf4,0x30,0x00,0x13,0xb0,0xb4,0x02,0x11,0xf5,0x46,0x00, +0x13,0x50,0x29,0x04,0x11,0xf6,0xd5,0x08,0x15,0x10,0xcc,0x0d,0x00,0x84,0x07,0x06, +0xda,0x0d,0x14,0x09,0x80,0x03,0x01,0x0e,0x00,0x13,0x0d,0xdb,0x0f,0x02,0x0e,0x00, +0x05,0x38,0x03,0x01,0x0e,0x00,0x14,0x5f,0x18,0x03,0x01,0x0e,0x00,0x14,0x9f,0xd7, +0x02,0x01,0x0e,0x00,0x12,0xdf,0xc6,0x10,0x02,0x0e,0x00,0x20,0x01,0xff,0x64,0x03, +0x00,0x94,0x03,0x51,0x38,0xff,0xff,0xf6,0x06,0x6f,0x00,0x13,0x07,0x61,0x0d,0x11, +0x0a,0xc2,0x00,0x04,0x0e,0x00,0x11,0x0e,0xba,0x00,0x16,0x07,0x7d,0x0d,0x16,0xf0, +0x0e,0x00,0x02,0x00,0x01,0x04,0x0e,0x00,0x0f,0x35,0x0b,0x4b,0x0f,0x51,0x0b,0x0a, +0x61,0x03,0xff,0xff,0xfe,0xc8,0x30,0x7e,0x05,0x00,0xaa,0x03,0x13,0x03,0x36,0x05, +0x12,0x3f,0xea,0x01,0x13,0x03,0xd5,0x01,0x42,0x03,0x33,0x49,0xff,0x2f,0x01,0x13, +0x04,0x70,0x08,0x13,0x0c,0x95,0x07,0x12,0x8f,0xd5,0x03,0x16,0x07,0xd4,0x0a,0x1a, +0x70,0x3d,0x0b,0x0f,0x0f,0x00,0x29,0x52,0x71,0x33,0x33,0x33,0x37,0x6e,0x09,0x00, +0x01,0x00,0x12,0x77,0x07,0x00,0x0f,0x0f,0x00,0x04,0x14,0x70,0xe4,0x08,0x32,0xed, +0xb8,0x50,0x1c,0x11,0x04,0x13,0x04,0x18,0x80,0x0e,0x00,0x28,0xff,0xfd,0x0e,0x09, +0x00,0x23,0x04,0x28,0xef,0xff,0x24,0x04,0x52,0x23,0x34,0xff,0xff,0xf3,0x78,0x11, +0x00,0xeb,0x02,0x13,0x0a,0xcb,0x04,0x11,0x08,0x1f,0x01,0x14,0x1f,0xc3,0x04,0x10, +0xbf,0x25,0x05,0x14,0x6f,0x08,0x05,0x10,0x3f,0xac,0x02,0x14,0xaf,0x54,0x10,0x10, +0x0f,0xc0,0x02,0x04,0x38,0x12,0x02,0x75,0x02,0x05,0xaf,0x05,0x10,0x0c,0xd0,0x05, +0x09,0x0e,0x00,0x1e,0x02,0x1c,0x00,0x08,0x38,0x00,0x15,0xff,0x33,0x0e,0x25,0xf2, +0x00,0xfc,0x11,0x01,0xbb,0x02,0x05,0x1b,0x07,0x10,0x5f,0x8c,0x00,0x14,0x9f,0xc0, +0x02,0x10,0xbf,0xa8,0x00,0x13,0x6f,0xb9,0x05,0x11,0x04,0xc9,0x07,0x10,0x0f,0x27, +0x07,0x02,0x33,0x05,0x12,0xfe,0xa9,0x10,0x40,0xfb,0x64,0x34,0x7c,0x79,0x02,0x02, +0xe7,0x12,0x06,0x0e,0x0a,0x06,0x2f,0x05,0x11,0xfd,0xbb,0x15,0x15,0xef,0x2e,0x08, +0x05,0xe4,0x05,0x33,0xff,0xff,0xd5,0x8f,0x05,0x24,0x15,0x9c,0x20,0x0a,0x05,0x89, +0x12,0x00,0xc9,0x03,0x14,0x08,0x16,0x13,0x00,0xbd,0x00,0x13,0x2f,0xc6,0x03,0x01, +0xe2,0x03,0x13,0xcf,0xb2,0x00,0x00,0x87,0x00,0x02,0x39,0x03,0x03,0xa4,0x14,0x12, +0x1f,0xdc,0x07,0x02,0xc8,0x09,0x12,0xaf,0xe2,0x04,0x10,0x3f,0x91,0x00,0x12,0x04, +0x1f,0x08,0x11,0x05,0x43,0x04,0x12,0x0e,0xbf,0x03,0x02,0x63,0x02,0x11,0x8f,0x58, +0x06,0x02,0x9a,0x14,0x03,0x43,0x01,0x02,0xd1,0x0f,0x02,0x99,0x02,0x03,0x96,0x14, +0x10,0x6f,0xbe,0x01,0x02,0xf9,0x14,0x01,0xe4,0x06,0x05,0x9d,0x07,0x10,0x0b,0x39, +0x00,0x13,0x0e,0x53,0x08,0x00,0xfc,0x03,0x13,0x08,0x38,0x04,0x00,0xcb,0x00,0x13, +0x13,0xff,0x08,0x00,0x5f,0x00,0x15,0xf9,0x89,0x0a,0x14,0x3f,0xe1,0x11,0x04,0xc3, +0x06,0x03,0xf9,0x08,0x22,0x02,0x6d,0xc4,0x0a,0x55,0x00,0x01,0xaa,0xbc,0xdf,0x3c, +0x01,0x14,0x2f,0xca,0x07,0x11,0x10,0xa0,0x00,0x02,0xaa,0x02,0x03,0x54,0x06,0x03, +0xb5,0x06,0x04,0x19,0x00,0x13,0xb5,0x9a,0x07,0x47,0xfe,0xdc,0xb8,0x63,0xa7,0x07, +0x01,0x3e,0x0b,0x17,0x96,0x3f,0x00,0x47,0xff,0xff,0xa2,0x00,0x2a,0x0b,0x16,0xf5, +0x19,0x00,0x00,0x19,0x01,0x17,0x2f,0x16,0x0e,0x00,0x5e,0x12,0x00,0xe8,0x06,0x10, +0xdf,0xc9,0x00,0x12,0x2f,0xc2,0x02,0x00,0x0c,0x01,0x23,0xfa,0x02,0xb5,0x00,0x00, +0x2f,0x02,0x14,0xe0,0x19,0x00,0x00,0x47,0x00,0x04,0x19,0x00,0x00,0x14,0x01,0x14, +0xf1,0x19,0x00,0x00,0x52,0x01,0x14,0x22,0x19,0x00,0x00,0x70,0x06,0x11,0x2f,0x4f, +0x03,0x02,0x24,0x08,0x11,0x32,0x6b,0x00,0x12,0xe0,0xb6,0x10,0x0f,0x19,0x00,0x12, +0x11,0x30,0xab,0x06,0x16,0x20,0x63,0x15,0x04,0x6f,0x08,0x04,0x7a,0x08,0x0f,0x19, +0x00,0xae,0x17,0xef,0xf3,0x15,0x14,0xef,0x01,0x02,0x17,0x40,0x7e,0x04,0x18,0xf9, +0x8a,0x04,0x17,0xa0,0x0c,0x00,0x10,0xf6,0x0c,0x00,0x03,0x76,0x04,0x14,0xfe,0x3d, +0x04,0x10,0x0a,0x32,0x09,0x03,0x49,0x04,0x00,0x8c,0x01,0x13,0xa0,0x0c,0x00,0x00, +0x8b,0x02,0x14,0xe0,0x0c,0x00,0x00,0xb1,0x01,0x04,0x0c,0x00,0x00,0x4d,0x12,0x12, +0xef,0x25,0x10,0x01,0x9d,0x00,0x03,0x0c,0x00,0x00,0xc8,0x02,0x1e,0xf4,0x0c,0x00, +0x0a,0x24,0x00,0x00,0x3c,0x00,0x01,0xc5,0x12,0x11,0x30,0x7c,0x04,0x1e,0xf1,0x5f, +0x0a,0x02,0xc8,0x14,0x04,0xdd,0x12,0x16,0xff,0xe6,0x0a,0x10,0x5f,0x82,0x07,0x01, +0x3c,0x00,0x21,0x35,0x8d,0xe5,0x00,0x17,0xbf,0x5e,0x05,0x06,0x0c,0x00,0x16,0x30, +0x0c,0x00,0x16,0xd2,0x55,0x13,0x14,0xe7,0x6d,0x13,0x33,0xfe,0xdb,0x84,0x74,0x0a, +0x13,0xf3,0x00,0x05,0x23,0xf1,0x0c,0x1e,0x0c,0x00,0xce,0x03,0x13,0x02,0xe5,0x15, +0x01,0x3c,0x0c,0x03,0x0d,0x0c,0x10,0x2f,0x3d,0x04,0x12,0x0d,0xba,0x03,0x13,0x3f, +0x7f,0x18,0x24,0xff,0x50,0xfe,0x16,0x11,0x9f,0xc9,0x0a,0x11,0x6f,0x29,0x04,0x11, +0x1e,0xed,0x04,0x02,0xad,0x06,0x11,0x06,0x56,0x00,0x12,0xbf,0x14,0x05,0x10,0xef, +0x98,0x00,0x03,0x67,0x05,0x12,0x8f,0x18,0x10,0x13,0xfb,0x63,0x01,0x22,0xa0,0x3f, +0xef,0x03,0x00,0x73,0x00,0x14,0xe9,0x46,0x19,0x02,0xde,0x08,0x02,0x88,0x05,0x02, +0xc9,0x18,0x15,0xe3,0x99,0x17,0x35,0xff,0xf9,0x10,0x0c,0x00,0x25,0xb6,0x10,0xb2, +0x0e,0x08,0xec,0x13,0x0f,0x0c,0x00,0xb3,0x03,0x39,0x19,0x01,0xfa,0x01,0x23,0xa0, +0xaf,0x0a,0x08,0x01,0x43,0x1a,0x11,0xdf,0x35,0x19,0x02,0x4b,0x01,0x13,0x03,0x54, +0x06,0x01,0xa5,0x05,0x13,0x07,0xfe,0x0b,0x01,0x77,0x01,0x03,0x76,0x1a,0x02,0xe9, +0x09,0x12,0x1e,0xe5,0x01,0x11,0xef,0x3f,0x07,0x11,0x3f,0x24,0x03,0x12,0x2f,0x74, +0x05,0x01,0x7f,0x0c,0x13,0x06,0x81,0x04,0x10,0xbf,0x2d,0x00,0x03,0xf4,0x06,0x00, +0xb5,0x06,0x23,0xc1,0xaf,0x99,0x05,0x16,0x04,0x31,0x19,0x04,0x5a,0x0d,0x14,0xf6, +0x51,0x07,0x00,0x06,0x14,0x03,0xbd,0x00,0x15,0x1e,0x7f,0x0c,0x02,0xe7,0x06,0x18, +0xf9,0x39,0x19,0x04,0xe6,0x0c,0x04,0xd5,0x1a,0x05,0x58,0x10,0x05,0x0b,0x0d,0x24, +0x00,0x05,0xca,0x0c,0x05,0xff,0x19,0x04,0xd1,0x18,0x10,0x3e,0x10,0x02,0x27,0x01, +0xff,0x0d,0x16,0x16,0x1f,0x0d,0x00,0x27,0xf7,0x01,0x5e,0x08,0x1f,0x70,0x19,0x00, +0x06,0x13,0x5f,0xab,0x08,0x27,0xda,0x72,0x93,0x11,0x00,0x25,0x0d,0x16,0x5f,0x25, +0x00,0x27,0x40,0x05,0x32,0x00,0x17,0x10,0x19,0x00,0x32,0xf9,0x01,0x33,0x23,0x0e, +0x27,0x6b,0xff,0x66,0x16,0x18,0x06,0x2b,0x1a,0x16,0x0d,0x44,0x11,0x01,0x19,0x03, +0x05,0x37,0x1a,0x00,0x51,0x0b,0x44,0x02,0xaa,0xaa,0xa5,0x19,0x00,0x05,0x45,0x14, +0x00,0xf0,0x05,0x05,0x45,0x14,0x00,0x61,0x04,0x04,0x19,0x00,0x00,0x69,0x03,0x04, +0x19,0x00,0x10,0x0a,0xd5,0x06,0x03,0x19,0x00,0x10,0x02,0x96,0x00,0x04,0x19,0x00, +0x10,0xcf,0xfb,0x01,0x03,0x19,0x00,0x10,0x9f,0x53,0x01,0x03,0x19,0x00,0x01,0x9a, +0x12,0x02,0x19,0x00,0x21,0x01,0xaf,0x1a,0x06,0x01,0x19,0x00,0x12,0x05,0x6d,0x09, +0x01,0x19,0x00,0x11,0x0c,0xec,0x00,0x03,0x19,0x00,0x16,0xff,0xbb,0x08,0x21,0x80, +0x0f,0xde,0x0d,0x05,0x19,0x00,0x35,0xfb,0x10,0x00,0x19,0x00,0x34,0xe5,0x00,0x00, +0x19,0x00,0x04,0x44,0x0e,0x00,0x19,0x00,0x14,0x06,0x8b,0x1e,0x06,0xea,0x0e,0x03, +0x7d,0x00,0x0f,0x19,0x00,0x33,0x0f,0xe3,0x12,0x0c,0x1f,0xd1,0xe3,0x12,0x03,0x1f, +0x70,0xe3,0x12,0x0d,0x1f,0xf7,0xe3,0x12,0x02,0x1f,0xfb,0xe3,0x12,0xa8,0x12,0xbf, +0x7c,0x03,0x01,0x0f,0x1e,0x00,0x4f,0x01,0x12,0xb8,0x80,0x03,0x10,0x0b,0xec,0x05, +0x00,0xa9,0x02,0x22,0xf9,0x5f,0x5f,0x05,0x10,0xcf,0x05,0x04,0x00,0x0e,0x01,0x12, +0x72,0x93,0x05,0x01,0xc5,0x10,0x00,0x66,0x02,0x22,0xf5,0x0f,0x93,0x06,0x01,0xea, +0x06,0x00,0x27,0x00,0x21,0x30,0xcf,0x4c,0x00,0x00,0x09,0x1b,0x02,0x04,0x07,0x12, +0x09,0xe2,0x17,0x02,0x1d,0x01,0x00,0x3e,0x00,0x01,0xfc,0x09,0x01,0xc8,0x05,0x02, +0x66,0x0a,0x11,0x03,0x93,0x00,0x02,0x4b,0x0a,0x01,0x13,0x0a,0x02,0x24,0x0a,0x02, +0x14,0x06,0x10,0x5f,0xdd,0x03,0x10,0xdf,0x84,0x02,0x02,0x66,0x0a,0x10,0x07,0x4e, +0x00,0x10,0x0a,0x4a,0x04,0x12,0x08,0xc0,0x08,0x00,0x34,0x03,0x00,0x91,0x04,0x22, +0x93,0x7c,0x88,0x06,0x01,0xbb,0x00,0x15,0x04,0xe6,0x06,0x03,0xc0,0x04,0x14,0x1f, +0x8e,0x09,0x01,0x73,0x00,0x14,0xe0,0xee,0x07,0x12,0xa2,0x8f,0x03,0x12,0xfb,0x1b, +0x06,0x33,0xfe,0xa6,0x10,0xd1,0x04,0x02,0xc8,0x0a,0x15,0xa2,0x66,0x02,0x11,0xf3, +0xa0,0x00,0x03,0xe9,0x01,0x03,0x18,0x05,0x14,0x2f,0x26,0x02,0x13,0x3d,0x72,0x07, +0x03,0xef,0x0e,0x22,0x04,0xaf,0x9e,0x04,0x00,0xe6,0x04,0x55,0xf6,0x33,0x45,0x68, +0xbe,0x05,0x05,0x27,0x9f,0xff,0x24,0x0a,0x03,0x09,0x04,0x05,0x4a,0x18,0x06,0xca, +0x0a,0x00,0x8a,0x00,0x14,0x71,0xa2,0x01,0x02,0xa5,0x02,0x16,0x94,0x2e,0x04,0x56, +0xee,0xdc,0xb9,0x86,0x31,0x07,0x12,0x02,0x2f,0x00,0x27,0xc9,0x61,0x0e,0x00,0x02, +0xa6,0x18,0x28,0x7f,0xff,0x7b,0x11,0x19,0x7f,0x59,0x0d,0x19,0x7f,0xb0,0x1d,0x64, +0x13,0x33,0x7f,0xff,0xff,0x83,0x7e,0x11,0x08,0x2b,0x0e,0x25,0xff,0x70,0x0e,0x00, +0x00,0x10,0x01,0x16,0xa0,0x0e,0x00,0x02,0x45,0x01,0x04,0x0e,0x00,0x02,0x38,0x1b, +0x04,0x0e,0x00,0x19,0x0c,0x0e,0x00,0x00,0x91,0x11,0x0f,0x0e,0x00,0x2a,0x1f,0x60, +0x0e,0x00,0x05,0x02,0x72,0x1d,0x04,0x0e,0x00,0x02,0x77,0x02,0x03,0x0e,0x00,0x04, +0x0d,0x0f,0x01,0x0e,0x00,0x24,0x24,0x8f,0xbc,0x0d,0x00,0x0e,0x00,0x15,0xbf,0x20, +0x0c,0x04,0x0e,0x00,0x19,0xf3,0x0e,0x00,0x18,0x90,0x0e,0x00,0x26,0xf9,0x00,0x0e, +0x00,0xd0,0xfe,0xc8,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x0b,0xff,0xff,0xf1, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_bold_XL __FLASH = { -.uncomp_size = 9024, -.comp_size = 3565, +.uncomp_size = 9040, +.comp_size = 3599, .line_height = 45, .base_line = 8, .subpx = 0, @@ -247,11 +249,11 @@ const etxLz4Font lv_font_he_bold_XL __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 9192, +.lvglFontBufSize = 9208, }; diff --git a/radio/src/fonts/lvgl/sml/lv_font_he_L.c b/radio/src/fonts/lvgl/sml/lv_font_he_L.c index b480b7336..08ac55a23 100644 --- a/radio/src/fonts/lvgl/sml/lv_font_he_L.c +++ b/radio/src/fonts/lvgl/sml/lv_font_he_L.c @@ -2,102 +2,105 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x0b,0xf0,0x0b,0x0c,0x0b,0x00,0x00,0x42,0x00,0x60,0x0b, -0x0b,0x0b,0x00,0x00,0x7f,0x00,0x10,0x08,0x08,0x0b,0x00,0x00,0xab,0x00,0x80,0x0a, -0x10,0x00,0xf1,0x0c,0xe8,0x00,0x10,0x0c,0x0a,0x0b,0x01,0x00,0x1f,0x01,0xf0,0x04, -0x03,0x0b,0x01,0x00,0x30,0x01,0x20,0x06,0x06,0x0c,0x00,0x00,0x54,0x01,0x80,0x18, -0x00,0x90,0x8b,0x01,0x60,0x0c,0x0b,0x0b,0x01,0x00,0xc8,0x20,0x00,0xf1,0x0f,0x06, -0x01,0x05,0xd1,0x01,0x20,0x0a,0x09,0x0f,0x00,0xfc,0x15,0x02,0x00,0x0a,0x09,0x0b, -0x00,0x00,0x47,0x02,0x10,0x0a,0x0a,0x10,0x00,0xff,0x97,0x02,0xe0,0x28,0x00,0x40, -0xd4,0x02,0x10,0x0d,0x70,0x00,0xf0,0x05,0x16,0x03,0xf0,0x04,0x03,0x0f,0x01,0xfc, -0x2d,0x03,0x60,0x07,0x06,0x0b,0x00,0x00,0x4e,0x03,0x70,0x0c,0x18,0x00,0x31,0x90, -0x03,0x10,0x88,0x00,0xc0,0xcd,0x03,0xd0,0x0b,0x0a,0x0f,0x01,0xfc,0x18,0x04,0x90, -0x0b,0x68,0x00,0xf1,0x04,0x4f,0x04,0x90,0x09,0x0a,0x0f,0x00,0xfc,0x9a,0x04,0x60, -0x0a,0x0a,0x0b,0x00,0x00,0xd1,0x04,0x30,0x20,0x00,0x31,0x1c,0x05,0x20,0x68,0x00, -0xb1,0x4e,0x05,0xe0,0x0d,0x0e,0x0b,0x00,0x00,0x9b,0x05,0x20,0x60,0x00,0xf0,0x28, -0xdd,0x05,0x70,0x0b,0x08,0x06,0x02,0x0a,0x07,0xfa,0x00,0x00,0x0b,0xf0,0x00,0xbf, -0x60,0x00,0x0d,0xe0,0x00,0x1e,0xf2,0x00,0x0f,0xc0,0x00,0x07,0xfd,0x00,0x4f,0x80, -0x00,0x7f,0xcf,0xa0,0xbf,0x20,0x01,0xfb,0x0a,0xfb,0xf6,0x00,0x06,0xf5,0x00,0xdf, -0x90,0x00,0x0a,0xf2,0x00,0x2f,0xe1,0x26,0x00,0xf0,0x0a,0x06,0xfb,0x00,0x1f,0xb0, -0x00,0x00,0xaf,0x80,0x4f,0x80,0x00,0x00,0x0d,0xf4,0x0c,0xff,0xff,0xc7,0x00,0x00, -0x79,0x99,0xae,0xfa,0x2e,0x01,0x20,0x0c,0xf2,0x06,0x00,0x70,0x6f,0x60,0x00,0x00, -0x00,0x04,0xf7,0x0b,0x00,0x2c,0x4f,0x70,0x0b,0x00,0xf0,0x07,0x02,0x99,0x99,0x99, -0xaf,0xc6,0x3f,0xff,0xff,0xff,0xff,0xb0,0x0c,0xfe,0x60,0x00,0x07,0x9e,0xf2,0x00, -0x00,0x05,0x22,0x00,0xf0,0x10,0xfc,0x00,0x00,0x00,0xbf,0x00,0x00,0x06,0xdf,0x30, -0x01,0xdf,0xaf,0x70,0x09,0xf3,0x0f,0xb0,0x0e,0xd0,0x0b,0xf0,0x1f,0x90,0x07,0xf3, -0x5f,0x60,0x04,0xf6,0xaf,0x32,0x00,0xa0,0x05,0x99,0x99,0x9a,0xfd,0x90,0x00,0x00, -0x00,0x2f,0x05,0x00,0x3f,0x02,0xf9,0x00,0x0b,0x00,0x14,0xa0,0x9f,0xff,0xff,0xd7, -0x00,0x59,0x99,0x9a,0xdf,0xb0,0xa5,0x00,0xbf,0xf3,0x26,0x10,0x00,0x05,0xf7,0x6f, -0x40,0x00,0x03,0xf8,0x05,0x00,0x0c,0x29,0x56,0xf5,0x03,0x00,0xfe,0x04,0x50,0x33, -0x00,0x00,0x8f,0xd8,0x30,0x29,0xef,0xfc,0x00,0x1d,0xec,0x00,0xbe,0x10,0x00,0xfb, -0x00,0x03,0x00,0xf0,0x05,0x6f,0xff,0xff,0xea,0x30,0x6f,0xb9,0x99,0xbf,0xf3,0x6f, -0x50,0x00,0x05,0xfb,0x6f,0x50,0x00,0x00,0xee,0x05,0x00,0x10,0xcf,0x05,0x00,0x1f, -0xbf,0x05,0x00,0x06,0xf0,0x07,0x7f,0x30,0x0c,0xff,0xb1,0x07,0xf3,0x00,0xb7,0xaf, -0xc0,0x7f,0x30,0x00,0x00,0xcf,0x27,0xf3,0x00,0x00,0x08,0xf4,0x0b,0x00,0xf0,0x05, -0x6f,0x57,0xf3,0x00,0x00,0x07,0xf5,0x7f,0x40,0x00,0x00,0x8f,0x46,0xf6,0x00,0x00, -0x0c,0xf1,0x2f,0xd1,0x87,0x01,0xb5,0xaf,0xea,0xad,0xfe,0x20,0x00,0x7d,0xff,0xd9, -0x20,0x00,0xa3,0x00,0x90,0xaf,0xff,0xfd,0x80,0x05,0x99,0x9a,0xdf,0xc0,0x4c,0x01, -0xe0,0x40,0x00,0x00,0x04,0xf8,0x00,0x00,0x00,0x1f,0x90,0x00,0x00,0x01,0xfa,0x09, -0x00,0x1f,0xa0,0x09,0x00,0x11,0xf3,0x0c,0x4f,0xff,0xfc,0x60,0x02,0x99,0x9b,0xef, -0xb0,0x00,0x00,0x01,0xbf,0x60,0x00,0x00,0x02,0xfb,0x00,0x00,0x00,0x0e,0xe0,0x00, -0x00,0x00,0xce,0x09,0x00,0x01,0x12,0x00,0x20,0xbf,0x62,0x24,0x00,0x00,0x2d,0x00, -0x7b,0x00,0x5e,0x50,0x00,0x00,0x00,0x5f,0x05,0x00,0xf1,0x05,0xff,0xff,0xd8,0x00, -0x39,0x99,0x99,0xdf,0xa0,0x00,0x00,0x00,0x0d,0xf0,0x00,0x00,0x00,0x09,0xf1,0x00, -0x6e,0x02,0x30,0x00,0x00,0x0f,0x9f,0x00,0x60,0x9f,0x50,0x00,0x00,0x06,0xfb,0x09, -0x00,0xe0,0xd1,0x00,0x00,0x6d,0xfc,0x10,0x00,0x03,0xff,0x70,0x00,0x00,0x02,0x71, -0x41,0x02,0xa0,0xff,0xff,0xfc,0x60,0x06,0xfb,0x99,0x9a,0xef,0x90,0x1c,0x01,0x70, -0xdf,0x16,0xf5,0x00,0x00,0x07,0xf4,0x0b,0x00,0x7d,0x5f,0x56,0xf5,0x00,0x00,0x05, -0xf5,0x0b,0x00,0x60,0xfb,0x99,0x99,0x9b,0xf5,0x6f,0x23,0x02,0xf0,0x07,0x50,0x2f, -0xc0,0x19,0xef,0xd7,0x00,0x08,0xf6,0xdf,0xba,0xef,0x90,0x00,0xdf,0xf5,0x00,0x1d, -0xf1,0x00,0x5f,0xb0,0xc6,0x02,0x20,0x7f,0x40,0x8a,0x02,0x70,0xde,0x00,0x00,0x03, -0xf8,0x01,0xfa,0x06,0x00,0x20,0x06,0xf6,0x06,0x00,0x20,0x0a,0xf2,0x06,0x00,0xbd, -0x0e,0xe0,0x00,0x99,0x9a,0xf8,0x2f,0xa0,0x00,0xff,0xff,0xf7,0x01,0x03,0xfd,0x01, -0xf5,0x03,0x0c,0xfe,0x90,0x07,0x9d,0xf6,0x00,0x01,0xfb,0x00,0x00,0xed,0x00,0x00, -0xdd,0x00,0x00,0xde,0x03,0x00,0x80,0x39,0x99,0xee,0x5f,0xff,0xfe,0x8f,0xff,0x0d, -0x03,0xf0,0x0b,0x49,0xfd,0x99,0x9a,0xef,0xa0,0x04,0xf5,0x00,0x00,0x0e,0xf2,0x09, -0xf2,0x00,0x00,0x08,0xf5,0x0b,0xf1,0x00,0x00,0x06,0xf6,0x0c,0xf0,0x06,0x00,0x11, -0x0b,0x12,0x00,0xf0,0x1c,0x08,0xf6,0x00,0x00,0x0b,0xf2,0x03,0xfe,0x20,0x00,0x5f, -0xc0,0x00,0xaf,0xfb,0xac,0xfe,0x20,0x00,0x06,0xcf,0xfd,0x91,0x00,0x0d,0xf1,0x00, -0x00,0xbf,0x10,0x7f,0x60,0x00,0x0b,0xf1,0x01,0xfc,0x00,0x00,0xcf,0x00,0x0a,0xf2, -0x74,0x03,0x20,0x4f,0x80,0x5b,0x02,0x10,0xee,0x43,0x03,0x20,0x08,0xf4,0x42,0x00, -0x20,0x1f,0xa6,0xda,0x02,0xc0,0xcf,0xfc,0x00,0x07,0xcd,0xff,0xf9,0x00,0x00,0x9f, -0xdb,0x72,0x0f,0x00,0xff,0x16,0xff,0xfe,0xc5,0x00,0xcf,0x99,0x9a,0xef,0x70,0xcf, -0x00,0x00,0x1e,0xf0,0xcf,0x00,0x00,0x08,0xf3,0xcf,0x00,0x00,0x06,0xf4,0xcf,0xff, -0x30,0x06,0xf5,0x79,0x99,0x20,0x06,0xf5,0x00,0x00,0x00,0x05,0x00,0x12,0xf4,0x0f, -0xaf,0xff,0xff,0xc5,0x00,0xaf,0x99,0x9b,0xff,0x80,0xaf,0x10,0x00,0x1d,0xf2,0xaf, -0x10,0x00,0x06,0xf6,0xaf,0x99,0x20,0x03,0xf8,0xaf,0xff,0x50,0x03,0xf8,0xd3,0x03, -0x10,0x08,0x2d,0x00,0xf3,0x1f,0x3f,0xf0,0x59,0x99,0x9c,0xff,0x50,0x9f,0xff,0xfe, -0xa3,0x00,0x9f,0x60,0x00,0x0b,0xf0,0x0e,0xf1,0x00,0x0c,0xf0,0x04,0xf9,0x00,0x0e, -0xd0,0x00,0xcf,0x20,0x1f,0xb0,0x00,0x4f,0x70,0x8f,0x60,0x00,0x0f,0xc9,0xfc,0x00, -0x00,0x0f,0xfd,0x70,0xfc,0x01,0x0f,0x05,0x00,0x0f,0x70,0x8f,0x90,0x00,0x09,0xf2, -0x0b,0xf6,0x09,0x01,0xf0,0x03,0xef,0x20,0x0d,0xf0,0x00,0x3f,0xd0,0x2f,0xb0,0x00, -0x06,0xfb,0xdf,0x30,0x00,0x00,0xaf,0xd3,0x52,0x02,0x10,0xf3,0xe0,0x03,0x20,0xfe, -0x10,0x6a,0x02,0x60,0xb0,0x29,0x99,0x99,0x9e,0xf6,0x53,0x04,0x20,0xf8,0xdf,0x76, -0x02,0x13,0x79,0xe9,0x03,0x20,0x0d,0xf1,0x76,0x02,0xf0,0x00,0xf2,0x6f,0x50,0x00, -0x09,0xf1,0x6f,0x50,0x00,0x0c,0xe0,0x6f,0x50,0x00,0x2f,0x52,0x02,0xf0,0x07,0xcf, -0x20,0x6f,0x50,0x0b,0xf7,0x00,0x6f,0x54,0xef,0x90,0x00,0x6f,0x59,0xf7,0x00,0x00, -0x6f,0x54,0x10,0x00,0x00,0x4a,0x02,0x07,0x05,0x00,0x08,0x4b,0x03,0x20,0xaf,0x50, -0x24,0x02,0x0f,0x4b,0x03,0x0d,0xf0,0x22,0x6f,0x50,0x00,0xde,0x00,0x0c,0xf0,0x3f, -0x80,0x00,0xec,0x00,0x0e,0xd0,0x0f,0xc0,0x00,0xfb,0x00,0x0f,0xb0,0x0d,0xf0,0x01, -0xf9,0x00,0x2f,0x90,0x0a,0xf2,0x07,0xf6,0x00,0x5f,0x70,0x07,0xfa,0xbf,0xe1,0x00, -0x7f,0x50,0x04,0xff,0xc8,0x20,0x00,0xaf,0x20,0xf3,0x04,0xe0,0x02,0xfd,0x00,0x00, -0xdf,0x00,0x00,0x4d,0xf6,0x00,0x00,0xaf,0xcc,0xdf,0x03,0x03,0x41,0x7f,0xfe,0xdb, -0x82,0x40,0x03,0x00,0x41,0x03,0x20,0xdf,0xa9,0x82,0x00,0x50,0x9f,0x20,0x00,0x0a, -0xf4,0x06,0x00,0x20,0x03,0xf8,0x06,0x00,0x2a,0x01,0xf9,0x06,0x00,0x10,0x10,0x06, -0x00,0x70,0xcf,0x00,0x00,0x01,0xf9,0x4c,0xfb,0x06,0x00,0x20,0x6e,0xb1,0x06,0x00, -0xf0,0x09,0x0d,0xf3,0x0b,0xf6,0x0f,0xe0,0x0e,0xf0,0x4f,0x80,0x2f,0xa0,0x7f,0x20, -0x5f,0x40,0xbc,0x00,0x8e,0x00,0xe7,0x00,0xc9,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x05,0xff,0xfc,0x05,0x08,0x00,0xc0,0x03,0xff,0xfc, +0x08,0x00,0x00,0x00,0x04,0x05,0xfe,0xfc,0x12,0x08,0x00,0x40,0x01,0xfe,0xfe,0x14, +0x08,0x00,0x42,0x03,0xfe,0xfc,0x1a,0x20,0x00,0xf0,0x0e,0x05,0x1d,0x00,0xf0,0x0b, +0x0c,0x0b,0x00,0x00,0x5f,0x00,0x60,0x0b,0x0b,0x0b,0x00,0x00,0x9c,0x00,0x10,0x08, +0x08,0x0b,0x00,0x00,0xc8,0x00,0x80,0x0a,0x10,0x00,0xf1,0x0c,0x05,0x01,0x10,0x0c, +0x0a,0x0b,0x01,0x00,0x3c,0x01,0xf0,0x04,0x03,0x0b,0x01,0x00,0x4d,0x01,0x20,0x06, +0x06,0x0c,0x00,0x00,0x71,0x01,0x80,0x18,0x00,0x90,0xa8,0x01,0x60,0x0c,0x0b,0x0b, +0x01,0x00,0xe5,0x20,0x00,0xf1,0x0f,0x06,0x01,0x05,0xee,0x01,0x20,0x0a,0x09,0x0f, +0x00,0xfc,0x32,0x02,0x00,0x0a,0x09,0x0b,0x00,0x00,0x64,0x02,0x10,0x0a,0x0a,0x10, +0x00,0xff,0xb4,0x02,0xe0,0x28,0x00,0x40,0xf1,0x02,0x10,0x0d,0x70,0x00,0xf0,0x05, +0x33,0x03,0xf0,0x04,0x03,0x0f,0x01,0xfc,0x4a,0x03,0x60,0x07,0x06,0x0b,0x00,0x00, +0x6b,0x03,0x70,0x0c,0x18,0x00,0x31,0xad,0x03,0x10,0x88,0x00,0xc0,0xea,0x03,0xd0, +0x0b,0x0a,0x0f,0x01,0xfc,0x35,0x04,0x90,0x0b,0x68,0x00,0xf1,0x04,0x6c,0x04,0x90, +0x09,0x0a,0x0f,0x00,0xfc,0xb7,0x04,0x60,0x0a,0x0a,0x0b,0x00,0x00,0xee,0x04,0x30, +0x20,0x00,0x31,0x39,0x05,0x20,0x68,0x00,0xb0,0x6b,0x05,0xe0,0x0d,0x0e,0x0b,0x00, +0x00,0xb8,0x05,0x20,0x60,0x00,0x00,0xe6,0x00,0xf0,0x46,0x00,0x06,0x00,0x07,0x00, +0x08,0x00,0x0c,0x00,0x00,0xaa,0x22,0xaa,0x11,0x00,0xaa,0x11,0x00,0x00,0xb8,0x8b, +0x21,0x12,0x0a,0xa0,0x01,0x10,0x8f,0xf8,0x8f,0xf8,0x07,0x80,0x00,0x00,0x00,0xaa, +0x11,0x07,0xfa,0x00,0x00,0x0b,0xf0,0x00,0xbf,0x60,0x00,0x0d,0xe0,0x00,0x1e,0xf2, +0x00,0x0f,0xc0,0x00,0x07,0xfd,0x00,0x4f,0x80,0x00,0x7f,0xcf,0xa0,0xbf,0x20,0x01, +0xfb,0x0a,0xfb,0xf6,0x00,0x06,0xf5,0x00,0xdf,0x90,0x00,0x0a,0xf2,0x00,0x2f,0xe1, +0x26,0x00,0xf0,0x0a,0x06,0xfb,0x00,0x1f,0xb0,0x00,0x00,0xaf,0x80,0x4f,0x80,0x00, +0x00,0x0d,0xf4,0x0c,0xff,0xff,0xc7,0x00,0x00,0x79,0x99,0xae,0xfa,0x77,0x00,0x20, +0x0c,0xf2,0x06,0x00,0x20,0x6f,0x60,0x82,0x00,0x10,0xf7,0x0b,0x00,0x2c,0x4f,0x70, +0x0b,0x00,0xf0,0x07,0x02,0x99,0x99,0x99,0xaf,0xc6,0x3f,0xff,0xff,0xff,0xff,0xb0, +0x0c,0xfe,0x60,0x00,0x07,0x9e,0xf2,0x00,0x00,0x05,0x22,0x00,0xf0,0x10,0xfc,0x00, +0x00,0x00,0xbf,0x00,0x00,0x06,0xdf,0x30,0x01,0xdf,0xaf,0x70,0x09,0xf3,0x0f,0xb0, +0x0e,0xd0,0x0b,0xf0,0x1f,0x90,0x07,0xf3,0x5f,0x60,0x04,0xf6,0xaf,0x32,0x00,0xb0, +0x05,0x99,0x99,0x9a,0xfd,0x90,0x00,0x00,0x00,0x2f,0x90,0xc3,0x01,0x2f,0xf9,0x00, +0x0b,0x00,0x14,0xa0,0x9f,0xff,0xff,0xd7,0x00,0x59,0x99,0x9a,0xdf,0xb0,0xa5,0x00, +0xbf,0xf3,0x26,0x10,0x00,0x05,0xf7,0x6f,0x40,0x00,0x03,0xf8,0x05,0x00,0x0c,0x29, +0x56,0xf5,0x03,0x00,0xfe,0x04,0x50,0x33,0x00,0x00,0x8f,0xd8,0x30,0x29,0xef,0xfc, +0x00,0x1d,0xec,0x00,0xbe,0x10,0x00,0xfb,0x00,0x03,0x00,0xf0,0x05,0x6f,0xff,0xff, +0xea,0x30,0x6f,0xb9,0x99,0xbf,0xf3,0x6f,0x50,0x00,0x05,0xfb,0x6f,0x50,0x00,0x00, +0xee,0x05,0x00,0x10,0xcf,0x05,0x00,0x1f,0xbf,0x05,0x00,0x06,0xf0,0x07,0x7f,0x30, +0x0c,0xff,0xb1,0x07,0xf3,0x00,0xb7,0xaf,0xc0,0x7f,0x30,0x00,0x00,0xcf,0x27,0xf3, +0x00,0x00,0x08,0xf4,0x0b,0x00,0xf0,0x05,0x6f,0x57,0xf3,0x00,0x00,0x07,0xf5,0x7f, +0x40,0x00,0x00,0x8f,0x46,0xf6,0x00,0x00,0x0c,0xf1,0x2f,0xd1,0x87,0x01,0xb5,0xaf, +0xea,0xad,0xfe,0x20,0x00,0x7d,0xff,0xd9,0x20,0x00,0xa3,0x00,0x90,0xaf,0xff,0xfd, +0x80,0x05,0x99,0x9a,0xdf,0xc0,0x4c,0x01,0xe0,0x40,0x00,0x00,0x04,0xf8,0x00,0x00, +0x00,0x1f,0x90,0x00,0x00,0x01,0xfa,0x09,0x00,0x1f,0xa0,0x09,0x00,0x11,0xf3,0x0c, +0x4f,0xff,0xfc,0x60,0x02,0x99,0x9b,0xef,0xb0,0x00,0x00,0x01,0xbf,0x60,0x00,0x00, +0x02,0xfb,0x00,0x00,0x00,0x0e,0xe0,0x00,0x00,0x00,0xce,0x09,0x00,0x01,0x12,0x00, +0x20,0xbf,0x62,0x24,0x00,0x00,0x2d,0x00,0x7b,0x00,0x5e,0x50,0x00,0x00,0x00,0x5f, +0x05,0x00,0xf1,0x05,0xff,0xff,0xd8,0x00,0x39,0x99,0x99,0xdf,0xa0,0x00,0x00,0x00, +0x0d,0xf0,0x00,0x00,0x00,0x09,0xf1,0x00,0x6e,0x02,0x30,0x00,0x00,0x0f,0x9f,0x00, +0x60,0x9f,0x50,0x00,0x00,0x06,0xfb,0x09,0x00,0xe0,0xd1,0x00,0x00,0x6d,0xfc,0x10, +0x00,0x03,0xff,0x70,0x00,0x00,0x02,0x71,0x41,0x02,0xa0,0xff,0xff,0xfc,0x60,0x06, +0xfb,0x99,0x9a,0xef,0x90,0x1c,0x01,0x70,0xdf,0x16,0xf5,0x00,0x00,0x07,0xf4,0x0b, +0x00,0x7d,0x5f,0x56,0xf5,0x00,0x00,0x05,0xf5,0x0b,0x00,0x60,0xfb,0x99,0x99,0x9b, +0xf5,0x6f,0x23,0x02,0xf0,0x07,0x50,0x2f,0xc0,0x19,0xef,0xd7,0x00,0x08,0xf6,0xdf, +0xba,0xef,0x90,0x00,0xdf,0xf5,0x00,0x1d,0xf1,0x00,0x5f,0xb0,0xc6,0x02,0x20,0x7f, +0x40,0x8a,0x02,0x70,0xde,0x00,0x00,0x03,0xf8,0x01,0xfa,0x06,0x00,0x20,0x06,0xf6, +0x06,0x00,0x20,0x0a,0xf2,0x06,0x00,0xbd,0x0e,0xe0,0x00,0x99,0x9a,0xf8,0x2f,0xa0, +0x00,0xff,0xff,0xf7,0x01,0x03,0xfd,0x01,0xf5,0x03,0x0c,0xfe,0x90,0x07,0x9d,0xf6, +0x00,0x01,0xfb,0x00,0x00,0xed,0x00,0x00,0xdd,0x00,0x00,0xde,0x03,0x00,0x80,0x39, +0x99,0xee,0x5f,0xff,0xfe,0x8f,0xff,0x0d,0x03,0xf0,0x0b,0x49,0xfd,0x99,0x9a,0xef, +0xa0,0x04,0xf5,0x00,0x00,0x0e,0xf2,0x09,0xf2,0x00,0x00,0x08,0xf5,0x0b,0xf1,0x00, +0x00,0x06,0xf6,0x0c,0xf0,0x06,0x00,0x11,0x0b,0x12,0x00,0xf0,0x1c,0x08,0xf6,0x00, +0x00,0x0b,0xf2,0x03,0xfe,0x20,0x00,0x5f,0xc0,0x00,0xaf,0xfb,0xac,0xfe,0x20,0x00, +0x06,0xcf,0xfd,0x91,0x00,0x0d,0xf1,0x00,0x00,0xbf,0x10,0x7f,0x60,0x00,0x0b,0xf1, +0x01,0xfc,0x00,0x00,0xcf,0x00,0x0a,0xf2,0x74,0x03,0x20,0x4f,0x80,0x5b,0x02,0x10, +0xee,0x43,0x03,0x20,0x08,0xf4,0x42,0x00,0x20,0x1f,0xa6,0xda,0x02,0xc0,0xcf,0xfc, +0x00,0x07,0xcd,0xff,0xf9,0x00,0x00,0x9f,0xdb,0x72,0x0f,0x00,0xff,0x16,0xff,0xfe, +0xc5,0x00,0xcf,0x99,0x9a,0xef,0x70,0xcf,0x00,0x00,0x1e,0xf0,0xcf,0x00,0x00,0x08, +0xf3,0xcf,0x00,0x00,0x06,0xf4,0xcf,0xff,0x30,0x06,0xf5,0x79,0x99,0x20,0x06,0xf5, +0x00,0x00,0x00,0x05,0x00,0x12,0xf4,0x0f,0xaf,0xff,0xff,0xc5,0x00,0xaf,0x99,0x9b, +0xff,0x80,0xaf,0x10,0x00,0x1d,0xf2,0xaf,0x10,0x00,0x06,0xf6,0xaf,0x99,0x20,0x03, +0xf8,0xaf,0xff,0x50,0x03,0xf8,0xd3,0x03,0x10,0x08,0x2d,0x00,0xf3,0x1f,0x3f,0xf0, +0x59,0x99,0x9c,0xff,0x50,0x9f,0xff,0xfe,0xa3,0x00,0x9f,0x60,0x00,0x0b,0xf0,0x0e, +0xf1,0x00,0x0c,0xf0,0x04,0xf9,0x00,0x0e,0xd0,0x00,0xcf,0x20,0x1f,0xb0,0x00,0x4f, +0x70,0x8f,0x60,0x00,0x0f,0xc9,0xfc,0x00,0x00,0x0f,0xfd,0x70,0xfc,0x01,0x0f,0x05, +0x00,0x0f,0x70,0x8f,0x90,0x00,0x09,0xf2,0x0b,0xf6,0x09,0x01,0xf0,0x03,0xef,0x20, +0x0d,0xf0,0x00,0x3f,0xd0,0x2f,0xb0,0x00,0x06,0xfb,0xdf,0x30,0x00,0x00,0xaf,0xd3, +0x52,0x02,0x10,0xf3,0xe0,0x03,0x20,0xfe,0x10,0x6a,0x02,0x60,0xb0,0x29,0x99,0x99, +0x9e,0xf6,0x53,0x04,0x20,0xf8,0xdf,0x76,0x02,0x13,0x79,0xe9,0x03,0x20,0x0d,0xf1, +0x76,0x02,0xf0,0x00,0xf2,0x6f,0x50,0x00,0x09,0xf1,0x6f,0x50,0x00,0x0c,0xe0,0x6f, +0x50,0x00,0x2f,0x52,0x02,0xf0,0x07,0xcf,0x20,0x6f,0x50,0x0b,0xf7,0x00,0x6f,0x54, +0xef,0x90,0x00,0x6f,0x59,0xf7,0x00,0x00,0x6f,0x54,0x10,0x00,0x00,0x4a,0x02,0x07, +0x05,0x00,0x08,0x4b,0x03,0x20,0xaf,0x50,0x24,0x02,0x0f,0x4b,0x03,0x0d,0xf0,0x22, +0x6f,0x50,0x00,0xde,0x00,0x0c,0xf0,0x3f,0x80,0x00,0xec,0x00,0x0e,0xd0,0x0f,0xc0, +0x00,0xfb,0x00,0x0f,0xb0,0x0d,0xf0,0x01,0xf9,0x00,0x2f,0x90,0x0a,0xf2,0x07,0xf6, +0x00,0x5f,0x70,0x07,0xfa,0xbf,0xe1,0x00,0x7f,0x50,0x04,0xff,0xc8,0x20,0x00,0xaf, +0x20,0xf3,0x04,0xe0,0x02,0xfd,0x00,0x00,0xdf,0x00,0x00,0x4d,0xf6,0x00,0x00,0xaf, +0xcc,0xdf,0x03,0x03,0x41,0x7f,0xfe,0xdb,0x82,0x40,0x03,0x00,0x41,0x03,0x20,0xdf, +0xa9,0x82,0x00,0x50,0x9f,0x20,0x00,0x0a,0xf4,0x06,0x00,0x20,0x03,0xf8,0x06,0x00, +0x2a,0x01,0xf9,0x06,0x00,0x10,0x10,0x06,0x00,0xf0,0x02,0xcf,0x00,0x00,0x01,0xf9, +0x4c,0xfb,0x00,0x00,0x01,0xf9,0x6e,0xb1,0x00,0x00,0x01,0xf9, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_L __FLASH = { -.uncomp_size = 1757, -.comp_size = 1354, -.line_height = 20, +.uncomp_size = 1814, +.comp_size = 1404, +.line_height = 19, .base_line = 4, .subpx = 0, .underline_position = -2, @@ -109,11 +112,11 @@ const etxLz4Font lv_font_he_L __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 1925, +.lvglFontBufSize = 1982, }; diff --git a/radio/src/fonts/lvgl/sml/lv_font_he_STD.c b/radio/src/fonts/lvgl/sml/lv_font_he_STD.c index 84c0bc967..942fdde29 100644 --- a/radio/src/fonts/lvgl/sml/lv_font_he_STD.c +++ b/radio/src/fonts/lvgl/sml/lv_font_he_STD.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 13 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 13 --font ../Arimo/Arimo-Regular.ttf -r 0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea,0x5f4 --format lvgl -o sml/lv_font_he_STD.c --force-fast-kern-format --no-compress --lv-fallback lv_font_en_STD + * Opts: --no-prefilter --bpp 4 --size 13 --font ../Arimo/Arimo-Regular.ttf -r 0x5b0,0x5b4,0x5b6,0x5b7,0x5b8,0x5bc,0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea --format lvgl -o sml/lv_font_he_STD.c --force-fast-kern-format --no-compress --lv-fallback lv_font_en_STD ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE @@ -22,6 +22,24 @@ /*Store the image of the glyphs*/ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+05B0 "ְ" */ + 0x55, 0x55, 0x0, + + /* U+05B4 "ִ" */ + 0x55, + + /* U+05B6 "ֶ" */ + 0x18, 0x81, 0x5, 0x50, + + /* U+05B7 "ַ" */ + 0xa, 0xa0, + + /* U+05B8 "ָ" */ + 0xb, 0xb0, 0x3, 0x30, + + /* U+05BC "ּ" */ + 0x55, + /* U+05D0 "א" */ 0xd, 0x90, 0x0, 0xa8, 0x2, 0xf4, 0x0, 0xc6, 0x0, 0xae, 0x10, 0xf3, 0x6, 0xdb, 0xb8, 0xc0, @@ -176,11 +194,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x8f, 0xff, 0xfe, 0x91, 0x6, 0xd1, 0x13, 0xc9, 0x5, 0xd0, 0x0, 0x5d, 0x5, 0xd0, 0x0, 0x3e, 0x5, 0xd0, 0x0, 0x3f, 0x5, 0xc0, 0x0, 0x3f, - 0x1a, 0xa0, 0x0, 0x3f, 0x9d, 0x30, 0x0, 0x3f, - - /* U+05F4 "״" */ - 0xe, 0x80, 0xf5, 0x1f, 0x24, 0xf0, 0x5c, 0x7, - 0x90, 0x86, 0xb, 0x40 + 0x1a, 0xa0, 0x0, 0x3f, 0x9d, 0x30, 0x0, 0x3f }; @@ -190,51 +204,58 @@ 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 = 131, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 32, .adv_w = 124, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 64, .adv_w = 88, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 88, .adv_w = 115, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 116, .adv_w = 132, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 148, .adv_w = 54, .box_w = 2, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 156, .adv_w = 67, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 176, .adv_w = 137, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 204, .adv_w = 136, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 232, .adv_w = 54, .box_w = 2, .box_h = 5, .ofs_x = 1, .ofs_y = 3}, - {.bitmap_index = 237, .adv_w = 111, .box_w = 6, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 267, .adv_w = 109, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 295, .adv_w = 110, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 337, .adv_w = 141, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 365, .adv_w = 143, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 397, .adv_w = 54, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 407, .adv_w = 81, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 427, .adv_w = 136, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 459, .adv_w = 121, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 487, .adv_w = 130, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 527, .adv_w = 127, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 559, .adv_w = 105, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 594, .adv_w = 113, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 622, .adv_w = 123, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 657, .adv_w = 111, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 681, .adv_w = 152, .box_w = 9, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 717, .adv_w = 144, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 749, .adv_w = 125, .box_w = 6, .box_h = 4, .ofs_x = 1, .ofs_y = 7} + {.bitmap_index = 0, .adv_w = 0, .box_w = 2, .box_h = 3, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 3, .adv_w = 0, .box_w = 2, .box_h = 1, .ofs_x = -1, .ofs_y = -2}, + {.bitmap_index = 4, .adv_w = 0, .box_w = 4, .box_h = 2, .ofs_x = -2, .ofs_y = -2}, + {.bitmap_index = 8, .adv_w = 0, .box_w = 4, .box_h = 1, .ofs_x = -2, .ofs_y = -2}, + {.bitmap_index = 10, .adv_w = 0, .box_w = 4, .box_h = 2, .ofs_x = -2, .ofs_y = -3}, + {.bitmap_index = 14, .adv_w = 0, .box_w = 2, .box_h = 1, .ofs_x = -1, .ofs_y = 4}, + {.bitmap_index = 15, .adv_w = 131, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 47, .adv_w = 124, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 79, .adv_w = 88, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 103, .adv_w = 115, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 131, .adv_w = 132, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 163, .adv_w = 54, .box_w = 2, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 171, .adv_w = 67, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 191, .adv_w = 137, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 219, .adv_w = 136, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 247, .adv_w = 54, .box_w = 2, .box_h = 5, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 252, .adv_w = 111, .box_w = 6, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 282, .adv_w = 109, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 310, .adv_w = 110, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 352, .adv_w = 141, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 380, .adv_w = 143, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 412, .adv_w = 54, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 422, .adv_w = 81, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 442, .adv_w = 136, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 474, .adv_w = 121, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 502, .adv_w = 130, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 542, .adv_w = 127, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 574, .adv_w = 105, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 609, .adv_w = 113, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 637, .adv_w = 123, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 672, .adv_w = 111, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 696, .adv_w = 152, .box_w = 9, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 732, .adv_w = 144, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 0} }; /*--------------------- * CHARACTER MAPPING *--------------------*/ - +static const uint16_t unicode_list_0[] = { + 0x0, 0x4, 0x6, 0x7, 0x8, 0xc +}; /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { - .range_start = 1488, .range_length = 27, .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 = 1456, .range_length = 13, .glyph_id_start = 1, + .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 6, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY }, { - .range_start = 1524, .range_length = 1, .glyph_id_start = 28, + .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY } }; @@ -284,8 +305,8 @@ lv_font_t lv_font_he_STD = { #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 = 13, /*The maximum line height required by the font*/ - .base_line = 2, /*Baseline measured from the bottom of the line*/ + .line_height = 14, /*The maximum line height required by the font*/ + .base_line = 3, /*Baseline measured from the bottom of the line*/ #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif diff --git a/radio/src/fonts/lvgl/sml/lv_font_he_XS.c b/radio/src/fonts/lvgl/sml/lv_font_he_XS.c index ea5e0aa5c..2df0ea276 100644 --- a/radio/src/fonts/lvgl/sml/lv_font_he_XS.c +++ b/radio/src/fonts/lvgl/sml/lv_font_he_XS.c @@ -2,55 +2,57 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x0b,0x40,0x06,0x07,0x06,0x00,0x00,0x15,0x00,0x00,0x06, -0x06,0x06,0x00,0x00,0x27,0x00,0x40,0x04,0x04,0x06,0x00,0x00,0x33,0x00,0x90,0x05, -0x10,0x00,0x31,0x45,0x00,0x50,0x18,0x00,0xf1,0x04,0x57,0x00,0xa0,0x02,0x02,0x06, -0x00,0x00,0x5d,0x00,0x40,0x03,0x04,0x07,0x00,0x00,0x6b,0x00,0x90,0x18,0x00,0x31, -0x7d,0x00,0x80,0x08,0x00,0x10,0x8f,0x20,0x00,0xf0,0x05,0x04,0x00,0x02,0x93,0x00, -0x50,0x05,0x05,0x08,0x00,0xfe,0xa7,0x00,0x40,0x05,0x05,0x06,0x00,0x00,0xb6,0x10, -0x00,0x61,0x0a,0x00,0xff,0xcf,0x00,0xd0,0x28,0x00,0x31,0xe1,0x00,0xe0,0x70,0x00, -0x10,0xf6,0x30,0x00,0x70,0x08,0x00,0xfe,0xfe,0x00,0xe0,0x03,0x70,0x00,0x31,0x0a, -0x01,0x90,0x18,0x00,0x31,0x1f,0x01,0xd0,0x78,0x00,0xb1,0x31,0x01,0x40,0x06,0x06, -0x08,0x00,0xfe,0x49,0x01,0x20,0x38,0x00,0x31,0x5b,0x01,0x10,0x58,0x00,0x31,0x6f, -0x01,0x70,0x20,0x00,0x40,0x81,0x01,0xe0,0x05,0x20,0x00,0x31,0x99,0x01,0x50,0x68, -0x00,0x40,0xa8,0x01,0x50,0x07,0x40,0x00,0x31,0xbd,0x01,0xf0,0x48,0x00,0xf2,0x17, -0xd2,0x01,0x00,0x06,0x05,0x03,0x01,0x05,0x1d,0x20,0x2c,0x00,0x4c,0x05,0x90,0x0a, -0xc8,0xb4,0x02,0xc0,0xca,0x00,0x58,0x02,0xd1,0x09,0x50,0x05,0xc0,0x4d,0xdc,0x40, -0x00,0x02,0xd0,0x00,0x00,0xe0,0x03,0x00,0xf8,0x06,0x7d,0xdd,0xf8,0x4e,0x70,0x01, -0xd0,0x00,0xb2,0x0b,0xc6,0x58,0x4a,0x95,0x0d,0xad,0xde,0xe3,0x00,0x06,0x80,0x03, -0x00,0xa4,0x3d,0xdd,0xb0,0x00,0x00,0x96,0x2a,0x00,0x58,0x2b,0x03,0x00,0x11,0x2c, -0x01,0x00,0x91,0x00,0x00,0xaa,0x50,0x09,0xc1,0x0d,0x00,0x0e,0x02,0x00,0x95,0x2f, -0xdd,0xc2,0x2c,0x00,0x5a,0x2c,0x00,0x2c,0x03,0x00,0xf6,0x11,0x3b,0x0a,0xc6,0x3b, -0x00,0x1d,0x3b,0x00,0x0e,0x2b,0x00,0x0e,0x0e,0x10,0x6a,0x06,0xdd,0xb1,0x2c,0x2c, -0x2c,0x01,0xad,0xda,0x00,0x00,0x96,0x00,0x05,0x80,0x00,0x58,0x05,0x00,0x20,0x8d, -0xd9,0x14,0x00,0xf2,0x1c,0x04,0xa0,0x00,0x4a,0x00,0x09,0x68,0xdd,0x90,0x10,0x00, -0x0a,0x30,0x00,0xa3,0x00,0x08,0xdd,0xd5,0x00,0x03,0xc0,0x00,0x3b,0x00,0x0b,0x50, -0x1a,0x90,0x0e,0x60,0x00,0x00,0x00,0x2f,0xdd,0xc4,0x2c,0x00,0x2d,0x2c,0x00,0x0e, -0x03,0x00,0xf3,0x0a,0x2f,0xdd,0xdf,0x69,0x8d,0xd4,0x00,0xcb,0x02,0xd0,0x0b,0x30, -0x0e,0x00,0xe0,0x00,0xd1,0x4b,0x00,0x0d,0x18,0x70,0xbd,0xf1,0x2c,0x01,0x00,0x20, -0x4d,0x90,0x15,0x00,0x00,0x02,0x00,0xf6,0x28,0x8d,0xf1,0x9f,0xdd,0xd4,0x02,0xb0, -0x02,0xd0,0x5a,0x00,0x0f,0x04,0xa0,0x00,0xe0,0x1e,0x10,0x6a,0x00,0x6d,0xdb,0x10, -0x4a,0x00,0xa4,0x0e,0x10,0xa3,0x08,0x60,0xc1,0x02,0xb2,0xc0,0x00,0xdd,0x30,0xbe, -0xa3,0x00,0x5e,0xdd,0x90,0x59,0x00,0xb4,0x59,0x00,0x76,0x4d,0x90,0x77,0x00,0x00, -0x03,0x00,0xf1,0x12,0x4e,0xdd,0x90,0x49,0x00,0xa5,0x4d,0xa0,0x68,0x00,0x00,0x67, -0x00,0x00,0xc4,0x3d,0xdd,0x70,0xa6,0x03,0xb1,0xd0,0x49,0x08,0x6a,0x50,0x6d,0x60, -0x06,0x80,0x00,0x68,0x00,0x05,0x00,0xf0,0x04,0x98,0x02,0xc0,0x0c,0x44,0xa0,0x02, -0xdc,0x40,0x00,0x5c,0x00,0x00,0x09,0x70,0x7d,0xdd,0xf0,0x5d,0x3c,0x01,0xf0,0x00, -0xa4,0x19,0x00,0xa4,0x2c,0x00,0xd1,0x2c,0x0a,0x70,0x2c,0xa8,0x00,0x2c,0x00,0x03, -0x00,0x29,0xad,0xdb,0x06,0x01,0xf0,0x23,0xa4,0x0c,0x22,0xc7,0x70,0xd0,0x4a,0x4a, -0x3d,0x06,0x81,0xfb,0x30,0x96,0x0e,0x00,0x4e,0x10,0xbe,0xda,0x30,0x8f,0xdd,0xd5, -0x00,0xb2,0x01,0xe0,0x0b,0x20,0x0c,0x10,0xb2,0x00,0xc1,0x0d,0x10,0x0c,0x19,0xa0, -0x00,0xc1,0x6a,0x3d,0x09,0x46,0x70,0xb0,0xa1,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x02,0xff,0xfe,0x02,0x08,0x00,0x43,0x01,0xff,0xfe, +0x03,0x10,0x00,0x12,0x05,0x10,0x00,0x23,0xff,0x06,0x10,0x00,0x12,0x08,0x10,0x00, +0xf0,0x0e,0x03,0x09,0x00,0x40,0x06,0x07,0x06,0x00,0x00,0x1e,0x00,0x00,0x06,0x06, +0x06,0x00,0x00,0x30,0x00,0x40,0x04,0x04,0x06,0x00,0x00,0x3c,0x00,0x90,0x05,0x10, +0x00,0x31,0x4e,0x00,0x50,0x18,0x00,0xf1,0x04,0x60,0x00,0xa0,0x02,0x02,0x06,0x00, +0x00,0x66,0x00,0x40,0x03,0x04,0x07,0x00,0x00,0x74,0x00,0x90,0x18,0x00,0x31,0x86, +0x00,0x80,0x08,0x00,0x10,0x98,0x20,0x00,0xf0,0x05,0x04,0x00,0x02,0x9c,0x00,0x50, +0x05,0x05,0x08,0x00,0xfe,0xb0,0x00,0x40,0x05,0x05,0x06,0x00,0x00,0xbf,0x10,0x00, +0x61,0x0a,0x00,0xff,0xd8,0x00,0xd0,0x28,0x00,0x31,0xea,0x00,0xe0,0x70,0x00,0x10, +0xff,0x30,0x00,0x70,0x08,0x00,0xfe,0x07,0x01,0xe0,0x03,0x70,0x00,0x31,0x13,0x01, +0x90,0x18,0x00,0x31,0x28,0x01,0xd0,0x78,0x00,0xb1,0x3a,0x01,0x40,0x06,0x06,0x08, +0x00,0xfe,0x52,0x01,0x20,0x38,0x00,0x31,0x64,0x01,0x10,0x58,0x00,0x31,0x78,0x01, +0x70,0x20,0x00,0x40,0x8a,0x01,0xe0,0x05,0x20,0x00,0x31,0xa2,0x01,0x50,0x68,0x00, +0x40,0xb1,0x01,0x50,0x07,0x40,0x00,0x31,0xc6,0x01,0xf0,0x48,0x00,0xf2,0x24,0x00, +0x00,0x04,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x33,0x33,0x33,0x66,0x33, +0x66,0x77,0x11,0x33,0x1d,0x20,0x2c,0x00,0x4c,0x05,0x90,0x0a,0xc8,0xb4,0x02,0xc0, +0xca,0x00,0x58,0x02,0xd1,0x09,0x50,0x05,0xc0,0x4d,0xdc,0x40,0x00,0x02,0xd0,0x00, +0x00,0xe0,0x03,0x00,0xf8,0x06,0x7d,0xdd,0xf8,0x4e,0x70,0x01,0xd0,0x00,0xb2,0x0b, +0xc6,0x58,0x4a,0x95,0x0d,0xad,0xde,0xe3,0x00,0x06,0x80,0x03,0x00,0xa4,0x3d,0xdd, +0xb0,0x00,0x00,0x96,0x2a,0x00,0x58,0x2b,0x03,0x00,0x11,0x2c,0x01,0x00,0x91,0x00, +0x00,0xaa,0x50,0x09,0xc1,0x0d,0x00,0x0e,0x02,0x00,0x95,0x2f,0xdd,0xc2,0x2c,0x00, +0x5a,0x2c,0x00,0x2c,0x03,0x00,0xf6,0x11,0x3b,0x0a,0xc6,0x3b,0x00,0x1d,0x3b,0x00, +0x0e,0x2b,0x00,0x0e,0x0e,0x10,0x6a,0x06,0xdd,0xb1,0x2c,0x2c,0x2c,0x01,0xad,0xda, +0x00,0x00,0x96,0x00,0x05,0x80,0x00,0x58,0x05,0x00,0x20,0x8d,0xd9,0x14,0x00,0xf2, +0x1c,0x04,0xa0,0x00,0x4a,0x00,0x09,0x68,0xdd,0x90,0x10,0x00,0x0a,0x30,0x00,0xa3, +0x00,0x08,0xdd,0xd5,0x00,0x03,0xc0,0x00,0x3b,0x00,0x0b,0x50,0x1a,0x90,0x0e,0x60, +0x00,0x00,0x00,0x2f,0xdd,0xc4,0x2c,0x00,0x2d,0x2c,0x00,0x0e,0x03,0x00,0xf3,0x0a, +0x2f,0xdd,0xdf,0x69,0x8d,0xd4,0x00,0xcb,0x02,0xd0,0x0b,0x30,0x0e,0x00,0xe0,0x00, +0xd1,0x4b,0x00,0x0d,0x18,0x70,0xbd,0xf1,0x2c,0x01,0x00,0x20,0x4d,0x90,0x15,0x00, +0x00,0x02,0x00,0xf6,0x28,0x8d,0xf1,0x9f,0xdd,0xd4,0x02,0xb0,0x02,0xd0,0x5a,0x00, +0x0f,0x04,0xa0,0x00,0xe0,0x1e,0x10,0x6a,0x00,0x6d,0xdb,0x10,0x4a,0x00,0xa4,0x0e, +0x10,0xa3,0x08,0x60,0xc1,0x02,0xb2,0xc0,0x00,0xdd,0x30,0xbe,0xa3,0x00,0x5e,0xdd, +0x90,0x59,0x00,0xb4,0x59,0x00,0x76,0x4d,0x90,0x77,0x00,0x00,0x03,0x00,0xf1,0x12, +0x4e,0xdd,0x90,0x49,0x00,0xa5,0x4d,0xa0,0x68,0x00,0x00,0x67,0x00,0x00,0xc4,0x3d, +0xdd,0x70,0xa6,0x03,0xb1,0xd0,0x49,0x08,0x6a,0x50,0x6d,0x60,0x06,0x80,0x00,0x68, +0x00,0x05,0x00,0xf0,0x04,0x98,0x02,0xc0,0x0c,0x44,0xa0,0x02,0xdc,0x40,0x00,0x5c, +0x00,0x00,0x09,0x70,0x7d,0xdd,0xf0,0x5d,0x3c,0x01,0xf0,0x00,0xa4,0x19,0x00,0xa4, +0x2c,0x00,0xd1,0x2c,0x0a,0x70,0x2c,0xa8,0x00,0x2c,0x00,0x03,0x00,0x29,0xad,0xdb, +0x06,0x01,0xf0,0x1b,0xa4,0x0c,0x22,0xc7,0x70,0xd0,0x4a,0x4a,0x3d,0x06,0x81,0xfb, +0x30,0x96,0x0e,0x00,0x4e,0x10,0xbe,0xda,0x30,0x8f,0xdd,0xd5,0x00,0xb2,0x01,0xe0, +0x0b,0x20,0x0c,0x10,0xb2,0x00,0xc1,0x0d,0x10,0x0c,0x19,0xa0,0x00,0xc1, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_XS __FLASH = { -.uncomp_size = 706, -.comp_size = 618, +.uncomp_size = 759, +.comp_size = 654, .line_height = 11, .base_line = 2, .subpx = 0, @@ -63,11 +65,11 @@ const etxLz4Font lv_font_he_XS __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 874, +.lvglFontBufSize = 927, }; diff --git a/radio/src/fonts/lvgl/sml/lv_font_he_XXS.c b/radio/src/fonts/lvgl/sml/lv_font_he_XXS.c index 5f98f6681..3076e43e0 100644 --- a/radio/src/fonts/lvgl/sml/lv_font_he_XXS.c +++ b/radio/src/fonts/lvgl/sml/lv_font_he_XXS.c @@ -2,50 +2,52 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x16,0x00,0x01,0x00,0x90,0x05,0x05,0x05,0x00,0x00,0x0d,0x00,0xd0,0x04,0x08,0x00, -0xb1,0x1a,0x00,0x60,0x03,0x04,0x05,0x00,0x00,0x24,0x00,0x70,0x10,0x00,0x31,0x31, -0x00,0x10,0x20,0x00,0xf1,0x04,0x3e,0x00,0x10,0x02,0x02,0x05,0x00,0x00,0x43,0x00, -0x90,0x02,0x03,0x05,0x00,0x00,0x4b,0x00,0x40,0x18,0x00,0x13,0x58,0x08,0x00,0x10, -0x65,0x20,0x00,0xf0,0x00,0x03,0x00,0x02,0x68,0x00,0x40,0x04,0x04,0x06,0x00,0xff, -0x74,0x00,0x30,0x04,0x48,0x00,0x10,0x7e,0x10,0x00,0x61,0x07,0x00,0x00,0x8c,0x00, -0x70,0x28,0x00,0x31,0x99,0x00,0x80,0x08,0x00,0x10,0xa6,0x30,0x00,0x70,0x06,0x00, -0xff,0xac,0x00,0x20,0x03,0x50,0x00,0x13,0xb4,0x48,0x00,0x31,0xc1,0x00,0xb0,0x78, -0x00,0x10,0xce,0x98,0x00,0x61,0x06,0x00,0xff,0xdd,0x00,0xe0,0x10,0x00,0x31,0xea, -0x00,0x10,0x58,0x00,0x31,0xf6,0x00,0x60,0x10,0x00,0x40,0x03,0x01,0xc0,0x04,0x20, -0x00,0x31,0x12,0x01,0x40,0x68,0x00,0xa2,0x1c,0x01,0xd0,0x05,0x06,0x05,0x00,0x00, -0x2b,0x01,0x60,0x00,0xf1,0x25,0x38,0x01,0xd0,0x04,0x05,0x03,0x00,0x04,0x3b,0x02, -0x90,0x96,0x57,0x2a,0xbb,0x16,0x41,0xb0,0xa1,0x05,0x80,0x5a,0xb6,0x00,0x00,0xb0, -0x00,0x0b,0x00,0x00,0xb0,0x7a,0xae,0x50,0x5c,0x10,0x05,0x60,0x08,0xa0,0x65,0xb0, -0xa1,0xa1,0x9a,0xbe,0x20,0x01,0xa0,0x00,0x1a,0x00,0x05,0x00,0xe0,0x4a,0xaa,0x00, -0x00,0x66,0x56,0x04,0x65,0x60,0x47,0x56,0x04,0x70,0x56,0x01,0x00,0xf2,0x1c,0x86, -0x10,0xb4,0x29,0x02,0x90,0x29,0x00,0x5c,0xab,0x25,0x60,0x38,0x56,0x01,0x95,0x60, -0x1a,0x56,0x01,0xa0,0x55,0x4a,0x55,0x50,0x0b,0x55,0x00,0xb4,0x70,0x39,0x0a,0xab, -0x20,0x56,0x56,0x23,0x9a,0xb2,0x00,0x29,0x00,0x1a,0x02,0x00,0x10,0x7a,0x0c,0x00, -0xf0,0x17,0x0b,0x00,0x29,0x7a,0xb2,0x90,0x00,0xb0,0x00,0x7a,0xb7,0x00,0x0c,0x00, -0x29,0x04,0xc1,0x39,0x10,0x5c,0xab,0x45,0x60,0x0b,0x56,0x00,0xb5,0x60,0x0b,0x5c, -0xaa,0xc0,0x78,0xbb,0x40,0xe1,0x0b,0x1a,0x0d,0x00,0x41,0x92,0x5a,0xd0,0x56,0x01, -0x00,0xf0,0x22,0x5c,0x20,0x47,0x04,0x70,0x47,0x7c,0x70,0x9d,0xab,0x46,0x50,0x0b, -0x74,0x00,0xc5,0x70,0x2a,0x0a,0xab,0x20,0x65,0x08,0x31,0xb0,0x92,0x0a,0x1b,0x00, -0x5b,0x80,0xab,0x70,0x00,0x7c,0xaa,0x07,0x40,0x74,0x6b,0x26,0x50,0x00,0x65,0x00, -0x06,0x50,0x00,0x65,0x0f,0x00,0xf0,0x02,0x65,0x5b,0x24,0x60,0x00,0x74,0x4a,0xa9, -0x00,0x93,0x0b,0x1b,0x29,0x0b,0x81,0x0b,0x00,0x02,0x00,0xf2,0x11,0x94,0x0b,0x00, -0xc3,0xa0,0x03,0xe2,0x00,0x07,0x60,0x7a,0xaf,0x00,0x5a,0xab,0x13,0x30,0x73,0x56, -0x0a,0x15,0x79,0x60,0x57,0x30,0x05,0x60,0x00,0x9a,0xb2,0x00,0x39,0xa8,0x00,0xf0, -0x15,0xb0,0x64,0x57,0x83,0x83,0x65,0x5a,0xc0,0x92,0x2a,0x00,0xc0,0x0e,0xbb,0x40, -0x7e,0xab,0x50,0xb0,0x0b,0x0b,0x00,0xb0,0xb0,0x0b,0x96,0x00,0xb0,0x05,0x16,0x00, -0xb1,0xa0,0x08,0x44,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x02,0xff,0xfe,0x02,0x08,0x00,0x43,0x01,0xff,0xfe, +0x03,0x10,0x00,0x12,0x05,0x10,0x00,0x23,0xff,0x06,0x10,0x00,0x12,0x08,0x10,0x00, +0xd0,0x02,0x09,0x00,0x00,0x05,0x05,0x05,0x00,0x00,0x16,0x00,0xd0,0x04,0x08,0x00, +0xb1,0x23,0x00,0x60,0x03,0x04,0x05,0x00,0x00,0x2d,0x00,0x70,0x10,0x00,0x31,0x3a, +0x00,0x10,0x20,0x00,0xf1,0x04,0x47,0x00,0x10,0x02,0x02,0x05,0x00,0x00,0x4c,0x00, +0x90,0x02,0x03,0x05,0x00,0x00,0x54,0x00,0x40,0x18,0x00,0x13,0x61,0x08,0x00,0x10, +0x6e,0x20,0x00,0xf0,0x00,0x03,0x00,0x02,0x71,0x00,0x40,0x04,0x04,0x06,0x00,0xff, +0x7d,0x00,0x30,0x04,0x48,0x00,0x10,0x87,0x10,0x00,0x61,0x07,0x00,0x00,0x95,0x00, +0x70,0x28,0x00,0x31,0xa2,0x00,0x80,0x08,0x00,0x10,0xaf,0x30,0x00,0x70,0x06,0x00, +0xff,0xb5,0x00,0x20,0x03,0x50,0x00,0x13,0xbd,0x48,0x00,0x31,0xca,0x00,0xb0,0x78, +0x00,0x10,0xd7,0x98,0x00,0x61,0x06,0x00,0xff,0xe6,0x00,0xe0,0x10,0x00,0x31,0xf3, +0x00,0x10,0x58,0x00,0x31,0xff,0x00,0x60,0x10,0x00,0x40,0x0c,0x01,0xc0,0x04,0x20, +0x00,0x31,0x1b,0x01,0x40,0x68,0x00,0xa2,0x25,0x01,0xd0,0x05,0x06,0x05,0x00,0x00, +0x34,0x01,0x60,0x00,0xf1,0x32,0x00,0x00,0x04,0x00,0x06,0x00,0x07,0x00,0x08,0x00, +0x0c,0x00,0x22,0x22,0x22,0x44,0x22,0x44,0x55,0x00,0x22,0x3b,0x02,0x90,0x96,0x57, +0x2a,0xbb,0x16,0x41,0xb0,0xa1,0x05,0x80,0x5a,0xb6,0x00,0x00,0xb0,0x00,0x0b,0x00, +0x00,0xb0,0x7a,0xae,0x50,0x5c,0x10,0x05,0x60,0x08,0xa0,0x65,0xb0,0xa1,0xa1,0x9a, +0xbe,0x20,0x01,0xa0,0x00,0x1a,0x00,0x05,0x00,0xe0,0x4a,0xaa,0x00,0x00,0x66,0x56, +0x04,0x65,0x60,0x47,0x56,0x04,0x70,0x56,0x01,0x00,0xf2,0x1c,0x86,0x10,0xb4,0x29, +0x02,0x90,0x29,0x00,0x5c,0xab,0x25,0x60,0x38,0x56,0x01,0x95,0x60,0x1a,0x56,0x01, +0xa0,0x55,0x4a,0x55,0x50,0x0b,0x55,0x00,0xb4,0x70,0x39,0x0a,0xab,0x20,0x56,0x56, +0x23,0x9a,0xb2,0x00,0x29,0x00,0x1a,0x02,0x00,0x10,0x7a,0x0c,0x00,0xf0,0x17,0x0b, +0x00,0x29,0x7a,0xb2,0x90,0x00,0xb0,0x00,0x7a,0xb7,0x00,0x0c,0x00,0x29,0x04,0xc1, +0x39,0x10,0x5c,0xab,0x45,0x60,0x0b,0x56,0x00,0xb5,0x60,0x0b,0x5c,0xaa,0xc0,0x78, +0xbb,0x40,0xe1,0x0b,0x1a,0x0d,0x00,0x41,0x92,0x5a,0xd0,0x56,0x01,0x00,0xf0,0x22, +0x5c,0x20,0x47,0x04,0x70,0x47,0x7c,0x70,0x9d,0xab,0x46,0x50,0x0b,0x74,0x00,0xc5, +0x70,0x2a,0x0a,0xab,0x20,0x65,0x08,0x31,0xb0,0x92,0x0a,0x1b,0x00,0x5b,0x80,0xab, +0x70,0x00,0x7c,0xaa,0x07,0x40,0x74,0x6b,0x26,0x50,0x00,0x65,0x00,0x06,0x50,0x00, +0x65,0x0f,0x00,0xf0,0x02,0x65,0x5b,0x24,0x60,0x00,0x74,0x4a,0xa9,0x00,0x93,0x0b, +0x1b,0x29,0x0b,0x81,0x0b,0x00,0x02,0x00,0xf2,0x11,0x94,0x0b,0x00,0xc3,0xa0,0x03, +0xe2,0x00,0x07,0x60,0x7a,0xaf,0x00,0x5a,0xab,0x13,0x30,0x73,0x56,0x0a,0x15,0x79, +0x60,0x57,0x30,0x05,0x60,0x00,0x9a,0xb2,0x00,0x39,0xa8,0x00,0xf0,0x0d,0xb0,0x64, +0x57,0x83,0x83,0x65,0x5a,0xc0,0x92,0x2a,0x00,0xc0,0x0e,0xbb,0x40,0x7e,0xab,0x50, +0xb0,0x0b,0x0b,0x00,0xb0,0xb0,0x0b,0x96,0x00,0xb0, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_XXS __FLASH = { -.uncomp_size = 552, -.comp_size = 501, -.line_height = 8, -.base_line = 1, +.uncomp_size = 605, +.comp_size = 538, +.line_height = 9, +.base_line = 2, .subpx = 0, .underline_position = -1, .underline_thickness = 1, @@ -56,11 +58,11 @@ const etxLz4Font lv_font_he_XXS __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 720, +.lvglFontBufSize = 773, }; diff --git a/radio/src/fonts/lvgl/sml/lv_font_he_bold_STD.c b/radio/src/fonts/lvgl/sml/lv_font_he_bold_STD.c index 74bdee30d..3aa5fc8e4 100644 --- a/radio/src/fonts/lvgl/sml/lv_font_he_bold_STD.c +++ b/radio/src/fonts/lvgl/sml/lv_font_he_bold_STD.c @@ -2,77 +2,80 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x0b,0xe0,0x08,0x09,0x08,0x00,0x00,0x24,0x00,0x50,0x08, -0x08,0x08,0x00,0x00,0x44,0x00,0x40,0x06,0x06,0x08,0x00,0x00,0x5c,0x00,0x90,0x07, -0x10,0x00,0x31,0x7c,0x00,0xd0,0x18,0x00,0xf0,0x0d,0x9c,0x00,0xf0,0x03,0x02,0x08, -0x01,0x00,0xa4,0x00,0xc0,0x04,0x05,0x09,0x00,0x00,0xbb,0x00,0x20,0x09,0x08,0x08, -0x01,0x00,0xdb,0x00,0xf0,0x08,0x08,0x00,0x10,0xfb,0x20,0x00,0xf1,0x0f,0x05,0x01, -0x03,0x00,0x01,0x80,0x07,0x07,0x0a,0x00,0xfe,0x23,0x01,0x30,0x07,0x07,0x08,0x00, -0x00,0x3f,0x01,0x70,0x07,0x07,0x0c,0x00,0xff,0x69,0x01,0x60,0x30,0x00,0x40,0x89, -0x01,0x70,0x09,0x70,0x00,0xf1,0x04,0xad,0x01,0xf0,0x03,0x02,0x0a,0x01,0xfe,0xb7, -0x01,0xa0,0x05,0x05,0x08,0x00,0x00,0xcb,0x01,0x10,0x18,0x00,0x31,0xef,0x01,0x10, -0x70,0x00,0xb1,0x0f,0x02,0xc0,0x08,0x08,0x0a,0x00,0xfe,0x37,0x02,0x80,0x10,0x00, -0x31,0x57,0x02,0x30,0x58,0x00,0x31,0x7a,0x02,0xf0,0x98,0x00,0x31,0x9a,0x02,0x80, -0x20,0x00,0x31,0xc2,0x02,0x80,0x68,0x00,0xb1,0xde,0x02,0x70,0x0a,0x0a,0x08,0x00, -0x00,0x06,0x03,0x50,0x48,0x00,0xf4,0x2d,0x2a,0x03,0x20,0x08,0x06,0x05,0x01,0x07, -0x0c,0xf3,0x00,0x9f,0x20,0x2f,0xe1,0x0a,0xf1,0x00,0xaf,0xa0,0xed,0x00,0x7f,0xdf, -0xbf,0x50,0x0d,0xd0,0xdf,0x80,0x01,0xf9,0x03,0xfc,0x00,0x4f,0x70,0x08,0xf8,0x07, -0xf4,0x00,0x0c,0xf4,0x3f,0xff,0xe9,0x00,0x18,0x88,0xcf,0xa0,0x00,0x00,0x0d,0xe0, -0x00,0x00,0x0b,0xf0,0x04,0x00,0xff,0x1d,0x48,0x88,0x8d,0xf7,0x7f,0xff,0xff,0xfd, -0x0f,0xfa,0x00,0x08,0xcf,0x50,0x00,0x1f,0x90,0x00,0x0d,0xe0,0x04,0xef,0xf1,0x0e, -0xd7,0xf5,0x4f,0x72,0xf8,0x7f,0x30,0xec,0xbf,0xff,0xff,0xf3,0x68,0x88,0xcf,0xa1, -0x00,0x00,0x7f,0x30,0x04,0x00,0x01,0xf8,0x05,0x0f,0xff,0xfd,0x80,0x08,0x88,0x9d, -0xf6,0x00,0x00,0x02,0xfa,0x0b,0xa0,0x00,0xfb,0x0e,0xd0,0x00,0xfc,0x04,0x00,0x13, -0xed,0x01,0x00,0xf2,0x02,0x00,0x00,0x0a,0xb5,0x00,0x7f,0xff,0x60,0x1e,0xe8,0x08, -0xf3,0x00,0xaf,0x10,0x0a,0xf1,0x05,0x00,0xf0,0x00,0xef,0xff,0xea,0x10,0xee,0x88, -0xcf,0xa0,0xed,0x00,0x0d,0xf0,0xed,0x00,0x0a,0x04,0x00,0x18,0xf1,0x04,0x00,0xf0, -0x11,0xfc,0x0a,0xfd,0x40,0xfc,0x07,0x7f,0xe0,0xfc,0x00,0x0a,0xf2,0xfc,0x00,0x08, -0xf3,0xfc,0x00,0x09,0xf2,0xde,0x00,0x0d,0xf0,0x8f,0xc9,0xdf,0x90,0x08,0xef,0xe8, -0x00,0x5b,0x00,0xfd,0x04,0x22,0xcf,0xff,0xc5,0x06,0x88,0x9f,0xf2,0x00,0x00,0x6f, -0x60,0x00,0x04,0xf7,0x00,0x00,0x4f,0x70,0x07,0x00,0xf4,0x47,0x7f,0xfe,0xa1,0x04, -0x88,0xbf,0xd0,0x00,0x00,0x9f,0x40,0x00,0x04,0xf6,0x00,0x00,0x4f,0x60,0x00,0x09, -0xf4,0x48,0x8b,0xfd,0x07,0xff,0xe9,0x10,0x47,0x10,0x00,0x09,0xf3,0x00,0x00,0x9f, -0x30,0x00,0x09,0xff,0xfe,0xa1,0x48,0x88,0xbf,0x90,0x00,0x00,0xfc,0x00,0x00,0x1f, -0xa0,0x00,0x0a,0xf5,0x00,0x2b,0xfb,0x00,0x9f,0xfa,0x00,0x0c,0xc4,0x00,0x00,0x10, -0x00,0x00,0xef,0xff,0xfb,0x30,0xee,0x88,0xaf,0xd0,0xed,0x00,0x09,0xf3,0xed,0x00, -0x06,0xf5,0x04,0x00,0xf5,0x1e,0xee,0x88,0x8b,0xf5,0xef,0xff,0xff,0xf5,0x6f,0x76, -0xdf,0xc2,0x00,0xdf,0xfd,0x9f,0xe0,0x04,0xfd,0x00,0x8f,0x40,0x5f,0x60,0x05,0xf5, -0x0a,0xf2,0x00,0x5f,0x60,0xee,0x00,0x05,0xf6,0x2f,0xa0,0x58,0xaf,0x67,0xf6,0x0b, -0xff,0xf6,0xed,0x01,0x00,0xfe,0x5f,0x3f,0xfa,0x01,0x8d,0xf5,0x00,0x3f,0x80,0x02, -0xf8,0x00,0x2f,0x90,0x02,0xf9,0x48,0x9f,0x98,0xff,0xf9,0xaf,0xff,0xff,0xb3,0x05, -0xdf,0x88,0xbf,0xe0,0x0e,0xb0,0x00,0xaf,0x31,0xfa,0x00,0x07,0xf5,0x1f,0xa0,0x00, -0x8f,0x40,0xfe,0x00,0x0c,0xf1,0x08,0xfd,0x9c,0xfa,0x00,0x08,0xdf,0xe9,0x00,0x4f, -0x90,0x06,0xf5,0x0d,0xe0,0x06,0xf5,0x08,0xf4,0x08,0xf3,0x02,0xfa,0x0b,0xf0,0x00, -0xcf,0x2f,0xb0,0x00,0x6f,0xff,0x40,0x8b,0xef,0xf7,0x00,0xbe,0xc9,0x20,0x00,0x2f, -0xff,0xfd,0x80,0x2f,0xc8,0x9e,0xf6,0x2f,0x90,0x02,0xfa,0x2f,0xff,0x10,0xfb,0x18, -0x88,0x00,0xfb,0x00,0x00,0x04,0x00,0xf7,0x29,0x1f,0xff,0xfc,0x50,0x1f,0xd8,0x9e, -0xf3,0x1f,0xa0,0x03,0xf9,0x1f,0xd8,0x10,0xfb,0x1f,0xff,0x30,0xfb,0x00,0x00,0x04, -0xf9,0x08,0x88,0xaf,0xf2,0x0f,0xff,0xeb,0x30,0x9f,0x50,0x0f,0xc0,0xee,0x11,0xfb, -0x05,0xf8,0x3f,0x80,0x0f,0xdd,0xf2,0x00,0xdf,0xb3,0x00,0x0d,0xd0,0x00,0x00,0xdd, -0x00,0x07,0x00,0xf0,0x1b,0x9f,0x70,0x08,0xf3,0x0c,0xf3,0x09,0xf2,0x02,0xfd,0x1d, -0xf0,0x00,0x5f,0xef,0x70,0x00,0x09,0xf9,0x00,0x00,0x00,0xdf,0x30,0x38,0x88,0xaf, -0xd0,0x6f,0xff,0xff,0xf3,0x3f,0xff,0xfe,0xa1,0x18,0x88,0x8c,0xf9,0x04,0x30,0x1a, -0x02,0xf1,0x06,0x01,0xfa,0x0e,0xd0,0x09,0xf5,0x0e,0xd0,0x9f,0xb0,0x0e,0xd7,0xfb, -0x00,0x0e,0xd4,0x50,0x00,0x0e,0xd0,0x00,0x04,0x00,0xbd,0xcf,0xff,0xc4,0x06,0x88, -0x9f,0xf1,0x00,0x00,0x6f,0x50,0xbb,0x01,0xf0,0x4c,0x8f,0x30,0x7f,0x40,0xde,0x5f, -0x60,0x8f,0x20,0xfc,0x2f,0x90,0xaf,0x11,0xfa,0x0f,0xc5,0xfd,0x03,0xf8,0x0c,0xff, -0xc3,0x06,0xf6,0x09,0xf3,0x00,0x2e,0xf1,0x07,0xfa,0x9b,0xff,0x70,0x04,0xff,0xed, -0x93,0x00,0x8f,0xff,0xff,0xc3,0x04,0xbf,0xb8,0xaf,0xe0,0x05,0xf6,0x00,0x9f,0x30, -0x5f,0x60,0x06,0xf4,0x05,0xf5,0x00,0x6f,0x40,0x6f,0x50,0x06,0xf4,0x5e,0xf2,0x00, -0x6f,0x49,0xe8,0x00,0x06,0xf4,0x00,0x00,0x00,0x0e,0xc0,0xf9,0x1f,0x64,0xf4,0x5f, -0x17,0xe0,0x8a,0x0b,0x80, +0x17,0x00,0x01,0x00,0x50,0x02,0x03,0xff,0xfd,0x03,0x08,0x00,0xc0,0x01,0xff,0xfe, +0x04,0x00,0x00,0x00,0x04,0x02,0xfe,0xfe,0x08,0x08,0x00,0x40,0x01,0xfe,0xfe,0x0a, +0x08,0x00,0x42,0x03,0xfe,0xfd,0x10,0x20,0x00,0xf0,0x0e,0x04,0x11,0x00,0xe0,0x08, +0x09,0x08,0x00,0x00,0x35,0x00,0x50,0x08,0x08,0x08,0x00,0x00,0x55,0x00,0x40,0x06, +0x06,0x08,0x00,0x00,0x6d,0x00,0x90,0x07,0x10,0x00,0x31,0x8d,0x00,0xd0,0x18,0x00, +0xf0,0x0d,0xad,0x00,0xf0,0x03,0x02,0x08,0x01,0x00,0xb5,0x00,0xc0,0x04,0x05,0x09, +0x00,0x00,0xcc,0x00,0x20,0x09,0x08,0x08,0x01,0x00,0xec,0x00,0xf0,0x08,0x08,0x00, +0xf1,0x14,0x0c,0x01,0xf0,0x03,0x02,0x05,0x01,0x03,0x11,0x01,0x80,0x07,0x07,0x0a, +0x00,0xfe,0x34,0x01,0x30,0x07,0x07,0x08,0x00,0x00,0x50,0x01,0x70,0x07,0x07,0x0c, +0x00,0xff,0x7a,0x01,0x60,0x30,0x00,0x40,0x9a,0x01,0x70,0x09,0x70,0x00,0x10,0xbe, +0x30,0x00,0xe1,0x0a,0x01,0xfe,0xc8,0x01,0xa0,0x05,0x05,0x08,0x00,0x00,0xdc,0x01, +0x10,0x18,0x00,0x31,0x00,0x02,0x10,0x70,0x00,0xb1,0x20,0x02,0xc0,0x08,0x08,0x0a, +0x00,0xfe,0x48,0x02,0x80,0x10,0x00,0x31,0x68,0x02,0x30,0x58,0x00,0x31,0x8b,0x02, +0xf0,0x98,0x00,0x31,0xab,0x02,0x80,0x20,0x00,0x31,0xd3,0x02,0x80,0x68,0x00,0xb2, +0xef,0x02,0x70,0x0a,0x0a,0x08,0x00,0x00,0x17,0x03,0x50,0x48,0x00,0xf4,0x41,0x00, +0x04,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x55,0x55,0x00,0x55,0x18,0x81, +0x05,0x50,0x0a,0xa0,0x01,0x10,0x0b,0xb0,0x01,0x10,0x55,0x0c,0xf3,0x00,0x9f,0x20, +0x2f,0xe1,0x0a,0xf1,0x00,0xaf,0xa0,0xed,0x00,0x7f,0xdf,0xbf,0x50,0x0d,0xd0,0xdf, +0x80,0x01,0xf9,0x03,0xfc,0x00,0x4f,0x70,0x08,0xf8,0x07,0xf4,0x00,0x0c,0xf4,0x3f, +0xff,0xe9,0x00,0x18,0x88,0xcf,0xa0,0x00,0x00,0x0d,0xe0,0x00,0x00,0x0b,0xf0,0x04, +0x00,0xff,0x1d,0x48,0x88,0x8d,0xf7,0x7f,0xff,0xff,0xfd,0x0f,0xfa,0x00,0x08,0xcf, +0x50,0x00,0x1f,0x90,0x00,0x0d,0xe0,0x04,0xef,0xf1,0x0e,0xd7,0xf5,0x4f,0x72,0xf8, +0x7f,0x30,0xec,0xbf,0xff,0xff,0xf3,0x68,0x88,0xcf,0xa1,0x00,0x00,0x7f,0x30,0x04, +0x00,0x01,0xf8,0x05,0x0f,0xff,0xfd,0x80,0x08,0x88,0x9d,0xf6,0x00,0x00,0x02,0xfa, +0x0b,0xa0,0x00,0xfb,0x0e,0xd0,0x00,0xfc,0x04,0x00,0x13,0xed,0x01,0x00,0xf2,0x02, +0x00,0x00,0x0a,0xb5,0x00,0x7f,0xff,0x60,0x1e,0xe8,0x08,0xf3,0x00,0xaf,0x10,0x0a, +0xf1,0x05,0x00,0xf0,0x00,0xef,0xff,0xea,0x10,0xee,0x88,0xcf,0xa0,0xed,0x00,0x0d, +0xf0,0xed,0x00,0x0a,0x04,0x00,0x18,0xf1,0x04,0x00,0xf0,0x11,0xfc,0x0a,0xfd,0x40, +0xfc,0x07,0x7f,0xe0,0xfc,0x00,0x0a,0xf2,0xfc,0x00,0x08,0xf3,0xfc,0x00,0x09,0xf2, +0xde,0x00,0x0d,0xf0,0x8f,0xc9,0xdf,0x90,0x08,0xef,0xe8,0x00,0x5b,0x00,0xfd,0x04, +0x22,0xcf,0xff,0xc5,0x06,0x88,0x9f,0xf2,0x00,0x00,0x6f,0x60,0x00,0x04,0xf7,0x00, +0x00,0x4f,0x70,0x07,0x00,0xf4,0x47,0x7f,0xfe,0xa1,0x04,0x88,0xbf,0xd0,0x00,0x00, +0x9f,0x40,0x00,0x04,0xf6,0x00,0x00,0x4f,0x60,0x00,0x09,0xf4,0x48,0x8b,0xfd,0x07, +0xff,0xe9,0x10,0x47,0x10,0x00,0x09,0xf3,0x00,0x00,0x9f,0x30,0x00,0x09,0xff,0xfe, +0xa1,0x48,0x88,0xbf,0x90,0x00,0x00,0xfc,0x00,0x00,0x1f,0xa0,0x00,0x0a,0xf5,0x00, +0x2b,0xfb,0x00,0x9f,0xfa,0x00,0x0c,0xc4,0x00,0x00,0x10,0x00,0x00,0xef,0xff,0xfb, +0x30,0xee,0x88,0xaf,0xd0,0xed,0x00,0x09,0xf3,0xed,0x00,0x06,0xf5,0x04,0x00,0xf5, +0x1e,0xee,0x88,0x8b,0xf5,0xef,0xff,0xff,0xf5,0x6f,0x76,0xdf,0xc2,0x00,0xdf,0xfd, +0x9f,0xe0,0x04,0xfd,0x00,0x8f,0x40,0x5f,0x60,0x05,0xf5,0x0a,0xf2,0x00,0x5f,0x60, +0xee,0x00,0x05,0xf6,0x2f,0xa0,0x58,0xaf,0x67,0xf6,0x0b,0xff,0xf6,0xed,0x01,0x00, +0xfe,0x5f,0x3f,0xfa,0x01,0x8d,0xf5,0x00,0x3f,0x80,0x02,0xf8,0x00,0x2f,0x90,0x02, +0xf9,0x48,0x9f,0x98,0xff,0xf9,0xaf,0xff,0xff,0xb3,0x05,0xdf,0x88,0xbf,0xe0,0x0e, +0xb0,0x00,0xaf,0x31,0xfa,0x00,0x07,0xf5,0x1f,0xa0,0x00,0x8f,0x40,0xfe,0x00,0x0c, +0xf1,0x08,0xfd,0x9c,0xfa,0x00,0x08,0xdf,0xe9,0x00,0x4f,0x90,0x06,0xf5,0x0d,0xe0, +0x06,0xf5,0x08,0xf4,0x08,0xf3,0x02,0xfa,0x0b,0xf0,0x00,0xcf,0x2f,0xb0,0x00,0x6f, +0xff,0x40,0x8b,0xef,0xf7,0x00,0xbe,0xc9,0x20,0x00,0x2f,0xff,0xfd,0x80,0x2f,0xc8, +0x9e,0xf6,0x2f,0x90,0x02,0xfa,0x2f,0xff,0x10,0xfb,0x18,0x88,0x00,0xfb,0x00,0x00, +0x04,0x00,0xf7,0x29,0x1f,0xff,0xfc,0x50,0x1f,0xd8,0x9e,0xf3,0x1f,0xa0,0x03,0xf9, +0x1f,0xd8,0x10,0xfb,0x1f,0xff,0x30,0xfb,0x00,0x00,0x04,0xf9,0x08,0x88,0xaf,0xf2, +0x0f,0xff,0xeb,0x30,0x9f,0x50,0x0f,0xc0,0xee,0x11,0xfb,0x05,0xf8,0x3f,0x80,0x0f, +0xdd,0xf2,0x00,0xdf,0xb3,0x00,0x0d,0xd0,0x00,0x00,0xdd,0x00,0x07,0x00,0xf0,0x1b, +0x9f,0x70,0x08,0xf3,0x0c,0xf3,0x09,0xf2,0x02,0xfd,0x1d,0xf0,0x00,0x5f,0xef,0x70, +0x00,0x09,0xf9,0x00,0x00,0x00,0xdf,0x30,0x38,0x88,0xaf,0xd0,0x6f,0xff,0xff,0xf3, +0x3f,0xff,0xfe,0xa1,0x18,0x88,0x8c,0xf9,0x04,0x30,0x1a,0x02,0xf1,0x06,0x01,0xfa, +0x0e,0xd0,0x09,0xf5,0x0e,0xd0,0x9f,0xb0,0x0e,0xd7,0xfb,0x00,0x0e,0xd4,0x50,0x00, +0x0e,0xd0,0x00,0x04,0x00,0xbd,0xcf,0xff,0xc4,0x06,0x88,0x9f,0xf1,0x00,0x00,0x6f, +0x50,0xbb,0x01,0xf0,0x3d,0x8f,0x30,0x7f,0x40,0xde,0x5f,0x60,0x8f,0x20,0xfc,0x2f, +0x90,0xaf,0x11,0xfa,0x0f,0xc5,0xfd,0x03,0xf8,0x0c,0xff,0xc3,0x06,0xf6,0x09,0xf3, +0x00,0x2e,0xf1,0x07,0xfa,0x9b,0xff,0x70,0x04,0xff,0xed,0x93,0x00,0x8f,0xff,0xff, +0xc3,0x04,0xbf,0xb8,0xaf,0xe0,0x05,0xf6,0x00,0x9f,0x30,0x5f,0x60,0x06,0xf4,0x05, +0xf5,0x00,0x6f,0x40,0x6f,0x50,0x06,0xf4,0x5e,0xf2,0x00,0x6f,0x49,0xe8,0x00,0x06, +0xf4, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_bold_STD __FLASH = { -.uncomp_size = 1057, -.comp_size = 933, +.uncomp_size = 1111, +.comp_size = 977, .line_height = 14, -.base_line = 2, +.base_line = 3, .subpx = 0, .underline_position = -1, .underline_thickness = 1, @@ -83,11 +86,11 @@ const etxLz4Font lv_font_he_bold_STD __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 1225, +.lvglFontBufSize = 1279, }; diff --git a/radio/src/fonts/lvgl/sml/lv_font_he_bold_XL.c b/radio/src/fonts/lvgl/sml/lv_font_he_bold_XL.c index 921c75f3e..f2b317ee1 100644 --- a/radio/src/fonts/lvgl/sml/lv_font_he_bold_XL.c +++ b/radio/src/fonts/lvgl/sml/lv_font_he_bold_XL.c @@ -2,137 +2,139 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf1,0x32,0x10,0x11,0x11,0x0f,0x00,0x00,0x80,0x00,0x00,0x10, -0x0f,0x0f,0x01,0x00,0xf1,0x00,0x00,0x0c,0x0c,0x0f,0x00,0x00,0x4b,0x01,0x90,0x0e, -0x0e,0x0f,0x00,0x00,0xb4,0x01,0xe0,0x10,0x0e,0x0f,0x01,0x00,0x1d,0x02,0x90,0x07, -0x04,0x0f,0x02,0x00,0x3b,0x02,0x20,0x09,0x09,0x10,0x00,0x00,0x83,0x02,0x80,0x11, -0x0e,0x0f,0x02,0x00,0xec,0x02,0x30,0x08,0x00,0xf0,0x06,0x55,0x03,0x90,0x07,0x04, -0x09,0x02,0x06,0x67,0x03,0x60,0x0e,0x0d,0x14,0x00,0xfb,0xe9,0x03,0xd0,0x0d,0x0d, -0x48,0x00,0xb0,0x04,0x50,0x0e,0x0e,0x16,0x00,0xff,0xe5,0x04,0x00,0x12,0x28,0x00, -0x40,0x4e,0x05,0x20,0x12,0x70,0x00,0xf1,0x04,0xce,0x05,0x90,0x07,0x04,0x14,0x02, -0xfb,0xf6,0x05,0xc0,0x0a,0x09,0x0f,0x00,0x00,0x3a,0x06,0x70,0x88,0x00,0xf1,0x04, -0xba,0x06,0x70,0x0f,0x0f,0x0f,0x00,0x00,0x2b,0x07,0xe0,0x10,0x0e,0x14,0x01,0xfb, -0xb7,0x07,0x50,0x80,0x00,0xb1,0x20,0x08,0xc0,0x0d,0x0e,0x14,0x00,0xfb,0xac,0x08, -0x40,0x20,0x00,0x31,0x1d,0x09,0x60,0x20,0x00,0x40,0xa9,0x09,0x60,0x0e,0x68,0x00, -0xf0,0x4a,0x0b,0x0a,0x20,0x14,0x14,0x0f,0x00,0x00,0xa1,0x0a,0xf0,0x11,0x10,0x0f, -0x00,0x00,0x19,0x0b,0xa0,0x0f,0x0c,0x08,0x02,0x0d,0x02,0xff,0xfd,0x00,0x00,0x00, -0x9f,0xfc,0x00,0x05,0xff,0xf9,0x00,0x00,0x0a,0xff,0xb0,0x00,0x09,0xff,0xf5,0x00, -0x00,0xcf,0xf9,0x00,0x00,0x0c,0xff,0xf2,0x00,0x0e,0xff,0x70,0x00,0x00,0x3f,0xff, -0xc0,0x02,0xff,0xf3,0x00,0x00,0x5f,0xff,0xff,0x80,0x8f,0xfd,0x00,0x00,0x1f,0xff, -0xef,0xff,0x8f,0xff,0x40,0x00,0x08,0xff,0xc0,0xdf,0xff,0x21,0x00,0x31,0xdf,0xf6, -0x02,0x08,0x00,0xf0,0x0d,0x1f,0xff,0x20,0x06,0xff,0xf8,0x00,0x00,0x04,0xff,0xf0, -0x00,0x0a,0xff,0xf4,0x00,0x00,0x7f,0xfd,0x00,0x00,0x0d,0xff,0xe1,0x00,0x0a,0xff, -0xa0,0x47,0x00,0xf0,0x14,0xb0,0x00,0xef,0xf7,0x00,0x00,0x00,0x7f,0xff,0x70,0x1f, -0xff,0x40,0x00,0x00,0x00,0xbf,0xff,0x30,0x6f,0xff,0xff,0xfd,0xa5,0x00,0x00,0x06, -0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x6f,0x08,0x00,0x11,0xfa,0x78,0x01,0x31,0x4d, -0xff,0xf1,0x08,0x00,0x31,0x3f,0xff,0x50,0x08,0x00,0x01,0x3b,0x00,0x00,0x4f,0x00, -0x11,0x70,0x08,0x00,0x21,0xcf,0xf8,0x07,0x00,0x3f,0x0c,0xff,0x80,0x0f,0x00,0x04, -0x12,0xff,0x01,0x00,0x12,0x1f,0x07,0x00,0x13,0xf2,0x0f,0x00,0x40,0x20,0x00,0xff, -0xfe,0x23,0x00,0x31,0xff,0xff,0xfb,0x06,0x00,0x61,0xff,0x30,0x00,0x00,0x00,0x2e, -0x36,0x00,0x72,0x07,0xff,0xd0,0x00,0x00,0x00,0x02,0x77,0x00,0x62,0xef,0xf5,0x00, -0x00,0x00,0x39,0x14,0x01,0x00,0x23,0x01,0xf1,0x15,0x9f,0xff,0xcf,0xff,0x00,0x01, -0xff,0xf6,0x0f,0xff,0x40,0x06,0xff,0xe0,0x0c,0xff,0x80,0x0a,0xff,0xa0,0x08,0xff, -0xb0,0x0e,0xff,0x70,0x04,0xff,0xf0,0x1f,0xff,0x30,0x01,0xff,0xf3,0x8f,0x61,0x00, -0x13,0xfe,0x07,0x00,0x11,0x7f,0x07,0x00,0x10,0xfd,0x4c,0x00,0x3f,0x4f,0xff,0x00, -0x07,0x00,0x3a,0x81,0x2f,0xff,0xff,0xff,0xec,0x82,0x00,0x2f,0x62,0x00,0x22,0x50, -0x2f,0xe0,0x00,0x00,0x1c,0x00,0x22,0x28,0xff,0x24,0x01,0x50,0xbf,0xfb,0x02,0x33, -0x10,0x7e,0x01,0x7f,0x0e,0xff,0x60,0x00,0x00,0x6f,0xfe,0x07,0x00,0x25,0x2f,0xef, -0xf6,0x02,0x00,0x09,0x70,0x24,0x00,0x00,0x00,0x06,0xfe,0x93,0xb5,0x01,0x40,0xfe, -0x93,0x04,0xef,0x52,0x01,0xe0,0x49,0xef,0xff,0xc0,0x00,0x2c,0xff,0xfc,0x00,0x0d, -0xff,0xa1,0x30,0x03,0x4a,0x01,0x20,0x5f,0xff,0xdd,0x01,0x10,0xe0,0x4e,0x00,0x0f, -0x09,0x00,0x05,0x82,0xef,0xff,0xff,0xff,0xda,0x50,0x00,0xef,0x03,0x02,0x11,0xef, -0xcf,0x00,0x31,0xa0,0xef,0xf6,0x02,0x02,0x00,0x07,0x00,0x51,0x03,0xff,0xf5,0xef, -0xf6,0x01,0x02,0x01,0x07,0x00,0x13,0xdf,0x07,0x00,0x1f,0xf8,0x07,0x00,0x1e,0xe2, -0xff,0xf4,0x00,0x8d,0xff,0xc6,0x00,0xff,0xf4,0x00,0xdf,0xff,0xff,0x80,0x07,0x00, -0xa0,0xf2,0xff,0xf4,0x00,0x62,0x07,0xff,0xf7,0xff,0xf4,0x23,0x00,0x11,0xfa,0x07, -0x00,0x21,0xaf,0xfc,0x07,0x00,0x22,0x9f,0xfd,0x07,0x00,0x12,0xfc,0x15,0x00,0x21, -0xfb,0xff,0x46,0x00,0x30,0xf9,0xdf,0xfa,0xe1,0x02,0x82,0xf6,0x9f,0xff,0x81,0x01, -0x6f,0xff,0xf0,0x7e,0x01,0x50,0x70,0x05,0xff,0xff,0xff,0xfa,0x02,0x6c,0x28,0xcf, -0xff,0xd9,0x30,0x00,0x2a,0x01,0x31,0x00,0x00,0x8f,0xe7,0x02,0x30,0x08,0xff,0xff, -0x26,0x01,0x01,0x22,0x02,0x12,0xf9,0xe4,0x02,0x12,0xf0,0xe3,0x02,0x20,0x30,0x00, -0x8e,0x02,0x10,0xf5,0x06,0x00,0x00,0x7c,0x01,0x00,0xee,0x00,0x1f,0xf6,0x0d,0x00, -0x3b,0x61,0x0f,0xff,0xff,0xeb,0x71,0x00,0x16,0x03,0x30,0xf4,0x00,0x0f,0x07,0x00, -0x10,0xf3,0xee,0x02,0x50,0xaf,0xff,0xb0,0x00,0x00,0xdf,0x02,0x11,0x10,0xfc,0x02, -0x09,0x82,0x00,0x16,0xf7,0x0d,0x00,0x35,0x02,0xff,0xf4,0x27,0x00,0x43,0x02,0x9f, -0xff,0xb0,0x41,0x00,0x00,0x06,0x00,0x20,0xe4,0x00,0x5b,0x00,0x15,0x70,0x30,0x05, -0x3f,0x2f,0xff,0x30,0x07,0x00,0x0e,0x00,0xea,0x01,0x12,0x80,0xc1,0x02,0x32,0xfd, -0x10,0x2f,0xf2,0x01,0x00,0x19,0x00,0x12,0x3d,0x10,0x01,0x12,0x05,0x84,0x03,0x00, -0x47,0x04,0x01,0x98,0x03,0x12,0xe0,0xf9,0x03,0x01,0x23,0x00,0x11,0x7f,0x3a,0x04, -0x11,0x07,0xbf,0x03,0xb0,0x01,0xaf,0xff,0xe1,0x00,0x00,0x01,0x8f,0xff,0xfe,0x30, -0x19,0x00,0x20,0xff,0xe3,0xa8,0x01,0x31,0xff,0xfa,0x10,0xaf,0x01,0x01,0x6a,0x00, -0x21,0x77,0x20,0xca,0x00,0x02,0x31,0x03,0x02,0x5b,0x02,0x22,0x60,0xef,0x31,0x03, -0x00,0x20,0x01,0x31,0x18,0xff,0xf9,0x27,0x01,0x21,0xaf,0xfd,0x07,0x00,0x21,0x6f, -0xff,0x07,0x00,0x1f,0x4f,0x07,0x00,0x12,0x02,0x50,0x04,0x0a,0x07,0x00,0xe0,0x2f, -0xff,0x70,0x06,0xce,0xfe,0xa3,0x00,0x00,0x8f,0xfe,0x1c,0xff,0xff,0x31,0x02,0x22, -0xef,0xfe,0x9e,0x03,0x10,0x06,0x1f,0x02,0x70,0x5f,0xff,0x90,0x00,0x0c,0xff,0xf9, -0x5b,0x02,0x00,0x13,0x02,0x72,0x10,0x00,0x05,0xff,0xf0,0x00,0x0d,0x1c,0x05,0x11, -0x10,0x63,0x01,0x61,0x02,0xff,0xf2,0x00,0x6f,0xff,0x23,0x01,0x42,0x20,0x0b,0xff, -0xb0,0x11,0x00,0x22,0xff,0xf7,0x11,0x00,0x00,0x27,0x02,0x00,0x11,0x00,0x50,0x08, -0xff,0xf0,0x00,0xaf,0xcc,0x04,0x40,0xcf,0xfb,0x00,0x0b,0x5e,0x00,0x50,0x0f,0xff, -0x70,0x00,0xbf,0x11,0x00,0x2f,0xef,0xf6,0x02,0x00,0x13,0x40,0x06,0xff,0xfd,0x80, -0x6c,0x05,0x10,0xc0,0x78,0x05,0x30,0x40,0x00,0x05,0xbb,0x02,0x01,0x6f,0x00,0x30, -0x8f,0xfc,0x00,0xd7,0x05,0x0f,0x09,0x00,0x03,0x00,0x4b,0x05,0x10,0xc2,0xbb,0x01, -0x00,0xb2,0x01,0x11,0xc0,0xab,0x05,0x42,0xec,0x81,0x00,0x06,0xfb,0x00,0x10,0xf5, -0x1f,0x06,0x04,0xec,0x00,0x10,0x90,0x59,0x02,0x40,0xa0,0x00,0xdf,0xf4,0x8b,0x05, -0x10,0xfe,0xbc,0x00,0x00,0xb3,0x01,0x41,0xf0,0x04,0xff,0xf1,0x66,0x01,0x40,0x10, -0x5f,0xff,0x00,0xfc,0x03,0x12,0xf0,0xe9,0x01,0x60,0x7f,0xff,0x00,0x3f,0xff,0x40, -0x6a,0x05,0x20,0xd0,0x00,0xd8,0x01,0xe1,0x01,0xff,0xfa,0x00,0x0b,0xff,0xf9,0x10, -0x04,0xdf,0xff,0x30,0x00,0x3f,0x55,0x00,0x10,0x90,0x73,0x01,0x02,0x08,0x00,0x60, -0x00,0x18,0xce,0xff,0xd9,0x30,0xb0,0x00,0x10,0xd0,0x38,0x01,0xb0,0x20,0x5f,0xff, -0x30,0x00,0x03,0xff,0xf2,0x00,0xef,0xf9,0x24,0x00,0x41,0x10,0x09,0xff,0xe0,0x57, -0x01,0x00,0x52,0x00,0x00,0x62,0x04,0xa1,0xcf,0xfa,0x00,0x09,0xff,0xc0,0x00,0x06, -0xff,0xf1,0xd5,0x06,0x60,0x1f,0xff,0x60,0x2f,0xff,0x50,0xe4,0x03,0x30,0x09,0xff, -0xf0,0x63,0x02,0x31,0xf8,0xff,0xf8,0xe6,0x02,0x70,0xff,0xfe,0x00,0x01,0x34,0x68, -0xef,0x11,0x06,0x10,0x8f,0x97,0x02,0x11,0x30,0xae,0x03,0x10,0xe7,0x9f,0x00,0x41, -0xed,0xb8,0x40,0x00,0xb8,0x00,0x01,0x43,0x03,0x11,0x6f,0xdf,0x05,0x21,0x40,0x6f, -0x98,0x00,0x10,0xe1,0x63,0x00,0x50,0x2a,0xff,0xf7,0x6f,0xfe,0x1c,0x04,0x11,0xfb, -0x07,0x00,0x21,0x8f,0xfc,0x07,0x00,0x93,0x7f,0xfd,0x6f,0xff,0xff,0xe0,0x00,0x6f, -0xfe,0x07,0x00,0x51,0x5f,0xff,0xff,0xd0,0x00,0x1a,0x00,0x1f,0x00,0x07,0x00,0x2f, -0x10,0x4f,0x8c,0x00,0x12,0x60,0x14,0x01,0x31,0xfd,0x20,0x4f,0x8c,0x00,0x90,0xd0, -0x4f,0xff,0x10,0x00,0x3b,0xff,0xf5,0x4f,0xa5,0x03,0x21,0xef,0xfa,0x07,0x00,0x91, -0x9f,0xfd,0x4f,0xff,0xff,0xf0,0x00,0x7f,0xfe,0x07,0x00,0x12,0x6f,0x07,0x00,0x00, -0x96,0x07,0x01,0xe7,0x04,0x11,0x00,0xda,0x03,0x01,0x3a,0x07,0x42,0x5e,0xff,0xf3, -0x1f,0x6a,0x01,0x12,0x2f,0x9e,0x04,0x00,0x07,0x00,0x10,0xd9,0x0c,0x01,0xa0,0x30, -0x00,0x04,0xff,0xf1,0x0d,0xff,0xd0,0x00,0x06,0xc1,0x01,0x31,0xf7,0x00,0x07,0x7e, -0x02,0x80,0x10,0x08,0xff,0xd0,0x00,0x1f,0xff,0x80,0x36,0x02,0x30,0x08,0xff,0xe0, -0x82,0x02,0x40,0x02,0xff,0xf3,0x8f,0xe9,0x01,0x42,0xff,0xfe,0xff,0xf9,0x75,0x03, -0x10,0x80,0x07,0x00,0x26,0xfd,0x72,0x8e,0x04,0x0f,0x07,0x00,0x2a,0x00,0x38,0x08, -0x00,0x86,0x01,0x00,0x37,0x08,0x00,0x74,0x00,0x40,0x01,0xef,0xfd,0x10,0xba,0x08, -0x11,0x03,0x2f,0x02,0x51,0xa0,0x00,0x07,0xff,0xf6,0xb4,0x04,0x40,0x0a,0xff,0xf3, -0x7f,0x88,0x00,0x22,0x1d,0xff,0x82,0x00,0x42,0x3f,0xff,0xfe,0x60,0xc0,0x01,0x12, -0x80,0xf8,0x00,0x00,0x42,0x04,0x00,0xaf,0x01,0x22,0xfe,0x20,0x01,0x01,0x00,0xaf, -0x06,0x02,0xf5,0x00,0x02,0xc7,0x03,0x22,0xe0,0x0e,0xc3,0x07,0x01,0x09,0x02,0x32, -0xfe,0xb6,0x00,0xd2,0x07,0x12,0xc0,0xd2,0x07,0x12,0xf7,0x9a,0x04,0x00,0x3c,0x01, -0x00,0xc4,0x03,0x12,0x00,0x5a,0x00,0x01,0x26,0x05,0x03,0x70,0x07,0x20,0xbf,0xfa, -0x07,0x00,0x30,0x01,0xff,0xf5,0x07,0x00,0x30,0x0b,0xff,0xe0,0x07,0x00,0xf0,0x08, -0x9f,0xff,0x60,0x0e,0xff,0x60,0x1b,0xff,0xfb,0x00,0x0e,0xff,0x61,0xff,0xff,0xc0, -0x00,0x0e,0xff,0x62,0xff,0xfa,0x10,0x07,0x00,0x30,0xfe,0x60,0x00,0x15,0x00,0x16, -0x70,0x79,0x05,0x0f,0x07,0x00,0x02,0x07,0x42,0x06,0x1f,0xfc,0x42,0x06,0x43,0x30, -0x3f,0xff,0x30,0x41,0x03,0x90,0x04,0xff,0xf1,0x0f,0xff,0x60,0x00,0x5f,0xff,0xf1, -0x01,0x30,0x0d,0xff,0x90,0x75,0x02,0x90,0x08,0xff,0xd0,0x0a,0xff,0xc0,0x00,0x8f, -0xfc,0x22,0x0a,0x01,0x01,0x02,0x60,0xfb,0x00,0x0c,0xff,0x90,0x04,0x77,0x03,0x10, -0xf8,0x25,0x0a,0x41,0x01,0xff,0xf5,0x18,0x58,0x06,0x02,0xc8,0x07,0x11,0xb0,0xea, -0x05,0x11,0xbf,0xa4,0x00,0x20,0x7f,0xff,0x04,0x00,0x10,0x74,0x71,0x01,0x11,0xfc, -0xa2,0x03,0x00,0xa2,0x01,0x10,0xf6,0x8a,0x03,0x40,0x50,0x01,0x37,0xef,0xdc,0x05, -0x03,0x6f,0x01,0x01,0xd4,0x03,0x00,0x01,0x00,0x20,0x91,0x00,0x73,0x04,0x43,0xfe, -0xdc,0xa7,0x40,0x2c,0x06,0x33,0xff,0xec,0x92,0xee,0x08,0x24,0xff,0x60,0xd0,0x09, -0x00,0xeb,0x09,0x00,0xc0,0x05,0x02,0xf3,0x09,0x22,0xaf,0xfc,0x08,0x00,0x22,0x6f, -0xfe,0x08,0x00,0x2d,0x5f,0xff,0x08,0x00,0x00,0x39,0x0a,0x00,0x08,0x00,0x00,0xdd, -0x00,0x00,0x08,0x00,0x30,0x8f,0xff,0x40,0x08,0x00,0x40,0x3f,0xff,0xff,0x00,0x08, -0x00,0x32,0x4f,0xff,0xf7,0x08,0x00,0x31,0xec,0x60,0x00,0x20,0x00,0xf0,0x00,0x9c, -0xc6,0x03,0xcc,0xb0,0x00,0xff,0xf3,0x08,0xff,0xa0,0x03,0xff,0xd0,0x0b,0xf8,0x09, -0xf0,0x0d,0x70,0x0f,0xfe,0x00,0x09,0xff,0x10,0x2f,0xf8,0x00,0x0d,0xfb,0x00,0x6f, -0xf2,0x00,0x0f,0xf5,0x00,0x9f,0xd0,0x00,0x4f,0xf0,0x00,0xdf,0x70,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x05,0xff,0xfb,0x05,0x08,0x00,0xf3,0x05,0x02,0xff, +0xfc,0x07,0x00,0x00,0x00,0x06,0x05,0xfd,0xfb,0x16,0x00,0x00,0x00,0x04,0x03,0xfe, +0xfc,0x1c,0x08,0x00,0x12,0x22,0x20,0x00,0xf1,0x35,0x08,0x24,0x00,0x10,0x11,0x11, +0x0f,0x00,0x00,0xa4,0x00,0x00,0x10,0x0f,0x0f,0x01,0x00,0x15,0x01,0x00,0x0c,0x0c, +0x0f,0x00,0x00,0x6f,0x01,0x90,0x0e,0x0e,0x0f,0x00,0x00,0xd8,0x01,0xe0,0x10,0x0e, +0x0f,0x01,0x00,0x41,0x02,0x90,0x07,0x04,0x0f,0x02,0x00,0x5f,0x02,0x20,0x09,0x09, +0x10,0x00,0x00,0xa7,0x02,0x80,0x11,0x0e,0x0f,0x02,0x00,0x10,0x03,0x30,0x08,0x00, +0xf0,0x06,0x79,0x03,0x90,0x07,0x04,0x09,0x02,0x06,0x8b,0x03,0x60,0x0e,0x0d,0x14, +0x00,0xfb,0x0d,0x04,0xd0,0x0d,0x0d,0x48,0x00,0xb0,0x04,0x50,0x0e,0x0e,0x16,0x00, +0xff,0x09,0x05,0x00,0x12,0x28,0x00,0x40,0x72,0x05,0x20,0x12,0x70,0x00,0xf1,0x04, +0xf2,0x05,0x90,0x07,0x04,0x14,0x02,0xfb,0x1a,0x06,0xc0,0x0a,0x09,0x0f,0x00,0x00, +0x5e,0x06,0x70,0x88,0x00,0xf1,0x04,0xde,0x06,0x70,0x0f,0x0f,0x0f,0x00,0x00,0x4f, +0x07,0xe0,0x10,0x0e,0x14,0x01,0xfb,0xdb,0x07,0x50,0x80,0x00,0xb1,0x44,0x08,0xc0, +0x0d,0x0e,0x14,0x00,0xfb,0xd0,0x08,0x40,0x20,0x00,0x31,0x41,0x09,0x60,0x20,0x00, +0x40,0xcd,0x09,0x60,0x0e,0x68,0x00,0xe0,0x2f,0x0a,0x20,0x14,0x14,0x0f,0x00,0x00, +0xc5,0x0a,0xf0,0x11,0x10,0x0f,0x06,0x01,0xf0,0x08,0x04,0x00,0x06,0x00,0x07,0x00, +0x08,0x00,0x0c,0x00,0xbb,0xcc,0x00,0xbb,0xcc,0xbb,0xcc,0x2e,0x55,0xe2,0x3f,0x55, +0xe3,0x1b,0x00,0xf0,0x45,0xbb,0x00,0x00,0xcc,0x00,0x00,0x00,0xff,0xff,0x33,0x33, +0xbb,0xbb,0x9d,0xd9,0x0a,0xb0,0xaa,0xcc,0x02,0xff,0xfd,0x00,0x00,0x00,0x9f,0xfc, +0x00,0x05,0xff,0xf9,0x00,0x00,0x0a,0xff,0xb0,0x00,0x09,0xff,0xf5,0x00,0x00,0xcf, +0xf9,0x00,0x00,0x0c,0xff,0xf2,0x00,0x0e,0xff,0x70,0x00,0x00,0x3f,0xff,0xc0,0x02, +0xff,0xf3,0x00,0x00,0x5f,0xff,0xff,0x80,0x8f,0xfd,0x00,0x00,0x1f,0xff,0xef,0xff, +0x8f,0xff,0x40,0x00,0x08,0xff,0xc0,0xdf,0xff,0x21,0x00,0x31,0xdf,0xf6,0x02,0x08, +0x00,0xf0,0x0d,0x1f,0xff,0x20,0x06,0xff,0xf8,0x00,0x00,0x04,0xff,0xf0,0x00,0x0a, +0xff,0xf4,0x00,0x00,0x7f,0xfd,0x00,0x00,0x0d,0xff,0xe1,0x00,0x0a,0xff,0xa0,0x47, +0x00,0xf0,0x14,0xb0,0x00,0xef,0xf7,0x00,0x00,0x00,0x7f,0xff,0x70,0x1f,0xff,0x40, +0x00,0x00,0x00,0xbf,0xff,0x30,0x6f,0xff,0xff,0xfd,0xa5,0x00,0x00,0x06,0xff,0xff, +0xff,0xff,0xfc,0x00,0x00,0x6f,0x08,0x00,0x11,0xfa,0xce,0x01,0x31,0x4d,0xff,0xf1, +0x08,0x00,0x31,0x3f,0xff,0x50,0x08,0x00,0x01,0x3b,0x00,0x00,0x4f,0x00,0x11,0x70, +0x08,0x00,0x21,0xcf,0xf8,0x07,0x00,0x3f,0x0c,0xff,0x80,0x0f,0x00,0x04,0x12,0xff, +0x01,0x00,0x12,0x1f,0x07,0x00,0x13,0xf2,0x0f,0x00,0x51,0x20,0x00,0xff,0xfe,0x80, +0x04,0x01,0x11,0xfb,0x06,0x00,0x61,0xff,0x30,0x00,0x00,0x00,0x2e,0x36,0x00,0x30, +0x07,0xff,0xd0,0x1d,0x02,0x02,0x77,0x00,0x62,0xef,0xf5,0x00,0x00,0x00,0x39,0x14, +0x01,0x00,0x23,0x01,0xf1,0x15,0x9f,0xff,0xcf,0xff,0x00,0x01,0xff,0xf6,0x0f,0xff, +0x40,0x06,0xff,0xe0,0x0c,0xff,0x80,0x0a,0xff,0xa0,0x08,0xff,0xb0,0x0e,0xff,0x70, +0x04,0xff,0xf0,0x1f,0xff,0x30,0x01,0xff,0xf3,0x8f,0x61,0x00,0x13,0xfe,0x07,0x00, +0x11,0x7f,0x07,0x00,0x10,0xfd,0x4c,0x00,0x3f,0x4f,0xff,0x00,0x07,0x00,0x3a,0x81, +0x2f,0xff,0xff,0xff,0xec,0x82,0x00,0x2f,0x62,0x00,0x22,0x50,0x2f,0xe0,0x00,0x00, +0x1c,0x00,0x22,0x28,0xff,0x24,0x01,0x50,0xbf,0xfb,0x02,0x33,0x10,0x7e,0x01,0x7f, +0x0e,0xff,0x60,0x00,0x00,0x6f,0xfe,0x07,0x00,0x25,0x2f,0xef,0xf6,0x02,0x00,0x09, +0x10,0x24,0x63,0x03,0x20,0xfe,0x93,0xb5,0x01,0x40,0xfe,0x93,0x04,0xef,0x52,0x01, +0xe0,0x49,0xef,0xff,0xc0,0x00,0x2c,0xff,0xfc,0x00,0x0d,0xff,0xa1,0x30,0x03,0x4a, +0x01,0x20,0x5f,0xff,0xdd,0x01,0x10,0xe0,0x4e,0x00,0x0f,0x09,0x00,0x05,0x82,0xef, +0xff,0xff,0xff,0xda,0x50,0x00,0xef,0x03,0x02,0x11,0xef,0xcf,0x00,0x31,0xa0,0xef, +0xf6,0x02,0x02,0x00,0x07,0x00,0x51,0x03,0xff,0xf5,0xef,0xf6,0x01,0x02,0x01,0x07, +0x00,0x13,0xdf,0x07,0x00,0x1f,0xf8,0x07,0x00,0x1e,0xe2,0xff,0xf4,0x00,0x8d,0xff, +0xc6,0x00,0xff,0xf4,0x00,0xdf,0xff,0xff,0x80,0x07,0x00,0xa0,0xf2,0xff,0xf4,0x00, +0x62,0x07,0xff,0xf7,0xff,0xf4,0x23,0x00,0x11,0xfa,0x07,0x00,0x21,0xaf,0xfc,0x07, +0x00,0x22,0x9f,0xfd,0x07,0x00,0x12,0xfc,0x15,0x00,0x21,0xfb,0xff,0x46,0x00,0x30, +0xf9,0xdf,0xfa,0xe1,0x02,0x82,0xf6,0x9f,0xff,0x81,0x01,0x6f,0xff,0xf0,0x7e,0x01, +0x50,0x70,0x05,0xff,0xff,0xff,0xfa,0x02,0x6c,0x28,0xcf,0xff,0xd9,0x30,0x00,0x2a, +0x01,0x31,0x00,0x00,0x8f,0xe7,0x02,0x30,0x08,0xff,0xff,0x26,0x01,0x01,0x22,0x02, +0x12,0xf9,0xe4,0x02,0x12,0xf0,0xe3,0x02,0x20,0x30,0x00,0x8e,0x02,0x10,0xf5,0x06, +0x00,0x00,0x7c,0x01,0x00,0xee,0x00,0x1f,0xf6,0x0d,0x00,0x3b,0x61,0x0f,0xff,0xff, +0xeb,0x71,0x00,0x16,0x03,0x30,0xf4,0x00,0x0f,0x07,0x00,0x10,0xf3,0xee,0x02,0x50, +0xaf,0xff,0xb0,0x00,0x00,0xdf,0x02,0x11,0x10,0xfc,0x02,0x09,0x82,0x00,0x16,0xf7, +0x0d,0x00,0x35,0x02,0xff,0xf4,0x27,0x00,0x43,0x02,0x9f,0xff,0xb0,0x41,0x00,0x00, +0x06,0x00,0x20,0xe4,0x00,0x5b,0x00,0x15,0x70,0x86,0x05,0x3f,0x2f,0xff,0x30,0x07, +0x00,0x0e,0x00,0xea,0x01,0x12,0x80,0xc1,0x02,0x32,0xfd,0x10,0x2f,0xf2,0x01,0x00, +0x19,0x00,0x12,0x3d,0x10,0x01,0x12,0x05,0x84,0x03,0x00,0x47,0x04,0x01,0x98,0x03, +0x12,0xe0,0xf9,0x03,0x01,0x23,0x00,0x11,0x7f,0x3a,0x04,0x11,0x07,0xbf,0x03,0xb0, +0x01,0xaf,0xff,0xe1,0x00,0x00,0x01,0x8f,0xff,0xfe,0x30,0x19,0x00,0x20,0xff,0xe3, +0xa8,0x01,0x31,0xff,0xfa,0x10,0xaf,0x01,0x01,0x6a,0x00,0x21,0x77,0x20,0xca,0x00, +0x02,0x31,0x03,0x02,0x5b,0x02,0x22,0x60,0xef,0x31,0x03,0x00,0x20,0x01,0x31,0x18, +0xff,0xf9,0x27,0x01,0x21,0xaf,0xfd,0x07,0x00,0x21,0x6f,0xff,0x07,0x00,0x1f,0x4f, +0x07,0x00,0x12,0x02,0x50,0x04,0x0a,0x07,0x00,0xe0,0x2f,0xff,0x70,0x06,0xce,0xfe, +0xa3,0x00,0x00,0x8f,0xfe,0x1c,0xff,0xff,0x31,0x02,0x22,0xef,0xfe,0x9e,0x03,0x10, +0x06,0x1f,0x02,0x70,0x5f,0xff,0x90,0x00,0x0c,0xff,0xf9,0x5b,0x02,0x00,0x13,0x02, +0x72,0x10,0x00,0x05,0xff,0xf0,0x00,0x0d,0x1c,0x05,0x11,0x10,0x63,0x01,0x61,0x02, +0xff,0xf2,0x00,0x6f,0xff,0x23,0x01,0x42,0x20,0x0b,0xff,0xb0,0x11,0x00,0x22,0xff, +0xf7,0x11,0x00,0x00,0x27,0x02,0x00,0x11,0x00,0x50,0x08,0xff,0xf0,0x00,0xaf,0xcc, +0x04,0x40,0xcf,0xfb,0x00,0x0b,0x5e,0x00,0x50,0x0f,0xff,0x70,0x00,0xbf,0x11,0x00, +0x2f,0xef,0xf6,0x02,0x00,0x13,0x40,0x06,0xff,0xfd,0x80,0x6c,0x05,0x10,0xc0,0x78, +0x05,0x30,0x40,0x00,0x05,0xbb,0x02,0x01,0x6f,0x00,0x30,0x8f,0xfc,0x00,0xd7,0x05, +0x0f,0x09,0x00,0x03,0x00,0x4b,0x05,0x10,0xc2,0xbb,0x01,0x00,0xb2,0x01,0x11,0xc0, +0xab,0x05,0x42,0xec,0x81,0x00,0x06,0xfb,0x00,0x10,0xf5,0x1f,0x06,0x04,0xec,0x00, +0x10,0x90,0x59,0x02,0x40,0xa0,0x00,0xdf,0xf4,0x8b,0x05,0x10,0xfe,0xbc,0x00,0x00, +0xb3,0x01,0x41,0xf0,0x04,0xff,0xf1,0x66,0x01,0x40,0x10,0x5f,0xff,0x00,0xfc,0x03, +0x12,0xf0,0xe9,0x01,0x60,0x7f,0xff,0x00,0x3f,0xff,0x40,0x6a,0x05,0x20,0xd0,0x00, +0xd8,0x01,0xe1,0x01,0xff,0xfa,0x00,0x0b,0xff,0xf9,0x10,0x04,0xdf,0xff,0x30,0x00, +0x3f,0x55,0x00,0x10,0x90,0x73,0x01,0x02,0x08,0x00,0x60,0x00,0x18,0xce,0xff,0xd9, +0x30,0xb0,0x00,0x10,0xd0,0x38,0x01,0xb0,0x20,0x5f,0xff,0x30,0x00,0x03,0xff,0xf2, +0x00,0xef,0xf9,0x24,0x00,0x41,0x10,0x09,0xff,0xe0,0x57,0x01,0x00,0x52,0x00,0x00, +0x62,0x04,0xa1,0xcf,0xfa,0x00,0x09,0xff,0xc0,0x00,0x06,0xff,0xf1,0xd5,0x06,0x60, +0x1f,0xff,0x60,0x2f,0xff,0x50,0xe4,0x03,0x30,0x09,0xff,0xf0,0x63,0x02,0x31,0xf8, +0xff,0xf8,0xe6,0x02,0x70,0xff,0xfe,0x00,0x01,0x34,0x68,0xef,0x11,0x06,0x10,0x8f, +0x97,0x02,0x11,0x30,0xae,0x03,0x10,0xe7,0x9f,0x00,0x41,0xed,0xb8,0x40,0x00,0xb8, +0x00,0x01,0x43,0x03,0x11,0x6f,0xdf,0x05,0x21,0x40,0x6f,0x98,0x00,0x10,0xe1,0x63, +0x00,0x50,0x2a,0xff,0xf7,0x6f,0xfe,0x1c,0x04,0x11,0xfb,0x07,0x00,0x21,0x8f,0xfc, +0x07,0x00,0x93,0x7f,0xfd,0x6f,0xff,0xff,0xe0,0x00,0x6f,0xfe,0x07,0x00,0x51,0x5f, +0xff,0xff,0xd0,0x00,0x1a,0x00,0x1f,0x00,0x07,0x00,0x2f,0x10,0x4f,0x8c,0x00,0x12, +0x60,0x14,0x01,0x31,0xfd,0x20,0x4f,0x8c,0x00,0x90,0xd0,0x4f,0xff,0x10,0x00,0x3b, +0xff,0xf5,0x4f,0xa5,0x03,0x21,0xef,0xfa,0x07,0x00,0x91,0x9f,0xfd,0x4f,0xff,0xff, +0xf0,0x00,0x7f,0xfe,0x07,0x00,0x12,0x6f,0x07,0x00,0x00,0x96,0x07,0x01,0xe7,0x04, +0x11,0x00,0xda,0x03,0x01,0x3a,0x07,0x42,0x5e,0xff,0xf3,0x1f,0x6a,0x01,0x12,0x2f, +0x9e,0x04,0x00,0x07,0x00,0x10,0xd9,0x0c,0x01,0xa0,0x30,0x00,0x04,0xff,0xf1,0x0d, +0xff,0xd0,0x00,0x06,0xc1,0x01,0x31,0xf7,0x00,0x07,0x7e,0x02,0x80,0x10,0x08,0xff, +0xd0,0x00,0x1f,0xff,0x80,0x36,0x02,0x30,0x08,0xff,0xe0,0x82,0x02,0x40,0x02,0xff, +0xf3,0x8f,0xe9,0x01,0x42,0xff,0xfe,0xff,0xf9,0x75,0x03,0x10,0x80,0x07,0x00,0x26, +0xfd,0x72,0x8e,0x04,0x0f,0x07,0x00,0x2a,0x00,0x38,0x08,0x00,0x86,0x01,0x00,0x37, +0x08,0x00,0x74,0x00,0x40,0x01,0xef,0xfd,0x10,0xba,0x08,0x11,0x03,0x2f,0x02,0x51, +0xa0,0x00,0x07,0xff,0xf6,0xb4,0x04,0x40,0x0a,0xff,0xf3,0x7f,0x88,0x00,0x22,0x1d, +0xff,0x82,0x00,0x42,0x3f,0xff,0xfe,0x60,0xc0,0x01,0x12,0x80,0xf8,0x00,0x00,0x42, +0x04,0x00,0xaf,0x01,0x22,0xfe,0x20,0x01,0x01,0x00,0xaf,0x06,0x02,0xf5,0x00,0x02, +0xc7,0x03,0x22,0xe0,0x0e,0xc3,0x07,0x01,0x09,0x02,0x32,0xfe,0xb6,0x00,0xd2,0x07, +0x12,0xc0,0xd2,0x07,0x12,0xf7,0x9a,0x04,0x00,0x3c,0x01,0x00,0xc4,0x03,0x12,0x00, +0x5a,0x00,0x01,0x26,0x05,0x03,0x70,0x07,0x20,0xbf,0xfa,0x07,0x00,0x30,0x01,0xff, +0xf5,0x07,0x00,0x30,0x0b,0xff,0xe0,0x07,0x00,0xf0,0x08,0x9f,0xff,0x60,0x0e,0xff, +0x60,0x1b,0xff,0xfb,0x00,0x0e,0xff,0x61,0xff,0xff,0xc0,0x00,0x0e,0xff,0x62,0xff, +0xfa,0x10,0x07,0x00,0x30,0xfe,0x60,0x00,0x15,0x00,0x16,0x70,0x79,0x05,0x0f,0x07, +0x00,0x02,0x07,0x42,0x06,0x1f,0xfc,0x42,0x06,0x43,0x30,0x3f,0xff,0x30,0x41,0x03, +0x90,0x04,0xff,0xf1,0x0f,0xff,0x60,0x00,0x5f,0xff,0xf1,0x01,0x30,0x0d,0xff,0x90, +0x75,0x02,0x90,0x08,0xff,0xd0,0x0a,0xff,0xc0,0x00,0x8f,0xfc,0x22,0x0a,0x01,0x01, +0x02,0x60,0xfb,0x00,0x0c,0xff,0x90,0x04,0x77,0x03,0x10,0xf8,0x25,0x0a,0x41,0x01, +0xff,0xf5,0x18,0x58,0x06,0x02,0xc8,0x07,0x11,0xb0,0xea,0x05,0x11,0xbf,0xa4,0x00, +0x20,0x7f,0xff,0x04,0x00,0x10,0x74,0x71,0x01,0x11,0xfc,0xa2,0x03,0x00,0xa2,0x01, +0x10,0xf6,0x8a,0x03,0x40,0x50,0x01,0x37,0xef,0xdc,0x05,0x03,0x6f,0x01,0x01,0xd4, +0x03,0x00,0x01,0x00,0x20,0x91,0x00,0x73,0x04,0x43,0xfe,0xdc,0xa7,0x40,0x2c,0x06, +0x33,0xff,0xec,0x92,0xee,0x08,0x24,0xff,0x60,0xd0,0x09,0x00,0xeb,0x09,0x00,0xc0, +0x05,0x02,0xf3,0x09,0x22,0xaf,0xfc,0x08,0x00,0x22,0x6f,0xfe,0x08,0x00,0x2d,0x5f, +0xff,0x08,0x00,0x00,0x39,0x0a,0x00,0x08,0x00,0x00,0xdd,0x00,0x00,0x08,0x00,0x30, +0x8f,0xff,0x40,0x08,0x00,0x40,0x3f,0xff,0xff,0x00,0x08,0x00,0x32,0x4f,0xff,0xf7, +0x08,0x00,0x70,0xec,0x60,0x00,0x00,0x00,0x5f,0xff, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_bold_XL __FLASH = { -.uncomp_size = 3121, -.comp_size = 1934, +.uncomp_size = 3161, +.comp_size = 1962, .line_height = 26, .base_line = 5, .subpx = 0, @@ -145,11 +147,11 @@ const etxLz4Font lv_font_he_bold_XL __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 3289, +.lvglFontBufSize = 3329, }; diff --git a/radio/src/fonts/lvgl/std/lv_font_he_L.c b/radio/src/fonts/lvgl/std/lv_font_he_L.c index f6e1852d1..6895eafec 100644 --- a/radio/src/fonts/lvgl/std/lv_font_he_L.c +++ b/radio/src/fonts/lvgl/std/lv_font_he_L.c @@ -2,126 +2,128 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x63,0x10,0x0f,0x0f,0x0e,0x00,0x00,0x69,0x00,0x60,0x0e, -0x0e,0x0e,0x00,0x00,0xcb,0x00,0x20,0x0a,0x0a,0x0e,0x00,0x00,0x11,0x01,0x50,0x0d, -0x0d,0x0e,0x00,0x00,0x6c,0x01,0x30,0x0f,0x0d,0x0e,0x01,0x00,0xc7,0x01,0x40,0x06, -0x03,0x0e,0x02,0x00,0xdc,0x01,0xc0,0x07,0x08,0x0f,0x00,0x00,0x18,0x02,0xd0,0x0f, -0x0c,0x0e,0x02,0x00,0x6c,0x02,0xb0,0x0f,0x0e,0x0e,0x01,0x00,0xce,0x02,0x40,0x06, -0x03,0x08,0x02,0x06,0xda,0x02,0xd0,0x0c,0x0b,0x13,0x00,0xfb,0x43,0x03,0xa0,0x0c, -0x0c,0x0e,0x00,0x00,0x97,0x03,0xb0,0x0c,0x0c,0x15,0x00,0xff,0x15,0x04,0x40,0x10, -0x0d,0x0e,0x02,0x00,0x70,0x04,0x80,0x10,0x70,0x00,0xf1,0x04,0xd9,0x04,0x40,0x06, -0x03,0x13,0x02,0xfb,0xf6,0x04,0x50,0x09,0x08,0x0e,0x00,0x00,0x2e,0x05,0xc0,0x88, -0x00,0x40,0x97,0x05,0x00,0x0e,0x78,0x00,0xc0,0xf2,0x05,0xf0,0x0e,0x0d,0x13,0x01, -0xfb,0x6e,0x06,0xa0,0x0e,0x80,0x00,0xb1,0xc9,0x06,0x20,0x0c,0x0c,0x13,0x00,0xfb, -0x3b,0x07,0x10,0x98,0x00,0xf1,0x0c,0x96,0x07,0x30,0x0e,0x0c,0x13,0x01,0xfb,0x08, -0x08,0xd0,0x0c,0x0b,0x0e,0x00,0x00,0x55,0x08,0x80,0x11,0x11,0x0e,0x00,0x00,0xcc, -0x08,0x90,0x60,0x00,0xf1,0x4b,0x35,0x09,0x80,0x0e,0x0b,0x08,0x02,0x0c,0x03,0xff, +0x17,0x00,0x01,0x00,0x50,0x02,0x04,0xff,0xfb,0x04,0x08,0x00,0xf0,0x05,0x02,0xff, +0xfc,0x06,0x00,0x00,0x00,0x06,0x04,0xfd,0xfb,0x12,0x00,0x00,0x00,0x04,0x03,0xfe, +0xfd,0x18,0x08,0x00,0x42,0x04,0xfe,0xfc,0x20,0x20,0x00,0xf0,0x66,0x07,0x22,0x00, +0x10,0x0f,0x0f,0x0e,0x00,0x00,0x8b,0x00,0x60,0x0e,0x0e,0x0e,0x00,0x00,0xed,0x00, +0x20,0x0a,0x0a,0x0e,0x00,0x00,0x33,0x01,0x50,0x0d,0x0d,0x0e,0x00,0x00,0x8e,0x01, +0x30,0x0f,0x0d,0x0e,0x01,0x00,0xe9,0x01,0x40,0x06,0x03,0x0e,0x02,0x00,0xfe,0x01, +0xc0,0x07,0x08,0x0f,0x00,0x00,0x3a,0x02,0xd0,0x0f,0x0c,0x0e,0x02,0x00,0x8e,0x02, +0xb0,0x0f,0x0e,0x0e,0x01,0x00,0xf0,0x02,0x40,0x06,0x03,0x08,0x02,0x06,0xfc,0x02, +0xd0,0x0c,0x0b,0x13,0x00,0xfb,0x65,0x03,0xa0,0x0c,0x0c,0x0e,0x00,0x00,0xb9,0x03, +0xb0,0x0c,0x0c,0x15,0x00,0xff,0x37,0x04,0x40,0x10,0x0d,0x0e,0x02,0x00,0x92,0x04, +0x80,0x10,0x70,0x00,0xf1,0x04,0xfb,0x04,0x40,0x06,0x03,0x13,0x02,0xfb,0x18,0x05, +0x50,0x09,0x08,0x0e,0x00,0x00,0x50,0x05,0xc0,0x88,0x00,0x40,0xb9,0x05,0x00,0x0e, +0x78,0x00,0xc0,0x14,0x06,0xf0,0x0e,0x0d,0x13,0x01,0xfb,0x90,0x06,0xa0,0x0e,0x80, +0x00,0xb1,0xeb,0x06,0x20,0x0c,0x0c,0x13,0x00,0xfb,0x5d,0x07,0x10,0x98,0x00,0xf0, +0x0c,0xb8,0x07,0x30,0x0e,0x0c,0x13,0x01,0xfb,0x2a,0x08,0xd0,0x0c,0x0b,0x0e,0x00, +0x00,0x77,0x08,0x80,0x11,0x11,0x0e,0x00,0x00,0xee,0x08,0x90,0x60,0x00,0x00,0xe6, +0x00,0xf0,0x12,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0xbb,0x99,0x99,0xbb, +0x99,0xbb,0x2e,0x66,0xe2,0x1c,0x54,0xc1,0x00,0x99,0x00,0x00,0xbb,0x00,0x00,0x00, +0xef,0xfe,0x23,0x32,0x06,0x00,0xf1,0x49,0x2b,0xb2,0x07,0x70,0x99,0xbb,0x03,0xff, 0x70,0x00,0x00,0x04,0xff,0x00,0x06,0xff,0x40,0x00,0x00,0x6f,0xd0,0x00,0x0a,0xfe, 0x10,0x00,0x08,0xfb,0x00,0x00,0x0d,0xfb,0x00,0x00,0xaf,0x80,0x00,0x00,0x7f,0xf7, 0x00,0x0e,0xf4,0x00,0x00,0xaf,0xff,0xf3,0x06,0xfd,0x00,0x00,0x5f,0xe2,0xaf,0xe3, 0xef,0x40,0x00,0x0b,0xf7,0x00,0xdf,0xff,0x80,0x00,0x00,0xff,0x30,0x02,0xff,0xc0, 0x00,0x00,0x3f,0xf0,0x00,0x05,0xff,0x40,0x00,0x07,0xfc,0x00,0x00,0x09,0xfe,0x10, -0x37,0x00,0xf0,0x10,0x0d,0xfc,0x00,0x0e,0xf5,0x00,0x00,0x00,0x2f,0xf9,0x01,0xff, -0x20,0x00,0x00,0x00,0x5f,0xf6,0x07,0xff,0xff,0xfe,0xb5,0x00,0x00,0x07,0xff,0xff, -0xff,0xff,0xa0,0x58,0x01,0x31,0x02,0x9f,0xf5,0x60,0x01,0x21,0x0a,0xfa,0x07,0x00, -0x21,0x05,0xfd,0x07,0x00,0x22,0x03,0xfe,0x07,0x00,0x1f,0xff,0x07,0x00,0x11,0x20, -0x0f,0xff,0x01,0x00,0x13,0xf8,0x07,0x00,0x31,0x07,0xff,0xd7,0x60,0x00,0x71,0x50, -0x00,0x00,0x01,0xbf,0xb0,0x00,0x98,0x00,0x11,0x00,0xbe,0x00,0x51,0x00,0x09,0xf8, -0x00,0x00,0xa0,0x00,0xf1,0x14,0x08,0xef,0xff,0x00,0x00,0xaf,0xe7,0xef,0x30,0x03, -0xff,0x20,0xaf,0x70,0x08,0xfa,0x00,0x6f,0xb0,0x0c,0xf6,0x00,0x2f,0xe0,0x0f,0xf3, -0x00,0x0f,0xf2,0x2f,0xf0,0x00,0x0b,0xf6,0x8f,0x4d,0x00,0x11,0xa8,0x06,0x00,0x01, -0x9a,0x00,0x27,0x5f,0xd0,0x9f,0x00,0x0f,0x0d,0x00,0x2a,0x70,0x3f,0xff,0xff,0xfe, -0xc7,0x00,0x03,0x5a,0x00,0x82,0xfd,0x10,0x00,0x00,0x00,0x01,0x6e,0xfa,0x21,0x00, -0x40,0xf0,0x05,0x50,0x00,0x4e,0x01,0x20,0xff,0x20,0xb0,0x00,0x70,0x0f,0xf2,0x00, -0x00,0x00,0xdf,0x40,0x0d,0x00,0x1f,0x0d,0x0d,0x00,0x15,0x3e,0xff,0x3f,0xf3,0x03, -0x00,0xff,0x10,0x34,0x00,0x00,0x00,0x6f,0xe9,0x40,0x00,0x4e,0xff,0xfe,0x92,0x00, -0x49,0xef,0xf6,0x00,0x05,0xed,0xa5,0x00,0x2f,0xf1,0x00,0x00,0x6f,0xb0,0x00,0x00, -0x7f,0xa0,0x04,0x00,0x0a,0x61,0xff,0xff,0xff,0xfe,0xa4,0x00,0x06,0x01,0xd0,0x90, -0xff,0x30,0x00,0x02,0xaf,0xf3,0xff,0x30,0x00,0x00,0x0c,0xf9,0x06,0x00,0x40,0x06, -0xfc,0xff,0x30,0xd1,0x00,0x00,0x06,0x00,0x2f,0x04,0xfe,0x06,0x00,0x17,0xf0,0x08, -0x1f,0xf1,0x00,0x4d,0xff,0xc5,0x00,0x1f,0xf1,0x00,0x7f,0xde,0xff,0x50,0x1f,0xf1, -0x00,0x21,0x00,0xaf,0xd0,0x1f,0xf1,0x27,0x02,0x11,0xf2,0x07,0x00,0x21,0x0f,0xf4, -0x07,0x00,0x28,0x0e,0xf5,0x07,0x00,0x30,0x0f,0xf4,0x0f,0x07,0x00,0x41,0x1f,0xf3, -0x0f,0xf3,0x2c,0x01,0x20,0x0c,0xf9,0xf8,0x00,0xf6,0x07,0xb0,0x06,0xff,0x82,0x01, -0x4c,0xff,0x30,0x00,0xaf,0xff,0xff,0xff,0xf6,0x00,0x00,0x05,0xbe,0xff,0xd9,0x20, -0x00,0xfe,0x00,0xb0,0x38,0x81,0x8f,0xff,0xff,0xda,0x40,0x08,0xff,0xff,0xff,0xaa, -0x02,0x20,0x00,0x2a,0x83,0x00,0x11,0x00,0x3c,0x00,0x71,0x00,0x6f,0xc0,0x00,0x00, -0x00,0x04,0x9d,0x01,0x30,0x4f,0xe0,0x00,0x9a,0x00,0x0f,0x0b,0x00,0x2a,0x20,0x1f, -0xff,0x7b,0x00,0x12,0x0f,0x88,0x00,0x31,0x00,0x00,0x4b,0x6a,0x00,0x31,0x00,0xcf, -0xb0,0x1e,0x00,0x10,0xf0,0x06,0x00,0x01,0xba,0x00,0x02,0x8a,0x02,0x03,0x06,0x00, -0x26,0x0f,0xf3,0x1e,0x00,0x22,0xbf,0xb0,0x36,0x00,0x11,0x1f,0x42,0x00,0x02,0x4e, -0x00,0x02,0x01,0x00,0x2f,0x2f,0xf0,0x06,0x00,0x0a,0x41,0xff,0xff,0xff,0xd7,0x06, -0x00,0x20,0xff,0xc0,0x4e,0x02,0x11,0x8f,0x5a,0x00,0x21,0x0d,0xf8,0x55,0x03,0x01, -0x06,0x00,0x26,0x0b,0xf7,0x6c,0x00,0x20,0x7f,0xe0,0x74,0x03,0x70,0xff,0x60,0x00, -0x00,0x00,0x1d,0xfb,0x3f,0x03,0x60,0xef,0xd1,0x00,0x00,0x01,0x9f,0x89,0x02,0x30, -0x8f,0xff,0xa1,0x87,0x00,0x10,0xe5,0x27,0x00,0x10,0x85,0x05,0x00,0x00,0xfd,0x01, -0x21,0xc8,0x10,0x57,0x03,0x81,0xfe,0x20,0xff,0x30,0x00,0x01,0x5e,0xfb,0x45,0x00, -0x21,0x4f,0xf1,0xdc,0x00,0x30,0xef,0x4f,0xf3,0x69,0x00,0x11,0xf5,0x0d,0x00,0x2f, -0xdf,0x5f,0x0d,0x00,0x0e,0x01,0x01,0x00,0x11,0x5f,0x06,0x00,0xc0,0xf5,0x1f,0xf7, -0x00,0x4b,0xef,0xd9,0x10,0x00,0x6f,0xf1,0x7f,0x5d,0x00,0xf0,0x03,0x00,0xcf,0xcf, -0xf8,0x10,0x4e,0xfb,0x00,0x02,0xff,0xf7,0x00,0x00,0x3f,0xf2,0x00,0x09,0xfe,0x60, -0x00,0x41,0x50,0x00,0xcf,0x70,0xbe,0x00,0x30,0x1f,0xf2,0x00,0x87,0x04,0x20,0x06, -0xfd,0xc4,0x03,0xb1,0xf9,0x00,0xaf,0x90,0x00,0x00,0x00,0x9f,0x90,0x0e,0xf5,0x0f, -0x00,0x31,0x03,0xff,0x10,0x0f,0x00,0x21,0x7f,0xd0,0x0f,0x00,0x41,0x0b,0xf9,0x00, -0x07,0xae,0x02,0x6e,0x50,0x00,0x7f,0xff,0xff,0xf9,0x12,0x03,0x06,0x03,0x00,0x40, -0x30,0x07,0xff,0xe9,0x2d,0x00,0x00,0xeb,0x02,0x12,0xf1,0x93,0x01,0x6f,0x0c,0xf5, -0x00,0x00,0x0b,0xf6,0x04,0x00,0x05,0x31,0x2f,0xff,0xff,0x04,0x00,0x12,0x6f,0x1a, -0x01,0x21,0x06,0xff,0x1b,0x01,0x91,0x30,0x00,0x9f,0x60,0x00,0x01,0x5e,0xfc,0x00, -0xa1,0x02,0x22,0x4f,0xf2,0x99,0x04,0x21,0xff,0x50,0xf1,0x03,0x31,0x0e,0xf6,0x06, -0x62,0x02,0x41,0xef,0x60,0x6f,0xd0,0xcd,0x02,0x12,0x05,0x1e,0x00,0x22,0x40,0x2f, -0x4a,0x01,0xf1,0x04,0x00,0xef,0xb0,0x00,0x00,0x0b,0xfb,0x00,0x06,0xff,0xb3,0x00, -0x3b,0xff,0x30,0x00,0x0a,0xff,0xff,0xbb,0x04,0x20,0x04,0xae,0x00,0x02,0x20,0x09, -0xfc,0xb3,0x01,0x40,0xc0,0x3f,0xf2,0x00,0x8e,0x05,0x81,0xdf,0x80,0x00,0x00,0x8f, -0xb0,0x06,0xfe,0x05,0x01,0xc0,0x1f,0xf4,0x00,0x00,0xbf,0x70,0x00,0xaf,0xa0,0x00, -0x0e,0xf5,0xba,0x05,0x70,0x01,0xff,0x10,0x00,0x0d,0xf5,0x00,0x66,0x00,0xa0,0x7f, -0xb0,0x0d,0xf6,0x00,0x00,0x01,0xff,0x29,0xfe,0xfd,0x01,0xf0,0x05,0xfe,0xff,0x30, -0x01,0x34,0x68,0xdf,0xfe,0x40,0x00,0x8f,0xff,0xff,0xfa,0x10,0x00,0x08,0xfe,0xc9, -0x61,0x56,0x00,0x01,0x89,0x05,0x12,0x07,0xe0,0x04,0x80,0x7f,0xb0,0x00,0x02,0x8f, -0xf5,0x07,0xfb,0x49,0x01,0x30,0xb0,0x7f,0xb0,0xd5,0x02,0x21,0x07,0xfb,0x62,0x02, -0xa3,0x7f,0xff,0xf9,0x00,0x02,0xff,0x07,0xff,0xff,0x90,0x6f,0x02,0x12,0x02,0x77, -0x05,0x0f,0x0d,0x00,0x2a,0x11,0x5f,0x7c,0x00,0x12,0x05,0x7c,0x00,0x70,0x5f,0xe0, -0x00,0x02,0x9f,0xf7,0x05,0xac,0x00,0x40,0x8f,0xe0,0x5f,0xe0,0xb9,0x00,0x21,0x25, -0xfe,0x22,0x03,0xa3,0x5f,0xff,0xfb,0x00,0x00,0xdf,0x55,0xff,0xff,0xb0,0x2f,0x03, -0x12,0x00,0x54,0x03,0x21,0x3f,0xf1,0xd6,0x02,0x12,0xfc,0x67,0x03,0x20,0x40,0x3f, -0x48,0x00,0x31,0x60,0x03,0xff,0x32,0x03,0x80,0x8f,0xe1,0x00,0x00,0x0c,0xf7,0x0d, -0xf9,0x6b,0x01,0x90,0x04,0xff,0x30,0x00,0x0f,0xf4,0x00,0xaf,0xc0,0x41,0x02,0x20, -0x2f,0xf3,0x68,0x03,0xb0,0x0a,0xf9,0x00,0x9f,0xb0,0x00,0x05,0xfd,0x07,0xff,0x30, -0x82,0x05,0x10,0xf5,0x8f,0x00,0x24,0xc7,0x10,0xa2,0x00,0x0f,0x06,0x00,0x22,0x30, -0x7f,0xf3,0x00,0x57,0x00,0xd0,0xbf,0xe1,0x00,0x00,0xcf,0x70,0x01,0xef,0xb0,0x00, -0x0d,0xf6,0x00,0x4f,0x07,0xe0,0xff,0x40,0x00,0x06,0xff,0x30,0x5f,0xf0,0x00,0x00, -0x0a,0xfe,0x5e,0xf9,0x03,0x03,0x02,0x49,0x06,0x22,0x2f,0xf9,0xee,0x05,0x02,0xd2, -0x00,0x31,0x9f,0xe1,0x00,0x27,0x04,0x20,0xc0,0x00,0xbc,0x03,0x22,0xef,0x80,0xc5, -0x06,0x02,0x72,0x05,0x71,0xf0,0x9f,0xff,0xff,0xff,0xd8,0x10,0x8b,0x06,0x10,0xe1, -0x1f,0x00,0x11,0x5f,0xcf,0x03,0x11,0x08,0xf9,0x00,0x71,0x06,0xfd,0x0d,0xd2,0x00, -0x00,0x06,0x92,0x03,0x40,0x08,0xf9,0x0f,0xf3,0x63,0x03,0x20,0x0f,0xf3,0x4d,0x04, -0x00,0x06,0x00,0xf0,0x09,0xdf,0x70,0x0f,0xf3,0x00,0x0b,0xfd,0x00,0x0f,0xf3,0x02, -0xdf,0xf2,0x00,0x0f,0xf3,0x5f,0xfe,0x30,0x00,0x0f,0xf3,0x7f,0xc1,0x07,0x04,0x15, -0x44,0x0d,0x04,0x0e,0x06,0x00,0x06,0x2e,0x05,0x00,0x64,0x03,0x30,0x29,0xff,0x40, -0x69,0x01,0x07,0x2e,0x05,0x0f,0x18,0x05,0x1a,0x21,0x4f,0xf0,0xa5,0x07,0x40,0xdf, -0x61,0xff,0x20,0x13,0x00,0xd0,0x0f,0xf4,0x0e,0xf5,0x00,0x06,0xfc,0x00,0x01,0xff, -0x20,0xbf,0x80,0x73,0x02,0x40,0x3f,0xf0,0x08,0xfc,0xcb,0x02,0xf0,0x0a,0x05,0xfe, -0x00,0x5f,0xf0,0x00,0xdf,0x70,0x00,0x7f,0xc0,0x02,0xff,0x23,0xbf,0xf2,0x00,0x09, -0xfa,0x00,0x0e,0xff,0xff,0xf7,0x00,0x00,0x04,0x30,0xbf,0xfb,0x72,0xfd,0x05,0x00, -0x8e,0x08,0x00,0xd7,0x07,0x20,0x00,0x00,0x23,0x02,0xc2,0x05,0xff,0x90,0x00,0x02, -0xff,0x43,0x46,0x8d,0xff,0xd1,0x00,0xff,0x07,0x10,0xa1,0x45,0x01,0x41,0xfe,0xdc, -0xa6,0x10,0x11,0x05,0x00,0x0b,0x02,0x32,0x02,0xff,0xff,0x4c,0x03,0xa0,0x0e,0xf3, -0x00,0x00,0x4c,0xff,0x10,0x00,0xef,0x30,0x8f,0x03,0x00,0x0f,0x00,0x00,0x2f,0x04, -0x01,0x0f,0x00,0x22,0x08,0xfa,0x0f,0x00,0x2c,0x8f,0xa0,0x0f,0x00,0x21,0xff,0x20, -0x0f,0x00,0x21,0x1f,0xf1,0x0f,0x00,0x30,0x19,0xfe,0x00,0x0f,0x00,0x30,0x4f,0xff, -0x70,0x0f,0x00,0x41,0xa4,0xfd,0x70,0x00,0x1e,0x00,0xf0,0x05,0x78,0x60,0x05,0x87, -0x00,0x1f,0xf7,0x00,0xdf,0xb0,0x04,0xff,0x10,0x1f,0xf5,0x00,0x8f,0xc0,0x04,0xff, -0x2b,0x04,0x00,0x39,0x07,0xf0,0x00,0x00,0x0b,0xf4,0x00,0x2f,0xa0,0x00,0xee,0x00, -0x06,0xf4,0x00,0x2f,0x80,0x00, +0x37,0x00,0xc0,0x0d,0xfc,0x00,0x0e,0xf5,0x00,0x00,0x00,0x2f,0xf9,0x01,0xff,0x71, +0x01,0xf1,0x00,0x5f,0xf6,0x07,0xff,0xff,0xfe,0xb5,0x00,0x00,0x07,0xff,0xff,0xff, +0xff,0xa0,0xac,0x01,0x21,0x9f,0xf5,0xb4,0x01,0x21,0x0a,0xfa,0x07,0x00,0x21,0x05, +0xfd,0x07,0x00,0x22,0x03,0xfe,0x07,0x00,0x1f,0xff,0x07,0x00,0x11,0x20,0x0f,0xff, +0x01,0x00,0x13,0xf8,0x07,0x00,0x31,0x07,0xff,0xd7,0x60,0x00,0x71,0x50,0x00,0x00, +0x01,0xbf,0xb0,0x00,0x98,0x00,0x11,0x00,0xbe,0x00,0x51,0x00,0x09,0xf8,0x00,0x00, +0xa0,0x00,0xf1,0x14,0x08,0xef,0xff,0x00,0x00,0xaf,0xe7,0xef,0x30,0x03,0xff,0x20, +0xaf,0x70,0x08,0xfa,0x00,0x6f,0xb0,0x0c,0xf6,0x00,0x2f,0xe0,0x0f,0xf3,0x00,0x0f, +0xf2,0x2f,0xf0,0x00,0x0b,0xf6,0x8f,0x4d,0x00,0x11,0xa8,0x06,0x00,0x01,0x9a,0x00, +0x27,0x5f,0xd0,0x9f,0x00,0x0f,0x0d,0x00,0x2a,0x70,0x3f,0xff,0xff,0xfe,0xc7,0x00, +0x03,0x5a,0x00,0x82,0xfd,0x10,0x00,0x00,0x00,0x01,0x6e,0xfa,0x21,0x00,0x40,0xf0, +0x05,0x50,0x00,0x4e,0x01,0x20,0xff,0x20,0xb0,0x00,0x70,0x0f,0xf2,0x00,0x00,0x00, +0xdf,0x40,0x0d,0x00,0x1f,0x0d,0x0d,0x00,0x15,0x3e,0xff,0x3f,0xf3,0x03,0x00,0xff, +0x10,0x34,0x00,0x00,0x00,0x6f,0xe9,0x40,0x00,0x4e,0xff,0xfe,0x92,0x00,0x49,0xef, +0xf6,0x00,0x05,0xed,0xa5,0x00,0x2f,0xf1,0x00,0x00,0x6f,0xb0,0x00,0x00,0x7f,0xa0, +0x04,0x00,0x0a,0x61,0xff,0xff,0xff,0xfe,0xa4,0x00,0x06,0x01,0xd0,0x90,0xff,0x30, +0x00,0x02,0xaf,0xf3,0xff,0x30,0x00,0x00,0x0c,0xf9,0x06,0x00,0x40,0x06,0xfc,0xff, +0x30,0xd1,0x00,0x00,0x06,0x00,0x2f,0x04,0xfe,0x06,0x00,0x17,0xf0,0x08,0x1f,0xf1, +0x00,0x4d,0xff,0xc5,0x00,0x1f,0xf1,0x00,0x7f,0xde,0xff,0x50,0x1f,0xf1,0x00,0x21, +0x00,0xaf,0xd0,0x1f,0xf1,0x27,0x02,0x11,0xf2,0x07,0x00,0x21,0x0f,0xf4,0x07,0x00, +0x28,0x0e,0xf5,0x07,0x00,0x30,0x0f,0xf4,0x0f,0x07,0x00,0x41,0x1f,0xf3,0x0f,0xf3, +0x2c,0x01,0x20,0x0c,0xf9,0xf8,0x00,0xf6,0x07,0xb0,0x06,0xff,0x82,0x01,0x4c,0xff, +0x30,0x00,0xaf,0xff,0xff,0xff,0xf6,0x00,0x00,0x05,0xbe,0xff,0xd9,0x20,0x00,0xfe, +0x00,0xb0,0x38,0x81,0x8f,0xff,0xff,0xda,0x40,0x08,0xff,0xff,0xff,0xaa,0x02,0x20, +0x00,0x2a,0x83,0x00,0x11,0x00,0x3c,0x00,0x30,0x00,0x6f,0xc0,0x25,0x03,0x01,0x9d, +0x01,0x30,0x4f,0xe0,0x00,0x9a,0x00,0x0f,0x0b,0x00,0x2a,0x20,0x1f,0xff,0x7b,0x00, +0x12,0x0f,0x88,0x00,0x31,0x00,0x00,0x4b,0x6a,0x00,0x31,0x00,0xcf,0xb0,0x1e,0x00, +0x10,0xf0,0x06,0x00,0x01,0xba,0x00,0x02,0x8a,0x02,0x03,0x06,0x00,0x26,0x0f,0xf3, +0x1e,0x00,0x22,0xbf,0xb0,0x36,0x00,0x11,0x1f,0x42,0x00,0x02,0x4e,0x00,0x02,0x01, +0x00,0x2f,0x2f,0xf0,0x06,0x00,0x0a,0x41,0xff,0xff,0xff,0xd7,0x06,0x00,0x20,0xff, +0xc0,0x4e,0x02,0x11,0x8f,0x5a,0x00,0x21,0x0d,0xf8,0x55,0x03,0x01,0x06,0x00,0x26, +0x0b,0xf7,0x6c,0x00,0x20,0x7f,0xe0,0x74,0x03,0x70,0xff,0x60,0x00,0x00,0x00,0x1d, +0xfb,0x3f,0x03,0x60,0xef,0xd1,0x00,0x00,0x01,0x9f,0x89,0x02,0x30,0x8f,0xff,0xa1, +0x87,0x00,0x10,0xe5,0x27,0x00,0x10,0x85,0x05,0x00,0x00,0xfd,0x01,0x21,0xc8,0x10, +0x57,0x03,0x81,0xfe,0x20,0xff,0x30,0x00,0x01,0x5e,0xfb,0x45,0x00,0x21,0x4f,0xf1, +0xdc,0x00,0x30,0xef,0x4f,0xf3,0x69,0x00,0x11,0xf5,0x0d,0x00,0x2f,0xdf,0x5f,0x0d, +0x00,0x0e,0x01,0x01,0x00,0x11,0x5f,0x06,0x00,0xc0,0xf5,0x1f,0xf7,0x00,0x4b,0xef, +0xd9,0x10,0x00,0x6f,0xf1,0x7f,0x5d,0x00,0xf0,0x03,0x00,0xcf,0xcf,0xf8,0x10,0x4e, +0xfb,0x00,0x02,0xff,0xf7,0x00,0x00,0x3f,0xf2,0x00,0x09,0xfe,0x60,0x00,0x41,0x50, +0x00,0xcf,0x70,0xbe,0x00,0x30,0x1f,0xf2,0x00,0x87,0x04,0x20,0x06,0xfd,0xc4,0x03, +0xb1,0xf9,0x00,0xaf,0x90,0x00,0x00,0x00,0x9f,0x90,0x0e,0xf5,0x0f,0x00,0x31,0x03, +0xff,0x10,0x0f,0x00,0x21,0x7f,0xd0,0x0f,0x00,0x41,0x0b,0xf9,0x00,0x07,0xae,0x02, +0x6e,0x50,0x00,0x7f,0xff,0xff,0xf9,0x12,0x03,0x06,0x03,0x00,0x40,0x30,0x07,0xff, +0xe9,0x2d,0x00,0x00,0xeb,0x02,0x12,0xf1,0x93,0x01,0x6f,0x0c,0xf5,0x00,0x00,0x0b, +0xf6,0x04,0x00,0x05,0x31,0x2f,0xff,0xff,0x04,0x00,0x12,0x6f,0x1a,0x01,0x21,0x06, +0xff,0x1b,0x01,0x91,0x30,0x00,0x9f,0x60,0x00,0x01,0x5e,0xfc,0x00,0xa1,0x02,0x22, +0x4f,0xf2,0x99,0x04,0x21,0xff,0x50,0xf1,0x03,0x31,0x0e,0xf6,0x06,0x62,0x02,0x41, +0xef,0x60,0x6f,0xd0,0xcd,0x02,0x12,0x05,0x1e,0x00,0x22,0x40,0x2f,0x4a,0x01,0xf1, +0x04,0x00,0xef,0xb0,0x00,0x00,0x0b,0xfb,0x00,0x06,0xff,0xb3,0x00,0x3b,0xff,0x30, +0x00,0x0a,0xff,0xff,0xbb,0x04,0x20,0x04,0xae,0x00,0x02,0x20,0x09,0xfc,0xb3,0x01, +0x40,0xc0,0x3f,0xf2,0x00,0x8e,0x05,0x81,0xdf,0x80,0x00,0x00,0x8f,0xb0,0x06,0xfe, +0x05,0x01,0xc0,0x1f,0xf4,0x00,0x00,0xbf,0x70,0x00,0xaf,0xa0,0x00,0x0e,0xf5,0xba, +0x05,0x70,0x01,0xff,0x10,0x00,0x0d,0xf5,0x00,0x66,0x00,0xa0,0x7f,0xb0,0x0d,0xf6, +0x00,0x00,0x01,0xff,0x29,0xfe,0xfd,0x01,0xf0,0x05,0xfe,0xff,0x30,0x01,0x34,0x68, +0xdf,0xfe,0x40,0x00,0x8f,0xff,0xff,0xfa,0x10,0x00,0x08,0xfe,0xc9,0x61,0x56,0x00, +0x01,0x89,0x05,0x12,0x07,0xe0,0x04,0x80,0x7f,0xb0,0x00,0x02,0x8f,0xf5,0x07,0xfb, +0x49,0x01,0x30,0xb0,0x7f,0xb0,0xd5,0x02,0x21,0x07,0xfb,0x62,0x02,0xa3,0x7f,0xff, +0xf9,0x00,0x02,0xff,0x07,0xff,0xff,0x90,0x6f,0x02,0x12,0x02,0x77,0x05,0x0f,0x0d, +0x00,0x2a,0x11,0x5f,0x7c,0x00,0x12,0x05,0x7c,0x00,0x70,0x5f,0xe0,0x00,0x02,0x9f, +0xf7,0x05,0xac,0x00,0x40,0x8f,0xe0,0x5f,0xe0,0xb9,0x00,0x21,0x25,0xfe,0x22,0x03, +0xa3,0x5f,0xff,0xfb,0x00,0x00,0xdf,0x55,0xff,0xff,0xb0,0x2f,0x03,0x12,0x00,0x54, +0x03,0x21,0x3f,0xf1,0xd6,0x02,0x12,0xfc,0x67,0x03,0x20,0x40,0x3f,0x48,0x00,0x31, +0x60,0x03,0xff,0x32,0x03,0x80,0x8f,0xe1,0x00,0x00,0x0c,0xf7,0x0d,0xf9,0x6b,0x01, +0x90,0x04,0xff,0x30,0x00,0x0f,0xf4,0x00,0xaf,0xc0,0x41,0x02,0x20,0x2f,0xf3,0x68, +0x03,0xb0,0x0a,0xf9,0x00,0x9f,0xb0,0x00,0x05,0xfd,0x07,0xff,0x30,0x82,0x05,0x10, +0xf5,0x8f,0x00,0x24,0xc7,0x10,0xa2,0x00,0x0f,0x06,0x00,0x22,0x30,0x7f,0xf3,0x00, +0x57,0x00,0xd0,0xbf,0xe1,0x00,0x00,0xcf,0x70,0x01,0xef,0xb0,0x00,0x0d,0xf6,0x00, +0x4f,0x07,0xe0,0xff,0x40,0x00,0x06,0xff,0x30,0x5f,0xf0,0x00,0x00,0x0a,0xfe,0x5e, +0xf9,0x03,0x03,0x02,0x49,0x06,0x22,0x2f,0xf9,0xee,0x05,0x02,0xd2,0x00,0x31,0x9f, +0xe1,0x00,0x27,0x04,0x20,0xc0,0x00,0xbc,0x03,0x22,0xef,0x80,0xc5,0x06,0x02,0x72, +0x05,0x71,0xf0,0x9f,0xff,0xff,0xff,0xd8,0x10,0x8b,0x06,0x10,0xe1,0x1f,0x00,0x11, +0x5f,0xcf,0x03,0x11,0x08,0xf9,0x00,0x71,0x06,0xfd,0x0d,0xd2,0x00,0x00,0x06,0x92, +0x03,0x40,0x08,0xf9,0x0f,0xf3,0x63,0x03,0x20,0x0f,0xf3,0x4d,0x04,0x00,0x06,0x00, +0xf0,0x09,0xdf,0x70,0x0f,0xf3,0x00,0x0b,0xfd,0x00,0x0f,0xf3,0x02,0xdf,0xf2,0x00, +0x0f,0xf3,0x5f,0xfe,0x30,0x00,0x0f,0xf3,0x7f,0xc1,0x07,0x04,0x15,0x44,0x0d,0x04, +0x0e,0x06,0x00,0x06,0x2e,0x05,0x00,0x64,0x03,0x30,0x29,0xff,0x40,0x69,0x01,0x07, +0x2e,0x05,0x0f,0x18,0x05,0x1a,0x21,0x4f,0xf0,0xa5,0x07,0x40,0xdf,0x61,0xff,0x20, +0x13,0x00,0xd0,0x0f,0xf4,0x0e,0xf5,0x00,0x06,0xfc,0x00,0x01,0xff,0x20,0xbf,0x80, +0x73,0x02,0x40,0x3f,0xf0,0x08,0xfc,0xcb,0x02,0xf0,0x0a,0x05,0xfe,0x00,0x5f,0xf0, +0x00,0xdf,0x70,0x00,0x7f,0xc0,0x02,0xff,0x23,0xbf,0xf2,0x00,0x09,0xfa,0x00,0x0e, +0xff,0xff,0xf7,0x00,0x00,0x04,0x30,0xbf,0xfb,0x72,0xfd,0x05,0x00,0x8e,0x08,0x00, +0xd7,0x07,0x20,0x00,0x00,0x23,0x02,0xc2,0x05,0xff,0x90,0x00,0x02,0xff,0x43,0x46, +0x8d,0xff,0xd1,0x00,0xff,0x07,0x10,0xa1,0x45,0x01,0x41,0xfe,0xdc,0xa6,0x10,0x11, +0x05,0x00,0x0b,0x02,0x32,0x02,0xff,0xff,0x4c,0x03,0xa0,0x0e,0xf3,0x00,0x00,0x4c, +0xff,0x10,0x00,0xef,0x30,0x8f,0x03,0x00,0x0f,0x00,0x00,0x2f,0x04,0x01,0x0f,0x00, +0x22,0x08,0xfa,0x0f,0x00,0x2c,0x8f,0xa0,0x0f,0x00,0x21,0xff,0x20,0x0f,0x00,0x21, +0x1f,0xf1,0x0f,0x00,0x30,0x19,0xfe,0x00,0x0f,0x00,0x30,0x4f,0xff,0x70,0x0f,0x00, +0x80,0xa4,0xfd,0x70,0x00,0x00,0x00,0x08,0xfa, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_L __FLASH = { -.uncomp_size = 2633, -.comp_size = 1750, +.uncomp_size = 2675, +.comp_size = 1785, .line_height = 25, .base_line = 5, .subpx = 0, @@ -134,11 +136,11 @@ const etxLz4Font lv_font_he_L __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 2801, +.lvglFontBufSize = 2843, }; diff --git a/radio/src/fonts/lvgl/std/lv_font_he_STD.c b/radio/src/fonts/lvgl/std/lv_font_he_STD.c index 78fe49cda..6d3927a9f 100644 --- a/radio/src/fonts/lvgl/std/lv_font_he_STD.c +++ b/radio/src/fonts/lvgl/std/lv_font_he_STD.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea,0x5f4 --format lvgl -o std/lv_font_he_STD.c --force-fast-kern-format --no-compress --lv-fallback lv_font_en_STD + * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x5b0,0x5b4,0x5b6,0x5b7,0x5b8,0x5bc,0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea --format lvgl -o std/lv_font_he_STD.c --force-fast-kern-format --no-compress --lv-fallback lv_font_en_STD ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE @@ -22,6 +22,25 @@ /*Store the image of the glyphs*/ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+05B0 "ְ" */ + 0x0, 0x77, 0x0, 0x77, 0x0, + + /* U+05B4 "ִ" */ + 0x0, 0x77, 0x0, + + /* U+05B6 "ֶ" */ + 0x0, 0x0, 0x69, 0x96, 0x1, 0x10, 0x7, 0x70, + 0x0, 0x0, + + /* U+05B7 "ַ" */ + 0x3d, 0xd3, + + /* U+05B8 "ָ" */ + 0x3d, 0xd3, 0x5, 0x50, + + /* U+05BC "ּ" */ + 0x0, 0x77, 0x0, + /* U+05D0 "א" */ 0xa, 0xf2, 0x0, 0x3, 0xf4, 0x1, 0xec, 0x0, 0x4, 0xf2, 0x0, 0x4f, 0x70, 0x8, 0xf0, 0x0, @@ -226,12 +245,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0xac, 0x0, 0xf7, 0x0, 0x0, 0xac, 0x0, 0xf7, 0x0, 0x0, 0xac, 0x0, 0xf6, 0x0, 0x0, 0xac, 0x3b, 0xf2, 0x0, 0x0, 0xac, 0x8e, 0x70, 0x0, - 0x0, 0xac, - - /* U+05F4 "״" */ - 0x5, 0xf6, 0xd, 0xd0, 0x9, 0xf0, 0x1f, 0x80, - 0xc, 0xa0, 0x4f, 0x20, 0xf, 0x40, 0x8c, 0x0, - 0x3e, 0x0, 0xb6, 0x0 + 0x0, 0xac }; @@ -241,51 +255,58 @@ 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 = 161, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 50, .adv_w = 153, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 100, .adv_w = 108, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 135, .adv_w = 142, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 180, .adv_w = 162, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 220, .adv_w = 67, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 230, .adv_w = 83, .box_w = 5, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 255, .adv_w = 169, .box_w = 9, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 300, .adv_w = 167, .box_w = 9, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 345, .adv_w = 67, .box_w = 2, .box_h = 6, .ofs_x = 1, .ofs_y = 4}, - {.bitmap_index = 351, .adv_w = 137, .box_w = 8, .box_h = 13, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 403, .adv_w = 134, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 443, .adv_w = 136, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 499, .adv_w = 174, .box_w = 9, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 544, .adv_w = 176, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 594, .adv_w = 67, .box_w = 2, .box_h = 13, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 607, .adv_w = 100, .box_w = 5, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 632, .adv_w = 168, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 682, .adv_w = 149, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 727, .adv_w = 160, .box_w = 8, .box_h = 13, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 779, .adv_w = 156, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 819, .adv_w = 129, .box_w = 8, .box_h = 13, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 871, .adv_w = 140, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 916, .adv_w = 151, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 975, .adv_w = 137, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1015, .adv_w = 187, .box_w = 11, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1070, .adv_w = 177, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1120, .adv_w = 154, .box_w = 8, .box_h = 5, .ofs_x = 1, .ofs_y = 8} + {.bitmap_index = 0, .adv_w = 0, .box_w = 2, .box_h = 5, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 5, .adv_w = 0, .box_w = 2, .box_h = 3, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 8, .adv_w = 0, .box_w = 4, .box_h = 5, .ofs_x = -2, .ofs_y = -4}, + {.bitmap_index = 18, .adv_w = 0, .box_w = 4, .box_h = 1, .ofs_x = -2, .ofs_y = -2}, + {.bitmap_index = 20, .adv_w = 0, .box_w = 4, .box_h = 2, .ofs_x = -2, .ofs_y = -3}, + {.bitmap_index = 24, .adv_w = 0, .box_w = 2, .box_h = 3, .ofs_x = -1, .ofs_y = 4}, + {.bitmap_index = 27, .adv_w = 161, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 77, .adv_w = 153, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 127, .adv_w = 108, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 162, .adv_w = 142, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 207, .adv_w = 162, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 247, .adv_w = 67, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 257, .adv_w = 83, .box_w = 5, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 282, .adv_w = 169, .box_w = 9, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 327, .adv_w = 167, .box_w = 9, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 372, .adv_w = 67, .box_w = 2, .box_h = 6, .ofs_x = 1, .ofs_y = 4}, + {.bitmap_index = 378, .adv_w = 137, .box_w = 8, .box_h = 13, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 430, .adv_w = 134, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 470, .adv_w = 136, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 526, .adv_w = 174, .box_w = 9, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 571, .adv_w = 176, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 621, .adv_w = 67, .box_w = 2, .box_h = 13, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 634, .adv_w = 100, .box_w = 5, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 659, .adv_w = 168, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 709, .adv_w = 149, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 754, .adv_w = 160, .box_w = 8, .box_h = 13, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 806, .adv_w = 156, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 846, .adv_w = 129, .box_w = 8, .box_h = 13, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 898, .adv_w = 140, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 943, .adv_w = 151, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 1002, .adv_w = 137, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1042, .adv_w = 187, .box_w = 11, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1097, .adv_w = 177, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0} }; /*--------------------- * CHARACTER MAPPING *--------------------*/ - +static const uint16_t unicode_list_0[] = { + 0x0, 0x4, 0x6, 0x7, 0x8, 0xc +}; /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { - .range_start = 1488, .range_length = 27, .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 = 1456, .range_length = 13, .glyph_id_start = 1, + .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 6, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY }, { - .range_start = 1524, .range_length = 1, .glyph_id_start = 28, + .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY } }; @@ -335,8 +356,8 @@ lv_font_t lv_font_he_STD = { #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 = 17, /*The maximum line height required by the font*/ - .base_line = 3, /*Baseline measured from the bottom of the line*/ + .line_height = 18, /*The maximum line height required by the font*/ + .base_line = 4, /*Baseline measured from the bottom of the line*/ #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif diff --git a/radio/src/fonts/lvgl/std/lv_font_he_XS.c b/radio/src/fonts/lvgl/std/lv_font_he_XS.c index 6bac4ccde..aa5739ca2 100644 --- a/radio/src/fonts/lvgl/std/lv_font_he_XS.c +++ b/radio/src/fonts/lvgl/std/lv_font_he_XS.c @@ -2,73 +2,75 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xa0,0x30,0x08,0x08,0x08,0x00,0x00,0x20,0x00,0xc0,0x07,0x08, -0x00,0xf1,0x04,0x40,0x00,0x80,0x05,0x06,0x08,0x00,0x00,0x58,0x00,0x30,0x07,0x07, -0x08,0x00,0x00,0x74,0x00,0x40,0x20,0x00,0xf1,0x0c,0x94,0x00,0x60,0x03,0x02,0x08, -0x01,0x00,0x9c,0x00,0x30,0x04,0x05,0x08,0x00,0x00,0xb0,0x00,0x90,0x08,0x07,0x08, -0x01,0x00,0xcc,0x00,0x80,0x08,0x00,0x10,0xe8,0x20,0x00,0xf0,0x00,0x05,0x01,0x03, -0xed,0x00,0xf0,0x06,0x06,0x0a,0x00,0xfe,0x0b,0x01,0xd0,0x06,0x40,0x00,0xb1,0x27, -0x01,0xe0,0x06,0x07,0x0c,0x00,0xff,0x51,0x01,0xd0,0x28,0x00,0x31,0x6d,0x01,0xf0, -0x50,0x00,0xc0,0x8d,0x01,0x60,0x03,0x02,0x0a,0x01,0xfe,0x97,0x01,0x10,0x05,0x50, -0x00,0x31,0xab,0x01,0x80,0x18,0x00,0x31,0xcb,0x01,0x90,0x78,0x00,0xb1,0xe7,0x01, -0x20,0x08,0x08,0x0a,0x00,0xfe,0x0f,0x02,0xf0,0x98,0x00,0xb1,0x2f,0x02,0x90,0x06, -0x07,0x0a,0x00,0xfe,0x52,0x02,0x10,0x20,0x00,0x40,0x6e,0x02,0xb0,0x07,0x10,0x00, -0x40,0x91,0x02,0xf0,0x06,0xb0,0x00,0xc0,0xa9,0x02,0x80,0x09,0x09,0x08,0x00,0x00, -0xcd,0x02,0x00,0x09,0x30,0x00,0xf4,0x29,0xed,0x02,0xd0,0x07,0x06,0x04,0x01,0x07, -0x0d,0x90,0x00,0xa8,0x02,0xf4,0x00,0xc6,0x00,0xae,0x10,0xf3,0x06,0xdb,0xb8,0xc0, -0x0d,0x51,0xee,0x20,0x1f,0x20,0x4f,0x20,0x4e,0x00,0x09,0xd0,0x7c,0x00,0x00,0xda, -0x3f,0xff,0xd5,0x00,0x01,0x11,0x6f,0x20,0x00,0x00,0x0c,0x60,0x00,0x00,0x0b,0x70, -0x04,0x00,0xfa,0x1f,0x01,0x11,0x1b,0x80,0x7f,0xff,0xff,0xf5,0x2f,0xe2,0x00,0x01, -0xaa,0x00,0x00,0x3e,0x00,0x00,0x1f,0x20,0x06,0xee,0x60,0x1f,0x38,0x90,0x5e,0x05, -0xd0,0x8a,0x01,0xf0,0xbf,0xff,0xff,0xd0,0x11,0x15,0xe1,0x00,0x00,0x4e,0x00,0x00, -0x04,0xe0,0x07,0x00,0xfc,0x01,0x0f,0xff,0xfc,0x30,0x01,0x11,0x2a,0xd0,0x00,0x00, -0x01,0xf2,0x0e,0x40,0x00,0xf3,0x04,0x00,0x13,0xe4,0x01,0x00,0xe2,0x88,0x20,0x04, -0xbf,0xd0,0x03,0xd6,0x00,0x98,0x00,0x0a,0x80,0x00,0xa8,0x05,0x00,0xf6,0x03,0xef, -0xff,0xd5,0x0e,0x51,0x16,0xf3,0xe4,0x00,0x0c,0x7e,0x40,0x00,0xa8,0xe4,0x00,0x0a, -0x8e,0x07,0x00,0xf0,0x0d,0xf3,0x0c,0xfb,0x1f,0x30,0x20,0xc8,0xf3,0x00,0x08,0xbf, -0x30,0x00,0x7c,0xf3,0x00,0x08,0xbd,0x50,0x00,0xb9,0x9d,0x32,0x7f,0x30,0x9e,0xfd, -0x40,0x50,0x00,0xa1,0x10,0xcf,0xfe,0xa1,0x01,0x13,0xc9,0x00,0x00,0x5d,0x89,0x00, -0x0c,0x03,0x00,0xf0,0x2f,0x7f,0xfd,0x70,0x00,0x11,0x4d,0x80,0x00,0x00,0x5e,0x00, -0x00,0x01,0xf0,0x00,0x00,0x1f,0x00,0x00,0x05,0xe0,0x01,0x14,0xd8,0x07,0xff,0xd7, -0x00,0x88,0x00,0x00,0x09,0x90,0x00,0x00,0x99,0x00,0x00,0x09,0xff,0xfe,0x70,0x01, -0x11,0x5f,0x20,0x00,0x00,0xf3,0x00,0x00,0x2f,0x10,0x00,0x0a,0xa0,0x00,0x09,0xe1, -0x00,0x5d,0xd2,0x18,0x01,0x00,0x01,0x00,0xf5,0x2e,0xef,0xff,0xd8,0x0e,0x51,0x14, -0xe7,0xe4,0x00,0x07,0xbe,0x40,0x00,0x6c,0xe4,0x00,0x06,0xce,0x40,0x00,0x6c,0xe5, -0x11,0x17,0xce,0xff,0xff,0xfc,0x5e,0x18,0xfe,0x80,0x0b,0xed,0x33,0xe7,0x03,0xf3, -0x00,0x7c,0x05,0xd0,0x00,0x5d,0x0a,0x80,0x00,0x4e,0x0e,0x50,0x00,0x4e,0x2f,0x10, -0x11,0x5e,0x6d,0x00,0xff,0xfe,0xe4,0x01,0x00,0xfe,0x57,0x3f,0xe5,0x00,0x18,0xd0, -0x00,0x3f,0x00,0x02,0xf0,0x00,0x2f,0x00,0x02,0xf0,0x01,0x3f,0x08,0xff,0xf0,0xaf, -0xff,0xfe,0x90,0x0c,0x61,0x14,0xe7,0x0f,0x20,0x00,0x8b,0x2f,0x10,0x00,0x7c,0x2f, -0x20,0x00,0x8b,0x0f,0x50,0x00,0xb9,0x0a,0xd4,0x26,0xf2,0x00,0x9e,0xfc,0x40,0x2f, -0x20,0x05,0xe0,0xc7,0x00,0x5d,0x06,0xd0,0x07,0xc0,0x1f,0x20,0x99,0x00,0xb8,0x0e, -0x50,0x05,0xd8,0xd0,0x24,0x7f,0xe2,0x0b,0xec,0x70,0x00,0x2f,0xff,0xfb,0x20,0x2f, -0x11,0x2b,0xc0,0x2f,0x00,0x03,0xf0,0x2f,0xf8,0x01,0xf0,0x02,0x21,0x01,0xf1,0x00, -0x00,0x04,0x00,0xf7,0x29,0x1f,0xff,0xea,0x10,0x1f,0x21,0x3b,0xb0,0x1f,0x10,0x02, -0xf1,0x1f,0xf9,0x00,0xf3,0x02,0x21,0x00,0xf2,0x00,0x00,0x03,0xf0,0x01,0x11,0x3c, -0x90,0x0f,0xff,0xd8,0x00,0x9c,0x00,0x0f,0x20,0xe5,0x02,0xf1,0x05,0xe0,0x5e,0x00, -0x0f,0x6e,0x60,0x00,0xea,0x40,0x00,0x0e,0x40,0x00,0x00,0xe4,0x00,0x07,0x00,0xf0, -0x05,0x9d,0x00,0x0f,0x40,0xd9,0x00,0xf2,0x02,0xf4,0x4f,0x00,0x06,0xee,0x60,0x00, -0x0a,0xc0,0x00,0x00,0x1e,0x32,0x01,0xf4,0x10,0x37,0xff,0xff,0xf8,0x3f,0xff,0xfc, -0x30,0x11,0x11,0x9c,0x07,0x20,0x04,0xe0,0xe4,0x00,0x6c,0x0e,0x40,0x0c,0x70,0xe4, -0x09,0xd0,0x0e,0x4d,0xd2,0x00,0xe4,0x70,0x42,0x00,0x01,0xa4,0x01,0x1e,0xd9,0xa4, -0x01,0xf0,0x1d,0x99,0x00,0xc6,0x05,0xe6,0xd0,0x0e,0x40,0x7c,0x3f,0x00,0xf3,0x09, -0xa0,0xf3,0x6f,0x00,0xb8,0x0d,0xfe,0x50,0x0d,0x50,0xa9,0x00,0x03,0xf1,0x07,0xc3, -0x47,0xe8,0x00,0x4f,0xfe,0xb5,0x00,0x8f,0xff,0xfe,0x91,0x06,0xd1,0x13,0xc9,0x5c, -0x01,0xf0,0x11,0x05,0xd0,0x00,0x3e,0x05,0xd0,0x00,0x3f,0x05,0xc0,0x00,0x3f,0x1a, -0xa0,0x00,0x3f,0x9d,0x30,0x00,0x3f,0x0e,0x80,0xf5,0x1f,0x24,0xf0,0x5c,0x07,0x90, -0x86,0x0b,0x40, +0x17,0x00,0x01,0x00,0x50,0x02,0x03,0xff,0xfd,0x03,0x08,0x00,0xc0,0x01,0xff,0xfe, +0x04,0x00,0x00,0x00,0x04,0x02,0xfe,0xfe,0x08,0x08,0x00,0x42,0x01,0xfe,0xfe,0x0a, +0x10,0x00,0x22,0xfd,0x0e,0x20,0x00,0xd0,0x04,0x0f,0x00,0x30,0x08,0x08,0x08,0x00, +0x00,0x2f,0x00,0xc0,0x07,0x08,0x00,0xf1,0x04,0x4f,0x00,0x80,0x05,0x06,0x08,0x00, +0x00,0x67,0x00,0x30,0x07,0x07,0x08,0x00,0x00,0x83,0x00,0x40,0x20,0x00,0xf1,0x0c, +0xa3,0x00,0x60,0x03,0x02,0x08,0x01,0x00,0xab,0x00,0x30,0x04,0x05,0x08,0x00,0x00, +0xbf,0x00,0x90,0x08,0x07,0x08,0x01,0x00,0xdb,0x00,0x80,0x08,0x00,0x10,0xf7,0x20, +0x00,0xf0,0x00,0x05,0x01,0x03,0xfc,0x00,0xf0,0x06,0x06,0x0a,0x00,0xfe,0x1a,0x01, +0xd0,0x06,0x40,0x00,0xb1,0x36,0x01,0xe0,0x06,0x07,0x0c,0x00,0xff,0x60,0x01,0xd0, +0x28,0x00,0x31,0x7c,0x01,0xf0,0x50,0x00,0xc0,0x9c,0x01,0x60,0x03,0x02,0x0a,0x01, +0xfe,0xa6,0x01,0x10,0x05,0x50,0x00,0x31,0xba,0x01,0x80,0x18,0x00,0x31,0xda,0x01, +0x90,0x78,0x00,0xb1,0xf6,0x01,0x20,0x08,0x08,0x0a,0x00,0xfe,0x1e,0x02,0xf0,0x98, +0x00,0xb1,0x3e,0x02,0x90,0x06,0x07,0x0a,0x00,0xfe,0x61,0x02,0x10,0x20,0x00,0x40, +0x7d,0x02,0xb0,0x07,0x10,0x00,0x40,0xa0,0x02,0xf0,0x06,0xb0,0x00,0xe0,0xb8,0x02, +0x80,0x09,0x09,0x08,0x00,0x00,0xdc,0x02,0x00,0x09,0x08,0x08,0x06,0x01,0xf4,0x3a, +0x04,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x55,0x55,0x00,0x55,0x18,0x81, +0x05,0x50,0x0a,0xa0,0x0b,0xb0,0x03,0x30,0x55,0x0d,0x90,0x00,0xa8,0x02,0xf4,0x00, +0xc6,0x00,0xae,0x10,0xf3,0x06,0xdb,0xb8,0xc0,0x0d,0x51,0xee,0x20,0x1f,0x20,0x4f, +0x20,0x4e,0x00,0x09,0xd0,0x7c,0x00,0x00,0xda,0x3f,0xff,0xd5,0x00,0x01,0x11,0x6f, +0x20,0x00,0x00,0x0c,0x60,0x00,0x00,0x0b,0x70,0x04,0x00,0xfa,0x1f,0x01,0x11,0x1b, +0x80,0x7f,0xff,0xff,0xf5,0x2f,0xe2,0x00,0x01,0xaa,0x00,0x00,0x3e,0x00,0x00,0x1f, +0x20,0x06,0xee,0x60,0x1f,0x38,0x90,0x5e,0x05,0xd0,0x8a,0x01,0xf0,0xbf,0xff,0xff, +0xd0,0x11,0x15,0xe1,0x00,0x00,0x4e,0x00,0x00,0x04,0xe0,0x07,0x00,0xfc,0x01,0x0f, +0xff,0xfc,0x30,0x01,0x11,0x2a,0xd0,0x00,0x00,0x01,0xf2,0x0e,0x40,0x00,0xf3,0x04, +0x00,0x13,0xe4,0x01,0x00,0xe2,0x88,0x20,0x04,0xbf,0xd0,0x03,0xd6,0x00,0x98,0x00, +0x0a,0x80,0x00,0xa8,0x05,0x00,0xf6,0x03,0xef,0xff,0xd5,0x0e,0x51,0x16,0xf3,0xe4, +0x00,0x0c,0x7e,0x40,0x00,0xa8,0xe4,0x00,0x0a,0x8e,0x07,0x00,0xf0,0x0d,0xf3,0x0c, +0xfb,0x1f,0x30,0x20,0xc8,0xf3,0x00,0x08,0xbf,0x30,0x00,0x7c,0xf3,0x00,0x08,0xbd, +0x50,0x00,0xb9,0x9d,0x32,0x7f,0x30,0x9e,0xfd,0x40,0x50,0x00,0xa1,0x10,0xcf,0xfe, +0xa1,0x01,0x13,0xc9,0x00,0x00,0x5d,0x89,0x00,0x0c,0x03,0x00,0xf0,0x2f,0x7f,0xfd, +0x70,0x00,0x11,0x4d,0x80,0x00,0x00,0x5e,0x00,0x00,0x01,0xf0,0x00,0x00,0x1f,0x00, +0x00,0x05,0xe0,0x01,0x14,0xd8,0x07,0xff,0xd7,0x00,0x88,0x00,0x00,0x09,0x90,0x00, +0x00,0x99,0x00,0x00,0x09,0xff,0xfe,0x70,0x01,0x11,0x5f,0x20,0x00,0x00,0xf3,0x00, +0x00,0x2f,0x10,0x00,0x0a,0xa0,0x00,0x09,0xe1,0x00,0x5d,0xd2,0x18,0x01,0x00,0x01, +0x00,0xf5,0x2e,0xef,0xff,0xd8,0x0e,0x51,0x14,0xe7,0xe4,0x00,0x07,0xbe,0x40,0x00, +0x6c,0xe4,0x00,0x06,0xce,0x40,0x00,0x6c,0xe5,0x11,0x17,0xce,0xff,0xff,0xfc,0x5e, +0x18,0xfe,0x80,0x0b,0xed,0x33,0xe7,0x03,0xf3,0x00,0x7c,0x05,0xd0,0x00,0x5d,0x0a, +0x80,0x00,0x4e,0x0e,0x50,0x00,0x4e,0x2f,0x10,0x11,0x5e,0x6d,0x00,0xff,0xfe,0xe4, +0x01,0x00,0xfe,0x57,0x3f,0xe5,0x00,0x18,0xd0,0x00,0x3f,0x00,0x02,0xf0,0x00,0x2f, +0x00,0x02,0xf0,0x01,0x3f,0x08,0xff,0xf0,0xaf,0xff,0xfe,0x90,0x0c,0x61,0x14,0xe7, +0x0f,0x20,0x00,0x8b,0x2f,0x10,0x00,0x7c,0x2f,0x20,0x00,0x8b,0x0f,0x50,0x00,0xb9, +0x0a,0xd4,0x26,0xf2,0x00,0x9e,0xfc,0x40,0x2f,0x20,0x05,0xe0,0xc7,0x00,0x5d,0x06, +0xd0,0x07,0xc0,0x1f,0x20,0x99,0x00,0xb8,0x0e,0x50,0x05,0xd8,0xd0,0x24,0x7f,0xe2, +0x0b,0xec,0x70,0x00,0x2f,0xff,0xfb,0x20,0x2f,0x11,0x2b,0xc0,0x2f,0x00,0x03,0xf0, +0x2f,0xf8,0x01,0xf0,0x02,0x21,0x01,0xf1,0x00,0x00,0x04,0x00,0xf7,0x29,0x1f,0xff, +0xea,0x10,0x1f,0x21,0x3b,0xb0,0x1f,0x10,0x02,0xf1,0x1f,0xf9,0x00,0xf3,0x02,0x21, +0x00,0xf2,0x00,0x00,0x03,0xf0,0x01,0x11,0x3c,0x90,0x0f,0xff,0xd8,0x00,0x9c,0x00, +0x0f,0x20,0xe5,0x02,0xf1,0x05,0xe0,0x5e,0x00,0x0f,0x6e,0x60,0x00,0xea,0x40,0x00, +0x0e,0x40,0x00,0x00,0xe4,0x00,0x07,0x00,0xf0,0x05,0x9d,0x00,0x0f,0x40,0xd9,0x00, +0xf2,0x02,0xf4,0x4f,0x00,0x06,0xee,0x60,0x00,0x0a,0xc0,0x00,0x00,0x1e,0x32,0x01, +0xf4,0x10,0x37,0xff,0xff,0xf8,0x3f,0xff,0xfc,0x30,0x11,0x11,0x9c,0x07,0x20,0x04, +0xe0,0xe4,0x00,0x6c,0x0e,0x40,0x0c,0x70,0xe4,0x09,0xd0,0x0e,0x4d,0xd2,0x00,0xe4, +0x70,0x42,0x00,0x01,0xa4,0x01,0x1e,0xd9,0xa4,0x01,0xf0,0x1d,0x99,0x00,0xc6,0x05, +0xe6,0xd0,0x0e,0x40,0x7c,0x3f,0x00,0xf3,0x09,0xa0,0xf3,0x6f,0x00,0xb8,0x0d,0xfe, +0x50,0x0d,0x50,0xa9,0x00,0x03,0xf1,0x07,0xc3,0x47,0xe8,0x00,0x4f,0xfe,0xb5,0x00, +0x8f,0xff,0xfe,0x91,0x06,0xd1,0x13,0xc9,0x5c,0x01,0xf0,0x05,0x05,0xd0,0x00,0x3e, +0x05,0xd0,0x00,0x3f,0x05,0xc0,0x00,0x3f,0x1a,0xa0,0x00,0x3f,0x9d,0x30,0x00,0x3f, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_XS __FLASH = { -.uncomp_size = 993, -.comp_size = 867, -.line_height = 13, -.base_line = 2, +.uncomp_size = 1048, +.comp_size = 912, +.line_height = 14, +.base_line = 3, .subpx = 0, .underline_position = -1, .underline_thickness = 1, @@ -79,11 +81,11 @@ const etxLz4Font lv_font_he_XS __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 1161, +.lvglFontBufSize = 1216, }; diff --git a/radio/src/fonts/lvgl/std/lv_font_he_XXS.c b/radio/src/fonts/lvgl/std/lv_font_he_XXS.c index cfacdf840..c75390da7 100644 --- a/radio/src/fonts/lvgl/std/lv_font_he_XXS.c +++ b/radio/src/fonts/lvgl/std/lv_font_he_XXS.c @@ -2,52 +2,54 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0x91,0xa0,0x05,0x06,0x05,0x00,0x00,0x0f,0x00,0x60,0x08,0x00, -0xf1,0x04,0x1e,0x00,0xd0,0x03,0x04,0x05,0x00,0x00,0x28,0x00,0x00,0x05,0x05,0x05, -0x00,0x00,0x35,0x00,0xb0,0x08,0x00,0xf1,0x04,0x42,0x00,0x50,0x02,0x02,0x05,0x00, -0x00,0x47,0x00,0xf0,0x02,0x03,0x06,0x00,0x00,0x50,0x00,0xf0,0x30,0x00,0x31,0x5f, -0x00,0xe0,0x08,0x00,0x10,0x6e,0x20,0x00,0xf0,0x00,0x03,0x00,0x02,0x71,0x00,0xd0, -0x04,0x05,0x07,0x00,0xfe,0x83,0x00,0xc0,0x04,0x38,0x00,0x10,0x90,0x08,0x00,0x70, -0x08,0x00,0xff,0xa4,0x00,0x20,0x06,0x28,0x00,0x31,0xb3,0x00,0x30,0x08,0x00,0x10, -0xc2,0x30,0x00,0xc3,0x07,0x00,0xfe,0xc9,0x00,0x80,0x03,0x03,0x05,0x00,0x00,0xd1, -0x48,0x00,0x31,0xe0,0x00,0x40,0x70,0x00,0x40,0xed,0x00,0xa0,0x05,0x48,0x00,0x31, -0xff,0x00,0x80,0x10,0x00,0x31,0x0c,0x01,0x90,0x58,0x00,0x31,0x1e,0x01,0xe0,0x58, -0x00,0x31,0x2b,0x01,0x50,0x20,0x00,0x31,0x3d,0x01,0xd0,0x10,0x00,0xa2,0x4a,0x01, -0x90,0x06,0x07,0x05,0x00,0x00,0x5c,0x01,0x60,0x00,0xf1,0x29,0x6b,0x01,0x70,0x05, -0x05,0x03,0x00,0x05,0x2c,0x10,0xa2,0x07,0xb0,0xd0,0x1c,0x8c,0x70,0x57,0x0a,0x50, -0x94,0x00,0xc2,0x5c,0xcb,0x10,0x00,0x07,0x60,0x00,0x05,0x70,0x00,0x05,0x70,0x7c, -0xcd,0xd0,0x5d,0x40,0x02,0xb0,0x05,0xe0,0x58,0x93,0x93,0x57,0x9c,0xcf,0x90,0x00, -0xc1,0x00,0x0c,0x10,0x05,0x00,0xe0,0x3c,0xcc,0x62,0x40,0x0d,0x49,0x00,0xd4,0x90, -0x0d,0x49,0x00,0xd0,0x39,0x01,0x00,0xf2,0x03,0x40,0x06,0xc9,0x0c,0x10,0xc0,0x1c, -0x01,0xc0,0x3e,0xbc,0x80,0x39,0x00,0xb1,0x39,0x00,0x93,0x03,0x00,0xf4,0x0d,0x48, -0x1b,0xc0,0x48,0x00,0x85,0x48,0x00,0x75,0x3a,0x00,0xb2,0x09,0xcc,0x70,0x39,0x39, -0x37,0x9c,0xc7,0x00,0x00,0xd0,0x00,0x0b,0x10,0x00,0xb1,0x05,0x00,0xe0,0x7b,0xc6, -0x00,0x00,0xc1,0x00,0x09,0x30,0x00,0xc1,0x7b,0xc6,0x00,0x81,0x16,0x00,0xf2,0x1f, -0x8c,0xcc,0x10,0x00,0x84,0x00,0x0a,0x20,0x05,0xb0,0x0a,0xb0,0x01,0x40,0x00,0x3e, -0xcc,0xa0,0x39,0x00,0x84,0x39,0x00,0x66,0x39,0x00,0x66,0x3e,0xcc,0xd6,0x68,0xac, -0xb0,0x0d,0x50,0x85,0x0d,0x00,0x57,0x49,0x00,0x57,0x85,0x2c,0xd7,0x39,0x01,0x00, -0xf2,0x21,0x5d,0x60,0x1b,0x00,0xc0,0x0c,0x8c,0xc0,0x9e,0xcc,0xb0,0x48,0x00,0x95, -0x67,0x00,0x76,0x4a,0x00,0xb3,0x09,0xcc,0x70,0x58,0x01,0xc0,0xd0,0x2a,0x08,0x55, -0x70,0x1c,0xc1,0xad,0xa2,0x00,0x6d,0xcc,0x46,0x60,0x1c,0x5c,0x50,0xd0,0x00,0x0d, -0x00,0x00,0x05,0x00,0xf0,0x0c,0x6d,0xcc,0x46,0x70,0x1d,0x5c,0x60,0xd0,0x00,0x1c, -0x3c,0xbc,0x30,0xa5,0x09,0x41,0xc0,0xb1,0x0a,0x9a,0x00,0x96,0x00,0x09,0x40,0x00, -0x94,0x05,0x00,0xf9,0x10,0x87,0x08,0x40,0xb4,0xb2,0x01,0xd7,0x00,0x02,0xc0,0x7c, -0xce,0x70,0x5c,0xbc,0x50,0x10,0x1c,0x39,0x02,0xa3,0x90,0xa4,0x39,0xa7,0x03,0x92, -0x00,0x39,0x00,0x00,0xcc,0x00,0xf0,0x1a,0xa2,0x1b,0x0b,0x17,0x63,0x90,0xd0,0x4c, -0xc4,0x0c,0x01,0xd0,0x07,0x80,0x0d,0xdc,0x90,0x00,0x8f,0xcb,0xb1,0x0c,0x00,0x76, -0x0c,0x00,0x57,0x0d,0x00,0x58,0x98,0x00,0x58,0x08,0x69,0x50,0xb1,0xc0,0x0a,0x0a, -0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x02,0xff,0xfe,0x02,0x08,0x00,0x43,0x01,0xff,0xfe, +0x03,0x10,0x00,0x12,0x05,0x10,0x00,0x23,0xff,0x06,0x10,0x00,0x12,0x08,0x10,0x00, +0xc1,0x03,0x09,0x00,0xa0,0x05,0x06,0x05,0x00,0x00,0x18,0x00,0x60,0x08,0x00,0xf1, +0x04,0x27,0x00,0xd0,0x03,0x04,0x05,0x00,0x00,0x31,0x00,0x00,0x05,0x05,0x05,0x00, +0x00,0x3e,0x00,0xb0,0x08,0x00,0xf1,0x04,0x4b,0x00,0x50,0x02,0x02,0x05,0x00,0x00, +0x50,0x00,0xf0,0x02,0x03,0x06,0x00,0x00,0x59,0x00,0xf0,0x30,0x00,0x31,0x68,0x00, +0xe0,0x08,0x00,0x10,0x77,0x20,0x00,0xf0,0x00,0x03,0x00,0x02,0x7a,0x00,0xd0,0x04, +0x05,0x07,0x00,0xfe,0x8c,0x00,0xc0,0x04,0x38,0x00,0x10,0x99,0x08,0x00,0x70,0x08, +0x00,0xff,0xad,0x00,0x20,0x06,0x28,0x00,0x31,0xbc,0x00,0x30,0x08,0x00,0x10,0xcb, +0x30,0x00,0xc3,0x07,0x00,0xfe,0xd2,0x00,0x80,0x03,0x03,0x05,0x00,0x00,0xda,0x48, +0x00,0x31,0xe9,0x00,0x40,0x70,0x00,0x40,0xf6,0x00,0xa0,0x05,0x48,0x00,0x31,0x08, +0x01,0x80,0x10,0x00,0x31,0x15,0x01,0x90,0x58,0x00,0x31,0x27,0x01,0xe0,0x58,0x00, +0x31,0x34,0x01,0x50,0x20,0x00,0x31,0x46,0x01,0xd0,0x10,0x00,0xa2,0x53,0x01,0x90, +0x06,0x07,0x05,0x00,0x00,0x65,0x01,0x60,0x00,0xf1,0x36,0x00,0x00,0x04,0x00,0x06, +0x00,0x07,0x00,0x08,0x00,0x0c,0x00,0x22,0x22,0x22,0x55,0x22,0x55,0x66,0x01,0x22, +0x2c,0x10,0xa2,0x07,0xb0,0xd0,0x1c,0x8c,0x70,0x57,0x0a,0x50,0x94,0x00,0xc2,0x5c, +0xcb,0x10,0x00,0x07,0x60,0x00,0x05,0x70,0x00,0x05,0x70,0x7c,0xcd,0xd0,0x5d,0x40, +0x02,0xb0,0x05,0xe0,0x58,0x93,0x93,0x57,0x9c,0xcf,0x90,0x00,0xc1,0x00,0x0c,0x10, +0x05,0x00,0xe0,0x3c,0xcc,0x62,0x40,0x0d,0x49,0x00,0xd4,0x90,0x0d,0x49,0x00,0xd0, +0x39,0x01,0x00,0xf2,0x03,0x40,0x06,0xc9,0x0c,0x10,0xc0,0x1c,0x01,0xc0,0x3e,0xbc, +0x80,0x39,0x00,0xb1,0x39,0x00,0x93,0x03,0x00,0xf4,0x0d,0x48,0x1b,0xc0,0x48,0x00, +0x85,0x48,0x00,0x75,0x3a,0x00,0xb2,0x09,0xcc,0x70,0x39,0x39,0x37,0x9c,0xc7,0x00, +0x00,0xd0,0x00,0x0b,0x10,0x00,0xb1,0x05,0x00,0xe0,0x7b,0xc6,0x00,0x00,0xc1,0x00, +0x09,0x30,0x00,0xc1,0x7b,0xc6,0x00,0x81,0x16,0x00,0xf2,0x1f,0x8c,0xcc,0x10,0x00, +0x84,0x00,0x0a,0x20,0x05,0xb0,0x0a,0xb0,0x01,0x40,0x00,0x3e,0xcc,0xa0,0x39,0x00, +0x84,0x39,0x00,0x66,0x39,0x00,0x66,0x3e,0xcc,0xd6,0x68,0xac,0xb0,0x0d,0x50,0x85, +0x0d,0x00,0x57,0x49,0x00,0x57,0x85,0x2c,0xd7,0x39,0x01,0x00,0xf2,0x21,0x5d,0x60, +0x1b,0x00,0xc0,0x0c,0x8c,0xc0,0x9e,0xcc,0xb0,0x48,0x00,0x95,0x67,0x00,0x76,0x4a, +0x00,0xb3,0x09,0xcc,0x70,0x58,0x01,0xc0,0xd0,0x2a,0x08,0x55,0x70,0x1c,0xc1,0xad, +0xa2,0x00,0x6d,0xcc,0x46,0x60,0x1c,0x5c,0x50,0xd0,0x00,0x0d,0x00,0x00,0x05,0x00, +0xf0,0x0c,0x6d,0xcc,0x46,0x70,0x1d,0x5c,0x60,0xd0,0x00,0x1c,0x3c,0xbc,0x30,0xa5, +0x09,0x41,0xc0,0xb1,0x0a,0x9a,0x00,0x96,0x00,0x09,0x40,0x00,0x94,0x05,0x00,0xf9, +0x10,0x87,0x08,0x40,0xb4,0xb2,0x01,0xd7,0x00,0x02,0xc0,0x7c,0xce,0x70,0x5c,0xbc, +0x50,0x10,0x1c,0x39,0x02,0xa3,0x90,0xa4,0x39,0xa7,0x03,0x92,0x00,0x39,0x00,0x00, +0xcc,0x00,0xf0,0x12,0xa2,0x1b,0x0b,0x17,0x63,0x90,0xd0,0x4c,0xc4,0x0c,0x01,0xd0, +0x07,0x80,0x0d,0xdc,0x90,0x00,0x8f,0xcb,0xb1,0x0c,0x00,0x76,0x0c,0x00,0x57,0x0d, +0x00,0x58,0x98,0x00,0x58, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_XXS __FLASH = { -.uncomp_size = 603, -.comp_size = 545, -.line_height = 10, +.uncomp_size = 656, +.comp_size = 581, +.line_height = 9, .base_line = 2, .subpx = 0, .underline_position = -1, @@ -59,11 +61,11 @@ const etxLz4Font lv_font_he_XXS __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 771, +.lvglFontBufSize = 824, }; diff --git a/radio/src/fonts/lvgl/std/lv_font_he_bold_STD.c b/radio/src/fonts/lvgl/std/lv_font_he_bold_STD.c index a5b1aa2ff..5c9d3d65c 100644 --- a/radio/src/fonts/lvgl/std/lv_font_he_bold_STD.c +++ b/radio/src/fonts/lvgl/std/lv_font_he_bold_STD.c @@ -2,96 +2,99 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x2b,0xf0,0x0a,0x0b,0x0a,0x00,0x00,0x37,0x00,0x40,0x0a, -0x0a,0x0a,0x00,0x00,0x69,0x00,0xb0,0x07,0x08,0x0a,0x00,0x00,0x91,0x00,0x50,0x09, -0x09,0x0a,0x00,0x00,0xbe,0x00,0xd0,0x0a,0x09,0x0a,0x01,0x00,0xeb,0x00,0xd0,0x04, -0x03,0x0a,0x01,0x00,0xfa,0x00,0xe0,0x05,0x06,0x0a,0x00,0x00,0x18,0x01,0x30,0x0b, -0x18,0x00,0xf0,0x0d,0x45,0x01,0x00,0x0b,0x0a,0x0a,0x01,0x00,0x77,0x01,0xd0,0x04, -0x03,0x06,0x01,0x04,0x80,0x01,0x40,0x09,0x08,0x0d,0x00,0xfd,0xb4,0x01,0xe0,0x08, -0x48,0x00,0xb1,0xdc,0x01,0x20,0x09,0x09,0x0f,0x00,0xff,0x20,0x02,0x80,0x28,0x00, -0x40,0x52,0x02,0xa0,0x0b,0x70,0x00,0xc0,0x89,0x02,0xd0,0x04,0x03,0x0d,0x01,0xfd, -0x9d,0x02,0xe0,0x06,0x50,0x00,0x31,0xbb,0x02,0x30,0x18,0x00,0x40,0xf2,0x02,0xe0, -0x09,0x88,0x00,0xb1,0x24,0x03,0xd0,0x0a,0x09,0x0d,0x01,0xfd,0x5f,0x03,0x70,0x80, -0x00,0xb1,0x8c,0x03,0xd0,0x08,0x09,0x0d,0x00,0xfd,0xc7,0x03,0xc0,0x98,0x00,0xc0, -0xf4,0x03,0x70,0x0a,0x0a,0x0d,0x00,0xfd,0x35,0x04,0x40,0x09,0x68,0x00,0xb1,0x5d, -0x04,0xe0,0x0c,0x0d,0x0a,0x00,0x00,0x9e,0x04,0x80,0x48,0x00,0xfb,0x49,0xd5,0x04, -0x00,0x0a,0x08,0x05,0x01,0x08,0x0a,0xfd,0x00,0x01,0xff,0x10,0x0e,0xf9,0x00,0x2f, -0xf0,0x00,0x3f,0xf4,0x04,0xfd,0x00,0x06,0xff,0xe1,0xaf,0x80,0x03,0xff,0xcf,0xdf, -0xe1,0x00,0x8f,0x81,0xff,0xe3,0x00,0x0c,0xf4,0x05,0xff,0x20,0x00,0xff,0x10,0x0a, -0xfd,0x00,0x3f,0xf0,0x00,0x1e,0xf8,0x06,0xfc,0x00,0x00,0x4f,0xf4,0x0f,0xff,0xfe, -0xa2,0x00,0x0e,0xee,0xef,0xfe,0x10,0x00,0x00,0x02,0xef,0x60,0x00,0x00,0x00,0x9f, -0x90,0x00,0x00,0x00,0x7f,0xa0,0x05,0x00,0xff,0x35,0x5e,0xee,0xee,0xff,0xf9,0x5f, -0xff,0xff,0xff,0xfb,0x0c,0xfe,0x60,0x00,0x0a,0xef,0xf2,0x00,0x00,0x0a,0xf8,0x00, -0x00,0x04,0xfc,0x00,0x00,0x02,0xff,0x00,0x00,0xaf,0xff,0x30,0x08,0xfd,0xbf,0x70, -0x0e,0xf3,0x6f,0xb0,0x2f,0xf0,0x2f,0xe0,0x6f,0xb0,0x0f,0xf2,0xaf,0xff,0xff,0xff, -0xe9,0xee,0xee,0xef,0xfc,0x00,0x00,0x06,0xfb,0x00,0x00,0x00,0x6f,0xb0,0x09,0x00, -0x08,0xfd,0x0e,0xdf,0xff,0xfe,0xa1,0x0b,0xee,0xee,0xff,0xd0,0x00,0x00,0x03,0xff, -0x50,0x00,0x00,0x0a,0xf7,0x9e,0x60,0x00,0x9f,0x8a,0xf7,0x00,0x09,0xf8,0xaf,0x70, -0x09,0x00,0x28,0x7a,0xf7,0x03,0x00,0xe0,0x89,0x40,0x00,0x9f,0xfe,0x93,0x17,0xcf, -0xfa,0x00,0x9f,0xc7,0x03,0xfe,0x93,0x00,0x17,0x05,0x03,0x00,0xfe,0x0c,0xaf,0xff, -0xfe,0xb4,0x0a,0xff,0xee,0xff,0xf4,0xaf,0x70,0x01,0xbf,0xba,0xf7,0x00,0x04,0xfd, -0xaf,0x70,0x00,0x3f,0xea,0xf7,0x00,0x03,0xfe,0x09,0x00,0xf1,0x0a,0xbf,0x60,0xaf, -0xfa,0x00,0xbf,0x60,0xbc,0xff,0x90,0xbf,0x60,0x00,0x6f,0xe0,0xbf,0x60,0x00,0x1f, -0xf1,0xbf,0x60,0x00,0x0f,0xf2,0x0a,0x00,0xf3,0x05,0xaf,0x70,0x00,0x4f,0xf0,0x7f, -0xd1,0x01,0xcf,0xa0,0x1f,0xff,0xef,0xff,0x20,0x02,0xae,0xfe,0xa2,0x00,0x86,0x00, -0xf2,0x07,0x71,0x21,0xbf,0xff,0xec,0x50,0x9e,0xee,0xff,0xf5,0x00,0x00,0x0b,0xfb, -0x00,0x00,0x04,0xfe,0x00,0x00,0x02,0xfe,0x1c,0x01,0x0f,0x04,0x00,0x07,0xf0,0x01, -0x6f,0xff,0xe9,0x10,0x5e,0xef,0xff,0xe1,0x00,0x00,0x3e,0xf9,0x00,0x00,0x06,0xfd, -0xfd,0x00,0x02,0x04,0x00,0x20,0x06,0xfd,0x14,0x00,0x00,0x1c,0x00,0x00,0x24,0x00, -0x60,0x01,0x10,0x00,0x00,0x07,0xfb,0x88,0x01,0x14,0xb0,0x09,0x00,0x60,0xff,0xfe, -0xb3,0x06,0xee,0xee,0x3b,0x00,0xf3,0x11,0x01,0xef,0x40,0x00,0x00,0x0c,0xf5,0x00, -0x00,0x00,0xff,0x20,0x00,0x00,0x9f,0xd0,0x00,0x01,0xaf,0xf3,0x00,0x18,0xef,0xf5, -0x00,0x07,0xff,0xd3,0x00,0x00,0x7c,0x60,0xfe,0x02,0xf1,0x09,0xaf,0xff,0xff,0xd7, -0x00,0xaf,0xfe,0xef,0xff,0x90,0xaf,0x70,0x00,0x7f,0xf0,0xaf,0x70,0x00,0x0f,0xf3, -0xaf,0x70,0x00,0x0e,0x05,0x00,0x17,0xf4,0x05,0x00,0x40,0xfe,0xee,0xef,0xf4,0xbc, -0x01,0xf0,0x08,0xf4,0x5f,0xe0,0x6d,0xfe,0x80,0x00,0xcf,0xcf,0xff,0xff,0x90,0x03, -0xff,0xf4,0x06,0xff,0x00,0x0c,0xf8,0x00,0x0e,0xf3,0x66,0x00,0xfb,0x0e,0xdf,0x50, -0x4f,0xe0,0x00,0x0c,0xf5,0x09,0xfa,0x00,0x00,0xcf,0x50,0xdf,0x60,0x00,0x0c,0xf5, -0x1f,0xf2,0x0a,0xee,0xff,0x55,0xfe,0x00,0xbf,0xff,0xf5,0x9e,0x01,0x00,0x03,0x00, -0x70,0x70,0x0f,0xfe,0x70,0x0e,0xff,0xf3,0x41,0x00,0x55,0x08,0xf9,0x00,0x07,0xfa, -0x03,0x00,0xd0,0x6e,0xef,0xfa,0x7f,0xff,0xfa,0x9f,0xff,0xff,0xfd,0x70,0x08,0xef, -0x9c,0x00,0xf0,0x28,0x07,0xf7,0x00,0x08,0xff,0x10,0xcf,0x40,0x00,0x0f,0xf3,0x0e, -0xf3,0x00,0x00,0xef,0x40,0xef,0x40,0x00,0x0f,0xf4,0x0d,0xf7,0x00,0x02,0xff,0x10, -0x9f,0xe2,0x01,0xbf,0xd0,0x01,0xef,0xfe,0xff,0xf4,0x00,0x02,0xae,0xfe,0xb3,0x00, -0x2f,0xf2,0x00,0x1f,0xf1,0x0c,0xf8,0x00,0x1f,0xf0,0x06,0xd3,0x02,0xf0,0x09,0x01, -0xff,0x30,0x4f,0xd0,0x00,0xaf,0x80,0x8f,0xa0,0x00,0x4f,0xe0,0xdf,0x50,0x00,0x0e, -0xfc,0xfe,0x00,0x01,0x3c,0xff,0xf4,0x02,0x02,0xff,0x1e,0x40,0x00,0xaf,0xda,0x60, -0x00,0x00,0xff,0xff,0xfe,0x91,0x0f,0xfe,0xef,0xff,0xd0,0xff,0x20,0x04,0xff,0x5f, -0xf2,0x00,0x0b,0xf7,0xff,0x20,0x00,0x9f,0x8f,0xff,0xf1,0x09,0xf8,0xde,0xee,0x00, -0x9f,0x80,0x00,0x00,0x09,0xf8,0x00,0x00,0x09,0x00,0x02,0xf1,0x0a,0xef,0xff,0xfd, -0x80,0x0e,0xfe,0xef,0xff,0xb0,0xef,0x40,0x05,0xff,0x4e,0xf4,0x00,0x0b,0xf7,0xef, -0xee,0x20,0x9f,0x8e,0xff,0xf2,0x20,0x00,0xf0,0x21,0xcf,0x60,0x00,0x00,0x7f,0xf2, -0xbe,0xee,0xff,0xf9,0x0c,0xff,0xff,0xc6,0x00,0x9f,0xc0,0x00,0xcf,0x61,0xef,0x70, -0x0e,0xf4,0x05,0xff,0x10,0xff,0x30,0x0d,0xf6,0x3f,0xf0,0x00,0x7f,0xcc,0xf9,0x00, -0x05,0xff,0xfa,0x00,0x00,0x5f,0xd1,0x00,0x00,0x05,0xc3,0x01,0x2f,0x5f,0xb0,0x09, -0x00,0x01,0xf0,0x10,0x9f,0xe1,0x00,0x3f,0xe0,0xcf,0xa0,0x05,0xfd,0x02,0xff,0x60, -0x7f,0xb0,0x06,0xff,0x2c,0xf7,0x00,0x0a,0xff,0xfd,0x00,0x00,0x0e,0xfc,0x00,0x00, -0x00,0x3f,0xf4,0xfb,0x01,0xf0,0x0b,0xe1,0x4e,0xee,0xee,0xff,0xc4,0xff,0xff,0xff, -0xfe,0x0f,0xff,0xff,0xfc,0x50,0x0e,0xee,0xee,0xff,0xf2,0x00,0x00,0x00,0x1d,0xf7, -0x00,0xae,0x00,0xf0,0x12,0x09,0xf7,0x00,0x0b,0xf7,0x0a,0xf7,0x00,0x1f,0xf3,0x0a, -0xf7,0x00,0xaf,0xc0,0x0a,0xf7,0x1a,0xff,0x20,0x0a,0xf7,0x9f,0xf4,0x00,0x0a,0xf7, -0x9b,0x20,0x00,0x0a,0xf7,0x10,0x5d,0x03,0x13,0x00,0x05,0x00,0x03,0xb5,0x02,0x1f, -0xf4,0xb5,0x02,0x0d,0xf0,0x33,0x7f,0xb0,0x06,0xfb,0x00,0xff,0x34,0xfe,0x00,0x7f, -0xa0,0x1f,0xf1,0x1f,0xf1,0x09,0xf8,0x03,0xff,0x00,0xef,0x40,0xcf,0x60,0x4f,0xd0, -0x0b,0xf9,0x7f,0xf2,0x06,0xfb,0x00,0x8f,0xff,0xf7,0x00,0x9f,0x90,0x05,0xfe,0x40, -0x00,0x1e,0xf5,0x00,0x2f,0xf0,0x01,0x5d,0xfe,0x00,0x00,0xff,0xef,0xff,0xfe,0x20, -0x00,0x0c,0xff,0xec,0xa6,0x00,0x00,0x7f,0xe3,0x01,0x11,0x06,0xe3,0x01,0xb0,0x00, -0xff,0x20,0x07,0xff,0x00,0x0f,0xf2,0x00,0x0f,0xf2,0x4c,0x02,0x43,0xef,0x30,0x0f, -0xf2,0x57,0x02,0xf0,0x17,0xef,0x30,0x4f,0xf0,0x00,0x0e,0xf3,0x7f,0xfc,0x00,0x00, -0xef,0x38,0xfc,0x20,0x00,0x0e,0xf3,0x05,0xfb,0x0d,0xf3,0x09,0xf5,0x1f,0xd0,0x0c, -0xf0,0x4f,0x70,0x0f,0xa0,0x8f,0x20,0x3f,0x40,0xbc,0x00, +0x17,0x00,0x01,0x00,0x50,0x02,0x05,0xff,0xfc,0x05,0x08,0x00,0xc0,0x03,0xff,0xfc, +0x08,0x00,0x00,0x00,0x04,0x05,0xfe,0xfc,0x12,0x08,0x00,0x40,0x01,0xfe,0xfe,0x14, +0x08,0x00,0x42,0x02,0xfe,0xfd,0x18,0x20,0x00,0xf0,0x2e,0x04,0x1b,0x00,0xf0,0x0a, +0x0b,0x0a,0x00,0x00,0x52,0x00,0x40,0x0a,0x0a,0x0a,0x00,0x00,0x84,0x00,0xb0,0x07, +0x08,0x0a,0x00,0x00,0xac,0x00,0x50,0x09,0x09,0x0a,0x00,0x00,0xd9,0x00,0xd0,0x0a, +0x09,0x0a,0x01,0x00,0x06,0x01,0xd0,0x04,0x03,0x0a,0x01,0x00,0x15,0x01,0xe0,0x05, +0x06,0x0a,0x00,0x00,0x33,0x01,0x30,0x0b,0x18,0x00,0x90,0x60,0x01,0x00,0x0b,0x0a, +0x0a,0x01,0x00,0x92,0x20,0x00,0xf0,0x00,0x06,0x01,0x04,0x9b,0x01,0x40,0x09,0x08, +0x0d,0x00,0xfd,0xcf,0x01,0xe0,0x08,0x48,0x00,0xb1,0xf7,0x01,0x20,0x09,0x09,0x0f, +0x00,0xff,0x3b,0x02,0x80,0x28,0x00,0x40,0x6d,0x02,0xa0,0x0b,0x70,0x00,0xc0,0xa4, +0x02,0xd0,0x04,0x03,0x0d,0x01,0xfd,0xb8,0x02,0xe0,0x06,0x50,0x00,0x31,0xd6,0x02, +0x30,0x18,0x00,0x40,0x0d,0x03,0xe0,0x09,0x88,0x00,0xb1,0x3f,0x03,0xd0,0x0a,0x09, +0x0d,0x01,0xfd,0x7a,0x03,0x70,0x80,0x00,0xb1,0xa7,0x03,0xd0,0x08,0x09,0x0d,0x00, +0xfd,0xe2,0x03,0xc0,0x98,0x00,0xc0,0x0f,0x04,0x70,0x0a,0x0a,0x0d,0x00,0xfd,0x50, +0x04,0x40,0x09,0x68,0x00,0xb0,0x78,0x04,0xe0,0x0c,0x0d,0x0a,0x00,0x00,0xb9,0x04, +0x80,0x48,0x00,0x00,0xe6,0x00,0xe0,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00, +0x00,0x77,0x00,0x77,0x00,0x03,0x00,0xfb,0x53,0x00,0x69,0x96,0x01,0x10,0x07,0x70, +0x00,0x00,0x3d,0xd3,0x3b,0xb3,0x07,0x80,0x00,0x77,0x00,0x0a,0xfd,0x00,0x01,0xff, +0x10,0x0e,0xf9,0x00,0x2f,0xf0,0x00,0x3f,0xf4,0x04,0xfd,0x00,0x06,0xff,0xe1,0xaf, +0x80,0x03,0xff,0xcf,0xdf,0xe1,0x00,0x8f,0x81,0xff,0xe3,0x00,0x0c,0xf4,0x05,0xff, +0x20,0x00,0xff,0x10,0x0a,0xfd,0x00,0x3f,0xf0,0x00,0x1e,0xf8,0x06,0xfc,0x00,0x00, +0x4f,0xf4,0x0f,0xff,0xfe,0xa2,0x00,0x0e,0xee,0xef,0xfe,0x10,0x00,0x00,0x02,0xef, +0x60,0x00,0x00,0x00,0x9f,0x90,0x00,0x00,0x00,0x7f,0xa0,0x05,0x00,0xff,0x35,0x5e, +0xee,0xee,0xff,0xf9,0x5f,0xff,0xff,0xff,0xfb,0x0c,0xfe,0x60,0x00,0x0a,0xef,0xf2, +0x00,0x00,0x0a,0xf8,0x00,0x00,0x04,0xfc,0x00,0x00,0x02,0xff,0x00,0x00,0xaf,0xff, +0x30,0x08,0xfd,0xbf,0x70,0x0e,0xf3,0x6f,0xb0,0x2f,0xf0,0x2f,0xe0,0x6f,0xb0,0x0f, +0xf2,0xaf,0xff,0xff,0xff,0xe9,0xee,0xee,0xef,0xfc,0x00,0x00,0x06,0xfb,0x00,0x00, +0x00,0x6f,0xb0,0x09,0x00,0x08,0xfd,0x0e,0xdf,0xff,0xfe,0xa1,0x0b,0xee,0xee,0xff, +0xd0,0x00,0x00,0x03,0xff,0x50,0x00,0x00,0x0a,0xf7,0x9e,0x60,0x00,0x9f,0x8a,0xf7, +0x00,0x09,0xf8,0xaf,0x70,0x09,0x00,0x28,0x7a,0xf7,0x03,0x00,0xe0,0x89,0x40,0x00, +0x9f,0xfe,0x93,0x17,0xcf,0xfa,0x00,0x9f,0xc7,0x03,0xfe,0x93,0x00,0x17,0x05,0x03, +0x00,0xfe,0x0c,0xaf,0xff,0xfe,0xb4,0x0a,0xff,0xee,0xff,0xf4,0xaf,0x70,0x01,0xbf, +0xba,0xf7,0x00,0x04,0xfd,0xaf,0x70,0x00,0x3f,0xea,0xf7,0x00,0x03,0xfe,0x09,0x00, +0xf1,0x0a,0xbf,0x60,0xaf,0xfa,0x00,0xbf,0x60,0xbc,0xff,0x90,0xbf,0x60,0x00,0x6f, +0xe0,0xbf,0x60,0x00,0x1f,0xf1,0xbf,0x60,0x00,0x0f,0xf2,0x0a,0x00,0xf3,0x05,0xaf, +0x70,0x00,0x4f,0xf0,0x7f,0xd1,0x01,0xcf,0xa0,0x1f,0xff,0xef,0xff,0x20,0x02,0xae, +0xfe,0xa2,0x00,0x86,0x00,0xf2,0x07,0x71,0x21,0xbf,0xff,0xec,0x50,0x9e,0xee,0xff, +0xf5,0x00,0x00,0x0b,0xfb,0x00,0x00,0x04,0xfe,0x00,0x00,0x02,0xfe,0x1c,0x01,0x0f, +0x04,0x00,0x07,0xf0,0x01,0x6f,0xff,0xe9,0x10,0x5e,0xef,0xff,0xe1,0x00,0x00,0x3e, +0xf9,0x00,0x00,0x06,0xfd,0xfd,0x00,0x02,0x04,0x00,0x20,0x06,0xfd,0x14,0x00,0x00, +0x1c,0x00,0x00,0x24,0x00,0x60,0x01,0x10,0x00,0x00,0x07,0xfb,0x88,0x01,0x14,0xb0, +0x09,0x00,0x60,0xff,0xfe,0xb3,0x06,0xee,0xee,0x3b,0x00,0xf3,0x11,0x01,0xef,0x40, +0x00,0x00,0x0c,0xf5,0x00,0x00,0x00,0xff,0x20,0x00,0x00,0x9f,0xd0,0x00,0x01,0xaf, +0xf3,0x00,0x18,0xef,0xf5,0x00,0x07,0xff,0xd3,0x00,0x00,0x7c,0x60,0x4b,0x03,0xf1, +0x09,0xaf,0xff,0xff,0xd7,0x00,0xaf,0xfe,0xef,0xff,0x90,0xaf,0x70,0x00,0x7f,0xf0, +0xaf,0x70,0x00,0x0f,0xf3,0xaf,0x70,0x00,0x0e,0x05,0x00,0x17,0xf4,0x05,0x00,0x40, +0xfe,0xee,0xef,0xf4,0xbc,0x01,0xf0,0x08,0xf4,0x5f,0xe0,0x6d,0xfe,0x80,0x00,0xcf, +0xcf,0xff,0xff,0x90,0x03,0xff,0xf4,0x06,0xff,0x00,0x0c,0xf8,0x00,0x0e,0xf3,0x66, +0x00,0xfb,0x0e,0xdf,0x50,0x4f,0xe0,0x00,0x0c,0xf5,0x09,0xfa,0x00,0x00,0xcf,0x50, +0xdf,0x60,0x00,0x0c,0xf5,0x1f,0xf2,0x0a,0xee,0xff,0x55,0xfe,0x00,0xbf,0xff,0xf5, +0x9e,0x01,0x00,0x03,0x00,0x70,0x70,0x0f,0xfe,0x70,0x0e,0xff,0xf3,0x41,0x00,0x55, +0x08,0xf9,0x00,0x07,0xfa,0x03,0x00,0xd0,0x6e,0xef,0xfa,0x7f,0xff,0xfa,0x9f,0xff, +0xff,0xfd,0x70,0x08,0xef,0x9c,0x00,0xf0,0x28,0x07,0xf7,0x00,0x08,0xff,0x10,0xcf, +0x40,0x00,0x0f,0xf3,0x0e,0xf3,0x00,0x00,0xef,0x40,0xef,0x40,0x00,0x0f,0xf4,0x0d, +0xf7,0x00,0x02,0xff,0x10,0x9f,0xe2,0x01,0xbf,0xd0,0x01,0xef,0xfe,0xff,0xf4,0x00, +0x02,0xae,0xfe,0xb3,0x00,0x2f,0xf2,0x00,0x1f,0xf1,0x0c,0xf8,0x00,0x1f,0xf0,0x06, +0xd3,0x02,0xf0,0x09,0x01,0xff,0x30,0x4f,0xd0,0x00,0xaf,0x80,0x8f,0xa0,0x00,0x4f, +0xe0,0xdf,0x50,0x00,0x0e,0xfc,0xfe,0x00,0x01,0x3c,0xff,0xf4,0x02,0x02,0xff,0x1e, +0x40,0x00,0xaf,0xda,0x60,0x00,0x00,0xff,0xff,0xfe,0x91,0x0f,0xfe,0xef,0xff,0xd0, +0xff,0x20,0x04,0xff,0x5f,0xf2,0x00,0x0b,0xf7,0xff,0x20,0x00,0x9f,0x8f,0xff,0xf1, +0x09,0xf8,0xde,0xee,0x00,0x9f,0x80,0x00,0x00,0x09,0xf8,0x00,0x00,0x09,0x00,0x02, +0xf1,0x0a,0xef,0xff,0xfd,0x80,0x0e,0xfe,0xef,0xff,0xb0,0xef,0x40,0x05,0xff,0x4e, +0xf4,0x00,0x0b,0xf7,0xef,0xee,0x20,0x9f,0x8e,0xff,0xf2,0x20,0x00,0xf0,0x21,0xcf, +0x60,0x00,0x00,0x7f,0xf2,0xbe,0xee,0xff,0xf9,0x0c,0xff,0xff,0xc6,0x00,0x9f,0xc0, +0x00,0xcf,0x61,0xef,0x70,0x0e,0xf4,0x05,0xff,0x10,0xff,0x30,0x0d,0xf6,0x3f,0xf0, +0x00,0x7f,0xcc,0xf9,0x00,0x05,0xff,0xfa,0x00,0x00,0x5f,0xd1,0x00,0x00,0x05,0xc3, +0x01,0x2f,0x5f,0xb0,0x09,0x00,0x01,0xf0,0x10,0x9f,0xe1,0x00,0x3f,0xe0,0xcf,0xa0, +0x05,0xfd,0x02,0xff,0x60,0x7f,0xb0,0x06,0xff,0x2c,0xf7,0x00,0x0a,0xff,0xfd,0x00, +0x00,0x0e,0xfc,0x00,0x00,0x00,0x3f,0xf4,0xfb,0x01,0xf0,0x0b,0xe1,0x4e,0xee,0xee, +0xff,0xc4,0xff,0xff,0xff,0xfe,0x0f,0xff,0xff,0xfc,0x50,0x0e,0xee,0xee,0xff,0xf2, +0x00,0x00,0x00,0x1d,0xf7,0x00,0xae,0x00,0xf0,0x12,0x09,0xf7,0x00,0x0b,0xf7,0x0a, +0xf7,0x00,0x1f,0xf3,0x0a,0xf7,0x00,0xaf,0xc0,0x0a,0xf7,0x1a,0xff,0x20,0x0a,0xf7, +0x9f,0xf4,0x00,0x0a,0xf7,0x9b,0x20,0x00,0x0a,0xf7,0x10,0x5d,0x03,0x13,0x00,0x05, +0x00,0x03,0xb5,0x02,0x1f,0xf4,0xb5,0x02,0x0d,0xf0,0x33,0x7f,0xb0,0x06,0xfb,0x00, +0xff,0x34,0xfe,0x00,0x7f,0xa0,0x1f,0xf1,0x1f,0xf1,0x09,0xf8,0x03,0xff,0x00,0xef, +0x40,0xcf,0x60,0x4f,0xd0,0x0b,0xf9,0x7f,0xf2,0x06,0xfb,0x00,0x8f,0xff,0xf7,0x00, +0x9f,0x90,0x05,0xfe,0x40,0x00,0x1e,0xf5,0x00,0x2f,0xf0,0x01,0x5d,0xfe,0x00,0x00, +0xff,0xef,0xff,0xfe,0x20,0x00,0x0c,0xff,0xec,0xa6,0x00,0x00,0x7f,0xe3,0x01,0x11, +0x06,0xe3,0x01,0xb0,0x00,0xff,0x20,0x07,0xff,0x00,0x0f,0xf2,0x00,0x0f,0xf2,0x4c, +0x02,0x43,0xef,0x30,0x0f,0xf2,0x57,0x02,0xf0,0x03,0xef,0x30,0x4f,0xf0,0x00,0x0e, +0xf3,0x7f,0xfc,0x00,0x00,0xef,0x38,0xfc,0x20,0x00,0x0e,0xf3, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_bold_STD __FLASH = { -.uncomp_size = 1489, -.comp_size = 1243, -.line_height = 17, -.base_line = 3, +.uncomp_size = 1548, +.comp_size = 1292, +.line_height = 18, +.base_line = 4, .subpx = 0, .underline_position = -2, .underline_thickness = 1, @@ -102,11 +105,11 @@ const etxLz4Font lv_font_he_bold_STD __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 1657, +.lvglFontBufSize = 1716, }; diff --git a/radio/src/fonts/lvgl/std/lv_font_he_bold_XL.c b/radio/src/fonts/lvgl/std/lv_font_he_bold_XL.c index 5e9fea669..e1a745bb1 100644 --- a/radio/src/fonts/lvgl/std/lv_font_he_bold_XL.c +++ b/radio/src/fonts/lvgl/std/lv_font_he_bold_XL.c @@ -2,21 +2,28 @@ #include "lz4_fonts.h" static const uint8_t lz4FontData[] __FLASH = { -0x15,0x00,0x01,0x00,0xf0,0x2b,0xd0,0x15,0x15,0x13,0x01,0x00,0xc8,0x00,0x80,0x14, -0x13,0x13,0x01,0x00,0x7d,0x01,0x50,0x0f,0x0f,0x13,0x00,0x00,0x0c,0x02,0xa0,0x12, -0x12,0x13,0x00,0x00,0xb7,0x02,0xa0,0x15,0x12,0x13,0x02,0x00,0x62,0x03,0xb0,0x09, -0x05,0x13,0x02,0x00,0x92,0x03,0xb0,0x0b,0x0c,0x14,0x00,0x00,0x0a,0x04,0x70,0x16, -0x18,0x00,0xf0,0x1d,0xb5,0x04,0x00,0x16,0x13,0x13,0x02,0x00,0x6a,0x05,0xb0,0x09, -0x05,0x0b,0x02,0x08,0x86,0x05,0x70,0x12,0x10,0x19,0x00,0xfa,0x4e,0x06,0xb0,0x11, -0x0f,0x13,0x01,0x00,0xdd,0x06,0x50,0x12,0x10,0x1c,0x01,0xfe,0xbd,0x07,0x10,0x17, -0x28,0x00,0xf0,0x0d,0x72,0x08,0x40,0x17,0x15,0x13,0x00,0x00,0x3a,0x09,0xb0,0x09, -0x05,0x19,0x02,0xfa,0x79,0x09,0xd0,0x0d,0x0b,0x13,0x01,0x00,0xe2,0x09,0x60,0x16, -0x18,0x00,0xf0,0x05,0xaa,0x0a,0xd0,0x13,0x13,0x13,0x00,0x00,0x5f,0x0b,0xa0,0x15, -0x12,0x19,0x02,0xfa,0x40,0x0c,0xe0,0x14,0x68,0x00,0xc0,0xeb,0x0c,0xa0,0x11,0x11, -0x19,0x00,0xfa,0xc0,0x0d,0x80,0x13,0x98,0x00,0xf1,0x0c,0x6b,0x0e,0xf0,0x14,0x13, -0x19,0x01,0xfa,0x59,0x0f,0x70,0x12,0x10,0x13,0x00,0x00,0xf1,0x0f,0xc0,0x19,0x19, -0x13,0x00,0x00,0xdf,0x10,0x00,0x60,0x00,0xf1,0x37,0xa7,0x11,0x00,0x14,0x0e,0x0a, -0x03,0x10,0x0a,0xff,0xff,0x70,0x00,0x00,0x00,0x1f,0xff,0xf3,0x00,0x0d,0xff,0xff, +0x17,0x00,0x01,0x00,0x50,0x04,0x06,0xfe,0xfa,0x0c,0x08,0x00,0xf0,0x05,0x03,0xfe, +0xfb,0x12,0x00,0x00,0x00,0x08,0x06,0xfc,0xfa,0x2a,0x00,0x00,0x00,0x06,0x02,0xfd, +0xfc,0x30,0x08,0x00,0x42,0x04,0xfd,0xfb,0x3c,0x20,0x00,0xf0,0x2e,0x0a,0x42,0x00, +0xd0,0x15,0x15,0x13,0x01,0x00,0x0a,0x01,0x80,0x14,0x13,0x13,0x01,0x00,0xbf,0x01, +0x50,0x0f,0x0f,0x13,0x00,0x00,0x4e,0x02,0xa0,0x12,0x12,0x13,0x00,0x00,0xf9,0x02, +0xa0,0x15,0x12,0x13,0x02,0x00,0xa4,0x03,0xb0,0x09,0x05,0x13,0x02,0x00,0xd4,0x03, +0xb0,0x0b,0x0c,0x14,0x00,0x00,0x4c,0x04,0x70,0x16,0x18,0x00,0xf0,0x1d,0xf7,0x04, +0x00,0x16,0x13,0x13,0x02,0x00,0xac,0x05,0xb0,0x09,0x05,0x0b,0x02,0x08,0xc8,0x05, +0x70,0x12,0x10,0x19,0x00,0xfa,0x90,0x06,0xb0,0x11,0x0f,0x13,0x01,0x00,0x1f,0x07, +0x50,0x12,0x10,0x1c,0x01,0xfe,0xff,0x07,0x10,0x17,0x28,0x00,0xf0,0x0d,0xb4,0x08, +0x40,0x17,0x15,0x13,0x00,0x00,0x7c,0x09,0xb0,0x09,0x05,0x19,0x02,0xfa,0xbb,0x09, +0xd0,0x0d,0x0b,0x13,0x01,0x00,0x24,0x0a,0x60,0x16,0x18,0x00,0xf0,0x05,0xec,0x0a, +0xd0,0x13,0x13,0x13,0x00,0x00,0xa1,0x0b,0xa0,0x15,0x12,0x19,0x02,0xfa,0x82,0x0c, +0xe0,0x14,0x68,0x00,0xc0,0x2d,0x0d,0xa0,0x11,0x11,0x19,0x00,0xfa,0x02,0x0e,0x80, +0x13,0x98,0x00,0xf0,0x0c,0xad,0x0e,0xf0,0x14,0x13,0x19,0x01,0xfa,0x9b,0x0f,0x70, +0x12,0x10,0x13,0x00,0x00,0x33,0x10,0xc0,0x19,0x19,0x13,0x00,0x00,0x21,0x11,0x00, +0x60,0x00,0x00,0xde,0x00,0xf0,0x36,0x00,0x06,0x00,0x07,0x00,0x08,0x00,0x0c,0x00, +0x0d,0xd0,0x2f,0xf2,0x04,0x40,0x05,0x50,0x2f,0xf2,0x1d,0xd0,0x04,0x40,0x2f,0xf2, +0x0d,0xd0,0x03,0x60,0x06,0x30,0x0f,0xf5,0x5f,0xf0,0x0b,0xe2,0x2e,0xb0,0x00,0x04, +0x40,0x00,0x00,0x2f,0xf2,0x00,0x00,0x0d,0xd0,0x00,0x5a,0xaa,0xa5,0x9f,0xff,0xf9, +0x47,0x77,0x74,0x9f,0xff,0xf9,0x12,0xde,0x21,0x00,0xde,0x00,0x30,0x00,0xf1,0x31, +0x1d,0xd1,0x0a,0xff,0xff,0x70,0x00,0x00,0x00,0x1f,0xff,0xf3,0x00,0x0d,0xff,0xff, 0x30,0x00,0x00,0x02,0xff,0xff,0x20,0x00,0x2f,0xff,0xfd,0x00,0x00,0x00,0x4f,0xff, 0xf0,0x00,0x00,0x6f,0xff,0xfa,0x00,0x00,0x06,0xff,0xfe,0x00,0x00,0x00,0x9f,0xff, 0xf6,0x00,0x00,0x8f,0xff,0xc0,0x00,0x00,0x00,0xdf,0xff,0xf2,0x00,0x0c,0xff,0xf8, @@ -29,11 +36,11 @@ static const uint8_t lz4FontData[] __FLASH = { 0xff,0xff,0x60,0x0a,0x3a,0x00,0x61,0x00,0x1e,0xff,0xff,0x20,0xdf,0xbc,0x00,0xf1, 0x01,0x00,0x3f,0xff,0xfd,0x00,0x0f,0xff,0xff,0xff,0xfe,0xb8,0x20,0x00,0x00,0x00, 0xff,0x01,0x00,0x10,0xa0,0x48,0x00,0x00,0x01,0x00,0x00,0x90,0x00,0x82,0xcc,0xcc, -0xcc,0xcd,0xff,0xff,0xff,0x60,0xd1,0x01,0x33,0x7f,0xff,0xfc,0xdb,0x01,0x32,0x8f, +0xcc,0xcd,0xff,0xff,0xff,0x60,0x45,0x02,0x33,0x7f,0xff,0xfc,0x4f,0x02,0x32,0x8f, 0xff,0xf0,0x09,0x00,0x01,0xf5,0x00,0x01,0x01,0x00,0x11,0x0f,0xa2,0x00,0x11,0x00, 0x48,0x00,0x1f,0x40,0x13,0x00,0x26,0x20,0x08,0xcc,0x01,0x00,0x63,0xcf,0xff,0xfd, -0xc4,0xbf,0xff,0x01,0x00,0x14,0x5b,0x09,0x00,0x15,0xf5,0x13,0x00,0x50,0x50,0x00, -0x8f,0xff,0xec,0x95,0x00,0x51,0x08,0xff,0xff,0xff,0x80,0x90,0x00,0x01,0x49,0x01, +0xc4,0xbf,0xff,0x01,0x00,0x14,0x5b,0x09,0x00,0x15,0xf5,0x13,0x00,0x60,0x50,0x00, +0x8f,0xff,0xec,0x60,0xc7,0x02,0x41,0xff,0xff,0xff,0x80,0x90,0x00,0x01,0x49,0x01, 0x59,0x06,0xcc,0xef,0xff,0xfa,0xa1,0x00,0x12,0xef,0x66,0x00,0x31,0x0a,0xff,0xf8, 0x0f,0x00,0x11,0x5f,0x84,0x01,0x21,0x00,0x01,0x1f,0x01,0x51,0x00,0x16,0xbf,0xff, 0xf4,0xd7,0x00,0x01,0xcb,0x01,0x00,0x44,0x00,0x10,0xfb,0x14,0x01,0x90,0xfb,0x7f, @@ -140,39 +147,35 @@ static const uint8_t lz4FontData[] __FLASH = { 0x00,0x93,0x0a,0x20,0xff,0x80,0x13,0x00,0x00,0xd7,0x00,0x11,0xe0,0x33,0x00,0x10, 0x3c,0x3c,0x0b,0x00,0x13,0x00,0x10,0x3f,0x6e,0x07,0x00,0x13,0x00,0x53,0x03,0xff, 0xff,0xe3,0x00,0x13,0x00,0x22,0xb1,0x00,0x13,0x00,0x32,0xfd,0x40,0x00,0x13,0x00, -0x11,0x24,0x7f,0x00,0x03,0x3d,0x07,0x04,0x17,0x0f,0x0f,0x13,0x00,0x0e,0x0f,0xd3, -0x09,0x12,0x1f,0xaf,0xd3,0x09,0x0e,0x0f,0xa3,0x09,0x3e,0x30,0x0f,0xff,0xf6,0x70, -0x00,0x11,0xf7,0xf9,0x04,0x31,0xdf,0xff,0x90,0xf0,0x02,0x00,0xd6,0x02,0x01,0x2e, -0x07,0x00,0xf4,0x02,0x00,0x77,0x06,0x00,0x1b,0x02,0x00,0x5e,0x06,0x00,0x80,0x03, -0x12,0x03,0x12,0x10,0x11,0xf1,0x56,0x05,0x00,0x34,0x05,0x01,0xe5,0x00,0x00,0x59, -0x05,0x30,0xdf,0xff,0x80,0x08,0x00,0x00,0x6d,0x02,0x00,0x50,0x03,0x01,0xc7,0x00, -0x00,0x50,0x03,0x50,0x00,0x7f,0xff,0xe1,0x4b,0x90,0x02,0x00,0x68,0x00,0x12,0x04, -0x3c,0x09,0x00,0x4f,0x00,0x12,0x50,0xf1,0x01,0x13,0xa0,0xe0,0x06,0x50,0xef,0xff, -0xfe,0xb7,0x20,0xaa,0x01,0x15,0xfe,0x46,0x09,0x02,0xd5,0x03,0x11,0x8f,0x34,0x06, -0x20,0x04,0xef,0xa7,0x01,0x01,0x7e,0x03,0x21,0x02,0x6b,0x6c,0x03,0x00,0xd2,0x02, -0x20,0xcc,0xef,0x59,0x01,0x14,0x10,0x5c,0x05,0x03,0x65,0x0b,0x12,0x0b,0x0c,0x00, -0x13,0xa4,0x36,0x0f,0x52,0xfe,0xdc,0xa8,0x63,0x00,0xac,0x06,0x02,0x23,0x09,0x15, -0x40,0x2f,0x00,0x23,0xff,0xc2,0x15,0x00,0x01,0x6d,0x08,0x61,0xac,0xcf,0xff,0xfd, -0xcc,0xcd,0xf0,0x02,0x00,0x24,0x0f,0x01,0x27,0x09,0x00,0x36,0x00,0x21,0xf5,0x00, -0x9e,0x08,0x03,0x15,0x00,0x01,0xbb,0x00,0x02,0x15,0x00,0x33,0x0d,0xff,0xf6,0x15, -0x00,0x00,0x32,0x0f,0x0f,0x15,0x00,0x05,0x14,0xf4,0x15,0x00,0x13,0xff,0xd3,0x05, -0x10,0x60,0x54,0x06,0x03,0x15,0x00,0x12,0x0b,0x03,0x0b,0x10,0xdf,0x10,0x05,0x22, -0xff,0xd0,0x15,0x00,0x21,0x0f,0xff,0x0a,0x02,0x00,0x15,0x00,0x03,0x4e,0x04,0x00, -0x15,0x00,0x43,0xfe,0xb6,0x00,0x00,0x3f,0x00,0xf0,0x1f,0x8e,0xee,0x90,0x09,0xee, -0xe8,0x00,0xcf,0xff,0x40,0x0d,0xff,0xf3,0x00,0xff,0xfe,0x00,0x0f,0xff,0xe0,0x03, -0xff,0xf8,0x00,0x4f,0xff,0x80,0x07,0xff,0xf2,0x00,0x7f,0xff,0x20,0x0a,0xff,0xd0, -0x00,0xbf,0xfc,0x00,0x0e,0xff,0x70,0x00,0xef,0xe5,0x03,0xf0,0x04,0x10,0x01,0xff, -0xf1,0x00,0x5f,0xfb,0x00,0x05,0xff,0xb0,0x00,0x8f,0xf5,0x00,0x08,0xff,0x50,0x00, +0x12,0x24,0x7b,0x10,0x07,0x92,0x00,0x2f,0xf0,0x00,0x13,0x00,0x0f,0x0f,0xd3,0x09, +0x12,0x1f,0xaf,0xd3,0x09,0x0e,0x0f,0xa3,0x09,0x3e,0x30,0x0f,0xff,0xf6,0x70,0x00, +0x11,0xf7,0xf9,0x04,0x31,0xdf,0xff,0x90,0xf0,0x02,0x00,0xd6,0x02,0x01,0x2e,0x07, +0x00,0xf4,0x02,0x00,0x77,0x06,0x00,0x1b,0x02,0x00,0x5e,0x06,0x00,0x80,0x03,0x12, +0x03,0x12,0x10,0x11,0xf1,0x56,0x05,0x00,0x34,0x05,0x01,0xe5,0x00,0x00,0x59,0x05, +0x30,0xdf,0xff,0x80,0x08,0x00,0x00,0x6d,0x02,0x00,0x50,0x03,0x01,0xc7,0x00,0x00, +0x50,0x03,0x50,0x00,0x7f,0xff,0xe1,0x4b,0x90,0x02,0x00,0x68,0x00,0x12,0x04,0x3c, +0x09,0x00,0x4f,0x00,0x12,0x50,0xf1,0x01,0x13,0xa0,0xe0,0x06,0x50,0xef,0xff,0xfe, +0xb7,0x20,0xaa,0x01,0x15,0xfe,0x46,0x09,0x02,0xd5,0x03,0x11,0x8f,0x34,0x06,0x20, +0x04,0xef,0xa7,0x01,0x01,0x7e,0x03,0x21,0x02,0x6b,0x6c,0x03,0x00,0xd2,0x02,0x20, +0xcc,0xef,0x59,0x01,0x14,0x10,0x5c,0x05,0x03,0x65,0x0b,0x12,0x0b,0x0c,0x00,0x13, +0xa4,0x36,0x0f,0x52,0xfe,0xdc,0xa8,0x63,0x00,0xac,0x06,0x02,0x23,0x09,0x15,0x40, +0x2f,0x00,0x23,0xff,0xc2,0x15,0x00,0x01,0x6d,0x08,0x61,0xac,0xcf,0xff,0xfd,0xcc, +0xcd,0xf0,0x02,0x00,0x24,0x0f,0x01,0x27,0x09,0x00,0x36,0x00,0x21,0xf5,0x00,0x9e, +0x08,0x03,0x15,0x00,0x01,0xbb,0x00,0x02,0x15,0x00,0x33,0x0d,0xff,0xf6,0x15,0x00, +0x00,0x32,0x0f,0x0f,0x15,0x00,0x05,0x14,0xf4,0x15,0x00,0x13,0xff,0xd3,0x05,0x10, +0x60,0x54,0x06,0x03,0x15,0x00,0x12,0x0b,0x03,0x0b,0x10,0xdf,0x10,0x05,0x22,0xff, +0xd0,0x15,0x00,0x21,0x0f,0xff,0x0a,0x02,0x00,0x15,0x00,0x03,0x4e,0x04,0x00,0x15, +0x00,0xa0,0xfe,0xb6,0x00,0x00,0x00,0x00,0x00,0xdf,0xff,0x60, }; static const etxFontCmap cmaps[] __FLASH = { -{ .range_start = 1488, .range_length = 27, .glyph_id_start = 1, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, -{ .range_start = 1524, .range_length = 1, .glyph_id_start = 28, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, +{ .range_start = 1456, .range_length = 13, .glyph_id_start = 1, .list_length = 6, .type = 3, .unicode_list = 272, .glyph_id_ofs_list = 0 }, +{ .range_start = 1488, .range_length = 27, .glyph_id_start = 7, .list_length = 0, .type = 2, .unicode_list = 0, .glyph_id_ofs_list = 0 }, }; const etxLz4Font lv_font_he_bold_XL __FLASH = { -.uncomp_size = 4821, -.comp_size = 2576, +.uncomp_size = 4869, +.comp_size = 2620, .line_height = 32, .base_line = 6, .subpx = 0, @@ -185,11 +188,11 @@ const etxLz4Font lv_font_he_bold_XL __FLASH = { .bitmap_format = 0, .left_class_cnt = 0, .right_class_cnt = 0, -.glyph_bitmap = 232, +.glyph_bitmap = 284, .class_pair_values = 0, .left_class_mapping = 0, .right_class_mapping = 0, .cmaps = cmaps, .compressed = lz4FontData, -.lvglFontBufSize = 4989, +.lvglFontBufSize = 5037, };