增加设置界面

This commit is contained in:
YuXifeng 2025-04-11 17:51:17 +08:00
parent cf2bf25ef8
commit 72ef13eaeb
10 changed files with 549 additions and 217 deletions

View File

@ -41,5 +41,6 @@ void custom_init(lv_ui *ui)
guider_ui.user_obj.home_btn_group = lv_group_create(); //创建组 guider_ui.user_obj.home_btn_group = lv_group_create(); //创建组
guider_ui.user_obj.imglist_group = lv_group_create(); guider_ui.user_obj.imglist_group = lv_group_create();
guider_ui.user_obj.burn_btn_group = lv_group_create(); guider_ui.user_obj.burn_btn_group = lv_group_create();
guider_ui.user_obj.seting_btn_group = lv_group_create();
} }

View File

@ -40,7 +40,7 @@ static void user_event_handler(lv_event_t *e)
if(code == LV_EVENT_CUSTOM_UPDATE) { if(code == LV_EVENT_CUSTOM_UPDATE) {
uint32_t key = (uint32_t)lv_event_get_param(e); uint32_t key = (uint32_t)lv_event_get_param(e);
printf("LV_EVENT_CUSTOM_UPDATE 事件: key=%ld\n", key); // printf("LV_EVENT_CUSTOM_UPDATE 事件: key=%ld\n", key);
lv_label_set_text_fmt(guider_ui.screen_label_1, "电量:%ld%%",key); lv_label_set_text_fmt(guider_ui.screen_label_1, "电量:%ld%%",key);
} }
} }
@ -61,11 +61,24 @@ static void file_btn_event_handler(lv_event_t *e) {
ui_load_scr_animation(&guider_ui, &guider_ui.sscreen_burn, guider_ui.sscreen_burn_del, &guider_ui.screen_imglist_del, setup_scr_sscreen_burn, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, true); ui_load_scr_animation(&guider_ui, &guider_ui.sscreen_burn, guider_ui.sscreen_burn_del, &guider_ui.screen_imglist_del, setup_scr_sscreen_burn, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, true);
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, user_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);
} }
static void btn_event_handler(lv_event_t *e)
{
lv_event_code_t code = lv_event_get_code(e);
// 通过 lv_event_get_param() 获取传递的按键值
uint32_t key = (uint32_t)lv_event_get_param(e);
if (key == LV_KEY_ESC) {
ESP_LOGI(TAG,"LV_KEY_ESC");
lv_indev_set_group(lvgl_button_indev, guider_ui.user_obj.home_btn_group);
lv_group_set_default(guider_ui.user_obj.home_btn_group);
ui_load_scr_animation(&guider_ui, &guider_ui.screen, guider_ui.screen_del, &guider_ui.screen_imglist_del, setup_scr_screen, LV_SCR_LOAD_ANIM_OVER_RIGHT, 200, 200, true, true);
}
}
static void key_event_handler(lv_event_t *e) static void key_event_handler(lv_event_t *e)
{ {
@ -108,33 +121,36 @@ static void key_event_handler(lv_event_t *e)
} }
static void screen_btn_1_event_handler (lv_event_t *e) static void screen_btn_1_event_handler (lv_event_t *e)//烧录按钮
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
switch (code) { switch (code) {
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
lv_group_remove_all_objs(guider_ui.user_obj.home_btn_group); ui_load_scr_animation(&guider_ui, &guider_ui.sscreen_burn, guider_ui.sscreen_burn_del, &guider_ui.screen_burning_del, setup_scr_sscreen_burn, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false);
ui_load_scr_animation(&guider_ui, &guider_ui.screen_imglist, guider_ui.screen_imglist_del, &guider_ui.screen_del, setup_scr_screen_imglist, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false); lv_indev_set_group(lvgl_button_indev, guider_ui.user_obj.burn_btn_group);
lv_indev_set_group(lvgl_button_indev, guider_ui.user_obj.imglist_group); lv_group_set_default(guider_ui.user_obj.burn_btn_group);
lv_group_set_default(guider_ui.user_obj.imglist_group);
lv_group_add_obj(guider_ui.user_obj.imglist_group,guider_ui.screen_imglist_btn_1);
lv_group_add_obj(guider_ui.user_obj.imglist_group,guider_ui.screen_imglist_ddlist_1);
lv_obj_add_event_cb(guider_ui.screen_imglist_ddlist_1, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
uint16_t selected_index = lv_dropdown_get_selected(guider_ui.screen_imglist_ddlist_1); lv_group_add_obj(guider_ui.user_obj.burn_btn_group,guider_ui.sscreen_burn_btn_1);
sprintf(&chip_path[0],"/spiffs/%s",chip_list[selected_index]); lv_group_add_obj(guider_ui.user_obj.burn_btn_group,guider_ui.sscreen_burn_btn_2);
lv_obj_t *file_btn[5]; lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_1, btn_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
spiffs_list_t directory[5]; lv_obj_add_event_cb(guider_ui.sscreen_burn_btn_2, btn_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
uint8_t file_num = 0; // lv_obj_add_event_cb(guider_ui.screen_imglist_ddlist_1, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
file_num = list_files_in_spiffs(chip_path,directory,5);
for(int i=0;i<file_num;i++) // uint16_t selected_index = lv_dropdown_get_selected(guider_ui.screen_imglist_ddlist_1);
{ // sprintf(&chip_path[0],"/spiffs/%s",chip_list[selected_index]);
ESP_LOGI(TAG,"[%d] Fond esp32s2 file:%s,size:%ld",i,directory[i].name,directory[i].size);
file_btn[i] = lv_list_add_btn(guider_ui.screen_imglist_list_1,NULL,directory[i].name); // lv_obj_t *file_btn[5];
lv_group_add_obj(guider_ui.user_obj.imglist_group,file_btn[i]); // spiffs_list_t directory[5];
} // uint8_t file_num = 0;
// file_num = list_files_in_spiffs(chip_path,directory,5);
// for(int i=0;i<file_num;i++)
// {
// ESP_LOGI(TAG,"[%d] Fond esp32s2 file:%s,size:%ld",i,directory[i].name,directory[i].size);
// file_btn[i] = lv_list_add_btn(guider_ui.screen_imglist_list_1,NULL,directory[i].name);
// lv_group_add_obj(guider_ui.user_obj.imglist_group,file_btn[i]);
// }
break; break;
} }
default: default:
@ -142,13 +158,35 @@ static void screen_btn_1_event_handler (lv_event_t *e)
} }
} }
static void screen_btn_3_event_handler (lv_event_t *e) static void screen_btn_2_event_handler (lv_event_t *e)//镜像按钮
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
switch (code) { switch (code) {
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
ui_load_scr_animation(&guider_ui, &guider_ui.screen_burning, guider_ui.screen_burning_del, &guider_ui.sscreen_burn_del, setup_scr_screen_burning, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false); ui_load_scr_animation(&guider_ui, &guider_ui.screen_imglist, guider_ui.screen_imglist_del, &guider_ui.screen_del, setup_scr_screen_imglist, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false);
lv_indev_set_group(lvgl_button_indev, guider_ui.user_obj.imglist_group);
lv_group_set_default(guider_ui.user_obj.imglist_group);
lv_group_add_obj(guider_ui.user_obj.imglist_group,guider_ui.screen_imglist_ddlist_1);
lv_obj_add_event_cb(guider_ui.screen_imglist_ddlist_1, btn_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
break;
}
default:
break;
}
}
static void screen_btn_3_event_handler (lv_event_t *e)//设置按钮
{
lv_event_code_t code = lv_event_get_code(e);
switch (code) {
case LV_EVENT_CLICKED:
{
ui_load_scr_animation(&guider_ui, &guider_ui.screen_seting, guider_ui.screen_seting_del, &guider_ui.screen_del, setup_scr_screen_seting, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false);
lv_indev_set_group(lvgl_button_indev, guider_ui.user_obj.seting_btn_group);
lv_group_set_default(guider_ui.user_obj.seting_btn_group);
lv_group_add_obj(guider_ui.user_obj.seting_btn_group,guider_ui.screen_seting_sw_1);
lv_obj_add_event_cb(guider_ui.screen_seting_sw_1, btn_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
break; break;
} }
default: default:
@ -159,6 +197,7 @@ static void screen_btn_3_event_handler (lv_event_t *e)
void events_init_screen (lv_ui *ui) 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_2, screen_btn_2_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); lv_obj_add_event_cb(ui->screen_label_1, user_event_handler, LV_EVENT_CUSTOM_UPDATE, NULL);
@ -208,9 +247,9 @@ static void screen_burning_btn_1_event_handler (lv_event_t *e)
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
ui_load_scr_animation(&guider_ui, &guider_ui.sscreen_burn, guider_ui.sscreen_burn_del, &guider_ui.screen_burning_del, setup_scr_sscreen_burn, LV_SCR_LOAD_ANIM_OVER_RIGHT, 200, 200, false, true); ui_load_scr_animation(&guider_ui, &guider_ui.sscreen_burn, guider_ui.sscreen_burn_del, &guider_ui.screen_burning_del, setup_scr_sscreen_burn, LV_SCR_LOAD_ANIM_OVER_RIGHT, 200, 200, false, true);
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, key_event_handler, LV_EVENT_CUSTOM_UPDATE, NULL);
break; break;
} }
default: default:

