From e25d2122eaca437f405c74d12734711187bfb41c Mon Sep 17 00:00:00 2001 From: sc <2401809606@qq.com> Date: Sat, 7 Mar 2026 00:32:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=BB=BA=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lvgl/guider/generated/events_init.c | 15 + .../lvgl/guider/generated/gui_guider.h | 2 + .../guider_fonts/lv_font_simsun_24.c | 406 +++++++++++------- .../lvgl/guider/generated/setup_scr_screen.c | 29 +- applications/lvgl/ui_data_labels.c | 6 + applications/lvgl/ui_data_labels.h | 1 + 6 files changed, 289 insertions(+), 170 deletions(-) diff --git a/applications/lvgl/guider/generated/events_init.c b/applications/lvgl/guider/generated/events_init.c index 23c7d41..d1b3cc0 100644 --- a/applications/lvgl/guider/generated/events_init.c +++ b/applications/lvgl/guider/generated/events_init.c @@ -321,6 +321,20 @@ static void screen_set_Save_event_handler (lv_event_t *e) } } +static void screen_set_new_event_handler (lv_event_t *e) +{ + lv_event_code_t code = lv_event_get_code(e); + switch (code) { + case LV_EVENT_CLICKED: + { + UI_pname_new(); + break; + } + default: + break; + } +} + static void screen_sys_save_event_handler (lv_event_t *e) { lv_event_code_t code = lv_event_get_code(e); @@ -478,6 +492,7 @@ void events_init_screen (lv_ui *ui) lv_obj_add_event_cb(ui->screen_set_Edit, screen_set_Edit_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_set_Delete, screen_set_Delete_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_set_Save, screen_set_Save_event_handler, LV_EVENT_ALL, ui); + lv_obj_add_event_cb(ui->screen_set_new, screen_set_new_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_sys_save, screen_sys_save_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_stepinf_s1, screen_stepinf_s1_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_stepinf_s2, screen_stepinf_s2_event_handler, LV_EVENT_ALL, ui); diff --git a/applications/lvgl/guider/generated/gui_guider.h b/applications/lvgl/guider/generated/gui_guider.h index 9581132..df8adba 100644 --- a/applications/lvgl/guider/generated/gui_guider.h +++ b/applications/lvgl/guider/generated/gui_guider.h @@ -439,6 +439,8 @@ typedef struct lv_obj_t *screen_step_set; lv_obj_t *screen_proess_set; lv_obj_t *screen_label_55; + lv_obj_t *screen_set_new; + lv_obj_t *screen_set_new_label; lv_obj_t *screen_w_5; lv_obj_t *screen_machine_name_rt; lv_obj_t *screen_sys_name; diff --git a/applications/lvgl/guider/generated/guider_fonts/lv_font_simsun_24.c b/applications/lvgl/guider/generated/guider_fonts/lv_font_simsun_24.c index 4cddd37..04b9669 100644 --- a/applications/lvgl/guider/generated/guider_fonts/lv_font_simsun_24.c +++ b/applications/lvgl/guider/generated/guider_fonts/lv_font_simsun_24.c @@ -2664,6 +2664,42 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + /* U+5EFA "建" */ + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x4, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x2b, 0x1, 0x22, + 0x25, 0xf2, 0x22, 0x5d, 0x10, 0x0, 0x1a, 0x77, + 0x7e, 0xe4, 0x16, 0x44, 0x7f, 0x44, 0x47, 0xf4, + 0x0, 0x0, 0x0, 0x3, 0xf3, 0x0, 0x0, 0x3, + 0xf0, 0x0, 0x4e, 0x3, 0x0, 0x0, 0x0, 0xc9, + 0x6, 0x77, 0x77, 0x9f, 0x77, 0x7a, 0xfa, 0xf5, + 0x0, 0x0, 0x6e, 0x0, 0x10, 0x0, 0x3, 0xf0, + 0x0, 0x4e, 0x0, 0x0, 0x0, 0x1e, 0x40, 0x0, + 0x0, 0x0, 0x3f, 0x0, 0x4, 0xe0, 0x0, 0x0, + 0x9, 0xa0, 0x6, 0x4, 0x87, 0x79, 0xf7, 0x77, + 0xaf, 0x0, 0x0, 0x9, 0xf8, 0x79, 0xf9, 0x0, + 0x0, 0x3f, 0x0, 0x3, 0x60, 0x0, 0x0, 0x4, + 0x0, 0x4f, 0x10, 0x0, 0x3, 0xf0, 0x0, 0x30, + 0x0, 0x0, 0x0, 0x0, 0x6, 0xd0, 0x47, 0x77, + 0x9f, 0x77, 0x7f, 0xb0, 0x0, 0x0, 0x7, 0x0, + 0x8a, 0x0, 0x10, 0x3, 0xf0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x81, 0xc, 0x70, 0x0, 0x0, 0x3f, + 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x90, 0xf3, + 0x67, 0x77, 0x79, 0xf7, 0x77, 0x79, 0xfb, 0x0, + 0x0, 0xb, 0x8d, 0x2, 0x0, 0x0, 0x3f, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x80, 0x0, + 0x0, 0x3, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x3, 0xfe, 0x50, 0x0, 0x0, 0x4f, 0x20, 0x0, + 0x0, 0x0, 0x0, 0x0, 0xd4, 0x5e, 0xd7, 0x20, + 0x4, 0xb1, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb5, + 0x0, 0x18, 0xef, 0xfc, 0xa9, 0x88, 0x88, 0x9a, + 0xa9, 0x1, 0x92, 0x0, 0x0, 0x0, 0x48, 0xbd, + 0xef, 0xff, 0xff, 0xf9, 0x0, 0x40, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, + /* U+5F00 "开" */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @@ -3299,6 +3335,40 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x1, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, + /* U+65B0 "新" */ + 0x0, 0x0, 0x23, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xc1, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x48, 0x0, 0x0, 0x0, + 0x2, 0xf5, 0x0, 0x32, 0x4, 0x0, 0x5c, 0xff, + 0x70, 0x6, 0x77, 0x77, 0xd7, 0x77, 0xee, 0x2e, + 0xa8, 0x63, 0x0, 0x0, 0x1, 0x10, 0x0, 0x0, + 0x95, 0x0, 0xe, 0x50, 0x0, 0x0, 0x0, 0x0, + 0xb, 0x20, 0x0, 0xeb, 0x0, 0xe, 0x50, 0x0, + 0x0, 0x0, 0x0, 0x6, 0xe2, 0x2, 0xd0, 0x0, + 0xd, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf5, + 0x8, 0x50, 0x0, 0xd, 0x50, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x50, 0xa, 0x0, 0x4c, 0x1d, 0x50, + 0x0, 0x8, 0xb0, 0x4a, 0x77, 0x77, 0xf9, 0x77, + 0x77, 0x4d, 0xa7, 0x7c, 0xa9, 0x94, 0x0, 0x0, + 0x0, 0xf3, 0x0, 0x0, 0xd, 0x50, 0xd, 0x60, + 0x0, 0x0, 0x0, 0x0, 0xf3, 0x0, 0x10, 0xe, + 0x50, 0xd, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf3, + 0x2, 0xe7, 0xe, 0x50, 0xd, 0x60, 0x0, 0x6, + 0x87, 0x77, 0xf9, 0x77, 0x77, 0x1f, 0x30, 0xd, + 0x60, 0x0, 0x0, 0x6, 0x30, 0xf3, 0x30, 0x0, + 0x1f, 0x10, 0xd, 0x60, 0x0, 0x0, 0xe, 0xc0, + 0xf3, 0x7c, 0x20, 0x4e, 0x0, 0xd, 0x60, 0x0, + 0x0, 0x5e, 0x10, 0xf3, 0xc, 0xd0, 0x8a, 0x0, + 0xd, 0x60, 0x0, 0x0, 0xc5, 0x0, 0xf3, 0x4, + 0xb0, 0xd5, 0x0, 0xd, 0x60, 0x0, 0x5, 0x90, + 0x0, 0xf3, 0x0, 0x5, 0xc0, 0x0, 0xd, 0x60, + 0x0, 0x19, 0x0, 0x0, 0xf3, 0x0, 0x1c, 0x10, + 0x0, 0xe, 0x60, 0x0, 0x40, 0x6, 0xbf, 0xf2, + 0x0, 0xa2, 0x0, 0x0, 0xe, 0x60, 0x0, 0x0, + 0x0, 0xb, 0x90, 0x19, 0x20, 0x0, 0x0, 0xe, + 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, + 0x0, 0x0, 0x5, 0x0, 0x0, + /* U+65F6 "时" */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @@ -7895,157 +7965,159 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { {.bitmap_index = 17712, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 17977, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 18242, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 18507, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 18749, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 19002, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 19267, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 19520, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 19785, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 20038, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 20303, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 20533, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 18507, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 18772, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 19014, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 19267, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 19532, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 19785, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 20050, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 20303, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 20568, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, {.bitmap_index = 20798, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21063, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21339, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21063, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21328, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 21604, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21869, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 22145, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21869, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 22134, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 22410, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 22675, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 22928, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 23204, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 23446, .adv_w = 384, .box_w = 19, .box_h = 22, .ofs_x = 3, .ofs_y = -3}, - {.bitmap_index = 23655, .adv_w = 384, .box_w = 18, .box_h = 23, .ofs_x = 4, .ofs_y = -3}, - {.bitmap_index = 23862, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 24115, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 22675, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 22940, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 23193, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 23469, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 23722, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 23964, .adv_w = 384, .box_w = 19, .box_h = 22, .ofs_x = 3, .ofs_y = -3}, + {.bitmap_index = 24173, .adv_w = 384, .box_w = 18, .box_h = 23, .ofs_x = 4, .ofs_y = -3}, {.bitmap_index = 24380, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 24633, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 24898, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 25163, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 25416, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 25692, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 25934, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 26187, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 26407, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 26672, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 26925, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 27178, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 27420, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 27696, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 27938, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 28191, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 28467, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 28709, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 28974, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 29226, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 29490, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 29732, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 30008, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 30273, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 30526, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 30779, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 30999, .adv_w = 384, .box_w = 15, .box_h = 22, .ofs_x = 5, .ofs_y = -3}, - {.bitmap_index = 31164, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 31417, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 31670, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 31935, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 32200, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 32442, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 32695, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 32937, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 33190, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 33432, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 33685, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 33938, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 34191, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 34444, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 34697, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 34950, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 35192, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 35457, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 35710, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 35986, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 36239, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 36515, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 36768, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 37033, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 37309, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 37574, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 37850, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 38126, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 38390, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 38666, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 38931, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 24633, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 24898, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 25151, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 25416, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 25681, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 25934, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 26210, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 26452, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 26705, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 26925, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 27190, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 27443, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 27696, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 27938, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 28214, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 28456, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 28709, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 28985, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 29227, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 29492, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 29744, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 30008, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 30250, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 30526, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 30791, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 31044, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 31297, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 31517, .adv_w = 384, .box_w = 15, .box_h = 22, .ofs_x = 5, .ofs_y = -3}, + {.bitmap_index = 31682, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 31935, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 32188, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 32453, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 32718, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 32960, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 33213, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 33455, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 33708, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 33950, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 34203, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 34456, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 34709, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 34962, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 35215, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 35468, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 35710, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 35975, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 36228, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 36504, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 36757, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 37033, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 37286, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 37551, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 37827, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 38092, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 38368, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 38644, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 38908, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 39184, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 39449, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 39714, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 39944, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 40197, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 40439, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 40692, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 40957, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 41233, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 41475, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 41740, .adv_w = 384, .box_w = 24, .box_h = 25, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 42040, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 42256, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 42520, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 42736, .adv_w = 264, .box_w = 17, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 42889, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 43177, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 43465, .adv_w = 432, .box_w = 27, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 43762, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 44050, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 44293, .adv_w = 384, .box_w = 24, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 44605, .adv_w = 192, .box_w = 12, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 44719, .adv_w = 288, .box_w = 18, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 44890, .adv_w = 432, .box_w = 27, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 45214, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 45430, .adv_w = 264, .box_w = 17, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 45634, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 45799, .adv_w = 336, .box_w = 21, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 46072, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 46303, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 46534, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 46699, .adv_w = 336, .box_w = 23, .box_h = 22, .ofs_x = -1, .ofs_y = -2}, - {.bitmap_index = 46952, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 47095, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 47238, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 47469, .adv_w = 336, .box_w = 21, .box_h = 6, .ofs_x = 0, .ofs_y = 6}, - {.bitmap_index = 47532, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 47775, .adv_w = 480, .box_w = 31, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 48147, .adv_w = 432, .box_w = 29, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 48495, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 48759, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, - {.bitmap_index = 48906, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, - {.bitmap_index = 49053, .adv_w = 480, .box_w = 31, .box_h = 19, .ofs_x = -1, .ofs_y = -1}, - {.bitmap_index = 49348, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 49564, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 49852, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 50165, .adv_w = 336, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 50407, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 50659, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 50890, .adv_w = 336, .box_w = 21, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 51100, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 51316, .adv_w = 240, .box_w = 17, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 51520, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 51772, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 52024, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 52267, .adv_w = 384, .box_w = 26, .box_h = 26, .ofs_x = -1, .ofs_y = -4}, - {.bitmap_index = 52605, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 52821, .adv_w = 480, .box_w = 30, .box_h = 23, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 53166, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 53406, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 53646, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 53886, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 54126, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 54366, .adv_w = 480, .box_w = 31, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 54676, .adv_w = 336, .box_w = 19, .box_h = 24, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 54904, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 55156, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -4}, - {.bitmap_index = 55469, .adv_w = 480, .box_w = 30, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 55739, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 55955, .adv_w = 386, .box_w = 25, .box_h = 16, .ofs_x = 0, .ofs_y = 1} + {.bitmap_index = 39449, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 39702, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 39967, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 40232, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 40462, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 40715, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 40957, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 41210, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 41475, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 41751, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 41993, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 42258, .adv_w = 384, .box_w = 24, .box_h = 25, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 42558, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 42774, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 43038, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 43254, .adv_w = 264, .box_w = 17, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 43407, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 43695, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 43983, .adv_w = 432, .box_w = 27, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 44280, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 44568, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 44811, .adv_w = 384, .box_w = 24, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 45123, .adv_w = 192, .box_w = 12, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 45237, .adv_w = 288, .box_w = 18, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 45408, .adv_w = 432, .box_w = 27, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 45732, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 45948, .adv_w = 264, .box_w = 17, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 46152, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 46317, .adv_w = 336, .box_w = 21, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 46590, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 46821, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 47052, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 47217, .adv_w = 336, .box_w = 23, .box_h = 22, .ofs_x = -1, .ofs_y = -2}, + {.bitmap_index = 47470, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 47613, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 47756, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 47987, .adv_w = 336, .box_w = 21, .box_h = 6, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 48050, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 48293, .adv_w = 480, .box_w = 31, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 48665, .adv_w = 432, .box_w = 29, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 49013, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 49277, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 49424, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 49571, .adv_w = 480, .box_w = 31, .box_h = 19, .ofs_x = -1, .ofs_y = -1}, + {.bitmap_index = 49866, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 50082, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 50370, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 50683, .adv_w = 336, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 50925, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 51177, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 51408, .adv_w = 336, .box_w = 21, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 51618, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 51834, .adv_w = 240, .box_w = 17, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 52038, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 52290, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 52542, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 52785, .adv_w = 384, .box_w = 26, .box_h = 26, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 53123, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 53339, .adv_w = 480, .box_w = 30, .box_h = 23, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 53684, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 53924, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 54164, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 54404, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 54644, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 54884, .adv_w = 480, .box_w = 31, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 55194, .adv_w = 336, .box_w = 19, .box_h = 24, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 55422, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 55674, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 55987, .adv_w = 480, .box_w = 30, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 56257, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 56473, .adv_w = 386, .box_w = 25, .box_h = 16, .ofs_x = 0, .ofs_y = 1} }; /*--------------------- @@ -8058,26 +8130,26 @@ static const uint16_t unicode_list_1[] = { 0x51bf, 0x51eb, 0x51ef, 0x51f0, 0x51f8, 0x5297, 0x52a5, 0x52db, 0x5312, 0x5326, 0x533b, 0x5340, 0x5347, 0x535d, 0x537f, 0x53a8, 0x53b8, 0x53cc, 0x53cd, 0x5507, 0x5584, 0x5857, 0x591b, 0x5aa8, - 0x5adc, 0x5aea, 0x5af2, 0x5d35, 0x5d53, 0x5ddf, 0x5df6, 0x5e50, - 0x5ed5, 0x5efa, 0x5f3b, 0x5f51, 0x5fbf, 0x6160, 0x6187, 0x621c, - 0x62e2, 0x62f7, 0x6320, 0x6322, 0x6355, 0x6396, 0x641d, 0x64c0, - 0x64e9, 0x6546, 0x655e, 0x6642, 0x666f, 0x668a, 0x66af, 0x6757, - 0x6787, 0x67c6, 0x6810, 0x6ab2, 0x6ab5, 0x6b24, 0x6b64, 0x6b84, - 0x6c38, 0x6c45, 0x6c67, 0x6c91, 0x6c9b, 0x6cc4, 0x6cd8, 0x6d02, - 0x6d79, 0x6de0, 0x6df2, 0x7206, 0x72d7, 0x72ff, 0x7478, 0x7485, - 0x763e, 0x7751, 0x77be, 0x791d, 0x795b, 0x79ca, 0x7a99, 0x7c4b, - 0x7e0f, 0x7e16, 0x7e23, 0x7e2f, 0x7e66, 0x7e88, 0x804d, 0x81c2, - 0x81ca, 0x81d2, 0x82bf, 0x8af1, 0x8af4, 0x8b25, 0x8ebc, 0x8ecd, - 0x8ee1, 0x8ee3, 0x8f20, 0x8f2b, 0x8f51, 0x8f6f, 0x90c8, 0x911d, - 0x911f, 0x9451, 0x9544, 0x959d, 0x95b4, 0x97d4, 0x97d6, 0x97ec, - 0x981e, 0x99f4, 0xef51, 0xef58, 0xef5b, 0xef5c, 0xef5d, 0xef61, - 0xef63, 0xef65, 0xef69, 0xef6c, 0xef71, 0xef76, 0xef77, 0xef78, - 0xef8e, 0xef93, 0xef98, 0xef9b, 0xef9c, 0xef9d, 0xefa1, 0xefa2, - 0xefa3, 0xefa4, 0xefb7, 0xefb8, 0xefbe, 0xefc0, 0xefc1, 0xefc4, - 0xefc7, 0xefc8, 0xefc9, 0xefcb, 0xefe3, 0xefe5, 0xf014, 0xf015, - 0xf017, 0xf019, 0xf030, 0xf037, 0xf03a, 0xf043, 0xf06c, 0xf074, - 0xf0ab, 0xf13b, 0xf190, 0xf191, 0xf192, 0xf193, 0xf194, 0xf1d7, - 0xf1e3, 0xf23d, 0xf254, 0xf4aa, 0xf712, 0xf7f2 + 0x5adc, 0x5aea, 0x5af2, 0x5d35, 0x5d53, 0x5ddf, 0x5df6, 0x5e4a, + 0x5e50, 0x5ed5, 0x5efa, 0x5f3b, 0x5f51, 0x5fbf, 0x6160, 0x6187, + 0x621c, 0x62e2, 0x62f7, 0x6320, 0x6322, 0x6355, 0x6396, 0x641d, + 0x64c0, 0x64e9, 0x6500, 0x6546, 0x655e, 0x6642, 0x666f, 0x668a, + 0x66af, 0x6757, 0x6787, 0x67c6, 0x6810, 0x6ab2, 0x6ab5, 0x6b24, + 0x6b64, 0x6b84, 0x6c38, 0x6c45, 0x6c67, 0x6c91, 0x6c9b, 0x6cc4, + 0x6cd8, 0x6d02, 0x6d79, 0x6de0, 0x6df2, 0x7206, 0x72d7, 0x72ff, + 0x7478, 0x7485, 0x763e, 0x7751, 0x77be, 0x791d, 0x795b, 0x79ca, + 0x7a99, 0x7c4b, 0x7e0f, 0x7e16, 0x7e23, 0x7e2f, 0x7e66, 0x7e88, + 0x804d, 0x81c2, 0x81ca, 0x81d2, 0x82bf, 0x8af1, 0x8af4, 0x8b25, + 0x8ebc, 0x8ecd, 0x8ee1, 0x8ee3, 0x8f20, 0x8f2b, 0x8f51, 0x8f6f, + 0x90c8, 0x911d, 0x911f, 0x9451, 0x9544, 0x959d, 0x95b4, 0x97d4, + 0x97d6, 0x97ec, 0x981e, 0x99f4, 0xef51, 0xef58, 0xef5b, 0xef5c, + 0xef5d, 0xef61, 0xef63, 0xef65, 0xef69, 0xef6c, 0xef71, 0xef76, + 0xef77, 0xef78, 0xef8e, 0xef93, 0xef98, 0xef9b, 0xef9c, 0xef9d, + 0xefa1, 0xefa2, 0xefa3, 0xefa4, 0xefb7, 0xefb8, 0xefbe, 0xefc0, + 0xefc1, 0xefc4, 0xefc7, 0xefc8, 0xefc9, 0xefcb, 0xefe3, 0xefe5, + 0xf014, 0xf015, 0xf017, 0xf019, 0xf030, 0xf037, 0xf03a, 0xf043, + 0xf06c, 0xf074, 0xf0ab, 0xf13b, 0xf190, 0xf191, 0xf192, 0xf193, + 0xf194, 0xf1d7, 0xf1e3, 0xf23d, 0xf254, 0xf4aa, 0xf712, 0xf7f2 }; /*Collect the unicode lists and glyph_id offsets*/ @@ -8089,7 +8161,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = }, { .range_start = 176, .range_length = 63475, .glyph_id_start = 96, - .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 198, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 200, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY } }; diff --git a/applications/lvgl/guider/generated/setup_scr_screen.c b/applications/lvgl/guider/generated/setup_scr_screen.c index cc91b03..90f767d 100644 --- a/applications/lvgl/guider/generated/setup_scr_screen.c +++ b/applications/lvgl/guider/generated/setup_scr_screen.c @@ -6961,7 +6961,7 @@ void setup_scr_screen(lv_ui *ui) lv_obj_add_event_cb(ui->screen_pname_set, ta_event_cb, LV_EVENT_ALL, ui->g_kb_top_layer); #endif lv_obj_set_pos(ui->screen_pname_set, 405, 0); - lv_obj_set_size(ui->screen_pname_set, 614, 50); + lv_obj_set_size(ui->screen_pname_set, 514, 50); //Write style for screen_pname_set, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. lv_obj_set_style_text_color(ui->screen_pname_set, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT); @@ -6974,7 +6974,7 @@ void setup_scr_screen(lv_ui *ui) lv_obj_set_style_bg_grad_dir(ui->screen_pname_set, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_border_width(ui->screen_pname_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_shadow_width(ui->screen_pname_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_top(ui->screen_pname_set, 5, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui->screen_pname_set, 8, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_pad_right(ui->screen_pname_set, 2, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_pad_left(ui->screen_pname_set, 2, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_radius(ui->screen_pname_set, 4, LV_PART_MAIN|LV_STATE_DEFAULT); @@ -7062,7 +7062,7 @@ void setup_scr_screen(lv_ui *ui) lv_obj_align(ui->screen_set_Save_label, LV_ALIGN_CENTER, 0, 0); lv_obj_set_style_pad_all(ui->screen_set_Save, 0, LV_STATE_DEFAULT); lv_obj_set_width(ui->screen_set_Save_label, LV_PCT(100)); - lv_obj_set_pos(ui->screen_set_Save, 890, 440); + lv_obj_set_pos(ui->screen_set_Save, 890, 439); lv_obj_set_size(ui->screen_set_Save, 100, 50); //Write style for screen_set_Save, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. @@ -7159,6 +7159,29 @@ void setup_scr_screen(lv_ui *ui) lv_obj_set_style_pad_left(ui->screen_label_55, 2, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_shadow_width(ui->screen_label_55, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + //Write codes screen_set_new + ui->screen_set_new = lv_btn_create(ui->screen_tabview_tab_4); + ui->screen_set_new_label = lv_label_create(ui->screen_set_new); + lv_label_set_text(ui->screen_set_new_label, "新建"); + lv_label_set_long_mode(ui->screen_set_new_label, LV_LABEL_LONG_WRAP); + lv_obj_align(ui->screen_set_new_label, LV_ALIGN_CENTER, 0, 0); + lv_obj_set_style_pad_all(ui->screen_set_new, 0, LV_STATE_DEFAULT); + lv_obj_set_width(ui->screen_set_new_label, LV_PCT(100)); + lv_obj_set_pos(ui->screen_set_new, 928, 5); + lv_obj_set_size(ui->screen_set_new, 85, 40); + + //Write style for screen_set_new, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. + lv_obj_set_style_bg_opa(ui->screen_set_new, 255, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui->screen_set_new, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_grad_dir(ui->screen_set_new, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_width(ui->screen_set_new, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_radius(ui->screen_set_new, 5, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_shadow_width(ui->screen_set_new, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_text_color(ui->screen_set_new, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_text_font(ui->screen_set_new, &lv_font_simsun_24, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_text_opa(ui->screen_set_new, 255, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_text_align(ui->screen_set_new, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT); + //Write codes 系统 ui->screen_tabview_tab_5 = lv_tabview_add_tab(ui->screen_tabview,"系统"); lv_obj_t * screen_tabview_tab_5_label = lv_label_create(ui->screen_tabview_tab_5); diff --git a/applications/lvgl/ui_data_labels.c b/applications/lvgl/ui_data_labels.c index 660196a..bcf0ddc 100644 --- a/applications/lvgl/ui_data_labels.c +++ b/applications/lvgl/ui_data_labels.c @@ -601,3 +601,9 @@ void UI_pname_del() UI_pname_Program[0]='\0'; UI_pname_Program_row =0; } + +//新建工艺 +void UI_pname_new() +{ + +} diff --git a/applications/lvgl/ui_data_labels.h b/applications/lvgl/ui_data_labels.h index b6f91f9..96f8af7 100644 --- a/applications/lvgl/ui_data_labels.h +++ b/applications/lvgl/ui_data_labels.h @@ -117,6 +117,7 @@ void UI_pname_step_inf(char* str_data,int row); void UI_pname_step_del(char* str_data,int row); void UI_pname_row_del(char* str_data); void UI_pname_del(); +void UI_pname_new(); //step #include