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] 阀门控制进一步完善
---
HARDWARE/EXTI/exti.c | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index f240803..6ed076c 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -10,6 +10,8 @@
#include "system_mem_para.h"
#include "system_run_fun.h"
#include "power_manage.h"
+#include "pulse_and_alarm_line.h"
+#include "tim.h"
void NMI_Handler(void)
{
@@ -61,11 +63,13 @@
if(KEY3_IO_READ==Bit_RESET)
{
//����
-
+ if(__SYS_STATUS_BYTES_GET(account_state) == RESET ||__SYS_STATUS_BYTES_GET(valve_lock) == RESET )
+ ValveCtrlOrder(VC_OPEN);
}else if(KEY2_IO_READ==Bit_RESET)
{
//�ط�
-
+ if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
+ ValveCtrlOrder(VC_OPEN);
}else
{
//������Դ
@@ -140,6 +144,20 @@
}
+ if(GPIO_EXTI_EXTIISR_ChkEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN) == SET) //�Ʒѵ�Ƶ����
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN);
+ //Ŀǰ�������Ʒ����幦����û�б����ò���Ҫ����
+ if(((flow_meter_para_g.broken_line_multiplex & BROKEN_LINE_MUTIPLEX_PULSE)!=BROKEN_LINE_MUTIPLEX_PULSE)&& \
+ ((flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_PULSE)||(flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_RS485_AND_PULSE))){
+ pulse_exti_flag = SET;
+ BTx_CR1_CHEN_Setable(BT1,ENABLE); //������ʱ��
+
+ }
+
+ }
+
+
// if(GPIO_EXTI_EXTIISR_ChkEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN) == SET)
// {
// GPIO_EXTI_EXTIISR_ClrEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN);
--
Gitblit v1.9.3