Revert "Remove unneeded MAG_I2C_INSTANCE defines (#204)" (#237)

This reverts commit 3534186.
betaflight · Nov 26, 2023 · c360e10 · c360e10
1 parent ffeb839
commit c360e10
Show file tree

Hide file tree

Showing 231 changed files with 256 additions and 1 deletion.
diff --git a/configs/AG3XF4/config.h b/configs/AG3XF4/config.h
@@ -99,6 +99,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI2
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/AG3XF7/config.h b/configs/AG3XF7/config.h
@@ -98,6 +98,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_BARO
 #define BARO_SPI_INSTANCE SPI2
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

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

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

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

diff --git a/configs/AOCODAF405/config.h b/configs/AOCODAF405/config.h
@@ -92,6 +92,7 @@
 
 #define ADC1_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

diff --git a/configs/AOCODAF405V2MPU6000/config.h b/configs/AOCODAF405V2MPU6000/config.h
@@ -95,6 +95,7 @@
 #define ADC_INSTANCE ADC3
 #define ADC3_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/AOCODAF405V2MPU6500/config.h b/configs/AOCODAF405V2MPU6500/config.h
@@ -95,6 +95,7 @@
 #define ADC_INSTANCE ADC3
 #define ADC3_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/AOCODAF722MINI/config.h b/configs/AOCODAF722MINI/config.h
@@ -94,6 +94,7 @@
 #define ADC1_DMA_OPT        1
 
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 

diff --git a/configs/AOCODAF722MINIV2/config.h b/configs/AOCODAF722MINIV2/config.h
@@ -97,6 +97,7 @@
 
 #define ADC1_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/AOCODARCF405_AIO/config.h b/configs/AOCODARCF405_AIO/config.h
@@ -89,6 +89,7 @@
 
 #define SERIALRX_UART SERIAL_PORT_USART2
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

diff --git a/configs/AOCODARCF411_AIO/config.h b/configs/AOCODARCF411_AIO/config.h
@@ -83,6 +83,7 @@
 
 #define ADC1_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define FLASH_SPI_INSTANCE SPI1
 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH

diff --git a/configs/AOCODARCF722_AIO/config.h b/configs/AOCODARCF722_AIO/config.h
@@ -123,6 +123,7 @@
 #define BARO_I2C_INSTANCE               (I2CDEV_1)
 #define FLASH_SPI_INSTANCE              SPI3
 
+#define MAG_I2C_INSTANCE                (I2CDEV_1)
 #define MAX7456_SPI_INSTANCE            SPI2
 
 #define SERIALRX_UART                   SERIAL_PORT_USART2

diff --git a/configs/AOCODARCF7DUAL/config.h b/configs/AOCODARCF7DUAL/config.h
@@ -100,6 +100,7 @@
 #define ADC1_DMA_OPT        0
 
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_2
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

diff --git a/configs/AOCODARCH7DUAL/config.h b/configs/AOCODARCH7DUAL/config.h
@@ -127,6 +127,7 @@
 #define TIMUP5_DMA_OPT      0
 
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_2)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

diff --git a/configs/AXISFLYINGF7PRO/config.h b/configs/AXISFLYINGF7PRO/config.h
@@ -102,6 +102,7 @@
 
 #define ADC1_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

diff --git a/configs/BAYCK_DOLPHIN/config.h b/configs/BAYCK_DOLPHIN/config.h
@@ -104,6 +104,7 @@
 
 #define ADC_INSTANCE ADC1
 #define ADC1_DMA_OPT        11
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/BETAFLIGHTF4/config.h b/configs/BETAFLIGHTF4/config.h
@@ -93,6 +93,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define BARO_I2C_INSTANCE (I2CDEV_2)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define BEEPER_INVERTED

diff --git a/configs/BETAFPVF405/config.h b/configs/BETAFPVF405/config.h
@@ -101,6 +101,7 @@
 #define SPI2_TX_DMA_OPT     0
 #define ADC2_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define BARO_SPI_INSTANCE SPI3
 #define DEFAULT_BARO_DEVICE BARO_NONE
 

diff --git a/configs/BETAFPVF405_ELRS/config.h b/configs/BETAFPVF405_ELRS/config.h
@@ -101,6 +101,7 @@
 #define SPI2_TX_DMA_OPT     0
 #define ADC2_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define BARO_SPI_INSTANCE SPI3
 #define DEFAULT_BARO_DEVICE BARO_NONE
 

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

diff --git a/configs/BLUEJAYF4/config.h b/configs/BLUEJAYF4/config.h
@@ -85,6 +85,7 @@
 #define SPI3_TX_DMA_OPT     0
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SDCARD
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define BEEPER_INVERTED

diff --git a/configs/CLRACINGF7/config.h b/configs/CLRACINGF7/config.h
@@ -106,6 +106,8 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
+
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

