From a6e5c60a9ec30574bf7c3d584046444b15f8680f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 10 二月 2022 16:29:20 +0800
Subject: [PATCH] V1.61 修改成中断模式,测试不丢包。

---
 源码/核心板/Src/ExternalDevices/beep.h |    6 ++++--
 1 files changed, 4 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 b862d84..aa24f61 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,14 +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);
 

--
Gitblit v1.9.3