Add missing I2CDEV defines (#580)

betaflight · Sep 27, 2024 · 9a26afd · 9a26afd
1 parent ff1f76f
commit 9a26afd
Show file tree

Hide file tree

Showing 93 changed files with 206 additions and 113 deletions.
diff --git a/configs/AIKONF4/config.h b/configs/AIKONF4/config.h
@@ -101,6 +101,7 @@
 
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_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/AIRBOTG4AIO/config.h b/configs/AIRBOTG4AIO/config.h
@@ -114,6 +114,7 @@
 #define BEEPER_INVERTED
 
 #define BARO_I2C_INSTANCE            (I2CDEV_1)
+#define MAG_I2C_INSTANCE                     (I2CDEV_1)
 #define MAX7456_SPI_INSTANCE         SPI2
 #define FLASH_SPI_INSTANCE           SPI2
 

diff --git a/configs/AIRBOTSUPERF4/config.h b/configs/AIRBOTSUPERF4/config.h
@@ -122,6 +122,7 @@
 
 #define ADC_INSTANCE                        ADC1
 #define BARO_I2C_INSTANCE                   (I2CDEV_1)
+#define MAG_I2C_INSTANCE                            (I2CDEV_1)
 
 #define DEFAULT_BLACKBOX_DEVICE             BLACKBOX_DEVICE_FLASH
 

diff --git a/configs/AIRF7/config.h b/configs/AIRF7/config.h
@@ -85,6 +85,7 @@
 #define ADC1_DMA_OPT        1
 
 #define BARO_I2C_INSTANCE (I2CDEV_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/ALIENFLIGHTF4/config.h b/configs/ALIENFLIGHTF4/config.h
@@ -108,6 +108,7 @@
 #define MAG_ALIGN_PITCH 1800
 #define MAG_ALIGN_YAW 1800
 #define MAG_I2C_INSTANCE (I2CDEV_1)
+#define BARO_I2C_INSTANCE (I2CDEV_1)
 //TODO #define SPEKTRUM_SAT_BIND 9
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SDCARD
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

diff --git a/configs/ANYFCM7/config.h b/configs/ANYFCM7/config.h
@@ -102,6 +102,7 @@
 
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_2)
+#define MAG_I2C_INSTANCE          (I2CDEV_2)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define BEEPER_INVERTED
 #define MAX7456_SPI_INSTANCE SPI3

diff --git a/configs/AOCODAF405/config.h b/configs/AOCODAF405/config.h
@@ -93,6 +93,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_DSHOT_BURST DSHOT_DMAR_ON
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

diff --git a/configs/APEXF7/config.h b/configs/APEXF7/config.h
@@ -90,6 +90,7 @@
 
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_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/APEXF72023/config.h b/configs/APEXF72023/config.h
@@ -92,6 +92,7 @@
 
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_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/ARGUSF7AIO/config.h b/configs/ARGUSF7AIO/config.h
@@ -101,6 +101,7 @@
 
 #define ADC_INSTANCE ADC1
 #define BARO_I2C_INSTANCE (I2CDEV_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/AXISFLYINGF7/config.h b/configs/AXISFLYINGF7/config.h
@@ -94,6 +94,7 @@
 
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_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/BETAFPVG473/config.h b/configs/BETAFPVG473/config.h
@@ -92,6 +92,7 @@
 #define SERIALRX_UART SERIAL_PORT_USART3
 
 #define BARO_I2C_INSTANCE (I2CDEV_1)
+#define MAG_I2C_INSTANCE          (I2CDEV_1)
 #define SERIALRX_PROVIDER SERIALRX_CRSF
 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
 //TODO #define DSHOT_IDLE_VALUE 450

diff --git a/configs/BLADE_F7/config.h b/configs/BLADE_F7/config.h
@@ -96,6 +96,7 @@
 #define ADC1_DMA_OPT        1
 
 #define BARO_I2C_INSTANCE (I2CDEV_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/BLADE_F7_AIO/config.h b/configs/BLADE_F7_AIO/config.h
