删除滤网寿命设置功能 默认寿命为6个月

main/actions.c

@@ -193,15 +193,6 @@ void on_btn_connect_wifi(lv_event_t *e) {
     app_connect_wifi();
 }
 
-
-/**
- * 保存滤网寿命设置
- * @param e
- */
-void on_btn_filter_life_save(lv_event_t *e) {
-    system_setting.filter_life_time=60*24*30*lv_spinbox_get_value(guider_ui.FactorySettingPage_spinbox_filter_life);
-    save_system_setting(&system_setting);
-}
 /**
  * 切换至主页面
  * @param e
@@ -250,7 +241,6 @@ void switch_factory_setting_page_set(lv_event_t *e) {
     int index=0;
     lv_ui * ui = lv_event_get_user_data(e);
     lvgl_port_lock(-1);
-    lv_spinbox_set_value(ui->FactorySettingPage_spinbox_filter_life, (int32_t )system_setting.filter_life_time/60/30/24);
     lv_spinbox_set_value(ui->FactorySettingPage_spinbox_supply1_vol, system_setting.supply_first_vol);
     lv_spinbox_set_value(ui->FactorySettingPage_spinbox_supply2_vol, system_setting.supply_second_vol);
     lv_spinbox_set_value(ui->FactorySettingPage_spinbox_supply3_vol, system_setting.supply_third_vol);

main/actions.h

@@ -20,7 +20,6 @@ void switch_setting_page_set(lv_event_t *e);
 void switch_factory_setting_page_set(lv_event_t *e);
 void on_fan_vol_save(lv_event_t *e);
 void on_btn_filter_life_remain_clear(lv_event_t *e);
-void on_btn_filter_life_save(lv_event_t *e);
 void on_fan_vol_refresh(lv_event_t *e);
 /**
  * 设置-tabView 切换事件

main/app/setting.c

@@ -13,13 +13,14 @@
 #include "gui_guider.h"
 #define DEFAULT_REPORT_DURATION 30
 #define DEFAULT_MIN_HUM 30
-#define FILTER_LIFE_TIME_VALVE 60*24*30*3
+#define FILTER_LIFE_TIME_VALVE 60*24*30*6//六个月
 
 static const char *TAG = "system_setting";
 lv_timer_t * screen_timer;
 static uint8_t screen_on_off_status;// 当前屏幕亮或灭的状态
 void read_system_setting(system_setting_t *setting) {
-    uint8_t air_fan_vol[5]={30,35,40,45,50};
+    uint8_t air_exhaust_fan_vol[5]={75,77,79,81,85};
+    uint8_t air_supply_fan_vol[5]={30,35,40,45,50};
 
     uint8_t *min_hum_valve = nvs_get_uint8(NVS_MIN_HUM);
     uint32_t *filter_life_time_valve = nvs_get_uint32(FILTER_LIFE_TIME);
@@ -71,62 +72,62 @@ void read_system_setting(system_setting_t *setting) {
         setting->exhaust_first_vol = *min_hum_valve;
     }
     if (air_exhaust_first_vol == NULL) {
-         nvs_set_uint32(air_fan_vol[0], AIR_EXHAUST_FIRST_VOL);
-        setting->exhaust_first_vol = air_fan_vol[0];
+         nvs_set_uint32(air_exhaust_fan_vol[0], AIR_EXHAUST_FIRST_VOL);
+        setting->exhaust_first_vol = air_exhaust_fan_vol[0];
     } else {
         setting->exhaust_first_vol = *air_exhaust_first_vol;
     }
     if (air_exhaust_second_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[1], AIR_EXHAUST_SECOND_VOL);
-        setting->exhaust_second_vol = air_fan_vol[1];
+        nvs_set_uint32(air_exhaust_fan_vol[1], AIR_EXHAUST_SECOND_VOL);
+        setting->exhaust_second_vol = air_exhaust_fan_vol[1];
     } else {
         setting->exhaust_second_vol = *air_exhaust_second_vol;
     }
     if (air_exhaust_third_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[2], AIR_EXHAUST_THIRD_VOL);
-        setting->exhaust_third_vol = air_fan_vol[2];
+        nvs_set_uint32(air_exhaust_fan_vol[2], AIR_EXHAUST_THIRD_VOL);
+        setting->exhaust_third_vol = air_exhaust_fan_vol[2];
     } else {
         setting->exhaust_third_vol = *air_exhaust_third_vol;
     }
     if (air_exhaust_fourth_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[3], AIR_EXHAUST_FOURTH_VOL);
-        setting->exhaust_fourth_vol = air_fan_vol[3];
+        nvs_set_uint32(air_exhaust_fan_vol[3], AIR_EXHAUST_FOURTH_VOL);
+        setting->exhaust_fourth_vol = air_exhaust_fan_vol[3];
     } else {
         setting->exhaust_fourth_vol = *air_exhaust_fourth_vol;
     }
     if (air_exhaust_fifth_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[4], AIR_EXHAUST_FIFTH_VOL);
-        setting->exhaust_fifth_vol = air_fan_vol[4];
+        nvs_set_uint32(air_exhaust_fan_vol[4], AIR_EXHAUST_FIFTH_VOL);
+        setting->exhaust_fifth_vol = air_exhaust_fan_vol[4];
     } else {
         setting->exhaust_fifth_vol =*air_exhaust_fifth_vol;
     }
     if (air_supply_first_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[0], AIR_SUPPLY_FIRST_VOL);
-        setting->supply_first_vol = air_fan_vol[0];
+        nvs_set_uint32(air_supply_fan_vol[0], AIR_SUPPLY_FIRST_VOL);
+        setting->supply_first_vol = air_supply_fan_vol[0];
     } else {
         setting->supply_first_vol = *air_supply_first_vol;
     }
     if (air_supply_second_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[1], AIR_SUPPLY_SECOND_VOL);
-        setting->supply_second_vol = air_fan_vol[1];
+        nvs_set_uint32(air_supply_fan_vol[1], AIR_SUPPLY_SECOND_VOL);
+        setting->supply_second_vol = air_supply_fan_vol[1];
     } else {
         setting->supply_second_vol = *air_supply_second_vol;
     }
     if (air_supply_third_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[2], AIR_SUPPLY_THIRD_VOL);
-        setting->supply_third_vol = air_fan_vol[2];
+        nvs_set_uint32(air_supply_fan_vol[2], AIR_SUPPLY_THIRD_VOL);
+        setting->supply_third_vol = air_supply_fan_vol[2];
     } else {
         setting->supply_third_vol = *air_supply_third_vol;
     }
     if (air_supply_fourth_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[3], AIR_SUPPLY_FOURTH_VOL);
-        setting->supply_fourth_vol = air_fan_vol[3];
+        nvs_set_uint32(air_supply_fan_vol[3], AIR_SUPPLY_FOURTH_VOL);
+        setting->supply_fourth_vol = air_supply_fan_vol[3];
     } else {
         setting->supply_fourth_vol = *air_supply_fourth_vol;
     }
     if (air_supply_fifth_vol == NULL) {
-        nvs_set_uint32(air_fan_vol[4], AIR_SUPPLY_FIFTH_VOL);
-        setting->supply_fifth_vol = air_fan_vol[4];
+        nvs_set_uint32(air_supply_fan_vol[4], AIR_SUPPLY_FIFTH_VOL);
+        setting->supply_fifth_vol = air_supply_fan_vol[4];
     } else {
         setting->supply_fifth_vol = *air_supply_fifth_vol;
     }

main/ui/generated/events_init.c

@@ -401,20 +401,6 @@ static void FactorySettingPage_btn_filter_life_clear_event_handler (lv_event_t *
     }
 }
 
-static void FactorySettingPage_btn_filter_life_save_event_handler (lv_event_t *e)
-{
-    lv_event_code_t code = lv_event_get_code(e);
-    switch (code) {
-    case LV_EVENT_CLICKED:
-    {
-        on_btn_filter_life_save(e);
-        break;
-    }
-    default:
-        break;
-    }
-}
-
 static void FactorySettingPage_btn_6_event_handler (lv_event_t *e)
 {
     lv_event_code_t code = lv_event_get_code(e);
@@ -437,7 +423,6 @@ void events_init_FactorySettingPage (lv_ui *ui)
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_4, FactorySettingPage_btn_4_event_handler, LV_EVENT_ALL, ui);
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_5, FactorySettingPage_btn_5_event_handler, LV_EVENT_ALL, ui);
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_filter_life_clear, FactorySettingPage_btn_filter_life_clear_event_handler, LV_EVENT_ALL, ui);
-    lv_obj_add_event_cb(ui->FactorySettingPage_btn_filter_life_save, FactorySettingPage_btn_filter_life_save_event_handler, LV_EVENT_ALL, ui);
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_6, FactorySettingPage_btn_6_event_handler, LV_EVENT_ALL, ui);
 }
 

main/ui/generated/gui_guider.h

@@ -171,11 +171,6 @@ typedef struct
 	lv_obj_t *FactorySettingPage_btn_5_label;
 	lv_obj_t *FactorySettingPage_btn_filter_life_clear;
 	lv_obj_t *FactorySettingPage_btn_filter_life_clear_label;
-	lv_obj_t *FactorySettingPage_spinbox_filter_life;
-	lv_obj_t *FactorySettingPage_spinbox_filter_life_btn_plus;
-	lv_obj_t *FactorySettingPage_spinbox_filter_life_btn_minus;
-	lv_obj_t *FactorySettingPage_btn_filter_life_save;
-	lv_obj_t *FactorySettingPage_btn_filter_life_save_label;
 	lv_obj_t *FactorySettingPage_btn_6;
 	lv_obj_t *FactorySettingPage_btn_6_label;
 	lv_obj_t *OTAPage;

main/ui/generated/guider_fonts/lv_font_Alibaba_PuHuiTi_Medium_16.c

@@ -1262,23 +1262,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xb0, 0x8f, 0x20, 0xaf, 0xff, 0xff, 0xff, 0xfb,
     0x0, 0x30, 0xa, 0xf0, 0x0, 0x0, 0xe, 0xb0,
 
-    /* U+547D "命" */
-    0x0, 0x0, 0x0, 0x6f, 0xe2, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x8, 0xfb, 0xee, 0x40, 0x0, 0x0,
-    0x0, 0x3, 0xcf, 0x90, 0x1d, 0xf9, 0x0, 0x0,
-    0x2, 0x9f, 0xf5, 0x0, 0x0, 0xaf, 0xe6, 0x0,
-    0x4f, 0xfc, 0xff, 0xff, 0xff, 0xfe, 0xef, 0xe0,
-    0x1c, 0x41, 0x99, 0x99, 0x99, 0x97, 0x8, 0xa0,
-    0x0, 0x33, 0x33, 0x30, 0x44, 0x44, 0x42, 0x0,
-    0x0, 0xef, 0xff, 0xf0, 0xff, 0xff, 0xfa, 0x0,
-    0x0, 0xea, 0x3a, 0xf0, 0xf9, 0x22, 0xea, 0x0,
-    0x0, 0xe9, 0x8, 0xf0, 0xf7, 0x0, 0xea, 0x0,
-    0x0, 0xe9, 0x8, 0xf0, 0xf7, 0x0, 0xe9, 0x0,
-    0x0, 0xec, 0x7b, 0xf0, 0xf7, 0x5b, 0xf8, 0x0,
-    0x0, 0xef, 0xff, 0xf0, 0xf7, 0x5e, 0xb2, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0,
-
     /* U+56DB "四" */
     0x5a, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x98, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xfe, 0x8f, 0x10, 0xae,
