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] 继续完善
---
Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c b/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c
index 8676d98..f3ff57b 100644
--- a/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c
+++ b/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c
@@ -121,9 +121,9 @@
delay_ms(1);
if(IO_JitterEliminationCheck(LF_PULSE_INT_PORT,LF_PULSE_INT_PIN,1,Bit_SET)==SET){
- __SYS_STATUS_BYTES_GET(broken_line) = SET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,SET,ALARM_ID_BROKEN_LINE);
}else{
- __SYS_STATUS_BYTES_GET(broken_line) = RESET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
}else{
@@ -142,12 +142,12 @@
if((flow_meter_para_g.flow_meter_code !=ASMODBUS)&&(flow_meter_para_g.flow_meter_code !=AS100MODBUS)&&(flow_meter_para_g.flow_meter_code !=SIARGO_MODBUS)){
if(IO_JitterEliminationCheck(LF_PULSE_INT_PORT,LF_PULSE_INT_PIN,501,Bit_RESET)==SET){
- __SYS_STATUS_BYTES_GET(broken_line) = SET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,SET,ALARM_ID_BROKEN_LINE);
}else{
- __SYS_STATUS_BYTES_GET(broken_line) = RESET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
}else{
- __SYS_STATUS_BYTES_GET(broken_line) = RESET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
}
@@ -170,9 +170,9 @@
delay_ms(1);
if(IO_JitterEliminationCheck(UNDER_PWR_INT_PORT,UNDER_PWR_INT_PIN,1,Bit_SET)==SET){
- __SYS_STATUS_BYTES_GET(broken_line) = SET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,SET,ALARM_ID_BROKEN_LINE);
}else{
- __SYS_STATUS_BYTES_GET(broken_line) = RESET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
UV_LOSE_CHECK_DISABLE;
@@ -209,9 +209,9 @@
delay_ms(1);
if(IO_JitterEliminationCheck(LOW_PWR_INT_PORT,LOW_PWR_INT_PIN,1,Bit_SET)==SET){
- __SYS_STATUS_BYTES_GET(broken_line) = SET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,SET,ALARM_ID_BROKEN_LINE);
}else{
- __SYS_STATUS_BYTES_GET(broken_line) = RESET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
LV_LOSE_CHECK_DISABLE;
@@ -248,9 +248,9 @@
delay_ms(1);
if(IO_JitterEliminationCheck(CV_ALM_A_PORT,CV_ALM_A_PIN,1,Bit_SET)==SET){
- __SYS_STATUS_BYTES_GET(broken_line) = SET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,SET,ALARM_ID_BROKEN_LINE);
}else{
- __SYS_STATUS_BYTES_GET(broken_line) = RESET ;
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
CV_LOSE_CHECK_DISABLE;
@@ -455,6 +455,8 @@
//���߱����� ��Ϊ�ܶ��߶����Ը��ö��ߣ����Զ��߷�������ж�
if(broken_line_cnt >= ALARM_LINE_CONTINUE_TIMES){
__SYS_STATUS_ALARM_BYTES_SET(broken_line,ALARM_ID_BROKEN_LINE);
+ }else{
+ __SYS_STATUS_BYTES_STATUS(broken_line,RESET,ALARM_ID_BROKEN_LINE);
}
--
Gitblit v1.9.3