Fix mag

betaflight · Apr 4, 2023 · 0edd5ca · 0edd5ca
1 parent 13feebe
commit 0edd5ca
Show file tree

Hide file tree

Showing 219 changed files with 28 additions and 260 deletions.
diff --git a/src/config/AG3XF4/config.h b/src/config/AG3XF4/config.h
@@ -99,7 +99,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI2

diff --git a/src/config/AG3XF7/config.h b/src/config/AG3XF7/config.h
@@ -98,7 +98,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI2

diff --git a/src/config/AIRBOTF4/config.h b/src/config/AIRBOTF4/config.h
@@ -101,7 +101,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI1

diff --git a/src/config/AIRBOTF4SD/config.h b/src/config/AIRBOTF4SD/config.h
@@ -104,7 +104,6 @@
 #define SPI3_TX_DMA_OPT     0
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI1

diff --git a/src/config/ALIENFLIGHTF4/config.h b/src/config/ALIENFLIGHTF4/config.h
@@ -107,7 +107,6 @@
 #define MAG_ALIGN CW180_DEG_FLIP
 #define MAG_ALIGN_PITCH 1800
 #define MAG_ALIGN_YAW 1800
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
@@ -125,4 +124,4 @@
 #define GYRO_1_SPI_INSTANCE SPI1
 #define GYRO_1_ALIGN CW270_DEG
 #define GYRO_1_ALIGN_YAW 2700
-//TODO #define I2C1_PULLUP ON
+#define USE_I2C1_PULLUP ON
diff --git a/src/config/ALIENFLIGHTNGF7/config.h b/src/config/ALIENFLIGHTNGF7/config.h
@@ -108,7 +108,8 @@
 #define MAG_ALIGN CW180_DEG_FLIP
 #define MAG_ALIGN_PITCH 1800
 #define MAG_ALIGN_YAW 1800
-//TODO #define MAG_SPI_DEVICE 3
+#define USE_SPI_MAG
+#define MAG_SPI_DEVICE SPI3
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI3
 //TODO #define SERIALRX_PROVIDER SPEK2048
@@ -126,4 +127,4 @@
 #define GYRO_1_SPI_INSTANCE SPI1
 #define GYRO_1_ALIGN CW270_DEG
 #define GYRO_1_ALIGN_YAW 2700
-//TODO #define I2C1_PULLUP ON
+#define USE_I2C1_PULLUP ON
diff --git a/src/config/ALIENFLIGHTNGF7_DUAL/config.h b/src/config/ALIENFLIGHTNGF7_DUAL/config.h
@@ -115,4 +115,4 @@
 #define GYRO_2_SPI_INSTANCE SPI3
 #define GYRO_2_ALIGN CW270_DEG
 #define GYRO_2_ALIGN_YAW 2700
-//TODO #define I2C1_PULLUP ON
+#define USE_I2C1_PULLUP ON
diff --git a/src/config/ALIENWHOOPF4/config.h b/src/config/ALIENWHOOPF4/config.h
@@ -74,7 +74,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE SLAVE
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define BEEPER_INVERTED
 #define SYSTEM_HSE_MHZ 8

diff --git a/src/config/ANYFCF7/config.h b/src/config/ANYFCF7/config.h
@@ -115,7 +115,6 @@
 #define SPI4_TX_DMA_OPT     0
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/ANYFCM7/config.h b/src/config/ANYFCM7/config.h
@@ -100,7 +100,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE NONE
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/src/config/AOCODAF405/config.h b/src/config/AOCODAF405/config.h
@@ -92,7 +92,6 @@
 
 #define ADC1_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/AOCODAF405V2MPU6000/config.h b/src/config/AOCODAF405V2MPU6000/config.h
@@ -94,7 +94,6 @@
 
 #define ADC1_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/AOCODAF405V2MPU6500/config.h b/src/config/AOCODAF405V2MPU6500/config.h
@@ -94,7 +94,6 @@
 
 #define ADC1_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/AOCODAF722MINI/config.h b/src/config/AOCODAF722MINI/config.h
@@ -92,7 +92,6 @@
 #define ADC1_DMA_OPT        1
 
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/AOCODARCF7DUAL/config.h b/src/config/AOCODARCF7DUAL/config.h
@@ -97,7 +97,6 @@
 #define ADC1_DMA_OPT        0
 
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_2
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/AOCODARCH7DUAL/config.h b/src/config/AOCODARCH7DUAL/config.h
@@ -120,7 +120,6 @@
 #define TIMUP5_DMA_OPT      0
 
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/AXISFLYINGF7PRO/config.h b/src/config/AXISFLYINGF7PRO/config.h
@@ -97,7 +97,6 @@
 
 #define ADC1_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/BETAFLIGHTF4/config.h b/src/config/BETAFLIGHTF4/config.h
@@ -90,7 +90,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/BETAFPVF405/config.h b/src/config/BETAFPVF405/config.h
@@ -97,9 +97,7 @@
 #define SPI2_TX_DMA_OPT     0
 #define ADC2_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
-//TODO #define MAG_HARDWARE NONE
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI3
 #define DEFAULT_BARO_DEVICE BARO_NONE

diff --git a/src/config/BETAFPVF411/config.h b/src/config/BETAFPVF411/config.h
@@ -95,7 +95,6 @@
 //TODO #define MOTOR_PWM_PROTOCOL DSHOT600
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
-//TODO #define MAG_HARDWARE NONE
 #define BEEPER_INVERTED
 #define SYSTEM_HSE_MHZ 8
 #define MAX7456_SPI_INSTANCE SPI2