@@ -1448,23 +1431,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf1,
     0x0,
 
-    /* U+5BFF "寿" */
-    0x0, 0x0, 0x0, 0x2c, 0x40, 0x0, 0x0, 0x0,
-    0x16, 0x66, 0x69, 0xf9, 0x66, 0x66, 0x61, 0x3,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x30, 0x0,
-    0x0, 0xb, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xaf,
-    0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, 0x3, 0x44,
-    0x8f, 0x84, 0x44, 0x44, 0x20, 0x5, 0x77, 0x7c,
-    0xf8, 0x77, 0x77, 0x77, 0x60, 0xbe, 0xef, 0xff,
-    0xee, 0xee, 0xee, 0xed, 0x0, 0x0, 0xcf, 0x32,
-    0x22, 0x5f, 0x52, 0x10, 0x0, 0x8f, 0xff, 0xff,
-    0xff, 0xff, 0xfa, 0x0, 0x6f, 0xab, 0xe5, 0x55,
-    0x8f, 0x85, 0x30, 0x6f, 0xb0, 0x7f, 0xb0, 0x4,
-    0xf4, 0x0, 0x4f, 0xb0, 0x0, 0x6d, 0x11, 0x7f,
-    0x40, 0x0, 0x60, 0x0, 0x0, 0x6, 0xff, 0xf2,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x17, 0x62, 0x0,
-    0x0,
-
     /* U+5C4F "屏" */
     0x0, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10,
     0xb, 0xf6, 0x66, 0x66, 0x66, 0x6b, 0xf1, 0x0,
