update:V1.3
1.修复实时报警索引错误 2.修复历史报警消息跨扇区显示错误 3.修复历史报警满一千条后会误擦除其他有效数据 4.修复TCP写入解析错误
This commit is contained in:
@@ -68,6 +68,8 @@ static void gui_tjc_hmi_all_page_index_clear(void);
|
||||
static u8 hmi_tx_buffer[HMI_TX_BUFFER_NUM];
|
||||
/*<2A>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD>ƴ<EFBFBD><C6B4> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
|
||||
static char gui_tjc_hmi_text_buffer[GUI_TJC_HMI_TEXT_BUFFER_NUM];
|
||||
/*<2A>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
|
||||
app_leakage_sub_device_flash_data_t temp_buffer[APP_LEAKAGE_SUB_DEVICE_NUM];
|
||||
/*<2A>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD> <20>˿ں<CBBF>*/
|
||||
static char *hmi_proto_string_com[] =
|
||||
{
|
||||
@@ -149,10 +151,7 @@ static void gui_tjc_hmi_save_password_to_w25q(void)
|
||||
|
||||
/* <20><><EFBFBD>豸<EFBFBD><E8B1B8>Ϣ<EFBFBD><CFA2>app_leakage<67><65><EFBFBD>浽W25Q32 */
|
||||
static void gui_tjc_hmi_save_device_info_to_w25q(void)
|
||||
{
|
||||
/* <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
app_leakage_sub_device_flash_data_t temp_buffer[APP_LEAKAGE_SUB_DEVICE_NUM];
|
||||
|
||||
{
|
||||
/* <20><>app_leakage<67>ṹ<EFBFBD>帴<EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
for(int i = 0; i < APP_LEAKAGE_SUB_DEVICE_NUM; i++)
|
||||
{
|
||||
@@ -306,7 +305,7 @@ static void gui_tjc_hmi_main_send(u8 cmd,u8 opa,u8 *p_data)
|
||||
}
|
||||
len += 3;
|
||||
/*<2A><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>*/
|
||||
len += gui_tjc_hmi_tx_text_display(GUI_MAIN,0,2,(char *)&hmi_tx_buffer[len],
|
||||
len += gui_tjc_hmi_tx_text_display(GUI_MAIN,0,3,(char *)&hmi_tx_buffer[len],
|
||||
"%s",SwVersion);
|
||||
|
||||
if(HMI_PROTO_CMD_GET == cmd)/*<2A><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>*/
|
||||
@@ -521,6 +520,13 @@ static void gui_tjc_hmi_curr_alarm_send(u8 cmd,u8 opa,u8 *p_data)
|
||||
{
|
||||
page_num++;
|
||||
}
|
||||
|
||||
if (page_num == 0) {
|
||||
page_num = 1;
|
||||
}
|
||||
if (p_tjc_hmi->page.real_alarm_index >= page_num) {
|
||||
p_tjc_hmi->page.real_alarm_index = page_num - 1;
|
||||
}
|
||||
len += gui_tjc_hmi_tx_text_display(GUI_CURR_ALARM,0, 0,
|
||||
(char *)&hmi_tx_buffer[len],
|
||||
"%d/%d",
|
||||
@@ -1221,7 +1227,7 @@ static void gui_tjc_hmi_history_alarm_send(u8 cmd,u8 opa,u8 *p_data)
|
||||
#define HISTORY_ALARM_PER_PAGE (15) /* ÿҳ15<31><35><EFBFBD><EFBFBD>ʷ<EFBFBD><CAB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
u16 len = 0, i, j;
|
||||
u8 page_num, remain_records, display_count;
|
||||
u32 total_records, start_index, record_index;
|
||||
u32 total_records, start_index, record_index = 0;
|
||||
app_leakage_history_alarm_t history_record;
|
||||
char time_str[20];
|
||||
char alarm_type_str[20];
|
||||
|
||||
Reference in New Issue
Block a user