From fa6053f85287163f6e2d5dba690bec05cbc95f4a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 07 Jun 2024 17:00:49 +0800
Subject: [PATCH] 增加阀控事件记录及修改阀控命令
---
HARDWARE/EXTI/exti.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index 9f04559..825ec2e 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -48,6 +48,13 @@
}
}
+ // �ж���λ����ʱʱ��
+ if (sys_delay_sec_para_g.UC_active_time.delay_time)
+ {
+ if (!(--sys_delay_sec_para_g.UC_active_time.delay_time))
+ sys_delay_sec_para_g.UC_active_time.delay_flag = SET;
+ }
+
// �ж�GPRS��ʱʱ��
if (sys_delay_sec_para_g.wrc_timeout_para.delay_time)
{
@@ -74,12 +81,12 @@
{
//����
if(__SYS_STATUS_BYTES_GET(account_state) == RESET ||__SYS_STATUS_BYTES_GET(valve_lock) == RESET )
- ValveCtrlOrder(VC_OPEN);
+ ValveCtrlOrder(VC_OPEN,VALVE_CTRL_SOURCE_KEY);
}else if((KEY2_IO_READ==Bit_RESET)&&(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0))
{
//�ط�
if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
- ValveCtrlOrder(VC_CLOSE);
+ ValveCtrlOrder(VC_CLOSE,VALVE_CTRL_SOURCE_KEY);
}else
{
//������Դ
--
Gitblit v1.9.3