From 55e36bbbabc1afed172689543d507b6a25d3932c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 07 八月 2021 09:25:22 +0800
Subject: [PATCH] 1

---
 源码/核心板/Src/ExternalDevices/beep.c |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c"
index dfe1346..5ef9931 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c"
@@ -5,12 +5,35 @@
 	GPIO_InitTypeDef GPIO_InitStructure;
 		
 	/* Enable GPIO clock */
-    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
+    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB,ENABLE);
 
-    // Enable GPIO used for beep
-    GPIO_InitStructure.GPIO_Pin = BEEP_PIN | BEEP2_PIN;
+	  GPIO_InitStructure.GPIO_Pin = KEY0_PIN;
+    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
+    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
+    GPIO_Init(KEY0_GPIO, &GPIO_InitStructure);
+	
+	//    // Enable GPIO used for beep
+    GPIO_InitStructure.GPIO_Pin = RELAY1_PIN|RELAY2_PIN;
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
     GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-    GPIO_Init(BEEP_GPIO, &GPIO_InitStructure);
+    GPIO_Init(RELAY1_GPIO, &GPIO_InitStructure);
+	
+	
+//    // Enable GPIO used for beep
+//    GPIO_InitStructure.GPIO_Pin = BEEP_PIN;
+//    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+//    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+//    GPIO_Init(BEEP_GPIO, &GPIO_InitStructure);
+//	
+//	// Enable GPIO used for beep
+//    GPIO_InitStructure.GPIO_Pin = BEEP2_PIN;
+//    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+//    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+//    GPIO_Init(BEEP2_GPIO, &GPIO_InitStructure);
+//	
+//	// Enable GPIO used for OUT
+//    GPIO_InitStructure.GPIO_Pin = OUT2_PIN;
+//    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+//    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+//    GPIO_Init(OUT2_GPIO, &GPIO_InitStructure);
 }
-

--
Gitblit v1.9.3