From fa6748b49a3af58216a1a619341567e4a4431d64 Mon Sep 17 00:00:00 2001
From: borisbstyle <dreambb1982@gmail.com>
Date: Sun, 9 Oct 2016 01:11:20 +0200
Subject: [PATCH] Fix merge issues // Free some space on NAZE and CC3D

---
 src/main/flight/pid.c         | 14 ++++++++------
 src/main/target/CC3D/target.h | 22 +++++++++++-----------
 src/main/target/NAZE/target.h | 32 ++++++++++++++++----------------
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c
index 8715726d3..0ef6dbfd3 100644
--- a/src/main/flight/pid.c
+++ b/src/main/flight/pid.c
@@ -97,12 +97,14 @@ float getdT(void)
 
 const angle_index_t rcAliasToAngleIndexMap[] = { AI_ROLL, AI_PITCH };
 
-static pt1Filter_t deltaFilter[3];
-static pt1Filter_t yawFilter;
-static biquadFilter_t dtermFilterLpf[3];
-static biquadFilter_t dtermFilterNotch[3];
-static denoisingState_t dtermDenoisingState[3];
-static bool dtermNotchInitialised;
+pt1Filter_t deltaFilter[3];
+pt1Filter_t yawFilter;
+biquadFilter_t dtermFilterLpf[3];
+biquadFilter_t dtermFilterNotch[3];
+bool dtermNotchInitialised;
+bool dtermBiquadLpfInitialised;
+denoisingState_t dtermDenoisingState[3];
+bool dtermNotchInitialised;
 
 void initFilters(const pidProfile_t *pidProfile) {
     int axis;
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index cdf8ceab1..7bbd8dcb9 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -60,14 +60,14 @@
 #define USE_MPU_DATA_READY_SIGNAL
 
 // External I2C BARO
-#define BARO
-#define USE_BARO_MS5611
-#define USE_BARO_BMP085
-#define USE_BARO_BMP280
+//#define BARO
+//#define USE_BARO_MS5611
+//#define USE_BARO_BMP085
+//#define USE_BARO_BMP280
 
 // External I2C MAG
-#define MAG
-#define USE_MAG_HMC5883
+//#define MAG
+//#define USE_MAG_HMC5883
 
 #define USE_VCP
 #define USE_UART1
@@ -91,11 +91,11 @@
 #define VBAT_ADC_PIN            PA0
 #define RSSI_ADC_PIN            PB0
 
-#define LED_STRIP
-#define WS2811_PIN                      PB4
-#define WS2811_TIMER                    TIM3
-#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC6
-#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH6_HANDLER
+//#define LED_STRIP
+//#define WS2811_PIN                      PB4
+//#define WS2811_TIMER                    TIM3
+//#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC6
+//#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH6_HANDLER
 
 #define SPEKTRUM_BIND
 // USART3, PB11 (Flexport)
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 415520060..7024d961e 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -30,8 +30,8 @@
 #define BEEPER_INVERTED
 #endif
 
-#define BARO_XCLR_PIN           PC13
-#define BARO_EOC_PIN            PC14
+//#define BARO_XCLR_PIN           PC13
+//#define BARO_EOC_PIN            PC14
 
 #define INVERTER                PB2 // PB2 (BOOT1) abused as inverter select GPIO
 #define INVERTER_USART          USART2
@@ -114,16 +114,16 @@
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
-#define USE_SOFTSERIAL1
-#define USE_SOFTSERIAL2
-#define SERIAL_PORT_COUNT       5
+//#define USE_SOFTSERIAL1
+//#define USE_SOFTSERIAL2
+#define SERIAL_PORT_COUNT       3
 
-#define SOFTSERIAL_1_TIMER TIM3
-#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5
-#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6
-#define SOFTSERIAL_2_TIMER TIM3
-#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7
-#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
+//#define SOFTSERIAL_1_TIMER TIM3
+//#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5
+//#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6
+//#define SOFTSERIAL_2_TIMER TIM3
+//#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7
+//#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
 
 // USART3 only on NAZE32_SP - Flex Port
 #define UART3_RX_PIN            PB11
@@ -142,11 +142,11 @@
 #define RSSI_ADC_PIN            PA1
 #define EXTERNAL1_ADC_PIN       PA5
 
-#define LED_STRIP
-#define WS2811_TIMER                    TIM3
-#define WS2811_PIN                      PA6
-#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC6
-#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH6_HANDLER
+//#define LED_STRIP
+//#define WS2811_TIMER                    TIM3
+//#define WS2811_PIN                      PA6
+//#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC6
+//#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH6_HANDLER
 
 #undef GPS