diff --git a/src/config/BETAFPVH743/config.h b/src/config/BETAFPVH743/config.h
@@ -118,7 +118,6 @@
 #define TIMUP8_DMA_OPT      0
 #define TIMUP0_DMA_OPT      0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/BLUEJAYF4/config.h b/src/config/BLUEJAYF4/config.h
@@ -85,7 +85,6 @@
 #define SPI3_TX_DMA_OPT     0
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/CLRACINGF7/config.h b/src/config/CLRACINGF7/config.h
@@ -106,7 +106,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/COLIBRI/config.h b/src/config/COLIBRI/config.h
@@ -100,7 +100,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_3)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_3)

diff --git a/src/config/CYCLONEF405_PRO/config.h b/src/config/CYCLONEF405_PRO/config.h
@@ -87,7 +87,6 @@
 
 #define ADC3_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/CYCLONEF722_PRO/config.h b/src/config/CYCLONEF722_PRO/config.h
@@ -96,7 +96,6 @@
 
 #define ADC3_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/DALRCF405/config.h b/src/config/DALRCF405/config.h
@@ -96,7 +96,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/src/config/DALRCF722DUAL/config.h b/src/config/DALRCF722DUAL/config.h
@@ -94,7 +94,6 @@
 
 #define ADC3_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/DARWINF722HD/config.h b/src/config/DARWINF722HD/config.h
@@ -105,9 +105,7 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
-//TODO #define MAG_HARDWARE NONE
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 

diff --git a/src/config/DFR_F722_DUAL_HD/config.h b/src/config/DFR_F722_DUAL_HD/config.h
@@ -93,7 +93,6 @@
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 
 #define USE_ADC

diff --git a/src/config/DRONIUSF7/config.h b/src/config/DRONIUSF7/config.h
@@ -78,9 +78,7 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
-//TODO #define MAG_HARDWARE NONE
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BARO_I2C_ADDRESS 119

diff --git a/src/config/DYSF4PRO/config.h b/src/config/DYSF4PRO/config.h
@@ -95,7 +95,6 @@
 
 #define ADC2_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/EACHINEF722/config.h b/src/config/EACHINEF722/config.h
@@ -102,7 +102,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI1

diff --git a/src/config/EACHINEF722_AIO/config.h b/src/config/EACHINEF722_AIO/config.h
@@ -100,7 +100,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI1

diff --git a/src/config/ELINF405/config.h b/src/config/ELINF405/config.h
@@ -89,7 +89,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_HARDWARE NONE
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 

diff --git a/src/config/ELINF722/config.h b/src/config/ELINF722/config.h
@@ -86,7 +86,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_HARDWARE NONE
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 

diff --git a/src/config/ELLE0/config.h b/src/config/ELLE0/config.h
@@ -71,7 +71,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE SLAVE
 #define SYSTEM_HSE_MHZ 25
 #define USE_SPI_GYRO
 #define GYRO_1_SPI_INSTANCE SPI2

diff --git a/src/config/EXF722DUAL/config.h b/src/config/EXF722DUAL/config.h
@@ -101,7 +101,6 @@
 #define ADC3_DMA_OPT        0
 
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/EXUAVF4PRO/config.h b/src/config/EXUAVF4PRO/config.h
@@ -98,7 +98,6 @@
 
 #define ADC2_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/F4BY/config.h b/src/config/F4BY/config.h
@@ -108,7 +108,6 @@
 #define SPI2_TX_DMA_OPT     0
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)

diff --git a/src/config/FF_RACEPIT/config.h b/src/config/FF_RACEPIT/config.h
@@ -42,7 +42,7 @@
 
 #define I2C3_SCL_PIN         PA8
 #define I2C3_SDA_PIN         PC9
-//TODO #define I2C3_PULLUP ON
+#define USE_I2C3_PULLUP ON
 
 #define SPI1_SCK_PIN         PA5
 #define SPI1_SDI_PIN         PA6

diff --git a/src/config/FF_RACEPIT_MINI/config.h b/src/config/FF_RACEPIT_MINI/config.h
@@ -41,7 +41,7 @@
 
 #define I2C3_SCL_PIN         PA8
 #define I2C3_SDA_PIN         PC9
-//TODO #define I2C3_PULLUP ON
+#define USE_I2C3_PULLUP ON
 
 #define SPI1_SCK_PIN         PA5
 #define SPI1_SDI_PIN         PA6

diff --git a/src/config/FLYCOLORF7/config.h b/src/config/FLYCOLORF7/config.h
@@ -98,7 +98,6 @@
 
 #define ADC3_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/FLYCOLORF7_AIO/config.h b/src/config/FLYCOLORF7_AIO/config.h
@@ -90,7 +90,6 @@
 
 #define ADC3_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/FLYWOOF405/config.h b/src/config/FLYWOOF405/config.h
@@ -93,7 +93,6 @@
 
 #define ADC1_DMA_OPT        1
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/FLYWOOF405NANO/config.h b/src/config/FLYWOOF405NANO/config.h
@@ -96,7 +96,6 @@
 
 #define ADC1_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)

diff --git a/src/config/FLYWOOF405PRO/config.h b/src/config/FLYWOOF405PRO/config.h
@@ -94,7 +94,6 @@
 
 #define ADC1_DMA_OPT        0
 
-//TODO #define MAG_BUSTYPE I2C
 #define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)