From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001 From: wujiazhi <1147861305@qq.com> Date: Tue, 11 Jun 2024 14:23:53 +0800 Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power --- Function/KEY/key.h | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Function/KEY/key.h b/Function/KEY/key.h index 22d2083..348798e 100644 --- a/Function/KEY/key.h +++ b/Function/KEY/key.h @@ -3,28 +3,28 @@ #include "define_all.h" -//�����ܽ� -#define KEY1_PIN GPIO_Pin_5 //��Դ -#define KEY1_PORT GPIOE +#define KEYA_S1_PORT GPIOD // ԭ��ͼKEYA ����S1 �������A�� +#define KEYA_S1_PIN GPIO_Pin_6 -#define KEY2_PIN GPIO_Pin_12 //���Ҽ� -#define KEY2_PORT GPIOF +#define KEYB_S2_PORT GPIOD // ԭ��ͼKEY1 ����S2 �������B�� +#define KEYB_S2_PIN GPIO_Pin_8 -#define KEY3_PIN GPIO_Pin_6 //����� -#define KEY3_PORT GPIOE +#define KEYC_S3_PORT GPIOA // ԭ��ͼKEYC ����S3 �������C�� +#define KEYC_S3_PIN GPIO_Pin_0 -#define KEY4_PIN GPIO_Pin_3 -#define KEY4_PORT GPIOC +#define KEY_A_READ GPIO_ReadInputDataBit(KEYA_S1_PORT,KEYA_S1_PIN) + +#define KEY_B_READ GPIO_ReadInputDataBit(KEYB_S2_PORT,KEYB_S2_PIN) + +#define KEY_C_READ GPIO_ReadInputDataBit(KEYC_S3_PORT,KEYC_S3_PIN) -#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) +extern FlagStatus key_awaken_flag_g; -void Key_GPIO_Init(void); +void KEY_IO_Init(void); -void keyPro(void); +void Key_Config_Init(void); +void CalMode_Exit_A_LongHandler(void); #endif -- Gitblit v1.9.3