From b63451ba4704937cdd1d4266a1624bb50c8b38a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=B1=20=E6=B2=88?= <2401809606@qq.com> Date: Sat, 21 Feb 2026 23:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/data/SC828_DATA_table.c | 2 +- applications/data/SC828_DATA_table.h | 2 +- applications/lvgl/guider/custom/custom.c | 20 +- .../lvgl/guider/generated/events_init.c | 1 + .../lvgl/guider/generated/gui_guider.h | 11 +- .../guider_fonts/lv_font_simsun_24.c | 434 +++++++++--------- .../lvgl/guider/generated/setup_scr_screen.c | 240 ++-------- applications/lvgl/ui_data_csv.c | 73 +++ applications/lvgl/ui_data_csv.h | 1 + applications/lvgl/ui_data_labels.c | 50 +- applications/lvgl/ui_data_labels.h | 10 + 11 files changed, 413 insertions(+), 431 deletions(-) diff --git a/applications/data/SC828_DATA_table.c b/applications/data/SC828_DATA_table.c index 8434c78..26cf146 100644 --- a/applications/data/SC828_DATA_table.c +++ b/applications/data/SC828_DATA_table.c @@ -263,7 +263,7 @@ void DATA_Table_Init(){ } } //运行指令:开始 -void DATA_INSTRUCTION_START(char p[25]){ +void DATA_INSTRUCTION_START(IO_STEP_DATA * data){ for(int i=0;i<256;i++) { step_table[i].RUN = 0; diff --git a/applications/data/SC828_DATA_table.h b/applications/data/SC828_DATA_table.h index 48deee2..b9934b2 100644 --- a/applications/data/SC828_DATA_table.h +++ b/applications/data/SC828_DATA_table.h @@ -83,7 +83,7 @@ extern const unsigned char AO_TABLE_SIZE; extern const unsigned char DATA_TABLE_SIZE; void DATA_Table_Init(void);// -void DATA_INSTRUCTION_START(char p[25]); +void DATA_INSTRUCTION_START(IO_STEP_DATA * data); void DATA_INSTRUCTION_STOP(); rt_int16_t get_ai_value(int pin); diff --git a/applications/lvgl/guider/custom/custom.c b/applications/lvgl/guider/custom/custom.c index b6de74f..1a84e57 100644 --- a/applications/lvgl/guider/custom/custom.c +++ b/applications/lvgl/guider/custom/custom.c @@ -217,7 +217,7 @@ void custom_init(lv_ui *ui) lv_obj_set_style_pad_all(ui->screen_w_io_tab_4, 0, LV_PART_MAIN); lv_obj_set_scroll_dir(ui->screen_w_io_tab_4, LV_DIR_NONE); - // + //工单页面的工艺信息列表 guider_ui.screen_list_inf = lv_table_create(guider_ui.screen_inf_list); table_style_init(guider_ui.screen_list_inf); lv_obj_add_event_cb(guider_ui.screen_list_inf, table_style_cb, LV_EVENT_DRAW_PART_BEGIN, NULL); @@ -227,7 +227,7 @@ void custom_init(lv_ui *ui) lv_table_set_cell_value(guider_ui.screen_list_inf,0,0,"工单"); lv_table_set_cell_value(guider_ui.screen_list_inf,0,1,"工艺"); - // + //工单页面的步骤列表 guider_ui.screen_w_list_NAME = lv_table_create(guider_ui.screen_tabview_tab_1); lv_obj_set_pos(guider_ui.screen_w_list_NAME, 0, 0); lv_obj_set_size(guider_ui.screen_w_list_NAME, 300, 50); @@ -239,10 +239,6 @@ void custom_init(lv_ui *ui) lv_table_set_cell_value(guider_ui.screen_w_list_NAME,0,0,"步"); lv_table_set_cell_value(guider_ui.screen_w_list_NAME,0,1,"工艺"); - - - - guider_ui.screen_w_list = lv_table_create(guider_ui.screen_step_list); table_style_init(guider_ui.screen_w_list); lv_obj_add_event_cb(guider_ui.screen_w_list, table_step_cb, LV_EVENT_DRAW_PART_BEGIN, NULL); @@ -254,9 +250,19 @@ void custom_init(lv_ui *ui) lv_obj_set_style_min_height(guider_ui.screen_w_list, 100, LV_PART_ITEMS | LV_STATE_DEFAULT); lv_obj_set_style_max_height(guider_ui.screen_w_list, 100, LV_PART_ITEMS | LV_STATE_DEFAULT); - // + //工单页面的信息 lv_obj_set_size(guider_ui.screen_text_inf, 550, 230); lv_label_set_text(guider_ui.screen_text_inf,""); + + //运行页面的步骤列表 + guider_ui.screen_run_step = lv_table_create(guider_ui.screen_cont_p); + table_style_init(guider_ui.screen_run_step); + lv_obj_add_event_cb(guider_ui.screen_run_step, table_style_cb, LV_EVENT_DRAW_PART_BEGIN, NULL); + lv_table_set_row_cnt(guider_ui.screen_run_step,1); + lv_table_set_col_width(guider_ui.screen_run_step, 0, 80); + lv_table_set_col_width(guider_ui.screen_run_step, 1, 370); + lv_table_set_cell_value(guider_ui.screen_run_step,0,0,"步"); + lv_table_set_cell_value(guider_ui.screen_run_step,0,1,"工艺"); /* Add your codes here */ } diff --git a/applications/lvgl/guider/generated/events_init.c b/applications/lvgl/guider/generated/events_init.c index cd0bc7d..60fe355 100644 --- a/applications/lvgl/guider/generated/events_init.c +++ b/applications/lvgl/guider/generated/events_init.c @@ -77,6 +77,7 @@ static void screen_w_start_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { + Work_start(); break; } default: diff --git a/applications/lvgl/guider/generated/gui_guider.h b/applications/lvgl/guider/generated/gui_guider.h index 47e73b6..92ab3ee 100644 --- a/applications/lvgl/guider/generated/gui_guider.h +++ b/applications/lvgl/guider/generated/gui_guider.h @@ -427,10 +427,6 @@ typedef struct lv_obj_t *screen_btn_AIOU_label; lv_obj_t *screen_btn_AIOD; lv_obj_t *screen_btn_AIOD_label; - lv_obj_t *screen_proess_set; - lv_obj_t *screen_proess_set_item0; - lv_obj_t *screen_step_set; - lv_obj_t *screen_step_set_item0; lv_obj_t *screen_pname_set; lv_obj_t *screen_set_Insert; lv_obj_t *screen_set_Insert_label; @@ -441,8 +437,8 @@ typedef struct lv_obj_t *screen_set_Save; lv_obj_t *screen_set_Save_label; lv_obj_t *screen_step_; - lv_obj_t *screen_cont_2; - lv_obj_t *screen_cont_1; + lv_obj_t *screen_step_set; + lv_obj_t *screen_proess_set; lv_obj_t *screen_w_5; lv_obj_t *screen_machine_name_rt; lv_obj_t *screen_sys_name; @@ -452,9 +448,10 @@ typedef struct lv_obj_t *screen_sys_save; lv_obj_t *screen_sys_save_label; lv_obj_t *g_kb_top_layer; - lv_obj_t *screen_w_list; + lv_obj_t *screen_w_list; lv_obj_t *screen_list_inf; lv_obj_t *screen_w_list_NAME; + lv_obj_t *screen_run_step; }lv_ui; typedef void (*ui_setup_scr_t)(lv_ui * ui); 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 b8cfb97..9336906 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 @@ -1098,6 +1098,11 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x80, 0x5, 0x0, 0x0, 0xbc, 0x13, 0x70, 0x0, 0x0, 0x0, 0x9, 0xd9, 0x0, + /* U+00B0 "°" */ + 0x0, 0x44, 0x0, 0x2c, 0x88, 0xc1, 0xa3, 0x0, + 0x67, 0xc0, 0x0, 0x48, 0x94, 0x0, 0x95, 0x1a, + 0xcc, 0x90, 0x0, 0x0, 0x0, + /* U+4E3B "主" */ 0x0, 0x0, 0x0, 0x0, 0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @@ -7528,194 +7533,195 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { {.bitmap_index = 6809, .adv_w = 192, .box_w = 2, .box_h = 24, .ofs_x = 5, .ofs_y = -3}, {.bitmap_index = 6833, .adv_w = 192, .box_w = 6, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 6896, .adv_w = 192, .box_w = 12, .box_h = 5, .ofs_x = 0, .ofs_y = 16}, - {.bitmap_index = 6926, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 7179, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 7444, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 7697, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 7962, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 8215, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 8480, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 8756, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 9021, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 9297, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 9528, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 9804, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 10080, .adv_w = 384, .box_w = 19, .box_h = 23, .ofs_x = 3, .ofs_y = -3}, - {.bitmap_index = 10299, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 10564, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 10817, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 11059, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 11301, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 11554, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 11796, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 12049, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 12302, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 12555, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 12808, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 13061, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 13314, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 13544, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 13774, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 14027, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 14247, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 14477, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 14707, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 14938, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 15169, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 15434, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 15687, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 15940, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 16193, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 16446, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 16711, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 16964, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 17217, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 17482, .adv_w = 384, .box_w = 22, .box_h = 19, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 17691, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 17956, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 18221, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 18486, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 18728, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 18981, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 19246, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 19511, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 19764, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 20029, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 20259, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 20524, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 20789, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21065, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21330, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21595, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 21871, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 22136, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 22401, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 22654, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 22930, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 23172, .adv_w = 384, .box_w = 19, .box_h = 22, .ofs_x = 3, .ofs_y = -3}, - {.bitmap_index = 23381, .adv_w = 384, .box_w = 18, .box_h = 23, .ofs_x = 4, .ofs_y = -3}, - {.bitmap_index = 23588, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 23841, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 24106, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 24359, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 24624, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 24889, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 25142, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 25384, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 25637, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 25857, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 26122, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 26375, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 26628, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 26870, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 27112, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 27365, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 27641, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 27906, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 28158, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 28422, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 28698, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 28963, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 29216, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 29469, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 29689, .adv_w = 384, .box_w = 15, .box_h = 22, .ofs_x = 5, .ofs_y = -3}, - {.bitmap_index = 29854, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 30107, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 30372, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 30637, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 30879, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 31132, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 31374, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 31627, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 31869, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 32122, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 32375, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 32628, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 32881, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 33134, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 33387, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 33629, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 33894, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 34147, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 34423, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 34699, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 34952, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 35217, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 35493, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 35758, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 36034, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 36298, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 36574, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 36827, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 37092, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 37357, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 37587, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 37840, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, - {.bitmap_index = 38082, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 38335, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 38600, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 38876, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 39118, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 39383, .adv_w = 384, .box_w = 24, .box_h = 25, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 39683, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 39899, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 40163, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 40379, .adv_w = 264, .box_w = 17, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 40532, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 40820, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 41108, .adv_w = 432, .box_w = 27, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 41405, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 41693, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 41936, .adv_w = 384, .box_w = 24, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 42248, .adv_w = 192, .box_w = 12, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 42362, .adv_w = 288, .box_w = 18, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 42533, .adv_w = 432, .box_w = 27, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 42857, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 43073, .adv_w = 264, .box_w = 17, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 43277, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 43442, .adv_w = 336, .box_w = 21, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 43715, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 43946, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 44177, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 44342, .adv_w = 336, .box_w = 23, .box_h = 22, .ofs_x = -1, .ofs_y = -2}, - {.bitmap_index = 44595, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 44738, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 44881, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 45112, .adv_w = 336, .box_w = 21, .box_h = 6, .ofs_x = 0, .ofs_y = 6}, - {.bitmap_index = 45175, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 45418, .adv_w = 480, .box_w = 31, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 45790, .adv_w = 432, .box_w = 29, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 46138, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 46402, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, - {.bitmap_index = 46549, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, - {.bitmap_index = 46696, .adv_w = 480, .box_w = 31, .box_h = 19, .ofs_x = -1, .ofs_y = -1}, - {.bitmap_index = 46991, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 47207, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 47495, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 47808, .adv_w = 336, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 48050, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 48302, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 48533, .adv_w = 336, .box_w = 21, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 48743, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 48959, .adv_w = 240, .box_w = 17, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, - {.bitmap_index = 49163, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 49415, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 49667, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 49910, .adv_w = 384, .box_w = 26, .box_h = 26, .ofs_x = -1, .ofs_y = -4}, - {.bitmap_index = 50248, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 50464, .adv_w = 480, .box_w = 30, .box_h = 23, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 50809, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 51049, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 51289, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 51529, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 51769, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, - {.bitmap_index = 52009, .adv_w = 480, .box_w = 31, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 52319, .adv_w = 336, .box_w = 19, .box_h = 24, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 52547, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 52799, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -4}, - {.bitmap_index = 53112, .adv_w = 480, .box_w = 30, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 53382, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, - {.bitmap_index = 53598, .adv_w = 386, .box_w = 25, .box_h = 16, .ofs_x = 0, .ofs_y = 1} + {.bitmap_index = 6926, .adv_w = 384, .box_w = 6, .box_h = 7, .ofs_x = 3, .ofs_y = 11}, + {.bitmap_index = 6947, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 7200, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 7465, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 7718, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 7983, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 8236, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 8501, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 8777, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 9042, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 9318, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 9549, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 9825, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 10101, .adv_w = 384, .box_w = 19, .box_h = 23, .ofs_x = 3, .ofs_y = -3}, + {.bitmap_index = 10320, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 10585, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 10838, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 11080, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 11322, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 11575, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 11817, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 12070, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 12323, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 12576, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 12829, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 13082, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 13335, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 13565, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 13795, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 14048, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 14268, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 14498, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 14728, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 14959, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 15190, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 15455, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 15708, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 15961, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 16214, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 16467, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 16732, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 16985, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 17238, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 17503, .adv_w = 384, .box_w = 22, .box_h = 19, .ofs_x = 1, .ofs_y = -1}, + {.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 = 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 = 1, .ofs_y = -3}, + {.bitmap_index = 20050, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 20280, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 20545, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 20810, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21086, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21351, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21616, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 21892, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 22157, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 22422, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 22675, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 22951, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 23193, .adv_w = 384, .box_w = 19, .box_h = 22, .ofs_x = 3, .ofs_y = -3}, + {.bitmap_index = 23402, .adv_w = 384, .box_w = 18, .box_h = 23, .ofs_x = 4, .ofs_y = -3}, + {.bitmap_index = 23609, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 23862, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 24127, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 24380, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 24645, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 24910, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 25163, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 25405, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 25658, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 25878, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 26143, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 26396, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 26649, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 26891, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 27133, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 27386, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 27662, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 27927, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 28179, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 28443, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 28719, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 28984, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 29237, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 29490, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 29710, .adv_w = 384, .box_w = 15, .box_h = 22, .ofs_x = 5, .ofs_y = -3}, + {.bitmap_index = 29875, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 30128, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 30393, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 30658, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 30900, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 31153, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 31395, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 31648, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 31890, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 32143, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 32396, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 32649, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 32902, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 33155, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 33408, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 33650, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 33915, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 34168, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 34444, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 34720, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 34973, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 35238, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 35514, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 35779, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 36055, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 36319, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 36595, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 36848, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 37113, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 37378, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 37608, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 37861, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3}, + {.bitmap_index = 38103, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 38356, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 38621, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 38897, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 39139, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 39404, .adv_w = 384, .box_w = 24, .box_h = 25, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 39704, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 39920, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 40184, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 40400, .adv_w = 264, .box_w = 17, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 40553, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 40841, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 41129, .adv_w = 432, .box_w = 27, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 41426, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 41714, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 41957, .adv_w = 384, .box_w = 24, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 42269, .adv_w = 192, .box_w = 12, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 42383, .adv_w = 288, .box_w = 18, .box_h = 19, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 42554, .adv_w = 432, .box_w = 27, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 42878, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 43094, .adv_w = 264, .box_w = 17, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 43298, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 43463, .adv_w = 336, .box_w = 21, .box_h = 26, .ofs_x = 0, .ofs_y = -4}, + {.bitmap_index = 43736, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 43967, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 44198, .adv_w = 336, .box_w = 15, .box_h = 22, .ofs_x = 3, .ofs_y = -2}, + {.bitmap_index = 44363, .adv_w = 336, .box_w = 23, .box_h = 22, .ofs_x = -1, .ofs_y = -2}, + {.bitmap_index = 44616, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 44759, .adv_w = 240, .box_w = 13, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 44902, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 45133, .adv_w = 336, .box_w = 21, .box_h = 6, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 45196, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 45439, .adv_w = 480, .box_w = 31, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 45811, .adv_w = 432, .box_w = 29, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 46159, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 46423, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 46570, .adv_w = 336, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 46717, .adv_w = 480, .box_w = 31, .box_h = 19, .ofs_x = -1, .ofs_y = -1}, + {.bitmap_index = 47012, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 47228, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 47516, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 47829, .adv_w = 336, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 48071, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 48323, .adv_w = 336, .box_w = 21, .box_h = 22, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 48554, .adv_w = 336, .box_w = 21, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 48764, .adv_w = 384, .box_w = 24, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 48980, .adv_w = 240, .box_w = 17, .box_h = 24, .ofs_x = -1, .ofs_y = -3}, + {.bitmap_index = 49184, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 49436, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 49688, .adv_w = 432, .box_w = 27, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 49931, .adv_w = 384, .box_w = 26, .box_h = 26, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 50269, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 50485, .adv_w = 480, .box_w = 30, .box_h = 23, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 50830, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 51070, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 51310, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 51550, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 51790, .adv_w = 480, .box_w = 30, .box_h = 16, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 52030, .adv_w = 480, .box_w = 31, .box_h = 20, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 52340, .adv_w = 336, .box_w = 19, .box_h = 24, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 52568, .adv_w = 336, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 52820, .adv_w = 384, .box_w = 25, .box_h = 25, .ofs_x = -1, .ofs_y = -4}, + {.bitmap_index = 53133, .adv_w = 480, .box_w = 30, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 53403, .adv_w = 288, .box_w = 18, .box_h = 24, .ofs_x = 0, .ofs_y = -3}, + {.bitmap_index = 53619, .adv_w = 386, .box_w = 25, .box_h = 16, .ofs_x = 0, .ofs_y = 1} }; /*--------------------- @@ -7723,30 +7729,30 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { *--------------------*/ static const uint16_t unicode_list_1[] = { - 0x0, 0xa8, 0xa9, 0x112, 0x121, 0x150, 0x1a6, 0x221, - 0x26d, 0x32a, 0x38b, 0x394, 0x3bf, 0x3e5, 0x3fb, 0x434, - 0x460, 0x464, 0x465, 0x46d, 0x50c, 0x51a, 0x550, 0x587, - 0x59b, 0x5b0, 0x5b5, 0x5bc, 0x5d2, 0x5f4, 0x61d, 0x62d, - 0x641, 0x642, 0x77c, 0x7f9, 0xacc, 0xb90, 0xd1d, 0xd51, - 0xd5f, 0xd67, 0xfaa, 0xfc8, 0x1054, 0x106b, 0x10c5, 0x114a, - 0x116f, 0x11c6, 0x1234, 0x13d5, 0x13fc, 0x1491, 0x1557, 0x156c, - 0x1595, 0x1597, 0x15ca, 0x160b, 0x1692, 0x1735, 0x175e, 0x17bb, - 0x17d3, 0x18b7, 0x18e4, 0x18ff, 0x1924, 0x19cc, 0x19fc, 0x1a3b, - 0x1d27, 0x1d2a, 0x1d99, 0x1dd9, 0x1df9, 0x1ead, 0x1eba, 0x1f06, - 0x1f10, 0x1f39, 0x1f77, 0x1fee, 0x2055, 0x247b, 0x254c, 0x2574, - 0x26ed, 0x26fa, 0x28b3, 0x29c6, 0x2b92, 0x2bd0, 0x2c3f, 0x2d0e, - 0x2ec0, 0x3084, 0x308b, 0x3098, 0x30a4, 0x30db, 0x30fd, 0x32c2, - 0x3437, 0x343f, 0x3447, 0x3534, 0x3d66, 0x3d9a, 0x4131, 0x4142, - 0x4156, 0x4158, 0x4195, 0x41c6, 0x41e4, 0x4392, 0x4394, 0x46c6, - 0x47b9, 0x4812, 0x4829, 0x4a49, 0x4a4b, 0x4a61, 0x4a93, 0x4c69, - 0xa1c6, 0xa1cd, 0xa1d0, 0xa1d1, 0xa1d2, 0xa1d6, 0xa1d8, 0xa1da, - 0xa1de, 0xa1e1, 0xa1e6, 0xa1eb, 0xa1ec, 0xa1ed, 0xa203, 0xa208, - 0xa20d, 0xa210, 0xa211, 0xa212, 0xa216, 0xa217, 0xa218, 0xa219, - 0xa22c, 0xa22d, 0xa233, 0xa235, 0xa236, 0xa239, 0xa23c, 0xa23d, - 0xa23e, 0xa240, 0xa258, 0xa25a, 0xa289, 0xa28a, 0xa28c, 0xa28e, - 0xa2a5, 0xa2ac, 0xa2af, 0xa2b8, 0xa2e1, 0xa2e9, 0xa320, 0xa3b0, - 0xa405, 0xa406, 0xa407, 0xa408, 0xa409, 0xa44c, 0xa458, 0xa4b2, - 0xa4c9, 0xa71f, 0xa987, 0xaa67 + 0x0, 0x4d8b, 0x4e33, 0x4e34, 0x4e9d, 0x4eac, 0x4edb, 0x4f31, + 0x4fac, 0x4ff8, 0x50b5, 0x5116, 0x511f, 0x514a, 0x5170, 0x5186, + 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, 0x5f51, 0x5fbf, 0x6160, 0x6187, 0x621c, 0x62e2, + 0x62f7, 0x6320, 0x6322, 0x6355, 0x6396, 0x641d, 0x64c0, 0x64e9, + 0x6546, 0x655e, 0x6642, 0x666f, 0x668a, 0x66af, 0x6757, 0x6787, + 0x67c6, 0x6ab2, 0x6ab5, 0x6b24, 0x6b64, 0x6b84, 0x6c38, 0x6c45, + 0x6c91, 0x6c9b, 0x6cc4, 0x6d02, 0x6d79, 0x6de0, 0x7206, 0x72d7, + 0x72ff, 0x7478, 0x7485, 0x763e, 0x7751, 0x791d, 0x795b, 0x79ca, + 0x7a99, 0x7c4b, 0x7e0f, 0x7e16, 0x7e23, 0x7e2f, 0x7e66, 0x7e88, + 0x804d, 0x81c2, 0x81ca, 0x81d2, 0x82bf, 0x8af1, 0x8b25, 0x8ebc, + 0x8ecd, 0x8ee1, 0x8ee3, 0x8f20, 0x8f51, 0x8f6f, 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*/ @@ -7757,8 +7763,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY }, { - .range_start = 20027, .range_length = 43624, .glyph_id_start = 96, - .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 188, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + .range_start = 176, .range_length = 63475, .glyph_id_start = 96, + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 189, .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 4d9432e..960389d 100644 --- a/applications/lvgl/guider/generated/setup_scr_screen.c +++ b/applications/lvgl/guider/generated/setup_scr_screen.c @@ -450,7 +450,7 @@ void setup_scr_screen(lv_ui *ui) //Write codes screen_text_inf ui->screen_text_inf = lv_label_create(ui->screen_w_text); - lv_label_set_text(ui->screen_text_inf, "信息"); + lv_label_set_text(ui->screen_text_inf, "信息工单工艺领料单预计开始预计完成预计用时锁定状态用户步骤时间步步骤工艺步号细节参数副功能功能代码颜色客户布重布种浴比浴量备注入水水位呼叫操作员准备入布准备出布温度控制排水主泵启动主泵停止备药加药入水流量等待命令取样运转呼叫准备程序结束水源目标温度速率时间药缸搅拌药桶曲线加压减压呼叫输送测试流程°"); lv_label_set_long_mode(ui->screen_text_inf, LV_LABEL_LONG_WRAP); lv_obj_set_pos(ui->screen_text_inf, 0, 0); lv_obj_set_size(ui->screen_text_inf, 550, 230); @@ -476,8 +476,8 @@ void setup_scr_screen(lv_ui *ui) //Write codes screen_step_list ui->screen_step_list = lv_obj_create(ui->screen_tabview_tab_1); - lv_obj_set_pos(ui->screen_step_list, 0, 50); - lv_obj_set_size(ui->screen_step_list, 300, 445); + lv_obj_set_pos(ui->screen_step_list, 0, 45); + lv_obj_set_size(ui->screen_step_list, 300, 450); lv_obj_set_scrollbar_mode(ui->screen_step_list, LV_SCROLLBAR_MODE_OFF); //Write style for screen_step_list, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. @@ -519,7 +519,7 @@ void setup_scr_screen(lv_ui *ui) ui->screen_cont_p = lv_obj_create(ui->screen_tabview_tab_2); lv_obj_set_pos(ui->screen_cont_p, 0, 64); lv_obj_set_size(ui->screen_cont_p, 450, 365); - lv_obj_set_scrollbar_mode(ui->screen_cont_p, LV_SCROLLBAR_MODE_ON); + lv_obj_set_scrollbar_mode(ui->screen_cont_p, LV_SCROLLBAR_MODE_OFF); //Write style for screen_cont_p, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. lv_obj_set_style_border_width(ui->screen_cont_p, 0, LV_PART_MAIN|LV_STATE_DEFAULT); @@ -642,7 +642,7 @@ void setup_scr_screen(lv_ui *ui) //Write codes screen_step_inf ui->screen_step_inf = lv_obj_create(ui->screen_tabview_tab_2); lv_obj_set_pos(ui->screen_step_inf, 468, 200); - lv_obj_set_size(ui->screen_step_inf, 559, 290); + lv_obj_set_size(ui->screen_step_inf, 555, 290); lv_obj_set_scrollbar_mode(ui->screen_step_inf, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_add_flag(ui->screen_step_inf, LV_OBJ_FLAG_SCROLLABLE); @@ -6983,153 +6983,9 @@ void setup_scr_screen(lv_ui *ui) lv_obj_t * screen_tabview_tab_4_label = lv_label_create(ui->screen_tabview_tab_4); lv_label_set_text(screen_tabview_tab_4_label, ""); - //Write codes screen_proess_set - ui->screen_proess_set = lv_list_create(ui->screen_tabview_tab_4); - ui->screen_proess_set_item0 = lv_list_add_btn(ui->screen_proess_set, LV_SYMBOL_SAVE, "save"); - lv_obj_set_pos(ui->screen_proess_set, 0, 0); - lv_obj_set_size(ui->screen_proess_set, 300, 490); - lv_obj_set_scrollbar_mode(ui->screen_proess_set, LV_SCROLLBAR_MODE_ACTIVE); - - //Write style state: LV_STATE_DEFAULT for &style_screen_proess_set_main_main_default - static lv_style_t style_screen_proess_set_main_main_default; - ui_init_style(&style_screen_proess_set_main_main_default); - - lv_style_set_pad_top(&style_screen_proess_set_main_main_default, 5); - lv_style_set_pad_left(&style_screen_proess_set_main_main_default, 5); - lv_style_set_pad_right(&style_screen_proess_set_main_main_default, 5); - lv_style_set_pad_bottom(&style_screen_proess_set_main_main_default, 5); - lv_style_set_bg_opa(&style_screen_proess_set_main_main_default, 255); - lv_style_set_bg_color(&style_screen_proess_set_main_main_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_proess_set_main_main_default, LV_GRAD_DIR_NONE); - lv_style_set_border_width(&style_screen_proess_set_main_main_default, 1); - lv_style_set_border_opa(&style_screen_proess_set_main_main_default, 255); - lv_style_set_border_color(&style_screen_proess_set_main_main_default, lv_color_hex(0xe1e6ee)); - lv_style_set_border_side(&style_screen_proess_set_main_main_default, LV_BORDER_SIDE_FULL); - lv_style_set_radius(&style_screen_proess_set_main_main_default, 3); - lv_style_set_shadow_width(&style_screen_proess_set_main_main_default, 0); - lv_obj_add_style(ui->screen_proess_set, &style_screen_proess_set_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT); - - //Write style state: LV_STATE_DEFAULT for &style_screen_proess_set_main_scrollbar_default - static lv_style_t style_screen_proess_set_main_scrollbar_default; - ui_init_style(&style_screen_proess_set_main_scrollbar_default); - - lv_style_set_radius(&style_screen_proess_set_main_scrollbar_default, 3); - lv_style_set_bg_opa(&style_screen_proess_set_main_scrollbar_default, 255); - lv_style_set_bg_color(&style_screen_proess_set_main_scrollbar_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_proess_set_main_scrollbar_default, LV_GRAD_DIR_NONE); - lv_obj_add_style(ui->screen_proess_set, &style_screen_proess_set_main_scrollbar_default, LV_PART_SCROLLBAR|LV_STATE_DEFAULT); - - //Write style state: LV_STATE_DEFAULT for &style_screen_proess_set_extra_btns_main_default - static lv_style_t style_screen_proess_set_extra_btns_main_default; - ui_init_style(&style_screen_proess_set_extra_btns_main_default); - - lv_style_set_pad_top(&style_screen_proess_set_extra_btns_main_default, 5); - lv_style_set_pad_left(&style_screen_proess_set_extra_btns_main_default, 5); - lv_style_set_pad_right(&style_screen_proess_set_extra_btns_main_default, 5); - lv_style_set_pad_bottom(&style_screen_proess_set_extra_btns_main_default, 5); - lv_style_set_border_width(&style_screen_proess_set_extra_btns_main_default, 0); - lv_style_set_text_color(&style_screen_proess_set_extra_btns_main_default, lv_color_hex(0x0D3055)); - lv_style_set_text_font(&style_screen_proess_set_extra_btns_main_default, &lv_font_montserratMedium_12); - lv_style_set_text_opa(&style_screen_proess_set_extra_btns_main_default, 255); - lv_style_set_radius(&style_screen_proess_set_extra_btns_main_default, 3); - lv_style_set_bg_opa(&style_screen_proess_set_extra_btns_main_default, 255); - lv_style_set_bg_color(&style_screen_proess_set_extra_btns_main_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_proess_set_extra_btns_main_default, LV_GRAD_DIR_NONE); - lv_obj_add_style(ui->screen_proess_set_item0, &style_screen_proess_set_extra_btns_main_default, LV_PART_MAIN|LV_STATE_DEFAULT); - - //Write style state: LV_STATE_DEFAULT for &style_screen_proess_set_extra_texts_main_default - static lv_style_t style_screen_proess_set_extra_texts_main_default; - ui_init_style(&style_screen_proess_set_extra_texts_main_default); - - lv_style_set_pad_top(&style_screen_proess_set_extra_texts_main_default, 5); - lv_style_set_pad_left(&style_screen_proess_set_extra_texts_main_default, 5); - lv_style_set_pad_right(&style_screen_proess_set_extra_texts_main_default, 5); - lv_style_set_pad_bottom(&style_screen_proess_set_extra_texts_main_default, 5); - lv_style_set_border_width(&style_screen_proess_set_extra_texts_main_default, 0); - lv_style_set_text_color(&style_screen_proess_set_extra_texts_main_default, lv_color_hex(0x0D3055)); - lv_style_set_text_font(&style_screen_proess_set_extra_texts_main_default, &lv_font_montserratMedium_12); - lv_style_set_text_opa(&style_screen_proess_set_extra_texts_main_default, 255); - lv_style_set_radius(&style_screen_proess_set_extra_texts_main_default, 3); - lv_style_set_transform_width(&style_screen_proess_set_extra_texts_main_default, 0); - lv_style_set_bg_opa(&style_screen_proess_set_extra_texts_main_default, 255); - lv_style_set_bg_color(&style_screen_proess_set_extra_texts_main_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_proess_set_extra_texts_main_default, LV_GRAD_DIR_NONE); - - //Write codes screen_step_set - ui->screen_step_set = lv_list_create(ui->screen_tabview_tab_4); - ui->screen_step_set_item0 = lv_list_add_btn(ui->screen_step_set, LV_SYMBOL_SAVE, "save"); - lv_obj_set_pos(ui->screen_step_set, 310, 55); - lv_obj_set_size(ui->screen_step_set, 714, 370); - lv_obj_set_scrollbar_mode(ui->screen_step_set, LV_SCROLLBAR_MODE_ACTIVE); - - //Write style state: LV_STATE_DEFAULT for &style_screen_step_set_main_main_default - static lv_style_t style_screen_step_set_main_main_default; - ui_init_style(&style_screen_step_set_main_main_default); - - lv_style_set_pad_top(&style_screen_step_set_main_main_default, 5); - lv_style_set_pad_left(&style_screen_step_set_main_main_default, 5); - lv_style_set_pad_right(&style_screen_step_set_main_main_default, 5); - lv_style_set_pad_bottom(&style_screen_step_set_main_main_default, 5); - lv_style_set_bg_opa(&style_screen_step_set_main_main_default, 255); - lv_style_set_bg_color(&style_screen_step_set_main_main_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_step_set_main_main_default, LV_GRAD_DIR_NONE); - lv_style_set_border_width(&style_screen_step_set_main_main_default, 1); - lv_style_set_border_opa(&style_screen_step_set_main_main_default, 255); - lv_style_set_border_color(&style_screen_step_set_main_main_default, lv_color_hex(0xe1e6ee)); - lv_style_set_border_side(&style_screen_step_set_main_main_default, LV_BORDER_SIDE_FULL); - lv_style_set_radius(&style_screen_step_set_main_main_default, 3); - lv_style_set_shadow_width(&style_screen_step_set_main_main_default, 0); - lv_obj_add_style(ui->screen_step_set, &style_screen_step_set_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT); - - //Write style state: LV_STATE_DEFAULT for &style_screen_step_set_main_scrollbar_default - static lv_style_t style_screen_step_set_main_scrollbar_default; - ui_init_style(&style_screen_step_set_main_scrollbar_default); - - lv_style_set_radius(&style_screen_step_set_main_scrollbar_default, 3); - lv_style_set_bg_opa(&style_screen_step_set_main_scrollbar_default, 255); - lv_style_set_bg_color(&style_screen_step_set_main_scrollbar_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_step_set_main_scrollbar_default, LV_GRAD_DIR_NONE); - lv_obj_add_style(ui->screen_step_set, &style_screen_step_set_main_scrollbar_default, LV_PART_SCROLLBAR|LV_STATE_DEFAULT); - - //Write style state: LV_STATE_DEFAULT for &style_screen_step_set_extra_btns_main_default - static lv_style_t style_screen_step_set_extra_btns_main_default; - ui_init_style(&style_screen_step_set_extra_btns_main_default); - - lv_style_set_pad_top(&style_screen_step_set_extra_btns_main_default, 5); - lv_style_set_pad_left(&style_screen_step_set_extra_btns_main_default, 5); - lv_style_set_pad_right(&style_screen_step_set_extra_btns_main_default, 5); - lv_style_set_pad_bottom(&style_screen_step_set_extra_btns_main_default, 5); - lv_style_set_border_width(&style_screen_step_set_extra_btns_main_default, 0); - lv_style_set_text_color(&style_screen_step_set_extra_btns_main_default, lv_color_hex(0x0D3055)); - lv_style_set_text_font(&style_screen_step_set_extra_btns_main_default, &lv_font_montserratMedium_12); - lv_style_set_text_opa(&style_screen_step_set_extra_btns_main_default, 255); - lv_style_set_radius(&style_screen_step_set_extra_btns_main_default, 3); - lv_style_set_bg_opa(&style_screen_step_set_extra_btns_main_default, 255); - lv_style_set_bg_color(&style_screen_step_set_extra_btns_main_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_step_set_extra_btns_main_default, LV_GRAD_DIR_NONE); - lv_obj_add_style(ui->screen_step_set_item0, &style_screen_step_set_extra_btns_main_default, LV_PART_MAIN|LV_STATE_DEFAULT); - - //Write style state: LV_STATE_DEFAULT for &style_screen_step_set_extra_texts_main_default - static lv_style_t style_screen_step_set_extra_texts_main_default; - ui_init_style(&style_screen_step_set_extra_texts_main_default); - - lv_style_set_pad_top(&style_screen_step_set_extra_texts_main_default, 5); - lv_style_set_pad_left(&style_screen_step_set_extra_texts_main_default, 5); - lv_style_set_pad_right(&style_screen_step_set_extra_texts_main_default, 5); - lv_style_set_pad_bottom(&style_screen_step_set_extra_texts_main_default, 5); - lv_style_set_border_width(&style_screen_step_set_extra_texts_main_default, 0); - lv_style_set_text_color(&style_screen_step_set_extra_texts_main_default, lv_color_hex(0x0D3055)); - lv_style_set_text_font(&style_screen_step_set_extra_texts_main_default, &lv_font_montserratMedium_12); - lv_style_set_text_opa(&style_screen_step_set_extra_texts_main_default, 255); - lv_style_set_radius(&style_screen_step_set_extra_texts_main_default, 3); - lv_style_set_transform_width(&style_screen_step_set_extra_texts_main_default, 0); - lv_style_set_bg_opa(&style_screen_step_set_extra_texts_main_default, 255); - lv_style_set_bg_color(&style_screen_step_set_extra_texts_main_default, lv_color_hex(0xffffff)); - lv_style_set_bg_grad_dir(&style_screen_step_set_extra_texts_main_default, LV_GRAD_DIR_NONE); - //Write codes screen_pname_set ui->screen_pname_set = lv_textarea_create(ui->screen_tabview_tab_4); - lv_textarea_set_text(ui->screen_pname_set, "Hello World"); + lv_textarea_set_text(ui->screen_pname_set, "工艺"); lv_textarea_set_placeholder_text(ui->screen_pname_set, ""); lv_textarea_set_password_bullet(ui->screen_pname_set, "*"); lv_textarea_set_password_mode(ui->screen_pname_set, false); @@ -7139,7 +6995,7 @@ void setup_scr_screen(lv_ui *ui) #if LV_USE_KEYBOARD != 0 || LV_USE_ZH_KEYBOARD != 0 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, 310, 0); + lv_obj_set_pos(ui->screen_pname_set, 305, 0); lv_obj_set_size(ui->screen_pname_set, 714, 50); //Write style for screen_pname_set, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. @@ -7282,47 +7138,47 @@ void setup_scr_screen(lv_ui *ui) lv_obj_set_style_pad_left(ui->screen_step_, 5, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_shadow_width(ui->screen_step_, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - //Write codes screen_cont_2 - ui->screen_cont_2 = lv_obj_create(ui->screen_tabview_tab_4); - lv_obj_set_pos(ui->screen_cont_2, 374, 208); - lv_obj_set_size(ui->screen_cont_2, 300, 200); - lv_obj_set_scrollbar_mode(ui->screen_cont_2, LV_SCROLLBAR_MODE_OFF); - - //Write style for screen_cont_2, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. - lv_obj_set_style_border_width(ui->screen_cont_2, 2, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_opa(ui->screen_cont_2, 255, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_color(ui->screen_cont_2, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_side(ui->screen_cont_2, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_radius(ui->screen_cont_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_opa(ui->screen_cont_2, 255, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_color(ui->screen_cont_2, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_grad_dir(ui->screen_cont_2, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_top(ui->screen_cont_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_bottom(ui->screen_cont_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_left(ui->screen_cont_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_right(ui->screen_cont_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_shadow_width(ui->screen_cont_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - - //Write codes screen_cont_1 - ui->screen_cont_1 = lv_obj_create(ui->screen_tabview_tab_4); - lv_obj_set_pos(ui->screen_cont_1, 362, 200); - lv_obj_set_size(ui->screen_cont_1, 300, 200); - lv_obj_set_scrollbar_mode(ui->screen_cont_1, LV_SCROLLBAR_MODE_OFF); - - //Write style for screen_cont_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. - lv_obj_set_style_border_width(ui->screen_cont_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_opa(ui->screen_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_color(ui->screen_cont_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_side(ui->screen_cont_1, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_radius(ui->screen_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_opa(ui->screen_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_color(ui->screen_cont_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_grad_dir(ui->screen_cont_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_top(ui->screen_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_bottom(ui->screen_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_left(ui->screen_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_pad_right(ui->screen_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_shadow_width(ui->screen_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + //Write codes screen_step_set + ui->screen_step_set = lv_obj_create(ui->screen_tabview_tab_4); + lv_obj_set_pos(ui->screen_step_set, 306, 55); + lv_obj_set_size(ui->screen_step_set, 714, 370); + lv_obj_set_scrollbar_mode(ui->screen_step_set, LV_SCROLLBAR_MODE_OFF); + + //Write style for screen_step_set, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. + lv_obj_set_style_border_width(ui->screen_step_set, 2, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_opa(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_color(ui->screen_step_set, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_side(ui->screen_step_set, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_radius(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui->screen_step_set, 255, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui->screen_step_set, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_grad_dir(ui->screen_step_set, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_bottom(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_left(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_right(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_shadow_width(ui->screen_step_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + + //Write codes screen_proess_set + ui->screen_proess_set = lv_obj_create(ui->screen_tabview_tab_4); + lv_obj_set_pos(ui->screen_proess_set, 0, 0); + lv_obj_set_size(ui->screen_proess_set, 300, 490); + lv_obj_set_scrollbar_mode(ui->screen_proess_set, LV_SCROLLBAR_MODE_OFF); + + //Write style for screen_proess_set, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. + lv_obj_set_style_border_width(ui->screen_proess_set, 2, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_opa(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_color(ui->screen_proess_set, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_border_side(ui->screen_proess_set, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_radius(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui->screen_proess_set, 255, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui->screen_proess_set, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_bg_grad_dir(ui->screen_proess_set, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_bottom(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_left(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_pad_right(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); + lv_obj_set_style_shadow_width(ui->screen_proess_set, 0, LV_PART_MAIN|LV_STATE_DEFAULT); //Write codes 系统 ui->screen_tabview_tab_5 = lv_tabview_add_tab(ui->screen_tabview,"系统"); diff --git a/applications/lvgl/ui_data_csv.c b/applications/lvgl/ui_data_csv.c index 061b101..1b11a82 100644 --- a/applications/lvgl/ui_data_csv.c +++ b/applications/lvgl/ui_data_csv.c @@ -5,6 +5,7 @@ #include #include "libcsv.h" #include "lvgl.h" +#include "SC828_DATA_table.h" #define CSV_MAX_ROWS 260 // 最大行数 #define CSV_MAX_COLS 48 // 每行最大列数 @@ -239,3 +240,75 @@ int parse_csv_to_inf(lv_obj_t *container, const char *csv_data ,int W_data,int H return 0; } + +int run_csv_to_table(const char *csv_data) { + if (csv_data == NULL) { + return -1; + } + user = (UserData *)rt_memheap_alloc(&sdram_heap, sizeof(UserData)); + + // 解析 CSV + if (parse_csv_string(csv_data, user) != 0) { + return -1; + } + + // 表格 + lv_obj_set_size(guider_ui.screen_run_step, LV_PCT(100), LV_SIZE_CONTENT); + lv_obj_set_style_pad_all(guider_ui.screen_run_step, 0, LV_PART_MAIN); + lv_table_set_col_cnt(guider_ui.screen_run_step,user->max_cols); + lv_table_set_row_cnt(guider_ui.screen_run_step,user->total_rows); + lv_table_set_col_width(guider_ui.screen_run_step, 0, 80); + lv_table_set_col_width(guider_ui.screen_run_step, 1, 370); + lv_table_set_cell_value(guider_ui.screen_run_step,0,0,"步"); + lv_table_set_cell_value(guider_ui.screen_run_step,0,1,"工艺"); + + //先停止清除任务缓存信息 + DATA_INSTRUCTION_STOP(); + + // 填充表格数据 + for (int i = 1; i < user->total_rows; i++) { + lv_table_set_cell_value_fmt(guider_ui.screen_run_step, i, 0,"%d",i); + lv_table_set_cell_value(guider_ui.screen_run_step, i, 1,csv_get_cell(user, i, 2)); + + //数据组信息 + step_table[i-1].RUN = 0; + rt_snprintf(step_table[i-1].Dyelot ,1,csv_get_cell(user, i, 0)); + rt_snprintf(step_table[i-1].StepID ,1,csv_get_cell(user, i, 1)); + rt_snprintf(step_table[i-1].StepName ,1,csv_get_cell(user, i, 2)); + rt_snprintf(step_table[i-1].ParameterName ,1,csv_get_cell(user, i, 3)); + step_table[i-1].Parameter1 = atof(csv_get_cell(user, i, 4)); + step_table[i-1].Parameter2 = atof(csv_get_cell(user, i, 5)); + step_table[i-1].Parameter3 = atof(csv_get_cell(user, i, 6)); + step_table[i-1].Parameter4 = atof(csv_get_cell(user, i, 7)); + step_table[i-1].Parameter5 = atof(csv_get_cell(user, i, 8)); + step_table[i-1].P6 = atoi(csv_get_cell(user, i, 9)); + step_table[i-1].P7 = atoi(csv_get_cell(user, i, 10)); + step_table[i-1].P8 = atoi(csv_get_cell(user, i, 11)); + step_table[i-1].P9 = atoi(csv_get_cell(user, i, 12)); + step_table[i-1].P10 = atoi(csv_get_cell(user, i, 13)); + step_table[i-1].Parameter1_S1 = atof(csv_get_cell(user, i, 14)); + step_table[i-1].Parameter2_S1 = atof(csv_get_cell(user, i, 15)); + step_table[i-1].Parameter3_S1 = atof(csv_get_cell(user, i, 16)); + step_table[i-1].Parameter4_S1 = atof(csv_get_cell(user, i, 17)); + step_table[i-1].Parameter5_S1 = atof(csv_get_cell(user, i, 18)); + step_table[i-1].Parameter1_S2 = atof(csv_get_cell(user, i, 19)); + step_table[i-1].Parameter2_S2 = atof(csv_get_cell(user, i, 20)); + step_table[i-1].Parameter3_S2 = atof(csv_get_cell(user, i, 21)); + step_table[i-1].Parameter4_S2 = atof(csv_get_cell(user, i, 22)); + step_table[i-1].Parameter5_S2 = atof(csv_get_cell(user, i, 23)); + step_table[i-1].Parameter1_S3 = atof(csv_get_cell(user, i, 24)); + step_table[i-1].Parameter2_S3 = atof(csv_get_cell(user, i, 25)); + step_table[i-1].Parameter3_S3 = atof(csv_get_cell(user, i, 26)); + step_table[i-1].Parameter4_S3 = atof(csv_get_cell(user, i, 27)); + step_table[i-1].Parameter5_S3 = atof(csv_get_cell(user, i, 28)); + step_table[i-1].ReDye = atoi(csv_get_cell(user, i, 29)); + rt_snprintf(step_table[i-1].StepID_S1, 3,csv_get_cell(user, i, 30)); + rt_snprintf(step_table[i-1].StepID_S2, 3,csv_get_cell(user, i, 31)); + rt_snprintf(step_table[i-1].StepID_S3, 3,csv_get_cell(user, i, 32)); + } + + // 释放内存 + rt_memheap_free(user); + + return 0; +} diff --git a/applications/lvgl/ui_data_csv.h b/applications/lvgl/ui_data_csv.h index 8d6d491..7bc2ec4 100644 --- a/applications/lvgl/ui_data_csv.h +++ b/applications/lvgl/ui_data_csv.h @@ -12,5 +12,6 @@ int parse_csv_to_table(lv_obj_t *container, const char *csv_data,int flags); int parse_csv_to_inf(lv_obj_t *container, const char *csv_data ,int W_data,int H_data); +int run_csv_to_table(const char *csv_data); #endif /* APPLICATIONS_LVGL_UI_DATA_CSV_H_ */ diff --git a/applications/lvgl/ui_data_labels.c b/applications/lvgl/ui_data_labels.c index b1205c8..2955e25 100644 --- a/applications/lvgl/ui_data_labels.c +++ b/applications/lvgl/ui_data_labels.c @@ -286,7 +286,7 @@ char* get_time_str(char *buf, size_t size) return buf; } - // 格式：2025/01/25 13:55:11 （注意两个空格） + // 格式：2025/01/25 13:55:11 （两个空格） strftime(buf, size, "%Y/%m/%d %H:%M:%S", tm_info); return buf; @@ -295,14 +295,11 @@ char* get_time_str(char *buf, size_t size) /** * 数据信息显示 **/ -#include -#include -#include -#include #include "sql/DB_SQLite.h" #include"ui_data_csv.h" int Work_Program_DATA=0; +char Work_NAME[32] = {0}; // 初始化为 0 char select_data_ui[4096]= {0}; char sqlSELECT[512] = {0}; // 初始化为 0 @@ -334,7 +331,7 @@ void Work_Program_ui(void) parse_csv_to_table(guider_ui.screen_list_inf, select_data_ui,0); } lv_table_set_col_cnt(guider_ui.screen_w_list,2); - lv_table_set_row_cnt(guider_ui.screen_w_list,1); + lv_table_set_row_cnt(guider_ui.screen_w_list,0); lv_table_set_col_width(guider_ui.screen_w_list, 0, 50); lv_table_set_col_width(guider_ui.screen_w_list, 1, 250); } @@ -345,11 +342,19 @@ void Work_Program_step_ui(char* str_data) if(Work_Program_DATA==0) { // 安全格式化 + rt_snprintf(Work_NAME, sizeof(Work_NAME),"%s",str_data); rt_snprintf(sqlSELECT, sizeof(sqlSELECT),"%s'%s' ORDER BY Step ASC;",select_WorkorderSteps_DATA,str_data); db_send_select(DB_CMD_SELECT, sqlSELECT, 500,select_data_ui); // 表格绘图 - if((select_data_ui[0]=='N')&&(select_data_ui[1]=='o'))return; + if((select_data_ui[0]=='N')&&(select_data_ui[1]=='o')){ + parse_csv_to_inf(guider_ui.screen_text_inf,"",550,230); + lv_table_set_col_cnt(guider_ui.screen_w_list,2); + lv_table_set_row_cnt(guider_ui.screen_w_list,0); + lv_table_set_col_width(guider_ui.screen_w_list, 0, 50); + lv_table_set_col_width(guider_ui.screen_w_list, 1, 250); + return; + } parse_csv_to_table(guider_ui.screen_w_list, select_data_ui,1); lv_table_set_col_width(guider_ui.screen_w_list, 0, 50); lv_table_set_col_width(guider_ui.screen_w_list, 1, 250); @@ -363,16 +368,16 @@ void Work_Program_step_ui(char* str_data) else { // 安全格式化 + rt_snprintf(Work_NAME, sizeof(Work_NAME),"%s",str_data); rt_snprintf(sqlSELECT, sizeof(sqlSELECT),"%s'%s' ORDER BY Step ASC;",select_ProgramSteps_DATA,str_data); db_send_select(DB_CMD_SELECT, sqlSELECT, 500,select_data_ui); // 表格绘图 + parse_csv_to_inf(guider_ui.screen_text_inf,"",550,230); if((select_data_ui[0]=='N')&&(select_data_ui[1]=='o'))return; parse_csv_to_table(guider_ui.screen_w_list, select_data_ui,1); lv_table_set_col_width(guider_ui.screen_w_list, 0, 50); lv_table_set_col_width(guider_ui.screen_w_list, 1, 250); - - parse_csv_to_inf(guider_ui.screen_text_inf,"",550,230); } } @@ -396,3 +401,30 @@ void Work_Program_stepINF_ui(char* str_data) parse_csv_to_inf(guider_ui.screen_text_inf,select_data_ui,550,230); } } +//启动按钮 +void Work_start() +{ + if(Work_Program_DATA==0) + { + //步骤信息 + rt_snprintf(sqlSELECT, sizeof(sqlSELECT),"%s WorkOrder = '%s' ORDER BY Step ASC;",select_Workordersteps_R,Work_NAME); + db_send_select(DB_CMD_SELECT, sqlSELECT, 500,select_data_ui); + run_csv_to_table(select_data_ui); + //启动信息 + rt_snprintf(sqlSELECT, sizeof(sqlSELECT),"%s w.WorkOrder = '%s' LIMIT 1;",select_Workorder_R,Work_NAME); + db_send_select(DB_CMD_SELECT, sqlSELECT, 500,select_data_ui); + rt_kprintf(select_data_ui); + //run_csv_to_table(select_data_ui); + //信息 + //rt_snprintf(sqlSELECT, sizeof(sqlSELECT),"%s WorkOrder = '%s' LIMIT 1;",select_Workorder_R,Work_NAME); + //db_send_select(DB_CMD_SELECT, sqlSELECT, 500,select_data_ui); + //run_csv_to_table(select_data_ui); + } + else + { + //步骤信息 + rt_snprintf(sqlSELECT, sizeof(sqlSELECT),"%s ProgramID = '%s' ORDER BY Step ASC;",select_Programstep_R,Work_NAME); + db_send_select(DB_CMD_SELECT, sqlSELECT, 500,select_data_ui); + run_csv_to_table(select_data_ui); + } +} diff --git a/applications/lvgl/ui_data_labels.h b/applications/lvgl/ui_data_labels.h index a1acbad..166825e 100644 --- a/applications/lvgl/ui_data_labels.h +++ b/applications/lvgl/ui_data_labels.h @@ -14,6 +14,15 @@ StartTime AS 预计开始,EndTime AS 预计完成,Time AS 预计用时,lock AS 锁定,State AS 状态,USER AS 用户 FROM WorkOrder WHERE State=101 AND EndTime > " #define select_Program_DATA "SELECT ProgramName AS 工艺 ,Step AS 步骤,Time AS 预计时间 FROM ProgramName" +#define select_Workorder_R "SELECT w.WorkOrder, w.Dyelot, w.ProgramName, s.PumpSpeed, s.Blower, s.Swing, s.ClothWheel, s.Nozzle\ + FROM WorkOrder w LEFT JOIN WorkOrderSet s ON w.WorkOrder = s.WorkOrder WHERE" +#define select_Workordersteps_R "SELECT Dyelot,StepID,StepName,ParameterName,P1,P2,P3,P4,P5,P6,P7,P8,P9,\ +P1_S1,P2_S1,P3_S1,P4_S1,P5_S1,P1_S2,P2_S2,P3_S2,P4_S2,P5_S2,P1_S3,P2_S3,P3_S3,P4_S3,P5_S3,ReDye,\ +StepID_S1,StepID_S2,StepID_S3 FROM WorkorderSteps WHERE " +#define select_Programstep_R "SELECT Dyelot,StepID,StepName,ParameterName,P1,P2,P3,P4,P5,P6,P7,P8,P9,\ +P1_S1,P2_S1,P3_S1,P4_S1,P5_S1,P1_S2,P2_S2,P3_S2,P4_S2,P5_S2,P1_S3,P2_S3,P3_S3,P4_S3,P5_S3,ReDye,\ +StepID_S1,StepID_S2,StepID_S3 FROM ProgramSteps WHERE" + #define select_ProgramSteps_DATA "SELECT Step AS 步 ,StepName AS 步骤工艺 FROM ProgramSteps WHERE Program=" #define select_WorkorderSteps_DATA "SELECT Step AS 步 ,StepName AS 步骤工艺 FROM WorkorderSteps WHERE WorkOrder=" @@ -100,5 +109,6 @@ char* get_time_str(char *buf, size_t size); void Work_Program_ui(void); void Work_Program_step_ui(char* str_data); void Work_Program_stepINF_ui(char* str_data); +void Work_start(); #endif /* APPLICATIONS_LVGL_UI_DATA_LABELS_H_ */