diff --git a/configs/COLIBRI/config.h b/configs/COLIBRI/config.h
@@ -100,6 +100,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_3)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_3)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/CRAZYBEEF405/config.h b/configs/CRAZYBEEF405/config.h
@@ -87,6 +87,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define BARO_I2C_INSTANCE (I2CDEV_2)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define BEEPER_INVERTED

diff --git a/configs/CYCLONEF405_PRO/config.h b/configs/CYCLONEF405_PRO/config.h
@@ -87,6 +87,8 @@
 
 #define ADC3_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
+
 #define USE_ADC
 #define ADC_INSTANCE ADC3
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

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

diff --git a/configs/DALRCF405/config.h b/configs/DALRCF405/config.h
@@ -96,6 +96,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

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

diff --git a/configs/DARWINF411/config.h b/configs/DARWINF411/config.h
@@ -87,6 +87,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define I2C1_CLOCKSPEED 400
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SDCARD

diff --git a/configs/DARWINF722HD/config.h b/configs/DARWINF722HD/config.h
@@ -105,6 +105,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 

diff --git a/configs/DARWINF722HDV2/config.h b/configs/DARWINF722HDV2/config.h
@@ -110,6 +110,7 @@
 dma SPI_MOSI 3 0 # SPI_MOSI 3: DMA1 Stream 5 Channel 0
 */
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

diff --git a/configs/DFR_F722_DUAL_HD/config.h b/configs/DFR_F722_DUAL_HD/config.h
@@ -102,6 +102,7 @@
 #define ADC3_DMA_OPT        0
 
 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 
 #define USE_ADC
 #define ADC_INSTANCE ADC3

diff --git a/configs/DRONIUSF7/config.h b/configs/DRONIUSF7/config.h
@@ -78,6 +78,8 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
+
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

diff --git a/configs/DYSF4PRO/config.h b/configs/DYSF4PRO/config.h
@@ -97,6 +97,7 @@
 
 #define ADC2_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_ADC
 #define ADC_INSTANCE ADC2
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/EACHINEF722/config.h b/configs/EACHINEF722/config.h
@@ -105,6 +105,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_SPI_INSTANCE SPI1
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

diff --git a/configs/EACHINEF722_AIO/config.h b/configs/EACHINEF722_AIO/config.h
@@ -102,6 +102,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_SPI_INSTANCE SPI1
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

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

diff --git a/configs/EXUAVF4PRO/config.h b/configs/EXUAVF4PRO/config.h
@@ -98,6 +98,7 @@
 
 #define ADC2_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_2)
 #define USE_ADC
 #define ADC_INSTANCE ADC2
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

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

diff --git a/configs/FLASHHOBBYF405/config.h b/configs/FLASHHOBBYF405/config.h
@@ -99,6 +99,7 @@
 
 #define ADC1_DMA_OPT 0
 #define SERIALRX_UART SERIAL_PORT_USART2
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO

diff --git a/configs/FLASHHOBBYF722/config.h b/configs/FLASHHOBBYF722/config.h
@@ -98,6 +98,7 @@
 
 #define ADC1_DMA_OPT 0
 #define SERIALRX_UART SERIAL_PORT_USART2
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO

diff --git a/configs/FLYCOLORF7/config.h b/configs/FLYCOLORF7/config.h
@@ -98,6 +98,7 @@
 
 #define ADC3_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_ADC
 #define ADC_INSTANCE ADC3
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/FLYCOLORF7_AIO/config.h b/configs/FLYCOLORF7_AIO/config.h
@@ -90,6 +90,7 @@
 
 #define ADC3_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_ADC
 #define ADC_INSTANCE ADC3
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/FLYWOOF405/config.h b/configs/FLYWOOF405/config.h
@@ -97,6 +97,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF
 

diff --git a/configs/FLYWOOF405NANO/config.h b/configs/FLYWOOF405NANO/config.h
@@ -96,6 +96,7 @@
 
 #define ADC1_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/FLYWOOF405PRO/config.h b/configs/FLYWOOF405PRO/config.h
@@ -94,6 +94,7 @@
 
 #define ADC1_DMA_OPT        0
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH

diff --git a/configs/FLYWOOF405S_AIO/config.h b/configs/FLYWOOF405S_AIO/config.h
@@ -95,6 +95,7 @@
 
 
 #define ADC1_DMA_OPT                    0
+#define MAG_I2C_INSTANCE                (I2CDEV_1)
 #define BARO_I2C_INSTANCE               (I2CDEV_1)
 #define DEFAULT_BLACKBOX_DEVICE         BLACKBOX_DEVICE_FLASH
 #define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC

diff --git a/configs/FLYWOOF411/config.h b/configs/FLYWOOF411/config.h
@@ -88,6 +88,7 @@
 
 #define ADC1_DMA_OPT        1
 
+#define MAG_I2C_INSTANCE (I2CDEV_1)
 #define BARO_I2C_INSTANCE (I2CDEV_1)
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON