From bcd3024235d04c926f8a915500927232435137a7 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 23 一月 2022 13:07:59 +0800
Subject: [PATCH] 增加modbus功能，待测试

---
 源码/核心板/Src/ExternalDevices/beep.h |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 c9b6945..a9aa2cb 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,11 +4,34 @@
 
 #include "stm32f10x.h"
 
-#define BEEP_PIN					GPIO_Pin_0
+#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)
 
+#define BEEP2_PIN					GPIO_Pin_5
+#define BEEP2_GPIO					GPIOB
+#define BEEP2_ON					GPIO_WriteBit(BEEP_GPIO, BEEP2_PIN, Bit_SET)
+#define BEEP2_OFF					GPIO_WriteBit(BEEP_GPIO, BEEP2_PIN, Bit_RESET)
+
+#define OUT2_PIN					GPIO_Pin_7
+#define OUT2_GPIO					GPIOB
+#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 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)
 
 void Beep_Init(void);
 

--
Gitblit v1.9.3