更新:

1、解决了频率输出时数据换算溢出的问题;
2、调整了代码结构,设置菜单界面拆分成了3个文件;
3、设置菜单布局调整, 新增采样间隔和描点数量设置;
4、新增语言选择与输入&输出记录菜单项,但功能尚未实装;
This commit is contained in:
吴俊潮 2025-04-07 15:53:14 +08:00
parent 8074b96f75
commit ea8c9b7b42
18 changed files with 16371 additions and 15508 deletions

View File

@ -30,7 +30,8 @@
"apps_gather.h": "c",
"ip5310_i2c.h": "c",
"app_screen_main.h": "c",
"algorithm": "c"
"algorithm": "c",
"app_screen_setting.h": "c"
},
"C_Cpp.errorSquiggles": "disabled",
"idf.pythonInstallPath": "F:\\Espressif\\tools\\idf-python\\3.11.2\\python.exe",

View File

@ -47,9 +47,6 @@
//闪烁次数上限
#define TWINKLE_CNT_MAX 10
//绘图等待滴答数上限
#define PLOT_WAIT_TICK_MAX 5
//数码管数值增加(正负情况交替时up和down两个键起到的作用会对调因此专门定义参数用于区分数值的增减)
#define NIXIE_INCREASE 1

View File

@ -3,6 +3,9 @@
#include "apps_gather.h"
extern int16_t save_cnt;
extern int16_t reset_cnt;
//设置界面
//{
@ -15,6 +18,8 @@
//页面数量
#define I0_PAGE_MAX 3
#define I1_PAGE_MAX 1
#define I2_PAGE_MAX 1
#define I3_PAGE_MAX 1
//设置界面选项卡0从上往下数
#define ITEMS_0 0
@ -66,21 +71,38 @@
#define ITEMS_1 1
//设置界面选项卡1从上往下数
//{
//照明 -> ON & OFF
#define LIGHT_STATUS 0
//采样间隔
#define SAMPLE_INTERVAL 0
//参数保存 -> 保存
#define DATA_SAVE 1
//参数复位 -> 复位
#define DATA_RESET 2
//描点个数
#define PLOT_NUM 1
//}
#define ITEMS_2 2
//设置界面选项卡2从上往下数
//{
//参数保存 -> 保存
#define DATA_SAVE 0
//输入记录
#define INPUT_LOG 1
//输出记录
#define OUTPUT_LOG 2
//参数复位 -> 复位
#define DATA_RESET 3
//}
#define ITEMS_3 3
//设置界面选项卡2从上往下数
//设置界面选项卡3从上往下数
//{
//照明 -> ON & OFF
#define LIGHT_STATUS 0
//语言
#define LANGUAGE_SELECT 1
//}
//选项卡未选中时的底色0xffffff0x000000
#define COLOR_ITEMS_UNCHECKED 0xffffff
@ -120,18 +142,6 @@ void setting_contents_check(uint8_t cursor, uint8_t cursor_prv);
//设置界面选项卡内部内容选中之后根据键值key_val和步长step修改内容修改第ite个选项卡的第con个内容
void setting_contents_modify(uint8_t ite, uint8_t con, int8_t step);
//修改选项卡0的值
void set_item0_value(uint8_t con, int8_t step);
//修改选项卡0的文本
void set_item0_text(uint8_t con);
//修改选项卡1的值
void set_item1_value(uint8_t con, int8_t step);
//修改选项卡1的文本
void set_item1_text(uint8_t con);
//设置内容的底色
void set_contents_color(uint8_t cursor, uint32_t color);

View File

@ -193,15 +193,26 @@ typedef struct
int16_t item0_page2_RTDlow;
//ITEMS_1
uint8_t item1_page0_lightflag; //照明状态标志0熄灭1开启
uint8_t item1_page0_saveflag; //[0, 1,2 ] -> [未保存,保存中,已保存]
uint8_t item1_page0_resetflag; //[0, 1,2 ] -> [未复位,复位中,已复位]
uint16_t item1_page0_sample_interval; //采样间隔ms
uint8_t item1_page0_plot_num; //曲线上显示的点数
//ITEMS_2
uint8_t item2_page0_saveflag; //[0, 1,2 ] -> [未保存,保存中,已保存]
float32 input_log_temp; //无纸化记录中转存入eeprom
float32 output_log_temp; //无纸化记录中转存入eeprom
uint8_t item2_page0_resetflag; //[0, 1,2 ] -> [未复位,复位中,已复位]
//ITEMS_3
uint8_t item3_page0_lightflag; //照明状态标志0熄灭1开启
uint8_t item3_page0_language; //语言类型
}TABVIEW_DATA;
//避免无法定位上面自定义的枚举和结构体
#include "app_screen_main.h"
#include "app_screen_setting.h"
#include "scr_setting_item_text.h"
#include "scr_setting_item_value.h"
extern MENU_DATA m5data; //界面参数初始化
extern PLOT_DATA pltdata; //chart绘图参数初始化
@ -213,7 +224,6 @@ extern PHYSICAL_QUANTITY FRE; //频率KHz
extern PHYSICAL_QUANTITY TC[8]; //热电偶共8种
extern PHYSICAL_QUANTITY RTD; //热电阻
//按键值
#define KEY_OUT 76
#define KEY_UP 84
@ -227,6 +237,10 @@ extern PHYSICAL_QUANTITY RTD; //热电阻
#define KEY_DOWN 86
#define KEY_BACK 70
//语言
#define MENU_SIMPLYFY_CHINESE 0
#define MENU_ENGLISH 1
//绝对值计算
#define MY_ABS(pa) ( ( (pa) >= 0 )?( (pa) ):( 0 - (pa) ) )

View File

@ -0,0 +1,20 @@
#ifndef _SCR_SETTING_ITEM_TEXT_H
#define _SCR_SETTING_ITEM_TEXT_H
#include "apps_gather.h"
//修改选项卡0的文本
void set_item0_text(uint8_t con);
//修改选项卡1的文本
void set_item1_text(uint8_t con);
//修改选项卡2的文本
void set_item2_text(uint8_t con);
//修改选项卡3的文本
void set_item3_text(uint8_t con);
#endif

View File

@ -0,0 +1,20 @@
#ifndef _SCR_SETTING_ITEM_VALUE_H
#define _SCR_SETTING_ITEM_VALUE_H
#include "apps_gather.h"
//修改选项卡0的值
void set_item0_value(uint8_t con, int8_t step);
//修改选项卡1的值
void set_item1_value(uint8_t con, int8_t step);
//修改选项卡2的值
void set_item2_value(uint8_t con, int8_t step);
//修改选项卡3的值
void set_item3_value(uint8_t con, int8_t step);
#endif

View File

@ -15,8 +15,8 @@ extern int heart_1000ms_flag;
extern int heart_1000ms_cnt;
extern int battery_3000ms_flag;
extern int battery_3000ms_cnt;
extern int plot_1500ms_flag;
extern int plot_1500ms_cnt;
extern int plot_ms_flag;
extern int plot_ms_cnt;
extern int twk_1000ms_flag;
extern int twk_1000ms_cnt;
extern int input_500ms_flag;

View File

