wxsmart-test
/
sggt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新： 

1、modbus主站界面切换、中英文切换；
2、收据收发界面布局；
This commit is contained in:
吴俊潮 2025-05-21 17:15:11 +08:00
parent 4b22e216b4
commit a368752485
15 changed files with 17989 additions and 16884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
App/APP_WU/Inc/app_screen_setting_trans.h
View File

@ -6,15 +6,22 @@
#define TEXT_HART 0
#define TEXT_BLE 1
#define TEXT_MODBUS 2
#define TEXT_MODBUS_CONFIG 3
void communication_switch(void);
void set_communication_text(uint8_t con);
void config_items_set_color(uint8_t cur, uint32_t color);
void config_items_check(uint8_t cur, uint8_t cur_prv);
void set_communication_modify(uint8_t con, int8_t step);
void key_functions_modbus(void);
//切换至modbus配置界面后对显示内容进行调整：语言、默认值
void scr_modbus_config_recover(void);
extern uint8_t com_switch_cursor;
extern uint8_t com_switch_cursor_prv;

7
App/APP_WU/Inc/apps_gather.h
View File

@ -125,7 +125,11 @@ typedef enum
SET_CONTENT_MODIFY, //设置菜单：内容修改
SET_SHOW_LOG, //设置菜单：查看记录
SET_COMMUNICATION_SWITCH, //通信模式切换
SET_COMMUNICATION_MODIFY //通信模式修改
SET_COMMUNICATION_MODIFY, //通信模式修改
MODBUS_MASTER_CONFIG, //modbus主站，配置项选择
MODBUS_MASTER_CONFIG_MODIFY, //modbus主站，配置项修改
MODBUS_MASTER_TRX, //modbus主站收发，选项选择
MODBUS_MASTER_TRX_MODIFY //modbus主站收发，选项修改
}OPERATIONS;
typedef enum
@ -145,6 +149,7 @@ typedef struct
uint16_t menu_stack_consume; //menu栈占用
uint8_t cpu_consume; //cpu使用率，0-100
uint8_t mem_consume; //内存使用率，0-100
uint8_t mem_frag; //内存碎片占比，0-100
uint8_t mem_consume_max; //最大内存占用占用，0-100
uint8_t eeprom_read_error; //eeprom读是否出现过错误
uint8_t eeprom_write_error; //eeprom写是否出现过错误

5
App/APP_WU/Inc/scr_setting_text.h
View File

@ -12,6 +12,8 @@
#define ITEM2_COMMUNICATION_VALUE_MAX 4
#define ITEM3_CONTENT_MAX 4
#define ITEM3_CONTENT_VAL_MAX 10
#define MODBUS_MASTER_CONFIG_ITEM_MAX 8
#define MODBUS_MASTER_TRX_ITEM_MAX 4
typedef struct
{
@ -25,6 +27,9 @@ typedef struct
char item_3[ITEM3_CONTENT_MAX][TEXT_LENGTH_MAX];
char item_3_val[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX];
char modbus_master_title[TEXT_LENGTH_MAX];
char modbus_master_item[MODBUS_MASTER_CONFIG_ITEM_MAX][TEXT_LENGTH_MAX];
char modbus_master_trx_item[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENGTH_MAX];
}SETTING_TEXT;
extern SETTING_TEXT text_pack;

3
App/APP_WU/Src/app_screen_main.c
View File

@ -175,7 +175,8 @@ void scr_init_run(void)
scr_main_recover();
//开机动画结束后，隐藏初始界面
lv_obj_add_flag(guider_ui.screen_init, LV_OBJ_FLAG_HIDDEN);
//lv_obj_add_flag(guider_ui.screen_init, LV_OBJ_FLAG_HIDDEN);
lv_obj_del_async(guider_ui.screen_init); //异步删除，更加安全
init_step = 3;
}

292
App/APP_WU/Src/app_screen_setting_trans.c
View File

