parent
9ef723ed36
commit
7938f2317f
|
|
@ -168,8 +168,8 @@ void io_on2off_status(void);
|
|||
//恢复主界面的各项参数显示，用于界面切换（设置界面->主界面）
|
||||
void scr_main_recover(void);
|
||||
|
||||
//颜色更新
|
||||
void scr_main_color_update(void);
|
||||
//曲线设置更新
|
||||
void scr_main_chart_update(void);
|
||||
|
||||
//数值闪烁，数值发生变化后开始闪烁，10秒无动作后闪烁停止，游标移动后恢复前一时刻位置的数值
|
||||
void num_twinkle(void);
|
||||
|
|
|
|||
|
|
@ -39,15 +39,17 @@ typedef enum
|
|||
PAGE_PV_ITEM_1,
|
||||
|
||||
//ITEM_2
|
||||
DATA_SAVE,
|
||||
INPUT_LOG,
|
||||
OUTPUT_LOG,
|
||||
DATA_RESET,
|
||||
COMMUNICATION,
|
||||
PROGRAM_OUTPUT,
|
||||
PAGE_PV_ITEM_2,
|
||||
|
||||
//ITEM_3
|
||||
LIGHT_STATUS,
|
||||
LANGUAGE_SELECT,
|
||||
DATA_SAVE,
|
||||
DATA_RESET,
|
||||
PAGE_PV_ITEM_3,
|
||||
|
||||
//general
|
||||
|
|
@ -99,17 +101,17 @@ typedef struct
|
|||
COLORS item1_page0_color_output; //输出曲线及其图例的颜色
|
||||
|
||||
//ITEMS_2
|
||||
uint8_t item2_page0_saveflag; //[0, 1,2 ] -> [未保存，保存中，已保存]
|
||||
char log_time[60][16]; //输入&输出记录，时间戳
|
||||
float32 input_log_value[60]; //输入记录，实际值
|
||||
SIG_FUNCTIONS_TYPE input_log_unit[60]; //输入记录，单位
|
||||
float32 output_log_value[60]; //输出记录，实际值
|
||||
SIG_FUNCTIONS_TYPE output_log_unit[60];//输出记录，单位
|
||||
uint8_t item2_page0_resetflag; //[0, 1,2 ] -> [未复位，复位中，已复位]
|
||||
|
||||
//ITEMS_3
|
||||
uint8_t item3_page0_lightflag; //照明状态标志，0熄灭，1开启
|
||||
LANGUAGES item3_page0_language; //语言类型
|
||||
uint8_t item3_page0_saveflag; //[0, 1,2 ] -> [未保存，保存中，已保存]
|
||||
uint8_t item3_page0_resetflag; //[0, 1,2 ] -> [未复位，复位中，已复位]
|
||||
|
||||
}TABVIEW_DATA;
|
||||
|
||||
|
|
@ -199,10 +201,6 @@ void scr_setting_recover(void);
|
|||
//详细设置界面
|
||||
void scr_setting_run(void);
|
||||
|
||||
//设置界面语言切换（主界面的语言切换在set_working_mode内）
|
||||
//此处用于更改标题和选项卡的语言，内容的语言切换在 set_XXX_text & set_XXX_value内
|
||||
void setting_laguage_switch(LANGUAGES lan);
|
||||
|
||||
//执行保存功能
|
||||
void deal_data_save(void);
|
||||
|
||||
|
|
@ -239,6 +237,9 @@ void set_item3_value(ITEM_CONTENTS con, int8_t step);
|
|||
//内容游标 uint8_t -> enum
|
||||
ITEM_CONTENTS content_cur_char2enum(ITEMS ite, uint8_t cur_uint8);
|
||||
|
||||
//刷新标题和选项卡文本
|
||||
void title_item_refresh(void);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ extern const lv_img_dsc_t * screen_main_ani_out_sign_imgs[3];
|
|||
/**********************************************Functions**********************************************/
|
||||
typedef enum
|
||||
{
|
||||
SIG_VOLTAGE = 0, //电压
|
||||
SIG_CURRENT, //电流
|
||||
SIG_CURRENT = 0, //电流
|
||||
SIG_VOLTAGE, //电压
|
||||
SIG_RESISTANT, //电阻
|
||||
SIG_FREQUENCE, //频率
|
||||
SIG_TC, //热电偶
|
||||
|
|
@ -66,9 +66,9 @@ typedef enum
|
|||
|
||||
typedef enum
|
||||
{
|
||||
VOLTAGE_MV = 0, //电压mV
|
||||
CURRENT_MA = 0, //电流mA
|
||||
VOLTAGE_MV, //电压mV
|
||||
VOLTAGE_V, //电压V
|
||||
CURRENT_MA, //电流mA
|
||||
RESISTANT_OHM, //电阻Ω
|
||||
FREQUENCE_KHZ, //频率KHz
|
||||
TC_K, //热电偶K
|
||||
|
|
@ -134,6 +134,7 @@ typedef struct
|
|||
#include "scr_setting_item_text.h"
|
||||
#include "scr_setting_item_value.h"
|
||||
#include "key_functions.h"
|
||||
#include "scr_setting_text.h"
|
||||
|
||||
extern PHYSICAL_QUANTITY VOL[2]; //电压，VOL[0]-V, VOL[1]-mV
|
||||
extern PHYSICAL_QUANTITY CUR; //电流，mA
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
#ifndef _SCR_SETTING_TEXT_H
|
||||
#define _SCR_SETTING_TEXT_H
|
||||
|
||||
#include "apps_gather.h"
|
||||
|
||||
#define TEXT_LENGTH_MAX 20
|
||||
#define ITEM_NUM_MAX 4
|
||||
#define ITEM0_CONTENT_MAX 14
|
||||
#define ITEM1_CONTENT_MAX 4
|
||||
#define ITEM2_CONTENT_MAX 4
|
||||
#define ITEM3_CONTENT_MAX 4
|
||||
#define ITEM3_CONTENT_VAL_MAX 10
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char title[TEXT_LENGTH_MAX];
|
||||
char items[ITEM_NUM_MAX][TEXT_LENGTH_MAX];
|
||||
char item_0[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX];
|
||||
char item_1[ITEM1_CONTENT_MAX][TEXT_LENGTH_MAX];
|
||||
char item_2[ITEM2_CONTENT_MAX][TEXT_LENGTH_MAX];
|
||||
char item_3[ITEM3_CONTENT_MAX][TEXT_LENGTH_MAX];
|
||||
char item_3_val[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX];
|
||||
|
||||
|
||||
}SETTING_TEXT;
|
||||
|
||||
extern SETTING_TEXT text_pack;
|
||||
|
||||
//设置界面语言切换
|
||||
void setting_laguage_switch(LANGUAGES lan);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
@ -892,7 +892,7 @@ void io_on2off_status(void)
|
|||
{
|
||||
case IO_OUTPUT:
|
||||
{
|
||||
//输入变回黑色，输出变为绿色
|
||||
//输入黑色，输出绿色
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_IN, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_OUT, lv_color_hex(0x06ff00), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
}
|
||||
|
|
@ -900,7 +900,7 @@ void io_on2off_status(void)
|
|||
|
||||
case IO_INPUT:
|
||||
{
|
||||
//输出变回黑色，输入变为绿色
|
||||
//输入绿色,输出黑色
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_IN, lv_color_hex(0x06ff00), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_OUT, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
}
|
||||
|
|
@ -920,7 +920,7 @@ void io_on2off_status(void)
|
|||
{
|
||||
case IO_OUTPUT:
|
||||
{
|
||||
//输入变回黑色，输出变为红色
|
||||
//输入黑色，输出红色
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_IN, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_OUT, lv_color_hex(0xff0027), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
}
|
||||
|
|
@ -928,7 +928,7 @@ void io_on2off_status(void)
|
|||
|
||||
case IO_INPUT:
|
||||
{
|
||||
//输出变回黑色，输入变为红色
|
||||
//输入绿色,输出黑色
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_IN, lv_color_hex(0x06ff00), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_color(guider_ui.screen_main_label_OUT, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
}
|
||||
|
|
@ -958,17 +958,8 @@ void scr_main_recover(void)
|
|||
m5data.output_mode_type = CURRENT_MA;
|
||||
set_working_mode(m5data.output_mode, m5data.output_mode_type);
|
||||
|
||||
//曲线设置项同步
|
||||
//曲线描点个数
|
||||
lv_chart_set_point_count(guider_ui.screen_main_chart_1, tabdata.item1_page0_plot_num);
|
||||
for(uint8_t i = 0; i < tabdata.item1_page0_plot_num; i++)
|
||||
{
|
||||
lv_chart_set_next_value(guider_ui.screen_main_chart_1, guider_ui.screen_main_chart_1_0, 0);
|
||||
lv_chart_set_next_value(guider_ui.screen_main_chart_1, guider_ui.screen_main_chart_1_1, 0);
|
||||
}
|
||||
|
||||
//输入/输出曲线、图例、上下限颜色更新
|
||||
scr_main_color_update();
|
||||
scr_main_chart_update();
|
||||
|
||||
//熄灭设置界面的选项卡缓存（隐藏式切换界面）
|
||||
setting_items_check(ITEM_NONE, tabdata.item_cursor);
|
||||
|
|
@ -977,15 +968,23 @@ void scr_main_recover(void)
|
|||
key_char2struct();
|
||||
}
|
||||
|
||||
//颜色更新
|
||||
void scr_main_color_update(void)
|
||||
//曲线设置更新
|
||||
void scr_main_chart_update(void)
|
||||
{
|
||||
//输入
|
||||
//曲线描点个数
|
||||
lv_chart_set_point_count(guider_ui.screen_main_chart_1, tabdata.item1_page0_plot_num);
|
||||
for(uint8_t i = 0; i < tabdata.item1_page0_plot_num; i++)
|
||||
{
|
||||
lv_chart_set_next_value(guider_ui.screen_main_chart_1, guider_ui.screen_main_chart_1_0, 0);
|
||||
lv_chart_set_next_value(guider_ui.screen_main_chart_1, guider_ui.screen_main_chart_1_1, 0);
|
||||
}
|
||||
|
||||
//输入曲线颜色
|
||||
lv_chart_set_series_color(guider_ui.screen_main_chart_1, guider_ui.screen_main_chart_1_1, lv_color_hex( color_table[tabdata.item1_page0_color_input] ));
|
||||
lv_obj_set_style_line_color(guider_ui.screen_main_line_legend_IN, lv_color_hex( color_table[tabdata.item1_page0_color_input] ), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
set_obj_color(guider_ui.screen_main_label_area_IN, tabdata.item1_page0_color_input);
|
||||
|
||||
//输出
|
||||
//输出曲线颜色
|
||||
lv_chart_set_series_color(guider_ui.screen_main_chart_1, guider_ui.screen_main_chart_1_0, lv_color_hex( color_table[tabdata.item1_page0_color_output] ));
|
||||
lv_obj_set_style_line_color(guider_ui.screen_main_line_legend_OUT, lv_color_hex( color_table[tabdata.item1_page0_color_output] ), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
set_obj_color(guider_ui.screen_main_label_area_OUT, tabdata.item1_page0_color_output);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ void tab_data_init(void)
|
|||
|
||||
|
||||
//ITEMS_2（部分内容位于EERPOM读取）
|
||||
tabdata.item2_page0_saveflag = 0;
|
||||
tabdata.item3_page0_saveflag = 0;
|
||||
memset(tabdata.log_time, 0, sizeof(tabdata.log_time));
|
||||
memset(tabdata.input_log_value, 0, sizeof(tabdata.input_log_value));
|
||||
memset(tabdata.input_log_unit, 0, sizeof(tabdata.input_log_unit));
|
||||
|
|
@ -44,7 +44,7 @@ void tab_data_init(void)
|
|||
sprintf(tabdata.log_time[0], "00:00:00");
|
||||
tabdata.input_log_unit[0] = m5data.input_mode_type;
|
||||
tabdata.output_log_unit[0] = m5data.output_mode_type;
|
||||
tabdata.item2_page0_resetflag = 0;
|
||||
tabdata.item3_page0_resetflag = 0;
|
||||
|
||||
//ITEMS_3（部分内容位于EERPOM读取）
|
||||
tabdata.item3_page0_lightflag = 0; //照明状态标志，0熄灭，1开启
|
||||
|
|
@ -55,7 +55,7 @@ void tab_data_init(void)
|
|||
//选项卡EEPROM部分数据初始化
|
||||
void eeprom_item_data_init(void)
|
||||
{
|
||||
if(tabdata.item2_page0_resetflag != 1)
|
||||
if(tabdata.item3_page0_resetflag != 1)
|
||||
{
|
||||
//判断eeprom内是否存在数据
|
||||
if(eeprom_device_check() == 1)
|
||||
|
|
@ -70,7 +70,7 @@ void eeprom_item_data_init(void)
|
|||
}
|
||||
|
||||
//读取过程中出现过错误，或者触发复位
|
||||
if( (system_sts.eeprom_read_error == 1)||(tabdata.item2_page0_resetflag == 1) )
|
||||
if( (system_sts.eeprom_read_error == 1)||(tabdata.item3_page0_resetflag == 1) )
|
||||
{
|
||||
tabdata.item0_page0_vup[0] = VOL[0].up; //电压V上限
|
||||
tabdata.item0_page0_vlow[0] = VOL[0].low; //电压V下限
|
||||
|
|
@ -107,7 +107,7 @@ void eeprom_item_data_init(void)
|
|||
tabdata.item3_page0_language = MENU_SIMPLYFY_CHINESE; //语言选择
|
||||
|
||||
//针对复位的情况追加进行保存
|
||||
if(tabdata.item2_page0_resetflag == 1)
|
||||
if(tabdata.item3_page0_resetflag == 1)
|
||||
{
|
||||
//eeprom_datasave();
|
||||
eeprom_datasave_changed();
|
||||
|
|
@ -226,33 +226,12 @@ void setting_items_page(ITEMS ite, uint8_t page)
|
|||
{
|
||||
case 1:
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "电压单位");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "电压上限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "电压下限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "电流上限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, "电流下限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, "电阻上限");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Voltage unit");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Voltage max");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "Voltage min");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "Current max");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, "Current min");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, "Res max");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.item_0[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.item_0[1]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.item_0[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.item_0[3]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, text_pack.item_0[4]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, text_pack.item_0[5]);
|
||||
|
||||
set_item0_text(VOL_UNIT_SET);
|
||||
set_item0_text(VOL_UP_SET);
|
||||
|
|
@ -265,33 +244,12 @@ void setting_items_page(ITEMS ite, uint8_t page)
|
|||
|
||||
case 2:
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "电阻下限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "频率上限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "频率下限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "热电偶类型");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, "热电偶上限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, "热电偶下限");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Res min");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Freq max");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "Freq min");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "TC type");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, "TC min");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, "TC max");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.item_0[6]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.item_0[7]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.item_0[8]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.item_0[9]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_40, text_pack.item_0[10]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_50, text_pack.item_0[11]);
|
||||
|
||||
set_item0_text(TC_LOW_SET);
|
||||
set_item0_text(TC_UP_SET);
|
||||
|
|
@ -304,25 +262,8 @@ void setting_items_page(ITEMS ite, uint8_t page)
|
|||
|
||||
case 3:
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "热电阻上限");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "热电阻下限");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "RTD min");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "RTD max");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.item_0[12]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.item_0[13]);
|
||||
|
||||
set_item0_text(RTD_UP_SET);
|
||||
set_item0_text(RTD_LOW_SET);
|
||||
|
|
@ -365,29 +306,10 @@ void setting_items_page(ITEMS ite, uint8_t page)
|
|||
{
|
||||
case 1:
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "采样间隔");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "描点数量");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "颜色-输入");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "颜色-输出");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Plot gap");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Plot count");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "Color-input");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "Color-output");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.item_1[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.item_1[1]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.item_1[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.item_1[3]);
|
||||
|
||||
set_item1_text(SAMPLE_INTERVAL);
|
||||
set_item1_text(PLOT_NUM);
|
||||
|
|
@ -429,34 +351,15 @@ void setting_items_page(ITEMS ite, uint8_t page)
|
|||
{
|
||||
case 1:
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "参数保存");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "输入记录");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "输出记录");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "参数复位");
|
||||
}
|
||||
break;
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.item_2[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.item_2[1]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.item_2[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.item_2[3]);
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Para save");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Input log");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "Output log");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "Para reset");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
set_item2_text(DATA_SAVE);
|
||||
set_item2_text(INPUT_LOG);
|
||||
set_item2_text(OUTPUT_LOG);
|
||||
set_item2_text(DATA_RESET);
|
||||
set_item2_text(COMMUNICATION);
|
||||
set_item2_text(PROGRAM_OUTPUT);
|
||||
|
||||
//隐藏多余组件
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_40, LV_OBJ_FLAG_HIDDEN);
|
||||
|
|
@ -482,40 +385,27 @@ void setting_items_page(ITEMS ite, uint8_t page)
|
|||
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); };
|
||||
|
||||
//显示目标页
|
||||
switch (page)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "照明");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "语言");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Lighting");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Language");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, text_pack.item_3[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, text_pack.item_3[1]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, text_pack.item_3[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, text_pack.item_3[3]);
|
||||
|
||||
set_item3_text(LIGHT_STATUS);
|
||||
set_item3_text(LANGUAGE_SELECT);
|
||||
set_item3_text(DATA_SAVE);
|
||||
set_item3_text(DATA_RESET);
|
||||
|
||||
//隐藏多余组件
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_20, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_21, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(guider_ui.screen_setting_label_30, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_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);
|
||||
|
|
@ -571,8 +461,8 @@ void setting_contents_modify(ITEMS ite, ITEM_CONTENTS con, int8_t step)
|
|||
set_item0_value(con, step);
|
||||
set_item0_text(con);
|
||||
|
||||
if(tabdata.item2_page0_saveflag == 2) tabdata.item2_page0_saveflag = 0;
|
||||
if(tabdata.item2_page0_resetflag == 2) tabdata.item2_page0_resetflag = 0;
|
||||
if(tabdata.item3_page0_saveflag == 2) tabdata.item3_page0_saveflag = 0;
|
||||
if(tabdata.item3_page0_resetflag == 2) tabdata.item3_page0_resetflag = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -581,8 +471,8 @@ void setting_contents_modify(ITEMS ite, ITEM_CONTENTS con, int8_t step)
|
|||
set_item1_value(con, step);
|
||||
set_item1_text(con);
|
||||
|
||||
if(tabdata.item2_page0_saveflag == 2) tabdata.item2_page0_saveflag = 0;
|
||||
if(tabdata.item2_page0_resetflag == 2) tabdata.item2_page0_resetflag = 0;
|
||||
if(tabdata.item3_page0_saveflag == 2) tabdata.item3_page0_saveflag = 0;
|
||||
if(tabdata.item3_page0_resetflag == 2) tabdata.item3_page0_resetflag = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -597,6 +487,12 @@ void setting_contents_modify(ITEMS ite, ITEM_CONTENTS con, int8_t step)
|
|||
{
|
||||
set_item3_value(con, step);
|
||||
set_item3_text(con);
|
||||
|
||||
//切换语言后，更新本页的其他文本
|
||||
if(con == LANGUAGE_SELECT)
|
||||
{
|
||||
setting_items_page(ITEM_3, 1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -652,6 +548,17 @@ void set_contents_color(uint8_t cursor, uint32_t color)
|
|||
}
|
||||
}
|
||||
|
||||
//刷新标题和选项卡文本
|
||||
void title_item_refresh(void)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_title, text_pack.title);
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s0, text_pack.items[0]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s1, text_pack.items[1]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s2, text_pack.items[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s3, text_pack.items[3]);
|
||||
}
|
||||
|
||||
void scr_setting_recover(void)
|
||||
{
|
||||
//当前操作切换至“选项卡选择”，按键配置同步更新
|
||||
|
|
@ -664,6 +571,7 @@ void scr_setting_recover(void)
|
|||
setting_items_check(tabdata.item_cursor, tabdata.item_cursor_prv);
|
||||
|
||||
setting_laguage_switch(tabdata.item3_page0_language);
|
||||
title_item_refresh();
|
||||
|
||||
tabdata.item_page = 1;
|
||||
setting_items_page(ITEM_0 ,tabdata.item_page);
|
||||
|
|
@ -685,7 +593,7 @@ void scr_setting_run(void) //详细设置界面
|
|||
uint8_t save_step = 0;
|
||||
void deal_data_save(void)
|
||||
{
|
||||
if(tabdata.item2_page0_saveflag == 1)
|
||||
if(tabdata.item3_page0_saveflag == 1)
|
||||
{
|
||||
if(save_step == 0)
|
||||
{
|
||||
|
|
@ -707,18 +615,15 @@ void deal_data_save(void)
|
|||
|
||||
if(system_sts.eeprom_write_error == 0)
|
||||
{
|
||||
//未出错
|
||||
tabdata.item2_page0_saveflag = 2;
|
||||
|
||||
set_item2_text(DATA_SAVE);
|
||||
//未出错，保存完成
|
||||
tabdata.item3_page0_saveflag = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
//出现过错误
|
||||
tabdata.item2_page0_saveflag = 0;
|
||||
|
||||
set_item2_text(DATA_SAVE);
|
||||
//出现过错误，未保存
|
||||
tabdata.item3_page0_saveflag = 0;
|
||||
}
|
||||
set_item3_text(DATA_SAVE);
|
||||
|
||||
//使能所有按键
|
||||
key_config(KEY_ALL, KEY_STATUS_ENABLE);
|
||||
|
|
@ -734,7 +639,7 @@ uint8_t reset_step = 0;
|
|||
//执行复位功能
|
||||
void deal_data_reset(void)
|
||||
{
|
||||
if(tabdata.item2_page0_resetflag == 1)
|
||||
if(tabdata.item3_page0_resetflag == 1)
|
||||
{
|
||||
if(reset_step == 0)
|
||||
{
|
||||
|
|
@ -756,46 +661,17 @@ void deal_data_reset(void)
|
|||
if(reset_cnt > 5)
|
||||
{
|
||||
reset_cnt = 0;
|
||||
tabdata.item2_page0_resetflag = 2;
|
||||
tabdata.item3_page0_resetflag = 2;
|
||||
|
||||
//更新本页文本
|
||||
//保存状态更改为“已保存”
|
||||
tabdata.item2_page0_saveflag = 0;
|
||||
set_item2_text(DATA_SAVE);
|
||||
tabdata.item3_page0_saveflag = 0;
|
||||
set_item3_text(DATA_SAVE);
|
||||
|
||||
//选项卡与标题
|
||||
setting_laguage_switch(tabdata.item3_page0_language);
|
||||
|
||||
//内容左列
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "参数保存");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "输入记录");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "输出记录");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "参数复位");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Para save");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Input log");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_20, "Output log");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_30, "Para reset");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
//内容右列
|
||||
set_item2_text(DATA_RESET);
|
||||
set_item2_text(DATA_SAVE);
|
||||
set_item2_text(INPUT_LOG);
|
||||
set_item2_text(OUTPUT_LOG);
|
||||
title_item_refresh();
|
||||
setting_items_page(ITEM_3, 1);
|
||||
|
||||
//使能所有按键
|
||||
key_config(KEY_ALL, KEY_STATUS_ENABLE);
|
||||
|
|
@ -806,38 +682,7 @@ void deal_data_reset(void)
|
|||
}
|
||||
}
|
||||
|
||||
//设置界面语言切换（主界面的语言切换在set_working_mode内）
|
||||
//此处用于更改标题和选项卡的语言，内容的语言切换在 set_XXX_text & set_XXX_value内
|
||||
void setting_laguage_switch(LANGUAGES lan)
|
||||
{
|
||||
switch (lan)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_title, "详细设置");
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s0, "量程设置");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s1, "曲线设置");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s2, "数据存储");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s3, "系统设置");
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_title, "Detailed Settings");
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s0, "Range");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s1, "Chart");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s2, "Storage");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_s3, "System");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//内容游标 uint8_t -> enum
|
||||
ITEM_CONTENTS content_cur_char2enum(ITEMS ite, uint8_t cur_uint8)
|
||||
|
|
@ -857,6 +702,7 @@ ITEM_CONTENTS content_cur_char2enum(ITEMS ite, uint8_t cur_uint8)
|
|||
|
||||
case ITEM_1:
|
||||
{
|
||||
//head
|
||||
cur_temp += (uint8_t)SAMPLE_INTERVAL;
|
||||
|
||||
result = (ITEM_CONTENTS)cur_temp;
|
||||
|
|
@ -865,7 +711,8 @@ ITEM_CONTENTS content_cur_char2enum(ITEMS ite, uint8_t cur_uint8)
|
|||
|
||||
case ITEM_2:
|
||||
{
|
||||
cur_temp += (uint8_t)DATA_SAVE;
|
||||
//head
|
||||
cur_temp += (uint8_t)INPUT_LOG;
|
||||
|
||||
result = (ITEM_CONTENTS)cur_temp;
|
||||
}
|
||||
|
|
@ -873,6 +720,7 @@ ITEM_CONTENTS content_cur_char2enum(ITEMS ite, uint8_t cur_uint8)
|
|||
|
||||
case ITEM_3:
|
||||
{
|
||||
//head
|
||||
cur_temp += (uint8_t)LIGHT_STATUS;
|
||||
|
||||
result = (ITEM_CONTENTS)cur_temp;
|
||||
|
|
|
|||
|
|
@ -484,16 +484,6 @@ void key_functions_main(void)
|
|||
{
|
||||
switch (m5data.output_mode) //功能切换
|
||||
{
|
||||
case SIG_VOLTAGE:
|
||||
{
|
||||
cursor_temp = (uint8_t)m5data.output_mode_type;
|
||||
cursor_temp = !cursor_temp;
|
||||
m5data.output_mode_type = (SIG_FUNCTIONS_TYPE)cursor_temp;
|
||||
|
||||
set_working_mode(m5data.output_mode, m5data.output_mode_type);
|
||||
}
|
||||
break;
|
||||
|
||||
case SIG_CURRENT:
|
||||
{
|
||||
m5data.output_mode_type = CURRENT_MA;
|
||||
|
|
@ -508,6 +498,16 @@ void key_functions_main(void)
|
|||
}
|
||||
break;
|
||||
|
||||
case SIG_VOLTAGE:
|
||||
{
|
||||
cursor_temp = (uint8_t)m5data.output_mode_type;
|
||||
cursor_temp = (cursor_temp == 1)?(2):(1);
|
||||
m5data.output_mode_type = (SIG_FUNCTIONS_TYPE)cursor_temp;
|
||||
|
||||
set_working_mode(m5data.output_mode, m5data.output_mode_type);
|
||||
}
|
||||
break;
|
||||
|
||||
case SIG_FREQUENCE: //频率
|
||||
{
|
||||
m5data.output_mode_type = FREQUENCE_KHZ;
|
||||
|
|
@ -542,19 +542,19 @@ void key_functions_main(void)
|
|||
{
|
||||
switch (m5data.input_mode)
|
||||
{
|
||||
case SIG_VOLTAGE:
|
||||
case SIG_CURRENT:
|
||||
{
|
||||
cursor_temp = (uint8_t)m5data.input_mode_type;
|
||||
cursor_temp = !cursor_temp;
|
||||
m5data.input_mode_type = (SIG_FUNCTIONS_TYPE)cursor_temp;
|
||||
|
||||
m5data.input_mode_type = CURRENT_MA;
|
||||
set_working_mode(m5data.input_mode, m5data.input_mode_type);
|
||||
}
|
||||
break;
|
||||
|
||||
case SIG_CURRENT:
|
||||
case SIG_VOLTAGE:
|
||||
{
|
||||
m5data.input_mode_type = CURRENT_MA;
|
||||
cursor_temp = (uint8_t)m5data.output_mode_type;
|
||||
cursor_temp = (cursor_temp == 1)?(2):(1);
|
||||
m5data.output_mode_type = (SIG_FUNCTIONS_TYPE)cursor_temp;
|
||||
|
||||
set_working_mode(m5data.input_mode, m5data.input_mode_type);
|
||||
}
|
||||
break;
|
||||
|
|
@ -719,7 +719,7 @@ void key_functions_setting(void)
|
|||
setting_contents_check(tabdata.content_cursor, CONTENT_EMPTY);
|
||||
|
||||
//更新当前游标所在内容的文本（焦点前后不一致）
|
||||
tabdata.current_content = content_cur_char2enum(tabdata.item_cursor, tabdata.content_cursor);
|
||||
tabdata.current_content = content_cur_char2enum(tabdata.item_cursor ,tabdata.content_cursor);
|
||||
|
||||
switch (tabdata.item_cursor)
|
||||
{
|
||||
|
|
@ -763,6 +763,8 @@ void key_functions_setting(void)
|
|||
break;
|
||||
}
|
||||
|
||||
tabdata.current_content = CONTENT_EMPTY;
|
||||
|
||||
//当前操作从“内容修改” 返回 至“内容选择”，按键配置同步更新
|
||||
current_operation = SET_CONTENT_CHOOSE;
|
||||
key_config_update(current_operation);
|
||||
|
|
@ -838,7 +840,7 @@ void key_functions_setting(void)
|
|||
case ITEM_3:
|
||||
{
|
||||
cursor_start = 0;
|
||||
cursor_end = 1;
|
||||
cursor_end = 3;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -911,7 +913,7 @@ void key_functions_setting(void)
|
|||
case ITEM_3:
|
||||
{
|
||||
cursor_start = 0;
|
||||
cursor_end = 1;
|
||||
cursor_end = 3;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -1000,13 +1002,13 @@ void key_functions_setting(void)
|
|||
{
|
||||
if(tabdata.current_content == INPUT_LOG)
|
||||
{
|
||||
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_11, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_01, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
show_IO_log(IO_INPUT, 1);
|
||||
}
|
||||
|
||||
if(tabdata.current_content == OUTPUT_LOG)
|
||||
{
|
||||
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_21, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_bg_color(guider_ui.screen_setting_label_11, lv_color_hex(COLOR_ITEMS_UNCHECKED), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
show_IO_log(IO_OUTPUT, 1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -463,272 +463,30 @@ void set_item2_text(ITEM_CONTENTS con)
|
|||
|
||||
switch (con)
|
||||
{
|
||||
case DATA_SAVE:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
switch (tabdata.item2_page0_saveflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "未保存");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "保存中");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "已保存");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
switch (tabdata.item2_page0_saveflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "Not save");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "Saving");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "Finished");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
switch (tabdata.item2_page0_saveflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< 未保存 >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< 保存中 >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< 已保存 >");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
switch (tabdata.item2_page0_saveflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< Not save >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< Saving >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< Finished >");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case DATA_RESET:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
switch (tabdata.item2_page0_resetflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "未复位");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "复位中");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "已复位");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
switch (tabdata.item2_page0_resetflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "No reset");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "Resetting");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "Finished");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
switch (tabdata.item2_page0_resetflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< 未复位 >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< 复位中 >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< 已复位 >");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
switch (tabdata.item2_page0_resetflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< No reset >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< Resetting >");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< Finished >");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case INPUT_LOG:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, ">");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, ">");
|
||||
}
|
||||
break;
|
||||
|
||||
case OUTPUT_LOG:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, ">");
|
||||
}
|
||||
break;
|
||||
|
||||
case COMMUNICATION:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, ">");
|
||||
}
|
||||
break;
|
||||
|
||||
case PROGRAM_OUTPUT:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, ">");
|
||||
}
|
||||
break;
|
||||
|
||||
case PAGE_PV_ITEM_2:
|
||||
{
|
||||
sprintf(str_temp,"< %d/%d >",tabdata.item_page, I2_PAGE_MAX);
|
||||
|
|
@ -744,73 +502,35 @@ void set_item2_text(ITEM_CONTENTS con)
|
|||
//修改选项卡3的文本
|
||||
void set_item3_text(ITEM_CONTENTS con)
|
||||
{
|
||||
char str_temp[16] = {0};
|
||||
char str_temp[32] = {0};
|
||||
|
||||
switch (con)
|
||||
{
|
||||
case LIGHT_STATUS:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "开");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, text_pack.item_3_val[0]);
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "关");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, text_pack.item_3_val[1]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
else
|
||||
{
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[0]);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[1]);
|
||||
}
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "ON");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "OFF");
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (tabdata.item3_page0_language)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< 开 >");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< 关 >");
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< ON >");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< OFF >");
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -823,13 +543,13 @@ void set_item3_text(ITEM_CONTENTS con)
|
|||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, "简体中文");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, text_pack.item_3_val[2]);
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, "English");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, text_pack.item_3_val[3]);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -843,40 +563,23 @@ void set_item3_text(ITEM_CONTENTS con)
|
|||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, "< 简体中文 >");
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[2]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
|
||||
|
||||
//切换语言后，更新本页的其他文本
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "照明");
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "开");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "关");
|
||||
}
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "语言");
|
||||
setting_laguage_switch(MENU_SIMPLYFY_CHINESE);
|
||||
title_item_refresh();
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, "< English >");
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[3]);
|
||||
lv_label_set_text(guider_ui.screen_setting_label_11, str_temp);
|
||||
|
||||
//切换语言后，更新本页的其他文本
|
||||
lv_label_set_text(guider_ui.screen_setting_label_00, "Lighting");
|
||||
|
||||
if(tabdata.item3_page0_lightflag)
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "ON");
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "OFF");
|
||||
}
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_10, "Language");
|
||||
setting_laguage_switch(MENU_ENGLISH);
|
||||
title_item_refresh();
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -887,6 +590,124 @@ void set_item3_text(ITEM_CONTENTS con)
|
|||
}
|
||||
break;
|
||||
|
||||
case DATA_SAVE:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
switch (tabdata.item3_page0_saveflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, text_pack.item_3_val[4]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, text_pack.item_3_val[5]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, text_pack.item_3_val[6]);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (tabdata.item3_page0_saveflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[4]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[5]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[6]);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_21, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case DATA_RESET:
|
||||
{
|
||||
if(tabdata.content_focus == 0)
|
||||
{
|
||||
switch (tabdata.item3_page0_resetflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, text_pack.item_3_val[7]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, text_pack.item_3_val[8]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, text_pack.item_3_val[9]);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (tabdata.item3_page0_resetflag)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[7]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[8]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
sprintf(str_temp,"< %s >",text_pack.item_3_val[9]);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, str_temp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PAGE_PV_ITEM_3:
|
||||
{
|
||||
sprintf(str_temp,"< %d/%d >",tabdata.item_page, I3_PAGE_MAX);
|
||||
|
|
|
|||
|
|
@ -271,7 +271,17 @@ void set_item1_value(ITEM_CONTENTS con, int8_t step)
|
|||
val_temp = (uint8_t)tabdata.item1_page0_color_input;
|
||||
val_temp += step;
|
||||
|
||||
if( val_temp > val_end ) val_temp = val_start;
|
||||
if( val_temp > val_end )
|
||||
{
|
||||
if( val_temp < 200)
|
||||
{
|
||||
val_temp = val_start;
|
||||
}
|
||||
else
|
||||
{
|
||||
val_temp = val_end;
|
||||
}
|
||||
}
|
||||
if( val_temp < val_start ) val_temp = val_end;
|
||||
|
||||
tabdata.item1_page0_color_input = (COLORS)val_temp;
|
||||
|
|
@ -285,7 +295,17 @@ void set_item1_value(ITEM_CONTENTS con, int8_t step)
|
|||
val_temp = (uint8_t)tabdata.item1_page0_color_output;
|
||||
val_temp += step;
|
||||
|
||||
if( val_temp > val_end ) val_temp = val_start;
|
||||
if( val_temp > val_end )
|
||||
{
|
||||
if( val_temp < 200)
|
||||
{
|
||||
val_temp = val_start;
|
||||
}
|
||||
else
|
||||
{
|
||||
val_temp = val_end;
|
||||
}
|
||||
}
|
||||
if( val_temp < val_start ) val_temp = val_end;
|
||||
|
||||
tabdata.item1_page0_color_output = (COLORS)val_temp;
|
||||
|
|
@ -302,26 +322,7 @@ void set_item2_value(ITEM_CONTENTS con, int8_t step)
|
|||
{
|
||||
switch (con)
|
||||
{
|
||||
case DATA_SAVE:
|
||||
{
|
||||
if(tabdata.item2_page0_saveflag == 0)
|
||||
{
|
||||
tabdata.item2_page0_saveflag = 1;
|
||||
|
||||
save_cnt = 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case DATA_RESET:
|
||||
{
|
||||
if(tabdata.item2_page0_resetflag == 0)
|
||||
{
|
||||
tabdata.item2_page0_resetflag = 1;
|
||||
|
||||
reset_cnt = 0;
|
||||
}
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -373,12 +374,31 @@ void set_item3_value(ITEM_CONTENTS con, int8_t step)
|
|||
|
||||
tabdata.item3_page0_language = (LANGUAGES)val_temp;
|
||||
|
||||
if(tabdata.item3_page0_saveflag == 2) tabdata.item3_page0_saveflag = 0;
|
||||
if(tabdata.item3_page0_resetflag == 2) tabdata.item3_page0_resetflag = 0;
|
||||
|
||||
if(tabdata.item2_page0_saveflag == 2) tabdata.item2_page0_saveflag = 0;
|
||||
if(tabdata.item2_page0_resetflag == 2) tabdata.item2_page0_resetflag = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
//修改语言选项后，随即更改标题、选项卡、当前页面的语言
|
||||
setting_laguage_switch(tabdata.item3_page0_language);
|
||||
case DATA_SAVE:
|
||||
{
|
||||
if(tabdata.item3_page0_saveflag == 0)
|
||||
{
|
||||
tabdata.item3_page0_saveflag = 1;
|
||||
|
||||
save_cnt = 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case DATA_RESET:
|
||||
{
|
||||
if(tabdata.item3_page0_resetflag == 0)
|
||||
{
|
||||
tabdata.item3_page0_resetflag = 1;
|
||||
|
||||
reset_cnt = 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,186 @@
|
|||
#include "scr_setting_text.h"
|
||||
|
||||
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] =
|
||||
{
|
||||
"量程设置",
|
||||
"曲线设置",
|
||||
"拓展功能",
|
||||
"系统设置"
|
||||
};
|
||||
|
||||
static char items_text_english[ITEM_NUM_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Range",
|
||||
"Chart",
|
||||
"Extra",
|
||||
"System"
|
||||
};
|
||||
/****************Items****************/
|
||||
|
||||
|
||||
|
||||
/****************Contents****************/
|
||||
static char item0_contents_text_chinese[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"电压单位",
|
||||
"电压上限",
|
||||
"电压下限",
|
||||
"电流上限",
|
||||
"电流下限",
|
||||
"电阻上限",
|
||||
|
||||
"电阻下限",
|
||||
"频率上限",
|
||||
"频率下限",
|
||||
"热电偶类型",
|
||||
"热电偶上限",
|
||||
"热电偶下限",
|
||||
|
||||
"热电阻上限",
|
||||
"热电阻下限"
|
||||
};
|
||||
|
||||
static char item0_contents_text_english[ITEM0_CONTENT_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"Voltage unit",
|
||||
"Voltage max",
|
||||
"Voltage min",
|
||||
"Current max",
|
||||
"Current min",
|
||||
"Res max",
|
||||
|
||||
"Res min",
|
||||
"Fre max",
|
||||
"Fre min",
|
||||
"TC type",
|
||||
"TC max",
|
||||
"TC min",
|
||||
|
||||
"RTD max",
|
||||
"RTD min"
|
||||
};
|
||||
|
||||
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",
|
||||
"plop count",
|
||||
"Color-input",
|
||||
"Color-output"
|
||||
};
|
||||
|
||||
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",
|
||||
"Output log",
|
||||
"Interaction",
|
||||
"Progam out"
|
||||
};
|
||||
|
||||
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",
|
||||
"Language",
|
||||
"Config save",
|
||||
"Config reset"
|
||||
};
|
||||
|
||||
static char item3_contents_value_chinese[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"开",
|
||||
"关",
|
||||
"简体中文",
|
||||
"English",
|
||||
"未保存",
|
||||
"保存中",
|
||||
"已保存",
|
||||
"未复位",
|
||||
"复位中",
|
||||
"已复位",
|
||||
};
|
||||
|
||||
static char item3_contents_value_english[ITEM3_CONTENT_VAL_MAX][TEXT_LENGTH_MAX] =
|
||||
{
|
||||
"ON",
|
||||
"OFF",
|
||||
"简体中文",
|
||||
"English",
|
||||
"No save",
|
||||
"saving",
|
||||
"saved",
|
||||
"No reset",
|
||||
"resetting",
|
||||
"已复位",
|
||||
};
|
||||
/****************Contents****************/
|
||||
|
||||
|
||||
|
||||
//设置界面语言切换
|
||||
void setting_laguage_switch(LANGUAGES lan)
|
||||
{
|
||||
switch (lan)
|
||||
{
|
||||
case MENU_SIMPLYFY_CHINESE:
|
||||
{
|
||||
memcpy(text_pack.title, title_text_chinese, sizeof(text_pack.title)) ;
|
||||
memcpy(text_pack.items, items_text_chinese, sizeof(text_pack.items)) ;
|
||||
memcpy(text_pack.item_0, item0_contents_text_chinese, sizeof(text_pack.item_0)) ;
|
||||
memcpy(text_pack.item_1, item1_contents_text_chinese, sizeof(text_pack.item_1)) ;
|
||||
memcpy(text_pack.item_2, item2_contents_text_chinese, sizeof(text_pack.item_2)) ;
|
||||
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)) ;
|
||||
}
|
||||
break;
|
||||
|
||||
case MENU_ENGLISH:
|
||||
{
|
||||
memcpy(text_pack.title, title_text_english, sizeof(text_pack.title)) ;
|
||||
memcpy(text_pack.items, items_text_english, sizeof(text_pack.items)) ;
|
||||
memcpy(text_pack.item_0, item0_contents_text_english, sizeof(text_pack.item_0)) ;
|
||||
memcpy(text_pack.item_1, item1_contents_text_english, sizeof(text_pack.item_1)) ;
|
||||
memcpy(text_pack.item_2, item2_contents_text_english, sizeof(text_pack.item_2)) ;
|
||||
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)) ;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -86,7 +86,6 @@ typedef struct
|
|||
lv_obj_t *screen_hidden;
|
||||
bool screen_hidden_del;
|
||||
lv_obj_t *screen_hidden_label_size14;
|
||||
lv_obj_t *screen_hidden_label_size16;
|
||||
}lv_ui;
|
||||
|
||||
typedef void (*ui_setup_scr_t)(lv_ui * ui);
|
||||
|
|
|
|||
|
|
@ -855,21 +855,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x1c, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+50A8 "储" */
|
||||
0x0, 0x28, 0x0, 0x0, 0x19, 0x0, 0x0, 0x0,
|
||||
0x7, 0x97, 0x20, 0x2, 0xb0, 0x4, 0x0, 0x0,
|
||||
0xb4, 0x2c, 0x6, 0x7d, 0xaa, 0xe2, 0x0, 0xd,
|
||||
0x0, 0x40, 0x2, 0xb0, 0xc4, 0x0, 0x3, 0xe4,
|
||||
0x6c, 0x10, 0x2b, 0x97, 0x22, 0x0, 0x8d, 0x0,
|
||||
0xd3, 0x67, 0xdb, 0x68, 0x80, 0x16, 0xd0, 0xd,
|
||||
0x0, 0x76, 0x0, 0x30, 0x2, 0xd, 0x0, 0xd0,
|
||||
0x7e, 0x66, 0x7e, 0x10, 0x0, 0xd0, 0xd, 0x30,
|
||||
0xd0, 0x1, 0xc0, 0x0, 0xd, 0x0, 0xd1, 0x2e,
|
||||
0x66, 0x7c, 0x0, 0x0, 0xd0, 0xf, 0x90, 0xd0,
|
||||
0x1, 0xc0, 0x0, 0xd, 0x4, 0xb0, 0xe, 0x66,
|
||||
0x7c, 0x0, 0x0, 0xc0, 0x0, 0x0, 0xc0, 0x1,
|
||||
0xb0, 0x0,
|
||||
|
||||
/* U+5165 "入" */
|
||||
0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x28, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
|
@ -913,6 +898,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xd6, 0x66, 0x7c, 0x66, 0x69, 0x90, 0x3, 0x0,
|
||||
0x0, 0x0, 0x0, 0x48, 0x0,
|
||||
|
||||
/* U+529F "功" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x94, 0x0, 0x0, 0x0,
|
||||
0x0, 0x7, 0x0, 0xc2, 0x0, 0x0, 0x6, 0x6d,
|
||||
0x67, 0x30, 0xc2, 0x0, 0x0, 0x0, 0xe, 0x2,
|
||||
0x66, 0xe7, 0x66, 0xc2, 0x0, 0xe, 0x0, 0x0,
|
||||
0xd0, 0x0, 0xe0, 0x0, 0xe, 0x0, 0x0, 0xe0,
|
||||
0x0, 0xd0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x1,
|
||||
0xd0, 0x0, 0xe, 0x2, 0x35, 0x70, 0x2, 0xb0,
|
||||
0x0, 0x1f, 0x95, 0xa, 0x20, 0x4, 0xa0, 0x2c,
|
||||
0xc5, 0x0, 0x3a, 0x0, 0x6, 0x80, 0x4, 0x0,
|
||||
0x0, 0xa1, 0x0, 0x9, 0x50, 0x0, 0x0, 0x9,
|
||||
0x20, 0x23, 0x3e, 0x10, 0x0, 0x1, 0x71, 0x0,
|
||||
0x3, 0xe7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+5355 "单" */
|
||||
0x0, 0x3, 0x20, 0x0, 0x27, 0x0, 0x0, 0x0,
|
||||
0xb, 0x50, 0xa, 0x60, 0x0, 0x0, 0x0, 0x3c,
|
||||
|
|
@ -941,21 +941,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x66, 0x66, 0x60, 0x10, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+53C2 "参" */
|
||||
0x0, 0x0, 0x3, 0x70, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x5d, 0x40, 0x14, 0x0, 0x0, 0x0, 0x2a,
|
||||
0x70, 0x1, 0x16, 0xd3, 0x0, 0x0, 0xcd, 0xcc,
|
||||
0xe7, 0x63, 0x4b, 0x0, 0x0, 0x0, 0xa, 0x90,
|
||||
0x0, 0x1, 0x60, 0x16, 0x66, 0xbc, 0x66, 0x79,
|
||||
0x67, 0x71, 0x0, 0x6, 0xa0, 0x2b, 0x16, 0x70,
|
||||
0x0, 0x0, 0x77, 0x4, 0xd3, 0x1, 0x6d, 0x82,
|
||||
0x25, 0x12, 0x97, 0x2, 0xc9, 0x1, 0x91, 0x0,
|
||||
0x44, 0x1, 0x8b, 0x40, 0x63, 0x0, 0x0, 0x4,
|
||||
0x77, 0x30, 0x2b, 0xb3, 0x0, 0x0, 0x31, 0x0,
|
||||
0x5b, 0xa4, 0x0, 0x0, 0x0, 0x36, 0x78, 0x51,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+578B "型" */
|
||||
0x0, 0x0, 0x0, 0x23, 0x0, 0x0, 0x91, 0x4,
|
||||
0x7a, 0x6b, 0x88, 0xe, 0x0, 0xe0, 0x0, 0x2a,
|
||||
|
|
@ -999,6 +984,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x2b, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0,
|
||||
|
||||
/* U+5C55 "展" */
|
||||
0x0, 0x30, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0,
|
||||
0xc7, 0x66, 0x66, 0x66, 0x6e, 0x40, 0x0, 0xc1,
|
||||
0x0, 0x0, 0x0, 0xd, 0x0, 0x0, 0xc7, 0x66,
|
||||
0x66, 0x66, 0x6e, 0x0, 0x0, 0xd1, 0x4, 0x90,
|
||||
0xd, 0x3, 0x0, 0x0, 0xe3, 0x69, 0xb6, 0x6e,
|
||||
0x8d, 0x0, 0x0, 0xe0, 0x4, 0x80, 0xe, 0x0,
|
||||
0x0, 0x0, 0xe0, 0x4, 0x80, 0xe, 0x4, 0x50,
|
||||
0x1, 0xc6, 0x6e, 0x69, 0x76, 0x68, 0x60, 0x4,
|
||||
0x70, 0xd, 0x0, 0x90, 0x8a, 0x0, 0x8, 0x30,
|
||||
0xd, 0x0, 0x6b, 0x40, 0x0, 0xa, 0x0, 0xe,
|
||||
0x46, 0x19, 0xc4, 0x0, 0x43, 0x0, 0x4e, 0x50,
|
||||
0x0, 0x4c, 0xd1, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+5DF2 "已" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x66,
|
||||
0x66, 0x66, 0x66, 0xd5, 0x0, 0x0, 0x0, 0x0,
|
||||
|
|
@ -1040,20 +1040,19 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x2a, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0,
|
||||
|
||||
/* U+636E "据" */
|
||||
0x0, 0x73, 0x1, 0x0, 0x0, 0x0, 0x10, 0x0,
|
||||
0xa3, 0xc, 0x76, 0x66, 0x67, 0xd0, 0x0, 0xa3,
|
||||
0x1c, 0x10, 0x0, 0x1, 0xb0, 0x36, 0xca, 0x9c,
|
||||
0x76, 0x66, 0x67, 0xb0, 0x0, 0xa3, 0xc, 0x10,
|
||||
0xc, 0x10, 0x40, 0x0, 0xa3, 0xd, 0x0, 0xe,
|
||||
0x0, 0x60, 0x0, 0xb8, 0x4e, 0x66, 0x6e, 0x67,
|
||||
0x82, 0x7c, 0xe3, 0xd, 0x0, 0xe, 0x0, 0x0,
|
||||
0x41, 0xa3, 0xa, 0x76, 0x6e, 0x67, 0xa0, 0x0,
|
||||
0xa3, 0x38, 0xa4, 0x0, 0x3, 0xb0, 0x0, 0xa3,
|
||||
0x73, 0xa4, 0x0, 0x3, 0xa0, 0x13, 0xc3, 0x80,
|
||||
0xa9, 0x66, 0x68, 0xa0, 0x6, 0xd2, 0x20, 0xa3,
|
||||
0x0, 0x3, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
/* U+62D3 "拓" */
|
||||
0x0, 0x29, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0,
|
||||
0x2a, 0x6, 0x66, 0x66, 0x66, 0xe7, 0x0, 0x2a,
|
||||
0x10, 0x0, 0xe2, 0x0, 0x0, 0x6, 0x8d, 0xb6,
|
||||
0x3, 0xe0, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x8,
|
||||
0x80, 0x0, 0x0, 0x0, 0x2a, 0x0, 0xe, 0x10,
|
||||
0x0, 0x20, 0x0, 0x3c, 0x74, 0x6f, 0x66, 0x66,
|
||||
0xf2, 0x2a, 0xdc, 0x0, 0xbe, 0x0, 0x0, 0xe0,
|
||||
0x16, 0x3a, 0x7, 0x1e, 0x0, 0x0, 0xe0, 0x0,
|
||||
0x2a, 0x41, 0xe, 0x0, 0x0, 0xe0, 0x0, 0x2a,
|
||||
0x10, 0xe, 0x0, 0x0, 0xe0, 0x1, 0x4a, 0x0,
|
||||
0xf, 0x66, 0x66, 0xe0, 0x3, 0xd6, 0x0, 0xd,
|
||||
0x0, 0x0, 0xd0,
|
||||
|
||||
/* U+63CF "描" */
|
||||
0x0, 0x29, 0x0, 0x4, 0x40, 0x44, 0x0, 0x0,
|
||||
|
|
@ -1331,6 +1330,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0xdd, 0xe8, 0x0, 0x0, 0x30, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+7F16 "编" */
|
||||
0x0, 0x43, 0x0, 0x0, 0x71, 0x0, 0x0, 0x0,
|
||||
0xd3, 0x1, 0x0, 0x49, 0x0, 0x20, 0x4, 0x90,
|
||||
0xb, 0x76, 0x67, 0x68, 0xc0, 0xa, 0x7, 0x9c,
|
||||
0x10, 0x0, 0x2, 0xa0, 0x89, 0x7d, 0x1b, 0x76,
|
||||
0x66, 0x68, 0xa0, 0x45, 0xa5, 0xc, 0x10, 0x0,
|
||||
0x1, 0x40, 0x3, 0x80, 0xd, 0x96, 0x66, 0x66,
|
||||
0xb1, 0x1a, 0x35, 0x3e, 0xc0, 0xa0, 0xa0, 0xc0,
|
||||
0x5d, 0x72, 0xd, 0xb0, 0xa0, 0xa0, 0xc0, 0x0,
|
||||
0x0, 0x2a, 0xb7, 0xd6, 0xd6, 0xd0, 0x4, 0x88,
|
||||
0x75, 0xb0, 0xa0, 0xa0, 0xc0, 0x4c, 0x30, 0x80,
|
||||
0xb0, 0xa0, 0x90, 0xc0, 0x0, 0x3, 0x30, 0xb0,
|
||||
0x30, 0x8, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+7F6E "置" */
|
||||
0x0, 0x30, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0,
|
||||
0xe6, 0x6e, 0x66, 0xe6, 0x6e, 0x30, 0x0, 0xe0,
|
||||
|
|
@ -1345,6 +1359,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x0, 0x0, 0xd2, 0x60, 0x26, 0x68, 0x66, 0x66,
|
||||
0x66, 0x87, 0x81,
|
||||
|
||||
/* U+80FD "能" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x3d, 0x10, 0x2, 0x90, 0x0, 0x0, 0x0, 0xc4,
|
||||
0x20, 0x3, 0xb0, 0x1b, 0x60, 0x8, 0x40, 0xb,
|
||||
0x23, 0xb6, 0x93, 0x0, 0x6d, 0xa9, 0x77, 0xb3,
|
||||
0xc0, 0x0, 0x10, 0x13, 0x0, 0x1, 0x33, 0xb0,
|
||||
0x0, 0x70, 0xa, 0x76, 0x6f, 0x31, 0xec, 0xcd,
|
||||
0xd0, 0xa, 0x20, 0xe, 0x1, 0x50, 0x0, 0x0,
|
||||
0xa, 0x86, 0x6e, 0x2, 0xb0, 0x3, 0x30, 0xa,
|
||||
0x20, 0xe, 0x2, 0xb0, 0x7c, 0x40, 0xa, 0x86,
|
||||
0x6e, 0x2, 0xd8, 0x40, 0x0, 0xa, 0x20, 0xe,
|
||||
0x2, 0xb0, 0x0, 0x20, 0xa, 0x20, 0xe, 0x2,
|
||||
0xb0, 0x0, 0x70, 0xa, 0x21, 0x9a, 0x0, 0xed,
|
||||
0xdd, 0xd1,
|
||||
|
||||
/* U+8272 "色" */
|
||||
0x0, 0x0, 0x82, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x7, 0xc0, 0x1, 0x40, 0x0, 0x0, 0x0, 0x1e,
|
||||
|
|
@ -1373,6 +1402,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0x66, 0x66, 0xf0, 0x0, 0x0, 0xd, 0x0, 0x0,
|
||||
0x0, 0xd0, 0x0,
|
||||
|
||||
/* U+8BAF "讯" */
|
||||
0x2, 0x30, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0,
|
||||
0xa5, 0x46, 0x79, 0x66, 0xd6, 0x0, 0x0, 0x2b,
|
||||
0x0, 0x3a, 0x0, 0xb2, 0x0, 0x0, 0x20, 0x0,
|
||||
0x3a, 0x0, 0xb2, 0x0, 0x36, 0xd5, 0x0, 0x3a,
|
||||
0x0, 0xb1, 0x0, 0x0, 0xb2, 0x0, 0x3a, 0x26,
|
||||
0xb2, 0x0, 0x0, 0xb2, 0x66, 0x8d, 0x65, 0xa2,
|
||||
0x0, 0x0, 0xb2, 0x0, 0x3a, 0x0, 0x93, 0x0,
|
||||
0x0, 0xb2, 0x0, 0x3a, 0x0, 0x86, 0x0, 0x0,
|
||||
0xb2, 0x41, 0x3a, 0x0, 0x58, 0x0, 0x0, 0xcb,
|
||||
0x30, 0x3a, 0x0, 0x1c, 0x13, 0x1, 0xe3, 0x0,
|
||||
0x3a, 0x0, 0xc, 0xb2, 0x0, 0x10, 0x0, 0x39,
|
||||
0x0, 0x2, 0xe3, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+8BB0 "记" */
|
||||
0x0, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x5c, 0x4, 0x66, 0x66, 0x6c, 0x60, 0x0, 0xb,
|
||||
|
|
@ -1431,6 +1475,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
|||
0xa0, 0x2b, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+901A "通" */
|
||||
0x3, 0x0, 0x0, 0x0, 0x0, 0x13, 0x0, 0x3,
|
||||
0xb0, 0x6, 0x66, 0x67, 0xe9, 0x0, 0x0, 0x96,
|
||||
0x0, 0x38, 0x98, 0x20, 0x0, 0x0, 0x24, 0x9,
|
||||
0x66, 0xac, 0x6a, 0x20, 0x0, 0x72, 0xd, 0x0,
|
||||
0xd0, 0xd, 0x0, 0x47, 0xd7, 0xd, 0x0, 0xd0,
|
||||
0xd, 0x0, 0x0, 0xb2, 0xe, 0x66, 0xe6, 0x6e,
|
||||
0x0, 0x0, 0xb2, 0xd, 0x0, 0xd0, 0xd, 0x0,
|
||||
0x0, 0xb2, 0xe, 0x66, 0xe6, 0x6e, 0x0, 0x0,
|
||||
0xb2, 0xd, 0x0, 0xd0, 0xd, 0x0, 0x0, 0xb6,
|
||||
0xd, 0x0, 0x70, 0x5d, 0x0, 0x1c, 0x25, 0x94,
|
||||
0x0, 0x0, 0x11, 0x0, 0x86, 0x0, 0x29, 0xde,
|
||||
0xee, 0xee, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+914D "配" */
|
||||
0x0, 0x0, 0x0, 0x50, 0x0, 0x0, 0x20, 0x26,
|
||||
0x88, 0xa6, 0x94, 0x66, 0x67, 0xe0, 0x0, 0x56,
|
||||
0xc0, 0x0, 0x0, 0x1, 0xc0, 0x9, 0x9a, 0xd6,
|
||||
0xb1, 0x0, 0x1, 0xc0, 0xd, 0x46, 0xb0, 0xe0,
|
||||
0x20, 0x1, 0xc0, 0xd, 0x54, 0xb0, 0xd0, 0xe6,
|
||||
0x67, 0xc0, 0xd, 0x72, 0xb1, 0xd0, 0xd0, 0x1,
|
||||
0xa0, 0xd, 0x70, 0x59, 0xd0, 0xd0, 0x0, 0x0,
|
||||
0xd, 0x0, 0x0, 0xd0, 0xd0, 0x0, 0x0, 0xe,
|
||||
0x66, 0x66, 0xd0, 0xd0, 0x0, 0x0, 0xd, 0x0,
|
||||
0x0, 0xd0, 0xd0, 0x0, 0x13, 0xe, 0x66, 0x66,
|
||||
0xd0, 0xe0, 0x0, 0x54, 0xc, 0x0, 0x0, 0xc0,
|
||||
0x9d, 0xdd, 0xc5,
|
||||
|
||||
/* U+91C7 "采" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x3, 0x72, 0x0, 0x0,
|
||||
0x2, 0x46, 0x9b, 0xca, 0x85, 0x0, 0x4, 0x64,
|
||||
|
|
@ -2468,114 +2541,119 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
|||
{.bitmap_index = 4333, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4424, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4515, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4613, .adv_w = 224, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 4613, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4711, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4809, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4907, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 4809, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 4894, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 4992, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5077, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5175, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5273, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5364, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5462, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5175, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5266, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5364, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5455, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5553, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 5638, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5729, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5820, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5918, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6016, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6114, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6212, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 6303, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 6381, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6472, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6570, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6668, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6773, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6878, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6983, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7074, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
|
||||
{.bitmap_index = 7152, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7243, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7334, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7425, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7523, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7621, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7719, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5820, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 5911, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6009, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6107, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6205, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 6296, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 6374, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 6465, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6563, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6661, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6766, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6871, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 6976, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7067, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
|
||||
{.bitmap_index = 7145, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7236, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7327, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7418, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7516, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7614, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7712, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 7810, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7901, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7992, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8083, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8181, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8272, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8370, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8461, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8552, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 8637, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 8722, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 8813, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 8904, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9009, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9114, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 9227, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 9304, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9395, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 9472, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 9527, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9632, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9737, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9841, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9946, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 10034, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10139, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10181, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10247, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10359, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 10436, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10511, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 10581, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10679, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10764, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10849, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 10919, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
|
||||
{.bitmap_index = 11010, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11069, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11128, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11213, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
|
||||
{.bitmap_index = 11239, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 11327, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11462, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 11590, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11681, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 11733, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 11785, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 11884, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 11961, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12066, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 12179, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12264, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12362, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12447, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12525, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12602, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 12677, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12775, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12873, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12961, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 13081, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13164, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13281, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13371, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13461, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13551, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13641, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13731, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13839, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13929, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14027, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 14140, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14239, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14322, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
|
||||
{.bitmap_index = 7901, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 7999, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8090, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8181, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8279, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8370, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8468, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8559, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8657, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8755, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8846, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 8937, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9028, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 9113, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
|
||||
{.bitmap_index = 9198, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 9289, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 9380, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9485, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9590, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 9703, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 9780, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 9871, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 9948, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 10003, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10108, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10213, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10317, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10422, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 10510, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10615, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10657, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 10723, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10835, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 10912, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10987, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11057, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11155, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11240, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11325, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11395, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
|
||||
{.bitmap_index = 11486, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11545, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11604, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 11689, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
|
||||
{.bitmap_index = 11715, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 11803, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 11938, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 12066, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12157, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 12209, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 12261, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12360, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 12437, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12542, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 12655, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12740, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12838, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 12923, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13001, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13078, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 13153, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13251, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13349, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13437, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 13557, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13640, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 13757, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13847, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 13937, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14027, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14117, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14207, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 14315, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14405, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14503, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 14616, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 14715, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14798, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
|
|
@ -2584,20 +2662,21 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
|||
|
||||
static const uint16_t unicode_list_2[] = {
|
||||
0x0, 0x1d5a, 0x4a61, 0x4a62, 0x4a84, 0x4ba4, 0x4baa, 0x4c34,
|
||||
0x4ccd, 0x4cff, 0x4dbc, 0x4dca, 0x4e51, 0x4fac, 0x4fe2, 0x5019,
|
||||
0x53e2, 0x5564, 0x57af, 0x5a49, 0x5b57, 0x5bac, 0x5fc5, 0x6026,
|
||||
0x4ccd, 0x4dbc, 0x4dca, 0x4e51, 0x4ef6, 0x4fac, 0x4fe2, 0x53e2,
|
||||
0x5564, 0x57af, 0x58ac, 0x5a49, 0x5b57, 0x5bac, 0x5f2a, 0x6026,
|
||||
0x61c7, 0x61de, 0x6265, 0x6349, 0x6381, 0x648e, 0x6998, 0x6d10,
|
||||
0x6d44, 0x6dbe, 0x6fde, 0x718c, 0x7662, 0x77d7, 0x78d2, 0x7952,
|
||||
0x7b16, 0x7b36, 0x7bc5, 0x7ec9, 0x8657, 0x8807, 0x8815, 0x8844,
|
||||
0x8bea, 0x8e1e, 0x8e26, 0x924b, 0x9292, 0x92a7, 0x92eb, 0x94e8,
|
||||
0x94f3, 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
|
||||
0x7b16, 0x7b36, 0x7b6d, 0x7bc5, 0x7d54, 0x7ec9, 0x8657, 0x8806,
|
||||
0x8807, 0x8815, 0x8844, 0x8bea, 0x8c71, 0x8da4, 0x8e1e, 0x8e26,
|
||||
0x924b, 0x9292, 0x92a7, 0x92eb, 0x94e8, 0x94f3, 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*/
|
||||
|
|
@ -2613,7 +2692,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 = 117, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 122, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -2651,7 +2730,8 @@ 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
|
||||
};
|
||||
|
||||
/*Map glyph_ids to kern right classes*/
|
||||
|
|
@ -2683,7 +2763,8 @@ 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
|
||||
};
|
||||
|
||||
/*Kern values between classes*/
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ void setup_scr_screen_hidden(lv_ui *ui)
|
|||
|
||||
//Write codes screen_hidden_label_size14
|
||||
ui->screen_hidden_label_size14 = lv_label_create(ui->screen_hidden);
|
||||
lv_label_set_text(ui->screen_hidden_label_size14, "热 电 偶 阻 ℃ Ω 类 型 频 率\n参 数 复 位 保 存 未 中 已 输 入 出 记 录 \n采 样 间 隔 描 点 颜 色\n照 明 语 言 简 体 文 开 关");
|
||||
lv_label_set_text(ui->screen_hidden_label_size14, "热 电 偶 阻 ℃ Ω 类 型 频 率\n\n采样间隔 描点数量 输入出颜色\n\n记录 编程 通讯\n\n照明 语言 配置保存 复位 \n\n");
|
||||
lv_label_set_long_mode(ui->screen_hidden_label_size14, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_pos(ui->screen_hidden_label_size14, 0, 0);
|
||||
lv_obj_set_size(ui->screen_hidden_label_size14, 320, 120);
|
||||
|
|
@ -51,29 +51,6 @@ void setup_scr_screen_hidden(lv_ui *ui)
|
|||
lv_obj_set_style_pad_left(ui->screen_hidden_label_size14, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_shadow_width(ui->screen_hidden_label_size14, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
|
||||
//Write codes screen_hidden_label_size16
|
||||
ui->screen_hidden_label_size16 = lv_label_create(ui->screen_hidden);
|
||||
lv_label_set_text(ui->screen_hidden_label_size16, "");
|
||||
lv_label_set_long_mode(ui->screen_hidden_label_size16, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_pos(ui->screen_hidden_label_size16, 0, 120);
|
||||
lv_obj_set_size(ui->screen_hidden_label_size16, 320, 120);
|
||||
|
||||
//Write style for screen_hidden_label_size16, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
||||
lv_obj_set_style_border_width(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_radius(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_color(ui->screen_hidden_label_size16, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_font(ui->screen_hidden_label_size16, &lv_font_SourceHanSerifSC_Regular_16, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_opa(ui->screen_hidden_label_size16, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_letter_space(ui->screen_hidden_label_size16, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_line_space(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_text_align(ui->screen_hidden_label_size16, LV_TEXT_ALIGN_LEFT, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_bg_opa(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_top(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_right(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_bottom(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_left(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_shadow_width(ui->screen_hidden_label_size16, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
|
||||
//The custom code of screen_hidden.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@ void setup_scr_screen_setting(lv_ui *ui)
|
|||
|
||||
//Write codes screen_setting_label_s2
|
||||
ui->screen_setting_label_s2 = lv_label_create(ui->screen_setting);
|
||||
lv_label_set_text(ui->screen_setting_label_s2, "数据存储");
|
||||
lv_label_set_text(ui->screen_setting_label_s2, "拓展功能");
|
||||
lv_label_set_long_mode(ui->screen_setting_label_s2, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_pos(ui->screen_setting_label_s2, 0, 140);
|
||||
lv_obj_set_size(ui->screen_setting_label_s2, 80, 50);
|
||||
|
|
|
|||
|
|
@ -220,6 +220,11 @@
|
|||
<WinNumber>1</WinNumber>
|
||||
<ItemText>tabdata,0x0A</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>13</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>text_pack,0x0A</ItemText>
|
||||
</Ww>
|
||||
</WatchWindow1>
|
||||
<WatchWindow2>
|
||||
<Ww>
|
||||
|
|
@ -3738,6 +3743,18 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>16</GroupNumber>
|
||||
<FileNumber>278</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\App\APP_WU\Src\scr_setting_text.c</PathWithFileName>
|
||||
<FilenameWithoutPath>scr_setting_text.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
</Group>
|
||||
|
||||
<Group>
|
||||
|
|
@ -3748,7 +3765,7 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>278</FileNumber>
|
||||
<FileNumber>279</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3760,7 +3777,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>279</FileNumber>
|
||||
<FileNumber>280</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3772,7 +3789,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>280</FileNumber>
|
||||
<FileNumber>281</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3784,7 +3801,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>281</FileNumber>
|
||||
<FileNumber>282</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3796,7 +3813,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>282</FileNumber>
|
||||
<FileNumber>283</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3808,7 +3825,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>283</FileNumber>
|
||||
<FileNumber>284</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3820,7 +3837,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>284</FileNumber>
|
||||
<FileNumber>285</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3832,7 +3849,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>285</FileNumber>
|
||||
<FileNumber>286</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3844,7 +3861,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>286</FileNumber>
|
||||
<FileNumber>287</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3856,7 +3873,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>287</FileNumber>
|
||||
<FileNumber>288</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3868,7 +3885,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>288</FileNumber>
|
||||
<FileNumber>289</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3880,7 +3897,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>289</FileNumber>
|
||||
<FileNumber>290</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3892,7 +3909,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>290</FileNumber>
|
||||
<FileNumber>291</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3904,7 +3921,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>291</FileNumber>
|
||||
<FileNumber>292</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3916,7 +3933,7 @@
|
|||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>292</FileNumber>
|
||||
<FileNumber>293</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
|
|
@ -3926,18 +3943,6 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>293</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\LVGL\myGUI\generated\guider_fonts\lv_font_SourceHanSerifSC_Regular_14.c</PathWithFileName>
|
||||
<FilenameWithoutPath>lv_font_SourceHanSerifSC_Regular_14.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>294</FileNumber>
|
||||
|
|
@ -4214,6 +4219,18 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>17</GroupNumber>
|
||||
<FileNumber>317</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>
|
||||
|
|
|
|||
|
|
@ -2508,6 +2508,11 @@
|
|||
<FileType>1</FileType>
|
||||
<FilePath>..\App\APP_WU\Src\key_functions.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>scr_setting_text.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\APP_WU\Src\scr_setting_text.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
@ -2588,11 +2593,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>
|
||||
|
|
@ -2708,6 +2708,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