@ -1345,9 +1345,9 @@ void num_twinkle(void) //数值闪烁
//将实际值线性转换成绘图值
void plot_drawing(void)
{
if(plot_1500ms_flag)
if(plot_ms_flag)
{
plot_1500ms_flag = 0;
plot_ms_flag = 0;
//输出曲线
//{
@ -1365,7 +1365,7 @@ void plot_drawing(void)
{
//变化幅度小的情况下不更新显示值
//等待一段时间后不再更新
if(pltdata.pri_wait_tick < PLOT_WAIT_TICK_MAX)
if(pltdata.pri_wait_tick < tabdata.item1_page0_plot_num)
{
pltdata.pri_wait_tick++;
@ -1402,7 +1402,7 @@ void plot_drawing(void)
{
//变化幅度小的情况下不更新显示值
//等待一段时间后不再更新
if(pltdata.scd_wait_tick < PLOT_WAIT_TICK_MAX)
if(pltdata.scd_wait_tick < tabdata.item1_page0_plot_num)
{
pltdata.scd_wait_tick++;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,663 @@
#include "scr_setting_item_text.h"
//修改选项卡0的文本
void set_item0_text(uint8_t con)
{
char str_temp[16] = {0};
uint8_t enum_temp = 0;
switch (con)
{
case VOL_UNIT_SET:
{
if(tabdata.content_focus == 0)
{
if(tabdata.item0_page0_vunit == VOLTAGE_V)
{
lv_label_set_text(guider_ui.screen_setting_label_01, "V");
}
else if(tabdata.item0_page0_vunit == VOLTAGE_MV)
{
lv_label_set_text(guider_ui.screen_setting_label_01, "mV");
}
}
else
{
if(tabdata.item0_page0_vunit == VOLTAGE_V)
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< V >");
}
else if(tabdata.item0_page0_vunit == VOLTAGE_MV)
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< mV >");
}
}
}
break;
case VOL_UP_SET:
{
if(tabdata.content_focus == 0)
{
if(tabdata.item0_page0_vunit == VOLTAGE_V)
{
sprintf(str_temp,"%d",tabdata.item0_page0_vup[0]);
}
else if(tabdata.item0_page0_vunit == VOLTAGE_MV)
{
sprintf(str_temp,"%d",tabdata.item0_page0_vup[1]);
}
}
else
{
if(tabdata.item0_page0_vunit == VOLTAGE_V)
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_vup[0]);
}
else if(tabdata.item0_page0_vunit == VOLTAGE_MV)
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_vup[1]);
}
}
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
}
break;
case VOL_LOW_SET:
{
if(tabdata.content_focus == 0)
{
if(tabdata.item0_page0_vunit == VOLTAGE_V)
{
sprintf(str_temp,"%d",tabdata.item0_page0_vlow[0]);
}
else if(tabdata.item0_page0_vunit == VOLTAGE_MV)
{
sprintf(str_temp,"%d",tabdata.item0_page0_vlow[1]);
}
}
else
{
if(tabdata.item0_page0_vunit == VOLTAGE_V)
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_vlow[0]);
}
else if(tabdata.item0_page0_vunit == VOLTAGE_MV)
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_vlow[1]);
}
}
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
}
break;
case CURRENT_UP_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page0_cup);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_cup);
}
lv_label_set_text(guider_ui.screen_setting_label_31, str_temp);
}
break;
case CURRENT_LOW_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page0_clow);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_clow);
}
lv_label_set_text(guider_ui.screen_setting_label_41, str_temp);
}
break;
case RES_UP_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page0_rup);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page0_rup);
}
lv_label_set_text(guider_ui.screen_setting_label_51, str_temp);
}
break;
case RES_LOW_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page1_rlow);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page1_rlow);
}
lv_label_set_text(guider_ui.screen_setting_label_01, str_temp);
}
break;
case FRE_UP_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page1_fup);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page1_fup);
}
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
}
break;
case FRE_LOW_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page1_flow);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page1_flow);
}
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
}
break;
case TC_TYPE_SET:
{
switch (tabdata.item0_page1_TCtype)
{
case TC_K:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "K ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< K ℃ >");
}
}
break;
case TC_S:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "S ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< S ℃ >");
}
}
break;
case TC_N:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "N ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< N ℃ >");
}
}
break;
case TC_B:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "B ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< B ℃ >");
}
}
break;
case TC_E:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "E ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< E ℃ >");
}
}
break;
case TC_J:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "J ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< J ℃ >");
}
}
break;
case TC_R:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "R ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< R ℃ >");
}
}
break;
case TC_T:
{
if(tabdata.content_focus == 0)
{
lv_label_set_text(guider_ui.screen_setting_label_31, "T ℃");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< T ℃ >");
}
}
break;
default:
break;
}
}
break;
case TC_UP_SET:
{
enum_temp = (uint8_t)tabdata.item0_page1_TCtype;
enum_temp -= 5;
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page1_TCup[enum_temp]);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page1_TCup[enum_temp]);
}
lv_label_set_text(guider_ui.screen_setting_label_41, str_temp);
}
break;
case TC_LOW_SET:
{
enum_temp = (uint8_t)tabdata.item0_page1_TCtype;
enum_temp -= 5;
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page1_TClow[enum_temp]);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page1_TClow[enum_temp]);
}
lv_label_set_text(guider_ui.screen_setting_label_51, str_temp);
}
break;
case RTD_UP_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page2_RTDup);
}
else
{
sprintf(str_temp,"< %d >",tabdata.item0_page2_RTDup);
}
lv_label_set_text(guider_ui.screen_setting_label_01, str_temp);
}
break;
case RTD_LOW_SET:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d",tabdata.item0_page2_RTDlow);
}
else
{sprintf(str_temp,"< %d >",tabdata.item0_page2_RTDlow);}
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
}
break;
case PAGE_PV:
{
sprintf(str_temp,"< %d / %d >",tabdata.item_page, I0_PAGE_MAX);
lv_label_set_text(guider_ui.screen_setting_label_page, str_temp);
}
break;
default:
break;
}
}
//修改选项卡1的文本
void set_item1_text(uint8_t con)
{
char str_temp[16] = {0};
switch (con)
{
case SAMPLE_INTERVAL:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d", tabdata.item1_page0_sample_interval);
lv_label_set_text(guider_ui.screen_setting_label_01, str_temp);
}
else
{
sprintf(str_temp,"< %d >", tabdata.item1_page0_sample_interval);
lv_label_set_text(guider_ui.screen_setting_label_01, str_temp);
}
}
break;
case PLOT_NUM:
{
if(tabdata.content_focus == 0)
{
sprintf(str_temp,"%d", tabdata.item1_page0_plot_num);
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
}
else
{
sprintf(str_temp,"< %d >", tabdata.item1_page0_plot_num);
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
}
}
break;
case PAGE_PV:
{
sprintf(str_temp,"< %d / %d >",tabdata.item_page, I1_PAGE_MAX);
lv_label_set_text(guider_ui.screen_setting_label_page, str_temp);
}
break;
default:
break;
}
}
//修改选项卡2的文本
void set_item2_text(uint8_t con)
{
char str_temp[16] = {0};
switch (con)
{
case DATA_SAVE:
{
if(tabdata.content_focus == 0)
{
switch (tabdata.item2_page0_saveflag)
{
case 0:
{
lv_label_set_text(guider_ui.screen_setting_label_01, "未保存");
}
break;
case 1:
{
lv_label_set_text(guider_ui.screen_setting_label_01, "保存中");
}
break;
case 2:
{
lv_label_set_text(guider_ui.screen_setting_label_01, "已保存");
}
break;
default:
break;
}
}
else
{
switch (tabdata.item2_page0_saveflag)
{
case 0:
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< 未保存 >");
}
break;
case 1:
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< 保存中 >");
}
break;
case 2:
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< 已保存 >");
}
break;
default:
break;
}
}
}
break;
case DATA_RESET:
{
if(tabdata.content_focus == 0)
{
switch (tabdata.item2_page0_resetflag)
{
case 0:
{
lv_label_set_text(guider_ui.screen_setting_label_31, "未复位");
}
break;
case 1:
{
lv_label_set_text(guider_ui.screen_setting_label_31, "复位中");
}
break;
case 2:
{
lv_label_set_text(guider_ui.screen_setting_label_31, "已复位");
}
break;
default:
break;
}
}
else
{
switch (tabdata.item2_page0_resetflag)
{
case 0:
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< 未复位 >");
}
break;
case 1:
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< 复位中 >");
}
break;
case 2:
{
lv_label_set_text(guider_ui.screen_setting_label_31, "< 已复位 >");
}
break;
default:
break;
}
}
}
break;
case INPUT_LOG:
{
lv_label_set_text(guider_ui.screen_setting_label_11, ">");
}
break;
case OUTPUT_LOG:
{
lv_label_set_text(guider_ui.screen_setting_label_21, ">");
}
break;
case PAGE_PV:
{
sprintf(str_temp,"< %d / %d >",tabdata.item_page, I2_PAGE_MAX);
lv_label_set_text(guider_ui.screen_setting_label_page, str_temp);
}
break;
default:
break;
}
}
//修改选项卡3的文本
void set_item3_text(uint8_t con)
{
char str_temp[16] = {0};
switch (con)
{
case LIGHT_STATUS:
{
if(tabdata.content_focus == 0)
{
if(tabdata.item3_page0_lightflag)
{
lv_label_set_text(guider_ui.screen_setting_label_01, "");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_01, "");
}
}
else
{
if(tabdata.item3_page0_lightflag)
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< 开 >");
}
else
{
lv_label_set_text(guider_ui.screen_setting_label_01, "< 关 >");
}
}
}
break;
case LANGUAGE_SELECT:
{
if(tabdata.content_focus == 0)
{
switch (tabdata.item3_page0_language)
{
case MENU_SIMPLYFY_CHINESE:
{
lv_label_set_text(guider_ui.screen_setting_label_11, "简体中文");
}
break;
case MENU_ENGLISH:
{
lv_label_set_text(guider_ui.screen_setting_label_11, "English");
}
break;
default:
break;
}
}
else
{
switch (tabdata.item3_page0_language)
{
case MENU_SIMPLYFY_CHINESE:
{
lv_label_set_text(guider_ui.screen_setting_label_11, "< 简体中文 >");
}
break;
case MENU_ENGLISH:
{
lv_label_set_text(guider_ui.screen_setting_label_11, "< English >");
}
break;
default:
break;
}
}
}
break;
case PAGE_PV:
{
sprintf(str_temp,"< %d / %d >",tabdata.item_page, I3_PAGE_MAX);
lv_label_set_text(guider_ui.screen_setting_label_page, str_temp);
}
break;
default:
break;
}
}

View File

