Compare commits

...

2 Commits

9 changed files with 313 additions and 157 deletions

View File

@ -34,6 +34,17 @@ static char chip_path[48] = {0};
static void key_event_handler(lv_event_t *e); static void key_event_handler(lv_event_t *e);
static void user_event_handler(lv_event_t *e)
{
lv_event_code_t code = lv_event_get_code(e);
if(code == LV_EVENT_CUSTOM_UPDATE) {
uint32_t key = (uint32_t)lv_event_get_param(e);
printf("LV_EVENT_CUSTOM_UPDATE 事件: key=%ld\n", key);
lv_label_set_text_fmt(guider_ui.screen_label_1, "电量:%ld%%",key);
}
}
static void file_btn_event_handler(lv_event_t *e) { static void file_btn_event_handler(lv_event_t *e) {
lv_obj_t *btn = lv_event_get_target(e); // 获取被点击的按钮 lv_obj_t *btn = lv_event_get_target(e); // 获取被点击的按钮
const char *btn_text = lv_list_get_btn_text(guider_ui.screen_imglist_list_1,btn); // 获取按钮上的文本 const char *btn_text = lv_list_get_btn_text(guider_ui.screen_imglist_list_1,btn); // 获取按钮上的文本
@ -52,7 +63,7 @@ static void file_btn_event_handler(lv_event_t *e) {
lv_label_set_text(guider_ui.sscreen_burn_label_1, guider_ui.user_obj.burn_title); lv_label_set_text(guider_ui.sscreen_burn_label_1, guider_ui.user_obj.burn_title);
lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_1, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_1, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_2, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_2, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_2, key_event_handler, LV_EVENT_CUSTOM_UPDATE, NULL); lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_2, user_event_handler, LV_EVENT_CUSTOM_UPDATE, NULL);
} }
@ -93,9 +104,6 @@ static void key_event_handler(lv_event_t *e)
} }
} }
} else if(code == LV_EVENT_CUSTOM_UPDATE) {
uint32_t key = (uint32_t)lv_event_get_param(e);
printf("LV_EVENT_CUSTOM_UPDATE 事件: key=%ld\n", key);
} }
} }
@ -152,6 +160,8 @@ void events_init_screen (lv_ui *ui)
{ {
lv_obj_add_event_cb(ui->screen_btn_1, screen_btn_1_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_btn_1, screen_btn_1_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_3, screen_btn_3_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_btn_3, screen_btn_3_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_label_1, user_event_handler, LV_EVENT_CUSTOM_UPDATE, NULL);
} }
static void sscreen_burn_btn_1_event_handler (lv_event_t *e)//执行烧录 static void sscreen_burn_btn_1_event_handler (lv_event_t *e)//执行烧录

View File

@ -37,6 +37,7 @@ typedef struct
lv_obj_t *screen_btn_2_label; lv_obj_t *screen_btn_2_label;
lv_obj_t *screen_btn_3; lv_obj_t *screen_btn_3;
lv_obj_t *screen_btn_3_label; lv_obj_t *screen_btn_3_label;
lv_obj_t *screen_label_1;
lv_obj_t *sscreen_burn; lv_obj_t *sscreen_burn;
bool sscreen_burn_del; bool sscreen_burn_del;
lv_obj_t *sscreen_burn_cont_1; lv_obj_t *sscreen_burn_cont_1;

View File

