Merge pull request #7142 from mikeller/remove_use_multi_gyro
Removed USE_MULTI_GYRO from targets that have it defined by default.
This commit is contained in:
commit
8a4ea0785e
|
@ -73,8 +73,6 @@
|
|||
|
||||
#define USE_EXTI
|
||||
|
||||
#define USE_MULTI_GYRO
|
||||
|
||||
#define USE_ACC
|
||||
#define USE_ACC_SPI_MPU6000
|
||||
|
||||
|
|
|
@ -26,9 +26,6 @@
|
|||
#ifndef SPRACINGF4EVO_REV
|
||||
#define SPRACINGF4EVO_REV 2
|
||||
#endif
|
||||
#ifdef SPRACINGF4EVODG
|
||||
#define USE_MULTI_GYRO
|
||||
#endif
|
||||
|
||||
#define USBD_PRODUCT_STRING "SP Racing F4 EVO"
|
||||
|
||||
|
@ -43,11 +40,9 @@
|
|||
#define USE_EXTI
|
||||
#define USE_GYRO_EXTI
|
||||
#define GYRO_1_EXTI_PIN PC13
|
||||
#ifdef USE_MULTI_GYRO
|
||||
#ifdef SPRACINGF4EVODG
|
||||
#define GYRO_2_EXTI_PIN PC5 // GYRO 2 / NC on prototype boards, but if it was it'd be here.
|
||||
#endif
|
||||
|
||||
#ifndef SPRACINGF4EVODG
|
||||
#define USE_MPU_DATA_READY_SIGNAL
|
||||
#define ENSURE_MPU_DATA_READY_IS_LOW
|
||||
#endif
|
||||
|
@ -62,7 +57,7 @@
|
|||
#define USE_ACC
|
||||
#define USE_ACC_SPI_MPU6500
|
||||
|
||||
#ifndef USE_MULTI_GYRO
|
||||
#ifndef SPRACINGF4EVODG
|
||||
#define ACC_1_ALIGN CW0_DEG
|
||||
#define GYRO_1_ALIGN CW0_DEG
|
||||
#else
|
||||
|
@ -156,7 +151,7 @@
|
|||
#define SDCARD_DMA_CHANNEL_TX DMA1_Stream4
|
||||
#define SDCARD_DMA_CHANNEL 0
|
||||
|
||||
#ifndef USE_MULTI_GYRO
|
||||
#ifndef SPRACINGF4EVODG
|
||||
#define GYRO_1_CS_PIN SPI1_NSS_PIN
|
||||
#define GYRO_1_SPI_INSTANCE SPI1
|
||||
#else
|
||||
|
|
Loading…
Reference in New Issue