From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
Function/KEY/key.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Function/KEY/key.c b/Function/KEY/key.c
index d5af81e..84e7d16 100644
--- a/Function/KEY/key.c
+++ b/Function/KEY/key.c
@@ -18,6 +18,13 @@
// InputtIO(KEY4_PORT,KEY4_PIN,IN_PULLUP);
}
+void Key_GPIO_Close(void)
+{
+ CloseIO(KEY2_PORT,KEY2_PIN);
+ CloseIO(KEY3_PORT,KEY3_PIN);
+// InputtIO(KEY4_PORT,KEY4_PIN,IN_PULLUP);
+}
+
void keyPro(void)
@@ -52,7 +59,7 @@
/**����ĿǰKey2��key3�õ�PE14��PE15����û���жϣ���ʱֻ����ѯ��ѯ*/
if(P_Key1Cnt ==0 && R_Key2Cnt >0 && L_Key3Cnt ==0) //����key2 �Ҽ�
{
- 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);
}
@@ -60,13 +67,13 @@
if(P_Key1Cnt ==0 && R_Key2Cnt ==0 && L_Key3Cnt >0) //����key3 ���
{
- 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);
}
}else if(P_Key1Cnt ==0 && R_Key2Cnt >0 && L_Key3Cnt >0) //����key2 + key3
{
- 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);
}
--
Gitblit v1.9.3