@@ -104,6 +104,7 @@
 #define ADC3_DMA_OPT                    1
 #define ADC_INSTANCE                    ADC3
 #define BARO_I2C_INSTANCE               (I2CDEV_1)
+#define MAG_I2C_INSTANCE                        (I2CDEV_1)
 #define FLASH_SPI_INSTANCE              SPI3
 #define GYRO_1_SPI_INSTANCE             SPI1
 #define MAX7456_SPI_INSTANCE            SPI2

diff --git a/configs/BLADE_F7_HD/config.h b/configs/BLADE_F7_HD/config.h
@@ -92,6 +92,7 @@
 
 #define USE_BARO
 #define BARO_I2C_INSTANCE (I2CDEV_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/BLUEJAYF4/config.h b/configs/BLUEJAYF4/config.h
@@ -86,6 +86,7 @@
 #define ADC1_DMA_OPT        1
 
 #define MAG_I2C_INSTANCE (I2CDEV_1)
+#define BARO_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/CADDXF4_AIO_ELRS/config.h b/configs/CADDXF4_AIO_ELRS/config.h
@@ -1,113 +1,114 @@
-/*
- * This file is part of Betaflight.
- *
- * Betaflight is free software. You can redistribute this software
- * and/or modify this software under the terms of the GNU General
- * Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later
- * version.
- *
- * Betaflight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this software.
- *
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define FC_TARGET_MCU     STM32F405
-
-#define BOARD_NAME        CADDXF4_AIO_ELRS
-#define MANUFACTURER_ID   CADX
-
-#define USE_GYRO
-#define USE_GYRO_SPI_MPU6000
-#define USE_GYRO_SPI_ICM42688P
-#define USE_ACC
-#define USE_ACC_SPI_MPU6000
-#define USE_ACC_SPI_ICM42688P
-#define USE_ACCGYRO_BMI270
-#define USE_BARO
-#define USE_BARO_BMP280
-#define USE_FLASH
-#define USE_FLASH_W25Q128FV
-#define USE_MAX7456
-
-#define BEEPER_PIN           PB4
-#define MOTOR1_PIN           PB0
-#define MOTOR2_PIN           PB1
-#define MOTOR3_PIN           PC9
-#define MOTOR4_PIN           PC8
-#define MOTOR5_PIN           PB6
-#define RX_PPM_PIN           PB8
-#define RX_PWM1_PIN          PB8
-#define LED_STRIP_PIN        PB6
-#define UART1_TX_PIN         PA9
-#define UART2_TX_PIN         PA2
-#define UART6_TX_PIN         PC6
-#define UART1_RX_PIN         PA10
-#define UART2_RX_PIN         PA3
-#define UART6_RX_PIN         PC7
-#define INVERTER_PIN_UART2   PC13
-#define LED0_PIN             PB5
-#define I2C2_SCL_PIN         PB10
-#define I2C2_SDA_PIN         PB11
-#define SPI1_SCK_PIN         PA5
-#define SPI2_SCK_PIN         PB13
-#define SPI3_SCK_PIN         PC10
-#define SPI1_SDI_PIN         PA6
-#define SPI2_SDI_PIN         PB14
-#define SPI3_SDI_PIN         PC11
-#define SPI1_SDO_PIN         PA7
-#define SPI2_SDO_PIN         PB15
-#define SPI3_SDO_PIN         PC12
-#define ESCSERIAL_PIN        PB8
-#define ADC_VBAT_PIN         PC2
-#define ADC_CURR_PIN         PC1
-#define FLASH_CS_PIN         PA15
-#define MAX7456_SPI_CS_PIN   PB12
-#define GYRO_1_EXTI_PIN      PC4
-#define GYRO_1_CS_PIN        PA4
-#define USB_DETECT_PIN       PC5
-#define PULLDOWN1_PIN        PB8
-
-#define TIMER_PIN_MAPPING \
-    TIMER_PIN_MAP( 0, PB8 , 2, -1) \
-    TIMER_PIN_MAP( 1, PB0 , 2,  0) \
-    TIMER_PIN_MAP( 2, PB1 , 2,  0) \
-    TIMER_PIN_MAP( 3, PC9 , 2,  0) \
-    TIMER_PIN_MAP( 4, PC8 , 2,  0) \
-    TIMER_PIN_MAP( 5, PB6 , 1,  0) \
-    TIMER_PIN_MAP( 6, PA9 , 1,  0) \
-    TIMER_PIN_MAP( 7, PA10, 1,  0) \
-    TIMER_PIN_MAP( 8, PA2 , 2,  0) \
-    TIMER_PIN_MAP( 9, PA3 , 3, -1) \
-    TIMER_PIN_MAP(10, PB10, 1,  0) \
-    TIMER_PIN_MAP(11, PB11, 1,  0)
-
-
-#define ADC1_DMA_OPT        1
-
-#define BARO_I2C_INSTANCE (I2CDEV_2)
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
-#define DEFAULT_CURRENT_METER_SCALE 470
-#define DEFAULT_RX_FEATURE	FEATURE_RX_SERIAL
-// Ensure RX2 and TX2 pads are bridged to use onboard ELRS RX
-#define SERIALRX_UART			SERIAL_PORT_USART2
-#define MSP_DISPLAYPORT_UART	SERIAL_PORT_USART1
-#define BEEPER_INVERTED
-#define SYSTEM_HSE_MHZ 8
-#define MAX7456_SPI_INSTANCE SPI2
-#define DASHBOARD_I2C_INSTANCE (I2CDEV_2)
-#define FLASH_SPI_INSTANCE SPI3
-#define GYRO_1_SPI_INSTANCE SPI1
-#define GYRO_1_ALIGN CW180_DEG
-#define GYRO_1_ALIGN_YAW 1800
+/*
+ * This file is part of Betaflight.
+ *
+ * Betaflight is free software. You can redistribute this software
+ * and/or modify this software under the terms of the GNU General
+ * Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * Betaflight is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this software.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define FC_TARGET_MCU     STM32F405
+
+#define BOARD_NAME        CADDXF4_AIO_ELRS
+#define MANUFACTURER_ID   CADX
+
+#define USE_GYRO
+#define USE_GYRO_SPI_MPU6000
+#define USE_GYRO_SPI_ICM42688P
+#define USE_ACC
+#define USE_ACC_SPI_MPU6000
+#define USE_ACC_SPI_ICM42688P
+#define USE_ACCGYRO_BMI270
+#define USE_BARO
+#define USE_BARO_BMP280
+#define USE_FLASH
+#define USE_FLASH_W25Q128FV
+#define USE_MAX7456
+
+#define BEEPER_PIN           PB4
+#define MOTOR1_PIN           PB0
+#define MOTOR2_PIN           PB1
+#define MOTOR3_PIN           PC9
+#define MOTOR4_PIN           PC8
+#define MOTOR5_PIN           PB6
+#define RX_PPM_PIN           PB8
+#define RX_PWM1_PIN          PB8
+#define LED_STRIP_PIN        PB6
+#define UART1_TX_PIN         PA9
+#define UART2_TX_PIN         PA2
+#define UART6_TX_PIN         PC6
+#define UART1_RX_PIN         PA10
+#define UART2_RX_PIN         PA3
+#define UART6_RX_PIN         PC7
+#define INVERTER_PIN_UART2   PC13
+#define LED0_PIN             PB5
+#define I2C2_SCL_PIN         PB10
+#define I2C2_SDA_PIN         PB11
+#define SPI1_SCK_PIN         PA5
+#define SPI2_SCK_PIN         PB13
+#define SPI3_SCK_PIN         PC10
+#define SPI1_SDI_PIN         PA6
+#define SPI2_SDI_PIN         PB14
+#define SPI3_SDI_PIN         PC11
+#define SPI1_SDO_PIN         PA7
+#define SPI2_SDO_PIN         PB15
+#define SPI3_SDO_PIN         PC12
+#define ESCSERIAL_PIN        PB8
+#define ADC_VBAT_PIN         PC2
+#define ADC_CURR_PIN         PC1
+#define FLASH_CS_PIN         PA15
+#define MAX7456_SPI_CS_PIN   PB12
+#define GYRO_1_EXTI_PIN      PC4
+#define GYRO_1_CS_PIN        PA4
+#define USB_DETECT_PIN       PC5
+#define PULLDOWN1_PIN        PB8
+
+#define TIMER_PIN_MAPPING \
+    TIMER_PIN_MAP( 0, PB8 , 2, -1) \
+    TIMER_PIN_MAP( 1, PB0 , 2,  0) \
+    TIMER_PIN_MAP( 2, PB1 , 2,  0) \
+    TIMER_PIN_MAP( 3, PC9 , 2,  0) \
+    TIMER_PIN_MAP( 4, PC8 , 2,  0) \
+    TIMER_PIN_MAP( 5, PB6 , 1,  0) \
+    TIMER_PIN_MAP( 6, PA9 , 1,  0) \
+    TIMER_PIN_MAP( 7, PA10, 1,  0) \
+    TIMER_PIN_MAP( 8, PA2 , 2,  0) \
+    TIMER_PIN_MAP( 9, PA3 , 3, -1) \
+    TIMER_PIN_MAP(10, PB10, 1,  0) \
+    TIMER_PIN_MAP(11, PB11, 1,  0)
+
+
+#define ADC1_DMA_OPT        1
+
+#define BARO_I2C_INSTANCE (I2CDEV_2)
+#define MAG_I2C_INSTANCE          (I2CDEV_2)
+#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
+#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
+#define DEFAULT_CURRENT_METER_SCALE 470
+#define DEFAULT_RX_FEATURE	FEATURE_RX_SERIAL
+// Ensure RX2 and TX2 pads are bridged to use onboard ELRS RX
+#define SERIALRX_UART			SERIAL_PORT_USART2
+#define MSP_DISPLAYPORT_UART	SERIAL_PORT_USART1
+#define BEEPER_INVERTED
+#define SYSTEM_HSE_MHZ 8
+#define MAX7456_SPI_INSTANCE SPI2
+#define DASHBOARD_I2C_INSTANCE (I2CDEV_2)
+#define FLASH_SPI_INSTANCE SPI3
+#define GYRO_1_SPI_INSTANCE SPI1
+#define GYRO_1_ALIGN CW180_DEG
+#define GYRO_1_ALIGN_YAW 1800
diff --git a/configs/CCRCF435AIO/config.h b/configs/CCRCF435AIO/config.h
@@ -98,6 +98,7 @@
 #define MAX7456_SPI_INSTANCE    SPI2
 #define FLASH_SPI_INSTANCE      SPI2
 #define BARO_I2C_INSTANCE       (I2CDEV_2)
+#define MAG_I2C_INSTANCE                (I2CDEV_2)
 #define USE_I2C_PULLUP
 #define LED0_INVERTED
 #define LED1_INVERTED

diff --git a/configs/DALRCF405/config.h b/configs/DALRCF405/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_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON

diff --git a/configs/DARWINF435/config.h b/configs/DARWINF435/config.h
@@ -97,6 +97,7 @@
 #define MAX7456_SPI_INSTANCE    SPI2
 #define FLASH_SPI_INSTANCE      SPI2
 #define BARO_I2C_INSTANCE       (I2CDEV_2)
+#define MAG_I2C_INSTANCE                (I2CDEV_2)
 #define USE_I2C_PULLUP
 #define LED0_INVERTED
 #define LED1_INVERTED

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

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