@ -0,0 +1,333 @@
#include "scr_setting_item_value.h"
//修改选项卡0的值
void set_item0_value(uint8_t con, int8_t step)
{
uint8_t enum_temp = 0;
switch (con)
{
case VOL_UNIT_SET:
{
if( tabdata.item0_page0_vunit == VOLTAGE_V )
{
tabdata.item0_page0_vunit = VOLTAGE_MV;
}
else
{
tabdata.item0_page0_vunit = VOLTAGE_V;
}
//修改单位后,更新上下限
set_item0_text(VOL_UP_SET);
set_item0_text(VOL_LOW_SET);
}
break;
case VOL_UP_SET:
{
if( tabdata.item0_page0_vunit == VOLTAGE_V )
{
tabdata.item0_page0_vup[0] = tabdata.item0_page0_vup[0] + step;
//上下限幅
if(tabdata.item0_page0_vup[0] > VOL[0].up) tabdata.item0_page0_vup[0] = VOL[0].up;
if(tabdata.item0_page0_vup[0] < VOL[0].low) tabdata.item0_page0_vup[0] = VOL[0].low;
//防止自相矛盾
if(tabdata.item0_page0_vup[0] < tabdata.item0_page0_vlow[0]) tabdata.item0_page0_vup[0] = tabdata.item0_page0_vlow[0];
}
else
{
tabdata.item0_page0_vup[1] = tabdata.item0_page0_vup[1] + step;
//上下限幅
if(tabdata.item0_page0_vup[1] > VOL[1].up) tabdata.item0_page0_vup[1] = VOL[1].up;
if(tabdata.item0_page0_vup[1] < VOL[1].low) tabdata.item0_page0_vup[1] = VOL[1].low;
//防止自相矛盾
if(tabdata.item0_page0_vup[1] < tabdata.item0_page0_vlow[1]) tabdata.item0_page0_vup[1] = tabdata.item0_page0_vlow[1];
}
}
break;
case VOL_LOW_SET:
{
if( tabdata.item0_page0_vunit == VOLTAGE_V )
{
tabdata.item0_page0_vlow[0] = tabdata.item0_page0_vlow[0] + step;
//上下限幅
if(tabdata.item0_page0_vlow[0] > VOL[0].up) tabdata.item0_page0_vlow[0] = VOL[0].up;
if(tabdata.item0_page0_vlow[0] < VOL[0].low) tabdata.item0_page0_vlow[0] = VOL[0].low;
//防止自相矛盾
if(tabdata.item0_page0_vlow[0] > tabdata.item0_page0_vup[0]) tabdata.item0_page0_vlow[0] = tabdata.item0_page0_vup[0];
}
else
{
tabdata.item0_page0_vlow[1] = tabdata.item0_page0_vlow[1] + step;
//上下限幅
if(tabdata.item0_page0_vlow[1] > VOL[1].up) tabdata.item0_page0_vlow[1] = VOL[1].up;
if(tabdata.item0_page0_vlow[1] < VOL[1].low) tabdata.item0_page0_vlow[1] = VOL[1].low;
//防止自相矛盾
if(tabdata.item0_page0_vlow[1] > tabdata.item0_page0_vup[1]) tabdata.item0_page0_vlow[1] = tabdata.item0_page0_vup[1];
}
}
break;
case CURRENT_UP_SET:
{
tabdata.item0_page0_cup = tabdata.item0_page0_cup + step;
//上下限幅
if(tabdata.item0_page0_cup > CUR.up) tabdata.item0_page0_cup = CUR.up;
if(tabdata.item0_page0_cup < CUR.low) tabdata.item0_page0_cup = CUR.low;
//防止自相矛盾
if(tabdata.item0_page0_cup < tabdata.item0_page0_clow) tabdata.item0_page0_cup = tabdata.item0_page0_clow;
}
break;
case CURRENT_LOW_SET:
{
tabdata.item0_page0_clow = tabdata.item0_page0_clow + step;
//上下限幅
if(tabdata.item0_page0_clow > CUR.up) tabdata.item0_page0_clow = CUR.up;
if(tabdata.item0_page0_clow < CUR.low) tabdata.item0_page0_clow = CUR.low;
//防止自相矛盾
if(tabdata.item0_page0_clow > tabdata.item0_page0_cup) tabdata.item0_page0_clow = tabdata.item0_page0_cup;
}
break;
case RES_UP_SET:
{
tabdata.item0_page0_rup = tabdata.item0_page0_rup + step;
//上下限幅
if(tabdata.item0_page0_rup > RES.up) tabdata.item0_page0_rup = RES.up;
if(tabdata.item0_page0_rup < RES.low) tabdata.item0_page0_rup = RES.low;
//防止自相矛盾
if(tabdata.item0_page0_rup < tabdata.item0_page1_rlow) tabdata.item0_page0_rup = tabdata.item0_page1_rlow;
}
break;
case RES_LOW_SET:
{
tabdata.item0_page1_rlow = tabdata.item0_page1_rlow + step;
//上下限幅
if(tabdata.item0_page1_rlow > RES.up) tabdata.item0_page1_rlow = RES.up;
if(tabdata.item0_page1_rlow < RES.low) tabdata.item0_page1_rlow = RES.low;
//防止自相矛盾
if(tabdata.item0_page1_rlow > tabdata.item0_page0_rup) tabdata.item0_page1_rlow = tabdata.item0_page0_rup;
}
break;
case FRE_UP_SET:
{
tabdata.item0_page1_fup = tabdata.item0_page1_fup + step;
//上下限幅
if(tabdata.item0_page1_fup > FRE.up) tabdata.item0_page1_fup = FRE.up;
if(tabdata.item0_page1_fup < FRE.low) tabdata.item0_page1_fup = FRE.low;
//防止自相矛盾
if(tabdata.item0_page1_fup < tabdata.item0_page1_flow) tabdata.item0_page1_fup = tabdata.item0_page1_flow;
}
break;
case FRE_LOW_SET:
{
tabdata.item0_page1_flow = tabdata.item0_page1_flow + step;
//上下限幅
if(tabdata.item0_page1_flow > FRE.up) tabdata.item0_page1_flow = FRE.up;
if(tabdata.item0_page1_flow < FRE.low) tabdata.item0_page1_flow = FRE.low;
//防止自相矛盾
if(tabdata.item0_page1_flow > tabdata.item0_page1_fup) tabdata.item0_page1_flow = tabdata.item0_page1_fup;
}
break;
case TC_TYPE_SET:
{
enum_temp = (uint8_t)tabdata.item0_page1_TCtype;
enum_temp = enum_temp + step;
if(enum_temp > 12) enum_temp = 5;
if(enum_temp < 5) enum_temp = 12;
tabdata.item0_page1_TCtype = (SIG_FUNCTIONS_TYPE)enum_temp;
//修改单位后,更新上下限
set_item0_text(TC_UP_SET);
set_item0_text(TC_LOW_SET);
}
break;
case TC_UP_SET:
{
enum_temp = (uint8_t)tabdata.item0_page1_TCtype;
enum_temp -= 5;
tabdata.item0_page1_TCup[enum_temp]= tabdata.item0_page1_TCup[enum_temp] + step;
//上下限幅
if(tabdata.item0_page1_TCup[enum_temp] > TC[enum_temp].up) tabdata.item0_page1_TCup[enum_temp] = TC[enum_temp].up;
if(tabdata.item0_page1_TCup[enum_temp] < TC[enum_temp].low) tabdata.item0_page1_TCup[enum_temp] = TC[enum_temp].low;
//防止自相矛盾
if(tabdata.item0_page1_TCup[enum_temp] < tabdata.item0_page1_TClow[enum_temp]) tabdata.item0_page1_TCup[enum_temp] = tabdata.item0_page1_TClow[enum_temp];
}
break;
case TC_LOW_SET:
{
enum_temp = (uint8_t)tabdata.item0_page1_TCtype;
enum_temp -= 5;
tabdata.item0_page1_TClow[enum_temp]= tabdata.item0_page1_TClow[enum_temp] + step;
//上下限幅
if(tabdata.item0_page1_TClow[enum_temp] > TC[enum_temp].up) tabdata.item0_page1_TClow[enum_temp] = TC[enum_temp].up;
if(tabdata.item0_page1_TClow[enum_temp] < TC[enum_temp].low) tabdata.item0_page1_TClow[enum_temp] = TC[enum_temp].low;
//防止自相矛盾
if(tabdata.item0_page1_TClow[enum_temp] > tabdata.item0_page1_TCup[enum_temp]) tabdata.item0_page1_TClow[enum_temp] = tabdata.item0_page1_TCup[enum_temp];
}
break;
case RTD_UP_SET:
{
tabdata.item0_page2_RTDup = tabdata.item0_page2_RTDup + step;
//上下限幅
if(tabdata.item0_page2_RTDup > RTD.up) tabdata.item0_page2_RTDup = RTD.up;
if(tabdata.item0_page2_RTDup < RTD.low) tabdata.item0_page2_RTDup = RTD.low;
//防止自相矛盾
if(tabdata.item0_page2_RTDup < tabdata.item0_page2_RTDlow) tabdata.item0_page2_RTDup = tabdata.item0_page2_RTDlow;
}
break;
case RTD_LOW_SET:
{
tabdata.item0_page2_RTDlow = tabdata.item0_page2_RTDlow + step;
//上下限幅
if(tabdata.item0_page2_RTDlow > RTD.up) tabdata.item0_page2_RTDlow = RTD.up;
if(tabdata.item0_page2_RTDlow < RTD.low) tabdata.item0_page2_RTDlow = RTD.low;
//防止自相矛盾
if(tabdata.item0_page2_RTDlow > tabdata.item0_page2_RTDup) tabdata.item0_page2_RTDlow = tabdata.item0_page2_RTDup;
}
break;
default:
break;
}
}
//修改选项卡1的值
int16_t save_cnt = 0;
int16_t reset_cnt = 0;
void set_item1_value(uint8_t con, int8_t step)
{
switch (con)
{
case SAMPLE_INTERVAL:
{
tabdata.item1_page0_sample_interval += step * 100;
if( tabdata.item1_page0_sample_interval > 60000 ) tabdata.item1_page0_sample_interval = 60000;
if( tabdata.item1_page0_sample_interval < 100 ) tabdata.item1_page0_sample_interval = 100;
}
break;
case PLOT_NUM:
{
tabdata.item1_page0_plot_num += step;
if( tabdata.item1_page0_plot_num > 20 ) tabdata.item1_page0_plot_num = 20;
if( tabdata.item1_page0_plot_num < 3 ) tabdata.item1_page0_plot_num = 3;
}
break;
default:
break;
}
}
//修改选项卡2的值
void set_item2_value(uint8_t con, int8_t step)
{
switch (con)
{
case DATA_SAVE:
{
if(tabdata.item2_page0_saveflag == 0)
{
tabdata.item2_page0_saveflag = 1;
//执行保存
set_item1_text(DATA_SAVE);
eeprom_datasave();
save_cnt = 0;
}
}
break;
case DATA_RESET:
{
if(tabdata.item2_page0_resetflag == 0)
{
tabdata.item2_page0_resetflag = 1;
//执行复位
item0_data_init();
reset_cnt = 0;
}
}
break;
}
}
//修改选项卡3的值
void set_item3_value(uint8_t con, int8_t step)
{
switch (con)
{
case LIGHT_STATUS:
{
if(tabdata.item3_page0_lightflag)
{
tabdata.item3_page0_lightflag = 0;
LIGHT_OFF;
}
else
{
tabdata.item3_page0_lightflag = 1;
LIGHT_ON;
}
}
break;
case LANGUAGE_SELECT:
{
tabdata.item3_page0_language = (tabdata.item3_page0_language > 0)?(0):(tabdata.item3_page0_language + 1);
}
break;
default:
break;
}
}

View File

@ -12,8 +12,8 @@ int heart_1000ms_flag = 0;
int heart_1000ms_cnt = 0;
int battery_3000ms_flag = 0;
int battery_3000ms_cnt = 0;
int plot_1500ms_flag = 0;
int plot_1500ms_cnt = 0;
int plot_ms_flag = 0;
int plot_ms_cnt = 0;
int twk_1000ms_flag = 0;
int twk_1000ms_cnt = 0;
int input_500ms_flag = 0;
@ -42,11 +42,11 @@ void duty_tim6(void)
battery_3000ms_flag = 1;
}
plot_1500ms_cnt++;
if( plot_1500ms_cnt >= 1500)
plot_ms_cnt++;
if( plot_ms_cnt >= tabdata.item1_page0_sample_interval)
{
plot_1500ms_cnt = 0;
plot_1500ms_flag = 1;
plot_ms_cnt = 0;
plot_ms_flag = 1;
}
twk_1000ms_cnt++;

View File