@ -1,7 +1,10 @@
#include "app_screen_setting_trans.h"
uint8_t com_switch_cursor = 0;
uint8_t com_switch_cursor = 0; //设置界面中，通讯选择的游标
uint8_t com_switch_cursor_prv = 99;
uint8_t mod_mas_conf_cursor = 0; //modbus配置项的游标，从上往下-从左往右：0~7
uint8_t mod_mas_conf_cursor_prv = 99;
uint8_t config_focus = 0;
void set_communication_text(uint8_t con)
{
@ -156,6 +159,82 @@ void communication_switch(void)
setting_contents_check(com_switch_cursor, com_switch_cursor_prv);
}
void config_items_set_color(uint8_t cur, uint32_t color)
{
switch (cur)
{
case 0:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_device_addr, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 1:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_start_addr, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 2:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_bytes, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 3:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_timeout, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 4:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_cmd, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 5:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_register_num, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 6:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_calibration, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
case 7:
{
lv_obj_set_style_bg_color(guider_ui.screen_modbus_config_value_next, lv_color_hex(color), LV_PART_MAIN|LV_STATE_DEFAULT);
}
break;
default:
break;
}
}
void config_items_check(uint8_t cur, uint8_t cur_prv)
{
uint32_t color = 0;
if(config_focus == 1)
{
color = COLOR_CONTENTS_FOCUSED;
}
else
{
color = COLOR_CONTENTS_CHECKED;
}
//点亮cur
config_items_set_color(cur, color);
//熄灭cur——prv
config_items_set_color(cur_prv, COLOR_ITEMS_UNCHECKED);
}
void set_communication_modify(uint8_t con, int8_t step)
{
switch (con)
@ -163,12 +242,36 @@ void set_communication_modify(uint8_t con, int8_t step)
case TEXT_HART:
{
tabdata.hart_enable = !tabdata.hart_enable;
//通讯方式互斥
if(tabdata.hart_enable)
{
tabdata.bluetooth_enable = 0;
tabdata.modbus_enable = 0;
tabdata.content_focus = 0;
set_communication_text(TEXT_BLE);
set_communication_text(TEXT_MODBUS);
tabdata.content_focus = 1;
}
}
break;
case TEXT_BLE:
{
tabdata.bluetooth_enable = !tabdata.bluetooth_enable;
//通讯方式互斥
if(tabdata.bluetooth_enable)
{
tabdata.hart_enable = 0;
tabdata.modbus_enable = 0;
tabdata.content_focus = 0;
set_communication_text(TEXT_HART);
set_communication_text(TEXT_MODBUS);
tabdata.content_focus = 1;
}
}
break;
@ -186,6 +289,18 @@ void set_communication_modify(uint8_t con, int8_t step)
{
tabdata.modbus_type = SIG_SLAVE;
}
//通讯方式互斥
if(tabdata.modbus_enable)
{
tabdata.hart_enable = 0;
tabdata.bluetooth_enable = 0;
tabdata.content_focus = 0;
set_communication_text(TEXT_HART);
set_communication_text(TEXT_BLE);
tabdata.content_focus = 1;
}
}
break;
@ -194,6 +309,24 @@ void set_communication_modify(uint8_t con, int8_t step)
}
}
void scr_modbus_config_recover(void)
{
lv_label_set_text(guider_ui.screen_modbus_config_label_title, text_pack.modbus_master_title);
lv_label_set_text(guider_ui.screen_modbus_config_label_device_addr, text_pack.modbus_master_item[0]);
lv_label_set_text(guider_ui.screen_modbus_config_label_start_addr, text_pack.modbus_master_item[1]);
lv_label_set_text(guider_ui.screen_modbus_config_label_bytes, text_pack.modbus_master_item[2]);
lv_label_set_text(guider_ui.screen_modbus_config_label_timeout, text_pack.modbus_master_item[3]);
lv_label_set_text(guider_ui.screen_modbus_config_label_cmd, text_pack.modbus_master_item[4]);
lv_label_set_text(guider_ui.screen_modbus_config_label_register_num, text_pack.modbus_master_item[5]);
lv_label_set_text(guider_ui.screen_modbus_config_label_calibration, text_pack.modbus_master_item[6]);
lv_label_set_text(guider_ui.screen_modbus_config_label_next, text_pack.modbus_master_item[7]);
mod_mas_conf_cursor = 0; //配置项的游标，从上往下-从左往右：0~7
mod_mas_conf_cursor_prv = 99;
}
void key_functions_modbus(void)
{
if( key_pv.status == KEY_STATUS_DISABLE ) return;
@ -201,27 +334,172 @@ void key_functions_modbus(void)
switch (key_pv.tag)
{
case KEY_UP:
{}
{
key = 0;
key_char2struct();
switch (current_operation)
{
case MODBUS_MASTER_CONFIG:
{
mod_mas_conf_cursor_prv = mod_mas_conf_cursor;
if(mod_mas_conf_cursor == 0)
{
mod_mas_conf_cursor = 7;
}
else
{
mod_mas_conf_cursor -= 1;
}
config_items_check(mod_mas_conf_cursor, mod_mas_conf_cursor_prv);
}
break;
default:
break;
}
}
break;
case KEY_DOWN:
{}
{
key = 0;
key_char2struct();
switch (current_operation)
{
case MODBUS_MASTER_CONFIG:
{
mod_mas_conf_cursor_prv = mod_mas_conf_cursor;
if(mod_mas_conf_cursor == 7)
{
mod_mas_conf_cursor = 0;
}
else
{
mod_mas_conf_cursor += 1;
}
config_items_check(mod_mas_conf_cursor, mod_mas_conf_cursor_prv);
}
break;
default:
break;
}
}
break;
case KEY_LEFT:
{}
{
key = 0;
key_char2struct();
switch (current_operation)
{
case MODBUS_MASTER_CONFIG:
{
mod_mas_conf_cursor_prv = mod_mas_conf_cursor;
mod_mas_conf_cursor -= 4;
if(mod_mas_conf_cursor > 200)
{
mod_mas_conf_cursor = mod_mas_conf_cursor_prv + 4;
}
config_items_check(mod_mas_conf_cursor, mod_mas_conf_cursor_prv);
}
break;
default:
break;
}
}
break;
case KEY_RIGHT:
{}
{
key = 0;
key_char2struct();
switch (current_operation)
{
case MODBUS_MASTER_CONFIG:
{
mod_mas_conf_cursor_prv = mod_mas_conf_cursor;
mod_mas_conf_cursor += 4;
if(mod_mas_conf_cursor > 7)
{
mod_mas_conf_cursor = mod_mas_conf_cursor_prv - 4;
}
config_items_check(mod_mas_conf_cursor, mod_mas_conf_cursor_prv);
}
break;
default:
break;
}
}
break;
case KEY_OK:
{}
{
key = 0;
key_char2struct();
}
break;
case KEY_BACK:
{}
{
key = 0;
key_char2struct();
switch (current_operation)
{
case MODBUS_MASTER_CONFIG:
{
//设置主界面和配置界面的内容
setup_scr_screen_main(&guider_ui);
delay_cnt(200); //不加延时有概率卡死
setup_scr_screen_setting(&guider_ui);
scr_setting_recover();
delay_cnt(200); //不加延时有概率卡死
lv_scr_load(guider_ui.screen_setting); //加载菜单界面
//删除modbus的相关内容，释放内存
lv_obj_del_async(guider_ui.screen_modbus_config);
lv_obj_del_async(guider_ui.screen_modbus_display);
m5data.scr_now = SCREEN_SETTING;
//进入拓展功能选项卡
tabdata.item_cursor = ITEM_2;
tabdata.item_cursor_prv = ITEM_0;
setting_items_check(tabdata.item_cursor, tabdata.item_cursor_prv);
//进入通讯选择
tabdata.content_focus = 0;
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_21, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
communication_switch();
current_operation = SET_COMMUNICATION_SWITCH;
key_config_update(current_operation);
}
break;
case MODBUS_MASTER_TRX:
{
//返回modbus配置界面
}
break;
default:
break;
}
}
break;
default:

4
App/APP_WU/Src/apps_gather.c
View File

@ -191,7 +191,9 @@ void screen_run(void)
break;
case SCREEN_MODBUS_MASTER_TRX:
{}
{
key_functions_modbus();
}
break;
default:

38
App/APP_WU/Src/key_functions.c
View File

@ -253,6 +253,44 @@ void key_config_update(OPERATIONS ope)
}
break;
case MODBUS_MASTER_CONFIG:
{
//使能：上、下、左、右、确认（OK）、返回
key_config(KEY_UP, KEY_STATUS_ENABLE);
key_config(KEY_DOWN, KEY_STATUS_ENABLE);
key_config(KEY_LEFT, KEY_STATUS_ENABLE);
key_config(KEY_RIGHT, KEY_STATUS_ENABLE);
key_config(KEY_OK, KEY_STATUS_ENABLE);
key_config(KEY_BACK, KEY_STATUS_ENABLE);
//不使能其他按键
key_config(KEY_IN, KEY_STATUS_DISABLE);
key_config(KEY_OUT, KEY_STATUS_DISABLE);
key_config(KEY_SOURCE, KEY_STATUS_DISABLE);
key_config(KEY_MENU, KEY_STATUS_DISABLE);
key_config(KEY_SWITCH, KEY_STATUS_DISABLE);
}
break;
case MODBUS_MASTER_TRX:
{
//使能：左、右、确认（OK）、返回
key_config(KEY_LEFT, KEY_STATUS_ENABLE);
key_config(KEY_RIGHT, KEY_STATUS_ENABLE);
key_config(KEY_OK, KEY_STATUS_ENABLE);
key_config(KEY_BACK, KEY_STATUS_ENABLE);
//不使能其他按键
key_config(KEY_UP, KEY_STATUS_DISABLE);
key_config(KEY_DOWN, KEY_STATUS_DISABLE);
key_config(KEY_IN, KEY_STATUS_DISABLE);
key_config(KEY_OUT, KEY_STATUS_DISABLE);
key_config(KEY_SOURCE, KEY_STATUS_DISABLE);
key_config(KEY_MENU, KEY_STATUS_DISABLE);
key_config(KEY_SWITCH, KEY_STATUS_DISABLE);
}
break;
default:
break;
}

