Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Fix merge issues // Free some space on NAZE and CC3D

Browse source
This commit is contained in:
borisbstyle 2016-10-09 01:11:20 +02:00
parent 70cca63875
commit fa6748b49a
3 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/flight/pid.c
View file

@ -97,12 +97,14 @@ float getdT(void)
const angle_index_t rcAliasToAngleIndexMap[] = { AI_ROLL, AI_PITCH }; const angle_index_t rcAliasToAngleIndexMap[] = { AI_ROLL, AI_PITCH };
static pt1Filter_t deltaFilter[3]; pt1Filter_t deltaFilter[3];
static pt1Filter_t yawFilter; pt1Filter_t yawFilter;
static biquadFilter_t dtermFilterLpf[3]; biquadFilter_t dtermFilterLpf[3];
static biquadFilter_t dtermFilterNotch[3]; biquadFilter_t dtermFilterNotch[3];
static denoisingState_t dtermDenoisingState[3]; bool dtermNotchInitialised;
static bool dtermNotchInitialised; bool dtermBiquadLpfInitialised;
denoisingState_t dtermDenoisingState[3];
bool dtermNotchInitialised;
void initFilters(const pidProfile_t *pidProfile) { void initFilters(const pidProfile_t *pidProfile) {
int axis; int axis;

22
src/main/target/CC3D/target.h
View file

@ -60,14 +60,14 @@
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
// External I2C BARO // External I2C BARO
#define BARO //#define BARO
#define USE_BARO_MS5611 //#define USE_BARO_MS5611
#define USE_BARO_BMP085 //#define USE_BARO_BMP085
#define USE_BARO_BMP280 //#define USE_BARO_BMP280
// External I2C MAG // External I2C MAG
#define MAG //#define MAG
#define USE_MAG_HMC5883 //#define USE_MAG_HMC5883
#define USE_VCP #define USE_VCP
#define USE_UART1 #define USE_UART1
@ -91,11 +91,11 @@
#define VBAT_ADC_PIN PA0 #define VBAT_ADC_PIN PA0
#define RSSI_ADC_PIN PB0 #define RSSI_ADC_PIN PB0
#define LED_STRIP //#define LED_STRIP
#define WS2811_PIN PB4 //#define WS2811_PIN PB4
#define WS2811_TIMER TIM3 //#define WS2811_TIMER TIM3
#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC6 //#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC6
#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER //#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART3, PB11 (Flexport) // USART3, PB11 (Flexport)

32
src/main/target/NAZE/target.h
View file

@ -30,8 +30,8 @@
#define BEEPER_INVERTED #define BEEPER_INVERTED
#endif #endif
#define BARO_XCLR_PIN PC13 //#define BARO_XCLR_PIN PC13
#define BARO_EOC_PIN PC14 //#define BARO_EOC_PIN PC14
#define INVERTER PB2 // PB2 (BOOT1) abused as inverter select GPIO #define INVERTER PB2 // PB2 (BOOT1) abused as inverter select GPIO
#define INVERTER_USART USART2 #define INVERTER_USART USART2
@ -114,16 +114,16 @@
#define USE_UART1 #define USE_UART1
#define USE_UART2 #define USE_UART2
#define USE_UART3 #define USE_UART3
#define USE_SOFTSERIAL1 //#define USE_SOFTSERIAL1
#define USE_SOFTSERIAL2 //#define USE_SOFTSERIAL2
#define SERIAL_PORT_COUNT 5 #define SERIAL_PORT_COUNT 3
#define SOFTSERIAL_1_TIMER TIM3 //#define SOFTSERIAL_1_TIMER TIM3
#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5 //#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5
#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6 //#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6
#define SOFTSERIAL_2_TIMER TIM3 //#define SOFTSERIAL_2_TIMER TIM3
#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7 //#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7
#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 //#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
// USART3 only on NAZE32_SP - Flex Port // USART3 only on NAZE32_SP - Flex Port
#define UART3_RX_PIN PB11 #define UART3_RX_PIN PB11
@ -142,11 +142,11 @@
#define RSSI_ADC_PIN PA1 #define RSSI_ADC_PIN PA1
#define EXTERNAL1_ADC_PIN PA5 #define EXTERNAL1_ADC_PIN PA5
#define LED_STRIP //#define LED_STRIP
#define WS2811_TIMER TIM3 //#define WS2811_TIMER TIM3
#define WS2811_PIN PA6 //#define WS2811_PIN PA6
#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC6 //#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC6
#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER //#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
#undef GPS #undef GPS