View File

@ -77,6 +77,7 @@ void init_scr_del_flag(lv_ui *ui)
ui->sscreen_burn_del = true; ui->sscreen_burn_del = true;
ui->screen_imglist_del = true; ui->screen_imglist_del = true;
ui->screen_burning_del = true; ui->screen_burning_del = true;
ui->screen_seting_del = true;
} }
void setup_ui(lv_ui *ui) void setup_ui(lv_ui *ui)

View File

@ -20,6 +20,7 @@ typedef struct
lv_group_t *home_btn_group; lv_group_t *home_btn_group;
lv_group_t *imglist_group; lv_group_t *imglist_group;
lv_group_t *burn_btn_group; lv_group_t *burn_btn_group;
lv_group_t *seting_btn_group;
char download_file[128]; char download_file[128];
char burn_title[48]; char burn_title[48];
}gui_user_data; }gui_user_data;
@ -72,7 +73,12 @@ typedef struct
lv_obj_t *screen_burning_btn_1_label; lv_obj_t *screen_burning_btn_1_label;
lv_obj_t *screen_burning_spangroup_1; lv_obj_t *screen_burning_spangroup_1;
lv_span_t *screen_burning_spangroup_1_span; lv_span_t *screen_burning_spangroup_1_span;
lv_obj_t *screen_seting;
bool screen_seting_del;
lv_obj_t *screen_seting_cont_1;
lv_obj_t *screen_seting_label_1;
lv_obj_t *screen_seting_sw_1;
lv_obj_t *screen_seting_label_2;
gui_user_data user_obj; gui_user_data user_obj;
}lv_ui; }lv_ui;
@ -100,6 +106,7 @@ void setup_scr_screen(lv_ui *ui);
void setup_scr_sscreen_burn(lv_ui *ui); void setup_scr_sscreen_burn(lv_ui *ui);
void setup_scr_screen_imglist(lv_ui *ui); void setup_scr_screen_imglist(lv_ui *ui);
void setup_scr_screen_burning(lv_ui *ui); void setup_scr_screen_burning(lv_ui *ui);
void setup_scr_screen_seting(lv_ui *ui);
LV_FONT_DECLARE(lv_font_GB2312_16) LV_FONT_DECLARE(lv_font_GB2312_16)
LV_FONT_DECLARE(lv_font_montserratMedium_16) LV_FONT_DECLARE(lv_font_montserratMedium_16)

