diff --git a/src/config/AOCODARCF7DUAL/config.h b/src/config/AOCODARCF7DUAL/config.h index 95d1113352..75e8a0a0e8 100644 --- a/src/config/AOCODARCF7DUAL/config.h +++ b/src/config/AOCODARCF7DUAL/config.h @@ -95,7 +95,7 @@ #define ADC1_DMA_OPT 0 -//TODO #define GYRO_TO_USE SECOND +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_2 //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) #define USE_BARO diff --git a/src/config/AOCODARCH7DUAL/config.h b/src/config/AOCODARCH7DUAL/config.h index 71a1c6cf8d..e79f00f506 100644 --- a/src/config/AOCODARCH7DUAL/config.h +++ b/src/config/AOCODARCH7DUAL/config.h @@ -118,7 +118,7 @@ #define TIMUP4_DMA_OPT 1 #define TIMUP5_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/CLRACINGF7/config.h b/src/config/CLRACINGF7/config.h index f4fe3c9390..83dbc73eac 100644 --- a/src/config/CLRACINGF7/config.h +++ b/src/config/CLRACINGF7/config.h @@ -128,6 +128,6 @@ #define GYRO_2_SPI_INSTANCE SPI1 #define GYRO_2_ALIGN CW90_DEG #define GYRO_2_ALIGN_YAW 900 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define PINIO1_BOX 40 //TODO #define MCO2_ON_PC9 ON diff --git a/src/config/DFR_F722_DUAL_HD/config.h b/src/config/DFR_F722_DUAL_HD/config.h index 8ae67e0296..f65bc59411 100644 --- a/src/config/DFR_F722_DUAL_HD/config.h +++ b/src/config/DFR_F722_DUAL_HD/config.h @@ -90,7 +90,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define USE_BARO #define BARO_I2C_INSTANCE (I2CDEV_2) //TODO #define MAG_BUSTYPE I2C diff --git a/src/config/EMAX_BABYHAWK_II_HD/config.h b/src/config/EMAX_BABYHAWK_II_HD/config.h index f57de62b0a..761807d2a4 100644 --- a/src/config/EMAX_BABYHAWK_II_HD/config.h +++ b/src/config/EMAX_BABYHAWK_II_HD/config.h @@ -91,7 +91,7 @@ #define ADC1_DMA_OPT 0 -//TODO #define GYRO_TO_USE FIRST +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 //TODO #define SERIALRX_INVERTED OFF #define USE_ADC diff --git a/src/config/EXF722DUAL/config.h b/src/config/EXF722DUAL/config.h index df4dffbce4..5e31a7c563 100644 --- a/src/config/EXF722DUAL/config.h +++ b/src/config/EXF722DUAL/config.h @@ -99,7 +99,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) #define USE_BARO diff --git a/src/config/GEPRCF411_AIO/config.h b/src/config/GEPRCF411_AIO/config.h index d1c096c16f..7dce8cde86 100644 --- a/src/config/GEPRCF411_AIO/config.h +++ b/src/config/GEPRCF411_AIO/config.h @@ -104,6 +104,4 @@ #define FLASH_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW180_DEG diff --git a/src/config/GEPRCF722_BT_HD/config.h b/src/config/GEPRCF722_BT_HD/config.h index 479bc48dd0..e491932657 100644 --- a/src/config/GEPRCF722_BT_HD/config.h +++ b/src/config/GEPRCF722_BT_HD/config.h @@ -102,7 +102,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) #define USE_BARO diff --git a/src/config/GEPRCF745_BT_HD/config.h b/src/config/GEPRCF745_BT_HD/config.h index ab2164727a..3ad164a516 100644 --- a/src/config/GEPRCF745_BT_HD/config.h +++ b/src/config/GEPRCF745_BT_HD/config.h @@ -97,7 +97,7 @@ #define ADC1_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO #define BARO_I2C_INSTANCE (I2CDEV_1) diff --git a/src/config/HAKRCF722V2/config.h b/src/config/HAKRCF722V2/config.h index c82ad32883..f2d4ca13de 100644 --- a/src/config/HAKRCF722V2/config.h +++ b/src/config/HAKRCF722V2/config.h @@ -97,7 +97,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/HGLRCF405/config.h b/src/config/HGLRCF405/config.h index f71e3e0492..53de827e1d 100644 --- a/src/config/HGLRCF405/config.h +++ b/src/config/HGLRCF405/config.h @@ -91,7 +91,7 @@ #define ADC2_DMA_OPT 1 -//TODO #define GYRO_TO_USE FIRST +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define MAG_ALIGN DEFAULT //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) @@ -128,13 +128,9 @@ #define FLASH_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW180_DEG #define USE_SPI_GYRO #define GYRO_2_SPI_INSTANCE SPI1 -//TODO #define GYRO_2_I2CBUS 0 -//TODO #define GYRO_2_I2C_ADDRESS 0 #define GYRO_2_ALIGN CW0_DEG //TODO #define I2C1_PULLUP OFF //TODO #define I2C1_OVERCLOCK ON diff --git a/src/config/HGLRCF745/config.h b/src/config/HGLRCF745/config.h index 0943538a1d..a8970ee424 100644 --- a/src/config/HGLRCF745/config.h +++ b/src/config/HGLRCF745/config.h @@ -100,7 +100,7 @@ #define SPI4_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -//TODO #define GYRO_TO_USE FIRST +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define MAG_ALIGN DEFAULT //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) @@ -134,13 +134,9 @@ #define FLASH_SPI_INSTANCE SPI0 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI3 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW90_DEG #define USE_SPI_GYRO #define GYRO_2_SPI_INSTANCE SPI1 -//TODO #define GYRO_2_I2CBUS 0 -//TODO #define GYRO_2_I2C_ADDRESS 0 #define GYRO_2_ALIGN DEFAULT //TODO #define I2C1_PULLUP OFF //TODO #define I2C1_OVERCLOCK ON diff --git a/src/config/IFLIGHT_F405_TWING/config.h b/src/config/IFLIGHT_F405_TWING/config.h index 435d01fbf9..8197271fa0 100644 --- a/src/config/IFLIGHT_F405_TWING/config.h +++ b/src/config/IFLIGHT_F405_TWING/config.h @@ -91,7 +91,7 @@ #define ADC1_DMA_OPT 1 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/IFLIGHT_F411_AIO32/config.h b/src/config/IFLIGHT_F411_AIO32/config.h index 3a11c1375d..f6e768394f 100644 --- a/src/config/IFLIGHT_F411_AIO32/config.h +++ b/src/config/IFLIGHT_F411_AIO32/config.h @@ -99,6 +99,4 @@ #define FLASH_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW180_DEG diff --git a/src/config/IFLIGHT_F722_TWING/config.h b/src/config/IFLIGHT_F722_TWING/config.h index 48b51bcb3b..69a6a3f373 100644 --- a/src/config/IFLIGHT_F722_TWING/config.h +++ b/src/config/IFLIGHT_F722_TWING/config.h @@ -100,7 +100,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define USE_BARO #define BARO_I2C_INSTANCE (I2CDEV_2) //TODO #define MAG_BUSTYPE I2C diff --git a/src/config/IFLIGHT_H743_AIO_V2/config.h b/src/config/IFLIGHT_H743_AIO_V2/config.h index d110b125c8..d9641f3873 100644 --- a/src/config/IFLIGHT_H743_AIO_V2/config.h +++ b/src/config/IFLIGHT_H743_AIO_V2/config.h @@ -111,7 +111,7 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/IFLIGHT_H7_TWING/config.h b/src/config/IFLIGHT_H7_TWING/config.h index 23e255b7c1..2b7548412b 100644 --- a/src/config/IFLIGHT_H7_TWING/config.h +++ b/src/config/IFLIGHT_H7_TWING/config.h @@ -108,7 +108,7 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 4 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/JBF7/config.h b/src/config/JBF7/config.h index 7bfcb3e733..c19597f96f 100644 --- a/src/config/JBF7/config.h +++ b/src/config/JBF7/config.h @@ -99,7 +99,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) #define USE_BARO diff --git a/src/config/JBF7_DJI/config.h b/src/config/JBF7_DJI/config.h index f7751982e4..7433f34bef 100644 --- a/src/config/JBF7_DJI/config.h +++ b/src/config/JBF7_DJI/config.h @@ -99,7 +99,7 @@ #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) #define USE_BARO diff --git a/src/config/KAKUTEH7/config.h b/src/config/KAKUTEH7/config.h index 433c8a525f..a150b0ff1b 100644 --- a/src/config/KAKUTEH7/config.h +++ b/src/config/KAKUTEH7/config.h @@ -124,4 +124,3 @@ #define GYRO_1_SPI_INSTANCE SPI4 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 -//TODO #define GYRO_2_BUSTYPE NONE diff --git a/src/config/LDARC_F411/config.h b/src/config/LDARC_F411/config.h index 298f3f49da..4c1367ecf0 100644 --- a/src/config/LDARC_F411/config.h +++ b/src/config/LDARC_F411/config.h @@ -92,6 +92,4 @@ #define FLASH_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW180_DEG diff --git a/src/config/MATEKF411/config.h b/src/config/MATEKF411/config.h index 7be0de6a7c..8f7186828a 100644 --- a/src/config/MATEKF411/config.h +++ b/src/config/MATEKF411/config.h @@ -96,6 +96,4 @@ #define MAX7456_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW180_DEG diff --git a/src/config/MATEKF411SE/config.h b/src/config/MATEKF411SE/config.h index 853938b3d1..313e9f13c7 100644 --- a/src/config/MATEKF411SE/config.h +++ b/src/config/MATEKF411SE/config.h @@ -99,6 +99,4 @@ #define PINIO1_BOX 40 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW180_DEG diff --git a/src/config/MATEKF722HD/config.h b/src/config/MATEKF722HD/config.h index c13b7e2799..78dd4217e8 100644 --- a/src/config/MATEKF722HD/config.h +++ b/src/config/MATEKF722HD/config.h @@ -143,5 +143,5 @@ #define CAMERA_CONTROL_MODE HARDWARE_PWM #define ENSURE_MPU_DATA_READY_IS_LOW -#define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1 +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define USE_MPU_DATA_READY_SIGNAL diff --git a/src/config/MATEKH743/config.h b/src/config/MATEKH743/config.h index 40066c146e..4ca431554b 100644 --- a/src/config/MATEKH743/config.h +++ b/src/config/MATEKH743/config.h @@ -176,7 +176,7 @@ #define GYRO_2_SPI_INSTANCE SPI4 #define GYRO_2_ALIGN CW0_DEG_FLIP #define GYRO_2_ALIGN_PITCH 1800 -#define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1 +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW diff --git a/src/config/NBD_CRICKETF7V2/config.h b/src/config/NBD_CRICKETF7V2/config.h index 1f50b98509..5579a89308 100644 --- a/src/config/NBD_CRICKETF7V2/config.h +++ b/src/config/NBD_CRICKETF7V2/config.h @@ -70,7 +70,7 @@ #define ADC1_DMA_OPT 1 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/src/config/NBD_GALAXYAIO255/config.h b/src/config/NBD_GALAXYAIO255/config.h index e86e46893e..8227767fab 100644 --- a/src/config/NBD_GALAXYAIO255/config.h +++ b/src/config/NBD_GALAXYAIO255/config.h @@ -97,7 +97,7 @@ #define TIMUP3_DMA_OPT 4 #define TIMUP5_DMA_OPT 4 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/NBD_INFINITYAIOV2PRO/config.h b/src/config/NBD_INFINITYAIOV2PRO/config.h index bced5c85ff..9ba07d5699 100644 --- a/src/config/NBD_INFINITYAIOV2PRO/config.h +++ b/src/config/NBD_INFINITYAIOV2PRO/config.h @@ -82,7 +82,7 @@ #define ADC1_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) diff --git a/src/config/NEUTRONRCF407/config.h b/src/config/NEUTRONRCF407/config.h index e40bf58228..30e0d5185f 100644 --- a/src/config/NEUTRONRCF407/config.h +++ b/src/config/NEUTRONRCF407/config.h @@ -83,7 +83,7 @@ #define ADC1_DMA_OPT 1 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) diff --git a/src/config/NEUTRONRCH743AIO/config.h b/src/config/NEUTRONRCH743AIO/config.h index 47c5eaeb25..3719f00e8c 100644 --- a/src/config/NEUTRONRCH743AIO/config.h +++ b/src/config/NEUTRONRCH743AIO/config.h @@ -116,7 +116,7 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/NEUTRONRCH7BT/config.h b/src/config/NEUTRONRCH7BT/config.h index 66864def6e..cafb2e53c9 100644 --- a/src/config/NEUTRONRCH7BT/config.h +++ b/src/config/NEUTRONRCH7BT/config.h @@ -122,7 +122,7 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/NUCLEOF722/config.h b/src/config/NUCLEOF722/config.h index b1007bc840..502a090c58 100644 --- a/src/config/NUCLEOF722/config.h +++ b/src/config/NUCLEOF722/config.h @@ -81,7 +81,5 @@ #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO #define BARO_I2C_INSTANCE (I2CDEV_1) -//TODO #define GYRO_1_BUSTYPE I2C -//TODO #define GYRO_1_I2CBUS 1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 diff --git a/src/config/SKYSTARSH7HD/config.h b/src/config/SKYSTARSH7HD/config.h index a20a9385d2..ff5a76cf0b 100644 --- a/src/config/SKYSTARSH7HD/config.h +++ b/src/config/SKYSTARSH7HD/config.h @@ -124,7 +124,7 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/SPEEDYBEEF7V3/config.h b/src/config/SPEEDYBEEF7V3/config.h index 4c1fedbf92..2a4701d02b 100644 --- a/src/config/SPEEDYBEEF7V3/config.h +++ b/src/config/SPEEDYBEEF7V3/config.h @@ -96,7 +96,7 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -//TODO #define GYRO_TO_USE SECOND +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_2 //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/SPRACINGF7DUAL/config.h b/src/config/SPRACINGF7DUAL/config.h index 6e93253217..469b67d363 100644 --- a/src/config/SPRACINGF7DUAL/config.h +++ b/src/config/SPRACINGF7DUAL/config.h @@ -111,7 +111,7 @@ #define SPI3_TX_DMA_OPT 1 #define ADC3_DMA_OPT 0 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_BARO diff --git a/src/config/SPRACINGH7EXTREME/config.h b/src/config/SPRACINGH7EXTREME/config.h index 3309062edb..6bd9b2ca66 100644 --- a/src/config/SPRACINGH7EXTREME/config.h +++ b/src/config/SPRACINGH7EXTREME/config.h @@ -196,7 +196,7 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI3 #define GYRO_1_ALIGN CW180_DEG diff --git a/src/config/TALONF4V2/config.h b/src/config/TALONF4V2/config.h index 5e358f75c2..e3c9516114 100644 --- a/src/config/TALONF4V2/config.h +++ b/src/config/TALONF4V2/config.h @@ -87,7 +87,7 @@ //TODO #define MAG_HARDWARE NONE //TODO #define BARO_HARDWARE NONE //TODO #define MOTOR_PWM_PROTOCOL DSHOT600 -//TODO #define GYRO_TO_USE FIRST +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define RX_SPI_INSTANCE SPI0 #define USE_ADC @@ -110,8 +110,6 @@ #define FLASH_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_1_I2CBUS 0 -//TODO #define GYRO_1_I2C_ADDRESS 0 #define GYRO_1_ALIGN CW0_DEG #define GYRO_1_ALIGN_ROLL 0 #define GYRO_1_ALIGN_PITCH 0 diff --git a/src/config/TALONF7FUSION/config.h b/src/config/TALONF7FUSION/config.h index eeeb355f26..edb2a2a032 100644 --- a/src/config/TALONF7FUSION/config.h +++ b/src/config/TALONF7FUSION/config.h @@ -90,7 +90,7 @@ #define ADC1_DMA_OPT 1 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MAG_BUSTYPE I2C #define MAG_I2C_INSTANCE (I2CDEV_2) //TODO #define MAG_HARDWARE NONE diff --git a/src/config/WIZZF7HD/config.h b/src/config/WIZZF7HD/config.h index 5479609606..a1e55db935 100644 --- a/src/config/WIZZF7HD/config.h +++ b/src/config/WIZZF7HD/config.h @@ -107,6 +107,6 @@ #define MAX7456_SPI_INSTANCE SPI3 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 -//TODO #define GYRO_TO_USE BOTH +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH //TODO #define MCO2_ON_PC9 ON #define PINIO1_BOX 40 diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c index 5e144823f3..b51c941c55 100644 --- a/src/main/sensors/gyro.c +++ b/src/main/sensors/gyro.c @@ -98,8 +98,8 @@ STATIC_UNIT_TESTED gyroDev_t * const gyroDevPtr = &gyro.gyroSensor1.gyroDev; PG_REGISTER_WITH_RESET_FN(gyroConfig_t, gyroConfig, PG_GYRO_CONFIG, 9); -#ifndef GYRO_CONFIG_USE_GYRO_DEFAULT -#define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1 +#ifndef DEFAULT_GYRO_TO_USE +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #endif void pgResetFn_gyroConfig(gyroConfig_t *gyroConfig) @@ -116,7 +116,7 @@ void pgResetFn_gyroConfig(gyroConfig_t *gyroConfig) gyroConfig->gyro_lpf2_type = FILTER_PT1; gyroConfig->gyro_lpf2_static_hz = GYRO_LPF2_HZ_DEFAULT; gyroConfig->gyro_high_fsr = false; - gyroConfig->gyro_to_use = GYRO_CONFIG_USE_GYRO_DEFAULT; + gyroConfig->gyro_to_use = DEFAULT_GYRO_TO_USE; gyroConfig->gyro_soft_notch_hz_1 = 0; gyroConfig->gyro_soft_notch_cutoff_1 = 0; gyroConfig->gyro_soft_notch_hz_2 = 0;