From f9f53573318c8c1da11c1fff0a19a41fad2f49f3 Mon Sep 17 00:00:00 2001 From: jflyper Date: Sat, 29 Sep 2018 09:45:10 +0900 Subject: [PATCH] Remove or convert stale MPU_INT_EXTI defs --- src/main/target/DALRCF722DUAL/target.h | 2 +- src/main/target/NUCLEOF446RE/target.h | 3 ++- src/main/target/OMNIBUSF7/target.h | 18 +++++++++--------- src/main/target/SPEDIXF4/target.h | 3 ++- src/main/target/SPRACINGF3NEO/target.h | 3 ++- src/main/target/SPRACINGF7DUAL/target.h | 3 +-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/target/DALRCF722DUAL/target.h b/src/main/target/DALRCF722DUAL/target.h index 9586a206a..94703fc01 100644 --- a/src/main/target/DALRCF722DUAL/target.h +++ b/src/main/target/DALRCF722DUAL/target.h @@ -33,9 +33,9 @@ #define USE_DUAL_GYRO #define USE_EXTI +#define USE_GYRO_EXTI #define GYRO_1_EXTI_PIN PB10 #define GYRO_2_EXTI_PIN PC4 -#define MPU_INT_EXTI #define GYRO_1_CS_PIN PB0 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/src/main/target/NUCLEOF446RE/target.h b/src/main/target/NUCLEOF446RE/target.h index 876780909..8376f9c8f 100644 --- a/src/main/target/NUCLEOF446RE/target.h +++ b/src/main/target/NUCLEOF446RE/target.h @@ -56,7 +56,8 @@ #define USE_EXTI -//#define MPU_INT_EXTI PC13 +//#define USE_GYRO_EXTI +//#define GYRO_1_EXTI_PIN PC13 //#define USE_MPU_DATA_READY_SIGNAL //#define ENSURE_MPU_DATA_READY_IS_LOW diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index ad43fe432..6945703a2 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -48,16 +48,14 @@ // ICM-20608-G #define USE_ACC_SPI_MPU6500 #define USE_GYRO_SPI_MPU6500 -//#define MPU_INT_EXTI PE8 // MPU6000 #define USE_ACC_SPI_MPU6000 #define USE_GYRO_SPI_MPU6000 -//#define MPU_INT_EXTI PD0 -// Provisioned, but not used -#define GYRO_1_EXTI_PIN NONE -#define GYRO_2_EXTI_PIN NONE +//#define USE_MPU_DATA_READY_SIGNAL +#define USE_EXTI +#define USE_GYRO_EXTI #if defined(OMNIBUSF7V2) #define GYRO_1_SPI_INSTANCE SPI3 @@ -68,6 +66,8 @@ #define GYRO_2_ALIGN ALIGN_DEFAULT #define ACC_1_ALIGN CW90_DEG #define ACC_2_ALIGN ALIGN_DEFAULT +#define GYRO_1_EXTI_PIN PD0 // MPU6000 +#define GYRO_2_EXTI_PIN PE8 // ICM20608 #elif defined(FPVM_BETAFLIGHTF7) #define GYRO_1_SPI_INSTANCE SPI1 @@ -78,6 +78,8 @@ #define ACC_1_ALIGN CW90_DEG #define GYRO_2_ALIGN CW270_DEG #define ACC_2_ALIGN CW270_DEG +#define GYRO_1_EXTI_PIN PD0 // Assume the same as OMNIBUSF7V2, need to verify +#define GYRO_2_EXTI_PIN PE8 // Ditto #else #define GYRO_1_SPI_INSTANCE SPI3 @@ -88,12 +90,10 @@ #define ACC_1_ALIGN ALIGN_DEFAULT #define GYRO_2_ALIGN ALIGN_DEFAULT #define ACC_2_ALIGN ALIGN_DEFAULT +#define GYRO_1_EXTI_PIN PE8 // ICM20608 +#define GYRO_2_EXTI_PIN PD0 // MPU6000 #endif -// TODO: dual gyro support -//#define USE_MPU_DATA_READY_SIGNAL -#define USE_EXTI - //UARTS------------------------------------- #define USE_VCP #define USE_USB_DETECT diff --git a/src/main/target/SPEDIXF4/target.h b/src/main/target/SPEDIXF4/target.h index f47fcfc9e..2534e5df8 100644 --- a/src/main/target/SPEDIXF4/target.h +++ b/src/main/target/SPEDIXF4/target.h @@ -34,7 +34,8 @@ #define ENABLE_DSHOT_DMAR true #define USE_EXTI -#define MPU_INT_EXTI PC4 +#define USE_GYRO_EXTI +#define GYRO_1_EXTI_PIN PC4 #define USE_MPU_DATA_READY_SIGNAL #define USE_GYRO diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index 4a04cffa5..f2f5622cc 100644 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -56,7 +56,8 @@ #define BEEPER_INVERTED //#define USE_EXTI -//#define MPU_INT_EXTI PC13 +//#define USE_GYRO_EXTI +//#define GYRO_1_EXTI_PIN PC13 //#define USE_MPU_DATA_READY_SIGNAL //#define ENSURE_MPU_DATA_READY_IS_LOW diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h index 36f153a4d..b4d5f1c38 100644 --- a/src/main/target/SPRACINGF7DUAL/target.h +++ b/src/main/target/SPRACINGF7DUAL/target.h @@ -43,9 +43,9 @@ #define BEEPER_INVERTED #define USE_EXTI +#define USE_GYRO_EXTI #define GYRO_1_EXTI_PIN PC13 #define GYRO_2_EXTI_PIN PC14 -#define MPU_INT_EXTI #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW @@ -70,7 +70,6 @@ #define GYRO_MPU6500_2_ALIGN CW270_DEG #endif - #define GYRO_1_ALIGN GYRO_MPU6500_1_ALIGN #define GYRO_2_ALIGN GYRO_MPU6500_2_ALIGN #define ACC_1_ALIGN ACC_MPU6500_1_ALIGN