View File

@ -637,6 +637,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xb1, 0x0, 0x1, 0xcd, 0x90, 0x0, 0x0, 0x0, 0xb1, 0x0, 0x1, 0xcd, 0x90, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+5382 "厂" */
0x0, 0xab, 0xbb, 0xbb, 0xbb, 0xbb, 0xb0, 0x0,
0xe1, 0x11, 0x11, 0x11, 0x11, 0x10, 0x0, 0xe0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xd0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x1, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5,
0xa0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0x50,
0x0, 0x0, 0x0, 0x0, 0x0, 0x1d, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+53F7 "号" */ /* U+53F7 "号" */
0x0, 0x8, 0xaa, 0xaa, 0xaa, 0x60, 0x0, 0x0, 0x0, 0x8, 0xaa, 0xaa, 0xaa, 0x60, 0x0, 0x0,
0xc, 0x32, 0x22, 0x26, 0x90, 0x0, 0x0, 0xc, 0xc, 0x32, 0x22, 0x26, 0x90, 0x0, 0x0, 0xc,
@ -664,6 +678,31 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x58, 0x0, 0x0, 0x0, 0xe, 0xee, 0xee, 0xee, 0x58, 0x0, 0x0, 0x0, 0xe, 0xee, 0xee, 0xee,
0xee, 0xee, 0xe1, 0xee, 0xee, 0xe1,
/* U+5DE5 "工" */
0x3, 0xee, 0xee, 0xee, 0xee, 0xee, 0x30, 0x0,
0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x78, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x78,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x78, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x78, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0xf,
0xff, 0xff, 0xff, 0xff, 0xff, 0xf1,
/* U+5F0F "式" */
0x0, 0x0, 0x0, 0x8, 0x65, 0x30, 0x0, 0x0,
0x0, 0x0, 0x7, 0x74, 0xb9, 0x0, 0x2, 0x22,
0x22, 0x28, 0x92, 0x26, 0x20, 0xa, 0xaa, 0xaa,
0xac, 0xea, 0xaa, 0x90, 0x0, 0x0, 0x0, 0x3,
0xb0, 0x0, 0x0, 0x2, 0xcc, 0xcc, 0xc2, 0xe0,
0x0, 0x0, 0x0, 0x11, 0xd1, 0x10, 0xd2, 0x0,
0x0, 0x0, 0x0, 0xd0, 0x0, 0x86, 0x0, 0x0,
0x0, 0x0, 0xd0, 0x2, 0x2d, 0x0, 0x0, 0x0,
0x3, 0xeb, 0xe8, 0xb, 0x50, 0x73, 0x8, 0xec,
0x73, 0x0, 0x2, 0xe2, 0xc3, 0x1, 0x0, 0x0,
0x0, 0x0, 0x4e, 0xe0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x2, 0x10,
/* U+603B "总" */ /* U+603B "总" */
0x0, 0x2, 0xb0, 0x0, 0x8, 0x30, 0x0, 0x0, 0x0, 0x2, 0xb0, 0x0, 0x8, 0x30, 0x0, 0x0,
0x0, 0x7a, 0x0, 0x6c, 0x0, 0x0, 0x0, 0x1, 0x0, 0x7a, 0x0, 0x6c, 0x0, 0x0, 0x0, 0x1,
@ -692,6 +731,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x70, 0x6, 0xd2, 0x2, 0x0, 0x0, 0x42, 0x0, 0x70, 0x6, 0xd2, 0x2, 0x0, 0x0, 0x42, 0x0,
0x0, 0x40, 0x0, 0x40,
/* U+6A21 "模" */
0x0, 0x18, 0x0, 0x9, 0x0, 0x90, 0x0, 0x0,
0x2b, 0x5, 0x5e, 0x55, 0xe5, 0x50, 0x0, 0x2b,
0x19, 0x9e, 0x99, 0xf9, 0x90, 0x8, 0x9d, 0x83,
0x8, 0x0, 0x80, 0x0, 0x5, 0x8d, 0x52, 0xed,
0xdd, 0xde, 0x0, 0x0, 0x7b, 0x0, 0xe0, 0x0,
0xe, 0x0, 0x0, 0xde, 0x90, 0xfd, 0xdd, 0xdf,
0x0, 0x4, 0xcb, 0xb3, 0xe0, 0x0, 0xe, 0x0,
0xc, 0x5b, 0x32, 0xdd, 0xee, 0xdd, 0x0, 0x28,
0x2b, 0x2, 0x22, 0xb4, 0x22, 0x20, 0x0, 0x2b,
0xa, 0xbc, 0xef, 0xbb, 0xa0, 0x0, 0x2b, 0x0,
0x3c, 0x24, 0xc3, 0x0, 0x0, 0x2b, 0x4a, 0x81,
0x0, 0x19, 0xb2, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+6B21 "次" */ /* U+6B21 "次" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x4c, 0x0, 0x0, 0x0, 0x74, 0x0, 0x5, 0x0, 0x4c, 0x0, 0x0, 0x0, 0x74, 0x0, 0x5,
@ -1623,71 +1677,75 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 2723, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2723, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2814, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2814, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2912, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2912, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3003, .adv_w = 224, .box_w = 14, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3003, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3087, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3094, .adv_w = 224, .box_w = 14, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3178, .adv_w = 224, .box_w = 14, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3178, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3262, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3269, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3360, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3339, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3451, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 3430, .adv_w = 224, .box_w = 14, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3564, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 3514, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3641, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3612, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3732, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 3710, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 3809, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 3801, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3864, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3914, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3969, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3991, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4074, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4082, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4178, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4159, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4283, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4214, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4371, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4319, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4476, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4424, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4518, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4528, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4584, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4633, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4696, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4721, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4773, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4826, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4848, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 4868, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4918, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4934, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5016, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5046, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5101, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5123, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5186, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 5198, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5256, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1}, {.bitmap_index = 5268, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5347, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5366, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5406, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5451, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5465, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5536, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5550, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3}, {.bitmap_index = 5606, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 5576, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5697, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5664, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5756, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5799, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 5815, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5927, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5900, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 6018, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 5926, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6070, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 6014, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6122, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6149, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6221, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6277, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6298, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6368, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 6403, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 6420, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 6516, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6472, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6601, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6571, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6699, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6648, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6784, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6753, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6862, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6866, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6939, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 6951, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7014, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7049, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7112, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7134, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7210, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7212, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7298, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 7289, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 7418, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7364, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7501, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7462, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7618, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7560, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7708, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7648, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 7798, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7768, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7888, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7851, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7978, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7968, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8068, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8058, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8176, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8148, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8266, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8238, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8364, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 8328, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8477, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 8418, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8576, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8526, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8659, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0} {.bitmap_index = 8616, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8714, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 8827, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8926, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9009, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
}; };
/*--------------------- /*---------------------
@ -1695,15 +1753,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, 0x218, 0x310, 0x49e, 0x832, 0x10e2, 0x1617, 0x1bc8, 0x0, 0x218, 0x310, 0x429, 0x49e, 0x832, 0xe8c, 0xfb6,
0xa0a8, 0xa0af, 0xa0b2, 0xa0b3, 0xa0b4, 0xa0b8, 0xa0ba, 0xa0bc, 0x10e2, 0x1617, 0x1ac8, 0x1bc8, 0xa0a8, 0xa0af, 0xa0b2, 0xa0b3,
0xa0c0, 0xa0c3, 0xa0c8, 0xa0cd, 0xa0ce, 0xa0cf, 0xa0e5, 0xa0ea, 0xa0b4, 0xa0b8, 0xa0ba, 0xa0bc, 0xa0c0, 0xa0c3, 0xa0c8, 0xa0cd,
0xa0ef, 0xa0f2, 0xa0f3, 0xa0f4, 0xa0f8, 0xa0f9, 0xa0fa, 0xa0fb, 0xa0ce, 0xa0cf, 0xa0e5, 0xa0ea, 0xa0ef, 0xa0f2, 0xa0f3, 0xa0f4,
0xa10e, 0xa10f, 0xa115, 0xa117, 0xa118, 0xa11b, 0xa11e, 0xa11f, 0xa0f8, 0xa0f9, 0xa0fa, 0xa0fb, 0xa10e, 0xa10f, 0xa115, 0xa117,
0xa120, 0xa122, 0xa13a, 0xa13c, 0xa16b, 0xa16c, 0xa16e, 0xa170, 0xa118, 0xa11b, 0xa11e, 0xa11f, 0xa120, 0xa122, 0xa13a, 0xa13c,
0xa187, 0xa18e, 0xa191, 0xa19a, 0xa1c3, 0xa1cb, 0xa202, 0xa292, 0xa16b, 0xa16c, 0xa16e, 0xa170, 0xa187, 0xa18e, 0xa191, 0xa19a,
0xa2e7, 0xa2e8, 0xa2e9, 0xa2ea, 0xa2eb, 0xa32e, 0xa33a, 0xa394, 0xa1c3, 0xa1cb, 0xa202, 0xa292, 0xa2e7, 0xa2e8, 0xa2e9, 0xa2ea,
0xa3ab, 0xa601, 0xa869, 0xa949 0xa2eb, 0xa32e, 0xa33a, 0xa394, 0xa3ab, 0xa601, 0xa869, 0xa949
}; };
/*Collect the unicode lists and glyph_id offsets*/ /*Collect the unicode lists and glyph_id offsets*/
@ -1719,7 +1777,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 = 68, .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

