From 1e58cd0c9d32218f566ba1c6bec5e47d72524121 Mon Sep 17 00:00:00 2001 From: ipason Date: Tue, 22 Apr 2025 16:04:56 +0800 Subject: [PATCH] updateFromSquareline --- .vscode/settings.json | 2 +- components/FluxUI/CMakeLists.txt | 1 + components/FluxUI/filelist.txt | 1 + components/FluxUI/fonts/ui_font_MisansM10.c | 809 ++++++++++++++++++++ components/FluxUI/screens/ui_pageHome.c | 4 +- components/FluxUI/ui.h | 1 + 6 files changed, 815 insertions(+), 3 deletions(-) create mode 100644 components/FluxUI/fonts/ui_font_MisansM10.c diff --git a/.vscode/settings.json b/.vscode/settings.json index 4b5d878..83eac6e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,7 +12,7 @@ "idf.openOcdConfigs": [ "board/esp32s3-builtin.cfg" ], - "idf.portWin": "COM6", + "idf.portWin": "COM5", "idf.flashType": "UART", "files.associations": { "*.md": "markdown", diff --git a/components/FluxUI/CMakeLists.txt b/components/FluxUI/CMakeLists.txt index 5ee80d3..3dfdb73 100644 --- a/components/FluxUI/CMakeLists.txt +++ b/components/FluxUI/CMakeLists.txt @@ -39,6 +39,7 @@ fonts/ui_font_MiSansN.c fonts/ui_font_MiSansN14.c fonts/ui_font_symbols16.c fonts/ui_font_symbolsalibaba.c +fonts/ui_font_MisansM10.c ui_event_wifi.c ui_event_debug.c ui_event_light.c diff --git a/components/FluxUI/filelist.txt b/components/FluxUI/filelist.txt index e1335d4..e94da4a 100644 --- a/components/FluxUI/filelist.txt +++ b/components/FluxUI/filelist.txt @@ -39,3 +39,4 @@ fonts/ui_font_MiSansN.c fonts/ui_font_MiSansN14.c fonts/ui_font_symbols16.c fonts/ui_font_symbolsalibaba.c +fonts/ui_font_MisansM10.c diff --git a/components/FluxUI/fonts/ui_font_MisansM10.c b/components/FluxUI/fonts/ui_font_MisansM10.c new file mode 100644 index 0000000..afafc3f --- /dev/null +++ b/components/FluxUI/fonts/ui_font_MisansM10.c @@ -0,0 +1,809 @@ +/******************************************************************************* + * Size: 10 px + * Bpp: 1 + * Opts: --bpp 1 --size 10 --font C:/Users/jarvis/Documents/FluxDC/SquareLineProj/assets/MiSans-Medium.otf -o C:/Users/jarvis/Documents/FluxDC/SquareLineProj/assets\ui_font_MisansM10.c --format lvgl -r 0x20-0x7f --no-compress --no-prefilter + ******************************************************************************/ + +#include "../ui.h" + +#ifndef UI_FONT_MISANSM10 +#define UI_FONT_MISANSM10 1 +#endif + +#if UI_FONT_MISANSM10 + +/*----------------- + * BITMAPS + *----------------*/ + +/*Store the image of the glyphs*/ +static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + 0x0, + + /* U+0021 "!" */ + 0xf9, + + /* U+0022 "\"" */ + 0xf6, 0x80, + + /* U+0023 "#" */ + 0x24, 0x49, 0xf9, 0x42, 0x9f, 0x92, 0x28, + + /* U+0024 "$" */ + 0x23, 0xab, 0x4e, 0x18, 0xb5, 0xf1, 0x0, + + /* U+0025 "%" */ + 0x62, 0x94, 0x98, 0x68, 0x16, 0x19, 0x29, 0x46, + + /* U+0026 "&" */ + 0x30, 0x91, 0x21, 0x8d, 0x53, 0xa3, 0x3a, + + /* U+0027 "'" */ + 0xa8, + + /* U+0028 "(" */ + 0x5a, 0xaa, 0x50, + + /* U+0029 ")" */ + 0xa5, 0x55, 0xa0, + + /* U+002A "*" */ + 0x5b, 0x0, + + /* U+002B "+" */ + 0x21, 0x3e, 0x42, 0x0, + + /* U+002C "," */ + 0xc0, + + /* U+002D "-" */ + 0xf0, + + /* U+002E "." */ + 0x80, + + /* U+002F "/" */ + 0x12, 0x22, 0x44, 0x44, + + /* U+0030 "0" */ + 0x76, 0xe3, 0x18, 0xc7, 0x6e, + + /* U+0031 "1" */ + 0x7c, 0x92, 0x49, + + /* U+0032 "2" */ + 0x74, 0x42, 0x31, 0x11, 0x1f, + + /* U+0033 "3" */ + 0xf1, 0x8, 0xc0, 0x86, 0x2e, + + /* U+0034 "4" */ + 0x18, 0x62, 0x9a, 0x4b, 0xf0, 0x82, + + /* U+0035 "5" */ + 0x7c, 0x21, 0xe0, 0x86, 0x2e, + + /* U+0036 "6" */ + 0x21, 0x11, 0xe8, 0xc6, 0x2e, + + /* U+0037 "7" */ + 0xf8, 0x44, 0x22, 0x11, 0x8, + + /* U+0038 "8" */ + 0x74, 0x62, 0xe8, 0xc6, 0x2e, + + /* U+0039 "9" */ + 0x74, 0x63, 0x17, 0x88, 0x84, + + /* U+003A ":" */ + 0x84, + + /* U+003B ";" */ + 0x86, + + /* U+003C "<" */ + 0x19, 0xb1, 0x83, 0xc, + + /* U+003D "=" */ + 0xf0, 0xf0, + + /* U+003E ">" */ + 0x83, 0x4, 0x26, 0x40, + + /* U+003F "?" */ + 0x76, 0x42, 0x22, 0x10, 0x4, + + /* U+0040 "@" */ + 0x3c, 0x42, 0x9d, 0xa5, 0xa5, 0x9a, 0x40, 0x3c, + + /* U+0041 "A" */ + 0x10, 0x60, 0xa1, 0x47, 0xc8, 0x91, 0x41, + + /* U+0042 "B" */ + 0xf4, 0x63, 0xe8, 0xc6, 0x3e, + + /* U+0043 "C" */ + 0x39, 0x18, 0x20, 0x82, 0x4, 0x4e, + + /* U+0044 "D" */ + 0xf2, 0x28, 0x61, 0x86, 0x18, 0xbc, + + /* U+0045 "E" */ + 0xfc, 0x21, 0xe8, 0x42, 0x1f, + + /* U+0046 "F" */ + 0xfc, 0x21, 0xe8, 0x42, 0x10, + + /* U+0047 "G" */ + 0x39, 0x18, 0x27, 0x86, 0x14, 0x4e, + + /* U+0048 "H" */ + 0x86, 0x18, 0x7f, 0x86, 0x18, 0x61, + + /* U+0049 "I" */ + 0xff, + + /* U+004A "J" */ + 0x11, 0x11, 0x11, 0x96, + + /* U+004B "K" */ + 0x8a, 0x4a, 0x38, 0xf2, 0x48, 0xa2, + + /* U+004C "L" */ + 0x84, 0x21, 0x8, 0x42, 0x1f, + + /* U+004D "M" */ + 0x83, 0x8f, 0x1d, 0x5a, 0xb2, 0x60, 0xc1, + + /* U+004E "N" */ + 0x87, 0x1e, 0x69, 0x96, 0x78, 0xe1, + + /* U+004F "O" */ + 0x38, 0x8a, 0xc, 0x18, 0x30, 0x51, 0x1c, + + /* U+0050 "P" */ + 0xf4, 0x63, 0x1f, 0x42, 0x10, + + /* U+0051 "Q" */ + 0x38, 0x8a, 0xc, 0x18, 0x31, 0x53, 0x1f, 0x2, + + /* U+0052 "R" */ + 0xf4, 0x63, 0x1f, 0x4a, 0x51, + + /* U+0053 "S" */ + 0x74, 0x61, 0xc1, 0x86, 0x2e, + + /* U+0054 "T" */ + 0xfc, 0x82, 0x8, 0x20, 0x82, 0x8, + + /* U+0055 "U" */ + 0x86, 0x18, 0x61, 0x86, 0x1c, 0xde, + + /* U+0056 "V" */ + 0x86, 0x89, 0x12, 0x62, 0x85, 0xc, 0x8, + + /* U+0057 "W" */ + 0x8c, 0x73, 0x24, 0xc9, 0x52, 0x52, 0x8c, 0xc3, + 0x30, 0x84, + + /* U+0058 "X" */ + 0x45, 0x22, 0x84, 0x30, 0xa4, 0xf1, + + /* U+0059 "Y" */ + 0x44, 0x88, 0xa1, 0x41, 0x2, 0x4, 0x8, + + /* U+005A "Z" */ + 0xf8, 0xc4, 0x42, 0x22, 0x1f, + + /* U+005B "[" */ + 0xea, 0xaa, 0xb0, + + /* U+005C "\\" */ + 0x89, 0x24, 0x49, + + /* U+005D "]" */ + 0xd5, 0x55, 0x70, + + /* U+005E "^" */ + 0x25, 0x90, + + /* U+005F "_" */ + 0xf8, + + /* U+0060 "`" */ + 0x14, + + /* U+0061 "a" */ + 0x61, 0x79, 0x9f, + + /* U+0062 "b" */ + 0x84, 0x3d, 0x38, 0xc6, 0x7e, + + /* U+0063 "c" */ + 0x74, 0x21, 0x8, 0x38, + + /* U+0064 "d" */ + 0x8, 0x5f, 0x98, 0xc7, 0x2f, + + /* U+0065 "e" */ + 0x74, 0x7f, 0x8, 0xb8, + + /* U+0066 "f" */ + 0x74, 0xe4, 0x44, 0x44, + + /* U+0067 "g" */ + 0x7e, 0x63, 0x18, 0xbc, 0x2e, + + /* U+0068 "h" */ + 0x84, 0x3d, 0x18, 0xc6, 0x31, + + /* U+0069 "i" */ + 0xbf, + + /* U+006A "j" */ + 0x45, 0x55, 0x70, + + /* U+006B "k" */ + 0x84, 0x25, 0x4e, 0x52, 0x52, + + /* U+006C "l" */ + 0xaa, 0xab, + + /* U+006D "m" */ + 0xed, 0x26, 0x4c, 0x99, 0x32, 0x40, + + /* U+006E "n" */ + 0xb6, 0x63, 0x18, 0xc4, + + /* U+006F "o" */ + 0x74, 0x63, 0x18, 0xb8, + + /* U+0070 "p" */ + 0xf4, 0xe3, 0x19, 0xfa, 0x10, + + /* U+0071 "q" */ + 0x7e, 0x63, 0x1c, 0xbc, 0x21, + + /* U+0072 "r" */ + 0xba, 0x49, 0x0, + + /* U+0073 "s" */ + 0xe9, 0xc3, 0x96, + + /* U+0074 "t" */ + 0x44, 0xf4, 0x44, 0x46, + + /* U+0075 "u" */ + 0x8c, 0x63, 0x18, 0xbc, + + /* U+0076 "v" */ + 0x8a, 0x54, 0xa3, 0x10, + + /* U+0077 "w" */ + 0x99, 0x99, 0x5a, 0x56, 0x66, 0x26, + + /* U+0078 "x" */ + 0x4a, 0x88, 0x65, 0x64, + + /* U+0079 "y" */ + 0x8a, 0x54, 0xa3, 0x10, 0x88, + + /* U+007A "z" */ + 0xf3, 0x24, 0xcf, + + /* U+007B "{" */ + 0x29, 0x25, 0x12, 0x4c, + + /* U+007C "|" */ + 0xff, 0xc0, + + /* U+007D "}" */ + 0x89, 0x24, 0x52, 0x58, + + /* U+007E "~" */ + 0x68, 0x80, + + /* U+007F "" */ + 0x0 +}; + + +/*--------------------- + * 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 = 47, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1, .adv_w = 45, .box_w = 1, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 2, .adv_w = 57, .box_w = 3, .box_h = 3, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 4, .adv_w = 114, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 11, .adv_w = 94, .box_w = 5, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 18, .adv_w = 134, .box_w = 8, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 26, .adv_w = 116, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 33, .adv_w = 32, .box_w = 2, .box_h = 3, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 34, .adv_w = 51, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 37, .adv_w = 51, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 40, .adv_w = 72, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 5}, + {.bitmap_index = 42, .adv_w = 99, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 46, .adv_w = 43, .box_w = 1, .box_h = 3, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 47, .adv_w = 74, .box_w = 4, .box_h = 1, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 48, .adv_w = 41, .box_w = 1, .box_h = 1, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 49, .adv_w = 66, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 53, .adv_w = 103, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 58, .adv_w = 67, .box_w = 3, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 61, .adv_w = 92, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 66, .adv_w = 96, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 71, .adv_w = 96, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 77, .adv_w = 98, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 82, .adv_w = 98, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 87, .adv_w = 86, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 92, .adv_w = 102, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 97, .adv_w = 98, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 102, .adv_w = 41, .box_w = 1, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 103, .adv_w = 43, .box_w = 1, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 104, .adv_w = 99, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 108, .adv_w = 99, .box_w = 4, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 110, .adv_w = 99, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 114, .adv_w = 80, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 119, .adv_w = 133, .box_w = 8, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 127, .adv_w = 109, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 134, .adv_w = 109, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 139, .adv_w = 114, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 145, .adv_w = 121, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 151, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 156, .adv_w = 93, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 161, .adv_w = 119, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 167, .adv_w = 117, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 173, .adv_w = 40, .box_w = 1, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 174, .adv_w = 80, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 178, .adv_w = 108, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 184, .adv_w = 92, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 189, .adv_w = 143, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 196, .adv_w = 119, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 202, .adv_w = 127, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 209, .adv_w = 102, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 214, .adv_w = 127, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 222, .adv_w = 103, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 227, .adv_w = 99, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 232, .adv_w = 98, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 238, .adv_w = 114, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 244, .adv_w = 110, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 251, .adv_w = 158, .box_w = 10, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 261, .adv_w = 105, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 267, .adv_w = 104, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 274, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 279, .adv_w = 57, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 282, .adv_w = 56, .box_w = 3, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 285, .adv_w = 57, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 288, .adv_w = 72, .box_w = 4, .box_h = 3, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 290, .adv_w = 74, .box_w = 5, .box_h = 1, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 291, .adv_w = 43, .box_w = 2, .box_h = 3, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 292, .adv_w = 88, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 295, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 300, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 304, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 309, .adv_w = 91, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 313, .adv_w = 58, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 317, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 322, .adv_w = 94, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 327, .adv_w = 41, .box_w = 1, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 328, .adv_w = 41, .box_w = 2, .box_h = 10, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 331, .adv_w = 84, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 336, .adv_w = 41, .box_w = 2, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 338, .adv_w = 143, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 344, .adv_w = 94, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 348, .adv_w = 94, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 352, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 357, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 362, .adv_w = 63, .box_w = 3, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 365, .adv_w = 78, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 368, .adv_w = 60, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 372, .adv_w = 94, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 376, .adv_w = 85, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 380, .adv_w = 131, .box_w = 8, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 386, .adv_w = 83, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 390, .adv_w = 86, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 395, .adv_w = 78, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 398, .adv_w = 58, .box_w = 3, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 402, .adv_w = 37, .box_w = 1, .box_h = 10, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 404, .adv_w = 58, .box_w = 3, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 408, .adv_w = 86, .box_w = 5, .box_h = 2, .ofs_x = 0, .ofs_y = 3}, + {.bitmap_index = 410, .adv_w = 0, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0} +}; + +/*--------------------- + * CHARACTER MAPPING + *--------------------*/ + + + +/*Collect the unicode lists and glyph_id offsets*/ +static const lv_font_fmt_txt_cmap_t cmaps[] = +{ + { + .range_start = 32, .range_length = 96, .glyph_id_start = 1, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + } +}; + +/*----------------- + * KERNING + *----------------*/ + + +/*Map glyph_ids to kern left classes*/ +static const uint8_t kern_left_class_mapping[] = +{ + 0, 0, 0, 1, 0, 0, 0, 2, + 1, 0, 0, 0, 0, 3, 4, 3, + 5, 6, 0, 7, 8, 9, 10, 11, + 12, 13, 14, 0, 0, 0, 0, 0, + 15, 0, 16, 17, 18, 19, 20, 21, + 22, 0, 0, 23, 24, 25, 0, 0, + 19, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 0, 0, 0, 0, + 0, 0, 37, 38, 39, 0, 40, 41, + 42, 43, 0, 0, 44, 45, 43, 43, + 38, 38, 42, 46, 47, 48, 42, 49, + 50, 51, 49, 52, 0, 0, 0, 0, + 0 +}; + +/*Map glyph_ids to kern right classes*/ +static const uint8_t kern_right_class_mapping[] = +{ + 0, 0, 0, 1, 0, 0, 0, 2, + 1, 0, 0, 0, 0, 3, 4, 3, + 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 0, 0, 0, 0, 0, + 16, 0, 17, 0, 18, 0, 0, 0, + 18, 0, 0, 19, 0, 0, 0, 0, + 18, 0, 18, 0, 20, 21, 22, 23, + 24, 25, 26, 27, 0, 0, 0, 0, + 0, 0, 28, 0, 29, 29, 29, 30, + 29, 0, 31, 31, 0, 32, 33, 33, + 29, 33, 29, 33, 34, 35, 36, 37, + 38, 39, 37, 40, 0, 0, 0, 0, + 0 +}; + +/*Kern values between classes*/ +static const int8_t kern_class_values[] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -15, 0, -9, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -2, -5, -4, -16, -5, -16, -10, + 0, -17, 0, -3, -2, -1, 0, -4, + 0, 0, -5, 0, -7, -5, 0, 0, + 0, 0, 0, 0, 0, -5, -15, 0, + 0, -7, -3, -3, -5, -1, -16, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -5, + 0, 0, 0, 0, -7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -11, 0, -8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -5, 0, 0, 0, 0, -4, + -3, 0, 0, 0, -3, 0, 0, 0, + -4, 0, -4, 0, -5, 0, -4, -3, + 0, -8, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -1, 0, -2, 0, 0, + -4, -5, 0, -3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -2, 0, + 0, -4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -3, 0, 0, 0, 0, -3, + 0, 0, 0, 0, 0, 0, -2, -4, + 0, 0, 0, 0, 0, 0, 0, 0, + -2, -3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -2, 0, 0, 0, 0, 0, -4, 0, + -3, 0, 0, 0, -4, 0, -3, -5, + 0, 0, 0, 0, -4, 0, -6, 0, + 0, -7, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -3, 0, 0, 0, -4, 0, + 0, 0, 0, 0, -3, 0, 0, -7, + 0, 0, 0, 0, 0, 0, -4, 0, + -5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -12, 0, -3, 0, 0, 0, -10, 0, + 0, 0, 0, 0, -8, 0, -2, -11, + 0, 0, 0, 0, -16, 0, -13, 0, + -3, -17, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -6, 0, -5, -3, + 3, 0, -22, -4, -14, -3, 0, 0, + 0, -12, 0, -11, 1, -5, 0, 2, + -16, 0, -18, 0, 0, 0, 0, 0, + 0, 0, 0, -13, -13, -4, 0, 0, + -7, -9, 0, -6, 0, 0, -6, -6, + 0, 0, -1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, 0, -4, -3, + 0, 0, 0, 0, -4, 0, -3, 0, + 0, -7, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -3, 0, + 0, 0, -17, 0, -8, 0, 0, 0, + 0, -5, 0, -4, 0, -3, 0, 0, + -11, 0, -14, 0, 0, 0, -2, 0, + -7, -4, 0, -6, -4, 2, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -9, -3, -5, 2, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -15, -2, 0, -7, 0, -4, -10, 0, + 0, 0, 0, 0, 0, 0, -12, -13, + 0, -6, 0, 0, -15, -3, -16, -11, + 0, -16, 0, 0, -3, -2, 0, -1, + 0, 0, -5, -2, -8, -6, 0, 0, + -5, 0, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -4, + -3, 0, -1, 0, -4, 0, -7, -3, + -3, -6, -2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -2, 0, -1, -1, + 0, 0, 0, -7, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -3, 0, 0, 0, 0, 0, 0, + -4, -5, -2, -2, -4, 0, 0, 0, + 0, 0, 0, 0, -3, -3, -2, 0, + -3, 0, -6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -4, + -6, 0, -9, 0, -5, 0, -6, -3, + -7, -8, -6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -2, + 0, -3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, -2, 0, 0, + 3, -4, -11, 0, 0, 0, 0, 0, + 0, -4, 0, -5, 0, 0, 0, 0, + -10, 0, -25, -2, 0, 0, 0, 0, + -3, 0, 0, -8, -5, 0, 0, 0, + -3, -3, 0, -3, -2, -2, -6, -3, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -4, + -4, 0, 0, 0, -5, 0, -6, -3, + -4, -8, -2, 0, 0, 0, 0, 0, + 0, -1, 0, 0, -4, -5, -3, 0, + 0, 0, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -6, 3, -15, 0, -8, -5, 0, + 0, -4, 0, 0, 0, 0, -8, -6, + 0, -9, -5, -4, 0, -8, 0, 0, + 0, 0, 0, -5, -8, -5, 0, -4, + -1, -2, -8, -8, -12, -10, 2, 0, + -15, 0, 4, -15, 0, 0, -12, 0, + 0, 0, 0, 0, -4, 0, -18, -15, + 0, -6, 0, 0, -25, -4, -22, -14, + 0, -28, 0, 0, -3, -3, 0, 0, + 0, 0, -7, -3, -13, -8, 0, 0, + 0, -6, -16, 0, 0, 0, 0, -2, + 0, -5, 0, 0, 0, 0, 0, 0, + -13, 0, -29, 0, -3, 0, -4, -3, + -5, -5, -3, -6, -4, 3, 0, 0, + 0, 0, 3, 0, 4, 4, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -4, 0, 0, 0, -5, 0, -4, -4, + -7, -8, -2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -1, -5, 0, -3, 0, -3, -2, + 0, -4, 0, -2, -3, 0, 0, 0, + 0, 0, 0, -3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -2, 0, -2, 0, + -2, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, -3, -2, -2, + 3, -11, -17, -13, 0, -5, 0, 0, + 0, -16, 0, -12, 0, -4, 0, 0, + -15, -5, -23, -2, 0, 0, -3, 0, + -5, 0, 0, -19, -19, -7, 0, 0, + -14, -17, -4, -12, -17, -16, -17, -14, + 0, 0, -6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -6, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -11, -21, -7, 0, -4, 0, 0, + 0, -11, -3, -8, 0, -3, 0, 0, + -16, -6, -25, -1, 0, 0, 0, 0, + 0, 0, 0, -14, -12, -3, 0, 0, + -8, -10, -2, -7, -5, -5, -7, -5, + 0, -6, -14, -4, 0, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -11, -3, -17, 1, 0, 0, 0, 0, + 0, 0, 0, -11, -9, -2, 0, 0, + -6, -8, 0, -7, -2, -3, -5, -4, + 0, -5, 1, -13, 0, 0, -5, 0, + -2, -3, -4, -4, 0, 0, -8, -4, + 0, -7, -2, -2, -5, -3, 0, 0, + 0, 0, 0, -3, -6, -4, 0, -1, + -1, -5, -6, -7, -9, -10, 0, 0, + 0, -13, -19, -11, 0, -8, 0, -3, + -2, -17, 0, -15, 0, -7, -3, 0, + -16, -8, -27, -4, 0, 0, 0, 0, + 0, 0, 0, -17, -18, -6, 0, 0, + -13, -15, -5, -14, -7, -8, -9, -10, + 0, -6, 0, -8, 0, 0, 0, 0, + 0, -6, 0, 0, 0, 0, 0, 0, + 0, -8, 0, 0, 0, -3, 0, 0, + 0, 0, 0, 0, -3, 0, 0, 0, + 0, 0, -5, -5, -7, -6, 0, 0, + -6, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -8, 0, -3, -8, + 0, 0, 0, 0, -17, 0, -12, -9, + 0, -15, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -2, -2, 0, 0, + -6, 0, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -8, 0, -4, -11, + -3, 0, 0, 0, -19, 0, -12, -9, + -6, -18, -2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, -2, -4, -1, + -2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -4, + 0, 0, 0, 0, -17, 0, -9, -6, + -4, -17, 0, -2, -2, 0, -2, -1, + 0, 0, 0, 0, -2, 0, -4, 0, + 0, 0, -2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -8, 0, 0, -8, + 0, 0, 0, 0, -16, 0, -10, -7, + -6, -14, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -2, -1, -3, 0, + 5, -4, -11, 0, 0, 0, 0, 0, + 0, -7, 0, 0, 3, 0, 3, 0, + -9, 0, -11, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, 0, 0, 0, + 0, -2, 1, -2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -4, 0, 0, -4, + 0, 0, 0, 0, -13, 0, -8, -6, + -2, -13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -6, 0, -3, -8, + 0, 0, 0, 0, -19, 0, -13, -10, + -3, -17, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -2, -1, -1, 0, + -4, -2, 2, -5, 0, 0, 0, 0, + 0, -5, 0, -4, 0, -4, -1, -3, + 0, -3, 0, 0, -16, -2, -8, -4, + 0, -13, 0, -2, -4, 0, 0, -1, + 0, -2, -2, -3, 0, 0, 0, 0, + 0, -2, 3, -3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -4, + 0, -2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 1, 0, 0, 1, -2, -1, 0, 0, + 0, -8, -17, 0, 0, 0, 0, -3, + -8, -8, 0, -4, 0, 0, 2, 0, + 0, 0, 0, 0, -14, 0, 0, 0, + -7, -6, -8, -4, -2, 2, 0, 0, + 0, -2, 2, -3, 3, 3, 1, 0, + -5, 0, 0, 0, 0, 0, -5, 0, + 0, 0, 0, 0, -5, 0, 0, -6, + 0, 0, 0, 0, -17, 0, -10, -7, + -4, -13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -4, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -3, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, -3, 0, -3, 0, + 0, -8, 0, 0, -1, 1, 0, 0, + 0, -1, 0, 0, 0, 0, 0, 0, + 0, -6, -13, 0, 0, 0, 0, 0, + 0, -5, 0, -5, 0, 0, 0, 0, + -8, 0, -15, 0, -17, 0, -5, -2, + -9, -7, -8, -4, -3, 0, 0, 0, + 0, -1, 0, 0, 0, 0, 0, 0, + 0, -3, -9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -6, 0, -11, 0, -16, 0, -5, -3, + -10, -8, -6, -3, -2, 0, 0, 0, + 0, -1, 0, 0, 0, 0, 0, 0, + 0, -2, 0, -4, 0, 0, 0, 0, + 0, -6, 0, -5, -4, -3, 0, 0, + 0, -2, 0, 0, -17, 0, -7, -5, + 1, -9, 0, -3, -4, 0, 0, -2, + 0, -4, 0, -2, 0, 0, 0, 0, + 0, -5, 0, -3, 0, 0, 0, 0, + 0, -6, 0, -3, -3, 0, -1, 0, + 0, -4, 0, 0, -14, 0, -7, -4, + 0, -10, 0, 0, -3, 0, 0, 0, + 0, -1, 0, -1, 0, 0, 0, 0 +}; + + +/*Collect the kern class' data in one place*/ +static const lv_font_fmt_txt_kern_classes_t kern_classes = +{ + .class_pair_values = kern_class_values, + .left_class_mapping = kern_left_class_mapping, + .right_class_mapping = kern_right_class_mapping, + .left_class_cnt = 52, + .right_class_cnt = 40, +}; + +/*-------------------- + * ALL CUSTOM DATA + *--------------------*/ + +#if LVGL_VERSION_MAJOR == 8 +/*Store all the custom data of the font*/ +static lv_font_fmt_txt_glyph_cache_t cache; +#endif + +#if LVGL_VERSION_MAJOR >= 8 +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 = &kern_classes, + .kern_scale = 16, + .cmap_num = 1, + .bpp = 1, + .kern_classes = 1, + .bitmap_format = 0, +#if LVGL_VERSION_MAJOR == 8 + .cache = &cache +#endif +}; + + + +/*----------------- + * PUBLIC FONT + *----------------*/ + +/*Initialize a public general font descriptor*/ +#if LVGL_VERSION_MAJOR >= 8 +const lv_font_t ui_font_MisansM10 = { +#else +lv_font_t ui_font_MisansM10 = { +#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 = 11, /*The maximum line height required by the font*/ + .base_line = 2, /*Baseline measured from the bottom of the line*/ +#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) + .subpx = LV_FONT_SUBPX_NONE, +#endif +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 + .underline_position = -1, + .underline_thickness = 1, +#endif + .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ +#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9 + .fallback = NULL, +#endif + .user_data = NULL, +}; + + + +#endif /*#if UI_FONT_MISANSM10*/ + diff --git a/components/FluxUI/screens/ui_pageHome.c b/components/FluxUI/screens/ui_pageHome.c index 28109db..61b9646 100644 --- a/components/FluxUI/screens/ui_pageHome.c +++ b/components/FluxUI/screens/ui_pageHome.c @@ -672,8 +672,8 @@ void ui_pageHome_screen_init(void) lv_obj_set_x(ui_pageHome_labelBSInfo, 0); lv_obj_set_y(ui_pageHome_labelBSInfo, 62); lv_obj_set_align(ui_pageHome_labelBSInfo, LV_ALIGN_CENTER); - lv_label_set_text(ui_pageHome_labelBSInfo, "15BPM start instruction successfully issued"); - lv_obj_set_style_text_font(ui_pageHome_labelBSInfo, &lv_font_montserrat_10, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_label_set_text(ui_pageHome_labelBSInfo, "Start testing at 15BPM"); + lv_obj_set_style_text_font(ui_pageHome_labelBSInfo, &ui_font_MisansM10, LV_PART_MAIN | LV_STATE_DEFAULT); ui_pageHome_labelstr23 = lv_label_create(ui_pageHome_panelResult1); lv_obj_set_width(ui_pageHome_labelstr23, LV_SIZE_CONTENT); /// 1 diff --git a/components/FluxUI/ui.h b/components/FluxUI/ui.h index ed5cdab..af99b6e 100644 --- a/components/FluxUI/ui.h +++ b/components/FluxUI/ui.h @@ -462,6 +462,7 @@ LV_FONT_DECLARE(ui_font_MiSansN); LV_FONT_DECLARE(ui_font_MiSansN14); LV_FONT_DECLARE(ui_font_symbols16); LV_FONT_DECLARE(ui_font_symbolsalibaba); +LV_FONT_DECLARE(ui_font_MisansM10); // UI INIT void ui_init(void);