From a1810b89e66f184c62a0588ae7d57c91d0c376e8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 30 May 2024 20:06:09 +0800
Subject: [PATCH] 继续测试修改
---
HARDWARE/EXTI/exti.c | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index 6033ecb..cdfcff2 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -70,21 +70,32 @@
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)
- ValveCtrlOrder(VC_OPEN);
+ ValveCtrlOrder(VC_CLOSE);
}else
{
//������Դ
+ if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) ==0){
+ //�״λ��ѣ�LCD�����ϵ磬ʹ��key2��key3������Ч�������״λ�����Ҫ��ʼ��Һ���������ñ�־λ
+ lcd_first_wake_up_flag_g = SET;
+ Lcd_GPIO_Init();
+ LCD_PWR_ON;
+ }
+
__SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
- lcd_wake_up_flag_g = 1;
+ lcd_wake_up_flag_g = SET;
+ Key_GPIO_Init();
+
+ pwr_vol_g.lith_flag = LMS_KEY; //����Դ���ɼ�һ�ε�ص�ѹ
+ pwr_vol_g.alka_flag = AMS_KEY;
}
}
@@ -95,7 +106,7 @@
GPIO_EXTI_EXTIISR_ClrEx(KEY2_PORT, KEY2_PIN);
if(KEY2_IO_READ==Bit_RESET)
{
- lcd_wake_up_flag_g = 1;
+ lcd_wake_up_flag_g = SET;
if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0){ //��������ⰴ�����ü���ʱ��
__SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
}
@@ -113,7 +124,7 @@
start_rs485_g = RS485_START_REASON_KEY;
start_wrc_g = WRC_MEANS_KEY;
}else{
- lcd_wake_up_flag_g = 1;
+ lcd_wake_up_flag_g = SET;
}
if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0){ //��������ⰴ�����ü���ʱ��
@@ -123,11 +134,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