From fd759a573cde6315e57c1d5988bbb904c15001ad Mon Sep 17 00:00:00 2001
From: Michael Jakob <michael.p.jakob@web.de>
Date: Thu, 16 Jun 2016 21:44:49 +0200
Subject: [PATCH] AlienFlight cleanups

---
 src/main/config/config.c                | 10 ++++------
 src/main/target/ALIENFLIGHTF3/target.h  | 17 ++++++++---------
 src/main/target/ALIENFLIGHTF3/target.mk |  1 -
 src/main/target/ALIENFLIGHTF4/target.h  | 14 ++++++--------
 src/main/target/NAZE/target.h           |  7 +++++--
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/main/config/config.c b/src/main/config/config.c
index 7c2fc82ccd..f091148d23 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -648,18 +648,16 @@ static void resetConf(void)
 #endif
     masterConfig.rxConfig.serialrx_provider = 1;
     masterConfig.rxConfig.spektrum_sat_bind = 5;
-	masterConfig.rxConfig.spektrum_sat_bind_autoreset = 1;
+    masterConfig.rxConfig.spektrum_sat_bind_autoreset = 1;
     masterConfig.escAndServoConfig.minthrottle = 1000;
     masterConfig.escAndServoConfig.maxthrottle = 2000;
     masterConfig.motor_pwm_rate = 32000;
-    masterConfig.motor_pwm_protocol = PWM_TYPE_BRUSHED;
     currentProfile->pidProfile.pidController = 2;
     masterConfig.failsafeConfig.failsafe_delay = 2;
     masterConfig.failsafeConfig.failsafe_off_delay = 0;
-    currentControlRateProfile->rcRate8 = 100;
-    currentControlRateProfile->rates[FD_PITCH] = 20;
-    currentControlRateProfile->rates[FD_ROLL] = 20;
-    currentControlRateProfile->rates[FD_YAW] = 20;
+    currentControlRateProfile->rates[FD_PITCH] = 40;
+    currentControlRateProfile->rates[FD_ROLL] = 40;
+    currentControlRateProfile->rates[FD_YAW] = 40;
     parseRcChannels("TAER1234", &masterConfig.rxConfig);
 
     masterConfig.customMotorMixer[0] = (motorMixer_t){ 1.0f, -0.414178f,  1.0f, -1.0f };    // REAR_R
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index 23c4a59199..a336abe638 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #define TARGET_BOARD_IDENTIFIER "AFF3" // AlienFlight F3.
-#define ALIENFLIGHT
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
@@ -128,23 +127,23 @@
 #define VBAT_ADC_GPIO_PIN    GPIO_Pin_4
 #define VBAT_ADC_CHANNEL     ADC_Channel_1
 
-#undef BLACKBOX
-#undef GPS
-#undef DISPLAY
-#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
-#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
+// alternative defaults for AlienFlight F3 target
+#define ALIENFLIGHT
 
 #define SPEKTRUM_BIND
 // USART2, PA3
 #define BIND_PIN   PA3
 
-// alternative defaults for AlienFlight F3 target
-#define ALIENFLIGHT
 #define HARDWARE_BIND_PLUG
-
 // Hardware bind plug at PB12 (Pin 25)
 #define BINDPLUG_PIN   PB12
 
+#define BRUSHED_MOTORS
+#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
+#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
+
+#define USE_SERIAL_4WAY_BLHELI_INTERFACE
+
 // IO - assuming 303 in 64pin package, TODO
 #define TARGET_IO_PORTA 0xffff
 #define TARGET_IO_PORTB 0xffff
diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk
index 04ba9c48f6..f1449b704c 100644
--- a/src/main/target/ALIENFLIGHTF3/target.mk
+++ b/src/main/target/ALIENFLIGHTF3/target.mk
@@ -4,7 +4,6 @@ FEATURES    = VCP
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6050.c \
-            drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
             drivers/compass_ak8963.c \
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index c3ec0a254f..746642c454 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -17,7 +17,6 @@
 
 #pragma once
 #define TARGET_BOARD_IDENTIFIER "AFF4"
-#define ALIENFLIGHT
 
 #define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)
 #define CONFIG_SERIALRX_PROVIDER SERIALRX_SPEKTRUM2048
@@ -181,19 +180,18 @@
 //#define WS2811_DMA_CHANNEL            DMA1_Channel3
 //#define WS2811_IRQ                    DMA1_Channel3_IRQn
 
-#define SPEKTRUM_BIND
-// USART2, PA3
-#define BIND_PORT            GPIOA
-#define BIND_PIN             PA3
-
 // alternative defaults for AlienFlight F4 target
 #define ALIENFLIGHT
 
-// Hardware bind plug at PB2 (Pin 28)
+#define SPEKTRUM_BIND
+// USART2, PA3
+#define BIND_PIN             PA3
+
 #define HARDWARE_BIND_PLUG
-#define BINDPLUG_PORT        GPIOB
+// Hardware bind plug at PB2 (Pin 28)
 #define BINDPLUG_PIN         PB2
 
+#define BRUSHED_MOTORS
 #define DEFAULT_RX_FEATURE FEATURE_RX_PPM
 #define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
 
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 557f295af0..a20ecaedf2 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -175,15 +175,18 @@
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 // alternative defaults for AlienFlight F1 target
-#ifdef ALIENFLIGHT
+#ifdef ALIENFLIGHTF1
 #undef TARGET_BOARD_IDENTIFIER
 #define TARGET_BOARD_IDENTIFIER "AFF1" // AlienFlight F1.
 #undef BOARD_HAS_VOLTAGE_DIVIDER
+
+// alternative defaults for AlienFlight F1 target
 #define ALIENFLIGHT
+
+#define BRUSHED_MOTORS
 #define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
 
 #define HARDWARE_BIND_PLUG
-
 // Hardware bind plug at PB5 (Pin 41)
 #define BINDPLUG_PIN   PB5
 #endif