@ -732,6 +732,22 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xe1, 0x0, 0x0, 0x2c, 0x0, 0x0, 0x5, 0xed, 0xe1, 0x0, 0x0, 0x2c, 0x0, 0x0, 0x5, 0xed,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+5382 "厂" */
0x0, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0,
0xb, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0xb4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb,
0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb4,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0x40,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb4, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0x40, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0xc3, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0xf, 0x10, 0x0, 0x0,
0x0, 0x0, 0x0, 0x3, 0xe0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x99, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x1f, 0x20, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0,
/* U+53F7 "号" */ /* U+53F7 "号" */
0x0, 0x4f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0,
0x5, 0xb0, 0x0, 0x0, 0xf, 0x10, 0x0, 0x0, 0x5, 0xb0, 0x0, 0x0, 0xf, 0x10, 0x0, 0x0,
@ -781,6 +797,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x9, 0xe8, 0x10, 0x0, 0x1, 0xde, 0xee, 0xd1, 0x9, 0xe8, 0x10, 0x0, 0x1, 0xde, 0xee, 0xd1,
0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+5DE5 "工" */
0x1, 0x11, 0x11, 0x11, 0x11, 0x11, 0x10, 0xf,
0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0,
0x0, 0x89, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x89, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x89,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x89, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x89, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x89, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x89, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x89, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x89, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0x1, 0x11, 0x11, 0x11,
0x11, 0x11, 0x11,
/* U+5DF2 "已" */ /* U+5DF2 "已" */
0xdf, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x0, 0x0, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0xe, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe, 0x30, 0x0, 0x0,
@ -796,6 +826,25 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x2c, 0x90, 0x7, 0xef, 0xff, 0xff, 0xff, 0xff, 0x2c, 0x90, 0x7, 0xef, 0xff, 0xff, 0xff, 0xff,
0xb1, 0x0, 0xb1, 0x0,
/* U+5F0F "式" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x79, 0x24, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x6a, 0x4b, 0xd2, 0x0,
0x0, 0x0, 0x0, 0x0, 0x5b, 0x0, 0x55, 0x0,
0xc, 0xcc, 0xcc, 0xcc, 0xdf, 0xcc, 0xcc, 0x70,
0x2, 0x22, 0x22, 0x22, 0x5e, 0x22, 0x22, 0x10,
0x0, 0x0, 0x0, 0x0, 0x1f, 0x0, 0x0, 0x0,
0x0, 0x11, 0x11, 0x11, 0xe, 0x20, 0x0, 0x0,
0x1, 0xdd, 0xee, 0xdd, 0x2c, 0x40, 0x0, 0x0,
0x0, 0x0, 0x69, 0x0, 0x8, 0x90, 0x0, 0x0,
0x0, 0x0, 0x69, 0x0, 0x4, 0xd0, 0x0, 0x0,
0x0, 0x0, 0x69, 0x0, 0x0, 0xe3, 0x0, 0x0,
0x0, 0x0, 0x6b, 0x9d, 0xd0, 0x8a, 0x0, 0x70,
0x4, 0x9d, 0xfc, 0x84, 0x0, 0x1e, 0x51, 0xf0,
0x6, 0x84, 0x0, 0x0, 0x0, 0x5, 0xe9, 0xc0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6e, 0x50,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+5F55 "录" */ /* U+5F55 "录" */
0x0, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x0, 0x0,
@ -914,6 +963,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x9, 0xc9, 0x10, 0x5e, 0xe7, 0x0, 0xb, 0xd1, 0x9, 0xc9, 0x10, 0x5e, 0xe7, 0x0, 0xb, 0xd1,
0x2, 0x0, 0x0, 0x6, 0x30, 0x0, 0x0, 0x60, 0x2, 0x0, 0x0, 0x6, 0x30, 0x0, 0x0, 0x60,
/* U+6A21 "模" */
0x0, 0x6, 0x10, 0x0, 0x60, 0x1, 0x60, 0x0,
0x0, 0xd, 0x31, 0x34, 0xe3, 0x35, 0xe3, 0x30,
0x0, 0xd, 0x35, 0x9a, 0xf9, 0x9a, 0xe9, 0x92,
0x8, 0x8e, 0x98, 0x10, 0x80, 0x1, 0x80, 0x0,
0x5, 0x5f, 0x75, 0x4f, 0xff, 0xff, 0xff, 0x0,
0x0, 0x3f, 0x30, 0x3c, 0x0, 0x0, 0x1f, 0x0,
0x0, 0x8f, 0xe3, 0x3f, 0xff, 0xff, 0xff, 0x0,
0x1, 0xed, 0x7c, 0x3c, 0x0, 0x0, 0x1f, 0x0,
0x9, 0x8d, 0x39, 0x4f, 0xff, 0xff, 0xff, 0x0,
0x2d, 0xd, 0x30, 0x0, 0x7, 0xa0, 0x0, 0x0,
0x0, 0xd, 0x34, 0xee, 0xef, 0xfe, 0xee, 0xe1,
0x0, 0xd, 0x30, 0x0, 0x7d, 0x4f, 0x20, 0x0,
0x0, 0xd, 0x30, 0x4, 0xf4, 0xa, 0xd1, 0x0,
0x0, 0xd, 0x32, 0x9f, 0x50, 0x0, 0xae, 0x60,
0x0, 0xd, 0x3b, 0xa2, 0x0, 0x0, 0x5, 0xd6,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+6B21 "次" */ /* U+6B21 "次" */
0x0, 0x0, 0x0, 0x26, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x26, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x5, 0xd0, 0x0, 0x0, 0x0, 0x6b, 0x0, 0x0, 0x5, 0xd0, 0x0, 0x0, 0x0, 0x6b,
@ -2144,88 +2211,92 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 3436, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 3436, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 3572, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3572, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 3685, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 3685, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 3805, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3805, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3910, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1}, {.bitmap_index = 3910, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 4008, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4015, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4136, .adv_w = 256, .box_w = 15, .box_h = 13, .ofs_x = 1, .ofs_y = -1}, {.bitmap_index = 4113, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4234, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4241, .adv_w = 256, .box_w = 14, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4346, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1}, {.bitmap_index = 4332, .adv_w = 256, .box_w = 15, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4451, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4430, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 4563, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -3}, {.bitmap_index = 4566, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4683, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4678, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4811, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 4783, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4939, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4895, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 5059, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 5015, .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 = 5143, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 5300, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 5271, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5405, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 2, .ofs_y = -1}, {.bitmap_index = 5391, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 5503, .adv_w = 256, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5519, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5607, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5632, .adv_w = 256, .box_w = 16, .box_h = 16, .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 = 5760, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5839, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5865, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 2, .ofs_y = -1},
{.bitmap_index = 5959, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5963, .adv_w = 256, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6079, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1}, {.bitmap_index = 6067, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6177, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6179, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6305, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6299, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6441, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6419, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6537, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6539, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 6649, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6637, .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 = 6765, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6811, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6901, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6939, .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 = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7067, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7109, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7193, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7205, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7321, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7271, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7429, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7399, .adv_w = 256, .box_w = 16, .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 = 7527, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7613, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7653, .adv_w = 256, .box_w = 16, .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 = 7781, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7841, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7889, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7937, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8017, .adv_w = 128, .box_w = 8, .box_h = 14, .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 = 8073, .adv_w = 192, .box_w = 12, .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 = 8157, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8231, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8301, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8336, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8397, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8434, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2}, {.bitmap_index = 8485, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 8514, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1}, {.bitmap_index = 8565, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 8626, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8691, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8696, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8796, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8766, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8894, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 8864, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4}, {.bitmap_index = 8974, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 8892, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 9086, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9000, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 9156, .adv_w = 160, .box_w = 10, .box_h = 14, .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 = 9226, .adv_w = 224, .box_w = 14, .box_h = 14, .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 = 9324, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
{.bitmap_index = 9448, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9352, .adv_w = 288, .box_w = 18, .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 = 9460, .adv_w = 320, .box_w = 20, .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 = 9620, .adv_w = 288, .box_w = 20, .box_h = 16, .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 = 9780, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9824, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 9908, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9952, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 9978, .adv_w = 224, .box_w = 14, .box_h = 10, .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 = 10048, .adv_w = 320, .box_w = 20, .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 = 10188, .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 = 10284, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10412, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 10412, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10510, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 10557, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10606, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 10662, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10702, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 10774, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10814, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 10872, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10926, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 10970, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11034, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3}, {.bitmap_index = 11066, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11196, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 11162, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11292, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 11274, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11442, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11386, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11542, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11494, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 11642, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11656, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11742, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11752, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11842, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 11902, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11942, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 12002, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 12089, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 12102, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 12185, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 12202, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 12297, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3}, {.bitmap_index = 12302, .adv_w = 320, .box_w = 20, .box_h = 10, .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 = 12402, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12562, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 12549, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 12658, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1} {.bitmap_index = 12645, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12757, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 12902, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13022, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13118, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1}
}; };
/*--------------------- /*---------------------
@ -2233,17 +2304,18 @@ 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, 0x429, 0x49e, 0x832,
0xe99, 0xffc, 0x10e2, 0x1116, 0x12b7, 0x130e, 0x144c, 0x1617, 0xc33, 0xe8c, 0xe99, 0xfb6, 0xffc, 0x10e2, 0x1116, 0x12b7,
0x1bc8, 0x218e, 0x22ee, 0x25dc, 0x3015, 0x3356, 0x38f3, 0x3c65, 0x130e, 0x144c, 0x1617, 0x1ac8, 0x1bc8, 0x218e, 0x22ee, 0x25dc,
0x4085, 0x4276, 0x4603, 0xa0a8, 0xa0af, 0xa0b2, 0xa0b3, 0xa0b4, 0x3015, 0x3356, 0x38f3, 0x3c65, 0x4085, 0x4276, 0x4603, 0xa0a8,
0xa0b8, 0xa0ba, 0xa0bc, 0xa0c0, 0xa0c3, 0xa0c8, 0xa0cd, 0xa0ce, 0xa0af, 0xa0b2, 0xa0b3, 0xa0b4, 0xa0b8, 0xa0ba, 0xa0bc, 0xa0c0,
0xa0cf, 0xa0e5, 0xa0ea, 0xa0ef, 0xa0f2, 0xa0f3, 0xa0f4, 0xa0f8, 0xa0c3, 0xa0c8, 0xa0cd, 0xa0ce, 0xa0cf, 0xa0e5, 0xa0ea, 0xa0ef,
0xa0f9, 0xa0fa, 0xa0fb, 0xa10e, 0xa10f, 0xa115, 0xa117, 0xa118, 0xa0f2, 0xa0f3, 0xa0f4, 0xa0f8, 0xa0f9, 0xa0fa, 0xa0fb, 0xa10e,
0xa11b, 0xa11e, 0xa11f, 0xa120, 0xa122, 0xa13a, 0xa13c, 0xa16b, 0xa10f, 0xa115, 0xa117, 0xa118, 0xa11b, 0xa11e, 0xa11f, 0xa120,
0xa16c, 0xa16e, 0xa170, 0xa187, 0xa18e, 0xa191, 0xa19a, 0xa1c3, 0xa122, 0xa13a, 0xa13c, 0xa16b, 0xa16c, 0xa16e, 0xa170, 0xa187,
0xa1cb, 0xa202, 0xa292, 0xa2e7, 0xa2e8, 0xa2e9, 0xa2ea, 0xa2eb, 0xa18e, 0xa191, 0xa19a, 0xa1c3, 0xa1cb, 0xa202, 0xa292, 0xa2e7,
0xa32e, 0xa33a, 0xa394, 0xa3ab, 0xa601, 0xa869, 0xa949 0xa2e8, 0xa2e9, 0xa2ea, 0xa2eb, 0xa32e, 0xa33a, 0xa394, 0xa3ab,
0xa601, 0xa869, 0xa949
}; };
/*Collect the unicode lists and glyph_id offsets*/ /*Collect the unicode lists and glyph_id offsets*/
@ -2259,7 +2331,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 = 87, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 91, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
} }
}; };

