Skip to content

Commit 8a4ea07

Browse files
authored
Merge pull request betaflight#7142 from mikeller/remove_use_multi_gyro
Removed USE_MULTI_GYRO from targets that have it defined by default.
2 parents ed86cd2 + 6d726f7 commit 8a4ea07

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

src/main/target/OMNIBUSF4/target.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373

7474
#define USE_EXTI
7575

76-
#define USE_MULTI_GYRO
77-
7876
#define USE_ACC
7977
#define USE_ACC_SPI_MPU6000
8078

src/main/target/SPRACINGF4EVO/target.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
#ifndef SPRACINGF4EVO_REV
2727
#define SPRACINGF4EVO_REV 2
2828
#endif
29-
#ifdef SPRACINGF4EVODG
30-
#define USE_MULTI_GYRO
31-
#endif
3229

3330
#define USBD_PRODUCT_STRING "SP Racing F4 EVO"
3431

@@ -43,11 +40,9 @@
4340
#define USE_EXTI
4441
#define USE_GYRO_EXTI
4542
#define GYRO_1_EXTI_PIN PC13
46-
#ifdef USE_MULTI_GYRO
43+
#ifdef SPRACINGF4EVODG
4744
#define GYRO_2_EXTI_PIN PC5 // GYRO 2 / NC on prototype boards, but if it was it'd be here.
48-
#endif
4945

50-
#ifndef SPRACINGF4EVODG
5146
#define USE_MPU_DATA_READY_SIGNAL
5247
#define ENSURE_MPU_DATA_READY_IS_LOW
5348
#endif
@@ -62,7 +57,7 @@
6257
#define USE_ACC
6358
#define USE_ACC_SPI_MPU6500
6459

65-
#ifndef USE_MULTI_GYRO
60+
#ifndef SPRACINGF4EVODG
6661
#define ACC_1_ALIGN CW0_DEG
6762
#define GYRO_1_ALIGN CW0_DEG
6863
#else
@@ -156,7 +151,7 @@
156151
#define SDCARD_DMA_CHANNEL_TX DMA1_Stream4
157152
#define SDCARD_DMA_CHANNEL 0
158153

159-
#ifndef USE_MULTI_GYRO
154+
#ifndef SPRACINGF4EVODG
160155
#define GYRO_1_CS_PIN SPI1_NSS_PIN
161156
#define GYRO_1_SPI_INSTANCE SPI1
162157
#else

0 commit comments

Comments
 (0)