From df8da3537c0bb35dbbef5885d9475f1b481d2dd5 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期二, 28 十一月 2023 16:03:29 +0800 Subject: [PATCH] V1.3 改成抗遮挡模式，客户反馈效果不好 --- 源码/核心板/Src/ExternalDevices/beep.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 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 b862d84..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" @@ -24,15 +24,16 @@ #define OUT2_OFF GPIO_WriteBit(OUT2_GPIO, OUT2_PIN, Bit_RESET) #define RELAY1_GPIO GPIOB -#define RELAY1_PIN GPIO_Pin_1 +#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_2 +#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