30
App/APP_WU/Src/key_functions_setting.c
View File

@ -395,6 +395,7 @@ void key_functions_setting(void)
{
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_01, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
show_IO_log(IO_INPUT, 1);
//当前操作从“内容选择” 切换 至“查看记录”，按键配置同步更新
current_operation = SET_SHOW_LOG;
key_config_update(current_operation);
@ -405,6 +406,7 @@ void key_functions_setting(void)
{
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_11, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
show_IO_log(IO_OUTPUT, 1);
//当前操作从“内容选择” 切换 至“查看记录”，按键配置同步更新
current_operation = SET_SHOW_LOG;
key_config_update(current_operation);
@ -448,6 +450,8 @@ void key_functions_setting(void)
break;
case SET_COMMUNICATION_SWITCH:
{
if(com_switch_cursor != TEXT_MODBUS_CONFIG)
{
tabdata.content_focus = 1;
setting_contents_check(com_switch_cursor, com_switch_cursor_prv);
@ -456,6 +460,32 @@ void key_functions_setting(void)
current_operation = SET_COMMUNICATION_MODIFY;
key_config_update(current_operation);
}
else if( tabdata.modbus_type == SIG_MASTER)
{
tabdata.content_focus = 0;
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_31, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
//跳转至modbus配置界面
current_operation = MODBUS_MASTER_CONFIG;
key_config_update(current_operation);
//设置modbus配置界面和收发界面的内容
setup_scr_screen_modbus_config(&guider_ui);
scr_modbus_config_recover();
delay_cnt(200); //不加延时有概率卡死
setup_scr_screen_modbus_display(&guider_ui);
delay_cnt(200); //不加延时有概率卡死
lv_scr_load(guider_ui.screen_modbus_config); //加载界面
m5data.scr_now = SCREEN_MODBUS_MASTER_CONFIG;
//删除主界面和设置界面的相关内容，释放内存
lv_obj_del_async(guider_ui.screen_main); //异步删除，更加安全
lv_obj_del_async(guider_ui.screen_setting); //异步删除，更加安全
}
}
break;
default:

58
App/APP_WU/Src/scr_setting_text.c
View File

@ -179,6 +179,58 @@ static char item3_contents_value_english[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX]
};
/****************Contents****************/
/****************Modbus Master****************/
static char modbus_master_config_title_chinese[TEXT_LENGTH_MAX] =
{
"Modbus 主设备"
};
static char modbus_master_config_title_english[TEXT_LENGTH_MAX] =
{
"Modbus Master"
};
static char modbus_master_config_item_chinese[MODBUS_MASTER_CONFIG_ITEM_MAX][TEXT_LENGTH_MAX] =
{
"从设备地址",
"起始地址",
"字节数",
"超时时间",
"命令字",
"寄存器数量",
"校验",
"下一步"
};
static char modbus_master_config_item_english[MODBUS_MASTER_CONFIG_ITEM_MAX][TEXT_LENGTH_MAX] =
{
"Slave id",
"Start addr",
"Bytes num",
"Timeout",
"Command",
"Register",
"Calibrate",
"Next"
};
static char modbus_master_trx_item_chinese[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENGTH_MAX] =
{
"数据",
"上一步",
"设置",
"发送"
};
static char modbus_master_trx_item_english[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENGTH_MAX] =
{
"Data",
"Previous",
"Set",
"Send"
};
/****************Modbus Master****************/
//设置界面语言切换
@ -197,6 +249,9 @@ void setting_laguage_switch(LANGUAGES lan)
memcpy(text_pack.item_2_com_val, item2_communication_switch_value_chinese, sizeof(text_pack.item_2_com_val));
memcpy(text_pack.item_3, item3_contents_text_chinese, sizeof(text_pack.item_3)) ;
memcpy(text_pack.item_3_val, item3_contents_value_chinese, sizeof(text_pack.item_3_val)) ;
memcpy(text_pack.modbus_master_title, modbus_master_config_title_chinese, sizeof(text_pack.modbus_master_title));
memcpy(text_pack.modbus_master_item, modbus_master_config_item_chinese, sizeof(text_pack.modbus_master_item));
memcpy(text_pack.modbus_master_trx_item, modbus_master_trx_item_chinese, sizeof(text_pack.modbus_master_trx_item));
}
break;
@ -211,6 +266,9 @@ void setting_laguage_switch(LANGUAGES lan)
memcpy(text_pack.item_2_com_val, item2_communication_switch_value_english, sizeof(text_pack.item_2_com_val));
memcpy(text_pack.item_3, item3_contents_text_english, sizeof(text_pack.item_3)) ;
memcpy(text_pack.item_3_val, item3_contents_value_english, sizeof(text_pack.item_3_val)) ;
memcpy(text_pack.modbus_master_title, modbus_master_config_title_english, sizeof(text_pack.modbus_master_title));
memcpy(text_pack.modbus_master_item, modbus_master_config_item_english, sizeof(text_pack.modbus_master_item));
memcpy(text_pack.modbus_master_trx_item, modbus_master_trx_item_english, sizeof(text_pack.modbus_master_trx_item));
}
break;

