Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00
Code Issues Wiki Activity

FIX CONFIG: GYRO (#12475)

Browse source 
* FIX CONFIG: GYRO

* Rename GYRO_CONFIG_USE_GYRO_DEFAULT to DEFAULT_GYRO_TO_USE
This commit is contained in:
Mark Haslinghuis 2023-03-08 20:52:04 +01:00 • committed by GitHub
parent 80e9cfb998
commit 977e470a48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 35 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config/AOCODARCF7DUAL/config.h
View file

@ -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

2
src/config/AOCODARCH7DUAL/config.h
View file

@ -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

2
src/config/CLRACINGF7/config.h
View file

@ -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

2
src/config/DFR_F722_DUAL_HD/config.h
View file

@ -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

2
src/config/EMAX_BABYHAWK_II_HD/config.h
View file

@ -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

2
src/config/EXF722DUAL/config.h
View file

@ -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

2
src/config/GEPRCF411_AIO/config.h
View file

@ -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

2
src/config/GEPRCF722_BT_HD/config.h
View file

@ -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

2
src/config/GEPRCF745_BT_HD/config.h
View file

@ -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)

2
src/config/HAKRCF722V2/config.h
View file

@ -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

6
src/config/HGLRCF405/config.h
View file

@ -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

6
src/config/HGLRCF745/config.h
View file

@ -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

2
src/config/IFLIGHT_F405_TWING/config.h
View file

@ -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

2
src/config/IFLIGHT_F411_AIO32/config.h
View file

@ -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

2
src/config/IFLIGHT_F722_TWING/config.h
View file

@ -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

2
src/config/IFLIGHT_H743_AIO_V2/config.h
View file

@ -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

2
src/config/IFLIGHT_H7_TWING/config.h
View file

@ -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

2
src/config/JBF7/config.h
View file

@ -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

2
src/config/JBF7_DJI/config.h
View file

@ -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

1
src/config/KAKUTEH7/config.h
View file

@ -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

2
src/config/LDARC_F411/config.h
View file

@ -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

2
src/config/MATEKF411/config.h
View file

@ -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

2
src/config/MATEKF411SE/config.h
View file

@ -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

2
src/config/MATEKF722HD/config.h
View file

@ -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

2
src/config/MATEKH743/config.h
View file

@ -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

2
src/config/NBD_CRICKETF7V2/config.h
View file

@ -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

2
src/config/NBD_GALAXYAIO255/config.h
View file

@ -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

2
src/config/NBD_INFINITYAIOV2PRO/config.h
View file

@ -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)

2
src/config/NEUTRONRCF407/config.h
View file

@ -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)

2
src/config/NEUTRONRCH743AIO/config.h
View file

@ -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

2
src/config/NEUTRONRCH7BT/config.h
View file

@ -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

2
src/config/NUCLEOF722/config.h
View file

@ -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

2
src/config/SKYSTARSH7HD/config.h
View file

@ -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

2
src/config/SPEEDYBEEF7V3/config.h
View file

@ -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

2
src/config/SPRACINGF7DUAL/config.h
View file

@ -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

2
src/config/SPRACINGH7EXTREME/config.h
View file

@ -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

4
src/config/TALONF4V2/config.h
View file

@ -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

2
src/config/TALONF7FUSION/config.h
View file

@ -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

2
src/config/WIZZF7HD/config.h
View file

@ -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

6
src/main/sensors/gyro.c
View file

@ -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;