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] 增加休眠,开始上板测试

---
 Function/KEY/key.h |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Function/KEY/key.h b/Function/KEY/key.h
index 1faf170..d973de8 100644
--- a/Function/KEY/key.h
+++ b/Function/KEY/key.h
@@ -4,30 +4,27 @@
 #include "define_all.h" 
 
 //�����ܽ�
-#define KEY1_PIN_NUM                                GPIO_Pin_5
-#define KEY1_PIN_GROUP                              GPIOE
+#define KEY1_PIN                                GPIO_Pin_9 //��Դ
+#define KEY1_PORT                              GPIOE
 
-#define KEY2_PIN_NUM                                GPIO_Pin_12
-#define KEY2_PIN_GROUP                              GPIOF
+#define KEY2_PIN                                GPIO_Pin_15  //���Ҽ�
+#define KEY2_PORT                              GPIOF
 
-#define KEY3_PIN_NUM                                GPIO_Pin_6
-#define KEY3_PIN_GROUP                              GPIOE
+#define KEY3_PIN                                GPIO_Pin_14 //�����
+#define KEY3_PORT                              GPIOF
 
-#define KEY4_PIN_NUM                                GPIO_Pin_3
-#define KEY4_PIN_GROUP                              GPIOC
+//#define KEY4_PIN                                GPIO_Pin_3
+//#define KEY4_PORT                              GPIOC
 
 
-#define KEY1  GPIO_ReadInputDataBit(KEY1_PIN_GROUP,KEY1_PIN_NUM)
-#define KEY2  GPIO_ReadInputDataBit(KEY2_PIN_GROUP,KEY2_PIN_NUM)
-#define KEY3  GPIO_ReadInputDataBit(KEY3_PIN_GROUP,KEY3_PIN_NUM)
-#define	KEY4	GPIO_ReadInputDataBit(KEY4_PIN_GROUP,KEY4_PIN_NUM)
+#define KEY1_IO_READ  GPIO_ReadInputDataBit(KEY1_PORT,KEY1_PIN)
+#define KEY2_IO_READ  GPIO_ReadInputDataBit(KEY2_PORT,KEY2_PIN)
+#define KEY3_IO_READ  GPIO_ReadInputDataBit(KEY3_PORT,KEY3_PIN)
+//#define	KEY4_IO_READ	GPIO_ReadInputDataBit(KEY4_PORT,KEY4_PIN)
 
+void Key_GPIO_Init(void);
 
-
-void key_interruptinit(void);
-
-void key_interruptinit_disable(void);
-void key_interruptinit_enable(void);
+void keyPro(void);
 
 
 #endif

--
Gitblit v1.9.3