1
Core/Src/freertos.c
View File

@ -334,6 +334,7 @@ void start_mux_analog(void const * argument)
lv_mem_monitor(&my_mon);
system_sts.mem_consume = my_mon.used_pct;
system_sts.mem_frag = my_mon.frag_pct;
system_sts.mem_consume_max = (system_sts.mem_consume_max < system_sts.mem_consume)?(system_sts.mem_consume):(system_sts.mem_consume_max);
}

257
LVGL/myGUI/generated/guider_fonts/lv_font_SourceHanSerifSC_Regular_16.c
View File

@ -891,6 +891,40 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x0, 0xe, 0x20, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xd, 0x10, 0x0, 0x0, 0x0,
/* U+4E3B "主" */
0x0, 0x0, 0x2, 0x20, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x8c, 0x30, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x62, 0x0, 0x44, 0x0,
0x3, 0x77, 0x77, 0x7a, 0x87, 0x77, 0xbc, 0x20,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x3, 0xb1, 0x0,
0x0, 0x57, 0x77, 0x7e, 0xa7, 0x77, 0x74, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xc, 0x40, 0x0, 0xa, 0x40,
0x37, 0x77, 0x77, 0x78, 0x77, 0x77, 0x78, 0x80,
/* U+4ECE "从" */
0x0, 0x0, 0xc5, 0x0, 0x3, 0xd1, 0x0, 0x0,
0x0, 0x0, 0xe2, 0x0, 0x4, 0xf0, 0x0, 0x0,
0x0, 0x0, 0xe2, 0x0, 0x4, 0xf0, 0x0, 0x0,
0x0, 0x0, 0xf1, 0x0, 0x4, 0xf1, 0x0, 0x0,
0x0, 0x0, 0xf0, 0x0, 0x5, 0xf3, 0x0, 0x0,
0x0, 0x2, 0xe0, 0x0, 0x7, 0xb6, 0x0, 0x0,
0x0, 0x4, 0xe7, 0x0, 0x9, 0x79, 0x0, 0x0,
0x0, 0x7, 0x8a, 0x70, 0xb, 0x4a, 0x0, 0x0,
0x0, 0xb, 0x42, 0xf2, 0xe, 0x8, 0x40, 0x0,
0x0, 0xe, 0x0, 0xb8, 0x5a, 0x4, 0xc0, 0x0,
0x0, 0x58, 0x0, 0x55, 0xc2, 0x0, 0xe4, 0x0,
0x0, 0xb0, 0x0, 0x6, 0x70, 0x0, 0x6e, 0x20,
0x5, 0x50, 0x0, 0x39, 0x0, 0x0, 0xd, 0xe2,
0x26, 0x0, 0x4, 0x70, 0x0, 0x0, 0x2, 0xd3,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+4EE4 "令" */
0x0, 0x0, 0x0, 0x6, 0x40, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x4f, 0xb1, 0x0, 0x0, 0x0,
@ -1119,6 +1153,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x26, 0xed, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0,
/* U+636E "据" */
0x0, 0x7, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x1e, 0x0, 0xa7, 0x77, 0x77, 0x78, 0xc1,
0x0, 0x1e, 0x0, 0xc2, 0x0, 0x0, 0x3, 0xd0,
0x0, 0x1e, 0x31, 0xc2, 0x0, 0x0, 0x3, 0xc0,
0x17, 0x8f, 0xa8, 0xc9, 0x77, 0x77, 0x79, 0xc0,
0x0, 0x1e, 0x0, 0xd2, 0x0, 0xa6, 0x1, 0x40,
0x0, 0x1e, 0x0, 0xe2, 0x0, 0xc3, 0x0, 0x60,
0x0, 0x1e, 0x55, 0xf8, 0x77, 0xe9, 0x79, 0xb4,
0x15, 0xaf, 0x30, 0xf0, 0x0, 0xc3, 0x0, 0x0,
0x5c, 0x6e, 0x1, 0xd1, 0x0, 0xc3, 0x0, 0x20,
0x0, 0x1e, 0x3, 0xa8, 0xa7, 0x98, 0x7a, 0xe1,
0x0, 0x1e, 0x6, 0x78, 0x70, 0x0, 0x5, 0xb0,
0x0, 0x1e, 0xa, 0x18, 0x70, 0x0, 0x5, 0xb0,
0x4, 0x5e, 0x18, 0x8, 0xb7, 0x77, 0x7a, 0xb0,
0x1, 0xc8, 0x30, 0x8, 0x50, 0x0, 0x5, 0x90,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+6570 "数" */
0x0, 0x0, 0x52, 0x0, 0x0, 0x40, 0x0, 0x0,
0x4, 0x30, 0xe1, 0x67, 0x3, 0xf2, 0x0, 0x0,
@ -2447,95 +2499,98 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 4780, .adv_w = 256, .box_w = 16, .box_h = 3, .ofs_x = 0, .ofs_y = 6},
{.bitmap_index = 4804, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4924, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5044, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5172, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5300, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 5405, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5533, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5653, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5044, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5164, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5284, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5412, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5540, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 5645, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5773, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5893, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6013, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6133, .adv_w = 256, .box_w = 17, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6269, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6397, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6525, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6653, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6781, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 6901, .adv_w = 256, .box_w = 17, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7037, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7165, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7278, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7391, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7511, .adv_w = 256, .box_w = 17, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7647, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7767, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7895, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8023, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8151, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8279, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8392, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 8497, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8617, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8753, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8849, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8961, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9057, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9123, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9251, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9379, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9505, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9633, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9741, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9869, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9925, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10009, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10153, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10249, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10337, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 10417, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 10543, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10648, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10746, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 10826, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 10938, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11008, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11078, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11176, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
{.bitmap_index = 11204, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11312, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11472, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11632, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11760, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11830, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11900, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12040, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 12136, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12264, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 12409, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12514, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12626, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12724, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12822, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 12918, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 13014, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13126, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13238, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13346, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 13508, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13604, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 13754, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 13854, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 13954, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14054, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14154, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14254, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 14401, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 14497, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 14609, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 14754, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 14874, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 14970, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1}
{.bitmap_index = 6133, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6253, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6373, .adv_w = 256, .box_w = 17, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6509, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6637, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6765, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6893, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7021, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7149, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 7269, .adv_w = 256, .box_w = 17, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7405, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7533, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7646, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7759, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7879, .adv_w = 256, .box_w = 17, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8015, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8135, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8263, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8391, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8519, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8647, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8760, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 8865, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8985, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9121, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9217, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9329, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9425, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9491, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9619, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9747, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9873, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10001, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10109, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10237, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10293, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10377, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10521, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10617, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10705, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 10785, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 10911, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11016, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11114, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 11194, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 11306, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11376, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11446, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11544, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
{.bitmap_index = 11572, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11680, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11840, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 12000, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12128, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 12198, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 12268, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12408, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 12504, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12632, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 12777, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12882, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12994, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 13092, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 13190, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13286, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 13382, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13494, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13606, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13714, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 13876, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13972, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 14122, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14222, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14322, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14422, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14522, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 14622, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 14769, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 14865, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 14977, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 15122, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 15242, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 15338, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1}
};
/*---------------------
@ -2543,18 +2598,18 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
*--------------------*/
static const uint16_t unicode_list_2[] = {
0x0, 0xa, 0xb, 0xe4, 0x365, 0x3fa, 0x5d1, 0x67d,
0x868, 0x930, 0x940, 0xb07, 0xbcb, 0xd57, 0xd58, 0xdc4,
0x1770, 0x17f6, 0x1a21, 0x1d65, 0x30c6, 0x316e, 0x3482, 0x3dbe,
0x3de6, 0x3f77, 0x3f85, 0x4193, 0x4201, 0x43cf, 0x47f4, 0x4c8c,
0xa201, 0xa208, 0xa20b, 0xa20c, 0xa20d, 0xa211, 0xa213, 0xa215,
0xa219, 0xa21c, 0xa221, 0xa226, 0xa227, 0xa228, 0xa23e, 0xa243,
0xa248, 0xa24b, 0xa24c, 0xa24d, 0xa251, 0xa252, 0xa253, 0xa254,
0xa267, 0xa268, 0xa26e, 0xa270, 0xa271, 0xa274, 0xa277, 0xa278,
0xa279, 0xa27b, 0xa293, 0xa295, 0xa2c4, 0xa2c5, 0xa2c7, 0xa2c9,
0xa2e0, 0xa2e7, 0xa2ea, 0xa2f3, 0xa31c, 0xa324, 0xa35b, 0xa3eb,
0xa440, 0xa441, 0xa442, 0xa443, 0xa444, 0xa487, 0xa493, 0xa4ed,
0xa504, 0xa75a, 0xa9c2, 0xaaa2
0x0, 0xa, 0xb, 0x3b, 0xce, 0xe4, 0x365, 0x3fa,
0x5d1, 0x67d, 0x868, 0x930, 0x940, 0xb07, 0xbcb, 0xd57,
0xd58, 0xdc4, 0x156e, 0x1770, 0x17f6, 0x1a21, 0x1d65, 0x30c6,
0x316e, 0x3482, 0x3dbe, 0x3de6, 0x3f77, 0x3f85, 0x4193, 0x4201,
0x43cf, 0x47f4, 0x4c8c, 0xa201, 0xa208, 0xa20b, 0xa20c, 0xa20d,
0xa211, 0xa213, 0xa215, 0xa219, 0xa21c, 0xa221, 0xa226, 0xa227,
0xa228, 0xa23e, 0xa243, 0xa248, 0xa24b, 0xa24c, 0xa24d, 0xa251,
0xa252, 0xa253, 0xa254, 0xa267, 0xa268, 0xa26e, 0xa270, 0xa271,
0xa274, 0xa277, 0xa278, 0xa279, 0xa27b, 0xa293, 0xa295, 0xa2c4,
0xa2c5, 0xa2c7, 0xa2c9, 0xa2e0, 0xa2e7, 0xa2ea, 0xa2f3, 0xa31c,
0xa324, 0xa35b, 0xa3eb, 0xa440, 0xa441, 0xa442, 0xa443, 0xa444,
0xa487, 0xa493, 0xa4ed, 0xa504, 0xa75a, 0xa9c2, 0xaaa2
};
/*Collect the unicode lists and glyph_id offsets*/
@ -2570,7 +2625,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
},
{
.range_start = 19968, .range_length = 43683, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 92, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 95, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@ -2605,7 +2660,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
};
/*Map glyph_ids to kern right classes*/
@ -2634,7 +2689,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
};
/*Kern values between classes*/

