From 5f02075313d646cd2bdb7a5ff720870455ba61fc Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期三, 29 十一月 2023 10:08:12 +0800 Subject: [PATCH] V1.4 去掉阈值修改，增加滤波功能，客户反馈还不行 --- 源码/核心板/Src/ExternalDevices/beep.h | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" index 814b487..4747571 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" @@ -4,8 +4,12 @@ #include "stm32f10x.h" -#define BEEP_PIN GPIO_Pin_6 -#define BEEP_GPIO GPIOB +#define KEY0_PIN GPIO_Pin_14 +#define KEY0_GPIO GPIOB +#define READ_KEY0 GPIO_ReadInputDataBit(KEY0_GPIO,KEY0_PIN) + +#define BEEP_PIN GPIO_Pin_12 +#define BEEP_GPIO GPIOA #define BEEP_ON GPIO_WriteBit(BEEP_GPIO, BEEP_PIN, Bit_SET) #define BEEP_OFF GPIO_WriteBit(BEEP_GPIO, BEEP_PIN, Bit_RESET) @@ -19,7 +23,17 @@ #define OUT2_ON GPIO_WriteBit(OUT2_GPIO, OUT2_PIN, Bit_SET) #define OUT2_OFF GPIO_WriteBit(OUT2_GPIO, OUT2_PIN, Bit_RESET) +#define RELAY1_GPIO GPIOB +#define RELAY1_PIN GPIO_Pin_0 +#define RELAY1_ON GPIO_WriteBit(RELAY1_GPIO, RELAY1_PIN, Bit_SET) +#define RELAY1_OFF GPIO_WriteBit(RELAY1_GPIO, RELAY1_PIN, Bit_RESET) +#define READ_RELAY1 GPIO_ReadInputDataBit(RELAY1_GPIO,RELAY1_PIN) +#define RELAY2_GPIO GPIOB +#define RELAY2_PIN GPIO_Pin_1 +#define RELAY2_ON GPIO_WriteBit(RELAY2_GPIO, RELAY2_PIN, Bit_SET) +#define RELAY2_OFF GPIO_WriteBit(RELAY2_GPIO, RELAY2_PIN, Bit_RESET) +#define READ_RELAY2 GPIO_ReadInputDataBit(RELAY2_GPIO,RELAY2_PIN) void Beep_Init(void); #endif -- Gitblit v1.9.3