From 6ea1a42391f86e72f53042a966dae970a3fd77cb Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 17 May 2024 17:18:57 +0800
Subject: [PATCH] 阀门控制进一步完善
---
Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c | 9 +++++----
1 files changed, 5 insertions(+), 4 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 a9215e3..8676d98 100644
--- a/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c
+++ b/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.c
@@ -3,6 +3,7 @@
#include "gpio.h"
#include "sizhu_ctrl_word.h"
#include "tim.h"
+#include "linked_list.h"
__IO int16_t pulse_count =0; //�����������һ������+1,���ս��㵽�ۻ�����,����֮������
__IO FlagStatus pulse_exti_flag = RESET;
@@ -360,7 +361,7 @@
//Ƿѹ��������
if(under_pwr_line_cnt >= ALARM_LINE_CONTINUE_TIMES){
- __SYS_STATUS_ALARM_BYTES_SET(flow_meter_under_pwr);
+ __SYS_STATUS_ALARM_BYTES_SET(flow_meter_under_pwr,ALARM_ID_FLOW_BAT_DOWN);
}
@@ -404,7 +405,7 @@
//�͵籨������
if(low_pwr_line_cnt >= ALARM_LINE_CONTINUE_TIMES){
- __SYS_STATUS_ALARM_BYTES_SET(flow_meter_low_pwr);
+ __SYS_STATUS_ALARM_BYTES_SET(flow_meter_low_pwr,ALARM_ID_FLOW_BAT_LOW);
}
/*�ط�������*/
@@ -446,14 +447,14 @@
//�ⲿ�����ط���������
if(close_valve_line_cnt >= ALARM_LINE_CONTINUE_TIMES){
- __SYS_STATUS_ALARM_BYTES_SET(ex_trigger_close_valve);
+ __SYS_STATUS_ALARM_BYTES_SET(ex_trigger_close_valve,ALARM_ID_EX_TRIGGER_CLOSE_VALVE);
}
//���߱����� ��Ϊ�ܶ��߶����Ը��ö��ߣ����Զ��߷�������ж�
if(broken_line_cnt >= ALARM_LINE_CONTINUE_TIMES){
- __SYS_STATUS_ALARM_BYTES_SET(broken_line);
+ __SYS_STATUS_ALARM_BYTES_SET(broken_line,ALARM_ID_BROKEN_LINE);
}
--
Gitblit v1.9.3