更新：
1、编程输出的参数设置界面开发完成：界面布局、切换、参数选择与修改； 2、目前阶跃和三角波共用一个界面，因此枚举变量存在耦合，后续添加新的输出波形时需要重新调整；
This commit is contained in:
parent
d187e0de5e
commit
98f3e7f035
|
|
@ -136,7 +136,7 @@ void title_item_refresh(void);
|
|||
void set_communication_text(uint8_t con);
|
||||
|
||||
//切换至通讯子菜单
|
||||
void communication_switch(void);
|
||||
void communication_select(void);
|
||||
|
||||
//修改通讯子菜单的值
|
||||
void set_communication_modify(uint8_t con, int8_t step);
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ extern const lv_img_dsc_t * screen_main_ani_out_sign_imgs[3];
|
|||
#include "modbus_485.h"
|
||||
#include "modbus_rtu.h"
|
||||
#include "modbus_rtu_master.h"
|
||||
#include "scr_setting_progam_out.h"
|
||||
|
||||
extern PHYSICAL_QUANTITY VOL[2]; //电压，VOL[0]-V, VOL[1]-mV
|
||||
extern PHYSICAL_QUANTITY CUR; //电流，mA
|
||||
|
|
|
|||
|
|
@ -71,7 +71,9 @@ typedef enum
|
|||
MODBUS_MASTER_CONFIG, //modbus主站，配置项选择
|
||||
MODBUS_MASTER_CONFIG_MODIFY, //modbus主站，配置项修改
|
||||
MODBUS_MASTER_TRX, //modbus主站收发，选项选择
|
||||
MODBUS_MASTER_TRX_MODIFY //modbus主站收发，选项修改
|
||||
MODBUS_MASTER_TRX_MODIFY, //modbus主站收发，选项修改
|
||||
PROG_OUT_CONFIG_1, //编程输出配置页面1，输出方式、输出模式、循环次数、下一步
|
||||
PROG_OUT_CONFIG_2 //阶跃、三角波
|
||||
}OPERATIONS;
|
||||
|
||||
typedef enum
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
#ifndef _SCR_SETTING_PROGRAM_OUT_H_
|
||||
#define _SCR_SETTING_PROGRAM_OUT_H_
|
||||
|
||||
#include "apps_gather.h"
|
||||
|
||||
#define PROG_OUT_V 0
|
||||
#define PROG_OUT_MA 1
|
||||
#define PROG_OUT_STEP 0
|
||||
#define PROG_OUT_TRIANGLE 1
|
||||
#define CIRCULATIONS_MAX 10
|
||||
|
||||
//CONFIG1
|
||||
#define CONF1_OUTPUT_UNIT 0
|
||||
#define CONF1_OUTPUT_MODE 1
|
||||
#define CONF1_CIRCULATIONS 2
|
||||
#define CONF1_NEXT 3
|
||||
|
||||
//CONFIG2_STEP
|
||||
#define CONF2_OUTPUT_MODE 0
|
||||
#define CONF2_START_PERCENT 1
|
||||
#define CONF2_END_PERCENT 2
|
||||
#define CONF2_STEP_PERCENT 3
|
||||
#define CONF2_HOLD_TIME 4
|
||||
#define CONF2_RISING_PERCENT 5
|
||||
#define CONF2_FALLING_PERCENT 6
|
||||
#define CONF2_PERIOD 7
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint8_t output_unit;
|
||||
uint8_t output_mode;
|
||||
uint8_t circulations;
|
||||
uint16_t hold_time;
|
||||
uint8_t start_percent;
|
||||
uint8_t end_percent;
|
||||
uint8_t step_percent;
|
||||
uint8_t rising_percent;
|
||||
uint8_t falling_percent;
|
||||
uint16_t period;
|
||||
}PROGRAM_OUT_DATA;
|
||||
|
||||
extern PROGRAM_OUT_DATA progout_data;
|
||||
extern uint8_t cursor_conf1;
|
||||
extern uint8_t cursor_conf1_prv;
|
||||
extern uint8_t cursor_conf2;
|
||||
extern uint8_t cursor_conf2_prv;
|
||||
|
||||
//初始化相关参数
|
||||
void program_out_init(void);
|
||||
|
||||
//初始化config1界面
|
||||
void program_out_config1(void);
|
||||
|
||||
//更新config1右列文本内容
|
||||
void text_update_conf1(uint8_t con);
|
||||
|
||||
//修改config1右列值
|
||||
void val_modify_conf1(int8_t step);
|
||||
|
||||
//初始化config2界面
|
||||
void program_out_config2(void);
|
||||
|
||||
//更新config2右列文本内容
|
||||
void text_update_conf2(uint8_t con);
|
||||
|
||||
//修改config2右列值
|
||||
void val_modify_conf2(int8_t step);
|
||||
|
||||
#endif
|
||||
|
|
@ -10,6 +10,9 @@
|
|||
#define ITEM2_CONTENT_MAX 4
|
||||
#define ITEM2_COMMUNICATION_MAX 4
|
||||
#define ITEM2_COMMUNICATION_VALUE_MAX 4
|
||||
#define ITEM2_PROGRAM_OUT_CONFIG1_MAX 4
|
||||
#define ITEM2_PROGRAM_OUT_CONFIG1_VALUE_MAX 2
|
||||
#define ITEM2_PROGRAM_OUT_CONFIG2_MAX 8
|
||||
#define ITEM3_CONTENT_MAX 4
|
||||
#define ITEM3_CONTENT_VAL_MAX 10
|
||||
#define MODBUS_MASTER_CONFIG_ITEM_MAX 8
|
||||
|
|
@ -30,6 +33,10 @@ typedef struct
|
|||
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];
|
||||
|
||||
char program_out_config1[ITEM2_PROGRAM_OUT_CONFIG1_MAX][TEXT_LENGTH_MAX];
|
||||
char program_out_config1_val[ITEM2_PROGRAM_OUT_CONFIG1_VALUE_MAX][TEXT_LENGTH_MAX];
|
||||
char program_out_config2[ITEM2_PROGRAM_OUT_CONFIG2_MAX][TEXT_LENGTH_MAX];
|
||||
}SETTING_TEXT;
|
||||
|
||||
extern SETTING_TEXT text_pack;
|
||||
|
|
|
|||
|
|
@ -877,7 +877,7 @@ void set_communication_text(uint8_t con)
|
|||
}
|
||||
}
|
||||
|
||||
void communication_switch(void)
|
||||
void communication_select(void)
|
||||
{
|
||||
//启用所需组件
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN); };
|
||||
|
|
@ -906,6 +906,7 @@ void communication_switch(void)
|
|||
set_communication_text(TEXT_BLE);
|
||||
set_communication_text(TEXT_MODBUS);
|
||||
|
||||
//初始化游标
|
||||
com_switch_cursor = 0;
|
||||
com_switch_cursor_prv = 99;
|
||||
setting_contents_check(com_switch_cursor, com_switch_cursor_prv);
|
||||
|
|
|
|||
|
|
@ -853,6 +853,9 @@ void my_inits_gather(void)
|
|||
|
||||
//MODBUS主站初始化
|
||||
modbus_rtu_master_init();
|
||||
|
||||
//编程输出参数初始化
|
||||
program_out_init();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -347,6 +347,44 @@ void key_config_update(OPERATIONS ope)
|
|||
key_config(KEY_SWITCH, KEY_STATUS_DISABLE);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
//使能：上、下、左、右、确认（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 PROG_OUT_CONFIG_2:
|
||||
{
|
||||
//使能：上、下、左、右、确认（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;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -712,7 +712,7 @@ void key_functions_modbus(void)
|
|||
//进入通讯选择
|
||||
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();
|
||||
communication_select();
|
||||
current_operation = SET_COMMUNICATION_SWITCH;
|
||||
key_config_update(current_operation);
|
||||
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ void key_functions_setting(void)
|
|||
tabdata.content_focus = 0;
|
||||
setting_contents_check(tabdata.content_cursor, tabdata.content_cursor_prv);
|
||||
|
||||
//当前操作从“查看记录” 返回 至“内容选择”，按键配置同步更新
|
||||
//当前操作从“通讯模式选择” 返回 至“内容选择”，按键配置同步更新
|
||||
current_operation = SET_CONTENT_CHOOSE;
|
||||
key_config_update(current_operation);
|
||||
}
|
||||
|
|
@ -181,6 +181,62 @@ void key_functions_setting(void)
|
|||
key_config_update(current_operation);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
//恢复至原本页面
|
||||
setting_contents_check(99, cursor_conf1);
|
||||
setting_items_page(ITEM_2, 1);
|
||||
tabdata.content_focus = 0;
|
||||
setting_contents_check(tabdata.content_cursor, tabdata.content_cursor_prv);
|
||||
|
||||
//当前操作从“通讯模式选择” 返回 至“内容选择”，按键配置同步更新
|
||||
current_operation = SET_CONTENT_CHOOSE;
|
||||
key_config_update(current_operation);
|
||||
}
|
||||
else
|
||||
{
|
||||
tabdata.content_focus = 0;
|
||||
setting_contents_check(cursor_conf1, cursor_conf1_prv);
|
||||
text_update_conf1(cursor_conf1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_2:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
setting_contents_check(99, cursor_conf2);
|
||||
|
||||
program_out_config1();
|
||||
|
||||
//游标调整至“下一步的位置”
|
||||
cursor_conf1 = 3;
|
||||
cursor_conf1_prv = 0;
|
||||
setting_contents_check(cursor_conf1, cursor_conf1_prv);
|
||||
|
||||
current_operation = PROG_OUT_CONFIG_1;
|
||||
key_config_update(current_operation);
|
||||
}
|
||||
else
|
||||
{
|
||||
tabdata.content_focus = 0;
|
||||
setting_contents_check(cursor_conf2, cursor_conf2_prv);
|
||||
|
||||
if((progout_data.output_mode == PROG_OUT_TRIANGLE)&&(cursor_conf2 > 2))
|
||||
{
|
||||
text_update_conf2(cursor_conf2 + 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
text_update_conf2(cursor_conf2);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
@ -289,6 +345,33 @@ void key_functions_setting(void)
|
|||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
cursor_conf1_prv = cursor_conf1;
|
||||
cursor_conf1 -= 1;
|
||||
if(cursor_conf1 > 200) cursor_conf1 = 3;
|
||||
|
||||
setting_contents_check(cursor_conf1, cursor_conf1_prv);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_2:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
cursor_conf2_prv = cursor_conf2;
|
||||
cursor_conf2 -= 1;
|
||||
if( (cursor_conf2 < 1)&&(progout_data.output_mode == PROG_OUT_STEP) ) cursor_conf2 = 4;
|
||||
if( (cursor_conf2 < 1)&&(progout_data.output_mode == PROG_OUT_TRIANGLE) ) cursor_conf2 = 5;
|
||||
|
||||
setting_contents_check(cursor_conf2, cursor_conf2_prv);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -394,6 +477,33 @@ void key_functions_setting(void)
|
|||
setting_contents_check(com_switch_cursor, com_switch_cursor_prv);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
cursor_conf1_prv = cursor_conf1;
|
||||
cursor_conf1 += 1;
|
||||
if(cursor_conf1 > 3) cursor_conf1 = 0;
|
||||
|
||||
setting_contents_check(cursor_conf1, cursor_conf1_prv);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_2:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
cursor_conf2_prv = cursor_conf2;
|
||||
cursor_conf2 += 1;
|
||||
if( (cursor_conf2 > 4)&&(progout_data.output_mode == PROG_OUT_STEP) ) cursor_conf2 = 1;
|
||||
if( (cursor_conf2 > 5)&&(progout_data.output_mode == PROG_OUT_TRIANGLE) ) cursor_conf2 = 1;
|
||||
|
||||
setting_contents_check(cursor_conf2, cursor_conf2_prv);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
@ -494,16 +604,28 @@ void key_functions_setting(void)
|
|||
|
||||
case COMMUNICATION:
|
||||
{
|
||||
//取消焦点，底色恢复正常
|
||||
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();
|
||||
|
||||
//切换至通讯选择界面
|
||||
communication_select();
|
||||
|
||||
current_operation = SET_COMMUNICATION_SWITCH;
|
||||
key_config_update(current_operation);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROGRAM_OUTPUT:
|
||||
{}
|
||||
{
|
||||
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);
|
||||
|
||||
program_out_config1();
|
||||
|
||||
current_operation = PROG_OUT_CONFIG_1;
|
||||
key_config_update(current_operation);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -575,6 +697,38 @@ void key_functions_setting(void)
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
if(cursor_conf1 != CONF1_NEXT)
|
||||
{
|
||||
tabdata.content_focus = 1;
|
||||
setting_contents_check(cursor_conf1, cursor_conf1_prv);
|
||||
text_update_conf1(cursor_conf1);
|
||||
}
|
||||
else
|
||||
{
|
||||
setting_contents_check(99, cursor_conf1);
|
||||
program_out_config2();
|
||||
current_operation = PROG_OUT_CONFIG_2;
|
||||
key_config_update(current_operation);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_2:
|
||||
{
|
||||
tabdata.content_focus = 1;
|
||||
setting_contents_check(cursor_conf2, cursor_conf2_prv);
|
||||
|
||||
uint8_t cur_temp = 0;
|
||||
if(progout_data.output_mode == PROG_OUT_TRIANGLE)
|
||||
{
|
||||
cur_temp = (cursor_conf2 <= 2)?(cursor_conf2):(cursor_conf2 + 2);
|
||||
}
|
||||
text_update_conf2(cur_temp);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
@ -682,6 +836,25 @@ void key_functions_setting(void)
|
|||
set_communication_text(com_switch_cursor);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
if(tabdata.content_focus == 1)
|
||||
{
|
||||
val_modify_conf1(-1);
|
||||
text_update_conf1(cursor_conf1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_2:
|
||||
{
|
||||
if(tabdata.content_focus == 1)
|
||||
{
|
||||
val_modify_conf2(-5);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
@ -789,6 +962,25 @@ void key_functions_setting(void)
|
|||
set_communication_text(com_switch_cursor);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_1:
|
||||
{
|
||||
if(tabdata.content_focus == 1)
|
||||
{
|
||||
val_modify_conf1(1);
|
||||
text_update_conf1(cursor_conf1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_CONFIG_2:
|
||||
{
|
||||
if(tabdata.content_focus == 1)
|
||||
{
|
||||
val_modify_conf2(5);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,533 @@
|
|||
#include "scr_setting_progam_out.h"
|
||||
|
||||
PROGRAM_OUT_DATA progout_data;
|
||||
uint8_t cursor_conf1 = 0;
|
||||
uint8_t cursor_conf1_prv = 99;
|
||||
uint8_t cursor_conf2 = 0;
|
||||
uint8_t cursor_conf2_prv = 99;
|
||||
|
||||
void program_out_init(void)
|
||||
{
|
||||
progout_data.output_unit = PROG_OUT_MA;
|
||||
progout_data.output_mode = PROG_OUT_STEP;
|
||||
progout_data.circulations = 3;
|
||||
progout_data.hold_time = 2000;
|
||||
progout_data.start_percent = 0;
|
||||
progout_data.end_percent = 100;
|
||||
progout_data.step_percent = 25;
|
||||
progout_data.rising_percent = 100;
|
||||
progout_data.falling_percent = 0;
|
||||
progout_data.period = 3000;
|
||||
}
|
||||
|
||||
void program_out_config1(void)
|
||||
{
|
||||
//启用所需组件
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_01, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_01, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_10, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_10, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_11, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_11, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_31, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_31, LV_OBJ_FLAG_HIDDEN); };
|
||||
|
||||
//隐藏多余组件
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_40, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_41, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_50, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_51, LV_OBJ_FLAG_HIDDEN);
|
||||
|
||||
//显示左列文本
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.program_out_config1[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.program_out_config1[1]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.program_out_config1[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.program_out_config1[3]);
|
||||
|
||||
//显示右列值
|
||||
text_update_conf1(CONF1_OUTPUT_UNIT);
|
||||
text_update_conf1(CONF1_OUTPUT_MODE);
|
||||
text_update_conf1(CONF1_CIRCULATIONS);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, ">");
|
||||
|
||||
//初始化游标
|
||||
cursor_conf1 = 0;
|
||||
cursor_conf1_prv = 99;
|
||||
setting_contents_check(cursor_conf1, cursor_conf1_prv);
|
||||
}
|
||||
|
||||
void val_modify_conf1(int8_t step)
|
||||
{
|
||||
switch(cursor_conf1)
|
||||
{
|
||||
case CONF1_OUTPUT_UNIT:
|
||||
{
|
||||
progout_data.output_unit += step;
|
||||
if( (1 < progout_data.output_unit)&&(progout_data.output_unit < 200) ) progout_data.output_unit = 0;
|
||||
if( progout_data.output_unit > 200 ) progout_data.output_unit = 1;
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF1_OUTPUT_MODE:
|
||||
{
|
||||
progout_data.output_mode += step;
|
||||
if( (1 < progout_data.output_mode)&&(progout_data.output_mode < 200) ) progout_data.output_mode = 0;
|
||||
if( progout_data.output_mode > 200 ) progout_data.output_mode = 1;
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF1_CIRCULATIONS:
|
||||
{
|
||||
progout_data.circulations += step;
|
||||
if( (11 < progout_data.circulations)&&(progout_data.circulations < 200) ) progout_data.circulations = 1;
|
||||
if( progout_data.circulations < 1 ) progout_data.circulations = 11;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void text_update_conf1(uint8_t con)
|
||||
{
|
||||
char str_temp[20] = {0};
|
||||
|
||||
switch (con)
|
||||
{
|
||||
case CONF1_OUTPUT_UNIT:
|
||||
{
|
||||
switch (progout_data.output_unit)
|
||||
{
|
||||
case PROG_OUT_V:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "V");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< V >");
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_MA:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "mA");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< mA >");
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF1_OUTPUT_MODE:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, text_pack.program_out_config1_val[progout_data.output_mode]);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %s >", text_pack.program_out_config1_val[progout_data.output_mode]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF1_CIRCULATIONS:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
if(progout_data.circulations <= CIRCULATIONS_MAX )
|
||||
{
|
||||
sprintf(str_temp, "%d", progout_data.circulations);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, "∞");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(progout_data.circulations <= CIRCULATIONS_MAX )
|
||||
{
|
||||
sprintf(str_temp, "< %d >", progout_data.circulations);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, "< ∞ >");
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void program_out_config2(void)
|
||||
{
|
||||
switch (progout_data.output_mode)
|
||||
{
|
||||
case PROG_OUT_STEP:
|
||||
{
|
||||
//启用所需组件
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_01, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_01, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_10, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_10, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_11, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_11, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_31, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_31, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_40, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_40, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_41, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_41, LV_OBJ_FLAG_HIDDEN); };
|
||||
|
||||
//隐藏多余组件
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_50, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_51, LV_OBJ_FLAG_HIDDEN);
|
||||
|
||||
//显示左列文本
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.program_out_config2[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.program_out_config2[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.program_out_config2[3]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.program_out_config2[4]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, text_pack.program_out_config2[1]);
|
||||
|
||||
//显示右列值
|
||||
text_update_conf2(CONF2_OUTPUT_MODE);
|
||||
text_update_conf2(CONF2_START_PERCENT);
|
||||
text_update_conf2(CONF2_END_PERCENT);
|
||||
text_update_conf2(CONF2_STEP_PERCENT);
|
||||
text_update_conf2(CONF2_HOLD_TIME);
|
||||
|
||||
//初始化游标
|
||||
cursor_conf2 = 1;
|
||||
cursor_conf2_prv = 99;
|
||||
setting_contents_check(cursor_conf2, cursor_conf2_prv);
|
||||
}
|
||||
break;
|
||||
|
||||
case PROG_OUT_TRIANGLE:
|
||||
{
|
||||
//启用所需组件
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_00, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_01, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_01, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_10, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_10, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_11, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_11, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_31, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_31, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_40, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_40, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_41, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_41, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_50, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_50, LV_OBJ_FLAG_HIDDEN); };
|
||||
if( lv_obj_has_flag(guider_ui.screen_setting_label_51, LV_OBJ_FLAG_HIDDEN) ) { lv_obj_clear_flag(guider_ui.screen_setting_label_51, LV_OBJ_FLAG_HIDDEN); };
|
||||
|
||||
//显示左列文本
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.program_out_config2[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.program_out_config2[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.program_out_config2[3]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.program_out_config2[5]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, text_pack.program_out_config2[6]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, text_pack.program_out_config2[7]);
|
||||
|
||||
//显示右列值
|
||||
text_update_conf2(CONF2_OUTPUT_MODE);
|
||||
text_update_conf2(CONF2_START_PERCENT);
|
||||
text_update_conf2(CONF2_END_PERCENT);
|
||||
text_update_conf2(CONF2_RISING_PERCENT);
|
||||
text_update_conf2(CONF2_FALLING_PERCENT);
|
||||
text_update_conf2(CONF2_PERIOD);
|
||||
|
||||
//初始化游标
|
||||
cursor_conf2 = 1;
|
||||
cursor_conf2_prv = 99;
|
||||
setting_contents_check(cursor_conf2, cursor_conf2_prv);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void text_update_conf2(uint8_t con)
|
||||
{
|
||||
char str_temp[20] = {0};
|
||||
|
||||
switch (con)
|
||||
{
|
||||
case CONF2_OUTPUT_MODE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, text_pack.program_out_config1_val[progout_data.output_mode]);
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_START_PERCENT:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d%%", progout_data.start_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d%% >", progout_data.start_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_END_PERCENT:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d%%", progout_data.end_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d%% >", progout_data.end_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_STEP_PERCENT:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d%%", progout_data.step_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d%% >", progout_data.step_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_HOLD_TIME:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d", progout_data.hold_time);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_41, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d >", progout_data.hold_time);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_41, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_RISING_PERCENT:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d%%", progout_data.rising_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d%% >", progout_data.rising_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_FALLING_PERCENT:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d%%", progout_data.falling_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_41, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d%% >", progout_data.falling_percent);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_41, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_PERIOD:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
sprintf(str_temp, "%d", progout_data.period);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_51, str_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp, "< %d >", progout_data.period);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_51, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void val_modify_conf2(int8_t step)
|
||||
{
|
||||
uint8_t cur_temp = 0;
|
||||
|
||||
//阶跃和三角波的枚举类型存在交叉
|
||||
if( (progout_data.output_mode == PROG_OUT_STEP)||(cursor_conf2 <= 2) )
|
||||
{
|
||||
cur_temp = cursor_conf2;
|
||||
}
|
||||
else
|
||||
{
|
||||
cur_temp = cursor_conf2 + 2;
|
||||
}
|
||||
|
||||
switch(cur_temp)
|
||||
{
|
||||
//0~95
|
||||
case CONF2_START_PERCENT:
|
||||
{
|
||||
progout_data.start_percent += step;
|
||||
if(progout_data.start_percent > 200) progout_data.start_percent = 0;
|
||||
if( (progout_data.end_percent - 5) <= progout_data.start_percent )
|
||||
progout_data.start_percent = progout_data.end_percent - 5;
|
||||
|
||||
text_update_conf2(cur_temp);
|
||||
|
||||
if(progout_data.output_mode == PROG_OUT_STEP)
|
||||
{
|
||||
//起点与终点的间隔较小时，步长同步变化
|
||||
if(progout_data.step_percent > (progout_data.end_percent - progout_data.start_percent))
|
||||
progout_data.step_percent = progout_data.end_percent - progout_data.start_percent;
|
||||
tabdata.content_focus = 0;
|
||||
text_update_conf2(CONF2_STEP_PERCENT);
|
||||
tabdata.content_focus = 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
//5~100
|
||||
case CONF2_END_PERCENT:
|
||||
{
|
||||
progout_data.end_percent += step;
|
||||
if(progout_data.end_percent > 100) progout_data.end_percent = 100;
|
||||
if( (progout_data.end_percent - 5) <= progout_data.start_percent )
|
||||
progout_data.end_percent = progout_data.start_percent + 5;
|
||||
|
||||
text_update_conf2(cur_temp);
|
||||
|
||||
if(progout_data.output_mode == PROG_OUT_STEP)
|
||||
{
|
||||
//起点与终点的间隔较小时，步长同步变化
|
||||
if(progout_data.step_percent > (progout_data.end_percent - progout_data.start_percent))
|
||||
progout_data.step_percent = progout_data.end_percent - progout_data.start_percent;
|
||||
tabdata.content_focus = 0;
|
||||
text_update_conf2(CONF2_STEP_PERCENT);
|
||||
tabdata.content_focus = 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_STEP_PERCENT:
|
||||
{
|
||||
progout_data.step_percent += step;
|
||||
if(progout_data.step_percent < 5) progout_data.step_percent = 5;
|
||||
if(progout_data.step_percent > (progout_data.end_percent - progout_data.start_percent))
|
||||
progout_data.step_percent = progout_data.end_percent - progout_data.start_percent;
|
||||
|
||||
text_update_conf2(cur_temp);
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_HOLD_TIME:
|
||||
{
|
||||
if( step > 0 )
|
||||
{
|
||||
progout_data.hold_time += 500;
|
||||
}
|
||||
else
|
||||
{
|
||||
progout_data.hold_time -= 500;
|
||||
}
|
||||
if(progout_data.hold_time < 500) progout_data.hold_time = 500;
|
||||
if(progout_data.hold_time > 30000) progout_data.hold_time = 30000;
|
||||
|
||||
text_update_conf2(cur_temp);
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_RISING_PERCENT:
|
||||
{
|
||||
progout_data.rising_percent += step;
|
||||
if( progout_data.rising_percent > 200 ) progout_data.rising_percent = 0;
|
||||
if( progout_data.rising_percent > 100 ) progout_data.rising_percent = 100;
|
||||
|
||||
text_update_conf2(CONF2_RISING_PERCENT);
|
||||
|
||||
//下降占比同步更新
|
||||
progout_data.falling_percent = 100 - progout_data.rising_percent;
|
||||
tabdata.content_focus = 0;
|
||||
text_update_conf2(CONF2_FALLING_PERCENT);
|
||||
tabdata.content_focus = 1;
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_FALLING_PERCENT:
|
||||
{
|
||||
progout_data.falling_percent += step;
|
||||
if( progout_data.falling_percent > 200 ) progout_data.falling_percent = 0;
|
||||
if( progout_data.falling_percent > 100 ) progout_data.falling_percent = 100;
|
||||
|
||||
text_update_conf2(CONF2_FALLING_PERCENT);
|
||||
|
||||
//上升占比同步更新
|
||||
progout_data.rising_percent = 100 - progout_data.falling_percent;
|
||||
tabdata.content_focus = 0;
|
||||
text_update_conf2(CONF2_RISING_PERCENT);
|
||||
tabdata.content_focus = 1;
|
||||
}
|
||||
break;
|
||||
|
||||
case CONF2_PERIOD:
|
||||
{
|
||||
if( step > 0 )
|
||||
{
|
||||
progout_data.period += 500;
|
||||
}
|
||||
else
|
||||
{
|
||||
progout_data.period -= 500;
|
||||
}
|
||||
if(progout_data.period < 1000) progout_data.period = 1000;
|
||||
if(progout_data.period > 10000) progout_data.period = 10000;
|
||||
|
||||
text_update_conf2(cur_temp);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
SETTING_TEXT text_pack;
|
||||
|
||||
/****************Title****************/
|
||||
//内容：设置界面，标题
|
||||
//语言：中文、英文
|
||||
static char title_text_chinese[TEXT_LENGTH_MAX] = "详细设置";
|
||||
static char title_text_english[TEXT_LENGTH_MAX] = "Detailed Setting";
|
||||
/****************Title****************/
|
||||
|
||||
|
||||
|
||||
/****************Items****************/
|
||||
//内容：设置界面，选项卡
|
||||
//语言：中文、英文
|
||||
static char items_text_chinese[ITEM_NUM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"量程设置",
|
||||
|
|
@ -17,7 +17,6 @@ static char items_text_chinese[ITEM_NUM_MAX][TEXT_LENGTH_MAX] =
|
|||
"拓展功能",
|
||||
"系统设置"
|
||||
};
|
||||
|
||||
static char items_text_english[ITEM_NUM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Range",
|
||||
|
|
@ -25,11 +24,10 @@ static char items_text_english[ITEM_NUM_MAX][TEXT_LENGTH_MAX] =
|
|||
"Extra",
|
||||
"System"
|
||||
};
|
||||
/****************Items****************/
|
||||
|
||||
|
||||
|
||||
/****************Contents****************/
|
||||
//内容：设置界面，选项卡0的内容，左列文本
|
||||
//语言：中文、英文
|
||||
static char item0_contents_text_chinese[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"电压单位",
|
||||
|
|
@ -49,7 +47,6 @@ static char item0_contents_text_chinese[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"热电阻上限℃",
|
||||
"热电阻下限℃"
|
||||
};
|
||||
|
||||
static char item0_contents_text_english[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Volt unit",
|
||||
|
|
@ -70,6 +67,9 @@ static char item0_contents_text_english[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"RTD min ℃"
|
||||
};
|
||||
|
||||
|
||||
//内容：设置界面，选项卡1的内容，左列文本
|
||||
//语言：中文、英文
|
||||
static char item1_contents_text_chinese[ITEM1_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"采样间隔",
|
||||
|
|
@ -77,7 +77,6 @@ static char item1_contents_text_chinese[ITEM1_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"颜色-输入",
|
||||
"颜色-输出"
|
||||
};
|
||||
|
||||
static char item1_contents_text_english[ITEM1_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Plot gap",
|
||||
|
|
@ -86,6 +85,9 @@ static char item1_contents_text_english[ITEM1_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"Color-output"
|
||||
};
|
||||
|
||||
|
||||
//内容：设置界面，选项卡2的内容，左列文本
|
||||
//语言：中文、英文
|
||||
static char item2_contents_text_chinese[ITEM2_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"输入记录",
|
||||
|
|
@ -93,7 +95,6 @@ static char item2_contents_text_chinese[ITEM2_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"通讯",
|
||||
"编程输出"
|
||||
};
|
||||
|
||||
static char item2_contents_text_english[ITEM2_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Input log",
|
||||
|
|
@ -102,6 +103,9 @@ static char item2_contents_text_english[ITEM2_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"Progam out"
|
||||
};
|
||||
|
||||
|
||||
//内容：设置界面，选项卡2的通讯子菜单，左列文本和右列的值
|
||||
//语言：中文、英文
|
||||
static char item2_communication_switch_chinese[ITEM2_COMMUNICATION_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"HART通讯",
|
||||
|
|
@ -109,15 +113,6 @@ static char item2_communication_switch_chinese[ITEM2_COMMUNICATION_MAX][TEXT_LEN
|
|||
"Modbus通讯",
|
||||
"--配置"
|
||||
};
|
||||
|
||||
static char item2_communication_switch_value_chinese[ITEM2_COMMUNICATION_VALUE_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"开",
|
||||
"关",
|
||||
"主",
|
||||
"从"
|
||||
};
|
||||
|
||||
static char item2_communication_switch_english[ITEM2_COMMUNICATION_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"HART",
|
||||
|
|
@ -125,7 +120,13 @@ static char item2_communication_switch_english[ITEM2_COMMUNICATION_MAX][TEXT_LEN
|
|||
"Modbus",
|
||||
"--Config"
|
||||
};
|
||||
|
||||
static char item2_communication_switch_value_chinese[ITEM2_COMMUNICATION_VALUE_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"开",
|
||||
"关",
|
||||
"主",
|
||||
"从"
|
||||
};
|
||||
static char item2_communication_switch_value_english[ITEM2_COMMUNICATION_VALUE_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"ON",
|
||||
|
|
@ -134,6 +135,59 @@ static char item2_communication_switch_value_english[ITEM2_COMMUNICATION_VALUE_M
|
|||
"Slave"
|
||||
};
|
||||
|
||||
|
||||
//内容：设置界面，选项卡2的编程输出子菜单，左列文本和右列的值
|
||||
//语言：中文、英文
|
||||
static char item2_program_out_config1_chinese[ITEM2_PROGRAM_OUT_CONFIG1_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"输出方式",
|
||||
"输出模式",
|
||||
"循环次数",
|
||||
"下一步"
|
||||
};
|
||||
static char item2_program_out_config1_english[ITEM2_PROGRAM_OUT_CONFIG1_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Output unit",
|
||||
"Output mode",
|
||||
"Circulation",
|
||||
"Next"
|
||||
};
|
||||
static char item2_program_out_config1_value_chinese[ITEM2_PROGRAM_OUT_CONFIG1_VALUE_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"阶跃",
|
||||
"三角波"
|
||||
};
|
||||
static char item2_program_out_config1_value_english[ITEM2_PROGRAM_OUT_CONFIG1_VALUE_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Step",
|
||||
"Triangle"
|
||||
};
|
||||
static char item2_program_out_config2_chinese[ITEM2_PROGRAM_OUT_CONFIG2_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"输出模式",
|
||||
"保持时间",
|
||||
"起点",
|
||||
"终点",
|
||||
"步长",
|
||||
"上升占比",
|
||||
"下降占比",
|
||||
"周期"
|
||||
};
|
||||
static char item2_program_out_config2_english[ITEM2_PROGRAM_OUT_CONFIG2_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Output Mode",
|
||||
"Hold time",
|
||||
"Start",
|
||||
"End",
|
||||
"Step Size",
|
||||
"Rising",
|
||||
"Falling",
|
||||
"Period"
|
||||
};
|
||||
|
||||
|
||||
//内容：设置界面，选项卡3的内容，左列文本和右列的值
|
||||
//语言：中文、英文
|
||||
static char item3_contents_text_chinese[ITEM3_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"照明",
|
||||
|
|
@ -141,7 +195,6 @@ static char item3_contents_text_chinese[ITEM3_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"配置保存",
|
||||
"配置复位"
|
||||
};
|
||||
|
||||
static char item3_contents_text_english[ITEM3_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Lighting",
|
||||
|
|
@ -149,7 +202,6 @@ static char item3_contents_text_english[ITEM3_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
|||
"Config save",
|
||||
"Config reset"
|
||||
};
|
||||
|
||||
static char item3_contents_value_chinese[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"开",
|
||||
|
|
@ -163,7 +215,6 @@ static char item3_contents_value_chinese[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX]
|
|||
"复位中",
|
||||
"已复位",
|
||||
};
|
||||
|
||||
static char item3_contents_value_english[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"ON",
|
||||
|
|
@ -177,9 +228,10 @@ static char item3_contents_value_english[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX]
|
|||
"resetting",
|
||||
"已复位",
|
||||
};
|
||||
/****************Contents****************/
|
||||
|
||||
/****************Modbus Master****************/
|
||||
|
||||
//内容：Modbus主站配置界面，标题
|
||||
//语言：中文、英文
|
||||
static char modbus_master_config_title_chinese[TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Modbus 主设备"
|
||||
|
|
@ -190,6 +242,9 @@ static char modbus_master_config_title_english[TEXT_LENGTH_MAX] =
|
|||
"Modbus Master"
|
||||
};
|
||||
|
||||
|
||||
//内容：Modbus主站配置界面，左列文本
|
||||
//语言：中文、英文
|
||||
static char modbus_master_config_item_chinese[MODBUS_MASTER_CONFIG_ITEM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"从设备地址",
|
||||
|
|
@ -201,7 +256,6 @@ static char modbus_master_config_item_chinese[MODBUS_MASTER_CONFIG_ITEM_MAX][TEX
|
|||
"校验",
|
||||
"下一步"
|
||||
};
|
||||
|
||||
static char modbus_master_config_item_english[MODBUS_MASTER_CONFIG_ITEM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Slave id",
|
||||
|
|
@ -214,6 +268,9 @@ static char modbus_master_config_item_english[MODBUS_MASTER_CONFIG_ITEM_MAX][TEX
|
|||
"Next"
|
||||
};
|
||||
|
||||
|
||||
//内容：Modbus主站收发界面，标题文本
|
||||
//语言：中文、英文
|
||||
static char modbus_master_trx_item_chinese[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"(HEX)数据",
|
||||
|
|
@ -221,7 +278,6 @@ static char modbus_master_trx_item_chinese[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENG
|
|||
"设置",
|
||||
"发送"
|
||||
};
|
||||
|
||||
static char modbus_master_trx_item_english[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"(HEX)Data",
|
||||
|
|
@ -229,11 +285,9 @@ static char modbus_master_trx_item_english[MODBUS_MASTER_TRX_ITEM_MAX][TEXT_LENG
|
|||
"Set",
|
||||
"Send"
|
||||
};
|
||||
/****************Modbus Master****************/
|
||||
|
||||
|
||||
|
||||
//设置界面语言切换
|
||||
//语言切换
|
||||
void setting_laguage_switch(LANGUAGES lan)
|
||||
{
|
||||
switch (lan)
|
||||
|
|
@ -249,9 +303,14 @@ 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));
|
||||
|
||||
memcpy(text_pack.program_out_config1, item2_program_out_config1_chinese, sizeof(text_pack.program_out_config1));
|
||||
memcpy(text_pack.program_out_config1_val, item2_program_out_config1_value_chinese, sizeof(text_pack.program_out_config1_val));
|
||||
memcpy(text_pack.program_out_config2, item2_program_out_config2_chinese, sizeof(text_pack.program_out_config2));
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -266,9 +325,14 @@ 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));
|
||||
|
||||
memcpy(text_pack.program_out_config1, item2_program_out_config1_english, sizeof(text_pack.program_out_config1));
|
||||
memcpy(text_pack.program_out_config1_val, item2_program_out_config1_value_english, sizeof(text_pack.program_out_config1_val));
|
||||
memcpy(text_pack.program_out_config2, item2_program_out_config2_english, sizeof(text_pack.program_out_config2));
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -758,11 +758,31 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0xb6, 0x0, 0x58, 0x0, 0x0, 0x0, 0x8,
|
||||
0x87, 0x93,
|
||||
|
||||
/* U+221E "∞" */
|
||||
0x5, 0xa9, 0xa3, 0x0, 0x3a, 0x9a, 0x50, 0x38,
|
||||
0x0, 0xa, 0x44, 0xa0, 0x0, 0x83, 0x81, 0x0,
|
||||
0x0, 0xbb, 0x0, 0x0, 0x18, 0x82, 0x0, 0x1,
|
||||
0xbb, 0x10, 0x0, 0x28, 0x2a, 0x0, 0x2b, 0x22,
|
||||
0xb2, 0x0, 0xa2, 0x2, 0x99, 0x81, 0x0, 0x18,
|
||||
0x99, 0x20,
|
||||
|
||||
/* U+4E00 "一" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0xb, 0x80, 0x17, 0x77,
|
||||
0x77, 0x77, 0x77, 0x77, 0x71,
|
||||
|
||||
/* U+4E09 "三" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0x20, 0x3,
|
||||
0x66, 0x66, 0x66, 0x66, 0x66, 0x40, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x20, 0x0, 0x0, 0x36, 0x66, 0x66, 0x6a,
|
||||
0xd2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x26, 0x66,
|
||||
0x66, 0x66, 0x66, 0x6a, 0xe3,
|
||||
|
||||
/* U+4E0A "上" */
|
||||
0x0, 0x0, 0x0, 0x72, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
|
@ -963,6 +983,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x3, 0xe7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+5347 "升" */
|
||||
0x0, 0x0, 0x0, 0x43, 0x8, 0x20, 0x0, 0x0,
|
||||
0x1, 0x6c, 0xa6, 0xe, 0x0, 0x0, 0x4, 0x66,
|
||||
0xc3, 0x0, 0xe, 0x0, 0x0, 0x0, 0x0, 0xb3,
|
||||
0x0, 0xe, 0x0, 0x0, 0x0, 0x0, 0xb3, 0x0,
|
||||
0xe, 0x0, 0x0, 0x0, 0x0, 0xb3, 0x0, 0xe,
|
||||
0x2, 0x80, 0x26, 0x66, 0xd8, 0x66, 0x6f, 0x67,
|
||||
0x72, 0x0, 0x0, 0xd1, 0x0, 0xe, 0x0, 0x0,
|
||||
0x0, 0x0, 0xd0, 0x0, 0xe, 0x0, 0x0, 0x0,
|
||||
0x4, 0x90, 0x0, 0xe, 0x0, 0x0, 0x0, 0xb,
|
||||
0x10, 0x0, 0xe, 0x0, 0x0, 0x0, 0x74, 0x0,
|
||||
0x0, 0xe, 0x0, 0x0, 0x5, 0x20, 0x0, 0x0,
|
||||
0xd, 0x0, 0x0,
|
||||
|
||||
/* U+5355 "单" */
|
||||
0x0, 0x3, 0x20, 0x0, 0x27, 0x0, 0x0, 0x0,
|
||||
0xb, 0x50, 0xa, 0x60, 0x0, 0x0, 0x0, 0x3c,
|
||||
|
|
@ -976,6 +1010,17 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0xd0, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+5360 "占" */
|
||||
0x0, 0x0, 0xa1, 0x0, 0x0, 0x0, 0x0, 0xe,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x8,
|
||||
0x0, 0x0, 0xf, 0x66, 0x67, 0x95, 0x0, 0x0,
|
||||
0xe0, 0x0, 0x0, 0x0, 0x0, 0xe, 0x0, 0x0,
|
||||
0x0, 0x30, 0x0, 0xe0, 0x0, 0x50, 0xc, 0x86,
|
||||
0x66, 0x66, 0x6e, 0x40, 0xc2, 0x0, 0x0, 0x0,
|
||||
0xd1, 0xc, 0x20, 0x0, 0x0, 0xd, 0x10, 0xc2,
|
||||
0x0, 0x0, 0x0, 0xd1, 0xc, 0x86, 0x66, 0x66,
|
||||
0x6e, 0x10, 0xc1, 0x0, 0x0, 0x0, 0xc1, 0x0,
|
||||
|
||||
/* U+538B "压" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x10, 0x0,
|
||||
0xb6, 0x66, 0x66, 0x66, 0x6a, 0xb0, 0x0, 0xd0,
|
||||
|
|
@ -1006,6 +1051,19 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x4a, 0xc2, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+5468 "周" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xb,
|
||||
0x76, 0x66, 0x66, 0x66, 0xf5, 0x0, 0xc1, 0x0,
|
||||
0xa3, 0x0, 0xe, 0x0, 0xc, 0x26, 0x6d, 0x77,
|
||||
0xc0, 0xe0, 0x0, 0xc1, 0x0, 0xc1, 0x0, 0xe,
|
||||
0x0, 0xc, 0x46, 0x6d, 0x76, 0xd3, 0xe0, 0x0,
|
||||
0xe1, 0x0, 0x0, 0x0, 0xe, 0x0, 0xe, 0x9,
|
||||
0x76, 0x68, 0xa0, 0xe0, 0x0, 0xd0, 0xb2, 0x0,
|
||||
0x2a, 0xe, 0x0, 0x2a, 0xb, 0x20, 0x2, 0xa0,
|
||||
0xe0, 0x6, 0x40, 0xb8, 0x66, 0x8a, 0xe, 0x0,
|
||||
0x90, 0x4, 0x0, 0x0, 0x54, 0xe0, 0x31, 0x0,
|
||||
0x0, 0x0, 0x0, 0x99, 0x0,
|
||||
|
||||
/* U+547D "命" */
|
||||
0x0, 0x0, 0x0, 0x89, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x4, 0xc6, 0x60, 0x0, 0x0, 0x0, 0x0,
|
||||
|
|
@ -1207,6 +1265,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x1d, 0x0, 0x0, 0x16, 0x0, 0x0, 0x0,
|
||||
0x1c, 0x0, 0x0,
|
||||
|
||||
/* U+5F0F "式" */
|
||||
0x0, 0x0, 0x0, 0x1, 0x91, 0x30, 0x0, 0x0,
|
||||
0x0, 0x0, 0x1, 0xe0, 0x4c, 0x10, 0x0, 0x0,
|
||||
0x0, 0x0, 0xf0, 0x3, 0x50, 0x6, 0x66, 0x66,
|
||||
0x66, 0xf6, 0x67, 0xb3, 0x0, 0x0, 0x0, 0x0,
|
||||
0xd1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0xb3,
|
||||
0x0, 0x0, 0x3, 0x66, 0xc6, 0x96, 0x86, 0x0,
|
||||
0x0, 0x0, 0x0, 0xe0, 0x0, 0x4b, 0x0, 0x0,
|
||||
0x0, 0x0, 0xe0, 0x0, 0xe, 0x10, 0x0, 0x0,
|
||||
0x0, 0xe0, 0x0, 0x7, 0x90, 0x0, 0x0, 0x0,
|
||||
0xe6, 0x75, 0x0, 0xe5, 0x14, 0x6, 0xac, 0x93,
|
||||
0x0, 0x0, 0x3e, 0xb3, 0x6, 0x40, 0x0, 0x0,
|
||||
0x0, 0x3, 0xd6, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+5F55 "录" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x5,
|
||||
0x66, 0x66, 0x66, 0xc6, 0x0, 0x0, 0x0, 0x0,
|
||||
|
|
@ -1221,6 +1294,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x2a, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0,
|
||||
|
||||
/* U+5FAA "循" */
|
||||
0x0, 0x18, 0x10, 0x0, 0x0, 0x57, 0x0, 0x0,
|
||||
0xa8, 0x5, 0x47, 0xae, 0x95, 0x10, 0x6, 0x80,
|
||||
0xe, 0x10, 0xe, 0x0, 0x0, 0x45, 0xb, 0x3e,
|
||||
0x66, 0x6e, 0x6b, 0xa0, 0x0, 0x5c, 0xe, 0x0,
|
||||
0xd, 0x0, 0x0, 0x0, 0xd3, 0xe, 0xa, 0x6e,
|
||||
0x6b, 0x30, 0x9, 0xf1, 0xe, 0xd, 0x0, 0xc,
|
||||
0x10, 0x43, 0xd1, 0xe, 0xe, 0x66, 0x6e, 0x10,
|
||||
0x0, 0xd1, 0x1c, 0xd, 0x0, 0xc, 0x10, 0x0,
|
||||
0xd1, 0x39, 0xe, 0x66, 0x6e, 0x10, 0x0, 0xd1,
|
||||
0x64, 0xd, 0x0, 0xc, 0x10, 0x0, 0xd1, 0x80,
|
||||
0xe, 0x66, 0x6e, 0x10, 0x0, 0xc3, 0x30, 0xc,
|
||||
0x0, 0xb, 0x0,
|
||||
|
||||
/* U+62D3 "拓" */
|
||||
0x0, 0x29, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0,
|
||||
0x2a, 0x6, 0x66, 0x66, 0x66, 0xe7, 0x0, 0x2a,
|
||||
|
|
@ -1235,6 +1322,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xf, 0x66, 0x66, 0xe0, 0x3, 0xd6, 0x0, 0xd,
|
||||
0x0, 0x0, 0xd0,
|
||||
|
||||
/* U+6301 "持" */
|
||||
0x0, 0x19, 0x0, 0x0, 0x9, 0x10, 0x0, 0x0,
|
||||
0x2c, 0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0x2c,
|
||||
0x0, 0x66, 0x6e, 0x6a, 0xb0, 0x6, 0x7d, 0x9a,
|
||||
0x0, 0xe, 0x0, 0x0, 0x0, 0x2c, 0x0, 0x0,
|
||||
0xe, 0x0, 0x72, 0x0, 0x2c, 0x5, 0x66, 0x67,
|
||||
0x76, 0x75, 0x0, 0x2d, 0x74, 0x0, 0x0, 0x69,
|
||||
0x10, 0x2b, 0xdc, 0x4, 0x66, 0x66, 0xaa, 0xb6,
|
||||
0x15, 0x2c, 0x0, 0x31, 0x0, 0x67, 0x0, 0x0,
|
||||
0x2c, 0x0, 0x2d, 0x20, 0x67, 0x0, 0x0, 0x2c,
|
||||
0x0, 0x7, 0x50, 0x67, 0x0, 0x1, 0x3c, 0x0,
|
||||
0x0, 0x10, 0x87, 0x0, 0x2, 0xd8, 0x0, 0x0,
|
||||
0x28, 0xf3, 0x0, 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,
|
||||
|
|
@ -1280,6 +1382,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x4b, 0xd2, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+65B9 "方" */
|
||||
0x0, 0x0, 0x1, 0x70, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x5c, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x9, 0x0, 0x2, 0x70, 0x26, 0x66, 0x7e,
|
||||
0x76, 0x66, 0x67, 0x71, 0x0, 0x0, 0x2f, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x3d, 0x0, 0x0,
|
||||
0x50, 0x0, 0x0, 0x0, 0x5d, 0x66, 0x66, 0xe4,
|
||||
0x0, 0x0, 0x0, 0x97, 0x0, 0x0, 0xe0, 0x0,
|
||||
0x0, 0x0, 0xd2, 0x0, 0x0, 0xe0, 0x0, 0x0,
|
||||
0x5, 0xb0, 0x0, 0x2, 0xc0, 0x0, 0x0, 0xc,
|
||||
0x20, 0x0, 0x5, 0xa0, 0x0, 0x0, 0x93, 0x0,
|
||||
0x23, 0x2b, 0x50, 0x0, 0x6, 0x20, 0x0, 0x2,
|
||||
0xea, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+65F6 "时" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x7, 0x20, 0xa, 0x66,
|
||||
0xc3, 0x0, 0x0, 0xd1, 0x0, 0xd0, 0xd, 0x0,
|
||||
|
|
@ -1320,6 +1437,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0xe0, 0xc8, 0x68, 0xd6, 0x6e, 0x66, 0xf0,
|
||||
0xb1, 0x0, 0x0, 0x0, 0x0, 0xd0,
|
||||
|
||||
/* U+671F "期" */
|
||||
0x0, 0x70, 0x6, 0x30, 0x10, 0x0, 0x30, 0x0,
|
||||
0xd0, 0xb, 0x30, 0xb7, 0x66, 0xf2, 0x16, 0xe6,
|
||||
0x6d, 0xb7, 0xb2, 0x0, 0xd0, 0x0, 0xd0, 0xb,
|
||||
0x20, 0xb2, 0x0, 0xd0, 0x0, 0xe6, 0x6d, 0x20,
|
||||
0xb8, 0x66, 0xd0, 0x0, 0xd0, 0xb, 0x20, 0xc2,
|
||||
0x0, 0xd0, 0x0, 0xe6, 0x6d, 0x20, 0xc1, 0x0,
|
||||
0xd0, 0x0, 0xd0, 0xb, 0x20, 0xe6, 0x55, 0xd0,
|
||||
0x36, 0xe6, 0x6d, 0xb9, 0xe0, 0x0, 0xd0, 0x0,
|
||||
0x43, 0x2, 0x1, 0xb0, 0x0, 0xd0, 0x0, 0xd3,
|
||||
0x9, 0x66, 0x60, 0x0, 0xd0, 0x7, 0x60, 0x1,
|
||||
0xb9, 0x0, 0x44, 0xd0, 0x34, 0x0, 0x0, 0x51,
|
||||
0x0, 0xa, 0x70,
|
||||
|
||||
/* U+672A "未" */
|
||||
0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0xb3, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
|
@ -1364,6 +1495,36 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+6A21 "模" */
|
||||
0x0, 0x7, 0x0, 0x4, 0x50, 0x51, 0x0, 0x0,
|
||||
0x1c, 0x0, 0x8, 0x50, 0xb0, 0x80, 0x0, 0x1c,
|
||||
0x25, 0x6b, 0x96, 0xd6, 0x61, 0x15, 0x7d, 0x97,
|
||||
0x88, 0x76, 0x89, 0x40, 0x0, 0x7c, 0x0, 0xe0,
|
||||
0x0, 0xa, 0x30, 0x0, 0xbd, 0x20, 0xe6, 0x66,
|
||||
0x6c, 0x30, 0x0, 0xec, 0xa3, 0xe0, 0x0, 0xa,
|
||||
0x30, 0x5, 0x8c, 0x36, 0xe6, 0x8a, 0x6c, 0x30,
|
||||
0xa, 0x2c, 0x0, 0x70, 0x5a, 0x3, 0x50, 0x32,
|
||||
0x1c, 0x6, 0x66, 0xbc, 0x67, 0xa2, 0x0, 0x1c,
|
||||
0x0, 0x1, 0xd3, 0x70, 0x0, 0x0, 0x1c, 0x0,
|
||||
0x3b, 0x30, 0x6c, 0x51, 0x0, 0x1b, 0x36, 0x50,
|
||||
0x0, 0x4, 0xc3, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+6B21 "次" */
|
||||
0x0, 0x0, 0x0, 0x39, 0x0, 0x0, 0x0, 0x7,
|
||||
0x80, 0x0, 0x89, 0x0, 0x0, 0x0, 0x0, 0xc6,
|
||||
0x0, 0xd3, 0x0, 0x0, 0x50, 0x0, 0x11, 0x62,
|
||||
0xc6, 0x66, 0x67, 0xf2, 0x0, 0x5, 0x29, 0x30,
|
||||
0x51, 0x6, 0x70, 0x0, 0x9, 0x28, 0x0, 0xf0,
|
||||
0x9, 0x0, 0x0, 0x73, 0x60, 0x2, 0xf2, 0x2,
|
||||
0x0, 0x1, 0xb0, 0x0, 0x6, 0x96, 0x0, 0x0,
|
||||
0x2b, 0x80, 0x0, 0xb, 0x49, 0x0, 0x0, 0x6,
|
||||
0x80, 0x0, 0x3b, 0x6, 0x60, 0x0, 0x5, 0xa0,
|
||||
0x1, 0xb1, 0x0, 0xd5, 0x0, 0x6, 0xb0, 0x3a,
|
||||
0x10, 0x0, 0x3f, 0xa1, 0x2, 0x56, 0x50, 0x0,
|
||||
0x0, 0x3, 0xc2, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+6B65 "步" */
|
||||
0x0, 0x0, 0x0, 0x94, 0x0, 0x0, 0x0, 0x0,
|
||||
0x9, 0x10, 0xb2, 0x0, 0x10, 0x0, 0x0, 0xe,
|
||||
|
|
@ -1379,6 +1540,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+6BD4 "比" */
|
||||
0x7, 0x30, 0x0, 0x17, 0x0, 0x0, 0x0, 0xe0,
|
||||
0x0, 0x2, 0xb0, 0x0, 0x0, 0xe, 0x0, 0x0,
|
||||
0x2b, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x2, 0xb0,
|
||||
0x4, 0x70, 0xe, 0x0, 0x41, 0x2b, 0x5, 0xe6,
|
||||
0x0, 0xe6, 0x6a, 0x83, 0xb7, 0xa1, 0x0, 0xe,
|
||||
0x0, 0x0, 0x2d, 0x20, 0x0, 0x0, 0xe0, 0x0,
|
||||
0x2, 0xb0, 0x0, 0x0, 0xe, 0x0, 0x0, 0x2b,
|
||||
0x0, 0x0, 0x0, 0xe0, 0x0, 0x2, 0xb0, 0x0,
|
||||
0x11, 0xe, 0x0, 0x24, 0x3b, 0x0, 0x4, 0x20,
|
||||
0xe7, 0xa5, 0x2, 0xc2, 0x22, 0x93, 0x2c, 0x50,
|
||||
0x0, 0x8, 0xbb, 0xba, 0x40, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0,
|
||||
|
||||
/* U+6CE2 "波" */
|
||||
0x1, 0x61, 0x0, 0x0, 0x74, 0x0, 0x0, 0x0,
|
||||
0x4d, 0x0, 0x0, 0xb2, 0x0, 0x0, 0x0, 0x3,
|
||||
0x19, 0x66, 0xd8, 0x67, 0xb0, 0x5, 0x0, 0x5c,
|
||||
0x10, 0xb2, 0x7, 0x70, 0x5, 0xb4, 0x2c, 0x10,
|
||||
0xb2, 0x4, 0x0, 0x0, 0x38, 0xd, 0x76, 0xd8,
|
||||
0x6b, 0x20, 0x0, 0x27, 0xe, 0x5, 0x0, 0x4c,
|
||||
0x0, 0x0, 0x92, 0xe, 0x7, 0x0, 0xa5, 0x0,
|
||||
0x1, 0xd0, 0xc, 0x3, 0x63, 0xc0, 0x0, 0x8,
|
||||
0xb0, 0x29, 0x0, 0x9d, 0x20, 0x0, 0x1, 0xd0,
|
||||
0x63, 0x1, 0xbd, 0x70, 0x0, 0x2, 0xf0, 0x90,
|
||||
0x49, 0x11, 0xbd, 0x61, 0x1, 0xc3, 0x56, 0x30,
|
||||
0x0, 0x5, 0xc3, 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,
|
||||
|
|
@ -1470,6 +1660,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xb3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa2,
|
||||
0x0, 0x0, 0x0,
|
||||
|
||||
/* U+73AF "环" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x30, 0x0,
|
||||
0x66, 0x6c, 0x95, 0x66, 0x97, 0x6b, 0x60, 0x0,
|
||||
0x3a, 0x0, 0x0, 0xe, 0x20, 0x0, 0x0, 0x3,
|
||||
0xa0, 0x0, 0x4, 0xc0, 0x0, 0x0, 0x0, 0x3a,
|
||||
0x10, 0x0, 0xab, 0x0, 0x0, 0x0, 0x58, 0xcb,
|
||||
0x80, 0x1f, 0xc4, 0x0, 0x0, 0x0, 0x3a, 0x0,
|
||||
0x8, 0x7c, 0x4a, 0x0, 0x0, 0x3, 0xa0, 0x2,
|
||||
0xa2, 0xc0, 0x8a, 0x0, 0x0, 0x3a, 0x44, 0x91,
|
||||
0x1c, 0x0, 0xe3, 0x0, 0x8, 0xd4, 0x62, 0x1,
|
||||
0xc0, 0x6, 0x20, 0xd, 0x70, 0x12, 0x0, 0x1c,
|
||||
0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x1, 0xc0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+7535 "电" */
|
||||
0x0, 0x0, 0xb3, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0xd0, 0x0, 0x0, 0x0, 0xa6, 0x66, 0xe7, 0x66,
|
||||
|
|
@ -1554,6 +1759,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x3, 0xda, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+7EC8 "终" */
|
||||
0x0, 0x35, 0x0, 0x5, 0x50, 0x0, 0x0, 0x0,
|
||||
0xb6, 0x0, 0xe, 0x40, 0x3, 0x0, 0x2, 0xb0,
|
||||
0x10, 0x4d, 0x66, 0x7f, 0x50, 0x9, 0x11, 0xe3,
|
||||
0xa8, 0x0, 0x6a, 0x0, 0x5c, 0x9c, 0x75, 0x61,
|
||||
0x82, 0xd1, 0x0, 0x14, 0x4b, 0x5, 0x0, 0x6e,
|
||||
0x30, 0x0, 0x1, 0xa0, 0x0, 0x2, 0xb8, 0xc3,
|
||||
0x0, 0x1a, 0x56, 0x50, 0x68, 0x20, 0x4d, 0xd4,
|
||||
0x1d, 0x72, 0x5, 0x10, 0x6c, 0x20, 0x60, 0x0,
|
||||
0x0, 0x11, 0x0, 0x5, 0xa0, 0x0, 0x3, 0x7a,
|
||||
0x50, 0x28, 0x82, 0x0, 0x0, 0x2e, 0x70, 0x0,
|
||||
0x0, 0x3c, 0xb2, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x7b, 0x0, 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,
|
||||
|
|
@ -1655,6 +1875,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0xd0, 0x1d, 0x50, 0x26, 0x86, 0x68, 0x66,
|
||||
0x86, 0x68, 0x83,
|
||||
|
||||
/* U+89D2 "角" */
|
||||
0x0, 0x0, 0x3b, 0x10, 0x0, 0x0, 0x0, 0x0,
|
||||
0xc, 0xa6, 0x67, 0xa0, 0x0, 0x0, 0x7, 0x80,
|
||||
0x0, 0xc5, 0x0, 0x0, 0x4, 0xb0, 0x0, 0x64,
|
||||
0x0, 0x50, 0x3, 0x6f, 0x66, 0x6e, 0x66, 0x6f,
|
||||
0x20, 0x20, 0xe0, 0x0, 0xe0, 0x0, 0xe0, 0x0,
|
||||
0xf, 0x66, 0x6e, 0x66, 0x6e, 0x0, 0x0, 0xd0,
|
||||
0x0, 0xe0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0xe,
|
||||
0x0, 0xe, 0x0, 0x3, 0xc6, 0x66, 0xe6, 0x66,
|
||||
0xe0, 0x0, 0x74, 0x0, 0xe, 0x0, 0xe, 0x0,
|
||||
0xb, 0x0, 0x0, 0xe0, 0x0, 0xe0, 0x7, 0x20,
|
||||
0x0, 0xc, 0x5, 0xcd, 0x0, 0x10, 0x0, 0x0,
|
||||
0x0, 0x3, 0x10,
|
||||
|
||||
/* U+8A00 "言" */
|
||||
0x0, 0x0, 0x2, 0x70, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x96, 0x0, 0x0, 0x10, 0x26, 0x66,
|
||||
|
|
@ -1757,6 +1991,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xdd, 0xdd, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+8DC3 "跃" */
|
||||
0x1, 0x0, 0x1, 0x0, 0x0, 0x27, 0x0, 0xa,
|
||||
0x86, 0x9b, 0x3, 0x7c, 0xb8, 0x30, 0xa, 0x30,
|
||||
0x48, 0x33, 0x4c, 0x0, 0x0, 0xa, 0x30, 0x48,
|
||||
0x0, 0x2b, 0x0, 0x0, 0xa, 0x87, 0x98, 0x0,
|
||||
0x3b, 0x0, 0x0, 0x6, 0x1d, 0x23, 0x0, 0x3a,
|
||||
0x1, 0x90, 0x3, 0xd, 0x2, 0x66, 0x9e, 0x66,
|
||||
0x61, 0xc, 0xd, 0x8c, 0x0, 0x7c, 0x0, 0x0,
|
||||
0xc, 0xd, 0x0, 0x0, 0xb4, 0x60, 0x0, 0xc,
|
||||
0xd, 0x0, 0x1, 0xb0, 0xa0, 0x0, 0xc, 0xd,
|
||||
0x65, 0xa, 0x20, 0x5a, 0x0, 0x3e, 0xd9, 0x20,
|
||||
0x84, 0x0, 0xb, 0xa1, 0x16, 0x0, 0x17, 0x10,
|
||||
0x0, 0x1, 0xb3, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+8F93 "输" */
|
||||
0x0, 0x44, 0x0, 0x0, 0x86, 0x0, 0x0, 0x0,
|
||||
0x94, 0x0, 0x3, 0xd7, 0x0, 0x0, 0x3, 0xd4,
|
||||
|
|
@ -1844,6 +2093,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xd8, 0x66, 0x66, 0x20, 0x16, 0x66, 0x66, 0xd8,
|
||||
0x66, 0x69, 0xd1,
|
||||
|
||||
/* U+957F "长" */
|
||||
0x0, 0x6, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0xb, 0x20, 0x0, 0x9, 0xb0, 0x0, 0x0, 0xb,
|
||||
0x20, 0x1, 0xc9, 0x0, 0x0, 0x0, 0xb, 0x20,
|
||||
0x6b, 0x30, 0x0, 0x0, 0x0, 0xb, 0x68, 0x30,
|
||||
0x0, 0x0, 0x0, 0x0, 0xb, 0x40, 0x0, 0x0,
|
||||
0x7, 0x40, 0x26, 0x6d, 0x86, 0x96, 0x66, 0x66,
|
||||
0x60, 0x0, 0xb, 0x20, 0x24, 0x0, 0x0, 0x0,
|
||||
0x0, 0xb, 0x20, 0x9, 0x10, 0x0, 0x0, 0x0,
|
||||
0xb, 0x20, 0x1, 0xc1, 0x0, 0x0, 0x0, 0xb,
|
||||
0x20, 0x13, 0x3d, 0x60, 0x0, 0x0, 0xd, 0x9a,
|
||||
0x60, 0x2, 0xcd, 0x70, 0x0, 0xd, 0x70, 0x0,
|
||||
0x0, 0x5, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+95F4 "间" */
|
||||
0x4, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb,
|
||||
0x63, 0x66, 0x66, 0x67, 0xe2, 0x2b, 0x38, 0x0,
|
||||
|
|
@ -1857,6 +2121,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xb0, 0x20, 0x0, 0x1, 0x33, 0xd0, 0x2a, 0x0,
|
||||
0x0, 0x0, 0x2, 0xd7, 0x0,
|
||||
|
||||
/* U+9636 "阶" */
|
||||
0x20, 0x3, 0x0, 0x6, 0x40, 0x0, 0xd, 0x67,
|
||||
0xf5, 0x0, 0xa6, 0x0, 0x0, 0xd0, 0x4a, 0x0,
|
||||
0x92, 0x18, 0x0, 0xd, 0x8, 0x20, 0x64, 0x0,
|
||||
0x6a, 0x10, 0xd0, 0x70, 0x54, 0x0, 0x0, 0x6e,
|
||||
0x3d, 0x8, 0x41, 0x1d, 0x0, 0xe1, 0x30, 0xd0,
|
||||
0x2a, 0x1, 0xd0, 0xe, 0x0, 0xd, 0x0, 0xd0,
|
||||
0x1c, 0x0, 0xe0, 0x0, 0xd0, 0xc, 0x32, 0xb0,
|
||||
0xe, 0x0, 0xd, 0x2b, 0xe0, 0x67, 0x0, 0xe0,
|
||||
0x0, 0xd0, 0x21, 0xb, 0x20, 0xe, 0x0, 0xd,
|
||||
0x0, 0x6, 0x50, 0x0, 0xe0, 0x0, 0xc0, 0x5,
|
||||
0x30, 0x0, 0xd, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0,
|
||||
|
||||
/* U+963B "阻" */
|
||||
0x20, 0x4, 0x0, 0x0, 0x0, 0x10, 0xe, 0x67,
|
||||
0xf3, 0xc6, 0x66, 0x6f, 0x20, 0xe0, 0x69, 0xd,
|
||||
|
|
@ -1870,6 +2148,19 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x0, 0xd0, 0x0, 0xe, 0x40, 0xc0, 0x6,
|
||||
0x69, 0x66, 0x66, 0x99, 0x40,
|
||||
|
||||
/* U+964D "降" */
|
||||
0x30, 0x4, 0x0, 0x85, 0x0, 0x0, 0xd, 0x68,
|
||||
0xf2, 0x1f, 0x86, 0x7b, 0x0, 0xd0, 0x77, 0x9,
|
||||
0xa0, 0xb, 0x60, 0xd, 0xa, 0x15, 0x70, 0x98,
|
||||
0x80, 0x0, 0xd1, 0x60, 0x40, 0x9, 0xe7, 0x0,
|
||||
0xd, 0x17, 0x0, 0x59, 0x32, 0x7e, 0xb3, 0xd0,
|
||||
0x66, 0x41, 0x0, 0xe0, 0x25, 0xd, 0x1, 0xb2,
|
||||
0x66, 0x6e, 0x6a, 0x60, 0xd0, 0xe, 0x9, 0x10,
|
||||
0xe0, 0x0, 0xd, 0x3c, 0xc2, 0xc0, 0xe, 0x1,
|
||||
0x70, 0xd0, 0x51, 0x38, 0x66, 0xe6, 0x66, 0xd,
|
||||
0x0, 0x0, 0x0, 0xe, 0x0, 0x0, 0xc0, 0x0,
|
||||
0x0, 0x0, 0xd0, 0x0, 0x0,
|
||||
|
||||
/* U+9650 "限" */
|
||||
0x20, 0x3, 0x2, 0x0, 0x0, 0x30, 0xd, 0x67,
|
||||
0xf5, 0xe6, 0x66, 0x6f, 0x20, 0xd0, 0x5a, 0x1c,
|
||||
|
|
@ -2860,149 +3151,170 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
|||
{.bitmap_index = 3843, .adv_w = 130, .box_w = 8, .box_h = 3, .ofs_x = 0, .ofs_y = 4},
|
||||
{.bitmap_index = 3855, .adv_w = 172, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3916, .adv_w = 224, .box_w = 12, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3982, .adv_w = 224, .box_w = 14, .box_h = 3, .ofs_x = 0, .ofs_y = 5},
|
||||
{.bitmap_index = 4003, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4094, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4185, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 4263, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4354, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4459, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4557, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4648, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4739, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4830, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4928, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5026, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5124, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 5209, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5307, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5392, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5490, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5588, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5679, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5770, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5861, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5952, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6043, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6134, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6232, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6337, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6435, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6526, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6624, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6722, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 6807, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6898, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6989, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7080, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7178, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7276, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7374, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 7465, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 7556, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 7634, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7725, .adv_w = 224, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7823, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7921, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8019, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8117, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8222, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8327, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8432, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8523, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8614, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
|
||||
{.bitmap_index = 8692, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8783, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8874, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8965, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9063, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9161, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9259, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9357, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9448, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9546, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9637, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9728, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9819, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9910, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10008, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10099, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10197, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10288, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10386, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10484, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10582, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10680, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10778, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10869, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10960, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11051, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 11136, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 11221, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11312, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11403, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11508, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11613, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11704, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 11817, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 11894, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11985, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12062, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12117, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12222, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12327, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12431, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12536, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12624, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12729, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12771, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12837, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12949, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13026, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13101, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 13171, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13269, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13354, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13439, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 13509, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
|
||||
{.bitmap_index = 13600, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13659, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13718, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13803, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
|
||||
{.bitmap_index = 13829, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13917, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14052, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 14180, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 14271, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 14323, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 14375, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14474, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14551, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14656, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 14769, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 14854, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14952, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15037, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15115, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 15192, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 15267, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 15365, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 15463, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 15551, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 15671, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 15754, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15871, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 15961, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16051, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16141, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16231, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16321, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 16429, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 16519, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 16617, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 16730, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16829, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 16912, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
|
||||
{.bitmap_index = 3982, .adv_w = 224, .box_w = 14, .box_h = 6, .ofs_x = 0, .ofs_y = 2},
|
||||
{.bitmap_index = 4024, .adv_w = 224, .box_w = 14, .box_h = 3, .ofs_x = 0, .ofs_y = 5},
|
||||
{.bitmap_index = 4045, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4122, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4213, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4304, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 4382, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4473, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4578, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4676, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4767, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4858, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4949, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5047, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5145, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5243, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 5328, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5426, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5517, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5602, .adv_w = 224, .box_w = 11, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
|
||||
{.bitmap_index = 5674, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5772, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5870, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5955, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6046, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6137, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6228, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6319, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6410, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6501, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6599, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6704, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6802, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6893, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6991, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7089, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 7174, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7265, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7363, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7454, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7545, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7636, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7734, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7832, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7930, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8028, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8126, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 8217, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 8308, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 8386, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8477, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8568, .adv_w = 224, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8666, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8764, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8862, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8960, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9058, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 9149, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9247, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9345, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9450, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9555, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9660, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9751, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9842, .adv_w = 224, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9940, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
|
||||
{.bitmap_index = 10018, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10109, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10200, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10291, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10389, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10487, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10585, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10683, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10781, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10872, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10970, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11061, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11152, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11243, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11334, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11425, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11523, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11614, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11712, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11803, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11901, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11999, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12097, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12195, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12293, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12391, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12482, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12573, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12664, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12762, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 12847, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 12938, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 13023, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 13108, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 13199, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 13290, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13395, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13500, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13591, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 13704, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13781, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13872, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13949, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14004, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14109, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14214, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 14318, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14423, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14511, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14616, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 14658, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 14724, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14836, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14913, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14988, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 15058, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 15156, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15241, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15326, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 15396, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
|
||||
{.bitmap_index = 15487, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15546, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15605, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 15690, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
|
||||
{.bitmap_index = 15716, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 15804, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 15939, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 16067, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 16158, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 16210, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 16262, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16361, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 16438, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 16543, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 16656, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 16741, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 16839, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 16924, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 17002, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 17079, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 17154, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 17252, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 17350, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 17438, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 17558, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 17641, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 17758, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 17848, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 17938, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 18028, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 18118, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 18208, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 18316, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 18406, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 18504, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 18617, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 18716, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 18799, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
|
|
@ -3010,25 +3322,27 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
|||
*--------------------*/
|
||||
|
||||
static const uint16_t unicode_list_2[] = {
|
||||
0x0, 0x1d5a, 0x4a57, 0x4a61, 0x4a62, 0x4a84, 0x4a92, 0x4b25,
|
||||
0x4b3b, 0x4ba4, 0x4baa, 0x4c34, 0x4ccd, 0x4dbc, 0x4dca, 0x4e51,
|
||||
0x4ef6, 0x4fac, 0x4fe2, 0x5028, 0x50d4, 0x52bf, 0x5387, 0x5397,
|
||||
0x53e2, 0x555e, 0x5564, 0x5622, 0x57ae, 0x57af, 0x581b, 0x58ac,
|
||||
0x5a49, 0x5b57, 0x5bac, 0x5f2a, 0x6026, 0x61c7, 0x61de, 0x624d,
|
||||
0x6265, 0x6349, 0x6381, 0x6478, 0x648e, 0x67bc, 0x6998, 0x6d10,
|
||||
0x6d44, 0x6dbe, 0x6eb0, 0x6fde, 0x718c, 0x7662, 0x77d7, 0x78d2,
|
||||
0x7952, 0x7b16, 0x7b36, 0x7b6d, 0x7bc5, 0x7d54, 0x7ec9, 0x7ed9,
|
||||
0x8134, 0x8657, 0x8806, 0x8807, 0x8815, 0x8844, 0x89ce, 0x89dc,
|
||||
0x8bea, 0x8c58, 0x8c71, 0x8da4, 0x8e1e, 0x8e26, 0x924b, 0x9292,
|
||||
0x92a7, 0x92eb, 0x94e8, 0x94f3, 0x96e3, 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, 0x1e75, 0x4a57, 0x4a60, 0x4a61, 0x4a62, 0x4a84,
|
||||
0x4a92, 0x4b25, 0x4b3b, 0x4ba4, 0x4baa, 0x4c34, 0x4ccd, 0x4dbc,
|
||||
0x4dca, 0x4e51, 0x4ef6, 0x4f9e, 0x4fac, 0x4fb7, 0x4fe2, 0x5028,
|
||||
0x50bf, 0x50d4, 0x52bf, 0x5387, 0x5397, 0x53e2, 0x555e, 0x5564,
|
||||
0x5622, 0x57ae, 0x57af, 0x581b, 0x58ac, 0x5a49, 0x5b57, 0x5b66,
|
||||
0x5bac, 0x5c01, 0x5f2a, 0x5f58, 0x6026, 0x61c7, 0x61de, 0x6210,
|
||||
0x624d, 0x6265, 0x6349, 0x6376, 0x6381, 0x6478, 0x648e, 0x6678,
|
||||
0x6778, 0x67bc, 0x682b, 0x6939, 0x6998, 0x6d10, 0x6d44, 0x6dbe,
|
||||
0x6eb0, 0x6fde, 0x7006, 0x718c, 0x7662, 0x77d7, 0x78d2, 0x7952,
|
||||
0x7b16, 0x7b1f, 0x7b36, 0x7b6d, 0x7bc5, 0x7d54, 0x7ec9, 0x7ed9,
|
||||
0x8134, 0x8629, 0x8657, 0x8806, 0x8807, 0x8815, 0x8844, 0x89ce,
|
||||
0x89dc, 0x8a1a, 0x8bea, 0x8c58, 0x8c71, 0x8da4, 0x8e1e, 0x8e26,
|
||||
0x91d6, 0x924b, 0x928d, 0x9292, 0x92a4, 0x92a7, 0x92eb, 0x94e8,
|
||||
0x94f3, 0x96e3, 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*/
|
||||
|
|
@ -3044,7 +3358,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 = 145, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 166, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -3085,7 +3399,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, 0, 0,
|
||||
0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
/*Map glyph_ids to kern right classes*/
|
||||
|
|
@ -3120,7 +3437,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, 0, 0,
|
||||
0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
/*Kern values between classes*/
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -258,7 +258,7 @@
|
|||
<Ww>
|
||||
<count>20</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>window_trx_num</ItemText>
|
||||
<ItemText>progout_data,0x0A</ItemText>
|
||||
</Ww>
|
||||
</WatchWindow1>
|
||||
<WatchWindow2>
|
||||
|
|
@ -3890,6 +3890,18 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>18</GroupNumber>
|
||||
<FileNumber>286</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\App\APP_WU\Src\scr_setting_progam_out.c</PathWithFileName>
|
||||
<FilenameWithoutPath>scr_setting_progam_out.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
</Group>
|
||||
|
||||
<Group>
|
||||
|
|
@ -3900,7 +3912,7 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>286</FileNumber>
|
||||
<FileNumber>287</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3912,7 +3924,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>287</FileNumber>
|
||||
<FileNumber>288</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3924,7 +3936,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>288</FileNumber>
|
||||
<FileNumber>289</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3936,7 +3948,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>289</FileNumber>
|
||||
<FileNumber>290</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3948,7 +3960,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>290</FileNumber>
|
||||
<FileNumber>291</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3960,7 +3972,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>291</FileNumber>
|
||||
<FileNumber>292</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3972,7 +3984,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>292</FileNumber>
|
||||
<FileNumber>293</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3984,7 +3996,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>293</FileNumber>
|
||||
<FileNumber>294</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3996,7 +4008,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>294</FileNumber>
|
||||
<FileNumber>295</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4008,7 +4020,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>295</FileNumber>
|
||||
<FileNumber>296</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4020,7 +4032,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>296</FileNumber>
|
||||
<FileNumber>297</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4032,7 +4044,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>297</FileNumber>
|
||||
<FileNumber>298</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4044,7 +4056,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>298</FileNumber>
|
||||
<FileNumber>299</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4056,7 +4068,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>299</FileNumber>
|
||||
<FileNumber>300</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4068,7 +4080,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>300</FileNumber>
|
||||
<FileNumber>301</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4080,7 +4092,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>301</FileNumber>
|
||||
<FileNumber>302</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4092,7 +4104,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>302</FileNumber>
|
||||
<FileNumber>303</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -4102,18 +4114,6 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>303</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>19</GroupNumber>
|
||||
<FileNumber>304</FileNumber>
|
||||
|
|
@ -4390,6 +4390,18 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>19</GroupNumber>
|
||||
<FileNumber>327</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>
|
||||
</Group>
|
||||
|
||||
<Group>
|
||||
|
|
|
|||
|
|
@ -2558,6 +2558,11 @@
|
|||
<FileType>1</FileType>
|
||||
<FilePath>..\App\APP_WU\Src\apps_var_def.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>scr_setting_progam_out.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\APP_WU\Src\scr_setting_progam_out.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
@ -2648,11 +2653,6 @@
|
|||
<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>
|
||||
|
|
@ -2768,6 +2768,11 @@
|
|||
<FileType>1</FileType>
|
||||
<FilePath>..\LVGL\myGUI\generated\images\screen_main_animimg_batterybt100.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>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue