diff --git a/code/application/source/cardv/Makefile b/code/application/source/cardv/Makefile index 0d24541ab..91affbc5a 100755 --- a/code/application/source/cardv/Makefile +++ b/code/application/source/cardv/Makefile @@ -252,6 +252,7 @@ SRC += \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_bold_20_8bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_16_8bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_18_8bpp.c \ + ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_12_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Plugin/lv_plugin_common.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Plugin/lv_plugin_menu.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Palette/palette.c \ diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_12_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_12_1bpp.c new file mode 100644 index 000000000..8660c1c09 --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_12_1bpp.c @@ -0,0 +1,883 @@ +/******************************************************************************* + * Size: 12 px + * Bpp: 1 + * Opts: --format lvgl --size 12 --bpp 1 --font D:/WOKR/git/S550_GUI/LVGL_SPORTCAM/fonts/SF-UI-Text-Medium.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o D:/WOKR/git/S550_GUI/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_12_1bpp.c --no-compress + ******************************************************************************/ + +#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#include "lvgl.h" +#else +#include "lvgl/lvgl.h" +#endif + +#ifndef SF_UI_TEXT_MEDIUM_12_1BPP +#define SF_UI_TEXT_MEDIUM_12_1BPP 1 +#endif + +#if SF_UI_TEXT_MEDIUM_12_1BPP + +/*----------------- + * BITMAPS + *----------------*/ + +/*Store the image of the glyphs*/ +static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + 0x0, + + /* U+0021 "!" */ + 0xaa, 0xa3, 0xc0, + + /* U+0022 "\"" */ + 0xb6, 0x80, + + /* U+0023 "#" */ + 0x14, 0x29, 0xf9, 0x22, 0x5f, 0xca, 0x24, 0x48, + + /* U+0024 "$" */ + 0x21, 0xea, 0xe8, 0xe1, 0xe2, 0xe9, 0xad, 0xe2, + 0x0, + + /* U+0025 "%" */ + 0x61, 0x49, 0x25, 0x8c, 0x80, 0xb0, 0xe4, 0xd2, + 0x49, 0x63, 0x0, + + /* U+0026 "&" */ + 0x78, 0x48, 0x48, 0x78, 0x72, 0x9a, 0x8e, 0x86, + 0x7a, + + /* U+0027 "'" */ + 0xe0, + + /* U+0028 "(" */ + 0x5a, 0xaa, 0x94, + + /* U+0029 ")" */ + 0xa5, 0x55, 0x68, + + /* U+002A "*" */ + 0x4d, 0x6d, 0x40, + + /* U+002B "+" */ + 0x10, 0x4f, 0xc4, 0x10, 0x40, + + /* U+002C "," */ + 0xaa, + + /* U+002D "-" */ + 0xf0, + + /* U+002E "." */ + 0xf0, + + /* U+002F "/" */ + 0x13, 0x22, 0x22, 0x44, 0x44, 0xc0, + + /* U+0030 "0" */ + 0x79, 0x28, 0x61, 0x86, 0x18, 0x52, 0x78, + + /* U+0031 "1" */ + 0x7e, 0x92, 0x49, 0x20, + + /* U+0032 "2" */ + 0x74, 0x62, 0x11, 0x19, 0x88, 0xf8, + + /* U+0033 "3" */ + 0x74, 0x62, 0x17, 0x4, 0x31, 0x70, + + /* U+0034 "4" */ + 0x18, 0xe2, 0x9a, 0x4a, 0x2f, 0xc2, 0x8, + + /* U+0035 "5" */ + 0x7d, 0x4, 0x1e, 0x4c, 0x1c, 0x53, 0x38, + + /* U+0036 "6" */ + 0x39, 0x38, 0x2e, 0xce, 0x18, 0x53, 0x78, + + /* U+0037 "7" */ + 0xfc, 0x30, 0x86, 0x10, 0xc2, 0x18, 0x40, + + /* U+0038 "8" */ + 0x7a, 0x38, 0x61, 0x7b, 0x18, 0x71, 0x78, + + /* U+0039 "9" */ + 0x7b, 0x28, 0x61, 0xcd, 0xf0, 0x72, 0x70, + + /* U+003A ":" */ + 0xf0, 0x3c, + + /* U+003B ";" */ + 0xf0, 0x2a, 0x80, + + /* U+003C "<" */ + 0x4, 0x33, 0xb8, 0xc1, 0xc1, 0x81, + + /* U+003D "=" */ + 0xfc, 0x0, 0x3f, + + /* U+003E ">" */ + 0x3, 0x6, 0x6, 0xc, 0xce, 0x20, + + /* U+003F "?" */ + 0x7b, 0x20, 0x86, 0x30, 0x80, 0xc, 0x30, + + /* U+0040 "@" */ + 0x1e, 0x18, 0x64, 0xe, 0x79, 0xa2, 0x68, 0x9a, + 0x26, 0x7e, 0x40, 0x18, 0x1, 0xe0, + + /* U+0041 "A" */ + 0x18, 0x18, 0x14, 0x24, 0x24, 0x3e, 0x42, 0x42, + 0x43, + + /* U+0042 "B" */ + 0xfa, 0x18, 0x61, 0xfa, 0x18, 0x61, 0xf8, + + /* U+0043 "C" */ + 0x38, 0x8a, 0xc, 0x8, 0x10, 0x20, 0xa3, 0x3c, + + /* U+0044 "D" */ + 0xf9, 0xa, 0xc, 0x18, 0x30, 0x60, 0xc2, 0xf8, + + /* U+0045 "E" */ + 0xfc, 0x21, 0xf, 0xc2, 0x10, 0xf8, + + /* U+0046 "F" */ + 0xfc, 0x21, 0xf, 0xc2, 0x10, 0x80, + + /* U+0047 "G" */ + 0x3c, 0x8e, 0xc, 0x8, 0xf0, 0x60, 0xa2, 0x38, + + /* U+0048 "H" */ + 0x83, 0x6, 0xc, 0x1f, 0xf0, 0x60, 0xc1, 0x82, + + /* U+0049 "I" */ + 0xff, 0x80, + + /* U+004A "J" */ + 0x8, 0x42, 0x10, 0x84, 0x39, 0x70, + + /* U+004B "K" */ + 0x8e, 0x6b, 0x28, 0xe2, 0xc9, 0xa2, 0x8c, + + /* U+004C "L" */ + 0x84, 0x21, 0x8, 0x42, 0x10, 0xf8, + + /* U+004D "M" */ + 0xc1, 0xc3, 0xc3, 0xe7, 0xa5, 0xa5, 0x99, 0x99, + 0x99, + + /* U+004E "N" */ + 0x83, 0x87, 0x8d, 0x99, 0x33, 0x63, 0xc3, 0x82, + + /* U+004F "O" */ + 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, + 0x3c, + + /* U+0050 "P" */ + 0xfa, 0x38, 0x61, 0x8f, 0xe8, 0x20, 0x80, + + /* U+0051 "Q" */ + 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x8b, 0x4e, + 0x3e, 0x1, + + /* U+0052 "R" */ + 0xfa, 0x18, 0x61, 0xfa, 0x68, 0xa3, 0x84, + + /* U+0053 "S" */ + 0x7a, 0x38, 0x30, 0x78, 0x30, 0x61, 0x78, + + /* U+0054 "T" */ + 0xfe, 0x20, 0x40, 0x81, 0x2, 0x4, 0x8, 0x10, + + /* U+0055 "U" */ + 0x83, 0x6, 0xc, 0x18, 0x30, 0x60, 0xe3, 0x7c, + + /* U+0056 "V" */ + 0x43, 0x42, 0x62, 0x26, 0x24, 0x34, 0x1c, 0x18, + 0x18, + + /* U+0057 "W" */ + 0x8c, 0x63, 0x18, 0xcf, 0x72, 0x52, 0x94, 0xa5, + 0x39, 0x8c, 0x21, 0x0, + + /* U+0058 "X" */ + 0x87, 0x99, 0xa1, 0xc3, 0x7, 0x1a, 0x66, 0x84, + + /* U+0059 "Y" */ + 0xc6, 0x89, 0xb1, 0x41, 0x2, 0x4, 0x8, 0x10, + + /* U+005A "Z" */ + 0xfc, 0x31, 0x84, 0x30, 0x84, 0x30, 0xfc, + + /* U+005B "[" */ + 0xf2, 0x49, 0x24, 0x9c, + + /* U+005C "\\" */ + 0xc4, 0x44, 0x62, 0x22, 0x23, 0x10, + + /* U+005D "]" */ + 0xe4, 0x92, 0x49, 0x3c, + + /* U+005E "^" */ + 0x66, 0x99, + + /* U+005F "_" */ + 0xfc, + + /* U+0060 "`" */ + 0xc8, + + /* U+0061 "a" */ + 0x74, 0x42, 0xf8, 0xc5, 0xe0, + + /* U+0062 "b" */ + 0x82, 0x8, 0x3e, 0xce, 0x18, 0x61, 0xcf, 0xe0, + + /* U+0063 "c" */ + 0x76, 0x61, 0x8, 0x65, 0xe0, + + /* U+0064 "d" */ + 0x4, 0x10, 0x5d, 0xce, 0x18, 0x61, 0xcd, 0xd0, + + /* U+0065 "e" */ + 0x7b, 0x38, 0x7f, 0x83, 0x37, 0x80, + + /* U+0066 "f" */ + 0x34, 0x4f, 0x44, 0x44, 0x44, + + /* U+0067 "g" */ + 0x77, 0x38, 0x61, 0x87, 0x37, 0x61, 0x78, + + /* U+0068 "h" */ + 0x84, 0x21, 0xe8, 0xc6, 0x31, 0x8c, 0x40, + + /* U+0069 "i" */ + 0x9f, 0xc0, + + /* U+006A "j" */ + 0x41, 0x55, 0x57, + + /* U+006B "k" */ + 0x84, 0x21, 0x3b, 0x73, 0x96, 0x94, 0xc0, + + /* U+006C "l" */ + 0xff, 0xc0, + + /* U+006D "m" */ + 0xf7, 0x44, 0x62, 0x31, 0x18, 0x8c, 0x46, 0x22, + + /* U+006E "n" */ + 0xf4, 0x63, 0x18, 0xc6, 0x20, + + /* U+006F "o" */ + 0x7b, 0x38, 0x61, 0x87, 0x37, 0x80, + + /* U+0070 "p" */ + 0xbb, 0x38, 0x61, 0x87, 0x3f, 0xa0, 0x80, + + /* U+0071 "q" */ + 0x77, 0x38, 0x61, 0x87, 0x37, 0xc1, 0x4, + + /* U+0072 "r" */ + 0xf2, 0x49, 0x20, + + /* U+0073 "s" */ + 0x74, 0x70, 0xe1, 0xc5, 0xc0, + + /* U+0074 "t" */ + 0x44, 0xf4, 0x44, 0x44, 0x70, + + /* U+0075 "u" */ + 0x8c, 0x63, 0x18, 0xc5, 0xe0, + + /* U+0076 "v" */ + 0x45, 0x14, 0xca, 0x28, 0xe3, 0x0, + + /* U+0077 "w" */ + 0xcc, 0xa6, 0x53, 0x6a, 0xa7, 0x31, 0x98, 0xcc, + + /* U+0078 "x" */ + 0x4d, 0xa3, 0x84, 0x39, 0xa4, 0xc0, + + /* U+0079 "y" */ + 0x45, 0x14, 0x8a, 0x28, 0xc1, 0xc, 0x60, + + /* U+007A "z" */ + 0xf8, 0xc4, 0x46, 0x63, 0xe0, + + /* U+007B "{" */ + 0x34, 0x44, 0x44, 0x84, 0x44, 0x43, + + /* U+007C "|" */ + 0xff, 0xe0, + + /* U+007D "}" */ + 0xc2, 0x22, 0x22, 0x12, 0x22, 0x2c, + + /* U+007E "~" */ + 0x66, 0x99, 0x80, + + /* U+00B0 "°" */ + 0x69, 0x96, + + /* U+00BA "º" */ + 0x74, 0x63, 0x18, 0xb8, + + /* U+00C1 "Á" */ + 0x4, 0x8, 0x0, 0x18, 0x18, 0x14, 0x24, 0x24, + 0x3e, 0x42, 0x42, 0x43, + + /* U+00C3 "Ã" */ + 0x34, 0x2c, 0x0, 0x18, 0x18, 0x14, 0x24, 0x24, + 0x3e, 0x42, 0x42, 0x43, + + /* U+00C4 "Ä" */ + 0x34, 0x0, 0x18, 0x18, 0x14, 0x24, 0x24, 0x3e, + 0x42, 0x42, 0x43, + + /* U+00C9 "É" */ + 0x11, 0x81, 0xf8, 0x42, 0x1f, 0x84, 0x21, 0xf0, + + /* U+00CE "Î" */ + 0x22, 0x80, 0x42, 0x10, 0x84, 0x21, 0x8, 0x40, + + /* U+00D3 "Ó" */ + 0x4, 0x8, 0x0, 0x3c, 0x42, 0x81, 0x81, 0x81, + 0x81, 0x81, 0x42, 0x3c, + + /* U+00D6 "Ö" */ + 0x2c, 0x0, 0x0, 0x3c, 0x42, 0x81, 0x81, 0x81, + 0x81, 0x81, 0x42, 0x3c, + + /* U+00DC "Ü" */ + 0x6c, 0x0, 0x4, 0x18, 0x30, 0x60, 0xc1, 0x83, + 0x7, 0x1b, 0xe0, + + /* U+00DF "ß" */ + 0x72, 0x28, 0xa2, 0xb2, 0x38, 0x61, 0xb8, + + /* U+00E0 "à" */ + 0x41, 0x0, 0xe8, 0x85, 0xf1, 0x8b, 0xc0, + + /* U+00E1 "á" */ + 0x18, 0x8c, 0x7, 0x44, 0x2f, 0x8c, 0x5e, + + /* U+00E2 "â" */ + 0x32, 0xc0, 0xe8, 0x85, 0xf1, 0x8b, 0xc0, + + /* U+00E3 "ã" */ + 0x6d, 0x80, 0xe8, 0x85, 0xf1, 0x8b, 0xc0, + + /* U+00E4 "ä" */ + 0xd0, 0x0, 0xe8, 0x85, 0xf1, 0x8b, 0xc0, + + /* U+00E7 "ç" */ + 0x7b, 0x38, 0x20, 0x83, 0x37, 0x84, 0x8, 0xc0, + + /* U+00E8 "è" */ + 0x41, 0x83, 0x0, 0x7b, 0x38, 0x7f, 0x83, 0x37, + 0x80, + + /* U+00E9 "é" */ + 0x8, 0x61, 0x0, 0x7b, 0x38, 0x7f, 0x83, 0x37, + 0x80, + + /* U+00EA "ê" */ + 0x31, 0x20, 0x1e, 0xce, 0x1f, 0xe0, 0xcd, 0xe0, + + /* U+00EC "ì" */ + 0x44, 0x12, 0x49, 0x24, + + /* U+00ED "í" */ + 0x50, 0x49, 0x24, 0x90, + + /* U+00F1 "ñ" */ + 0x6d, 0x81, 0xe8, 0xc6, 0x31, 0x8c, 0x40, + + /* U+00F2 "ò" */ + 0x41, 0x83, 0x0, 0x7b, 0x38, 0x61, 0x87, 0x37, + 0x80, + + /* U+00F3 "ó" */ + 0x8, 0x63, 0x0, 0x7b, 0x38, 0x61, 0x87, 0x37, + 0x80, + + /* U+00F5 "õ" */ + 0x6a, 0x60, 0x1e, 0xce, 0x18, 0x61, 0xcd, 0xe0, + + /* U+00F6 "ö" */ + 0x58, 0x0, 0x1e, 0xce, 0x18, 0x61, 0xcd, 0xe0, + + /* U+00FA "ú" */ + 0x18, 0x88, 0x8, 0xc6, 0x31, 0x8c, 0x5e, + + /* U+00FC "ü" */ + 0x58, 0x1, 0x18, 0xc6, 0x31, 0x8b, 0xc0, + + /* U+0105 "ą" */ + 0x76, 0x42, 0xf8, 0xc5, 0xe2, 0x10, 0x40, + + /* U+0118 "Ę" */ + 0xfc, 0x21, 0xf, 0xc2, 0x10, 0xf8, 0x84, 0x30, + + /* U+0410 "А" */ + 0x18, 0x18, 0x14, 0x24, 0x24, 0x3e, 0x42, 0x42, + 0x43, + + /* U+0411 "Б" */ + 0xfa, 0x8, 0x20, 0xfa, 0x18, 0x61, 0xf8, + + /* U+0412 "В" */ + 0xfa, 0x18, 0x61, 0xfa, 0x18, 0x61, 0xf8, + + /* U+0413 "Г" */ + 0xfc, 0x21, 0x8, 0x42, 0x10, 0x80, + + /* U+0414 "Д" */ + 0x3e, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x62, + 0xff, 0x81, 0x81, + + /* U+0417 "З" */ + 0x74, 0x62, 0x17, 0x4, 0x31, 0x70, + + /* U+0418 "И" */ + 0x83, 0xe, 0x3c, 0xd9, 0x36, 0x78, 0xe1, 0x82, + + /* U+041A "К" */ + 0x8e, 0x6b, 0x28, 0xc2, 0x89, 0x26, 0x8c, + + /* U+041C "М" */ + 0xc1, 0xc3, 0xc3, 0xe7, 0xa5, 0xa5, 0x99, 0x99, + 0x99, + + /* U+041D "Н" */ + 0x83, 0x6, 0xc, 0x1f, 0xf0, 0x60, 0xc1, 0x82, + + /* U+041E "О" */ + 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, + 0x3c, + + /* U+041F "П" */ + 0xff, 0x6, 0xc, 0x18, 0x30, 0x60, 0xc1, 0x82, + + /* U+0420 "Р" */ + 0xfa, 0x38, 0x61, 0x8f, 0xe8, 0x20, 0x80, + + /* U+0421 "С" */ + 0x38, 0x8a, 0xc, 0x8, 0x10, 0x20, 0xa3, 0x3c, + + /* U+0422 "Т" */ + 0xfe, 0x20, 0x40, 0x81, 0x2, 0x4, 0x8, 0x10, + + /* U+0423 "У" */ + 0xc7, 0x89, 0x13, 0x62, 0x85, 0xc, 0x8, 0x60, + + /* U+0424 "Ф" */ + 0x8, 0x1f, 0x12, 0x51, 0x18, 0x8c, 0x45, 0x24, + 0x7c, 0x8, 0x0, + + /* U+0426 "Ц" */ + 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, + 0xff, 0x1, 0x1, + + /* U+0427 "Ч" */ + 0x86, 0x18, 0x61, 0xcd, 0xf0, 0x41, 0x4, + + /* U+0428 "Ш" */ + 0x88, 0xc4, 0x62, 0x31, 0x18, 0x8c, 0x46, 0x23, + 0x11, 0xff, 0x80, + + /* U+042B "Ы" */ + 0x81, 0x81, 0x81, 0xf9, 0x8d, 0x85, 0x85, 0x8d, + 0xf9, + + /* U+042D "Э" */ + 0x79, 0x8a, 0x8, 0x13, 0xe0, 0x60, 0xe2, 0x78, + + /* U+042F "Я" */ + 0x7e, 0x18, 0x61, 0x7d, 0x94, 0x71, 0x84, + + /* U+0430 "а" */ + 0x74, 0x42, 0xf8, 0xc5, 0xe0, + + /* U+0431 "б" */ + 0x7d, 0xf, 0xb3, 0x86, 0x18, 0x73, 0x78, + + /* U+0432 "в" */ + 0xf4, 0x63, 0xe8, 0xc7, 0xc0, + + /* U+0433 "г" */ + 0xf8, 0x88, 0x88, 0x80, + + /* U+0434 "д" */ + 0x7c, 0xc9, 0x12, 0x24, 0x48, 0xbf, 0xc1, 0x82, + + /* U+0435 "е" */ + 0x7b, 0x38, 0x7f, 0x83, 0x37, 0x80, + + /* U+0436 "ж" */ + 0xc9, 0x35, 0x8a, 0x83, 0x82, 0xa3, 0x5b, 0x26, + + /* U+0437 "з" */ + 0x72, 0x42, 0x60, 0xe5, 0xc0, + + /* U+0438 "и" */ + 0x8c, 0xef, 0x5e, 0xe6, 0x20, + + /* U+0439 "й" */ + 0xd3, 0x81, 0x19, 0xde, 0xbd, 0xcc, 0x40, + + /* U+043A "к" */ + 0x9d, 0xa9, 0x8a, 0x5a, 0x60, + + /* U+043B "л" */ + 0x7a, 0x52, 0x94, 0xa6, 0x20, + + /* U+043C "м" */ + 0xc3, 0x8f, 0x1d, 0x5a, 0xb7, 0x64, 0x80, + + /* U+043D "н" */ + 0x8c, 0x63, 0xf8, 0xc6, 0x20, + + /* U+043E "о" */ + 0x7b, 0x38, 0x61, 0x87, 0x37, 0x80, + + /* U+043F "п" */ + 0xfc, 0x63, 0x18, 0xc6, 0x20, + + /* U+0440 "р" */ + 0xbb, 0x38, 0x61, 0x87, 0x3b, 0xa0, 0x80, + + /* U+0441 "с" */ + 0x76, 0x61, 0x8, 0x65, 0xc0, + + /* U+0442 "т" */ + 0xf9, 0x8, 0x42, 0x10, 0x80, + + /* U+0443 "у" */ + 0x45, 0x14, 0x8a, 0x28, 0xc1, 0xc, 0x60, + + /* U+0444 "ф" */ + 0x10, 0x21, 0xf6, 0xb9, 0x32, 0x64, 0xeb, 0x7c, + 0x20, 0x40, + + /* U+0445 "х" */ + 0x4d, 0xa3, 0x84, 0x39, 0xa4, 0xc0, + + /* U+0446 "ц" */ + 0x8a, 0x28, 0xa2, 0x8a, 0x2f, 0xc1, 0x4, + + /* U+0447 "ч" */ + 0x8c, 0x63, 0x17, 0x84, 0x20, + + /* U+0448 "ш" */ + 0x88, 0xc4, 0x62, 0x31, 0x18, 0x8c, 0x47, 0xfe, + + /* U+0449 "щ" */ + 0x89, 0x44, 0xa2, 0x51, 0x28, 0x94, 0x4b, 0xfe, + 0x1, 0x0, 0x80, + + /* U+044A "ъ" */ + 0xe0, 0x40, 0xf1, 0x12, 0x24, 0x4f, 0x0, + + /* U+044B "ы" */ + 0x83, 0x7, 0xcc, 0x58, 0xb1, 0x7c, 0x80, + + /* U+044C "ь" */ + 0x84, 0x3d, 0x18, 0xc7, 0xc0, + + /* U+044D "э" */ + 0x7b, 0x30, 0x4f, 0x7, 0x37, 0x80, + + /* U+044E "ю" */ + 0x9e, 0x93, 0xb1, 0xe1, 0xb1, 0xb3, 0x9e, + + /* U+044F "я" */ + 0x7a, 0x72, 0x97, 0xb5, 0x20, + + /* U+2026 "…" */ + 0xdb, 0xdb +}; + + +/*--------------------- + * GLYPH DESCRIPTION + *--------------------*/ + +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 = 53, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1, .adv_w = 63, .box_w = 2, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 4, .adv_w = 88, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 6}, + {.bitmap_index = 6, .adv_w = 124, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 14, .adv_w = 127, .box_w = 6, .box_h = 11, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 23, .adv_w = 154, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 34, .adv_w = 139, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 43, .adv_w = 50, .box_w = 1, .box_h = 3, .ofs_x = 1, .ofs_y = 6}, + {.bitmap_index = 44, .adv_w = 71, .box_w = 2, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 47, .adv_w = 71, .box_w = 2, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 50, .adv_w = 98, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 4}, + {.bitmap_index = 53, .adv_w = 127, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 58, .adv_w = 62, .box_w = 2, .box_h = 4, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 59, .adv_w = 91, .box_w = 4, .box_h = 1, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 60, .adv_w = 60, .box_w = 2, .box_h = 2, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 61, .adv_w = 69, .box_w = 4, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 67, .adv_w = 125, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 74, .adv_w = 93, .box_w = 3, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 78, .adv_w = 119, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 84, .adv_w = 123, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 90, .adv_w = 127, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 97, .adv_w = 122, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 104, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 111, .adv_w = 112, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 118, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 125, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 132, .adv_w = 60, .box_w = 2, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 134, .adv_w = 60, .box_w = 2, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 137, .adv_w = 127, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 143, .adv_w = 127, .box_w = 6, .box_h = 4, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 146, .adv_w = 127, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 152, .adv_w = 102, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 159, .adv_w = 177, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 173, .adv_w = 133, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 182, .adv_w = 129, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 189, .adv_w = 139, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 197, .adv_w = 141, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 205, .adv_w = 116, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 211, .adv_w = 112, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 217, .adv_w = 144, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 225, .adv_w = 145, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 233, .adv_w = 55, .box_w = 1, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 235, .adv_w = 108, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 241, .adv_w = 130, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 248, .adv_w = 111, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 254, .adv_w = 171, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 263, .adv_w = 144, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 271, .adv_w = 149, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 280, .adv_w = 125, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 287, .adv_w = 149, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 297, .adv_w = 128, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 304, .adv_w = 125, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 311, .adv_w = 123, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 319, .adv_w = 144, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 327, .adv_w = 133, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 336, .adv_w = 189, .box_w = 10, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 348, .adv_w = 134, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 356, .adv_w = 130, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 364, .adv_w = 128, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 371, .adv_w = 74, .box_w = 3, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 375, .adv_w = 69, .box_w = 4, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 381, .adv_w = 74, .box_w = 3, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 385, .adv_w = 95, .box_w = 4, .box_h = 4, .ofs_x = 1, .ofs_y = 5}, + {.bitmap_index = 387, .adv_w = 87, .box_w = 6, .box_h = 1, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 388, .adv_w = 103, .box_w = 3, .box_h = 2, .ofs_x = 2, .ofs_y = 8}, + {.bitmap_index = 389, .adv_w = 109, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 394, .adv_w = 120, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 402, .adv_w = 109, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 407, .adv_w = 120, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 415, .adv_w = 112, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 421, .adv_w = 73, .box_w = 4, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 426, .adv_w = 119, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 433, .adv_w = 119, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 440, .adv_w = 50, .box_w = 1, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 442, .adv_w = 50, .box_w = 2, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 445, .adv_w = 108, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 452, .adv_w = 51, .box_w = 1, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 454, .adv_w = 171, .box_w = 9, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 462, .adv_w = 117, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 467, .adv_w = 115, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 473, .adv_w = 120, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 480, .adv_w = 120, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 487, .adv_w = 76, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 490, .adv_w = 104, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 495, .adv_w = 73, .box_w = 4, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 500, .adv_w = 117, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 505, .adv_w = 107, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 511, .adv_w = 154, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 519, .adv_w = 105, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 525, .adv_w = 108, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 532, .adv_w = 105, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 537, .adv_w = 81, .box_w = 4, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 543, .adv_w = 66, .box_w = 1, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 545, .adv_w = 81, .box_w = 4, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 551, .adv_w = 113, .box_w = 6, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 554, .adv_w = 84, .box_w = 4, .box_h = 4, .ofs_x = 1, .ofs_y = 5}, + {.bitmap_index = 556, .adv_w = 99, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 560, .adv_w = 133, .box_w = 8, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 572, .adv_w = 133, .box_w = 8, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 584, .adv_w = 133, .box_w = 8, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 595, .adv_w = 116, .box_w = 5, .box_h = 12, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 603, .adv_w = 55, .box_w = 5, .box_h = 12, .ofs_x = -1, .ofs_y = 0}, + {.bitmap_index = 611, .adv_w = 149, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 623, .adv_w = 149, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 635, .adv_w = 144, .box_w = 7, .box_h = 12, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 646, .adv_w = 124, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 653, .adv_w = 109, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 660, .adv_w = 109, .box_w = 5, .box_h = 11, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 667, .adv_w = 109, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 674, .adv_w = 109, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 681, .adv_w = 109, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 688, .adv_w = 109, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 696, .adv_w = 112, .box_w = 6, .box_h = 11, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 705, .adv_w = 112, .box_w = 6, .box_h = 11, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 714, .adv_w = 112, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 722, .adv_w = 51, .box_w = 3, .box_h = 10, .ofs_x = -1, .ofs_y = 0}, + {.bitmap_index = 726, .adv_w = 51, .box_w = 3, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 730, .adv_w = 117, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 737, .adv_w = 115, .box_w = 6, .box_h = 11, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 746, .adv_w = 115, .box_w = 6, .box_h = 11, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 755, .adv_w = 115, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 763, .adv_w = 115, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 771, .adv_w = 118, .box_w = 5, .box_h = 11, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 778, .adv_w = 118, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 785, .adv_w = 109, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 792, .adv_w = 116, .box_w = 5, .box_h = 12, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 800, .adv_w = 135, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 809, .adv_w = 125, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 816, .adv_w = 131, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 823, .adv_w = 111, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 829, .adv_w = 144, .box_w = 8, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 840, .adv_w = 121, .box_w = 5, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 846, .adv_w = 147, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 854, .adv_w = 132, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 861, .adv_w = 173, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 870, .adv_w = 147, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 878, .adv_w = 152, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 887, .adv_w = 145, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 895, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 902, .adv_w = 143, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 910, .adv_w = 125, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 918, .adv_w = 127, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 926, .adv_w = 165, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 937, .adv_w = 151, .box_w = 8, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 948, .adv_w = 137, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 955, .adv_w = 189, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 966, .adv_w = 171, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 975, .adv_w = 143, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 983, .adv_w = 132, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 990, .adv_w = 111, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 995, .adv_w = 119, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1002, .adv_w = 109, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1007, .adv_w = 91, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1011, .adv_w = 121, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1019, .adv_w = 114, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1025, .adv_w = 159, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1033, .adv_w = 104, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1038, .adv_w = 120, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1043, .adv_w = 120, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1050, .adv_w = 108, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1055, .adv_w = 114, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1060, .adv_w = 148, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1067, .adv_w = 119, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1072, .adv_w = 118, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1078, .adv_w = 118, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1083, .adv_w = 121, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1090, .adv_w = 111, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1095, .adv_w = 99, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1100, .adv_w = 110, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1107, .adv_w = 148, .box_w = 7, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1117, .adv_w = 107, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1123, .adv_w = 123, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1130, .adv_w = 113, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1135, .adv_w = 162, .box_w = 9, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1143, .adv_w = 167, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1154, .adv_w = 120, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1161, .adv_w = 142, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1168, .adv_w = 103, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1173, .adv_w = 113, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1179, .adv_w = 158, .box_w = 8, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1186, .adv_w = 106, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1191, .adv_w = 161, .box_w = 8, .box_h = 2, .ofs_x = 1, .ofs_y = 0} +}; + +/*--------------------- + * CHARACTER MAPPING + *--------------------*/ + +static const uint16_t unicode_list_1[] = { + 0x0, 0xa, 0x11, 0x13, 0x14, 0x19, 0x1e, 0x23, + 0x26, 0x2c, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, + 0x37, 0x38, 0x39, 0x3a, 0x3c, 0x3d, 0x41, 0x42, + 0x43, 0x45, 0x46, 0x4a, 0x4c, 0x55, 0x68, 0x360, + 0x361, 0x362, 0x363, 0x364, 0x367, 0x368, 0x36a, 0x36c, + 0x36d, 0x36e, 0x36f, 0x370, 0x371, 0x372, 0x373, 0x374, + 0x376, 0x377, 0x378, 0x37b, 0x37d +}; + +/*Collect the unicode lists and glyph_id offsets*/ +static const lv_font_fmt_txt_cmap_t cmaps[] = +{ + { + .range_start = 32, .range_length = 95, .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 = 176, .range_length = 894, .glyph_id_start = 96, + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 53, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + }, + { + .range_start = 1071, .range_length = 33, .glyph_id_start = 149, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + }, + { + .range_start = 8230, .range_length = 1, .glyph_id_start = 182, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + } +}; + + + +/*-------------------- + * ALL CUSTOM DATA + *--------------------*/ + +#if LV_VERSION_CHECK(8, 0, 0) +/*Store all the custom data of the font*/ +static lv_font_fmt_txt_glyph_cache_t cache; +static const lv_font_fmt_txt_dsc_t font_dsc = { +#else +static lv_font_fmt_txt_dsc_t font_dsc = { +#endif + .glyph_bitmap = glyph_bitmap, + .glyph_dsc = glyph_dsc, + .cmaps = cmaps, + .kern_dsc = NULL, + .kern_scale = 0, + .cmap_num = 4, + .bpp = 1, + .kern_classes = 0, + .bitmap_format = 0, +#if LV_VERSION_CHECK(8, 0, 0) + .cache = &cache +#endif +}; + + +/*----------------- + * PUBLIC FONT + *----------------*/ + +/*Initialize a public general font descriptor*/ +#if LV_VERSION_CHECK(8, 0, 0) +const lv_font_t sf_ui_text_medium_12_1bpp = { +#else +lv_font_t sf_ui_text_medium_12_1bpp = { +#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 = 15, /*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 +#if LV_VERSION_CHECK(7, 4, 0) + .underline_position = 0, + .underline_thickness = 0, +#endif + .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ +}; + + + +#endif /*#if SF_UI_TEXT_MEDIUM_12_1BPP*/ + diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr index 970448b2b..7c3a31f66 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr @@ -1019,11 +1019,11 @@ "click": false, "drag": false, "event callback": "", - "font type": "Font_Type0", + "font type": "Font_Type3", "geometry": { "height": 40, "width": 120, - "x": 140, + "x": 150, "y": 10 }, "hidden": true, @@ -1036,7 +1036,7 @@ { "Text": { "text_color": "0xffffff", - "text_font": "SF-UI-Text-Medium 16 1bpp", + "text_font": "SF-UI-Text-Medium 12 1bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, @@ -1080,11 +1080,11 @@ "click": false, "drag": false, "event callback": "", - "font type": "Font_Type0", + "font type": "Font_Type3", "geometry": { "height": 40, "width": 140, - "x": 88, + "x": 84, "y": 10 }, "hidden": true, @@ -1097,7 +1097,7 @@ { "Text": { "text_color": "0x42af29", - "text_font": "SF-UI-Text-Medium 16 1bpp", + "text_font": "SF-UI-Text-Medium 12 1bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang index f42489480..d771819f5 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -198,7 +198,7 @@ "SF-UI-Text-Medium 16 1bpp", "SF-UI-Text-Medium 18 1bpp", "SF-UI-Text-Bold 20 1bpp", - "montserrat 16 4bpp", + "SF-UI-Text-Medium 12 1bpp", "montserrat 16 4bpp" ], [ diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp index e2d913051..63d0febcf 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp @@ -2480,6 +2480,30 @@ "unicode range names": [ "Ascii" ] + }, + { + "bpp": 1, + "compressed": false, + "custom code range": "", + "file path": "fonts/SF-UI-Text-Medium.otf", + "include language table": true, + "name": "SF-UI-Text-Medium", + "size": 12, + "unicode range names": [ + "Ascii" + ] + }, + { + "bpp": 1, + "compressed": false, + "custom code range": "", + "file path": "fonts/ARIALUNI.TTF", + "include language table": true, + "name": "ARIALUNI", + "size": 32, + "unicode range names": [ + "Ascii" + ] } ], "images": [ diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c index 73c6b215e..0b6289f9a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c @@ -550,6 +550,8 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] = { &sf_ui_text_bold_16_1bpp }, { &sf_ui_text_bold_20_1bpp }, { &sf_ui_text_bold_18_1bpp }, + { &sf_ui_text_medium_12_1bpp }, + { &arialuni_32_1bpp }, }; lv_plugin_string_t* lv_plugin_language_table[] = { @@ -570,7 +572,7 @@ lv_plugin_res_id lv_plugin_language_font_table_EN[] = { LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP, LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP, LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP, - LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_12_1BPP, LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h index 327c08058..905572623 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h @@ -69,6 +69,8 @@ LV_FONT_DECLARE(notosans_black_8_1bpp); LV_FONT_DECLARE(sf_ui_text_bold_16_1bpp); LV_FONT_DECLARE(sf_ui_text_bold_20_1bpp); LV_FONT_DECLARE(sf_ui_text_bold_18_1bpp); +LV_FONT_DECLARE(sf_ui_text_medium_12_1bpp); +LV_FONT_DECLARE(arialuni_32_1bpp); void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event); void button_del_event_callback(lv_obj_t* obj, lv_event_t event); @@ -1083,7 +1085,9 @@ LV_IMG_DECLARE(work_mode); #define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_16_1BPP 13 #define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 14 #define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_18_1BPP 15 -#define LV_PLUGIN_FONT_TABLE_SIZE 16 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_12_1BPP 16 +#define LV_PLUGIN_FONT_ID_ARIALUNI_32_1BPP 17 +#define LV_PLUGIN_FONT_TABLE_SIZE 18 #define LV_PLUGIN_STRING_ID_STRID_NULL_ 1 #define LV_PLUGIN_STRING_ID_STRID_MODE 2 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c index 2d9006430..f51cc58e4 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c @@ -1028,7 +1028,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); + lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_12_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_CHECKED, color); @@ -1073,10 +1073,10 @@ lv_obj_t* UIFlowPhoto_create(){ lv_obj_set_drag(label_tips, false); lv_plugin_label_allocate_ext_attr(label_tips); lv_plugin_label_allocate_ext_attr(label_tips); - lv_plugin_label_set_font_type(label_tips, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); + lv_plugin_label_set_font_type(label_tips, LV_PLUGIN_LANGUAGE_FONT_TYPE_3); lv_label_set_align(label_tips, LV_LABEL_ALIGN_RIGHT); lv_label_set_long_mode(label_tips, LV_LABEL_LONG_SROLL); - lv_obj_set_pos(label_tips, 140, 10); + lv_obj_set_pos(label_tips, 150, 10); lv_obj_set_size(label_tips, 120, 40); lv_obj_add_style(label_tips, 0, &label_tips_s0); @@ -1089,7 +1089,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_tips2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); + lv_style_set_text_font(&label_tips2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_12_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_CHECKED, color); @@ -1135,9 +1135,9 @@ lv_obj_t* UIFlowPhoto_create(){ lv_plugin_label_allocate_ext_attr(label_tips2); lv_label_set_text(label_tips2,"Connected to APP"); lv_plugin_label_allocate_ext_attr(label_tips2); - lv_plugin_label_set_font_type(label_tips2, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); + lv_plugin_label_set_font_type(label_tips2, LV_PLUGIN_LANGUAGE_FONT_TYPE_3); lv_label_set_long_mode(label_tips2, LV_LABEL_LONG_SROLL); - lv_obj_set_pos(label_tips2, 88, 10); + lv_obj_set_pos(label_tips2, 84, 10); lv_obj_set_size(label_tips2, 140, 40); lv_obj_add_style(label_tips2, 0, &label_tips2_s0);