@ -610,6 +610,16 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xb, 0x0, 0xa5, 0x0, 0x0, 0xb, 0x0, 0x0, 0xb, 0x0, 0xa5, 0x0, 0x0, 0xb, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+7535 "电" */
0x0, 0x0, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xc,
0x0, 0x0, 0x0, 0x7b, 0xbb, 0xeb, 0xbb, 0xa0,
0xa, 0x20, 0xc, 0x0, 0xc, 0x0, 0xa2, 0x0,
0xc0, 0x0, 0xc0, 0xa, 0xcb, 0xbe, 0xbb, 0xbd,
0x0, 0xa2, 0x0, 0xc0, 0x0, 0xc0, 0xa, 0xcb,
0xbe, 0xbb, 0xbd, 0x0, 0x0, 0x0, 0xc0, 0x0,
0x3, 0x40, 0x0, 0xc, 0x0, 0x0, 0x65, 0x0,
0x0, 0x5b, 0xbb, 0xba, 0x0,
/* U+82AF "芯" */ /* U+82AF "芯" */
0x0, 0x1, 0xa0, 0x5, 0x60, 0x0, 0x0, 0x1, 0x0, 0x1, 0xa0, 0x5, 0x60, 0x0, 0x0, 0x1,
0xa0, 0x5, 0x70, 0x0, 0xb, 0xbb, 0xeb, 0xbc, 0xa0, 0x5, 0x70, 0x0, 0xb, 0xbb, 0xeb, 0xbc,
@ -632,6 +642,16 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x56, 0x0, 0x0, 0x1c, 0x0, 0x9, 0x0, 0x0, 0x56, 0x0, 0x0, 0x1c, 0x0, 0x9,
0xe3, 0x0, 0xe3, 0x0,
/* U+91CF "量" */
0x0, 0xaa, 0x99, 0x99, 0xaa, 0x0, 0x0, 0xa9,
0x99, 0x99, 0x9a, 0x0, 0x0, 0x9a, 0x99, 0x99,
0xa9, 0x0, 0x19, 0x99, 0x99, 0x99, 0x99, 0x91,
0x0, 0x58, 0x88, 0x88, 0x86, 0x0, 0x0, 0x9a,
0x8b, 0xb8, 0x9a, 0x0, 0x0, 0x97, 0x48, 0x94,
0x5a, 0x0, 0x0, 0x36, 0x6a, 0xa6, 0x64, 0x0,
0x0, 0x9a, 0xac, 0xca, 0xaa, 0x0, 0x9, 0x99,
0x9c, 0xc9, 0x99, 0x90,
/* U+F001 "" */ /* U+F001 "" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0x0, 0x0,
0x0, 0x3, 0x7c, 0xff, 0x0, 0x0, 0x59, 0xef, 0x0, 0x3, 0x7c, 0xff, 0x0, 0x0, 0x59, 0xef,
@ -1370,68 +1390,70 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 2347, .adv_w = 192, .box_w = 12, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2347, .adv_w = 192, .box_w = 12, .box_h = 12, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2419, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2419, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2497, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 2497, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 2557, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2557, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 2623, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2618, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2689, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2684, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2767, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2750, .adv_w = 192, .box_w = 12, .box_h = 10, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2821, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2810, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2887, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2888, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2941, .adv_w = 132, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2942, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2982, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3008, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3060, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3062, .adv_w = 132, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3138, .adv_w = 216, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3103, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3215, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3181, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3293, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 3259, .adv_w = 216, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3356, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3336, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3434, .adv_w = 96, .box_w = 6, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3414, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3464, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3477, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3509, .adv_w = 216, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3555, .adv_w = 96, .box_w = 6, .box_h = 10, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3600, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 3585, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3654, .adv_w = 132, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3630, .adv_w = 216, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3713, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3721, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3761, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3775, .adv_w = 132, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3833, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3834, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 3894, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3882, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3955, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3954, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4003, .adv_w = 168, .box_w = 12, .box_h = 11, .ofs_x = -1, .ofs_y = -1}, {.bitmap_index = 4015, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4069, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4076, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 4108, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4124, .adv_w = 168, .box_w = 12, .box_h = 11, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 4147, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4190, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4208, .adv_w = 168, .box_w = 11, .box_h = 3, .ofs_x = 0, .ofs_y = 3}, {.bitmap_index = 4229, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4225, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4268, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4288, .adv_w = 240, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4329, .adv_w = 168, .box_w = 11, .box_h = 3, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 4392, .adv_w = 216, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 4346, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4490, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4409, .adv_w = 240, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4556, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 4513, .adv_w = 216, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4595, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 4611, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4634, .adv_w = 240, .box_w = 16, .box_h = 10, .ofs_x = -1, .ofs_y = 0}, {.bitmap_index = 4677, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 4714, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4716, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 4768, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4755, .adv_w = 240, .box_w = 16, .box_h = 10, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 4846, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 4835, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4931, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4889, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4992, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4967, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 5064, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5052, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5125, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5113, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5186, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5185, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5240, .adv_w = 120, .box_w = 9, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 5246, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5299, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5307, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5371, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5361, .adv_w = 120, .box_w = 9, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 5443, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5420, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5506, .adv_w = 192, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 5492, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5597, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5564, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5656, .adv_w = 240, .box_w = 15, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5627, .adv_w = 192, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 5746, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5718, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5814, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5777, .adv_w = 240, .box_w = 15, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5882, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5867, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5950, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5935, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6018, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6003, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6086, .adv_w = 240, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6071, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6174, .adv_w = 168, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6139, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6239, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6207, .adv_w = 240, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6311, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 6295, .adv_w = 168, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6396, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6360, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6464, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6432, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6523, .adv_w = 193, .box_w = 13, .box_h = 9, .ofs_x = 0, .ofs_y = 0} {.bitmap_index = 6517, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6585, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6644, .adv_w = 193, .box_w = 13, .box_h = 9, .ofs_x = 0, .ofs_y = 0}
}; };
/*--------------------- /*---------------------
@ -1440,14 +1462,14 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
static const uint16_t unicode_list_2[] = { static const uint16_t unicode_list_2[] = {
0x0, 0xbab, 0xf74, 0x108e, 0x122f, 0x1286, 0x2106, 0x2266, 0x0, 0xbab, 0xf74, 0x108e, 0x122f, 0x1286, 0x2106, 0x2266,
0x32ce, 0x386b, 0xa020, 0xa027, 0xa02a, 0xa02b, 0xa02c, 0xa030, 0x2554, 0x32ce, 0x386b, 0x41ee, 0xa020, 0xa027, 0xa02a, 0xa02b,
0xa032, 0xa034, 0xa038, 0xa03b, 0xa040, 0xa045, 0xa046, 0xa047, 0xa02c, 0xa030, 0xa032, 0xa034, 0xa038, 0xa03b, 0xa040, 0xa045,
0xa05d, 0xa062, 0xa067, 0xa06a, 0xa06b, 0xa06c, 0xa070, 0xa071, 0xa046, 0xa047, 0xa05d, 0xa062, 0xa067, 0xa06a, 0xa06b, 0xa06c,
0xa072, 0xa073, 0xa086, 0xa087, 0xa08d, 0xa08f, 0xa090, 0xa093, 0xa070, 0xa071, 0xa072, 0xa073, 0xa086, 0xa087, 0xa08d, 0xa08f,
0xa096, 0xa097, 0xa098, 0xa09a, 0xa0b2, 0xa0b4, 0xa0e3, 0xa0e4, 0xa090, 0xa093, 0xa096, 0xa097, 0xa098, 0xa09a, 0xa0b2, 0xa0b4,
0xa0e6, 0xa0e8, 0xa0ff, 0xa106, 0xa109, 0xa112, 0xa13b, 0xa143, 0xa0e3, 0xa0e4, 0xa0e6, 0xa0e8, 0xa0ff, 0xa106, 0xa109, 0xa112,
0xa17a, 0xa20a, 0xa25f, 0xa260, 0xa261, 0xa262, 0xa263, 0xa2a6, 0xa13b, 0xa143, 0xa17a, 0xa20a, 0xa25f, 0xa260, 0xa261, 0xa262,
0xa2b2, 0xa30c, 0xa323, 0xa579, 0xa7e1, 0xa8c1 0xa263, 0xa2a6, 0xa2b2, 0xa30c, 0xa323, 0xa579, 0xa7e1, 0xa8c1
}; };
/*Collect the unicode lists and glyph_id offsets*/ /*Collect the unicode lists and glyph_id offsets*/
@ -1463,7 +1485,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
}, },
{ {
.range_start = 20449, .range_length = 43202, .glyph_id_start = 95, .range_start = 20449, .range_length = 43202, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 70, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 72, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
} }
}; };