View File

@ -0,0 +1,130 @@
/*
* Copyright 2025 NXP
* NXP Proprietary. This software is owned or controlled by NXP and may only be used strictly in
* accordance with the applicable license terms. By expressly accepting such terms or by downloading, installing,
* activating and/or otherwise using the software, you are agreeing that you have read, and that you agree to
* comply with and are bound by, such license terms. If you do not agree to be bound by the applicable license
* terms, then you may not retain, install, activate or otherwise use the software.
*/
#include "lvgl.h"
#include <stdio.h>
#include "gui_guider.h"
#include "events_init.h"
#include "widgets_init.h"
#include "custom.h"
void setup_scr_screen_seting(lv_ui *ui)
{
//Write codes screen_seting
ui->screen_seting = lv_obj_create(NULL);
lv_obj_set_size(ui->screen_seting, 128, 160);
lv_obj_set_scrollbar_mode(ui->screen_seting, LV_SCROLLBAR_MODE_OFF);
//Write style for screen_seting, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_bg_opa(ui->screen_seting, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes screen_seting_cont_1
ui->screen_seting_cont_1 = lv_obj_create(ui->screen_seting);
lv_obj_set_pos(ui->screen_seting_cont_1, 0, 0);
lv_obj_set_size(ui->screen_seting_cont_1, 128, 160);
lv_obj_set_scrollbar_mode(ui->screen_seting_cont_1, LV_SCROLLBAR_MODE_OFF);
//Write style for screen_seting_cont_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_border_width(ui->screen_seting_cont_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_opa(ui->screen_seting_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_color(ui->screen_seting_cont_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_side(ui->screen_seting_cont_1, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->screen_seting_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->screen_seting_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->screen_seting_cont_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->screen_seting_cont_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui->screen_seting_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui->screen_seting_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui->screen_seting_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui->screen_seting_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->screen_seting_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes screen_seting_label_1
ui->screen_seting_label_1 = lv_label_create(ui->screen_seting);
lv_label_set_text(ui->screen_seting_label_1, "电量:100%");
lv_label_set_long_mode(ui->screen_seting_label_1, LV_LABEL_LONG_SCROLL);
lv_obj_set_pos(ui->screen_seting_label_1, 2, 0);
lv_obj_set_size(ui->screen_seting_label_1, 124, 18);
//Write style for screen_seting_label_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_border_width(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui->screen_seting_label_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui->screen_seting_label_1, &lv_font_GB2312_12, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui->screen_seting_label_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_letter_space(ui->screen_seting_label_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_line_space(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->screen_seting_label_1, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->screen_seting_label_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->screen_seting_label_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->screen_seting_label_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui->screen_seting_label_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->screen_seting_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes screen_seting_sw_1
ui->screen_seting_sw_1 = lv_switch_create(ui->screen_seting);
lv_obj_set_pos(ui->screen_seting_sw_1, 79, 25);
lv_obj_set_size(ui->screen_seting_sw_1, 40, 20);
//Write style for screen_seting_sw_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_bg_opa(ui->screen_seting_sw_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->screen_seting_sw_1, lv_color_hex(0xe6e2e6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->screen_seting_sw_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_width(ui->screen_seting_sw_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->screen_seting_sw_1, 10, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->screen_seting_sw_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write style for screen_seting_sw_1, Part: LV_PART_INDICATOR, State: LV_STATE_CHECKED.
lv_obj_set_style_bg_opa(ui->screen_seting_sw_1, 255, LV_PART_INDICATOR|LV_STATE_CHECKED);
lv_obj_set_style_bg_color(ui->screen_seting_sw_1, lv_color_hex(0x2195f6), LV_PART_INDICATOR|LV_STATE_CHECKED);
lv_obj_set_style_bg_grad_dir(ui->screen_seting_sw_1, LV_GRAD_DIR_NONE, LV_PART_INDICATOR|LV_STATE_CHECKED);
lv_obj_set_style_border_width(ui->screen_seting_sw_1, 0, LV_PART_INDICATOR|LV_STATE_CHECKED);
//Write style for screen_seting_sw_1, Part: LV_PART_KNOB, State: LV_STATE_DEFAULT.
lv_obj_set_style_bg_opa(ui->screen_seting_sw_1, 255, LV_PART_KNOB|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->screen_seting_sw_1, lv_color_hex(0xffffff), LV_PART_KNOB|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->screen_seting_sw_1, LV_GRAD_DIR_NONE, LV_PART_KNOB|LV_STATE_DEFAULT);
lv_obj_set_style_border_width(ui->screen_seting_sw_1, 0, LV_PART_KNOB|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->screen_seting_sw_1, 10, LV_PART_KNOB|LV_STATE_DEFAULT);
//Write codes screen_seting_label_2
ui->screen_seting_label_2 = lv_label_create(ui->screen_seting);
lv_label_set_text(ui->screen_seting_label_2, "工厂模式:");
lv_label_set_long_mode(ui->screen_seting_label_2, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_seting_label_2, 7, 25);
lv_obj_set_size(ui->screen_seting_label_2, 69, 20);
//Write style for screen_seting_label_2, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_border_width(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui->screen_seting_label_2, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui->screen_seting_label_2, &lv_font_GB2312_14, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui->screen_seting_label_2, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_letter_space(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_line_space(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->screen_seting_label_2, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui->screen_seting_label_2, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->screen_seting_label_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//The custom code of screen_seting.
//Update current screen layout.
lv_obj_update_layout(ui->screen_seting);
}