@ -812,6 +812,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x23, 0x4, 0x70, 0x0, 0xb3, 0x66, 0x66,
0x66, 0x66, 0x61,
/* U+4F53 "体" */
0x0, 0x9, 0x20, 0x0, 0xa1, 0x0, 0x0, 0x0,
0x3e, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x88,
0x0, 0x0, 0xe0, 0x2, 0x40, 0x0, 0xd2, 0x66,
0x6b, 0xf8, 0x68, 0x90, 0x3, 0xf2, 0x0, 0xe,
0xe6, 0x0, 0x0, 0x9, 0xf0, 0x0, 0x69, 0xe6,
0x10, 0x0, 0x25, 0xe0, 0x0, 0xc1, 0xe1, 0xa0,
0x0, 0x30, 0xe0, 0x5, 0x80, 0xe0, 0x95, 0x0,
0x0, 0xe0, 0x1b, 0x0, 0xe0, 0x1e, 0x20, 0x0,
0xe0, 0x80, 0x0, 0xe0, 0x76, 0xe4, 0x0, 0xe4,
0x13, 0x66, 0xf6, 0x62, 0x51, 0x0, 0xe0, 0x0,
0x0, 0xe0, 0x0, 0x0, 0x0, 0xd0, 0x0, 0x0,
0xd0, 0x0, 0x0,
/* U+4FDD "保" */
0x0, 0x8, 0x21, 0x0, 0x0, 0x3, 0x0, 0x0,
0x2e, 0xe, 0x66, 0x66, 0x6f, 0x20, 0x0, 0x77,
@ -826,20 +840,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xe0, 0x2, 0xc3, 0x0, 0xc1, 0x0, 0x0,
0xd0, 0x0, 0x0,
/* U+503C "值" */
0x0, 0x8, 0x20, 0x1, 0xa1, 0x0, 0x0, 0x0,
0x2e, 0x0, 0x2, 0xd0, 0x2, 0x60, 0x0, 0x78,
0x56, 0x68, 0xd6, 0x67, 0x81, 0x0, 0xd2, 0x3,
0x2, 0xa0, 0x5, 0x0, 0x3, 0xf1, 0xe, 0x66,
0x66, 0x7e, 0x10, 0x9, 0xf0, 0xe, 0x0, 0x0,
0x1d, 0x0, 0x34, 0xe0, 0xe, 0x66, 0x66, 0x7d,
0x0, 0x20, 0xe0, 0xe, 0x0, 0x0, 0x1d, 0x0,
0x0, 0xe0, 0xe, 0x66, 0x66, 0x7d, 0x0, 0x0,
0xe0, 0xe, 0x0, 0x0, 0x1d, 0x0, 0x0, 0xe0,
0xe, 0x66, 0x66, 0x7d, 0x0, 0x0, 0xe0, 0xe,
0x0, 0x0, 0x1d, 0x50, 0x0, 0xd2, 0x68, 0x66,
0x66, 0x68, 0x84,
/* U+5076 "偶" */
0x0, 0x8, 0x21, 0x0, 0x0, 0x2, 0x0, 0x0,
0x3d, 0x2e, 0x66, 0xc6, 0x6e, 0x20, 0x0, 0x87,
@ -855,6 +855,64 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x1c, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+50A8 "储" */
0x0, 0x28, 0x0, 0x0, 0x19, 0x0, 0x0, 0x0,
0x7, 0x97, 0x20, 0x2, 0xb0, 0x4, 0x0, 0x0,
0xb4, 0x2c, 0x6, 0x7d, 0xaa, 0xe2, 0x0, 0xd,
0x0, 0x40, 0x2, 0xb0, 0xc4, 0x0, 0x3, 0xe4,
0x6c, 0x10, 0x2b, 0x97, 0x22, 0x0, 0x8d, 0x0,
0xd3, 0x67, 0xdb, 0x68, 0x80, 0x16, 0xd0, 0xd,
0x0, 0x76, 0x0, 0x30, 0x2, 0xd, 0x0, 0xd0,
0x7e, 0x66, 0x7e, 0x10, 0x0, 0xd0, 0xd, 0x30,
0xd0, 0x1, 0xc0, 0x0, 0xd, 0x0, 0xd1, 0x2e,
0x66, 0x7c, 0x0, 0x0, 0xd0, 0xf, 0x90, 0xd0,
0x1, 0xc0, 0x0, 0xd, 0x4, 0xb0, 0xe, 0x66,
0x7c, 0x0, 0x0, 0xc0, 0x0, 0x0, 0xc0, 0x1,
0xb0, 0x0,
/* U+5165 "入" */
0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x28, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x63, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x97, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xeb,
0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xda, 0x10,
0x0, 0x0, 0x0, 0x0, 0x9, 0x75, 0x80, 0x0,
0x0, 0x0, 0x0, 0x1e, 0x10, 0xd0, 0x0, 0x0,
0x0, 0x0, 0x95, 0x0, 0x79, 0x0, 0x0, 0x0,
0x4, 0xa0, 0x0, 0xe, 0x60, 0x0, 0x0, 0x1a,
0x0, 0x0, 0x3, 0xf5, 0x0, 0x1, 0x90, 0x0,
0x0, 0x0, 0x6f, 0xa1, 0x26, 0x0, 0x0, 0x0,
0x0, 0x5, 0xd4, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+5173 "关" */
0x0, 0x4, 0x20, 0x0, 0x9, 0x30, 0x0, 0x0,
0x0, 0xc5, 0x0, 0x5c, 0x0, 0x0, 0x0, 0x0,
0x3e, 0x0, 0xb1, 0x10, 0x0, 0x3, 0x66, 0x67,
0x78, 0x86, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xc2,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd2, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0xd1, 0x0, 0x7,
0x30, 0x36, 0x66, 0x67, 0xf9, 0x66, 0x67, 0x60,
0x0, 0x0, 0x4, 0xa7, 0x0, 0x0, 0x0, 0x0,
0x0, 0xc, 0x22, 0xa0, 0x0, 0x0, 0x0, 0x0,
0xa5, 0x0, 0x6b, 0x10, 0x0, 0x0, 0x3a, 0x20,
0x0, 0x6, 0xf9, 0x30, 0x37, 0x50, 0x0, 0x0,
0x0, 0x3a, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+51FA "出" */
0x0, 0x0, 0x0, 0x91, 0x0, 0x0, 0x0, 0x35,
0x0, 0x1d, 0x0, 0x6, 0x10, 0x7, 0x70, 0x1,
0xd0, 0x0, 0xe0, 0x0, 0x77, 0x0, 0x1d, 0x0,
0xe, 0x0, 0x7, 0x70, 0x1, 0xd0, 0x0, 0xe0,
0x0, 0x8a, 0x66, 0x7e, 0x66, 0x6e, 0x0, 0x1,
0x20, 0x1, 0xd0, 0x0, 0x90, 0x1, 0xb1, 0x0,
0x1d, 0x0, 0x3, 0x80, 0x2b, 0x0, 0x1, 0xd0,
0x0, 0x49, 0x2, 0xb0, 0x0, 0x1d, 0x0, 0x4,
0x90, 0x2b, 0x0, 0x1, 0xd0, 0x0, 0x49, 0x4,
0xd6, 0x66, 0x7c, 0x66, 0x69, 0x90, 0x3, 0x0,
0x0, 0x0, 0x0, 0x48, 0x0,
/* U+5355 "单" */
0x0, 0x3, 0x20, 0x0, 0x27, 0x0, 0x0, 0x0,
0xb, 0x50, 0xa, 0x60, 0x0, 0x0, 0x0, 0x3c,
@ -898,18 +956,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+56F4 "围" */
0x20, 0x0, 0x0, 0x0, 0x0, 0x40, 0xc7, 0x66,
0x68, 0x66, 0x66, 0xe4, 0xc1, 0x0, 0xe, 0x0,
0x30, 0xd1, 0xc2, 0x66, 0x6e, 0x67, 0xa1, 0xd1,
0xc1, 0x0, 0xd, 0x2, 0x20, 0xd1, 0xc1, 0x36,
0x6e, 0x68, 0x80, 0xd1, 0xc1, 0x0, 0xd, 0x0,
0x20, 0xd1, 0xc3, 0x66, 0x6e, 0x66, 0xd3, 0xd1,
0xc1, 0x0, 0xd, 0x0, 0xd0, 0xd1, 0xc1, 0x0,
0xd, 0x4b, 0xb0, 0xd1, 0xc1, 0x0, 0xd, 0x2,
0x0, 0xd1, 0xc7, 0x66, 0x67, 0x66, 0x66, 0xe1,
0xb1, 0x0, 0x0, 0x0, 0x0, 0xc0,
/* U+578B "型" */
0x0, 0x0, 0x0, 0x23, 0x0, 0x0, 0x91, 0x4,
0x7a, 0x6b, 0x88, 0xe, 0x0, 0xe0, 0x0, 0x2a,
@ -966,6 +1012,64 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xd4, 0x0, 0x0, 0x0, 0x18, 0x90, 0x4, 0xbd,
0xdd, 0xdd, 0xdd, 0xc9, 0x0,
/* U+5F00 "开" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x5,
0x66, 0x87, 0x66, 0x68, 0x6b, 0xa0, 0x0, 0x0,
0xb3, 0x0, 0x1d, 0x0, 0x0, 0x0, 0x0, 0xb3,
0x0, 0x1d, 0x0, 0x0, 0x0, 0x0, 0xb3, 0x0,
0x1d, 0x0, 0x0, 0x0, 0x0, 0xb3, 0x0, 0x1d,
0x0, 0x51, 0x26, 0x66, 0xd8, 0x66, 0x7e, 0x66,
0x95, 0x0, 0x0, 0xd1, 0x0, 0x1d, 0x0, 0x0,
0x0, 0x0, 0xe0, 0x0, 0x1d, 0x0, 0x0, 0x0,
0x5, 0x80, 0x0, 0x1d, 0x0, 0x0, 0x0, 0xb,
0x10, 0x0, 0x1d, 0x0, 0x0, 0x0, 0x92, 0x0,
0x0, 0x1d, 0x0, 0x0, 0x16, 0x0, 0x0, 0x0,
0x1c, 0x0, 0x0,
/* U+5F55 "录" */
0x0, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x5,
0x66, 0x66, 0x66, 0xc6, 0x0, 0x0, 0x0, 0x0,
0x0, 0xb, 0x30, 0x0, 0x2, 0x66, 0x66, 0x66,
0xd3, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0x23,
0x13, 0x66, 0x66, 0x69, 0x86, 0xa7, 0xa8, 0x0,
0x35, 0x0, 0xb6, 0x0, 0x64, 0x0, 0x0, 0x8b,
0xb, 0x61, 0x5b, 0x10, 0x0, 0x0, 0x93, 0xd3,
0x95, 0x0, 0x0, 0x0, 0x49, 0x4b, 0x32, 0xb1,
0x0, 0x17, 0xd7, 0x0, 0xb3, 0x3, 0xd7, 0x1,
0xa2, 0x1, 0xc, 0x30, 0x2, 0xca, 0x0, 0x0,
0x2a, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+636E "据" */
0x0, 0x73, 0x1, 0x0, 0x0, 0x0, 0x10, 0x0,
0xa3, 0xc, 0x76, 0x66, 0x67, 0xd0, 0x0, 0xa3,
0x1c, 0x10, 0x0, 0x1, 0xb0, 0x36, 0xca, 0x9c,
0x76, 0x66, 0x67, 0xb0, 0x0, 0xa3, 0xc, 0x10,
0xc, 0x10, 0x40, 0x0, 0xa3, 0xd, 0x0, 0xe,
0x0, 0x60, 0x0, 0xb8, 0x4e, 0x66, 0x6e, 0x67,
0x82, 0x7c, 0xe3, 0xd, 0x0, 0xe, 0x0, 0x0,
0x41, 0xa3, 0xa, 0x76, 0x6e, 0x67, 0xa0, 0x0,
0xa3, 0x38, 0xa4, 0x0, 0x3, 0xb0, 0x0, 0xa3,
0x73, 0xa4, 0x0, 0x3, 0xa0, 0x13, 0xc3, 0x80,
0xa9, 0x66, 0x68, 0xa0, 0x6, 0xd2, 0x20, 0xa3,
0x0, 0x3, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+63CF "描" */
0x0, 0x29, 0x0, 0x4, 0x40, 0x44, 0x0, 0x0,
0x3a, 0x0, 0x7, 0x50, 0x75, 0x0, 0x0, 0x3a,
0x24, 0x6b, 0xa6, 0xb9, 0xd6, 0x16, 0x8c, 0x98,
0x7, 0x50, 0x75, 0x0, 0x0, 0x3a, 0x0, 0x7,
0x50, 0x75, 0x0, 0x0, 0x3a, 0x3, 0x86, 0x66,
0x66, 0xb2, 0x0, 0x4d, 0x74, 0xb0, 0xd, 0x0,
0xe0, 0x1b, 0xda, 0x2, 0xb0, 0xd, 0x0, 0xe0,
0x5, 0x3a, 0x2, 0xd6, 0x6e, 0x66, 0xe0, 0x0,
0x3a, 0x2, 0xb0, 0xd, 0x0, 0xe0, 0x0, 0x3a,
0x2, 0xb0, 0xd, 0x0, 0xe0, 0x1, 0x4a, 0x2,
0xd6, 0x6e, 0x66, 0xe0, 0x3, 0xe7, 0x2, 0xa0,
0x0, 0x0, 0xc0, 0x0, 0x10, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+6570 "数" */
0x0, 0x2, 0x90, 0x20, 0x19, 0x10, 0x0, 0x5,
0x63, 0xa3, 0xb0, 0x4c, 0x0, 0x0, 0x0, 0xa3,
@ -981,6 +1085,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x1, 0xc7, 0x1, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+6587 "文" */
0x0, 0x0, 0x1, 0x50, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0xb, 0x10, 0x1, 0x40, 0x16, 0x67, 0x66,
0x66, 0x67, 0xa9, 0xb1, 0x0, 0x2, 0x20, 0x0,
0x7, 0xa0, 0x0, 0x0, 0x0, 0x70, 0x0, 0xd,
0x40, 0x0, 0x0, 0x0, 0x71, 0x0, 0x4d, 0x0,
0x0, 0x0, 0x0, 0xa, 0x0, 0xd3, 0x0, 0x0,
0x0, 0x0, 0x3, 0xa9, 0x70, 0x0, 0x0, 0x0,
0x0, 0x0, 0xce, 0x10, 0x0, 0x0, 0x0, 0x0,
0x1a, 0x66, 0xe6, 0x0, 0x0, 0x0, 0x5, 0x91,
0x0, 0x2d, 0xd8, 0x30, 0x15, 0x62, 0x0, 0x0,
0x0, 0x4b, 0xd2, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+660E "明" */
0x0, 0x0, 0x0, 0x10, 0x0, 0x2, 0xc, 0x66,
0x7d, 0xe, 0x66, 0x67, 0xf1, 0xd0, 0x2, 0xb0,
@ -995,6 +1114,18 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x50, 0x0, 0x4, 0xf7, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+66F2 "曲" */
0x0, 0x2, 0x70, 0x8, 0x0, 0x0, 0x0, 0x3,
0xa0, 0xe, 0x0, 0x0, 0x0, 0x3, 0xa0, 0xe,
0x0, 0x0, 0x96, 0x68, 0xd6, 0x6e, 0x66, 0xd3,
0xc2, 0x3, 0xa0, 0xe, 0x0, 0xe0, 0xc2, 0x3,
0xa0, 0xe, 0x0, 0xe0, 0xc2, 0x3, 0xa0, 0xe,
0x0, 0xe0, 0xc7, 0x68, 0xd6, 0x6e, 0x66, 0xf0,
0xc2, 0x3, 0xa0, 0xe, 0x0, 0xe0, 0xc2, 0x3,
0xa0, 0xe, 0x0, 0xe0, 0xc2, 0x3, 0xa0, 0xe,
0x0, 0xe0, 0xc8, 0x68, 0xd6, 0x6e, 0x66, 0xf0,
0xb1, 0x0, 0x0, 0x0, 0x0, 0xd0,
/* U+672A "未" */
0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xb3, 0x0, 0x0, 0x0, 0x0, 0x0,
@ -1009,6 +1140,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xb3, 0x0, 0x4, 0x90, 0x0, 0x0, 0x0, 0xa2,
0x0, 0x0, 0x0,
/* U+6837 "样" */
0x0, 0xa, 0x10, 0x41, 0x0, 0x9, 0x20, 0x0,
0xd, 0x0, 0x1d, 0x0, 0x5b, 0x0, 0x0, 0xd,
0x0, 0x8, 0x40, 0x91, 0x50, 0x6, 0x7e, 0xab,
0x56, 0x6c, 0x77, 0x92, 0x0, 0x6d, 0x0, 0x0,
0xe, 0x0, 0x0, 0x0, 0xae, 0x60, 0x0, 0xe,
0x5, 0x50, 0x0, 0xdd, 0x87, 0x36, 0x6f, 0x66,
0x60, 0x5, 0x7d, 0x17, 0x0, 0xe, 0x0, 0x0,
0xa, 0xd, 0x0, 0x0, 0xe, 0x0, 0x73, 0x42,
0xd, 0x3, 0x66, 0x6f, 0x66, 0x64, 0x0, 0xd,
0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0xd, 0x0,
0x0, 0xe, 0x0, 0x0, 0x0, 0xc, 0x0, 0x0,
0xd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+6D41 "流" */
0x1, 0x50, 0x0, 0x4, 0x50, 0x0, 0x0, 0x0,
0x6b, 0x0, 0x0, 0xd1, 0x1, 0x20, 0x0, 0x6,
@ -1024,6 +1170,22 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xc0, 0xad, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+70B9 "点" */
0x0, 0x0, 0x0, 0x84, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xb, 0x20, 0x0, 0x30, 0x0, 0x0,
0x0, 0x0, 0xb8, 0x66, 0x7c, 0x50, 0x0, 0x0,
0x0, 0xb, 0x20, 0x0, 0x0, 0x0, 0x0, 0x12,
0x0, 0xb2, 0x0, 0x51, 0x0, 0x0, 0x2, 0xd6,
0x66, 0x66, 0x6d, 0x70, 0x0, 0x0, 0x2c, 0x0,
0x0, 0x0, 0xa3, 0x0, 0x0, 0x2, 0xc0, 0x0,
0x0, 0xa, 0x30, 0x0, 0x0, 0x2d, 0x66, 0x66,
0x66, 0xd3, 0x0, 0x0, 0x2, 0x30, 0x0, 0x10,
0x4, 0x0, 0x0, 0x0, 0x80, 0xa, 0x3, 0x90,
0x3a, 0x10, 0x0, 0x4d, 0x0, 0xc1, 0xa, 0x50,
0x4d, 0x0, 0x1d, 0x30, 0x9, 0x10, 0x46, 0x0,
0xa3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0,
/* U+70ED "热" */
0x0, 0xc, 0x10, 0x2, 0x90, 0x0, 0x0, 0x0,
0x0, 0xe0, 0x0, 0x3b, 0x0, 0x0, 0x0, 0x16,
@ -1082,6 +1244,34 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x4, 0x0, 0x0, 0xd1, 0x0, 0x0, 0x55,
0x0, 0x0, 0x8f, 0xee, 0xee, 0xe5,
/* U+7A0B "程" */
0x0, 0x1, 0x81, 0x0, 0x0, 0x1, 0x0, 0x3,
0x9e, 0x72, 0xc7, 0x66, 0x6d, 0x60, 0x13, 0xe,
0x0, 0xc1, 0x0, 0xa, 0x30, 0x0, 0xe, 0x11,
0xc1, 0x0, 0xa, 0x30, 0x16, 0x7e, 0x97, 0xc7,
0x66, 0x6d, 0x30, 0x0, 0x6e, 0x20, 0x70, 0x0,
0x5, 0x10, 0x0, 0xbe, 0x97, 0x66, 0x66, 0x6a,
0xb0, 0x1, 0xae, 0x17, 0x0, 0xe, 0x0, 0x0,
0x8, 0x2e, 0x0, 0x0, 0xe, 0x2, 0x0, 0x25,
0xe, 0x1, 0x66, 0x6f, 0x6a, 0x70, 0x0, 0xe,
0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0xe, 0x0,
0x0, 0xe, 0x0, 0x60, 0x0, 0xc, 0x6, 0x66,
0x69, 0x67, 0x93,
/* U+7B80 "简" */
0x0, 0x37, 0x0, 0x0, 0x71, 0x0, 0x0, 0x0,
0xa7, 0x0, 0x64, 0xc0, 0x1, 0x80, 0x1, 0xd6,
0xd7, 0x6a, 0x7b, 0x96, 0x62, 0x8, 0x53, 0x65,
0x24, 0x2, 0xb0, 0x0, 0x26, 0xa, 0x53, 0x66,
0x66, 0x6e, 0x30, 0x0, 0xd3, 0x40, 0x0, 0x0,
0xe, 0x0, 0x0, 0xd0, 0x1c, 0x66, 0xd3, 0xe,
0x0, 0x0, 0xd0, 0x1b, 0x0, 0xc0, 0xe, 0x0,
0x0, 0xd0, 0x1d, 0x66, 0xe0, 0xe, 0x0, 0x0,
0xd0, 0x1b, 0x0, 0xc0, 0xe, 0x0, 0x0, 0xd0,
0x1d, 0x66, 0xe0, 0xe, 0x0, 0x0, 0xd0, 0x17,
0x0, 0x51, 0xe, 0x0, 0x0, 0xc0, 0x0, 0x0,
0x3, 0xc9, 0x0,
/* U+7C7B "类" */
0x0, 0x0, 0x0, 0x84, 0x0, 0x20, 0x0, 0x0,
0xa, 0x50, 0xb3, 0x9, 0xa0, 0x0, 0x0, 0x0,
@ -1096,6 +1286,51 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x2c, 0xa4, 0x10, 0x36, 0x72, 0x0, 0x0,
0x0, 0x5b, 0xc1,
/* U+7CFB "系" */
0x0, 0x0, 0x0, 0x0, 0x37, 0xa4, 0x0, 0x2,
0x57, 0x8a, 0xcb, 0x97, 0x53, 0x0, 0x2, 0x10,
0x1c, 0x90, 0x1, 0x0, 0x0, 0x0, 0x4, 0xb4,
0x0, 0x4e, 0x60, 0x0, 0x0, 0x9c, 0x77, 0x7a,
0xc2, 0x0, 0x0, 0x0, 0x54, 0x26, 0xb4, 0x2,
0x0, 0x0, 0x0, 0x5, 0x83, 0x0, 0x5, 0xb3,
0x0, 0x4, 0xda, 0x89, 0xa8, 0x76, 0x6e, 0x30,
0x1, 0x53, 0x10, 0xb3, 0x0, 0x4, 0x40, 0x0,
0xa, 0x80, 0xb3, 0x17, 0x40, 0x0, 0x0, 0x6a,
0x0, 0xb3, 0x0, 0x9a, 0x0, 0x6, 0x70, 0x0,
0xb3, 0x0, 0xa, 0x70, 0x22, 0x0, 0x29, 0xe0,
0x0, 0x1, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+7EBF "线" */
0x0, 0x6, 0x10, 0x2, 0x93, 0x10, 0x0, 0x0,
0x3d, 0x10, 0x3, 0xc0, 0xc5, 0x0, 0x0, 0xa3,
0x10, 0x2, 0xc0, 0x27, 0x0, 0x4, 0x70, 0x9a,
0x1, 0xd3, 0x5b, 0xa0, 0x2b, 0x56, 0xd1, 0x66,
0xf2, 0x0, 0x0, 0x19, 0x6d, 0x20, 0x0, 0xd1,
0x0, 0x71, 0x0, 0x93, 0x0, 0x1, 0xc8, 0x67,
0x94, 0x8, 0x43, 0x54, 0x64, 0x87, 0xd, 0x60,
0x2f, 0xb6, 0x10, 0x0, 0x1d, 0xaa, 0x0, 0x0,
0x0, 0x3, 0x0, 0xd, 0xc0, 0x0, 0x2, 0x6a,
0x81, 0x1, 0xb9, 0xe3, 0x5, 0xd, 0x71, 0x0,
0x69, 0x20, 0x3e, 0x77, 0x0, 0x0, 0x26, 0x20,
0x0, 0x3, 0xda, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+7EDF "统" */
0x0, 0x16, 0x0, 0x0, 0x71, 0x0, 0x0, 0x0,
0x7a, 0x0, 0x0, 0x4a, 0x0, 0x20, 0x0, 0xc1,
0x5, 0x66, 0x78, 0x66, 0xd5, 0x7, 0x30, 0xe3,
0x2, 0xe4, 0x0, 0x0, 0x3a, 0x59, 0x90, 0x1c,
0x60, 0x56, 0x0, 0x3a, 0x6d, 0x1, 0xb4, 0x0,
0xa, 0x70, 0x0, 0xa2, 0xa, 0xdc, 0xa9, 0xe5,
0xf0, 0x8, 0x30, 0x23, 0x1d, 0x10, 0xe0, 0x40,
0x3e, 0xc8, 0x30, 0xe, 0x0, 0xe0, 0x0, 0x3,
0x0, 0x0, 0x1e, 0x0, 0xe0, 0x0, 0x0, 0x27,
0x72, 0x68, 0x0, 0xe0, 0x2, 0x2e, 0xa3, 0x2,
0xb0, 0x0, 0xe0, 0x16, 0x2, 0x0, 0x39, 0x10,
0x0, 0xdd, 0xe8, 0x0, 0x0, 0x30, 0x0, 0x0,
0x0, 0x0,
/* U+7F6E "置" */
0x0, 0x30, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0,
0xe6, 0x6e, 0x66, 0xe6, 0x6e, 0x30, 0x0, 0xe0,
@ -1110,19 +1345,33 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0xd2, 0x60, 0x26, 0x68, 0x66, 0x66,
0x66, 0x87, 0x81,
/* U+8303 "范" */
0x0, 0x0, 0x83, 0x0, 0x19, 0x0, 0x0, 0x0,
0x0, 0xd0, 0x0, 0x2b, 0x2, 0x80, 0x16, 0x66,
0xe6, 0x66, 0x7d, 0x66, 0x61, 0x0, 0x20, 0xb0,
0x0, 0x29, 0x0, 0x0, 0x0, 0x8a, 0x0, 0x96,
0x66, 0x7a, 0x0, 0x0, 0x5, 0x50, 0xd0, 0x0,
0x2b, 0x0, 0x1b, 0x53, 0x40, 0xd0, 0x0, 0x2a,
0x0, 0x1, 0x79, 0x0, 0xd0, 0x0, 0x2a, 0x0,
0x0, 0x65, 0x0, 0xd0, 0x3, 0x79, 0x0, 0x6,
0xe0, 0x0, 0xd0, 0x0, 0x51, 0x0, 0x3, 0xc0,
0x0, 0xd0, 0x0, 0x0, 0x30, 0x1, 0xf0, 0x0,
0xd1, 0x0, 0x0, 0x80, 0x1, 0xd0, 0x0, 0x8e,
0xdd, 0xdd, 0xe3,
/* U+8A00 "言" */
0x0, 0x0, 0x2, 0x70, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x96, 0x0, 0x0, 0x10, 0x26, 0x66,
0x66, 0x78, 0x66, 0x69, 0xd1, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x16, 0x66, 0x66,
0x68, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x16, 0x66, 0x66, 0x68, 0xe2,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x9, 0x66, 0x66, 0x66, 0xb2, 0x0, 0x0,
0xe, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe,
0x0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xf, 0x66,
0x66, 0x66, 0xf0, 0x0, 0x0, 0xd, 0x0, 0x0,
0x0, 0xd0, 0x0,
/* U+8BB0 "记" */
0x0, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x5c, 0x4, 0x66, 0x66, 0x6c, 0x60, 0x0, 0xb,
0x40, 0x0, 0x0, 0xb, 0x30, 0x0, 0x2, 0x0,
0x0, 0x0, 0xb, 0x20, 0x6, 0x8d, 0x0, 0x0,
0x0, 0xb, 0x20, 0x0, 0x2b, 0x0, 0x40, 0x0,
0xb, 0x20, 0x0, 0x2b, 0x0, 0xe6, 0x66, 0x6d,
0x20, 0x0, 0x2b, 0x0, 0xe0, 0x0, 0x5, 0x0,
0x0, 0x2b, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0,
0x2b, 0x3, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x2d,
0x90, 0xe0, 0x0, 0x0, 0x50, 0x0, 0x6c, 0x10,
0xe1, 0x0, 0x0, 0x91, 0x0, 0x11, 0x0, 0x7c,
0xcc, 0xcc, 0xb4,
/* U+8BBE "设" */
0x3, 0x30, 0x0, 0x10, 0x0, 0x20, 0x0, 0x0,
@ -1139,6 +1388,76 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x49, 0xd3, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+8BED "语" */
0x2, 0x30, 0x0, 0x0, 0x0, 0x5, 0x0, 0x0,
0xa4, 0x26, 0x69, 0x86, 0x69, 0x30, 0x0, 0x3b,
0x0, 0xb, 0x10, 0x0, 0x0, 0x0, 0x30, 0x16,
0x6e, 0x66, 0xd4, 0x0, 0x46, 0xd5, 0x0, 0x2a,
0x0, 0xb1, 0x0, 0x0, 0xb2, 0x0, 0x66, 0x0,
0xb2, 0x10, 0x0, 0xb2, 0x66, 0xa8, 0x66, 0xb9,
0xb0, 0x0, 0xb2, 0x0, 0x0, 0x0, 0x1, 0x0,
0x0, 0xb2, 0x2, 0xc6, 0x66, 0x9c, 0x0, 0x0,
0xb2, 0x43, 0xb0, 0x0, 0x49, 0x0, 0x0, 0xcc,
0x32, 0xb0, 0x0, 0x49, 0x0, 0x1, 0xd2, 0x2,
0xd6, 0x66, 0x99, 0x0, 0x0, 0x0, 0x2, 0x90,
0x0, 0x48, 0x0,
/* U+8F93 "输" */
0x0, 0x44, 0x0, 0x0, 0x86, 0x0, 0x0, 0x0,
0x94, 0x0, 0x3, 0xd7, 0x0, 0x0, 0x3, 0xd4,
0x88, 0xc, 0x20, 0x92, 0x0, 0x4, 0xc2, 0x22,
0x84, 0x1, 0x7b, 0x91, 0x5, 0x8c, 0x16, 0x26,
0x67, 0x71, 0x76, 0x9, 0x3c, 0x10, 0x96, 0xa3,
0x30, 0xa0, 0x2e, 0x7d, 0xb6, 0xc0, 0xc0, 0xc0,
0xc0, 0x1, 0xc, 0x0, 0xe6, 0xe0, 0xb0, 0xc0,
0x0, 0xc, 0x12, 0xc0, 0xc0, 0xb0, 0xc0, 0x4,
0x9e, 0x50, 0xe6, 0xe0, 0xb0, 0xc0, 0xa, 0x5c,
0x0, 0xc0, 0xc0, 0x90, 0xc0, 0x0, 0xc, 0x0,
0xc1, 0xd0, 0x0, 0xc0, 0x0, 0xb, 0x0, 0xb4,
0xa0, 0x2b, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+91C7 "采" */
0x0, 0x0, 0x0, 0x0, 0x3, 0x72, 0x0, 0x0,
0x2, 0x46, 0x9b, 0xca, 0x85, 0x0, 0x4, 0x64,
0x35, 0x10, 0x0, 0x34, 0x0, 0x0, 0x66, 0x2,
0xc0, 0x0, 0xd6, 0x0, 0x0, 0xe, 0x10, 0xc1,
0x7, 0x60, 0x0, 0x0, 0x5, 0x0, 0x42, 0x25,
0x0, 0x0, 0x0, 0x0, 0x0, 0xb3, 0x0, 0x7,
0x50, 0x36, 0x66, 0x6e, 0xfc, 0x66, 0x66, 0x60,
0x0, 0x0, 0x8b, 0xb4, 0x80, 0x0, 0x0, 0x0,
0x5, 0xc1, 0xb3, 0x4a, 0x0, 0x0, 0x0, 0x69,
0x0, 0xb3, 0x5, 0xd5, 0x0, 0x7, 0x30, 0x0,
0xb3, 0x0, 0x3c, 0xc1, 0x20, 0x0, 0x0, 0xa2,
0x0, 0x0, 0x10,
/* U+91CF "量" */
0x0, 0x2, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0,
0xf, 0x66, 0x66, 0x66, 0xf2, 0x0, 0x0, 0xf,
0x66, 0x66, 0x66, 0xe0, 0x0, 0x0, 0xe, 0x0,
0x0, 0x0, 0xe0, 0x0, 0x0, 0xd, 0x66, 0x66,
0x66, 0xb1, 0x30, 0x15, 0x55, 0x55, 0x55, 0x55,
0x67, 0x90, 0x0, 0x1b, 0x66, 0x87, 0x66, 0xd4,
0x0, 0x0, 0x1c, 0x0, 0xb2, 0x0, 0xc1, 0x0,
0x0, 0x1e, 0x66, 0xd8, 0x66, 0xe1, 0x0, 0x0,
0x1e, 0x66, 0xd8, 0x66, 0xe1, 0x0, 0x0, 0x4,
0x0, 0xb2, 0x0, 0x28, 0x0, 0x1, 0x66, 0x66,
0xd8, 0x66, 0x66, 0x20, 0x16, 0x66, 0x66, 0xd8,
0x66, 0x69, 0xd1,
/* U+95F4 "间" */
0x4, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb,
0x63, 0x66, 0x66, 0x67, 0xe2, 0x2b, 0x38, 0x0,
0x0, 0x0, 0xe, 0x2, 0xb0, 0x20, 0x0, 0x3,
0x0, 0xd0, 0x2b, 0xa, 0x86, 0x66, 0xf1, 0xd,
0x2, 0xb0, 0xa3, 0x0, 0xe, 0x0, 0xd0, 0x2b,
0xa, 0x86, 0x66, 0xe0, 0xd, 0x2, 0xb0, 0xa3,
0x0, 0xe, 0x0, 0xd0, 0x2b, 0xa, 0x30, 0x0,
0xe0, 0xd, 0x2, 0xb0, 0xa8, 0x66, 0x6e, 0x0,
0xd0, 0x2b, 0xa, 0x30, 0x0, 0xd0, 0xd, 0x2,
0xb0, 0x20, 0x0, 0x1, 0x33, 0xd0, 0x2a, 0x0,
0x0, 0x0, 0x2, 0xd7, 0x0,
/* U+963B "阻" */
0x20, 0x4, 0x0, 0x0, 0x0, 0x10, 0xe, 0x67,
0xf3, 0xc6, 0x66, 0x6f, 0x20, 0xe0, 0x69, 0xd,
@ -1166,21 +1485,19 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x59, 0x10, 0x0, 0x1a, 0x20, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+9879 "项" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x0,
0x0, 0x4, 0x56, 0x67, 0x96, 0x6b, 0x80, 0x6,
0x8d, 0x65, 0x0, 0x39, 0x0, 0x0, 0x0, 0x2,
0xc0, 0xb, 0x68, 0x76, 0x6d, 0x10, 0x0, 0x2c,
0x0, 0xe0, 0x6, 0x10, 0xd0, 0x0, 0x2, 0xc0,
0xe, 0x0, 0xd0, 0xd, 0x0, 0x0, 0x2c, 0x0,
0xe0, 0x1c, 0x0, 0xd0, 0x0, 0x2, 0xc0, 0xe,
0x2, 0xb0, 0xd, 0x0, 0x0, 0x2c, 0x43, 0xe0,
0x58, 0x0, 0xd0, 0x0, 0x9d, 0xa3, 0xa, 0x9,
0x60, 0x8, 0x0, 0x7, 0x20, 0x0, 0x1, 0xc1,
0xa7, 0x0, 0x0, 0x0, 0x0, 0x2, 0xb2, 0x0,
0x9c, 0x0, 0x0, 0x0, 0x26, 0x60, 0x0, 0x0,
0xb3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0,
/* U+9694 "隔" */
0x40, 0x15, 0x0, 0x0, 0x0, 0x36, 0xd, 0x59,
0xd5, 0x66, 0x66, 0x66, 0x60, 0xd0, 0x85, 0x8,
0x66, 0x66, 0xb1, 0xd, 0xa, 0x0, 0xd0, 0x0,
0xd, 0x0, 0xd1, 0x50, 0xd, 0x66, 0x66, 0xd0,
0xd, 0x8, 0x0, 0x90, 0x0, 0x8, 0x0, 0xd0,
0x74, 0xb6, 0x66, 0x66, 0x7e, 0x1d, 0x4, 0x9c,
0x7, 0x13, 0x90, 0xc0, 0xd0, 0x3b, 0xc0, 0x35,
0x82, 0x2c, 0xd, 0x3e, 0x8c, 0x36, 0xc7, 0x65,
0xc0, 0xd0, 0x20, 0xc0, 0xb, 0x10, 0xc, 0xd,
0x0, 0xc, 0x0, 0xb1, 0x1, 0xc0, 0xc0, 0x0,
0xb0, 0x5, 0x2, 0xb8, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+9891 "频" */
0x0, 0x1, 0x60, 0x0, 0x0, 0x0, 0x30, 0x0,
@ -2121,90 +2438,112 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 4333, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4424, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4515, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4613, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4698, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4796, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4894, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4972, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5063, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5161, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5252, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 5337, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5435, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5526, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5617, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5715, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5820, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5925, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6016, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
{.bitmap_index = 6094, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6185, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6276, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6367, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6465, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 6550, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 6641, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6746, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6851, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6964, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7041, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7132, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7209, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7264, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7369, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7474, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7578, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7683, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7771, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7876, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7918, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7984, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8096, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8173, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8248, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8318, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8416, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8501, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8586, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8656, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 8747, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8806, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8865, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8950, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 8976, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9064, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9199, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9327, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9418, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9470, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9522, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9621, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9698, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9803, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9916, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10001, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10099, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10184, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10262, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10339, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10414, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10512, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10610, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10698, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10818, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10901, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11018, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11108, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11198, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11288, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11378, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11468, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11576, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11666, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11764, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11877, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11976, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12059, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
{.bitmap_index = 4613, .adv_w = 224, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4711, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4809, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4907, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4992, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5077, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5175, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5273, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5364, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5462, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5553, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 5638, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5729, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5820, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5918, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6016, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6114, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6212, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 6303, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 6381, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6472, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6570, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6668, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6773, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6878, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6983, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7074, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
{.bitmap_index = 7152, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7243, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7334, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7425, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7523, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7621, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7719, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7810, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7901, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7992, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8090, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8181, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8279, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8370, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8461, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 8546, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 8631, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8722, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8813, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8918, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9031, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9108, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9199, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9276, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9331, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9436, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9541, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9645, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9750, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9838, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9943, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9985, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10051, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10163, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10240, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10315, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 10385, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10483, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10568, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10653, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 10723, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 10814, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10873, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10932, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11017, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 11043, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11131, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11266, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11394, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11485, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11537, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 11589, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11688, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11765, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11870, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11983, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12068, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12166, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12251, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 12329, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 12406, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 12481, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12579, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12677, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 12765, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 12885, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12968, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 13085, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13175, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13265, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13355, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13445, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 13535, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 13643, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13733, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 13831, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 13944, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 14043, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 14126, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
};
/*---------------------
@ -2212,18 +2551,21 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
*--------------------*/
static const uint16_t unicode_list_2[] = {
0x0, 0x1d5a, 0x4a61, 0x4a62, 0x4a84, 0x4ba4, 0x4c34, 0x4c93,
0x4ccd, 0x4fac, 0x4fe2, 0x5019, 0x534b, 0x53e2, 0x5564, 0x57af,
0x5a49, 0x61c7, 0x6265, 0x6381, 0x6998, 0x6d44, 0x6dbe, 0x6fde,
0x718c, 0x78d2, 0x7bc5, 0x7f5a, 0x8815, 0x9292, 0x92a7, 0x94d0,
0x94e8, 0xec58, 0xec5f, 0xec62, 0xec63, 0xec64, 0xec68, 0xec6a,
0xec6c, 0xec70, 0xec73, 0xec78, 0xec7d, 0xec7e, 0xec7f, 0xec95,
0xec9a, 0xec9f, 0xeca2, 0xeca3, 0xeca4, 0xeca8, 0xeca9, 0xecaa,
0xecab, 0xecbe, 0xecbf, 0xecc5, 0xecc7, 0xecc8, 0xeccb, 0xecce,
0xeccf, 0xecd0, 0xecd2, 0xecea, 0xecec, 0xed1b, 0xed1c, 0xed1e,
0xed20, 0xed37, 0xed3e, 0xed41, 0xed4a, 0xed73, 0xed7b, 0xedb2,
0xee42, 0xee97, 0xee98, 0xee99, 0xee9a, 0xee9b, 0xeede, 0xeeea,
0xef44, 0xef5b, 0xf1b1, 0xf419, 0xf4f9
0x0, 0x1d5a, 0x4a61, 0x4a62, 0x4a84, 0x4ba4, 0x4baa, 0x4c34,
0x4ccd, 0x4cff, 0x4dbc, 0x4dca, 0x4e51, 0x4fac, 0x4fe2, 0x5019,
0x53e2, 0x5564, 0x57af, 0x5a49, 0x5b57, 0x5bac, 0x5fc5, 0x6026,
0x61c7, 0x61de, 0x6265, 0x6349, 0x6381, 0x648e, 0x6998, 0x6d10,
0x6d44, 0x6dbe, 0x6fde, 0x718c, 0x7662, 0x77d7, 0x78d2, 0x7952,
0x7b16, 0x7b36, 0x7bc5, 0x8657, 0x8807, 0x8815, 0x8844, 0x8bea,
0x8e1e, 0x8e26, 0x924b, 0x9292, 0x92a7, 0x92eb, 0x94e8, 0xec58,
0xec5f, 0xec62, 0xec63, 0xec64, 0xec68, 0xec6a, 0xec6c, 0xec70,
0xec73, 0xec78, 0xec7d, 0xec7e, 0xec7f, 0xec95, 0xec9a, 0xec9f,
0xeca2, 0xeca3, 0xeca4, 0xeca8, 0xeca9, 0xecaa, 0xecab, 0xecbe,
0xecbf, 0xecc5, 0xecc7, 0xecc8, 0xeccb, 0xecce, 0xeccf, 0xecd0,
0xecd2, 0xecea, 0xecec, 0xed1b, 0xed1c, 0xed1e, 0xed20, 0xed37,
0xed3e, 0xed41, 0xed4a, 0xed73, 0xed7b, 0xedb2, 0xee42, 0xee97,
0xee98, 0xee99, 0xee9a, 0xee9b, 0xeede, 0xeeea, 0xef44, 0xef5b,
0xf1b1, 0xf419, 0xf4f9
};
/*Collect the unicode lists and glyph_id offsets*/
@ -2239,7 +2581,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
},
{
.range_start = 937, .range_length = 62714, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 93, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 115, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@ -2274,7 +2616,10 @@ 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, 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*/
@ -2303,7 +2648,10 @@ 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, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0
};
/*Kern values between classes*/

View File

@ -30,9 +30,9 @@ void setup_scr_screen_hidden(lv_ui *ui)
//Write codes screen_hidden_label_1
ui->screen_hidden_label_1 = lv_label_create(ui->screen_hidden);
lv_label_set_text(ui->screen_hidden_label_1, "照 明 热 电 偶 阻 ℃ Ω 类 型\n参 数 复 位 保 存 未 中 已 ");
lv_label_set_text(ui->screen_hidden_label_1, "热 电 偶 阻 ℃ Ω 类 型 频 率\n参 数 复 位 保 存 未 中 已 输 入 出 记 录 \n照 明 语 言 简 体 文 开 关");
lv_label_set_long_mode(ui->screen_hidden_label_1, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_hidden_label_1, 0, 0);
lv_obj_set_pos(ui->screen_hidden_label_1, 2, 0);
lv_obj_set_size(ui->screen_hidden_label_1, 320, 240);
//Write style for screen_hidden_label_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.

View File

@ -58,7 +58,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_s0
ui->screen_setting_label_s0 = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_s0, "数值范围");
lv_label_set_text(ui->screen_setting_label_s0, "量程设置");
lv_label_set_long_mode(ui->screen_setting_label_s0, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_s0, 0, 40);
lv_obj_set_size(ui->screen_setting_label_s0, 80, 50);
@ -86,7 +86,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_s1
ui->screen_setting_label_s1 = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_s1, "设置项1");
lv_label_set_text(ui->screen_setting_label_s1, "曲线设置");
lv_label_set_long_mode(ui->screen_setting_label_s1, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_s1, 0, 90);
lv_obj_set_size(ui->screen_setting_label_s1, 80, 50);
@ -114,7 +114,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_s2
ui->screen_setting_label_s2 = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_s2, "设置项2");
lv_label_set_text(ui->screen_setting_label_s2, "数据存储");
lv_label_set_long_mode(ui->screen_setting_label_s2, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_s2, 0, 140);
lv_obj_set_size(ui->screen_setting_label_s2, 80, 50);
@ -142,7 +142,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_s3
ui->screen_setting_label_s3 = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_s3, "设置项3");
lv_label_set_text(ui->screen_setting_label_s3, "系统设置");
lv_label_set_long_mode(ui->screen_setting_label_s3, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_s3, 0, 190);
lv_obj_set_size(ui->screen_setting_label_s3, 80, 50);

