1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00

Merge pull request #3111 from nathantsoi/obf7-cleanup

[obf7] a couple updates and cleanups. good eye mikeller!
This commit is contained in:
Martin Budden 2017-05-18 08:21:05 +01:00 committed by GitHub
commit 1c1cebc448

View file

@ -32,8 +32,6 @@
#define USE_ACC_SPI_MPU6500 #define USE_ACC_SPI_MPU6500
#define USE_GYRO_MPU6500 #define USE_GYRO_MPU6500
#define USE_GYRO_SPI_MPU6500 #define USE_GYRO_SPI_MPU6500
//#define ACC_MPU6500_ALIGN CW0_DEG
//#define GYRO_MPU6500_ALIGN CW0_DEG
#define MPU6500_CS_PIN SPI1_NSS_PIN #define MPU6500_CS_PIN SPI1_NSS_PIN
#define MPU6500_SPI_INSTANCE SPI1 #define MPU6500_SPI_INSTANCE SPI1
//#define MPU_INT_EXTI PE8 //#define MPU_INT_EXTI PE8
@ -43,8 +41,6 @@
#define USE_ACC_SPI_MPU6000 #define USE_ACC_SPI_MPU6000
#define USE_GYRO_MPU6000 #define USE_GYRO_MPU6000
#define USE_GYRO_SPI_MPU6000 #define USE_GYRO_SPI_MPU6000
//#define ACC_MPU6000_ALIGN CW0_DEG
//#define GYRO_MPU6000_ALIGN CW0_DEG
#define MPU6000_CS_PIN SPI3_NSS_PIN #define MPU6000_CS_PIN SPI3_NSS_PIN
#define MPU6000_SPI_INSTANCE SPI3 #define MPU6000_SPI_INSTANCE SPI3
//#define MPU_INT_EXTI PD0 //#define MPU_INT_EXTI PD0
@ -72,15 +68,15 @@
//#define UART2_RX_PIN PA3 //#define UART2_RX_PIN PA3
// Assigned to shared output I2C2 // Assigned to shared output I2C2
//#define USE_UART3 #define USE_UART3
//#define UART3_RX_PIN PB10 #define UART3_RX_PIN PB11
//#define UART3_TX_PIN PB11 #define UART3_TX_PIN PB10
#define USE_UART6 #define USE_UART6
#define UART6_RX_PIN PC7 #define UART6_RX_PIN PC7
#define UART6_TX_PIN PC6 #define UART6_TX_PIN PC6
#define SERIAL_PORT_COUNT 3 //VCP, USART1, USART6 #define SERIAL_PORT_COUNT 4
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_1
@ -137,8 +133,8 @@
#define SDCARD_DMA_CHANNEL DMA_CHANNEL_4 #define SDCARD_DMA_CHANNEL DMA_CHANNEL_4
#define USE_I2C #define USE_I2C
//#define USE_I2C2 #define USE_I2C_DEVICE_2
//#define I2C_DEVICE (I2CDEV_2) #define I2C_DEVICE (I2CDEV_2)
#define BARO #define BARO
#define USE_BARO_BMP280 #define USE_BARO_BMP280