View File

@ -965,6 +965,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+7535 "电" */
0x0, 0x0, 0xb, 0x10, 0x0, 0x0, 0x0, 0x0,
0x0, 0xe, 0x10, 0x0, 0x0, 0x0, 0x11, 0x11,
0x1e, 0x21, 0x11, 0x10, 0x0, 0xed, 0xdd, 0xdf,
0xdd, 0xdd, 0xf2, 0x0, 0xe2, 0x0, 0xe, 0x10,
0x0, 0xe2, 0x0, 0xe2, 0x0, 0xe, 0x10, 0x0,
0xe2, 0x0, 0xef, 0xff, 0xff, 0xff, 0xff, 0xf2,
0x0, 0xe2, 0x0, 0xe, 0x10, 0x0, 0xe2, 0x0,
0xe2, 0x0, 0xe, 0x10, 0x0, 0xe2, 0x0, 0xec,
0xbb, 0xbf, 0xbb, 0xbb, 0xf2, 0x0, 0x33, 0x33,
0x3f, 0x43, 0x33, 0x30, 0x30, 0x0, 0x0, 0xe,
0x10, 0x0, 0x0, 0xc3, 0x0, 0x0, 0xe, 0x20,
0x0, 0x0, 0xe1, 0x0, 0x0, 0xa, 0xff, 0xff,
0xff, 0xb0,
/* U+7F6E "置" */ /* U+7F6E "置" */
0x0, 0xcd, 0xde, 0xed, 0xdf, 0xdd, 0xdc, 0x0, 0x0, 0xcd, 0xde, 0xed, 0xdf, 0xdd, 0xdc, 0x0,
0x0, 0xc5, 0x6, 0xa0, 0xf, 0x10, 0x4c, 0x0, 0x0, 0xc5, 0x6, 0xa0, 0xf, 0x10, 0x4c, 0x0,
@ -1047,6 +1062,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x2e, 0x50, 0x18, 0xdf, 0xff, 0xff, 0xff, 0xc0, 0x2e, 0x50, 0x18, 0xdf, 0xff, 0xff, 0xff, 0xc0,
0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+91CF "量" */
0x0, 0x56, 0x66, 0x66, 0x66, 0x65, 0x0, 0x0,
0xe8, 0x77, 0x77, 0x77, 0x8e, 0x0, 0x0, 0xec,
0xcc, 0xcc, 0xcc, 0xce, 0x0, 0x0, 0xe3, 0x22,
0x22, 0x22, 0x3e, 0x0, 0x0, 0x9a, 0xaa, 0xaa,
0xaa, 0xa9, 0x0, 0xab, 0xbb, 0xbb, 0xbb, 0xbb,
0xbb, 0xba, 0x0, 0x34, 0x44, 0x44, 0x44, 0x44,
0x0, 0x0, 0xca, 0x77, 0xbc, 0x77, 0x9e, 0x0,
0x0, 0xcc, 0xbb, 0xdd, 0xbb, 0xbe, 0x0, 0x0,
0xc6, 0x22, 0x99, 0x22, 0x4e, 0x0, 0x0, 0x8a,
0xaa, 0xdd, 0xaa, 0xa9, 0x0, 0x2, 0xaa, 0xaa,
0xdd, 0xaa, 0xaa, 0x40, 0x0, 0x33, 0x33, 0x9a,
0x33, 0x33, 0x10, 0x8d, 0xdd, 0xdd, 0xee, 0xdd,
0xdd, 0xd9,
/* U+955C "镜" */ /* U+955C "镜" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0xb, 0x0, 0x0, 0xa, 0xa0, 0x0, 0x0, 0x0, 0xb, 0x0, 0x0, 0xa, 0xa0, 0x0, 0x0,
@ -2128,72 +2158,74 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 5059, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 5059, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5172, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5172, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5300, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 5300, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5405, .adv_w = 256, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5405, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 2, .ofs_y = -1},
{.bitmap_index = 5509, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5503, .adv_w = 256, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5621, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5607, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5741, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5719, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5861, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5839, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5981, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5959, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6109, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6079, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 6245, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6177, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6341, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6305, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6453, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6441, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6549, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6537, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6615, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6649, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6743, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6745, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6871, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6811, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6997, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6939, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7125, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7067, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7233, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7193, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7361, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7321, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7417, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7429, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7501, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7557, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7645, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7613, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7741, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7697, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7829, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2}, {.bitmap_index = 7841, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7909, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 7937, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8035, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8025, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 8140, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8105, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 8238, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2}, {.bitmap_index = 8231, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8318, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1}, {.bitmap_index = 8336, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8430, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8434, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 8500, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8514, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 8570, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8626, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8668, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4}, {.bitmap_index = 8696, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8696, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 8766, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8804, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8864, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
{.bitmap_index = 8964, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 8892, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9124, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 9000, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9252, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9160, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9322, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9320, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9392, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 9448, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9532, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 9518, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9628, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 9588, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9756, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 9728, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9901, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 9824, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10006, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 9952, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10118, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 10097, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10216, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 10202, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10314, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 10314, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10410, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 10412, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10506, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 10510, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10618, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 10606, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10730, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 10702, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10838, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3}, {.bitmap_index = 10814, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11000, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 10926, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11096, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 11034, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 11246, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11196, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11346, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11292, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11446, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11442, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11546, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11542, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11646, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11642, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11746, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 11742, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11893, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 11842, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11989, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 11942, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12101, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3}, {.bitmap_index = 12089, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 12246, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 12185, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12366, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 12297, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 12462, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1} {.bitmap_index = 12442, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 12562, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12658, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1}
}; };
/*--------------------- /*---------------------
@ -2203,15 +2235,15 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
static const uint16_t unicode_list_2[] = { static const uint16_t unicode_list_2[] = {
0x0, 0x88, 0x176, 0x218, 0x310, 0x49e, 0x832, 0xc33, 0x0, 0x88, 0x176, 0x218, 0x310, 0x49e, 0x832, 0xc33,
0xe99, 0xffc, 0x10e2, 0x1116, 0x12b7, 0x130e, 0x144c, 0x1617, 0xe99, 0xffc, 0x10e2, 0x1116, 0x12b7, 0x130e, 0x144c, 0x1617,
0x1bc8, 0x218e, 0x22ee, 0x3015, 0x3356, 0x38f3, 0x3c65, 0x4085, 0x1bc8, 0x218e, 0x22ee, 0x25dc, 0x3015, 0x3356, 0x38f3, 0x3c65,
0x4603, 0xa0a8, 0xa0af, 0xa0b2, 0xa0b3, 0xa0b4, 0xa0b8, 0xa0ba, 0x4085, 0x4276, 0x4603, 0xa0a8, 0xa0af, 0xa0b2, 0xa0b3, 0xa0b4,
0xa0bc, 0xa0c0, 0xa0c3, 0xa0c8, 0xa0cd, 0xa0ce, 0xa0cf, 0xa0e5, 0xa0b8, 0xa0ba, 0xa0bc, 0xa0c0, 0xa0c3, 0xa0c8, 0xa0cd, 0xa0ce,
0xa0ea, 0xa0ef, 0xa0f2, 0xa0f3, 0xa0f4, 0xa0f8, 0xa0f9, 0xa0fa, 0xa0cf, 0xa0e5, 0xa0ea, 0xa0ef, 0xa0f2, 0xa0f3, 0xa0f4, 0xa0f8,
0xa0fb, 0xa10e, 0xa10f, 0xa115, 0xa117, 0xa118, 0xa11b, 0xa11e, 0xa0f9, 0xa0fa, 0xa0fb, 0xa10e, 0xa10f, 0xa115, 0xa117, 0xa118,
0xa11f, 0xa120, 0xa122, 0xa13a, 0xa13c, 0xa16b, 0xa16c, 0xa16e, 0xa11b, 0xa11e, 0xa11f, 0xa120, 0xa122, 0xa13a, 0xa13c, 0xa16b,
0xa170, 0xa187, 0xa18e, 0xa191, 0xa19a, 0xa1c3, 0xa1cb, 0xa202, 0xa16c, 0xa16e, 0xa170, 0xa187, 0xa18e, 0xa191, 0xa19a, 0xa1c3,
0xa292, 0xa2e7, 0xa2e8, 0xa2e9, 0xa2ea, 0xa2eb, 0xa32e, 0xa33a, 0xa1cb, 0xa202, 0xa292, 0xa2e7, 0xa2e8, 0xa2e9, 0xa2ea, 0xa2eb,
0xa394, 0xa3ab, 0xa601, 0xa869, 0xa949 0xa32e, 0xa33a, 0xa394, 0xa3ab, 0xa601, 0xa869, 0xa949
}; };
/*Collect the unicode lists and glyph_id offsets*/ /*Collect the unicode lists and glyph_id offsets*/
@ -2227,7 +2259,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
}, },
{ {
.range_start = 20313, .range_length = 43338, .glyph_id_start = 95, .range_start = 20313, .range_length = 43338, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 85, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 87, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
} }
}; };

