From 6c7e61a54ef9b96f79704f0b965664e89f57dd52 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 29 May 2024 17:41:52 +0800
Subject: [PATCH] 增加休眠，开始上板测试
---
HARDWARE/EXTI/exti.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index 6033ecb..549c290 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -70,12 +70,12 @@
if(KEY1_IO_READ==Bit_RESET)
{
- if(KEY3_IO_READ==Bit_RESET)
+ if((KEY3_IO_READ==Bit_RESET)&&(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0))
{
//����
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)
+ }else if((KEY2_IO_READ==Bit_RESET)&&(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0))
{
//�ط�
if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
@@ -123,11 +123,11 @@
}
}
- if(GPIO_EXTI_EXTIISR_ChkEx(KEY4_PORT, KEY4_PIN) == SET) //key4�ж�
- {
- GPIO_EXTI_EXTIISR_ClrEx(KEY4_PORT, KEY4_PIN);
+// if(GPIO_EXTI_EXTIISR_ChkEx(KEY4_PORT, KEY4_PIN) == SET) //key4�ж�
+// {
+// GPIO_EXTI_EXTIISR_ClrEx(KEY4_PORT, KEY4_PIN);
- }
+// }
if(GPIO_EXTI_EXTIISR_ChkEx(Motor_OP_PORT, Motor_OP_PIN) == SET) //���ſ���λ�ж�
{
--
Gitblit v1.9.3