From: p15692025051 <846603105@qq.com> Date: Fri, 28 Apr 2023 03:04:46 +0000 (+0800) Subject: 增加表盘20号字库 X-Git-Url: http://git.snicker.com.cn/css/static/script.js?a=commitdiff_plain;h=71838339f859a47082812186994e51e8bb450d1f;p=mirrors%2FASR1603_G5.git 增加表盘20号字库 --- diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/animimg.h b/2.sdk/Helios_SDK/config/include/config/lvgl/animimg.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/arc.h b/2.sdk/Helios_SDK/config/include/config/lvgl/arc.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/calendar.h b/2.sdk/Helios_SDK/config/include/config/lvgl/calendar.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/chart.h b/2.sdk/Helios_SDK/config/include/config/lvgl/chart.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/colorwheel.h b/2.sdk/Helios_SDK/config/include/config/lvgl/colorwheel.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/gif/decode.h b/2.sdk/Helios_SDK/config/include/config/lvgl/gif/decode.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/led.h b/2.sdk/Helios_SDK/config/include/config/lvgl/led.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/meter.h b/2.sdk/Helios_SDK/config/include/config/lvgl/meter.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/spinbox.h b/2.sdk/Helios_SDK/config/include/config/lvgl/spinbox.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/spinner.h b/2.sdk/Helios_SDK/config/include/config/lvgl/spinner.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/config/include/config/lvgl/tabview.h b/2.sdk/Helios_SDK/config/include/config/lvgl/tabview.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h index ff59360b..4c09db93 100644 --- a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h +++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h @@ -342,7 +342,7 @@ LV_FONT_DECLARE(lv_font_SDsiyuan_46) LV_FONT_DECLARE(lv_font_SDsiyuan_48) #endif LV_FONT_DECLARE(lv_font_70_bold) -LV_FONT_DECLARE(lv_font_30_week) +LV_FONT_DECLARE(lv_font_28_dial) LV_FONT_DECLARE(lv_font_60_main_menu) /*Declare the custom (user defined) fonts*/ #ifdef LV_FONT_CUSTOM_DECLARE diff --git a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk index a1a5eab9..17da4236 100644 --- a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk +++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk @@ -97,5 +97,5 @@ lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_14_simsum.c lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_16_simsum.c lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_18_simsum.c lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_70_bold.c -lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_30_week.c +lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_28_dial.c lvgl_SRCS += $(LVGL_DIR_NAME)/src/font/lv_font_60_main_menu.c \ No newline at end of file diff --git a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_28_dial.c b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_28_dial.c new file mode 100644 index 00000000..7018db6c --- /dev/null +++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_28_dial.c @@ -0,0 +1,719 @@ +/******************************************************************************* + * Size: 28 px + * Bpp: 4 + * Opts: + ******************************************************************************/ + +#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#include "lvgl.h" +#else +#include "lvgl/lvgl.h" +#endif + +#ifndef LV_FONT_28_DIAL +#define LV_FONT_28_DIAL 1 +#endif + +#if LV_FONT_28_DIAL + +/*----------------- + * BITMAPS + *----------------*/ + +/*Store the image of the glyphs*/ +static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + + /* U+0030 "0" */ + 0x0, 0x2, 0x9d, 0xff, 0xeb, 0x60, 0x0, 0x0, + 0x6, 0xff, 0xff, 0xff, 0xff, 0xc1, 0x0, 0x3, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x0, 0xcf, + 0xff, 0xfb, 0xad, 0xff, 0xff, 0x40, 0x2f, 0xff, + 0xf3, 0x0, 0xb, 0xff, 0xf9, 0x6, 0xff, 0xfb, + 0x0, 0x0, 0x3f, 0xff, 0xe0, 0x9f, 0xff, 0x70, + 0x0, 0x0, 0xff, 0xff, 0x1b, 0xff, 0xf5, 0x0, + 0x0, 0xd, 0xff, 0xf2, 0xcf, 0xff, 0x40, 0x0, + 0x0, 0xcf, 0xff, 0x3d, 0xff, 0xf3, 0x0, 0x0, + 0xb, 0xff, 0xf4, 0xdf, 0xff, 0x30, 0x0, 0x0, + 0xbf, 0xff, 0x4c, 0xff, 0xf4, 0x0, 0x0, 0xc, + 0xff, 0xf3, 0xbf, 0xff, 0x50, 0x0, 0x0, 0xdf, + 0xff, 0x29, 0xff, 0xf7, 0x0, 0x0, 0xf, 0xff, + 0xf0, 0x6f, 0xff, 0xb0, 0x0, 0x3, 0xff, 0xfe, + 0x2, 0xff, 0xff, 0x30, 0x0, 0xbf, 0xff, 0x90, + 0xc, 0xff, 0xff, 0xba, 0xdf, 0xff, 0xf3, 0x0, + 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, 0x0, + 0x5f, 0xff, 0xff, 0xff, 0xfc, 0x10, 0x0, 0x0, + 0x29, 0xdf, 0xfe, 0xb6, 0x0, 0x0, + + /* U+0031 "1" */ + 0x0, 0x26, 0x9c, 0xff, 0xf9, 0x4f, 0xff, 0xff, + 0xff, 0xf9, 0x5f, 0xff, 0xff, 0xff, 0xf9, 0x5f, + 0xff, 0xfe, 0xff, 0xf9, 0x38, 0x52, 0x8, 0xff, + 0xf9, 0x0, 0x0, 0x8, 0xff, 0xf9, 0x0, 0x0, + 0x8, 0xff, 0xf9, 0x0, 0x0, 0x8, 0xff, 0xf9, + 0x0, 0x0, 0x8, 0xff, 0xf9, 0x0, 0x0, 0x8, + 0xff, 0xf9, 0x0, 0x0, 0x8, 0xff, 0xf9, 0x0, + 0x0, 0x8, 0xff, 0xf9, 0x0, 0x0, 0x8, 0xff, + 0xf9, 0x0, 0x0, 0x8, 0xff, 0xf9, 0x0, 0x0, + 0x8, 0xff, 0xf9, 0x0, 0x0, 0x8, 0xff, 0xf9, + 0x0, 0x0, 0x8, 0xff, 0xf9, 0x0, 0x0, 0x8, + 0xff, 0xf9, 0x0, 0x0, 0x8, 0xff, 0xf9, 0x0, + 0x0, 0x8, 0xff, 0xf9, + + /* U+0032 "2" */ + 0x2, 0x7b, 0xde, 0xff, 0xda, 0x50, 0x0, 0x0, + 0x6f, 0xff, 0xff, 0xff, 0xff, 0xc1, 0x0, 0x6, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x0, 0x6f, + 0xc9, 0x88, 0xbf, 0xff, 0xff, 0x30, 0x1, 0x0, + 0x0, 0x0, 0x3f, 0xff, 0xf7, 0x0, 0x0, 0x0, + 0x0, 0x0, 0xbf, 0xff, 0x80, 0x0, 0x0, 0x0, + 0x0, 0xa, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, + 0x0, 0xef, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, + 0x6f, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x2f, + 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, + 0xfd, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xfe, + 0x20, 0x0, 0x0, 0x0, 0x3e, 0xff, 0xfe, 0x20, + 0x0, 0x0, 0x0, 0x5f, 0xff, 0xfd, 0x20, 0x0, + 0x0, 0x0, 0x7f, 0xff, 0xfb, 0x10, 0x0, 0x0, + 0x0, 0xaf, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, + 0x8f, 0xff, 0xfe, 0x99, 0x99, 0x99, 0x99, 0x9, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x9f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + + /* U+0033 "3" */ + 0x2, 0x9c, 0xef, 0xfe, 0xc8, 0x20, 0x0, 0x6, + 0xff, 0xff, 0xff, 0xff, 0xf8, 0x0, 0x6, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x50, 0x5, 0xc9, 0x77, + 0x8b, 0xff, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, + 0x6f, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1f, + 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, + 0xc0, 0x0, 0x3, 0x34, 0x6a, 0xff, 0xff, 0x40, + 0x0, 0xf, 0xff, 0xff, 0xff, 0xe5, 0x0, 0x0, + 0xf, 0xff, 0xff, 0xff, 0x71, 0x0, 0x0, 0xf, + 0xff, 0xff, 0xff, 0xfe, 0x20, 0x0, 0x0, 0x1, + 0x26, 0xdf, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, + 0x1f, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0xc, + 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, + 0xf7, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xf5, + 0x1e, 0xb9, 0x88, 0x9d, 0xff, 0xff, 0xf1, 0x1f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x70, 0x1f, 0xff, + 0xff, 0xff, 0xff, 0xf7, 0x0, 0xb, 0xde, 0xff, + 0xfd, 0xb7, 0x10, 0x0, + + /* U+0034 "4" */ + 0x0, 0x0, 0x0, 0x0, 0xcf, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x0, 0x2f, 0xff, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x0, 0xdf, 0xff, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x8, 0xff, 0xfc, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x3f, 0xff, 0x6a, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0xdf, 0xfb, 0xa, 0xff, 0xf4, 0x0, + 0x0, 0x9, 0xff, 0xf2, 0xa, 0xff, 0xf4, 0x0, + 0x0, 0x4f, 0xff, 0x70, 0xa, 0xff, 0xf4, 0x0, + 0x0, 0xdf, 0xfc, 0x0, 0xa, 0xff, 0xf4, 0x0, + 0x9, 0xff, 0xf2, 0x0, 0xa, 0xff, 0xf4, 0x0, + 0x3f, 0xff, 0x70, 0x0, 0xa, 0xff, 0xf4, 0x0, + 0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, + 0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, + 0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, + 0x29, 0x99, 0x99, 0x99, 0x9d, 0xff, 0xfb, 0x93, + 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf4, 0x0, + 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf4, 0x0, + + /* U+0035 "5" */ + 0x7, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x0, 0x9f, + 0xff, 0xff, 0xff, 0xff, 0x90, 0xb, 0xff, 0xff, + 0xff, 0xff, 0xf9, 0x0, 0xdf, 0xfe, 0x99, 0x99, + 0x99, 0x50, 0xf, 0xff, 0xa0, 0x0, 0x0, 0x0, + 0x2, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x4f, + 0xff, 0x50, 0x0, 0x0, 0x0, 0x6, 0xff, 0xfe, + 0xff, 0xec, 0x71, 0x0, 0x8f, 0xff, 0xff, 0xff, + 0xff, 0xe3, 0xa, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xe0, 0x66, 0x43, 0x23, 0x6d, 0xff, 0xff, 0x60, + 0x0, 0x0, 0x0, 0xd, 0xff, 0xfa, 0x0, 0x0, + 0x0, 0x0, 0x7f, 0xff, 0xc0, 0x0, 0x0, 0x0, + 0x6, 0xff, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x9f, + 0xff, 0xb0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0xf8, + 0xab, 0x98, 0x8a, 0xdf, 0xff, 0xff, 0x2b, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x70, 0xbf, 0xff, 0xff, + 0xff, 0xff, 0x60, 0x7, 0xce, 0xff, 0xfd, 0xb6, + 0x10, 0x0, + + /* U+0036 "6" */ + 0x0, 0x0, 0x0, 0x16, 0xbd, 0xe9, 0x0, 0x0, + 0x0, 0x1, 0x9f, 0xff, 0xff, 0x90, 0x0, 0x0, + 0x3, 0xef, 0xff, 0xff, 0xf9, 0x0, 0x0, 0x2, + 0xff, 0xff, 0xff, 0xca, 0x50, 0x0, 0x0, 0xdf, + 0xff, 0xd4, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, + 0xb0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xe0, + 0x0, 0x10, 0x0, 0x0, 0x2, 0xff, 0xfa, 0x7d, + 0xff, 0xfc, 0x60, 0x0, 0x5f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xa0, 0x8, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x60, 0x9f, 0xff, 0xf7, 0x10, 0x3b, + 0xff, 0xfd, 0xa, 0xff, 0xf8, 0x0, 0x0, 0xe, + 0xff, 0xf1, 0xbf, 0xff, 0x30, 0x0, 0x0, 0xaf, + 0xff, 0x2a, 0xff, 0xf3, 0x0, 0x0, 0x9, 0xff, + 0xf3, 0x8f, 0xff, 0x50, 0x0, 0x0, 0xbf, 0xff, + 0x24, 0xff, 0xfc, 0x0, 0x0, 0x3f, 0xff, 0xe0, + 0xe, 0xff, 0xfc, 0x76, 0x9f, 0xff, 0xf9, 0x0, + 0x5f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x10, 0x0, + 0x7f, 0xff, 0xff, 0xff, 0xfe, 0x30, 0x0, 0x0, + 0x39, 0xdf, 0xfe, 0xb7, 0x0, 0x0, + + /* U+0037 "7" */ + 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x7f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x7f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xf9, 0x49, 0x99, 0x99, + 0x99, 0x9b, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, + 0xa, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x2f, + 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, + 0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0x20, + 0x0, 0x0, 0x0, 0x7, 0xff, 0xfa, 0x0, 0x0, + 0x0, 0x0, 0xe, 0xff, 0xf3, 0x0, 0x0, 0x0, + 0x0, 0x5f, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, + 0xdf, 0xff, 0x50, 0x0, 0x0, 0x0, 0x4, 0xff, + 0xfe, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xf7, + 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0xf1, 0x0, + 0x0, 0x0, 0x0, 0x9f, 0xff, 0x90, 0x0, 0x0, + 0x0, 0x1, 0xff, 0xff, 0x20, 0x0, 0x0, 0x0, + 0x8, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x0, 0xe, + 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, + 0xd0, 0x0, 0x0, 0x0, + + /* U+0038 "8" */ + 0x0, 0x5, 0xad, 0xff, 0xec, 0x81, 0x0, 0x0, + 0xb, 0xff, 0xff, 0xff, 0xff, 0xf4, 0x0, 0x9, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0x0, 0xff, + 0xff, 0x95, 0x46, 0xdf, 0xff, 0x80, 0x3f, 0xff, + 0x90, 0x0, 0x1, 0xff, 0xfb, 0x3, 0xff, 0xf5, + 0x0, 0x0, 0xe, 0xff, 0xb0, 0x1f, 0xff, 0x90, + 0x0, 0x1, 0xff, 0xf8, 0x0, 0xaf, 0xff, 0x84, + 0x35, 0xdf, 0xff, 0x20, 0x0, 0xcf, 0xff, 0xff, + 0xff, 0xfe, 0x40, 0x0, 0x2, 0xef, 0xff, 0xff, + 0xff, 0x60, 0x0, 0x5, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xb0, 0x2, 0xff, 0xfe, 0x51, 0x2, 0xaf, + 0xff, 0x90, 0x9f, 0xff, 0x40, 0x0, 0x0, 0xcf, + 0xff, 0x1c, 0xff, 0xf0, 0x0, 0x0, 0x7, 0xff, + 0xf4, 0xdf, 0xff, 0x0, 0x0, 0x0, 0x7f, 0xff, + 0x5c, 0xff, 0xf5, 0x0, 0x0, 0xd, 0xff, 0xf3, + 0x8f, 0xff, 0xfa, 0x66, 0x7d, 0xff, 0xff, 0x1, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x3, + 0xef, 0xff, 0xff, 0xff, 0xff, 0x90, 0x0, 0x0, + 0x6b, 0xef, 0xfe, 0xc9, 0x30, 0x0, + + /* U+0039 "9" */ + 0x0, 0x3, 0x9d, 0xff, 0xeb, 0x50, 0x0, 0x0, + 0x8, 0xff, 0xff, 0xff, 0xff, 0xc1, 0x0, 0x8, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x1, 0xff, + 0xff, 0xc7, 0x69, 0xff, 0xff, 0x50, 0x6f, 0xff, + 0xb0, 0x0, 0x6, 0xff, 0xfb, 0xa, 0xff, 0xf3, + 0x0, 0x0, 0xe, 0xff, 0xe0, 0xbf, 0xff, 0x0, + 0x0, 0x0, 0xbf, 0xff, 0x1b, 0xff, 0xf1, 0x0, + 0x0, 0xb, 0xff, 0xf2, 0x9f, 0xff, 0x60, 0x0, + 0x1, 0xff, 0xff, 0x25, 0xff, 0xff, 0x72, 0x13, + 0xcf, 0xff, 0xf1, 0xd, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x0, 0x2e, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xe0, 0x0, 0x17, 0xcf, 0xfe, 0xa4, 0xff, + 0xfb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, + 0x70, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xf1, + 0x0, 0x0, 0x0, 0x2, 0x8f, 0xff, 0xfa, 0x0, + 0x0, 0xa, 0xbe, 0xff, 0xff, 0xfe, 0x10, 0x0, + 0x1, 0xff, 0xff, 0xff, 0xfe, 0x20, 0x0, 0x0, + 0x1f, 0xff, 0xff, 0xf9, 0x10, 0x0, 0x0, 0x1, + 0xfe, 0xda, 0x61, 0x0, 0x0, 0x0, + + /* U+003A ":" */ + 0x4e, 0xff, 0x80, 0xbf, 0xff, 0xf0, 0xcf, 0xff, + 0xf1, 0xcf, 0xff, 0xf1, 0x6f, 0xff, 0xb0, 0x1, + 0x22, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x21, + 0x0, 0x6f, 0xff, 0xb0, 0xcf, 0xff, 0xf1, 0xcf, + 0xff, 0xf1, 0xcf, 0xff, 0xf0, 0x4e, 0xff, 0x80, + + /* U+4E00 "一" */ + 0x6e, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, + 0xee, 0xee, 0xee, 0xee, 0xc7, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + + /* U+4E09 "三" */ + 0x0, 0x2b, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, + 0xbb, 0xbb, 0xbb, 0xb0, 0x0, 0x4, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x0, 0x0, 0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xc0, 0x0, 0x0, 0x0, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, + 0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xd0, 0x0, 0x0, 0x0, + 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, + 0x97, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x18, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, + 0x88, 0x88, 0x88, 0x88, 0x88, 0x82, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xfe, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe2, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + + /* U+4E8C "二" */ + 0x0, 0x6, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, + 0xcc, 0xcc, 0xcc, 0x30, 0x0, 0x0, 0x8f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf4, + 0x0, 0x0, 0x8, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x40, 0x0, 0x0, 0x8f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xfe, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xfe, 0x2c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, + 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xb0, + + /* U+4E94 "五" */ + 0x0, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xfa, 0x0, 0xe, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xa0, 0x0, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, 0x6, 0x77, + 0x77, 0x7c, 0xff, 0xf8, 0x77, 0x77, 0x77, 0x77, + 0x77, 0x50, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0xd, 0xff, 0xd0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, + 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x2f, 0xff, 0x80, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0x0, + 0x0, 0x6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x50, 0x0, 0x0, 0x6f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, + 0x0, 0x0, 0x3, 0x77, 0x77, 0xff, 0xfe, 0x77, + 0x77, 0x77, 0xaf, 0xff, 0x40, 0x0, 0x0, 0x0, + 0x0, 0xf, 0xff, 0xa0, 0x0, 0x0, 0x6, 0xff, + 0xf3, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf7, + 0x0, 0x0, 0x0, 0x7f, 0xff, 0x30, 0x0, 0x0, + 0x0, 0x0, 0x5f, 0xff, 0x40, 0x0, 0x0, 0x7, + 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x8, 0xff, + 0xf2, 0x0, 0x0, 0x0, 0x8f, 0xff, 0x20, 0x0, + 0x0, 0x0, 0x0, 0xbf, 0xff, 0x0, 0x0, 0x0, + 0x9, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0xd, + 0xff, 0xc0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x10, + 0x0, 0x0, 0x0, 0x1, 0xff, 0xfa, 0x0, 0x0, + 0x0, 0xa, 0xff, 0xf1, 0x0, 0x7, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x25, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, + + /* U+516D "六" */ + 0x0, 0x0, 0x0, 0x0, 0x0, 0x8b, 0xcd, 0x30, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0xbf, 0xff, 0x60, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, + 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0xb0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x3f, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0xf, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x80, 0xf, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, + 0x8, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, + 0x88, 0x88, 0x88, 0x88, 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, + 0x0, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0xd, 0xfa, 0x40, 0x0, 0x5, 0xef, + 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, + 0xff, 0xd0, 0x0, 0x4f, 0xff, 0xf2, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0xcf, 0xff, 0x60, 0x0, + 0xb, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x4, 0xff, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xff, + 0x60, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xf7, + 0x0, 0x0, 0x0, 0x6f, 0xff, 0xf1, 0x0, 0x0, + 0x0, 0x0, 0x6f, 0xff, 0xe0, 0x0, 0x0, 0x0, + 0xc, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x1, 0xef, + 0xff, 0x50, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff, + 0x50, 0x0, 0x0, 0xa, 0xff, 0xfc, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x9f, 0xff, 0xe0, 0x0, 0x0, + 0x4f, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x1e, 0xff, 0xf8, 0x0, 0x1, 0xef, 0xff, 0x90, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xff, + 0x20, 0xc, 0xff, 0xfe, 0x10, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0xdf, 0xff, 0xa0, 0x5f, 0xff, + 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x4f, 0xff, 0xe0, 0x5, 0xef, 0x90, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xf9, 0x0, + 0x0, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x3, 0x40, 0x0, + + /* U+56DB "四" */ + 0x17, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, + 0x77, 0x77, 0x77, 0x62, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x2f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x2f, 0xff, + 0x40, 0xe, 0xff, 0x70, 0x2f, 0xff, 0x20, 0x8, + 0xff, 0xe2, 0xff, 0xf4, 0x0, 0xef, 0xf7, 0x2, + 0xff, 0xf2, 0x0, 0x8f, 0xfe, 0x2f, 0xff, 0x40, + 0xe, 0xff, 0x60, 0x2f, 0xff, 0x20, 0x8, 0xff, + 0xe2, 0xff, 0xf4, 0x0, 0xff, 0xf6, 0x2, 0xff, + 0xf2, 0x0, 0x8f, 0xfe, 0x2f, 0xff, 0x40, 0xf, + 0xff, 0x60, 0x2f, 0xff, 0x20, 0x8, 0xff, 0xe2, + 0xff, 0xf4, 0x1, 0xff, 0xf4, 0x2, 0xff, 0xf2, + 0x0, 0x8f, 0xfe, 0x2f, 0xff, 0x40, 0x5f, 0xff, + 0x20, 0x2f, 0xff, 0x20, 0x8, 0xff, 0xe2, 0xff, + 0xf4, 0xc, 0xff, 0xe0, 0x2, 0xff, 0xf6, 0x0, + 0x8f, 0xfe, 0x2f, 0xff, 0x47, 0xff, 0xf8, 0x0, + 0x1f, 0xff, 0xff, 0xff, 0xff, 0xe2, 0xff, 0xfa, + 0xff, 0xfe, 0x10, 0x0, 0xef, 0xff, 0xff, 0xff, + 0xfe, 0x2f, 0xff, 0xff, 0xff, 0x40, 0x0, 0x5, + 0xff, 0xff, 0xff, 0xff, 0xe2, 0xff, 0xfb, 0xff, + 0x50, 0x0, 0x0, 0x1, 0x57, 0x77, 0xcf, 0xfe, + 0x2f, 0xff, 0x46, 0x40, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x8, 0xff, 0xe2, 0xff, 0xf4, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xfe, 0x2f, + 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x8, 0xff, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x2f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xfe, 0x17, 0x77, 0x77, + 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, + 0x60, + + /* U+65E5 "日" */ + 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xea, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xaf, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xfa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xef, 0xff, 0xaf, 0xff, + 0x20, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xfa, + 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdf, + 0xff, 0xaf, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, + 0xd, 0xff, 0xfa, 0xff, 0xf2, 0x0, 0x0, 0x0, + 0x0, 0x0, 0xdf, 0xff, 0xaf, 0xff, 0x20, 0x0, + 0x0, 0x0, 0x0, 0xd, 0xff, 0xfa, 0xff, 0xfa, + 0x99, 0x99, 0x99, 0x99, 0x99, 0xef, 0xff, 0xaf, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xfa, 0xff, 0xf2, 0x0, 0x0, + 0x0, 0x0, 0x0, 0xdf, 0xff, 0xaf, 0xff, 0x20, + 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xfa, 0xff, + 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdf, 0xff, + 0xaf, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0xd, + 0xff, 0xfa, 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, + 0x0, 0xdf, 0xff, 0xaf, 0xff, 0x20, 0x0, 0x0, + 0x0, 0x0, 0xd, 0xff, 0xfa, 0xff, 0xfa, 0x99, + 0x99, 0x99, 0x99, 0x99, 0xef, 0xff, 0xaf, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xf0, + + /* U+661F "星" */ + 0x0, 0x9, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, + 0xcc, 0xcc, 0xcc, 0x0, 0x0, 0x0, 0xcf, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + 0x0, 0x0, 0xc, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xcf, + 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, + 0xf0, 0x0, 0x0, 0xc, 0xff, 0xdb, 0xbb, 0xbb, + 0xbb, 0xbb, 0xbb, 0xcf, 0xff, 0x0, 0x0, 0x0, + 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xf0, 0x0, 0x0, 0xc, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, + 0x0, 0xcf, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x5, 0xff, 0xf0, 0x0, 0x0, 0xc, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, + 0x0, 0x0, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x9, 0xce, + 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, + 0x0, 0x0, 0x0, 0x9, 0xfd, 0x80, 0x0, 0xaa, + 0xa6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, + 0xff, 0xfb, 0x0, 0xe, 0xff, 0xa0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0xcf, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, + 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xf0, 0x0, 0x4f, 0xff, 0xec, 0xcc, + 0xcc, 0xff, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0x0, + 0x2f, 0xff, 0xf3, 0x0, 0x0, 0xe, 0xff, 0xa0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xfd, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, + 0x0, 0x0, 0xa7, 0x9f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x10, 0x0, 0x0, 0x6, + 0xaa, 0xaa, 0xaa, 0xff, 0xfe, 0xaa, 0xaa, 0xaa, + 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe, + 0xff, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xff, 0xff, 0xdd, 0xdd, + 0xdd, 0xdd, 0xd3, 0x1f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x41, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf4, + + /* U+6708 "月" */ + 0x0, 0x0, 0x36, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x62, 0x0, 0x0, 0x9f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0x0, 0x0, + 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xf5, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf5, 0x0, 0x0, 0x9f, 0xff, + 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xf5, 0x0, + 0x0, 0x9f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1, + 0xff, 0xf5, 0x0, 0x0, 0x9f, 0xff, 0x0, 0x0, + 0x0, 0x0, 0x1, 0xff, 0xf5, 0x0, 0x0, 0x9f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, + 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xf5, 0x0, 0x0, 0x9f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0x0, 0x0, + 0x9f, 0xff, 0x44, 0x44, 0x44, 0x44, 0x45, 0xff, + 0xf5, 0x0, 0x0, 0x9f, 0xff, 0x0, 0x0, 0x0, + 0x0, 0x1, 0xff, 0xf5, 0x0, 0x0, 0x9f, 0xfe, + 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xf5, 0x0, + 0x0, 0x9f, 0xff, 0x55, 0x55, 0x55, 0x55, 0x56, + 0xff, 0xf5, 0x0, 0x0, 0xaf, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xf5, 0x0, 0x0, 0xbf, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, + 0x0, 0x0, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xf5, 0x0, 0x0, 0xff, 0xf8, 0x0, + 0x0, 0x0, 0x0, 0x1, 0xff, 0xf5, 0x0, 0x5, + 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, + 0xf5, 0x0, 0xb, 0xff, 0xf0, 0x0, 0x0, 0x0, + 0x0, 0x1, 0xff, 0xf5, 0x0, 0x4f, 0xff, 0xa0, + 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf5, 0x1, + 0xef, 0xff, 0x40, 0x0, 0x0, 0x0, 0x16, 0x7c, + 0xff, 0xf5, 0xc, 0xff, 0xfb, 0x0, 0x0, 0x0, + 0x0, 0x2f, 0xff, 0xff, 0xf3, 0x2e, 0xff, 0xf2, + 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xff, 0xd0, + 0x1, 0xaf, 0x60, 0x0, 0x0, 0x0, 0x0, 0x7, + 0xfd, 0xb8, 0x10, 0x0, 0x3, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + + /* U+671F "期" */ + 0x0, 0x13, 0x21, 0x0, 0x3, 0x22, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xf9, 0x0, + 0xe, 0xff, 0x20, 0x68, 0x88, 0x88, 0x88, 0x87, + 0x0, 0x6f, 0xf9, 0x0, 0xe, 0xff, 0x20, 0xbf, + 0xff, 0xff, 0xff, 0xfd, 0xc, 0xef, 0xff, 0xdd, + 0xdf, 0xff, 0xe7, 0xbf, 0xff, 0xff, 0xff, 0xfd, + 0xe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xbf, + 0xff, 0xff, 0xff, 0xfd, 0xe, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xf8, 0xbf, 0xf5, 0x11, 0x2f, 0xfd, + 0x0, 0x6f, 0xfa, 0x0, 0xe, 0xff, 0x20, 0xbf, + 0xf4, 0x0, 0x1f, 0xfd, 0x0, 0x6f, 0xfa, 0x22, + 0x2e, 0xff, 0x20, 0xbf, 0xf4, 0x0, 0x1f, 0xfd, + 0x0, 0x6f, 0xff, 0xff, 0xff, 0xff, 0x20, 0xbf, + 0xf9, 0x66, 0x7f, 0xfd, 0x0, 0x6f, 0xff, 0xff, + 0xff, 0xff, 0x20, 0xbf, 0xff, 0xff, 0xff, 0xfd, + 0x0, 0x6f, 0xfe, 0xbb, 0xbf, 0xff, 0x20, 0xbf, + 0xff, 0xff, 0xff, 0xfd, 0x0, 0x6f, 0xf9, 0x0, + 0xe, 0xff, 0x20, 0xbf, 0xfa, 0x88, 0x9f, 0xfd, + 0x0, 0x6f, 0xff, 0xff, 0xff, 0xff, 0x20, 0xbf, + 0xf4, 0x0, 0x1f, 0xfd, 0x0, 0x6f, 0xff, 0xff, + 0xff, 0xff, 0x20, 0xbf, 0xf4, 0x0, 0x1f, 0xfd, + 0x0, 0x6f, 0xfe, 0xdd, 0xdf, 0xff, 0x20, 0xbf, + 0xf7, 0x44, 0x4f, 0xfd, 0x0, 0x6f, 0xf9, 0x0, + 0xe, 0xff, 0x20, 0xcf, 0xff, 0xff, 0xff, 0xfd, + 0xde, 0xef, 0xff, 0xee, 0xef, 0xff, 0xe6, 0xdf, + 0xff, 0xff, 0xff, 0xfd, 0xef, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xf6, 0xef, 0xfc, 0xcc, 0xcf, 0xfd, + 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xff, + 0xf0, 0x0, 0x1f, 0xfd, 0x0, 0x3, 0xfb, 0x10, + 0x8f, 0xc1, 0x4, 0xff, 0xd0, 0x0, 0x1f, 0xfd, + 0x0, 0x1d, 0xff, 0xa2, 0xff, 0xfc, 0x9, 0xff, + 0xa0, 0x0, 0x1f, 0xfd, 0x1, 0xcf, 0xff, 0x30, + 0x4f, 0xff, 0x7e, 0xff, 0x60, 0x0, 0x3f, 0xfd, + 0x1c, 0xff, 0xf6, 0x0, 0x5, 0xf9, 0x7f, 0xff, + 0x10, 0x69, 0xef, 0xfd, 0x9f, 0xff, 0x90, 0x0, + 0x0, 0x52, 0xff, 0xf8, 0x0, 0x7f, 0xff, 0xfa, + 0xb, 0xfa, 0x0, 0x0, 0x0, 0x5, 0xff, 0xe1, + 0x0, 0x2f, 0xff, 0xd2, 0x0, 0x70, 0x0, 0x0, + 0x0, 0x0, 0x19, 0x60, 0x0, 0x6, 0x63, 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 = 115, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 0, .adv_w = 264, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 150, .adv_w = 264, .box_w = 10, .box_h = 20, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 250, .adv_w = 264, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 400, .adv_w = 264, .box_w = 14, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 540, .adv_w = 264, .box_w = 16, .box_h = 20, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 700, .adv_w = 264, .box_w = 13, .box_h = 20, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 830, .adv_w = 264, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 980, .adv_w = 264, .box_w = 14, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1120, .adv_w = 264, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1270, .adv_w = 264, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1420, .adv_w = 181, .box_w = 6, .box_h = 16, .ofs_x = 3, .ofs_y = 0}, + {.bitmap_index = 1468, .adv_w = 441, .box_w = 25, .box_h = 5, .ofs_x = 1, .ofs_y = 8}, + {.bitmap_index = 1531, .adv_w = 441, .box_w = 25, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1819, .adv_w = 441, .box_w = 25, .box_h = 21, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 2082, .adv_w = 441, .box_w = 25, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 2370, .adv_w = 441, .box_w = 26, .box_h = 25, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 2695, .adv_w = 441, .box_w = 23, .box_h = 23, .ofs_x = 2, .ofs_y = -2}, + {.bitmap_index = 2960, .adv_w = 441, .box_w = 19, .box_h = 23, .ofs_x = 4, .ofs_y = -2}, + {.bitmap_index = 3179, .adv_w = 441, .box_w = 25, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 3479, .adv_w = 441, .box_w = 22, .box_h = 26, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 3765, .adv_w = 441, .box_w = 24, .box_h = 26, .ofs_x = 1, .ofs_y = -3} +}; + +/*--------------------- + * CHARACTER MAPPING + *--------------------*/ + +static const uint16_t unicode_list_0[] = { + 0x0, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, + 0x17, 0x18, 0x19, 0x1a, 0x4de0, 0x4de9, 0x4e6c, 0x4e74, + 0x514d, 0x56bb, 0x65c5, 0x65ff, 0x66e8, 0x66ff +}; + +/*Collect the unicode lists and glyph_id offsets*/ +static const lv_font_fmt_txt_cmap_t cmaps[] = +{ + { + .range_start = 32, .range_length = 26368, .glyph_id_start = 1, + .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 22, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + } +}; + +/*----------------- + * KERNING + *----------------*/ + + +/*Pair left and right glyphs for kerning*/ +static const uint8_t kern_pair_glyph_ids[] = +{ + 3, 12, + 9, 12, + 12, 3, + 12, 9 +}; + +/* Kerning between the respective left and right glyphs + * 4.4 format which needs to scaled with `kern_scale`*/ +static const int8_t kern_pair_values[] = +{ + -39, -34, -30, -22 +}; + +/*Collect the kern pair's data in one place*/ +static const lv_font_fmt_txt_kern_pair_t kern_pairs = +{ + .glyph_ids = kern_pair_glyph_ids, + .values = kern_pair_values, + .pair_cnt = 4, + .glyph_ids_size = 0 +}; + +/*-------------------- + * 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 = &kern_pairs, + .kern_scale = 16, + .cmap_num = 1, + .bpp = 4, + .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 lv_font_28_dial = { +#else +lv_font_t lv_font_28_dial = { +#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 = 27, /*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 +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 + .underline_position = -2, + .underline_thickness = 1, +#endif + .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ +}; + + + +#endif /*#if LV_FONT_28_DIAL*/ + diff --git a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_30_week.c b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_30_dial.c similarity index 55% rename from 2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_30_week.c rename to 2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_30_dial.c index 37520cd5..e0980d2f 100644 --- a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_30_week.c +++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font_30_dial.c @@ -10,11 +10,11 @@ #include "lvgl/lvgl.h" #endif -#ifndef LV_FONT_30_WEEK -#define LV_FONT_30_WEEK 1 +#ifndef LV_FONT_30_DIAL +#define LV_FONT_30_DIAL 1 #endif -#if LV_FONT_30_WEEK +#if LV_FONT_30_DIAL /*----------------- * BITMAPS @@ -22,6 +22,238 @@ /*Store the image of the glyphs*/ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + + /* U+0030 "0" */ + 0x0, 0x0, 0x6b, 0xef, 0xfd, 0xa4, 0x0, 0x0, + 0x0, 0x2d, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x0, + 0x0, 0xef, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x0, + 0x8, 0xff, 0xff, 0xfe, 0xef, 0xff, 0xff, 0x30, + 0xe, 0xff, 0xfd, 0x10, 0x4, 0xff, 0xff, 0x90, + 0x3f, 0xff, 0xf3, 0x0, 0x0, 0x8f, 0xff, 0xe0, + 0x7f, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff, 0xf1, + 0x9f, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xff, 0xf3, + 0xaf, 0xff, 0xa0, 0x0, 0x0, 0xf, 0xff, 0xf4, + 0xbf, 0xff, 0xa0, 0x0, 0x0, 0xe, 0xff, 0xf5, + 0xbf, 0xff, 0x90, 0x0, 0x0, 0xe, 0xff, 0xf5, + 0xbf, 0xff, 0xa0, 0x0, 0x0, 0xe, 0xff, 0xf5, + 0xaf, 0xff, 0xa0, 0x0, 0x0, 0xf, 0xff, 0xf4, + 0x9f, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xff, 0xf3, + 0x7f, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff, 0xf1, + 0x3f, 0xff, 0xf3, 0x0, 0x0, 0x8f, 0xff, 0xd0, + 0xe, 0xff, 0xfd, 0x20, 0x4, 0xff, 0xff, 0x80, + 0x8, 0xff, 0xff, 0xfe, 0xef, 0xff, 0xff, 0x20, + 0x0, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x0, + 0x0, 0x2d, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x0, + 0x0, 0x0, 0x6b, 0xef, 0xfd, 0xa4, 0x0, 0x0, + + /* U+0031 "1" */ + 0x0, 0x14, 0x7a, 0xdf, 0xff, 0x61, 0xdf, 0xff, + 0xff, 0xff, 0xf6, 0x2f, 0xff, 0xff, 0xff, 0xff, + 0x62, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x1d, 0xa7, + 0x41, 0xff, 0xff, 0x60, 0x0, 0x0, 0xf, 0xff, + 0xf6, 0x0, 0x0, 0x0, 0xff, 0xff, 0x60, 0x0, + 0x0, 0xf, 0xff, 0xf6, 0x0, 0x0, 0x0, 0xff, + 0xff, 0x60, 0x0, 0x0, 0xf, 0xff, 0xf6, 0x0, + 0x0, 0x0, 0xff, 0xff, 0x60, 0x0, 0x0, 0xf, + 0xff, 0xf6, 0x0, 0x0, 0x0, 0xff, 0xff, 0x60, + 0x0, 0x0, 0xf, 0xff, 0xf6, 0x0, 0x0, 0x0, + 0xff, 0xff, 0x60, 0x0, 0x0, 0xf, 0xff, 0xf6, + 0x0, 0x0, 0x0, 0xff, 0xff, 0x60, 0x0, 0x0, + 0xf, 0xff, 0xf6, 0x0, 0x0, 0x0, 0xff, 0xff, + 0x60, 0x0, 0x0, 0xf, 0xff, 0xf6, 0x0, 0x0, + 0x0, 0xff, 0xff, 0x60, + + /* U+0032 "2" */ + 0x0, 0x69, 0xce, 0xff, 0xec, 0x93, 0x0, 0x0, + 0x3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x0, + 0x3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, + 0x3, 0xff, 0xec, 0xbd, 0xff, 0xff, 0xff, 0x20, + 0x1, 0x51, 0x0, 0x0, 0x1a, 0xff, 0xff, 0x70, + 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0x80, + 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xff, 0x80, + 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x70, + 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0x30, + 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0xfc, 0x0, + 0x0, 0x0, 0x0, 0x1, 0xdf, 0xff, 0xf3, 0x0, + 0x0, 0x0, 0x0, 0x1d, 0xff, 0xff, 0x60, 0x0, + 0x0, 0x0, 0x2, 0xdf, 0xff, 0xf7, 0x0, 0x0, + 0x0, 0x0, 0x3e, 0xff, 0xff, 0x70, 0x0, 0x0, + 0x0, 0x6, 0xff, 0xff, 0xf5, 0x0, 0x0, 0x0, + 0x0, 0x9f, 0xff, 0xfe, 0x30, 0x0, 0x0, 0x0, + 0x1c, 0xff, 0xff, 0xb1, 0x0, 0x0, 0x0, 0x0, + 0x7f, 0xff, 0xff, 0xdd, 0xdd, 0xdd, 0xdd, 0xd1, + 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, + 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, + 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, + + /* U+0033 "3" */ + 0x18, 0xbd, 0xef, 0xfe, 0xb7, 0x10, 0x0, 0x3f, + 0xff, 0xff, 0xff, 0xff, 0xf6, 0x0, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x40, 0x3f, 0xdc, 0xab, + 0xcf, 0xff, 0xff, 0xb0, 0x0, 0x0, 0x0, 0x1, + 0xcf, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x6f, + 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, + 0xd0, 0x0, 0x0, 0x1, 0x49, 0xff, 0xff, 0x60, + 0x0, 0xbf, 0xff, 0xff, 0xff, 0xf8, 0x0, 0x0, + 0xbf, 0xff, 0xff, 0xfe, 0x20, 0x0, 0x0, 0xbf, + 0xff, 0xff, 0xff, 0xf8, 0x0, 0x0, 0x47, 0x78, + 0xaf, 0xff, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, + 0xaf, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x1f, + 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, + 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xf7, + 0x20, 0x0, 0x0, 0x4, 0xef, 0xff, 0xf4, 0xff, + 0xdc, 0xbc, 0xef, 0xff, 0xff, 0xe0, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x50, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xe5, 0x0, 0xac, 0xef, 0xff, 0xec, + 0x95, 0x0, 0x0, + + /* U+0034 "4" */ + 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0x30, + 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xff, 0xf3, + 0x0, 0x0, 0x0, 0x0, 0x8, 0xff, 0xff, 0xff, + 0x30, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff, + 0xf3, 0x0, 0x0, 0x0, 0x0, 0xdf, 0xfe, 0xff, + 0xff, 0x30, 0x0, 0x0, 0x0, 0x8f, 0xff, 0x4f, + 0xff, 0xf3, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xa0, + 0xff, 0xff, 0x30, 0x0, 0x0, 0xd, 0xff, 0xe1, + 0xf, 0xff, 0xf3, 0x0, 0x0, 0x9, 0xff, 0xf5, + 0x0, 0xff, 0xff, 0x30, 0x0, 0x4, 0xff, 0xfb, + 0x0, 0xf, 0xff, 0xf3, 0x0, 0x0, 0xdf, 0xff, + 0x10, 0x0, 0xff, 0xff, 0x30, 0x0, 0x9f, 0xff, + 0x60, 0x0, 0xf, 0xff, 0xf3, 0x0, 0x2f, 0xff, + 0xc0, 0x0, 0x0, 0xff, 0xff, 0x30, 0x3, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x3f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x83, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, + 0x2c, 0xcc, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0xdc, + 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xf3, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, + 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, + 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, + 0xff, 0x30, 0x0, + + /* U+0035 "5" */ + 0x3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x90, 0x5, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x90, 0x7, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x90, 0xa, 0xff, 0xfd, + 0xcc, 0xcc, 0xcc, 0x70, 0xc, 0xff, 0xf2, 0x0, + 0x0, 0x0, 0x0, 0xe, 0xff, 0xf0, 0x0, 0x0, + 0x0, 0x0, 0xf, 0xff, 0xc0, 0x0, 0x0, 0x0, + 0x0, 0x2f, 0xff, 0xfe, 0xff, 0xea, 0x50, 0x0, + 0x4f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x10, 0x7f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x7b, 0x87, + 0x66, 0x8c, 0xff, 0xff, 0xf5, 0x0, 0x0, 0x0, + 0x0, 0x6f, 0xff, 0xfa, 0x0, 0x0, 0x0, 0x0, + 0xd, 0xff, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xa, + 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, + 0xfd, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xfb, + 0x10, 0x0, 0x0, 0x4, 0xcf, 0xff, 0xf6, 0x8f, + 0xdc, 0xcd, 0xef, 0xff, 0xff, 0xe1, 0x8f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x40, 0x8f, 0xff, 0xff, + 0xff, 0xff, 0xd4, 0x0, 0x5b, 0xef, 0xff, 0xec, + 0x94, 0x0, 0x0, + + /* U+0036 "6" */ + 0x0, 0x0, 0x0, 0x3, 0x7b, 0xde, 0x70, 0x0, + 0x0, 0x0, 0x4, 0xcf, 0xff, 0xff, 0x70, 0x0, + 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0x70, 0x0, + 0x0, 0xb, 0xff, 0xff, 0xff, 0xfe, 0x60, 0x0, + 0x0, 0x7f, 0xff, 0xfc, 0x62, 0x0, 0x0, 0x0, + 0x1, 0xff, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, + 0x8, 0xff, 0xf6, 0x2, 0x44, 0x20, 0x0, 0x0, + 0xe, 0xff, 0xf6, 0xdf, 0xff, 0xfe, 0x60, 0x0, + 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, + 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x60, + 0x7f, 0xff, 0xfd, 0x40, 0x15, 0xef, 0xff, 0xd0, + 0x8f, 0xff, 0xe1, 0x0, 0x0, 0x4f, 0xff, 0xf1, + 0x9f, 0xff, 0xa0, 0x0, 0x0, 0xe, 0xff, 0xf3, + 0x9f, 0xff, 0x80, 0x0, 0x0, 0xc, 0xff, 0xf4, + 0x8f, 0xff, 0xa0, 0x0, 0x0, 0xd, 0xff, 0xf3, + 0x5f, 0xff, 0xd0, 0x0, 0x0, 0x1f, 0xff, 0xf2, + 0x1f, 0xff, 0xf7, 0x0, 0x0, 0xbf, 0xff, 0xe0, + 0xb, 0xff, 0xff, 0xc8, 0xae, 0xff, 0xff, 0x80, + 0x2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x0, + 0x0, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xc1, 0x0, + 0x0, 0x0, 0x7b, 0xef, 0xfd, 0xa5, 0x0, 0x0, + + /* U+0037 "7" */ + 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa5, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x5f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa4, 0xcc, + 0xcc, 0xcc, 0xcc, 0xce, 0xff, 0xfa, 0x0, 0x0, + 0x0, 0x0, 0x0, 0xcf, 0xff, 0x90, 0x0, 0x0, + 0x0, 0x0, 0x4f, 0xff, 0xf2, 0x0, 0x0, 0x0, + 0x0, 0xb, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x0, + 0x3, 0xff, 0xff, 0x30, 0x0, 0x0, 0x0, 0x0, + 0xaf, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x2f, + 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, + 0xfe, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xff, + 0x70, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xf0, + 0x0, 0x0, 0x0, 0x0, 0xe, 0xff, 0xf8, 0x0, + 0x0, 0x0, 0x0, 0x6, 0xff, 0xff, 0x10, 0x0, + 0x0, 0x0, 0x0, 0xdf, 0xff, 0xa0, 0x0, 0x0, + 0x0, 0x0, 0x5f, 0xff, 0xf2, 0x0, 0x0, 0x0, + 0x0, 0xc, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x0, + 0x4, 0xff, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, + 0xbf, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x2f, + 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, + + /* U+0038 "8" */ + 0x0, 0x2, 0x8c, 0xef, 0xfe, 0xb7, 0x10, 0x0, + 0x0, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xe4, 0x0, + 0x6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, + 0xd, 0xff, 0xff, 0x97, 0x8b, 0xff, 0xff, 0x80, + 0x1f, 0xff, 0xf2, 0x0, 0x0, 0x6f, 0xff, 0xb0, + 0x1f, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xff, 0xc0, + 0xf, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff, 0xa0, + 0x9, 0xff, 0xfa, 0x20, 0x14, 0xdf, 0xff, 0x40, + 0x1, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x0, + 0x0, 0xb, 0xff, 0xff, 0xff, 0xff, 0x30, 0x0, + 0x0, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xe5, 0x0, + 0xc, 0xff, 0xff, 0x96, 0x7a, 0xff, 0xff, 0x60, + 0x4f, 0xff, 0xe1, 0x0, 0x0, 0x4f, 0xff, 0xe0, + 0x9f, 0xff, 0x70, 0x0, 0x0, 0xc, 0xff, 0xf4, + 0xbf, 0xff, 0x40, 0x0, 0x0, 0x9, 0xff, 0xf6, + 0xbf, 0xff, 0x60, 0x0, 0x0, 0xb, 0xff, 0xf6, + 0x9f, 0xff, 0xe1, 0x0, 0x0, 0x5f, 0xff, 0xf4, + 0x4f, 0xff, 0xff, 0xb9, 0xac, 0xff, 0xff, 0xf0, + 0xc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x60, + 0x0, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x0, + 0x0, 0x3, 0x9c, 0xef, 0xfe, 0xb7, 0x10, 0x0, + + /* U+0039 "9" */ + 0x0, 0x1, 0x7c, 0xef, 0xfd, 0x93, 0x0, 0x0, + 0x0, 0x5f, 0xff, 0xff, 0xff, 0xff, 0x90, 0x0, + 0x4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, + 0xe, 0xff, 0xff, 0xc9, 0xae, 0xff, 0xff, 0x40, + 0x4f, 0xff, 0xf5, 0x0, 0x0, 0xbf, 0xff, 0xa0, + 0x8f, 0xff, 0xa0, 0x0, 0x0, 0x2f, 0xff, 0xe0, + 0x9f, 0xff, 0x60, 0x0, 0x0, 0xe, 0xff, 0xf2, + 0x9f, 0xff, 0x70, 0x0, 0x0, 0xe, 0xff, 0xf3, + 0x8f, 0xff, 0xb0, 0x0, 0x0, 0x3f, 0xff, 0xf4, + 0x4f, 0xff, 0xfa, 0x20, 0x4, 0xdf, 0xff, 0xf3, + 0xd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, + 0x2, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, + 0x0, 0x19, 0xef, 0xff, 0xfc, 0x7f, 0xff, 0xe0, + 0x0, 0x0, 0x2, 0x33, 0x10, 0x7f, 0xff, 0xb0, + 0x0, 0x0, 0x0, 0x0, 0x1, 0xef, 0xff, 0x60, + 0x0, 0x0, 0x0, 0x0, 0x2d, 0xff, 0xff, 0x0, + 0x0, 0x0, 0x1, 0x4a, 0xff, 0xff, 0xf7, 0x0, + 0x0, 0xb, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x0, + 0x0, 0xc, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, + 0x0, 0xc, 0xff, 0xff, 0xfd, 0x60, 0x0, 0x0, + 0x0, 0xc, 0xfe, 0xc9, 0x40, 0x0, 0x0, 0x0, + + /* U+003A ":" */ + 0x2c, 0xff, 0xd3, 0x8f, 0xff, 0xf9, 0x9f, 0xff, + 0xfb, 0x8f, 0xff, 0xfa, 0x5f, 0xff, 0xf7, 0x4, + 0x77, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x4, 0x77, 0x50, 0x6f, 0xff, 0xf7, 0x8f, + 0xff, 0xfa, 0x9f, 0xff, 0xfb, 0x7f, 0xff, 0xf9, + 0x1c, 0xff, 0xd2, + /* U+4E00 "一" */ 0x2e, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xd2, 0xff, 0xff, @@ -340,6 +572,50 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, + /* U+6708 "月" */ + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xd8, 0x88, 0x88, 0x88, + 0x88, 0x8d, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, + 0xa0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xa0, 0x0, 0x0, 0x0, + 0x0, 0xa, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, + 0xa0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, + 0xd7, 0x77, 0x77, 0x77, 0x77, 0x7c, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xa0, 0x0, 0x0, 0x0, + 0x0, 0xa, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, + 0xa0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf0, + 0x0, 0x0, 0x1f, 0xff, 0xa0, 0x0, 0x0, 0x0, + 0x0, 0xa, 0xff, 0xf0, 0x0, 0x0, 0x2f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x5f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, + 0x0, 0x0, 0x7f, 0xff, 0xa8, 0x88, 0x88, 0x88, + 0x88, 0x8d, 0xff, 0xf0, 0x0, 0x0, 0xbf, 0xff, + 0x20, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf0, + 0x0, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, + 0x0, 0xa, 0xff, 0xf0, 0x0, 0x7, 0xff, 0xf9, + 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf0, + 0x0, 0x1f, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, + 0x0, 0xc, 0xff, 0xf0, 0x0, 0xbf, 0xff, 0xc0, + 0x0, 0x0, 0x0, 0x1, 0x79, 0xbf, 0xff, 0xf0, + 0x8, 0xff, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, + 0xef, 0xff, 0xff, 0xe0, 0xc, 0xff, 0xfa, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0xff, 0x90, + 0x0, 0x7f, 0xe1, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x2f, 0xfe, 0xb6, 0x0, 0x0, 0x2, 0x30, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, + /* U+671F "期" */ 0x0, 0x19, 0x87, 0x0, 0x2, 0x98, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, @@ -396,15 +672,28 @@ 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 = 472, .box_w = 27, .box_h = 5, .ofs_x = 1, .ofs_y = 9}, - {.bitmap_index = 68, .adv_w = 472, .box_w = 27, .box_h = 25, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 406, .adv_w = 472, .box_w = 27, .box_h = 23, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 717, .adv_w = 472, .box_w = 27, .box_h = 25, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 1055, .adv_w = 472, .box_w = 28, .box_h = 28, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 1447, .adv_w = 472, .box_w = 24, .box_h = 25, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 1747, .adv_w = 472, .box_w = 21, .box_h = 26, .ofs_x = 4, .ofs_y = -3}, - {.bitmap_index = 2020, .adv_w = 472, .box_w = 27, .box_h = 27, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 2385, .adv_w = 472, .box_w = 26, .box_h = 28, .ofs_x = 1, .ofs_y = -4} + {.bitmap_index = 0, .adv_w = 123, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 0, .adv_w = 283, .box_w = 16, .box_h = 21, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 168, .adv_w = 283, .box_w = 11, .box_h = 21, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 284, .adv_w = 283, .box_w = 16, .box_h = 21, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 452, .adv_w = 283, .box_w = 14, .box_h = 21, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 599, .adv_w = 283, .box_w = 17, .box_h = 21, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 778, .adv_w = 283, .box_w = 14, .box_h = 21, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 925, .adv_w = 283, .box_w = 16, .box_h = 21, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1093, .adv_w = 283, .box_w = 15, .box_h = 21, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1251, .adv_w = 283, .box_w = 16, .box_h = 21, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1419, .adv_w = 283, .box_w = 16, .box_h = 21, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 1587, .adv_w = 194, .box_w = 6, .box_h = 17, .ofs_x = 3, .ofs_y = 0}, + {.bitmap_index = 1638, .adv_w = 472, .box_w = 27, .box_h = 5, .ofs_x = 1, .ofs_y = 9}, + {.bitmap_index = 1706, .adv_w = 472, .box_w = 27, .box_h = 25, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 2044, .adv_w = 472, .box_w = 27, .box_h = 23, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 2355, .adv_w = 472, .box_w = 27, .box_h = 25, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 2693, .adv_w = 472, .box_w = 28, .box_h = 28, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 3085, .adv_w = 472, .box_w = 24, .box_h = 25, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 3385, .adv_w = 472, .box_w = 21, .box_h = 26, .ofs_x = 4, .ofs_y = -3}, + {.bitmap_index = 3658, .adv_w = 472, .box_w = 27, .box_h = 27, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 4023, .adv_w = 472, .box_w = 24, .box_h = 28, .ofs_x = 1, .ofs_y = -4}, + {.bitmap_index = 4359, .adv_w = 472, .box_w = 26, .box_h = 28, .ofs_x = 1, .ofs_y = -4} }; /*--------------------- @@ -412,20 +701,49 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { *--------------------*/ static const uint16_t unicode_list_0[] = { - 0x0, 0x9, 0x8c, 0x94, 0x36d, 0x8db, 0x17e5, 0x181f, - 0x191f + 0x0, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, + 0x17, 0x18, 0x19, 0x1a, 0x4de0, 0x4de9, 0x4e6c, 0x4e74, + 0x514d, 0x56bb, 0x65c5, 0x65ff, 0x66e8, 0x66ff }; /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { - .range_start = 19968, .range_length = 6432, .glyph_id_start = 1, - .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 9, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + .range_start = 32, .range_length = 26368, .glyph_id_start = 1, + .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 22, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY } }; +/*----------------- + * KERNING + *----------------*/ + + +/*Pair left and right glyphs for kerning*/ +static const uint8_t kern_pair_glyph_ids[] = +{ + 3, 12, + 9, 12, + 12, 3, + 12, 9 +}; + +/* Kerning between the respective left and right glyphs + * 4.4 format which needs to scaled with `kern_scale`*/ +static const int8_t kern_pair_values[] = +{ + -42, -37, -33, -23 +}; +/*Collect the kern pair's data in one place*/ +static const lv_font_fmt_txt_kern_pair_t kern_pairs = +{ + .glyph_ids = kern_pair_glyph_ids, + .values = kern_pair_values, + .pair_cnt = 4, + .glyph_ids_size = 0 +}; /*-------------------- * ALL CUSTOM DATA @@ -441,8 +759,8 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .glyph_bitmap = glyph_bitmap, .glyph_dsc = glyph_dsc, .cmaps = cmaps, - .kern_dsc = NULL, - .kern_scale = 0, + .kern_dsc = &kern_pairs, + .kern_scale = 16, .cmap_num = 1, .bpp = 4, .kern_classes = 0, @@ -459,9 +777,9 @@ static lv_font_fmt_txt_dsc_t font_dsc = { /*Initialize a public general font descriptor*/ #if LV_VERSION_CHECK(8, 0, 0) -const lv_font_t lv_font_30_week = { +const lv_font_t lv_font_28_dial = { #else -lv_font_t lv_font_30_week = { +lv_font_t lv_font_28_dial = { #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*/ @@ -479,5 +797,5 @@ lv_font_t lv_font_30_week = { -#endif /*#if LV_FONT_30_WEEK*/ +#endif /*#if LV_FONT_30_DIAL*/ diff --git a/2.sdk/Helios_SDK/services/microPython/microPython.mk b/2.sdk/Helios_SDK/services/microPython/microPython.mk index 7e1b22d7..44f367bf 100644 --- a/2.sdk/Helios_SDK/services/microPython/microPython.mk +++ b/2.sdk/Helios_SDK/services/microPython/microPython.mk @@ -489,7 +489,7 @@ lib/lvgl/src/font/lv_font_14_simsum.c \ lib/lvgl/src/font/lv_font_16_simsum.c \ lib/lvgl/src/font/lv_font_18_simsum.c \ lib/lvgl/src/font/lv_font_70_bold.c \ -lib/lvgl/src/font/lv_font_30_week.c \ +lib/lvgl/src/font/lv_font_28_dial.c \ lib/lvgl/src/font/lv_font_60_main_menu.c \ lib/lvgl/src/hal/lv_hal_disp.c \ lib/lvgl/src/hal/lv_hal_indev.c \ diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c index 97f940b2..4efe679d 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c @@ -26693,9 +26693,9 @@ STATIC const mp_lv_struct_t mp_lv_font_70_bold = { { &mp_lv_font_t_type }, (lv_font_t*)&lv_font_70_bold }; -STATIC const mp_lv_struct_t mp_lv_font_30_week = { +STATIC const mp_lv_struct_t mp_lv_font_28_dial = { { &mp_lv_font_t_type }, -(lv_font_t*)&lv_font_30_week +(lv_font_t*)&lv_font_28_dial }; STATIC const mp_lv_struct_t mp_lv_font_60_main_menu = { { &mp_lv_font_t_type }, @@ -32490,7 +32490,7 @@ STATIC MP_DEFINE_CONST_LV_FUN_OBJ_VAR(mp_lv_gif_set_src_obj, 2, mp_lv_gif_set_sr STATIC const mp_rom_map_elem_t lvgl_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_font_70_bold), MP_ROM_PTR(&mp_lv_font_70_bold) }, - { MP_ROM_QSTR(MP_QSTR_font_30_week), MP_ROM_PTR(&mp_lv_font_30_week) }, + { MP_ROM_QSTR(MP_QSTR_font_28_dial), MP_ROM_PTR(&mp_lv_font_28_dial) }, { MP_ROM_QSTR(MP_QSTR_font_60_main_menu), MP_ROM_PTR(&mp_lv_font_60_main_menu) }, { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_lvgl) }, { MP_ROM_QSTR(MP_QSTR___qpy_module_deinit__), MP_ROM_PTR(&qpy_module_lvgl_deinit_obj) }, diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/animimg.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/animimg.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/arc.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/arc.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/calendar.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/calendar.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/chart.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/chart.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/colorwheel.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/colorwheel.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/gif/decode.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/gif/decode.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/led.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/led.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/meter.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/meter.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/spinbox.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/spinbox.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/spinner.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/spinner.h deleted file mode 100644 index e69de29b..00000000 diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/tabview.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/include/config/lvgl/tabview.h deleted file mode 100644 index e69de29b..00000000