View File

@ -55,7 +55,7 @@ void setup_scr_screen(lv_ui *ui)
lv_obj_align(ui->screen_btn_1_label, LV_ALIGN_CENTER, 0, 0); lv_obj_align(ui->screen_btn_1_label, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_style_pad_all(ui->screen_btn_1, 0, LV_STATE_DEFAULT); lv_obj_set_style_pad_all(ui->screen_btn_1, 0, LV_STATE_DEFAULT);
lv_obj_set_width(ui->screen_btn_1_label, LV_PCT(100)); lv_obj_set_width(ui->screen_btn_1_label, LV_PCT(100));
lv_obj_set_pos(ui->screen_btn_1, 11, 8); lv_obj_set_pos(ui->screen_btn_1, 11, 23);
lv_obj_set_size(ui->screen_btn_1, 105, 40); lv_obj_set_size(ui->screen_btn_1, 105, 40);
//Write style for screen_btn_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. //Write style for screen_btn_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
@ -78,7 +78,7 @@ void setup_scr_screen(lv_ui *ui)
lv_obj_align(ui->screen_btn_2_label, LV_ALIGN_CENTER, 0, 0); lv_obj_align(ui->screen_btn_2_label, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_style_pad_all(ui->screen_btn_2, 0, LV_STATE_DEFAULT); lv_obj_set_style_pad_all(ui->screen_btn_2, 0, LV_STATE_DEFAULT);
lv_obj_set_width(ui->screen_btn_2_label, LV_PCT(100)); lv_obj_set_width(ui->screen_btn_2_label, LV_PCT(100));
lv_obj_set_pos(ui->screen_btn_2, 11, 58); lv_obj_set_pos(ui->screen_btn_2, 11, 68);
lv_obj_set_size(ui->screen_btn_2, 105, 40); lv_obj_set_size(ui->screen_btn_2, 105, 40);
//Write style for screen_btn_2, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. //Write style for screen_btn_2, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
@ -101,7 +101,7 @@ void setup_scr_screen(lv_ui *ui)
lv_obj_align(ui->screen_btn_3_label, LV_ALIGN_CENTER, 0, 0); lv_obj_align(ui->screen_btn_3_label, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_style_pad_all(ui->screen_btn_3, 0, LV_STATE_DEFAULT); lv_obj_set_style_pad_all(ui->screen_btn_3, 0, LV_STATE_DEFAULT);
lv_obj_set_width(ui->screen_btn_3_label, LV_PCT(100)); lv_obj_set_width(ui->screen_btn_3_label, LV_PCT(100));
lv_obj_set_pos(ui->screen_btn_3, 11, 106); lv_obj_set_pos(ui->screen_btn_3, 11, 113);
lv_obj_set_size(ui->screen_btn_3, 105, 40); lv_obj_set_size(ui->screen_btn_3, 105, 40);
//Write style for screen_btn_3, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. //Write style for screen_btn_3, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
@ -116,6 +116,31 @@ void setup_scr_screen(lv_ui *ui)
lv_obj_set_style_text_opa(ui->screen_btn_3, 255, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_text_opa(ui->screen_btn_3, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->screen_btn_3, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_text_align(ui->screen_btn_3, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes screen_label_1
ui->screen_label_1 = lv_label_create(ui->screen);
lv_label_set_text(ui->screen_label_1, "电量:100%");
lv_label_set_long_mode(ui->screen_label_1, LV_LABEL_LONG_SCROLL);
lv_obj_set_pos(ui->screen_label_1, 2, 0);
lv_obj_set_size(ui->screen_label_1, 124, 18);
//Write style for screen_label_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_border_width(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui->screen_label_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui->screen_label_1, &lv_font_GB2312_12, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui->screen_label_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_letter_space(ui->screen_label_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_line_space(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->screen_label_1, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->screen_label_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->screen_label_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->screen_label_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui->screen_label_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->screen_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//The custom code of screen. //The custom code of screen.

View File

@ -239,6 +239,12 @@ extern "C" int Axp_PEKPress_IRQ()
return 0; return 0;
} }
extern "C" int getBattPercentage(void)
{
return axp.getBattPercentage();
}
extern "C" void Axp202_task(void *pvParameter) extern "C" void Axp202_task(void *pvParameter)
{ {
axp_init(); axp_init();
@ -265,15 +271,17 @@ extern "C" void Axp202_task(void *pvParameter)
if (xQueueReceive(gpio_evt_queue, &io_num, portMAX_DELAY)) { if (xQueueReceive(gpio_evt_queue, &io_num, portMAX_DELAY)) {
if (io_num == AXP_ISR_GPIO) { if (io_num == AXP_ISR_GPIO) {
axp.readIRQ(); axp.readIRQ();
ESP_LOGI(TAG,"axp-irq");
if (axp.isPEKLongtPressIRQ()) { if (axp.isPEKLongtPressIRQ()) {
ESP_LOGI("sleep","esp_light_sleep_start"); ESP_LOGI("sleep","esp_light_sleep_start");
esp_timer_stop(SysTick_timer);
axp.setGPIOMode(AXP_GPIO_0, AXP_IO_INPUT_MODE); // 屏幕供电 axp.setGPIOMode(AXP_GPIO_0, AXP_IO_INPUT_MODE); // 屏幕供电
vTaskDelay(500/ portTICK_PERIOD_MS); vTaskDelay(500/ portTICK_PERIOD_MS);
esp_light_sleep_start(); esp_light_sleep_start();
ESP_LOGI(TAG, "AXP202 PEK key Click:%.2f,%.2f,%.2f,%d",axp.getBattVoltage(),axp.getCoulombData(),axp.getBattDischargeCurrent(),axp.getBattPercentage()); ESP_LOGI(TAG, "AXP202 PEK key Click:%.2f,%.2f,%.2f,%d",axp.getBattVoltage(),axp.getCoulombData(),axp.getBattDischargeCurrent(),axp.getBattPercentage());
// axp.shutdown(); // axp.shutdown();
axp.setGPIOMode(AXP_GPIO_0, AXP_IO_LDO_MODE); // 屏幕供电 axp.setGPIOMode(AXP_GPIO_0, AXP_IO_LDO_MODE); // 屏幕供电
esp_timer_start_periodic(SysTick_timer,1000);
} }
axp.clearIRQ(); axp.clearIRQ();
} }

View File

@ -3,7 +3,7 @@
#include "public.h" #include "public.h"
#define LV_EVENT_CUSTOM_UPDATE _LV_EVENT_LAST + 1
#define EVENT_CONNECT BIT10 #define EVENT_CONNECT BIT10
#define EVENT_BURN_BEGIN BIT11 #define EVENT_BURN_BEGIN BIT11

View File

@ -43,6 +43,8 @@
#include "i2c_port.h" #include "i2c_port.h"
#include "gui_guider.h"
static const char *TAG = "main"; static const char *TAG = "main";
@ -61,6 +63,54 @@ uint8_t* load_html2Ram(wifi_html_t html)
return NULL; return NULL;
} }
esp_timer_handle_t SysTick_timer;
extern int getBattPercentage(void);
void IRAM_ATTR SysTick_Handler(void)
{
static uint32_t SysTick_ms_cnt = 0;
static uint8_t wdt_status = 0;
if(SysTick_ms_cnt % 1000 == 0)//1s
{
// xEventGroupSetBits(Printer_group,EVENT_GET_Batterylevel);
lv_event_send(guider_ui.screen_label_1, LV_EVENT_CUSTOM_UPDATE, (void *)getBattPercentage());
}
SysTick_ms_cnt ++;
}
void Timer_Config_Init()
{
esp_timer_create_args_t args = {
.callback = SysTick_Handler,
.arg = (void*)1,
.dispatch_method = ESP_TIMER_TASK,
.name = "Tiemr1",
.skip_unhandled_events = false,
};
esp_timer_create(&args, &SysTick_timer);
esp_timer_start_periodic(SysTick_timer, 1000);
// ESP_ERROR_CHECK(gptimer_new_timer(&timer_config, &gptimer_PrintLoop));
// gptimer_event_callbacks_t PrintLoop_cbs = {
// .on_alarm = PrintLoop_callback,
// };
// EventGrou_PrintLoop = xEventGroupCreate();
// ESP_ERROR_CHECK(gptimer_register_event_callbacks(gptimer_PrintLoop, &PrintLoop_cbs, NULL));
// ESP_LOGI(TAG, "Enable timer");
// ESP_ERROR_CHECK(gptimer_enable(gptimer_PrintLoop));
// gptimer_alarm_config_t alarm_config_PrintLoop = {
// .alarm_count = 1000,
// .flags.auto_reload_on_alarm = false,
// };
// ESP_ERROR_CHECK(gptimer_set_alarm_action(gptimer_PrintLoop, &alarm_config_PrintLoop));
// ESP_ERROR_CHECK(gptimer_start(gptimer_PrintLoop));
}
extern uint8_t* home_html_data; extern uint8_t* home_html_data;
@ -156,7 +206,7 @@ void app_main(void)
ESP_LOGI(TAG, "mem free:%ld %d",esp_get_free_heap_size(),sizeof(Sys_config_t)); ESP_LOGI(TAG, "mem free:%ld %d",esp_get_free_heap_size(),sizeof(Sys_config_t));
// Write_ESPFlash(0x40,0x00,&System_Config,sizeof(Sys_config_t)); // Write_ESPFlash(0x40,0x00,&System_Config,sizeof(Sys_config_t));
Timer_Config_Init();
while (1) while (1)
{ {
// if(gpio_get_level(GPIO_NUM_9) == 0 || gpio_get_level(GPIO_NUM_2) == 0) // if(gpio_get_level(GPIO_NUM_9) == 0 || gpio_get_level(GPIO_NUM_2) == 0)

View File

@ -29,6 +29,10 @@
#include "driver/uart.h" #include "driver/uart.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "esp_timer.h"
#include "driver/gptimer.h"
#include "driver/timer.h"
#include "wifi_task.h" #include "wifi_task.h"
#include "spiffs.h" #include "spiffs.h"
@ -39,6 +43,8 @@
#include "esp_efuse.h" #include "esp_efuse.h"
#include "stream.h" #include "stream.h"
#define LV_EVENT_CUSTOM_UPDATE _LV_EVENT_LAST + 1
typedef struct Device_info_ typedef struct Device_info_
{ {
uint8_t Device_SN[12]; uint8_t Device_SN[12];
@ -60,6 +66,8 @@ extern Device_info_t off_line_tool;
extern stream_data_t uart_interface_data; extern stream_data_t uart_interface_data;
extern esp_timer_handle_t SysTick_timer;
extern void usb_serial2Uart(void *pvParameters); extern void usb_serial2Uart(void *pvParameters);
extern void Read_CMD_task(void *pvParameter); extern void Read_CMD_task(void *pvParameter);