View File

@ -3782,6 +3782,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>16</GroupNumber>
<FileNumber>275</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\App\APP_WU\Src\scr_setting_item_text.c</PathWithFileName>
<FilenameWithoutPath>scr_setting_item_text.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>16</GroupNumber>
<FileNumber>276</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\App\APP_WU\Src\scr_setting_item_value.c</PathWithFileName>
<FilenameWithoutPath>scr_setting_item_value.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
@ -3792,7 +3816,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>275</FileNumber>
<FileNumber>277</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3804,7 +3828,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>276</FileNumber>
<FileNumber>278</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3816,7 +3840,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>277</FileNumber>
<FileNumber>279</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3828,7 +3852,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>278</FileNumber>
<FileNumber>280</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3840,7 +3864,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>279</FileNumber>
<FileNumber>281</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3852,7 +3876,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>280</FileNumber>
<FileNumber>282</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3864,7 +3888,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>281</FileNumber>
<FileNumber>283</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3876,7 +3900,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>282</FileNumber>
<FileNumber>284</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3888,7 +3912,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>283</FileNumber>
<FileNumber>285</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3900,7 +3924,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>284</FileNumber>
<FileNumber>286</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3912,7 +3936,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>285</FileNumber>
<FileNumber>287</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3924,7 +3948,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>286</FileNumber>
<FileNumber>288</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3936,7 +3960,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>287</FileNumber>
<FileNumber>289</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3948,7 +3972,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>288</FileNumber>
<FileNumber>290</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -3958,30 +3982,6 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>289</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_12.c</PathWithFileName>
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_12.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>290</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_14.c</PathWithFileName>
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_14.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>291</FileNumber>
@ -3989,18 +3989,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>17</GroupNumber>
<FileNumber>292</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>
@ -4008,7 +3996,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>293</FileNumber>
<FileNumber>292</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4020,7 +4008,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>294</FileNumber>
<FileNumber>293</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4032,7 +4020,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>295</FileNumber>
<FileNumber>294</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4044,7 +4032,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>296</FileNumber>
<FileNumber>295</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4056,7 +4044,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>297</FileNumber>
<FileNumber>296</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4068,7 +4056,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>298</FileNumber>
<FileNumber>297</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4080,7 +4068,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>299</FileNumber>
<FileNumber>298</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4092,7 +4080,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>300</FileNumber>
<FileNumber>299</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4104,7 +4092,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>301</FileNumber>
<FileNumber>300</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4116,7 +4104,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>302</FileNumber>
<FileNumber>301</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4128,7 +4116,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>303</FileNumber>
<FileNumber>302</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4140,7 +4128,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>304</FileNumber>
<FileNumber>303</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4152,7 +4140,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>305</FileNumber>
<FileNumber>304</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4164,7 +4152,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>306</FileNumber>
<FileNumber>305</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4176,7 +4164,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>307</FileNumber>
<FileNumber>306</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4188,7 +4176,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>308</FileNumber>
<FileNumber>307</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4200,7 +4188,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>309</FileNumber>
<FileNumber>308</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4212,7 +4200,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>310</FileNumber>
<FileNumber>309</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4224,7 +4212,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>311</FileNumber>
<FileNumber>310</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4236,7 +4224,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>312</FileNumber>
<FileNumber>311</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4248,7 +4236,7 @@
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>313</FileNumber>
<FileNumber>312</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -4258,6 +4246,42 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>313</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_12.c</PathWithFileName>
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_12.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>314</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_14.c</PathWithFileName>
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_14.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>17</GroupNumber>
<FileNumber>315</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>