View File

@ -272,17 +272,25 @@ extern "C" void Axp202_task(void *pvParameter)
if (io_num == AXP_ISR_GPIO) { if (io_num == AXP_ISR_GPIO) {
axp.readIRQ(); axp.readIRQ();
ESP_LOGI(TAG,"axp-irq"); ESP_LOGI(TAG,"axp-irq");
if (axp.isPEKLongtPressIRQ()) { // axp.debugStatus();
ESP_LOGI("sleep","esp_light_sleep_start"); if (axp.isVbusPlugInIRQ())
esp_timer_stop(SysTick_timer); {
axp.setGPIOMode(AXP_GPIO_0, AXP_IO_INPUT_MODE); // 屏幕供电 ESP_LOGI(TAG,"USB inserted");
vTaskDelay(500/ portTICK_PERIOD_MS);
esp_light_sleep_start();
ESP_LOGI(TAG, "AXP202 PEK key Click:%.2f,%.2f,%.2f,%d",axp.getBattVoltage(),axp.getCoulombData(),axp.getBattDischargeCurrent(),axp.getBattPercentage());
// axp.shutdown();
axp.setGPIOMode(AXP_GPIO_0, AXP_IO_LDO_MODE); // 屏幕供电
esp_timer_start_periodic(SysTick_timer,1000);
} }
if (axp.isVbusRemoveIRQ()) {
ESP_LOGI(TAG,"USB plug out");
}
// if (axp.isPEKLongtPressIRQ()) {
// ESP_LOGI("sleep","esp_light_sleep_start");
// esp_timer_stop(SysTick_timer);
// axp.setGPIOMode(AXP_GPIO_0, AXP_IO_INPUT_MODE); // 屏幕供电
// vTaskDelay(500/ portTICK_PERIOD_MS);
// esp_light_sleep_start();
// ESP_LOGI(TAG, "AXP202 PEK key Click:%.2f,%.2f,%.2f,%d",axp.getBattVoltage(),axp.getCoulombData(),axp.getBattDischargeCurrent(),axp.getBattPercentage());
// // axp.shutdown();
// axp.setGPIOMode(AXP_GPIO_0, AXP_IO_LDO_MODE); // 屏幕供电
// esp_timer_start_periodic(SysTick_timer,1000);
// }
axp.clearIRQ(); axp.clearIRQ();
} }
}else{ }else{

View File

@ -70,12 +70,18 @@ extern int getBattPercentage(void);
void IRAM_ATTR SysTick_Handler(void) void IRAM_ATTR SysTick_Handler(void)
{ {
static uint32_t SysTick_ms_cnt = 0; static uint32_t SysTick_ms_cnt = 0;
static uint8_t wdt_status = 0; static uint32_t SysTick_s_cnt = 0;
if(SysTick_ms_cnt % 1000 == 0)//1s if(SysTick_ms_cnt % 1000 == 0)//1s
{ {
// xEventGroupSetBits(Printer_group,EVENT_GET_Batterylevel); // xEventGroupSetBits(Printer_group,EVENT_GET_Batterylevel);
lv_event_send(guider_ui.screen_label_1, LV_EVENT_CUSTOM_UPDATE, (void *)getBattPercentage()); // lv_event_send(guider_ui.screen_label_1, LV_EVENT_CUSTOM_UPDATE, (void *)getBattPercentage());
SysTick_s_cnt +=1;
} }
if ((SysTick_s_cnt % 10 == 0) && (SysTick_ms_cnt % 1000 == 0)) {
xEventGroupSetBits(System_eventGroup,EVENT_GET_BATTPERCENTAGE);
}
SysTick_ms_cnt ++; SysTick_ms_cnt ++;
@ -118,7 +124,8 @@ stream_data_t wifi_interface_data;
stream_data_t uart_interface_data; stream_data_t uart_interface_data;
Device_info_t off_line_tool; Device_info_t off_line_tool;
// EXT_RAM_BSS_ATTR Sys_config_t System_Config; EventGroupHandle_t System_eventGroup;
Sys_config_t System_Config; Sys_config_t System_Config;
extern void Axp202_task(void *pvParameter); extern void Axp202_task(void *pvParameter);
@ -136,6 +143,9 @@ void app_main(void)
ESP_ERROR_CHECK(err); ESP_ERROR_CHECK(err);
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());
ESP_ERROR_CHECK(esp_event_loop_create_default()); ESP_ERROR_CHECK(esp_event_loop_create_default());
System_eventGroup = xEventGroupCreate();
xTaskCreate(&Gui_Task, "Gui_Task", 1024*30, NULL, 12, NULL); xTaskCreate(&Gui_Task, "Gui_Task", 1024*30, NULL, 12, NULL);
init_spiffs(); init_spiffs();
list_files_in_spiffs("/spiffs",off_line_tool.directory, 10); list_files_in_spiffs("/spiffs",off_line_tool.directory, 10);
@ -207,14 +217,17 @@ void app_main(void)
// Write_ESPFlash(0x40,0x00,&System_Config,sizeof(Sys_config_t)); // Write_ESPFlash(0x40,0x00,&System_Config,sizeof(Sys_config_t));
Timer_Config_Init(); Timer_Config_Init();
EventBits_t bits;
while (1) while (1)
{ {
// if(gpio_get_level(GPIO_NUM_9) == 0 || gpio_get_level(GPIO_NUM_2) == 0) bits = xEventGroupWaitBits(System_eventGroup, EVENT_GET_BATTPERCENTAGE ,pdFALSE,pdFALSE,portMAX_DELAY);
// { if(bits&EVENT_GET_BATTPERCENTAGE)
// ESP_LOGI(TAG,"BOOT Down"); {
// } ESP_LOGI(TAG,"EVENT_GET_BATTPERCENTAGE");
// ESP_LOGI(TAG, "mem free:%ld",esp_get_free_heap_size()); lv_event_send(guider_ui.screen_label_1, LV_EVENT_CUSTOM_UPDATE, (void *)getBattPercentage());
vTaskDelay(1000/ portTICK_PERIOD_MS); xEventGroupClearBits(System_eventGroup,EVENT_GET_BATTPERCENTAGE);
}
} }
} }

View File

@ -45,6 +45,8 @@
#define LV_EVENT_CUSTOM_UPDATE _LV_EVENT_LAST + 1 #define LV_EVENT_CUSTOM_UPDATE _LV_EVENT_LAST + 1
#define EVENT_GET_BATTPERCENTAGE BIT10
typedef struct Device_info_ typedef struct Device_info_
{ {
uint8_t Device_SN[12]; uint8_t Device_SN[12];
@ -68,6 +70,7 @@ extern stream_data_t uart_interface_data;
extern esp_timer_handle_t SysTick_timer; extern esp_timer_handle_t SysTick_timer;
extern EventGroupHandle_t System_eventGroup;
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);