@@ -3934,163 +3900,161 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 7110, .adv_w = 252, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
     {.bitmap_index = 7215, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 7328, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 7448, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 7568, .adv_w = 252, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 7653, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 7773, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 7448, .adv_w = 252, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 7533, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 7653, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 7781, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 7901, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 8021, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8141, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8261, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 8389, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 8517, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8637, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8750, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8863, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8968, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 9066, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9194, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9307, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9427, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9532, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 9630, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9735, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9855, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 9968, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 10104, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10232, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10352, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10472, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10592, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 10728, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10848, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10976, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11096, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11224, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11352, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 11480, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11600, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11705, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 11817, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 11915, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 12043, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 12156, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12284, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 12420, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 12533, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12653, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 12757, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12885, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13005, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 8141, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 8269, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 8397, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8517, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8630, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8735, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 8833, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8961, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9074, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9194, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9299, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 9397, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9502, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9622, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 9735, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 9871, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9999, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10119, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10239, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10359, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 10495, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10615, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10743, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10863, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10991, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11119, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 11247, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11367, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11472, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 11584, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 11682, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 11810, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 11923, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12051, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 12187, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 12300, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12420, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 12524, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12652, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12772, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 12900, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 13028, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 13133, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13261, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13366, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13494, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 13630, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 13728, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13826, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 13946, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 14058, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 14171, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14291, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14396, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14516, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14629, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 14757, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14877, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 15005, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15117, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15237, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15357, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 15455, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15553, .adv_w = 252, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 15672, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15785, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15890, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16018, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16138, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 16250, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16370, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16498, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16618, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16738, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16858, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16986, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17099, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17219, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 17324, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 17422, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17542, .adv_w = 252, .box_w = 13, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17646, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17758, .adv_w = 252, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17863, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17976, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18088, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18208, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18321, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18457, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 18553, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 18665, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 18761, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 18827, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18955, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19083, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 19209, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19337, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 19445, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19573, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 19629, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 19713, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19857, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 19953, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 20041, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 20121, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 20247, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20352, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20450, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 20530, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
-    {.bitmap_index = 20642, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20712, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20782, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20880, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
-    {.bitmap_index = 20908, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 21016, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 21176, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
-    {.bitmap_index = 21336, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 21464, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 21534, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 21604, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 21744, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 21840, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 21968, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
-    {.bitmap_index = 22113, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 22218, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 22330, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 22428, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 22526, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 22622, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
-    {.bitmap_index = 22718, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 22830, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 22942, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 23050, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
-    {.bitmap_index = 23212, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 23308, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 23458, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23558, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23658, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23758, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23858, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23958, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 24105, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 24201, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 24313, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
-    {.bitmap_index = 24458, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 24578, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 24674, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 24768, .adv_w = 252, .box_w = 6, .box_h = 14, .ofs_x = 8, .ofs_y = -2},
-    {.bitmap_index = 24810, .adv_w = 252, .box_w = 5, .box_h = 14, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 24845, .adv_w = 252, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 24860, .adv_w = 252, .box_w = 4, .box_h = 10, .ofs_x = 2, .ofs_y = -1}
+    {.bitmap_index = 13261, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 13397, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 13495, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 13593, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 13713, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 13825, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 13938, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14058, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14163, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14283, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14396, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 14524, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14644, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 14772, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 14884, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15004, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15124, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 15222, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 15320, .adv_w = 252, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 15439, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15552, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15657, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15785, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15905, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 16017, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16137, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16265, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16385, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16505, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16625, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16753, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16866, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16986, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 17091, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 17189, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17309, .adv_w = 252, .box_w = 13, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 17413, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 17525, .adv_w = 252, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 17630, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17743, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17855, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17975, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18088, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18224, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 18320, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 18432, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 18528, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 18594, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18722, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18850, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 18976, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19104, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 19212, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19340, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 19396, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 19480, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19624, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 19720, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19808, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 19888, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 20014, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20119, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20217, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 20297, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
+    {.bitmap_index = 20409, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20479, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20549, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20647, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
+    {.bitmap_index = 20675, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 20783, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 20943, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
+    {.bitmap_index = 21103, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 21231, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 21301, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 21371, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 21511, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 21607, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 21735, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
+    {.bitmap_index = 21880, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 21985, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 22097, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 22195, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 22293, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 22389, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
+    {.bitmap_index = 22485, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 22597, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 22709, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 22817, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
+    {.bitmap_index = 22979, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 23075, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 23225, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23325, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23425, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23525, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23625, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23725, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 23872, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 23968, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 24080, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
+    {.bitmap_index = 24225, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 24345, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 24441, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 24535, .adv_w = 252, .box_w = 6, .box_h = 14, .ofs_x = 8, .ofs_y = -2},
+    {.bitmap_index = 24577, .adv_w = 252, .box_w = 5, .box_h = 14, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 24612, .adv_w = 252, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 24627, .adv_w = 252, .box_w = 4, .box_h = 10, .ofs_x = 2, .ofs_y = -1}
 };
 
 /*---------------------
@@ -4102,26 +4066,26 @@ static const uint16_t unicode_list_2[] = {
     0x2d8b, 0x2d91, 0x2dd3, 0x2e59, 0x2e7c, 0x2eda, 0x3062, 0x3070,
     0x3073, 0x30f7, 0x3103, 0x3114, 0x3134, 0x314a, 0x319c, 0x3244,
     0x327f, 0x3288, 0x32ca, 0x32d3, 0x32f4, 0x330a, 0x330b, 0x332c,
-    0x337a, 0x35d8, 0x3625, 0x362d, 0x37ed, 0x3804, 0x380a, 0x382e,
-    0x3a55, 0x3a97, 0x3ac3, 0x3afc, 0x3b4c, 0x3cef, 0x3d52, 0x3d8c,
-    0x3df7, 0x3dfd, 0x3e50, 0x3e52, 0x3efe, 0x3f4f, 0x3f5f, 0x410d,
-    0x4168, 0x417b, 0x421e, 0x428f, 0x42a2, 0x42a4, 0x4375, 0x43ca,
-    0x4442, 0x44aa, 0x44ad, 0x44dd, 0x44f3, 0x453b, 0x4577, 0x4627,
-    0x4629, 0x4637, 0x46e2, 0x4760, 0x4a60, 0x4b35, 0x4c85, 0x4d8d,
-    0x4de1, 0x4f6a, 0x5145, 0x51b3, 0x5303, 0x5425, 0x5432, 0x5578,
-    0x56fe, 0x576b, 0x5837, 0x58ed, 0x5908, 0x5a9e, 0x5da4, 0x5dce,
-    0x5dd9, 0x5dea, 0x5dfc, 0x5e4e, 0x5e6b, 0x5ffa, 0x6749, 0x687e,
-    0x68e3, 0x6abb, 0x6adf, 0x6af4, 0x6c22, 0x6e90, 0x6ed8, 0x6ed9,
-    0x6edb, 0x6efd, 0x6efe, 0x70ca, 0x70cc, 0x739c, 0x74ea, 0x74f1,
-    0x7599, 0x76f0, 0x77cb, 0x7885, 0x79d5, 0xcefe, 0xcf05, 0xcf08,
-    0xcf09, 0xcf0a, 0xcf0e, 0xcf10, 0xcf12, 0xcf16, 0xcf19, 0xcf1e,
-    0xcf23, 0xcf24, 0xcf25, 0xcf3b, 0xcf40, 0xcf45, 0xcf48, 0xcf49,
-    0xcf4a, 0xcf4e, 0xcf4f, 0xcf50, 0xcf51, 0xcf64, 0xcf65, 0xcf6b,
-    0xcf6d, 0xcf6e, 0xcf71, 0xcf74, 0xcf75, 0xcf76, 0xcf78, 0xcf90,
-    0xcf92, 0xcfc1, 0xcfc2, 0xcfc4, 0xcfc6, 0xcfdd, 0xcfe4, 0xcfe7,
-    0xcff0, 0xd019, 0xd021, 0xd058, 0xd0e8, 0xd13d, 0xd13e, 0xd13f,
-    0xd140, 0xd141, 0xd184, 0xd190, 0xd1ea, 0xd201, 0xd457, 0xd6bf,
-    0xd79f, 0xde05, 0xde06, 0xde09, 0xde17
+    0x35d8, 0x3625, 0x362d, 0x37ed, 0x3804, 0x380a, 0x382e, 0x3a55,
+    0x3a97, 0x3ac3, 0x3b4c, 0x3cef, 0x3d52, 0x3d8c, 0x3df7, 0x3dfd,
+    0x3e50, 0x3e52, 0x3efe, 0x3f4f, 0x3f5f, 0x410d, 0x4168, 0x417b,
+    0x421e, 0x428f, 0x42a2, 0x42a4, 0x4375, 0x43ca, 0x4442, 0x44aa,
+    0x44ad, 0x44dd, 0x44f3, 0x453b, 0x4577, 0x4627, 0x4629, 0x4637,
+    0x46e2, 0x4760, 0x4a60, 0x4b35, 0x4c85, 0x4d8d, 0x4de1, 0x4f6a,
+    0x5145, 0x51b3, 0x5303, 0x5425, 0x5432, 0x5578, 0x56fe, 0x576b,
+    0x5837, 0x58ed, 0x5908, 0x5a9e, 0x5da4, 0x5dce, 0x5dd9, 0x5dea,
+    0x5dfc, 0x5e4e, 0x5e6b, 0x5ffa, 0x6749, 0x687e, 0x68e3, 0x6abb,
+    0x6adf, 0x6af4, 0x6c22, 0x6e90, 0x6ed8, 0x6ed9, 0x6edb, 0x6efd,
+    0x6efe, 0x70ca, 0x70cc, 0x739c, 0x74ea, 0x74f1, 0x7599, 0x76f0,
+    0x77cb, 0x7885, 0x79d5, 0xcefe, 0xcf05, 0xcf08, 0xcf09, 0xcf0a,
+    0xcf0e, 0xcf10, 0xcf12, 0xcf16, 0xcf19, 0xcf1e, 0xcf23, 0xcf24,
+    0xcf25, 0xcf3b, 0xcf40, 0xcf45, 0xcf48, 0xcf49, 0xcf4a, 0xcf4e,
+    0xcf4f, 0xcf50, 0xcf51, 0xcf64, 0xcf65, 0xcf6b, 0xcf6d, 0xcf6e,
+    0xcf71, 0xcf74, 0xcf75, 0xcf76, 0xcf78, 0xcf90, 0xcf92, 0xcfc1,
+    0xcfc2, 0xcfc4, 0xcfc6, 0xcfdd, 0xcfe4, 0xcfe7, 0xcff0, 0xd019,
+    0xd021, 0xd058, 0xd0e8, 0xd13d, 0xd13e, 0xd13f, 0xd140, 0xd141,
+    0xd184, 0xd190, 0xd1ea, 0xd201, 0xd457, 0xd6bf, 0xd79f, 0xde05,
+    0xde06, 0xde09, 0xde17
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -4137,7 +4101,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 8451, .range_length = 56856, .glyph_id_start = 97,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 189, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 187, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
@@ -4184,7 +4148,7 @@ static const uint8_t kern_left_class_mapping[] =
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0
+    0, 0, 0, 0
 };
 
 /*Map glyph_ids to kern right classes*/
@@ -4225,7 +4189,7 @@ static const uint8_t kern_right_class_mapping[] =
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0
+    0, 0, 0, 0
 };
 
 /*Kern values between classes*/

main/ui/generated/setup_scr_FactorySettingPage.c

@@ -38,14 +38,14 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
     lv_obj_set_style_bg_opa(ui->FactorySettingPage_tabview_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_bg_color(ui->FactorySettingPage_tabview_1, lv_color_hex(0xf9f9f9), LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_bg_grad_dir(ui->FactorySettingPage_tabview_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_border_width(ui->FactorySettingPage_tabview_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_radius(ui->FactorySettingPage_tabview_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_shadow_width(ui->FactorySettingPage_tabview_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_color(ui->FactorySettingPage_tabview_1, lv_color_hex(0x4d4d4d), LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_font(ui->FactorySettingPage_tabview_1, &lv_font_Alibaba_PuHuiTi_Medium_16, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_opa(ui->FactorySettingPage_tabview_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_letter_space(ui->FactorySettingPage_tabview_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_line_space(ui->FactorySettingPage_tabview_1, 16, LV_PART_MAIN|LV_STATE_DEFAULT);
+    lv_obj_set_style_border_width(ui->FactorySettingPage_tabview_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
+    lv_obj_set_style_radius(ui->FactorySettingPage_tabview_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
+    lv_obj_set_style_shadow_width(ui->FactorySettingPage_tabview_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
 
     //Write style state: LV_STATE_DEFAULT for &style_FactorySettingPage_tabview_1_extra_btnm_main_default
     static lv_style_t style_FactorySettingPage_tabview_1_extra_btnm_main_default;
@@ -74,14 +74,14 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
     lv_style_set_text_color(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, lv_color_hex(0x2195f6));
     lv_style_set_text_font(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, &lv_font_montserratMedium_12);
     lv_style_set_text_opa(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, 255);
-    lv_style_set_bg_opa(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, 60);
-    lv_style_set_bg_color(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, lv_color_hex(0x2195f6));
-    lv_style_set_bg_grad_dir(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, LV_GRAD_DIR_NONE);
     lv_style_set_border_width(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, 4);
     lv_style_set_border_opa(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, 255);
     lv_style_set_border_color(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, lv_color_hex(0x2195f6));
     lv_style_set_border_side(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, LV_BORDER_SIDE_BOTTOM);
     lv_style_set_radius(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, 0);
+    lv_style_set_bg_opa(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, 60);
+    lv_style_set_bg_color(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, lv_color_hex(0x2195f6));
+    lv_style_set_bg_grad_dir(&style_FactorySettingPage_tabview_1_extra_btnm_items_checked, LV_GRAD_DIR_NONE);
     lv_obj_add_style(lv_tabview_get_tab_bar(ui->FactorySettingPage_tabview_1), &style_FactorySettingPage_tabview_1_extra_btnm_items_checked, LV_PART_ITEMS|LV_STATE_CHECKED);
 
     //Write codes 风档电压
@@ -1058,7 +1058,7 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
 
     //Write codes FactorySettingPage_label_detail_error
     ui->FactorySettingPage_label_detail_error = lv_label_create(ui->FactorySettingPage_tabview_1_tab_2);
-    lv_obj_set_pos(ui->FactorySettingPage_label_detail_error, 190, 32);
+    lv_obj_set_pos(ui->FactorySettingPage_label_detail_error, 174, 34);
     lv_obj_set_size(ui->FactorySettingPage_label_detail_error, 100, 310);
     lv_label_set_text(ui->FactorySettingPage_label_detail_error, "E1");
     lv_label_set_long_mode(ui->FactorySettingPage_label_detail_error, LV_LABEL_LONG_WRAP);
@@ -1086,7 +1086,7 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
 
     //Write codes FactorySettingPage_btn_4
     ui->FactorySettingPage_btn_4 = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_btn_4, 161, 217);
+    lv_obj_set_pos(ui->FactorySettingPage_btn_4, 150, 85);
     lv_obj_set_size(ui->FactorySettingPage_btn_4, 157, 50);
     ui->FactorySettingPage_btn_4_label = lv_label_create(ui->FactorySettingPage_btn_4);
     lv_label_set_text(ui->FactorySettingPage_btn_4_label, "退出高级设置");
@@ -1109,7 +1109,7 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
 
     //Write codes FactorySettingPage_btn_5
     ui->FactorySettingPage_btn_5 = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_btn_5, 161, 280);
+    lv_obj_set_pos(ui->FactorySettingPage_btn_5, 150, 165);
     lv_obj_set_size(ui->FactorySettingPage_btn_5, 157, 50);
     ui->FactorySettingPage_btn_5_label = lv_label_create(ui->FactorySettingPage_btn_5);
     lv_label_set_text(ui->FactorySettingPage_btn_5_label, "恢复出厂设置");
@@ -1132,7 +1132,7 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
 
     //Write codes FactorySettingPage_btn_filter_life_clear
     ui->FactorySettingPage_btn_filter_life_clear = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_btn_filter_life_clear, 161, 151);
+    lv_obj_set_pos(ui->FactorySettingPage_btn_filter_life_clear, 150, 5);
     lv_obj_set_size(ui->FactorySettingPage_btn_filter_life_clear, 157, 50);
     ui->FactorySettingPage_btn_filter_life_clear_label = lv_label_create(ui->FactorySettingPage_btn_filter_life_clear);
     lv_label_set_text(ui->FactorySettingPage_btn_filter_life_clear_label, "重置滤网");
@@ -1153,96 +1153,9 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
     lv_obj_set_style_text_opa(ui->FactorySettingPage_btn_filter_life_clear, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_align(ui->FactorySettingPage_btn_filter_life_clear, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
 
-    //Write codes FactorySettingPage_spinbox_filter_life
-    ui->FactorySettingPage_spinbox_filter_life = lv_spinbox_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_spinbox_filter_life, 203, 11);
-    lv_obj_set_pos(ui->FactorySettingPage_spinbox_filter_life, 203, 11);
-    lv_obj_set_width(ui->FactorySettingPage_spinbox_filter_life, 74);
-    lv_obj_set_height(ui->FactorySettingPage_spinbox_filter_life, 38);
-    lv_spinbox_set_digit_format(ui->FactorySettingPage_spinbox_filter_life, 2, 2);
-    lv_spinbox_set_range(ui->FactorySettingPage_spinbox_filter_life, -99, 99);
-    int32_t FactorySettingPage_spinbox_filter_life_h = lv_obj_get_height(ui->FactorySettingPage_spinbox_filter_life);
-    ui->FactorySettingPage_spinbox_filter_life_btn_plus = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_spinbox_filter_life, 203, 11);
-    lv_obj_set_size(ui->FactorySettingPage_spinbox_filter_life_btn_plus, FactorySettingPage_spinbox_filter_life_h, FactorySettingPage_spinbox_filter_life_h);
-    lv_obj_align_to(ui->FactorySettingPage_spinbox_filter_life_btn_plus, ui->FactorySettingPage_spinbox_filter_life, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
-    lv_obj_set_style_bg_image_src(ui->FactorySettingPage_spinbox_filter_life_btn_plus, LV_SYMBOL_PLUS, 0);
-    lv_obj_add_event_cb(ui->FactorySettingPage_spinbox_filter_life_btn_plus, lv_FactorySettingPage_spinbox_filter_life_increment_event_cb, LV_EVENT_ALL, NULL);
-    ui->FactorySettingPage_spinbox_filter_life_btn_minus = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_size(ui->FactorySettingPage_spinbox_filter_life_btn_minus, FactorySettingPage_spinbox_filter_life_h, FactorySettingPage_spinbox_filter_life_h);
-    lv_obj_align_to(ui->FactorySettingPage_spinbox_filter_life_btn_minus, ui->FactorySettingPage_spinbox_filter_life, LV_ALIGN_OUT_LEFT_MID, -5, 0);
-    lv_obj_set_style_bg_image_src(ui->FactorySettingPage_spinbox_filter_life_btn_minus, LV_SYMBOL_MINUS, 0);
-    lv_obj_add_event_cb(ui->FactorySettingPage_spinbox_filter_life_btn_minus, lv_FactorySettingPage_spinbox_filter_life_decrement_event_cb, LV_EVENT_ALL, NULL);
-
-    //Write style for FactorySettingPage_spinbox_filter_life, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
-    lv_obj_set_style_bg_opa(ui->FactorySettingPage_spinbox_filter_life, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_color(ui->FactorySettingPage_spinbox_filter_life, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_grad_dir(ui->FactorySettingPage_spinbox_filter_life, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_border_width(ui->FactorySettingPage_spinbox_filter_life, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_border_opa(ui->FactorySettingPage_spinbox_filter_life, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_border_color(ui->FactorySettingPage_spinbox_filter_life, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_border_side(ui->FactorySettingPage_spinbox_filter_life, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_pad_top(ui->FactorySettingPage_spinbox_filter_life, 10, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_pad_right(ui->FactorySettingPage_spinbox_filter_life, 10, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_pad_bottom(ui->FactorySettingPage_spinbox_filter_life, 10, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_pad_left(ui->FactorySettingPage_spinbox_filter_life, 10, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_color(ui->FactorySettingPage_spinbox_filter_life, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_font(ui->FactorySettingPage_spinbox_filter_life, &lv_font_montserratMedium_12, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_opa(ui->FactorySettingPage_spinbox_filter_life, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_letter_space(ui->FactorySettingPage_spinbox_filter_life, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_radius(ui->FactorySettingPage_spinbox_filter_life, 5, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_shadow_width(ui->FactorySettingPage_spinbox_filter_life, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
-
-    //Write style for FactorySettingPage_spinbox_filter_life, Part: LV_PART_CURSOR, State: LV_STATE_DEFAULT.
-    lv_obj_set_style_text_color(ui->FactorySettingPage_spinbox_filter_life, lv_color_hex(0xffffff), LV_PART_CURSOR|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_font(ui->FactorySettingPage_spinbox_filter_life, &lv_font_montserratMedium_12, LV_PART_CURSOR|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_opa(ui->FactorySettingPage_spinbox_filter_life, 255, LV_PART_CURSOR|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_opa(ui->FactorySettingPage_spinbox_filter_life, 255, LV_PART_CURSOR|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_color(ui->FactorySettingPage_spinbox_filter_life, lv_color_hex(0x2195f6), LV_PART_CURSOR|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_grad_dir(ui->FactorySettingPage_spinbox_filter_life, LV_GRAD_DIR_NONE, LV_PART_CURSOR|LV_STATE_DEFAULT);
-
-    //Write style state: LV_STATE_DEFAULT for &style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default
-    static lv_style_t style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default;
-    ui_init_style(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default);
-
-    lv_style_set_text_color(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, lv_color_hex(0xffffff));
-    lv_style_set_text_font(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, &lv_font_montserratMedium_12);
-    lv_style_set_text_opa(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, 255);
-    lv_style_set_bg_opa(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, 255);
-    lv_style_set_bg_color(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, lv_color_hex(0x2195f6));
-    lv_style_set_bg_grad_dir(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, LV_GRAD_DIR_NONE);
-    lv_style_set_border_width(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, 0);
-    lv_style_set_radius(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, 5);
-    lv_style_set_shadow_width(&style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, 0);
-    lv_obj_add_style(ui->FactorySettingPage_spinbox_filter_life_btn_plus, &style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_add_style(ui->FactorySettingPage_spinbox_filter_life_btn_minus, &style_FactorySettingPage_spinbox_filter_life_extra_btns_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
-
-    //Write codes FactorySettingPage_btn_filter_life_save
-    ui->FactorySettingPage_btn_filter_life_save = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_btn_filter_life_save, 161, 56);
-    lv_obj_set_size(ui->FactorySettingPage_btn_filter_life_save, 157, 50);
-    ui->FactorySettingPage_btn_filter_life_save_label = lv_label_create(ui->FactorySettingPage_btn_filter_life_save);
-    lv_label_set_text(ui->FactorySettingPage_btn_filter_life_save_label, "设置滤网寿命");
-    lv_label_set_long_mode(ui->FactorySettingPage_btn_filter_life_save_label, LV_LABEL_LONG_WRAP);
-    lv_obj_align(ui->FactorySettingPage_btn_filter_life_save_label, LV_ALIGN_CENTER, 0, 0);
-    lv_obj_set_style_pad_all(ui->FactorySettingPage_btn_filter_life_save, 0, LV_STATE_DEFAULT);
-    lv_obj_set_width(ui->FactorySettingPage_btn_filter_life_save_label, LV_PCT(100));
-
-    //Write style for FactorySettingPage_btn_filter_life_save, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
-    lv_obj_set_style_bg_opa(ui->FactorySettingPage_btn_filter_life_save, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_color(ui->FactorySettingPage_btn_filter_life_save, lv_color_hex(0x00eeff), LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_grad_dir(ui->FactorySettingPage_btn_filter_life_save, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_border_width(ui->FactorySettingPage_btn_filter_life_save, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_radius(ui->FactorySettingPage_btn_filter_life_save, 5, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_shadow_width(ui->FactorySettingPage_btn_filter_life_save, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_color(ui->FactorySettingPage_btn_filter_life_save, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_font(ui->FactorySettingPage_btn_filter_life_save, &lv_font_Alibaba_PuHuiTi_Medium_16, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_opa(ui->FactorySettingPage_btn_filter_life_save, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_text_align(ui->FactorySettingPage_btn_filter_life_save, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
-
     //Write codes FactorySettingPage_btn_6
     ui->FactorySettingPage_btn_6 = lv_button_create(ui->FactorySettingPage_tabview_1_tab_3);
-    lv_obj_set_pos(ui->FactorySettingPage_btn_6, 161, 342);
+    lv_obj_set_pos(ui->FactorySettingPage_btn_6, 150, 245);
     lv_obj_set_size(ui->FactorySettingPage_btn_6, 157, 50);
     ui->FactorySettingPage_btn_6_label = lv_label_create(ui->FactorySettingPage_btn_6);
     lv_label_set_text(ui->FactorySettingPage_btn_6_label, "重启设备");
@@ -1263,8 +1176,8 @@ void setup_scr_FactorySettingPage(lv_ui *ui)
     lv_obj_set_style_text_opa(ui->FactorySettingPage_btn_6, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_align(ui->FactorySettingPage_btn_6, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
 
-    //The custom code of FactorySettingPage.
-    lv_spinbox_set_range(ui->FactorySettingPage_spinbox_filter_life, 1, 99);
+//    //The custom code of FactorySettingPage.
+//    lv_spinbox_set_range(ui->FactorySettingPage_spinbox_filter_life, 1, 99);
 
     //Update current screen layout.
     lv_obj_update_layout(ui->FactorySettingPage);

main/ui/generated/widgets_init.c

@@ -245,18 +245,4 @@ void lv_FactorySettingPage_spinbox_supply5_vol_decrement_event_cb(lv_event_t * e
         lv_spinbox_decrement(guider_ui.FactorySettingPage_spinbox_supply5_vol);
     }
 }
-void lv_FactorySettingPage_spinbox_filter_life_increment_event_cb(lv_event_t * event)
-{
-    lv_event_code_t code = lv_event_get_code(event);
-    if(code == LV_EVENT_SHORT_CLICKED || code == LV_EVENT_LONG_PRESSED_REPEAT) {
-        lv_spinbox_increment(guider_ui.FactorySettingPage_spinbox_filter_life);
-    }
-}
-void lv_FactorySettingPage_spinbox_filter_life_decrement_event_cb(lv_event_t * event)
-{
-    lv_event_code_t code = lv_event_get_code(event);
-    if(code == LV_EVENT_SHORT_CLICKED || code == LV_EVENT_LONG_PRESSED_REPEAT) {
-        lv_spinbox_decrement(guider_ui.FactorySettingPage_spinbox_filter_life);
-    }
-}
 

main/ui/generated/widgets_init.h

@@ -56,9 +56,6 @@ void lv_FactorySettingPage_spinbox_supply4_vol_decrement_event_cb(lv_event_t * e
 extern lv_obj_t * FactorySettingPage_spinbox_supply5_vol;
 void lv_FactorySettingPage_spinbox_supply5_vol_increment_event_cb(lv_event_t * event);
 void lv_FactorySettingPage_spinbox_supply5_vol_decrement_event_cb(lv_event_t * event);
-extern lv_obj_t * FactorySettingPage_spinbox_filter_life;
-void lv_FactorySettingPage_spinbox_filter_life_increment_event_cb(lv_event_t * event);
-void lv_FactorySettingPage_spinbox_filter_life_decrement_event_cb(lv_event_t * event);
 
 
 

xfUI/XFJS/generated/events_init.c

@@ -401,20 +401,6 @@ static void FactorySettingPage_btn_filter_life_clear_event_handler (lv_event_t *
     }
 }
 
-static void FactorySettingPage_btn_filter_life_save_event_handler (lv_event_t *e)
-{
-    lv_event_code_t code = lv_event_get_code(e);
-    switch (code) {
-    case LV_EVENT_CLICKED:
-    {
-        on_btn_filter_life_save(e);
-        break;
-    }
-    default:
-        break;
-    }
-}
-
 static void FactorySettingPage_btn_6_event_handler (lv_event_t *e)
 {
     lv_event_code_t code = lv_event_get_code(e);
@@ -437,7 +423,6 @@ void events_init_FactorySettingPage (lv_ui *ui)
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_4, FactorySettingPage_btn_4_event_handler, LV_EVENT_ALL, ui);
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_5, FactorySettingPage_btn_5_event_handler, LV_EVENT_ALL, ui);
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_filter_life_clear, FactorySettingPage_btn_filter_life_clear_event_handler, LV_EVENT_ALL, ui);
-    lv_obj_add_event_cb(ui->FactorySettingPage_btn_filter_life_save, FactorySettingPage_btn_filter_life_save_event_handler, LV_EVENT_ALL, ui);
     lv_obj_add_event_cb(ui->FactorySettingPage_btn_6, FactorySettingPage_btn_6_event_handler, LV_EVENT_ALL, ui);
 }
 

xfUI/XFJS/generated/gui_guider.h

@@ -171,11 +171,6 @@ typedef struct
 	lv_obj_t *FactorySettingPage_btn_5_label;
 	lv_obj_t *FactorySettingPage_btn_filter_life_clear;
 	lv_obj_t *FactorySettingPage_btn_filter_life_clear_label;
-	lv_obj_t *FactorySettingPage_spinbox_filter_life;
-	lv_obj_t *FactorySettingPage_spinbox_filter_life_btn_plus;
-	lv_obj_t *FactorySettingPage_spinbox_filter_life_btn_minus;
-	lv_obj_t *FactorySettingPage_btn_filter_life_save;
-	lv_obj_t *FactorySettingPage_btn_filter_life_save_label;
 	lv_obj_t *FactorySettingPage_btn_6;
 	lv_obj_t *FactorySettingPage_btn_6_label;
 	lv_obj_t *OTAPage;

xfUI/XFJS/generated/guider_fonts/lv_font_Alibaba_PuHuiTi_Medium_16.c

@@ -1262,23 +1262,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xb0, 0x8f, 0x20, 0xaf, 0xff, 0xff, 0xff, 0xfb,
     0x0, 0x30, 0xa, 0xf0, 0x0, 0x0, 0xe, 0xb0,
 
-    /* U+547D "命" */
-    0x0, 0x0, 0x0, 0x6f, 0xe2, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x8, 0xfb, 0xee, 0x40, 0x0, 0x0,
-    0x0, 0x3, 0xcf, 0x90, 0x1d, 0xf9, 0x0, 0x0,
-    0x2, 0x9f, 0xf5, 0x0, 0x0, 0xaf, 0xe6, 0x0,
-    0x4f, 0xfc, 0xff, 0xff, 0xff, 0xfe, 0xef, 0xe0,
-    0x1c, 0x41, 0x99, 0x99, 0x99, 0x97, 0x8, 0xa0,
-    0x0, 0x33, 0x33, 0x30, 0x44, 0x44, 0x42, 0x0,
-    0x0, 0xef, 0xff, 0xf0, 0xff, 0xff, 0xfa, 0x0,
-    0x0, 0xea, 0x3a, 0xf0, 0xf9, 0x22, 0xea, 0x0,
-    0x0, 0xe9, 0x8, 0xf0, 0xf7, 0x0, 0xea, 0x0,
-    0x0, 0xe9, 0x8, 0xf0, 0xf7, 0x0, 0xe9, 0x0,
-    0x0, 0xec, 0x7b, 0xf0, 0xf7, 0x5b, 0xf8, 0x0,
-    0x0, 0xef, 0xff, 0xf0, 0xf7, 0x5e, 0xb2, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0,
-
     /* U+56DB "四" */
     0x5a, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x98, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xfe, 0x8f, 0x10, 0xae,
@@ -1448,23 +1431,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf1,
     0x0,
 
-    /* U+5BFF "寿" */
-    0x0, 0x0, 0x0, 0x2c, 0x40, 0x0, 0x0, 0x0,
-    0x16, 0x66, 0x69, 0xf9, 0x66, 0x66, 0x61, 0x3,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x30, 0x0,
-    0x0, 0xb, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xaf,
-    0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, 0x3, 0x44,
-    0x8f, 0x84, 0x44, 0x44, 0x20, 0x5, 0x77, 0x7c,
-    0xf8, 0x77, 0x77, 0x77, 0x60, 0xbe, 0xef, 0xff,
-    0xee, 0xee, 0xee, 0xed, 0x0, 0x0, 0xcf, 0x32,
-    0x22, 0x5f, 0x52, 0x10, 0x0, 0x8f, 0xff, 0xff,
-    0xff, 0xff, 0xfa, 0x0, 0x6f, 0xab, 0xe5, 0x55,
-    0x8f, 0x85, 0x30, 0x6f, 0xb0, 0x7f, 0xb0, 0x4,
-    0xf4, 0x0, 0x4f, 0xb0, 0x0, 0x6d, 0x11, 0x7f,
-    0x40, 0x0, 0x60, 0x0, 0x0, 0x6, 0xff, 0xf2,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x17, 0x62, 0x0,
-    0x0,
-
     /* U+5C4F "屏" */
     0x0, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10,
     0xb, 0xf6, 0x66, 0x66, 0x66, 0x6b, 0xf1, 0x0,
@@ -3934,163 +3900,161 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 7110, .adv_w = 252, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
     {.bitmap_index = 7215, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 7328, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 7448, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 7568, .adv_w = 252, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 7653, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 7773, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 7448, .adv_w = 252, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 7533, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 7653, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 7781, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 7901, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 8021, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8141, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8261, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 8389, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 8517, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8637, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8750, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8863, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 8968, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 9066, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9194, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9307, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9427, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9532, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 9630, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9735, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 9855, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 9968, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 10104, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10232, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10352, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10472, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10592, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 10728, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10848, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 10976, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11096, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11224, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11352, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 11480, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11600, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11705, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 11817, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 11915, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 12043, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 12156, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12284, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 12420, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 12533, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12653, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 12757, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12885, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13005, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 8141, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 8269, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 8397, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8517, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8630, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8735, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 8833, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 8961, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9074, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9194, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9299, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 9397, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9502, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9622, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 9735, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 9871, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 9999, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10119, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10239, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10359, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 10495, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10615, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10743, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10863, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 10991, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11119, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 11247, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11367, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11472, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 11584, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 11682, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 11810, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 11923, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12051, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 12187, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 12300, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12420, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 12524, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12652, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12772, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 12900, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 13028, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
     {.bitmap_index = 13133, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13261, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13366, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13494, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 13630, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 13728, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13826, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 13946, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 14058, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 14171, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14291, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14396, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14516, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14629, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 14757, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14877, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 15005, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15117, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15237, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15357, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 15455, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15553, .adv_w = 252, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 15672, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15785, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15890, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16018, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16138, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 16250, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16370, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16498, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16618, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16738, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16858, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16986, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17099, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17219, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 17324, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 17422, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17542, .adv_w = 252, .box_w = 13, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17646, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17758, .adv_w = 252, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17863, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 17976, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18088, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18208, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18321, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18457, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 18553, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 18665, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 18761, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 18827, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 18955, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19083, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 19209, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19337, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 19445, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19573, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 19629, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 19713, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 19857, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 19953, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 20041, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 20121, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 20247, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20352, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20450, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 20530, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
-    {.bitmap_index = 20642, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20712, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20782, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 20880, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
-    {.bitmap_index = 20908, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 21016, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 21176, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
-    {.bitmap_index = 21336, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 21464, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 21534, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 21604, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 21744, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 21840, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 21968, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
-    {.bitmap_index = 22113, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 22218, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 22330, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 22428, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 22526, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 22622, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
-    {.bitmap_index = 22718, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 22830, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 22942, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 23050, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
-    {.bitmap_index = 23212, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 23308, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 23458, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23558, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23658, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23758, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23858, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 23958, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 24105, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 24201, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 24313, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
-    {.bitmap_index = 24458, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 24578, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 24674, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 24768, .adv_w = 252, .box_w = 6, .box_h = 14, .ofs_x = 8, .ofs_y = -2},
-    {.bitmap_index = 24810, .adv_w = 252, .box_w = 5, .box_h = 14, .ofs_x = 2, .ofs_y = -2},
-    {.bitmap_index = 24845, .adv_w = 252, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 24860, .adv_w = 252, .box_w = 4, .box_h = 10, .ofs_x = 2, .ofs_y = -1}
+    {.bitmap_index = 13261, .adv_w = 252, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 13397, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 13495, .adv_w = 252, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 13593, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 13713, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 13825, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 13938, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14058, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14163, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14283, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14396, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 14524, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14644, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 14772, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 14884, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15004, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15124, .adv_w = 252, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 15222, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 15320, .adv_w = 252, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 15439, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15552, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15657, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15785, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15905, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 16017, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16137, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16265, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16385, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16505, .adv_w = 252, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16625, .adv_w = 252, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16753, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16866, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 16986, .adv_w = 252, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 17091, .adv_w = 252, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 17189, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17309, .adv_w = 252, .box_w = 13, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 17413, .adv_w = 252, .box_w = 14, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 17525, .adv_w = 252, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 17630, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17743, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17855, .adv_w = 252, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17975, .adv_w = 252, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18088, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18224, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 18320, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 18432, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 18528, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 18594, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18722, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 18850, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 18976, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19104, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 19212, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19340, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 19396, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 19480, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19624, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 19720, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 19808, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 19888, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 20014, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20119, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20217, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 20297, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
+    {.bitmap_index = 20409, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20479, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20549, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 20647, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
+    {.bitmap_index = 20675, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 20783, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 20943, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
+    {.bitmap_index = 21103, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 21231, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 21301, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 21371, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 21511, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 21607, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 21735, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
+    {.bitmap_index = 21880, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 21985, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 22097, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 22195, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 22293, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 22389, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
+    {.bitmap_index = 22485, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 22597, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 22709, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 22817, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
+    {.bitmap_index = 22979, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 23075, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 23225, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23325, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23425, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23525, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23625, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 23725, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 23872, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 23968, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 24080, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
+    {.bitmap_index = 24225, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 24345, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 24441, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 24535, .adv_w = 252, .box_w = 6, .box_h = 14, .ofs_x = 8, .ofs_y = -2},
+    {.bitmap_index = 24577, .adv_w = 252, .box_w = 5, .box_h = 14, .ofs_x = 2, .ofs_y = -2},
+    {.bitmap_index = 24612, .adv_w = 252, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 24627, .adv_w = 252, .box_w = 4, .box_h = 10, .ofs_x = 2, .ofs_y = -1}
 };
 
 /*---------------------
@@ -4102,26 +4066,26 @@ static const uint16_t unicode_list_2[] = {
     0x2d8b, 0x2d91, 0x2dd3, 0x2e59, 0x2e7c, 0x2eda, 0x3062, 0x3070,
     0x3073, 0x30f7, 0x3103, 0x3114, 0x3134, 0x314a, 0x319c, 0x3244,
     0x327f, 0x3288, 0x32ca, 0x32d3, 0x32f4, 0x330a, 0x330b, 0x332c,
-    0x337a, 0x35d8, 0x3625, 0x362d, 0x37ed, 0x3804, 0x380a, 0x382e,
-    0x3a55, 0x3a97, 0x3ac3, 0x3afc, 0x3b4c, 0x3cef, 0x3d52, 0x3d8c,
-    0x3df7, 0x3dfd, 0x3e50, 0x3e52, 0x3efe, 0x3f4f, 0x3f5f, 0x410d,
-    0x4168, 0x417b, 0x421e, 0x428f, 0x42a2, 0x42a4, 0x4375, 0x43ca,
-    0x4442, 0x44aa, 0x44ad, 0x44dd, 0x44f3, 0x453b, 0x4577, 0x4627,
-    0x4629, 0x4637, 0x46e2, 0x4760, 0x4a60, 0x4b35, 0x4c85, 0x4d8d,
-    0x4de1, 0x4f6a, 0x5145, 0x51b3, 0x5303, 0x5425, 0x5432, 0x5578,
-    0x56fe, 0x576b, 0x5837, 0x58ed, 0x5908, 0x5a9e, 0x5da4, 0x5dce,
-    0x5dd9, 0x5dea, 0x5dfc, 0x5e4e, 0x5e6b, 0x5ffa, 0x6749, 0x687e,
-    0x68e3, 0x6abb, 0x6adf, 0x6af4, 0x6c22, 0x6e90, 0x6ed8, 0x6ed9,
-    0x6edb, 0x6efd, 0x6efe, 0x70ca, 0x70cc, 0x739c, 0x74ea, 0x74f1,
-    0x7599, 0x76f0, 0x77cb, 0x7885, 0x79d5, 0xcefe, 0xcf05, 0xcf08,
-    0xcf09, 0xcf0a, 0xcf0e, 0xcf10, 0xcf12, 0xcf16, 0xcf19, 0xcf1e,
-    0xcf23, 0xcf24, 0xcf25, 0xcf3b, 0xcf40, 0xcf45, 0xcf48, 0xcf49,
-    0xcf4a, 0xcf4e, 0xcf4f, 0xcf50, 0xcf51, 0xcf64, 0xcf65, 0xcf6b,
-    0xcf6d, 0xcf6e, 0xcf71, 0xcf74, 0xcf75, 0xcf76, 0xcf78, 0xcf90,
-    0xcf92, 0xcfc1, 0xcfc2, 0xcfc4, 0xcfc6, 0xcfdd, 0xcfe4, 0xcfe7,
-    0xcff0, 0xd019, 0xd021, 0xd058, 0xd0e8, 0xd13d, 0xd13e, 0xd13f,
-    0xd140, 0xd141, 0xd184, 0xd190, 0xd1ea, 0xd201, 0xd457, 0xd6bf,
-    0xd79f, 0xde05, 0xde06, 0xde09, 0xde17
+    0x35d8, 0x3625, 0x362d, 0x37ed, 0x3804, 0x380a, 0x382e, 0x3a55,
+    0x3a97, 0x3ac3, 0x3b4c, 0x3cef, 0x3d52, 0x3d8c, 0x3df7, 0x3dfd,
+    0x3e50, 0x3e52, 0x3efe, 0x3f4f, 0x3f5f, 0x410d, 0x4168, 0x417b,
+    0x421e, 0x428f, 0x42a2, 0x42a4, 0x4375, 0x43ca, 0x4442, 0x44aa,
+    0x44ad, 0x44dd, 0x44f3, 0x453b, 0x4577, 0x4627, 0x4629, 0x4637,
+    0x46e2, 0x4760, 0x4a60, 0x4b35, 0x4c85, 0x4d8d, 0x4de1, 0x4f6a,
+    0x5145, 0x51b3, 0x5303, 0x5425, 0x5432, 0x5578, 0x56fe, 0x576b,
+    0x5837, 0x58ed, 0x5908, 0x5a9e, 0x5da4, 0x5dce, 0x5dd9, 0x5dea,
+    0x5dfc, 0x5e4e, 0x5e6b, 0x5ffa, 0x6749, 0x687e, 0x68e3, 0x6abb,
+    0x6adf, 0x6af4, 0x6c22, 0x6e90, 0x6ed8, 0x6ed9, 0x6edb, 0x6efd,
+    0x6efe, 0x70ca, 0x70cc, 0x739c, 0x74ea, 0x74f1, 0x7599, 0x76f0,
+    0x77cb, 0x7885, 0x79d5, 0xcefe, 0xcf05, 0xcf08, 0xcf09, 0xcf0a,
+    0xcf0e, 0xcf10, 0xcf12, 0xcf16, 0xcf19, 0xcf1e, 0xcf23, 0xcf24,
+    0xcf25, 0xcf3b, 0xcf40, 0xcf45, 0xcf48, 0xcf49, 0xcf4a, 0xcf4e,
+    0xcf4f, 0xcf50, 0xcf51, 0xcf64, 0xcf65, 0xcf6b, 0xcf6d, 0xcf6e,
+    0xcf71, 0xcf74, 0xcf75, 0xcf76, 0xcf78, 0xcf90, 0xcf92, 0xcfc1,
+    0xcfc2, 0xcfc4, 0xcfc6, 0xcfdd, 0xcfe4, 0xcfe7, 0xcff0, 0xd019,
+    0xd021, 0xd058, 0xd0e8, 0xd13d, 0xd13e, 0xd13f, 0xd140, 0xd141,
+    0xd184, 0xd190, 0xd1ea, 0xd201, 0xd457, 0xd6bf, 0xd79f, 0xde05,
+    0xde06, 0xde09, 0xde17
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -4137,7 +4101,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 8451, .range_length = 56856, .glyph_id_start = 97,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 189, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 187, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
@@ -4184,7 +4148,7 @@ static const uint8_t kern_left_class_mapping[] =
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0
+    0, 0, 0, 0
 };
 
 /*Map glyph_ids to kern right classes*/
@@ -4225,7 +4189,7 @@ static const uint8_t kern_right_class_mapping[] =
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0
+    0, 0, 0, 0
 };
 
 /*Kern values between classes*/

xfUI/XFJS/generated/widgets_init.c

@@ -245,18 +245,4 @@ void lv_FactorySettingPage_spinbox_supply5_vol_decrement_event_cb(lv_event_t * e
         lv_spinbox_decrement(guider_ui.FactorySettingPage_spinbox_supply5_vol);
     }
 }
-void lv_FactorySettingPage_spinbox_filter_life_increment_event_cb(lv_event_t * event)
-{
-    lv_event_code_t code = lv_event_get_code(event);
-    if(code == LV_EVENT_SHORT_CLICKED || code == LV_EVENT_LONG_PRESSED_REPEAT) {
-        lv_spinbox_increment(guider_ui.FactorySettingPage_spinbox_filter_life);
-    }
-}
-void lv_FactorySettingPage_spinbox_filter_life_decrement_event_cb(lv_event_t * event)
-{
-    lv_event_code_t code = lv_event_get_code(event);
-    if(code == LV_EVENT_SHORT_CLICKED || code == LV_EVENT_LONG_PRESSED_REPEAT) {
-        lv_spinbox_decrement(guider_ui.FactorySettingPage_spinbox_filter_life);
-    }
-}
 

xfUI/XFJS/generated/widgets_init.h

@@ -56,9 +56,6 @@ void lv_FactorySettingPage_spinbox_supply4_vol_decrement_event_cb(lv_event_t * e
 extern lv_obj_t * FactorySettingPage_spinbox_supply5_vol;
 void lv_FactorySettingPage_spinbox_supply5_vol_increment_event_cb(lv_event_t * event);
 void lv_FactorySettingPage_spinbox_supply5_vol_decrement_event_cb(lv_event_t * event);
-extern lv_obj_t * FactorySettingPage_spinbox_filter_life;
-void lv_FactorySettingPage_spinbox_filter_life_increment_event_cb(lv_event_t * event);
-void lv_FactorySettingPage_spinbox_filter_life_decrement_event_cb(lv_event_t * event);