From d6c812f4fe1e7508e083afbe14d4411ef38ec906 Mon Sep 17 00:00:00 2001
From: henn1001 <hendrik-schlee@web.de>
Date: Wed, 30 Dec 2015 23:48:56 +0100
Subject: [PATCH] Fix Selectable Buzzer Pin for CC3D -Cleanup

---
 src/main/drivers/sound_beeper.c | 14 +++-----------
 src/main/drivers/sound_beeper.h |  4 ----
 src/main/main.c                 |  6 ++----
 src/main/target/CC3D/target.h   |  1 -
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/main/drivers/sound_beeper.c b/src/main/drivers/sound_beeper.c
index 61e690010c..31f71dc729 100644
--- a/src/main/drivers/sound_beeper.c
+++ b/src/main/drivers/sound_beeper.c
@@ -63,20 +63,12 @@ void systemBeep(bool onoff)
 #endif
 }
 
-#ifdef CC3D
-void beeperInit(beeperConfig_t *config, uint8_t use_buzzer_p6) {
-	if (use_buzzer_p6) {
-        beeperPin = Pin_2;
-	} else {
-        beeperPin = BEEP_PIN;
-	}
-#else
-void beeperInit(beeperConfig_t *config) {
-	beeperPin = BEEP_PIN;
-#endif
+void beeperInit(beeperConfig_t *config)
+{
 #ifndef BEEPER
     UNUSED(config);
 #else
+    beeperPin = config->gpioPin;
     initBeeperHardware(config);
     if (config->isInverted)
         systemBeepPtr = beepInverted;
diff --git a/src/main/drivers/sound_beeper.h b/src/main/drivers/sound_beeper.h
index 558fa14d41..c6fd4faa00 100644
--- a/src/main/drivers/sound_beeper.h
+++ b/src/main/drivers/sound_beeper.h
@@ -36,10 +36,6 @@ typedef struct beeperConfig_s {
 } beeperConfig_t;
 
 void systemBeep(bool onoff);
-#ifdef CC3D
-void beeperInit(beeperConfig_t *beeperConfig, uint8_t use_buzzer_p6);
-#else
 void beeperInit(beeperConfig_t *beeperConfig);
-#endif
 
 void initBeeperHardware(beeperConfig_t *config);
diff --git a/src/main/main.c b/src/main/main.c
index e242e26a75..5ec52284ea 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -306,11 +306,9 @@ void init(void)
 #ifdef CC3D
     if (masterConfig.use_buzzer_p6 == 1)
         beeperConfig.gpioPin = Pin_2;
-
-    beeperInit(&beeperConfig, masterConfig.use_buzzer_p6);
-#else
-    beeperInit(&beeperConfig);
 #endif
+
+    beeperInit(&beeperConfig);
 #endif
 
 #ifdef INVERTER
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 1f9009b562..fc387cd700 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -27,7 +27,6 @@
 #define INVERTER_PERIPHERAL RCC_APB2Periph_GPIOB
 #define INVERTER_USART USART1
 
-//#define BEEPER_PIN6 // Uncomment this line for hexacopter configurations where PIN6 is needed for motor
 
 #define BEEP_GPIO GPIOA
 #define BEEP_PIN Pin_15 // PA15 (Beeper)