Use GYRO_1/2 defines instead of GYRO_0/1 to make things less confusing. (#5274)

This commit is contained in:
Dominic Clifton 2018-03-03 14:00:28 +01:00 committed by Michael Keller
parent c11d016bc7
commit c7f7846d39
4 changed files with 9 additions and 9 deletions

View File

@ -385,7 +385,7 @@ static bool gyroInitSensor(gyroSensor_t *gyroSensor)
#ifdef USE_DUAL_GYRO
// set cnsPin using GYRO_n_CS_PIN defined in target.h
gyroSensor->gyroDev.bus.busdev_u.spi.csnPin = gyroConfig()->gyro_to_use == 0 ? IOGetByTag(IO_TAG(GYRO_0_CS_PIN)) : IOGetByTag(IO_TAG(GYRO_1_CS_PIN));
gyroSensor->gyroDev.bus.busdev_u.spi.csnPin = gyroConfig()->gyro_to_use == 0 ? IOGetByTag(IO_TAG(GYRO_1_CS_PIN)) : IOGetByTag(IO_TAG(GYRO_2_CS_PIN));
#else
gyroSensor->gyroDev.bus.busdev_u.spi.csnPin = IO_NONE; // set cnsPin to IO_NONE so mpuDetect will set it according to value defined in target.h
#endif // USE_DUAL_GYRO

View File

@ -47,8 +47,8 @@
#define MPU6000_SPI_INSTANCE SPI3
#define ICM20689_CS_PIN SPI4_NSS_PIN
#define ICM20689_SPI_INSTANCE SPI4
#define GYRO_1_CS_PIN MPU6000_CS_PIN
#define GYRO_0_CS_PIN ICM20689_CS_PIN
#define GYRO_2_CS_PIN MPU6000_CS_PIN
#define GYRO_1_CS_PIN ICM20689_CS_PIN
//#define USE_MPU_DATA_READY_SIGNAL

View File

@ -63,8 +63,8 @@
#define MPU6000_SPI_INSTANCE SPI1
#define MPU6500_CS_PIN SPI3_NSS_PIN
#define MPU6500_SPI_INSTANCE SPI3
#define GYRO_1_CS_PIN MPU6000_CS_PIN
#define GYRO_0_CS_PIN MPU6500_CS_PIN
#define GYRO_2_CS_PIN MPU6000_CS_PIN
#define GYRO_1_CS_PIN MPU6500_CS_PIN
#define GYRO_MPU6500_ALIGN CW90_DEG
#define ACC_MPU6500_ALIGN CW90_DEG
#define GYRO_MPU6000_ALIGN CW90_DEG
@ -74,8 +74,8 @@
#define MPU6000_SPI_INSTANCE SPI3
#define MPU6500_CS_PIN SPI1_NSS_PIN
#define MPU6500_SPI_INSTANCE SPI1
#define GYRO_0_CS_PIN MPU6000_CS_PIN
#define GYRO_1_CS_PIN MPU6500_CS_PIN
#define GYRO_1_CS_PIN MPU6000_CS_PIN
#define GYRO_2_CS_PIN MPU6500_CS_PIN
#endif
// TODO: dual gyro support

View File

@ -96,8 +96,8 @@
#define ICM20601_CS_PIN PA4 // served through MPU6500 code
#define ICM20601_SPI_INSTANCE SPI1
#define USE_DUAL_GYRO
#define GYRO_0_CS_PIN MPU6000_CS_PIN
#define GYRO_1_CS_PIN ICM20601_CS_PIN
#define GYRO_1_CS_PIN MPU6000_CS_PIN
#define GYRO_2_CS_PIN ICM20601_CS_PIN
#endif
#if defined(SOULF4)