2
LVGL/myGUI/generated/setup_scr_screen_main.c
View File

@ -572,7 +572,7 @@ void setup_scr_screen_main(lv_ui *ui)
//Write codes screen_main_label_trans
ui->screen_main_label_trans = lv_label_create(ui->screen_main);
lv_label_set_text(ui->screen_main_label_trans, "HART");
lv_label_set_text(ui->screen_main_label_trans, "");
lv_label_set_long_mode(ui->screen_main_label_trans, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_main_label_trans, 82, 3);
lv_obj_set_size(ui->screen_main_label_trans, 45, 14);

68
MDK-ARM/signal_generator.uvoptx
View File

@ -4115,18 +4115,6 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_16.c</PathWithFileName>
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_16.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>302</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\images\_logo_alpha_141x60.c</PathWithFileName>
<FilenameWithoutPath>_logo_alpha_141x60.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@ -4134,7 +4122,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>303</FileNumber>
<FileNumber>302</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4146,7 +4134,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>304</FileNumber>
<FileNumber>303</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4158,7 +4146,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>305</FileNumber>
<FileNumber>304</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4170,7 +4158,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>306</FileNumber>
<FileNumber>305</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4182,7 +4170,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>307</FileNumber>
<FileNumber>306</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4194,7 +4182,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>308</FileNumber>
<FileNumber>307</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4206,7 +4194,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>309</FileNumber>
<FileNumber>308</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4218,7 +4206,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>310</FileNumber>
<FileNumber>309</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4230,7 +4218,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>311</FileNumber>
<FileNumber>310</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4242,7 +4230,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>312</FileNumber>
<FileNumber>311</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4254,7 +4242,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>313</FileNumber>
<FileNumber>312</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4266,7 +4254,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>314</FileNumber>
<FileNumber>313</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4278,7 +4266,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>315</FileNumber>
<FileNumber>314</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4290,7 +4278,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>316</FileNumber>
<FileNumber>315</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4302,7 +4290,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>317</FileNumber>
<FileNumber>316</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4314,7 +4302,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>318</FileNumber>
<FileNumber>317</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4326,7 +4314,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>319</FileNumber>
<FileNumber>318</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4338,7 +4326,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>320</FileNumber>
<FileNumber>319</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4350,7 +4338,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>321</FileNumber>
<FileNumber>320</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4362,7 +4350,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>322</FileNumber>
<FileNumber>321</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4374,7 +4362,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>323</FileNumber>
<FileNumber>322</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4386,7 +4374,7 @@
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>324</FileNumber>
<FileNumber>323</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4396,6 +4384,18 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>324</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_16.c</PathWithFileName>
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_16.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>

10
MDK-ARM/signal_generator.uvprojx
View File

@ -2638,11 +2638,6 @@
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_12.c</FilePath>
</File>
<File>
<FileName>lv_font_SourceHanSerifSC_Regular_16.c</FileName>
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_16.c</FilePath>
</File>
<File>
<FileName>_logo_alpha_141x60.c</FileName>
<FileType>1</FileType>
@ -2758,6 +2753,11 @@
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_14.c</FilePath>
</File>
<File>
<FileName>lv_font_SourceHanSerifSC_Regular_16.c</FileName>
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_16.c</FilePath>
</File>
</Files>
</Group>
<Group>

34081
MDK-ARM/signal_generator/signal_generator.hex
View File

File diff suppressed because it is too large Load Diff