From b39a40b0191e0a8b155db74e885ff66e17b91896 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 06 Jun 2024 19:25:15 +0800
Subject: [PATCH] 继续完善
---
Soft/sizhu_ctrl_word.c | 130 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.c b/Soft/sizhu_ctrl_word.c
index 345e607..eb1e542 100644
--- a/Soft/sizhu_ctrl_word.c
+++ b/Soft/sizhu_ctrl_word.c
@@ -8,7 +8,7 @@
SYSTEM_STATUS_WORD_T system_status_word_g;
SYSTEM_FUNCTION_CTRL_WORD_T system_function_ctrl_word_g = { \
-.fun_ctrl_word.billing_type = 0x02, \
+ .fun_ctrl_word.billing_type = 0x02, \
};
SYSTEM_ALARM_WORD_T system_alarm_word_g; //�����ϱ����ϱ������
@@ -17,75 +17,75 @@
SYSTEM_ALARM_CTRL_WORD_T system_alarm_ctrl_word_g= {.alarm_ctl_word={
-.system_start = 1,
-.power_state = 1,
-.valve_error = 1,
-.valve_state_change = 1,
-.set_cumulate_up_to = 1,
-.no_use_gas_date_up_to = 1,
-.no_gprs_date_up_to = 1,
-.balance_small_3 = 1,
-.lith_low = 1,
-.lith_down = 1,
-.lith_remove = 1,
-.alka_low = 1,
-.alka_down = 1,
-.alka_remove = 1,
-.gprs_status = 1, //Զ��ʧ��ֻ���������ϱ�
-.RS485_err = 1,
-.RS485_lessen = 1,
-.broken_line = 1,
-.temp_err = 1,
-.cpu_temp_up = 1,
-.cpu_temp_down = 1,
-.press_err = 1,
-.lcd_up = 1,
-.cl_have_flow = 1,
-}
+ .system_start = 1,
+ .power_state = 1,
+ .valve_error = 1,
+ .valve_state_change = 1,
+ .set_cumulate_up_to = 1,
+ .no_use_gas_date_up_to = 1,
+ .no_gprs_date_up_to = 1,
+ .balance_small_3 = 1,
+ .lith_low = 1,
+ .lith_down = 1,
+ .lith_remove = 1,
+ .alka_low = 1,
+ .alka_down = 1,
+ .alka_remove = 1,
+ .gprs_status = 1, //Զ��ʧ��ֻ���������ϱ�
+ .RS485_err = 1,
+ .RS485_lessen = 1,
+ .broken_line = 1,
+ .temp_err = 1,
+ .cpu_temp_up = 1,
+ .cpu_temp_down = 1,
+ .press_err = 1,
+ .lcd_up = 1,
+ .cl_have_flow = 1,
+ }
};
SYSTEM_ALARM_CTRL_WORD_T system_alarm_report_ctrl_word_g= {.alarm_ctl_word={
-.system_start = 1,
-.power_state = 1,
-.valve_error = 1,
-.valve_state_change = 1,
-.set_cumulate_up_to = 1,
-.no_use_gas_date_up_to = 1,
-.no_gprs_date_up_to = 1,
-.balance_small_3 = 1,
-.lith_low = 1,
-.lith_down = 1,
-.lith_remove = 1,
-.alka_low = 1,
-.alka_down = 1,
-.alka_remove = 1,
-//.gprs_status = 1, //Զ��ʧ��ֻ���������ϱ�
-.RS485_err = 1,
-.RS485_lessen = 1,
-.broken_line = 1,
-.temp_err = 1,
-.cpu_temp_up = 1,
-.cpu_temp_down = 1,
-.press_err = 1,
-.lcd_up = 1,
-.cl_have_flow = 1,
-}
+ .system_start = 1,
+ .power_state = 1,
+ .valve_error = 1,
+ .valve_state_change = 1,
+ .set_cumulate_up_to = 1,
+ .no_use_gas_date_up_to = 1,
+ .no_gprs_date_up_to = 1,
+ .balance_small_3 = 1,
+ .lith_low = 1,
+ .lith_down = 1,
+ .lith_remove = 1,
+ .alka_low = 1,
+ .alka_down = 1,
+ .alka_remove = 1,
+ //.gprs_status = 1, //Զ��ʧ��ֻ���������ϱ�
+ .RS485_err = 1,
+ .RS485_lessen = 1,
+ .broken_line = 1,
+ .temp_err = 1,
+ .cpu_temp_up = 1,
+ .cpu_temp_down = 1,
+ .press_err = 1,
+ .lcd_up = 1,
+ .cl_have_flow = 1,
+ }
};
VALVE_CTL_BYTES_UNION_T valve_ctl_bytes_g = {.valve_ctrl_bytes = {
-{0},
-{0},
-{0},
-{.lith_down_need_close_valve_flag =1,.lith_down_close_valve_type = 1,.lith_remove_need_close_valve_flag =1,.lith_remove_close_valve_type =1,
-//.alka_down_need_close_valve_flag= 1,.alka_down_close_valve_type = 1,.alka_remove_need_close_valve_flag =1,.alka_remove_close_valve_type =1,
-},
-{0},
-{0},
-{0},
-{0},
-{0},
-{0},
-{0},}
+ {0},
+ {0},
+ {0},
+ {.lith_down_need_close_valve_flag =1,.lith_down_close_valve_type = 1,.lith_remove_need_close_valve_flag =1,.lith_remove_close_valve_type =1,
+ //.alka_down_need_close_valve_flag= 1,.alka_down_close_valve_type = 1,.alka_remove_need_close_valve_flag =1,.alka_remove_close_valve_type =1,
+ },
+ {0},
+ {0},
+ {0},
+ {0},
+ {0},
+ {0},
+ {0},}
};
@@ -237,7 +237,7 @@
/*���������ϱ�*/
if(AlarmTriggerWrcFlag ==SET){
AlarmTriggerWrcFlag = RESET;
- start_wrc_g = WRC_MEANS_ALARM;//���ڱ���
+// start_wrc_g = WRC_MEANS_ALARM;//���ڱ��� ������ע��
}
/*������������*/
--
Gitblit v1.9.3