View File

@ -2493,6 +2493,16 @@
<FileType>1</FileType>
<FilePath>..\App\APP_WU\Src\app_screen_setting.c</FilePath>
</File>
<File>
<FileName>scr_setting_item_text.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\APP_WU\Src\scr_setting_item_text.c</FilePath>
</File>
<File>
<FileName>scr_setting_item_value.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\APP_WU\Src\scr_setting_item_value.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -2568,21 +2578,6 @@
<FileType>5</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_customer_fonts\guider_customer_fonts.h</FilePath>
</File>
<File>
<FileName>lv_font_SourceHanSerifSC_Regular_12.c</FileName>
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_12.c</FilePath>
</File>
<File>
<FileName>lv_font_SourceHanSerifSC_Regular_14.c</FileName>
<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>
<File>
<FileName>_logo_alpha_141x60.c</FileName>
<FileType>1</FileType>
@ -2693,6 +2688,21 @@
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\images\screen_main_animimg_batterybt100.c</FilePath>
</File>
<File>
<FileName>lv_font_SourceHanSerifSC_Regular_12.c</FileName>
<FileType>1</FileType>
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_12.c</FilePath>
</File>
<File>
<FileName>lv_font_SourceHanSerifSC_Regular_14.c</FileName>
<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>

File diff suppressed because it is too large Load Diff