From 5ab7edec7be9587215715d248b4d48ab7220c0cf Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Mon, 2 Dec 2024 02:11:45 +0100 Subject: [PATCH] Fix parenthesis (#624) --- configs/ACCIF405/config.h | 4 ++-- configs/ACCIF435/config.h | 4 ++-- configs/AG3XF4/config.h | 4 ++-- configs/AG3XF7/config.h | 2 +- configs/AIKONF4/config.h | 6 +++--- configs/AIRBOTF4/config.h | 4 ++-- configs/AIRBOTF4SD/config.h | 4 ++-- configs/AIRBOTF4V2/config.h | 2 +- configs/AIRBOTG4AIO/config.h | 4 ++-- configs/AIRBOTSUPERF4/config.h | 4 ++-- configs/AIRF7/config.h | 4 ++-- configs/ALIENFLIGHTF4/config.h | 4 ++-- configs/ANYFCF7/config.h | 6 +++--- configs/ANYFCM7/config.h | 4 ++-- configs/AOCODAF405/config.h | 6 +++--- configs/AOCODAF405V2MPU6000/config.h | 4 ++-- configs/AOCODAF405V2MPU6500/config.h | 4 ++-- configs/AOCODAF722MINI/config.h | 4 ++-- configs/AOCODAF722MINIV2/config.h | 4 ++-- configs/AOCODARCF405V3/config.h | 4 ++-- configs/AOCODARCF405V3SD/config.h | 4 ++-- configs/AOCODARCF405_AIO/config.h | 4 ++-- configs/AOCODARCF411_AIO/config.h | 4 ++-- configs/AOCODARCF722_AIO/config.h | 4 ++-- configs/AOCODARCF7DUAL/config.h | 4 ++-- configs/AOCODARCH7DUAL/config.h | 4 ++-- configs/APEXF7/config.h | 4 ++-- configs/APEXF72023/config.h | 4 ++-- configs/ARGUSF7AIO/config.h | 4 ++-- configs/AXISFLYINGF7/config.h | 4 ++-- configs/AXISFLYINGF7PRO/config.h | 4 ++-- configs/BAYCK_DOLPHIN/config.h | 2 +- configs/BEASTFPVF722/config.h | 4 ++-- configs/BEEROTORF4/config.h | 2 +- configs/BETAFLIGHTF4/config.h | 6 +++--- configs/BETAFPVF405/config.h | 2 +- configs/BETAFPVG473/config.h | 4 ++-- configs/BETAFPVH743/config.h | 4 ++-- configs/BLADE_F7/config.h | 4 ++-- configs/BLADE_F7_AIO/config.h | 4 ++-- configs/BLADE_F7_HD/config.h | 4 ++-- configs/BLUEJAYF4/config.h | 6 +++--- configs/BRAHMA_F405/config.h | 4 ++-- configs/BROTHERHOBBYF405V2/config.h | 4 ++-- configs/BROTHERHOBBYF405V3/config.h | 4 ++-- configs/BROTHERHOBBYF435/config.h | 4 ++-- configs/CADDXF4/config.h | 4 ++-- configs/CADDXF4_AIO_ELRS/config.h | 6 +++--- configs/CCRCF435AIO/config.h | 4 ++-- configs/CCRCF722D/config.h | 4 ++-- configs/CHONKERH735/config.h | 4 ++-- configs/CKFLIGHTF4/config.h | 2 +- configs/CLRACINGF7/config.h | 2 +- configs/CRAZYBEEF405/config.h | 4 ++-- configs/CYCLONEF405_PRO/config.h | 4 ++-- configs/CYCLONEF722_PRO/config.h | 4 ++-- configs/DAKEFPVF405/config.h | 2 +- configs/DAKEFPVF722/config.h | 2 +- configs/DALRCF405/config.h | 6 +++--- configs/DALRCF722DUAL/config.h | 4 ++-- configs/DARWINF411/config.h | 4 ++-- configs/DARWINF435/config.h | 4 ++-- configs/DARWINF722HD/config.h | 4 ++-- configs/DARWINF722HDV2/config.h | 4 ++-- configs/DFR_F722_DUAL_HD/config.h | 4 ++-- configs/DREAMFLYF405/config.h | 4 ++-- configs/DREAMFLYF722/config.h | 4 ++-- configs/DREAMWORKSF722/config.h | 4 ++-- configs/DRONIUSF7/config.h | 4 ++-- configs/DYSF4PRO/config.h | 4 ++-- configs/EACHINEF722/config.h | 2 +- configs/EACHINEF722_AIO/config.h | 2 +- configs/EAGLEF405/config.h | 4 ++-- configs/EAGLEF722/config.h | 4 ++-- configs/ELINF405/config.h | 2 +- configs/EXF722DUAL/config.h | 4 ++-- configs/EXUAVF4PRO/config.h | 4 ++-- configs/F4BY/config.h | 6 +++--- configs/FLAOF405X8/config.h | 4 ++-- configs/FLASHHOBBYF405/config.h | 4 ++-- configs/FLASHHOBBYF722/config.h | 4 ++-- configs/FLYCOLORF4/config.h | 4 ++-- configs/FLYCOLORF7/config.h | 4 ++-- configs/FLYCOLORF7MICRO/config.h | 4 ++-- configs/FLYCOLORF7MINI/config.h | 2 +- configs/FLYCOLORF7V2/config.h | 4 ++-- configs/FLYCOLORF7_AIO/config.h | 4 ++-- configs/FLYFISHRCF405/config.h | 6 +++--- configs/FLYSPARKF4/config.h | 4 ++-- configs/FLYWOOF405/config.h | 6 +++--- configs/FLYWOOF405NANO/config.h | 6 +++--- configs/FLYWOOF405PRO/config.h | 6 +++--- configs/FLYWOOF405S_AIO/config.h | 6 +++--- configs/FLYWOOF411/config.h | 4 ++-- configs/FLYWOOF411EVO_HD/config.h | 4 ++-- configs/FLYWOOF411HEX/config.h | 4 ++-- configs/FLYWOOF411V2/config.h | 4 ++-- configs/FLYWOOF411_5IN1_AIO/config.h | 2 +- configs/FLYWOOF722PRO/config.h | 4 ++-- configs/FLYWOOF722PROV2/config.h | 4 ++-- configs/FLYWOOF745/config.h | 4 ++-- configs/FLYWOOF745AIO/config.h | 4 ++-- configs/FLYWOOF745HEX/config.h | 4 ++-- configs/FLYWOOF745NANO/config.h | 4 ++-- configs/FLYWOOF7DUAL/config.h | 4 ++-- configs/FOXEERF405/config.h | 2 +- configs/FOXEERF405V2/config.h | 6 +++--- configs/FOXEERF722DUAL/config.h | 4 ++-- configs/FOXEERF722V2/config.h | 4 ++-- configs/FOXEERF722V3/config.h | 4 ++-- configs/FOXEERF722V4/config.h | 4 ++-- configs/FOXEERF745V2_AIO/config.h | 4 ++-- configs/FOXEERF745V3_AIO/config.h | 4 ++-- configs/FOXEERF745V4_AIO/config.h | 4 ++-- configs/FOXEERF745_AIO/config.h | 4 ++-- configs/FOXEERH743/config.h | 4 ++-- configs/FOXEERH743V2/config.h | 4 ++-- configs/FPVM_BETAFLIGHTF7/config.h | 4 ++-- configs/FREEAXISF4/config.h | 4 ++-- configs/FURYF4/config.h | 6 +++--- configs/FURYF4OSD/config.h | 6 +++--- configs/GEELANGF411/config.h | 6 +++--- configs/GEMEF411/config.h | 4 ++-- configs/GEPRCF405/config.h | 4 ++-- configs/GEPRCF405_BT_HD/config.h | 4 ++-- configs/GEPRCF411/config.h | 4 ++-- configs/GEPRCF411_AIO/config.h | 4 ++-- configs/GEPRCF722/config.h | 4 ++-- configs/GEPRCF722BT/config.h | 4 ++-- configs/GEPRCF722_BT_HD/config.h | 4 ++-- configs/GEPRCF722_BT_HD_V3/config.h | 4 ++-- configs/GEPRCF745_BT_HD/config.h | 4 ++-- configs/GEPRC_F722_AIO/config.h | 4 ++-- configs/GEP_F405_VTX_V3/config.h | 2 +- configs/GRAVITYF7/config.h | 4 ++-- configs/HAKRCF405/config.h | 2 +- configs/HAKRCF405D/config.h | 6 +++--- configs/HAKRCF405V2/config.h | 4 ++-- configs/HAKRCF411D/config.h | 4 ++-- configs/HAKRCF722D/config.h | 4 ++-- configs/HAKRCF722MINI/config.h | 4 ++-- configs/HAKRCF722V2/config.h | 4 ++-- configs/HAKRCF7230D/config.h | 4 ++-- configs/HELSEL_STRIKERF7/config.h | 4 ++-- configs/HGLRCF405/config.h | 4 ++-- configs/HGLRCF405AS/config.h | 6 +++--- configs/HGLRCF405V2/config.h | 4 ++-- configs/HGLRCF722/config.h | 4 ++-- configs/HGLRCF722AIO/config.h | 4 ++-- configs/HGLRCF722AIO_X6/config.h | 4 ++-- configs/HGLRCF722E/config.h | 2 +- configs/HGLRCF722MINI/config.h | 4 ++-- configs/HGLRCF722MINIV2/config.h | 4 ++-- configs/HIFIONRCF7/config.h | 4 ++-- configs/HOBBYWING_XROTORF4G3/config.h | 4 ++-- configs/HOBBYWING_XROTORF7CONV/config.h | 4 ++-- configs/IFLIGHT_BLITZ_F435/config.h | 4 ++-- configs/IFLIGHT_BLITZ_F722/config.h | 4 ++-- configs/IFLIGHT_BLITZ_F722_X1/config.h | 4 ++-- configs/IFLIGHT_BLITZ_F7_AIO/config.h | 4 ++-- configs/IFLIGHT_BLITZ_F7_PRO/config.h | 4 ++-- configs/IFLIGHT_BORG_F435S/config.h | 4 ++-- configs/IFLIGHT_DEFENDER_F411/config.h | 4 ++-- configs/IFLIGHT_F405_AIO/config.h | 2 +- configs/IFLIGHT_F405_TWING/config.h | 6 +++--- configs/IFLIGHT_F411_AIO32/config.h | 4 ++-- configs/IFLIGHT_F411_PRO/config.h | 4 ++-- configs/IFLIGHT_F722_TWING/config.h | 4 ++-- configs/IFLIGHT_F745_AIO/config.h | 4 ++-- configs/IFLIGHT_F745_AIO_V2/config.h | 4 ++-- configs/IFLIGHT_H743_AIO/config.h | 4 ++-- configs/IFLIGHT_H743_AIO_V2/config.h | 6 +++--- configs/IFLIGHT_H7_TWING/config.h | 6 +++--- configs/IFLIGHT_SUCCEX_E_F4/config.h | 6 +++--- configs/IFLIGHT_SUCCEX_E_F7/config.h | 4 ++-- configs/JBF7/config.h | 4 ++-- configs/JBF7_DJI/config.h | 4 ++-- configs/JBF7_V2/config.h | 4 ++-- configs/JHEF405PRO/config.h | 4 ++-- configs/JHEF411/config.h | 4 ++-- configs/JHEF411HD/config.h | 4 ++-- configs/JHEF435/config.h | 4 ++-- configs/JHEF722HD/config.h | 4 ++-- configs/JHEF745/config.h | 4 ++-- configs/JHEF745V2/config.h | 4 ++-- configs/JHEF7DUAL/config.h | 4 ++-- configs/JHEH743_AIO/config.h | 4 ++-- configs/JHEH743_HD/config.h | 4 ++-- configs/JMIF722A/config.h | 4 ++-- configs/KD722/config.h | 4 ++-- configs/KROOZX/config.h | 2 +- configs/LDARC_F411/config.h | 4 ++-- configs/LUXF4OSD/config.h | 4 ++-- configs/LUXHDAIO-G4/config.h | 4 ++-- configs/LUXMICROAIO/config.h | 4 ++-- configs/MAMBAF405US/config.h | 2 +- configs/MAMBAF405US_I2C/config.h | 4 ++-- configs/MAMBAF405_2022A/config.h | 4 ++-- configs/MAMBAF405_2022B/config.h | 4 ++-- configs/MAMBAF722/config.h | 2 +- configs/MAMBAF722_2022A/config.h | 4 ++-- configs/MAMBAF722_2022B/config.h | 4 ++-- configs/MAMBAF722_I2C/config.h | 4 ++-- configs/MAMBAF722_X8/config.h | 4 ++-- configs/MAMBAG4/config.h | 4 ++-- configs/MAMBAH743/config.h | 4 ++-- configs/MAMBAH743_2022B/config.h | 4 ++-- configs/MATEKF405AIO/config.h | 6 +++--- configs/MATEKF405CTR/config.h | 6 +++--- configs/MATEKF405MINI/config.h | 6 +++--- configs/MATEKF405SE/config.h | 4 ++-- configs/MATEKF405STD/config.h | 6 +++--- configs/MATEKF405STD_CLONE/config.h | 6 +++--- configs/MATEKF405TE/config.h | 4 ++-- configs/MATEKF405TE_SD/config.h | 4 ++-- configs/MATEKF411/config.h | 4 ++-- configs/MATEKF411SE/config.h | 4 ++-- configs/MATEKF722/config.h | 4 ++-- configs/MATEKF722HD/config.h | 4 ++-- configs/MATEKF722MINI/config.h | 4 ++-- configs/MATEKF722SE/config.h | 4 ++-- configs/MATEKH743/config.h | 4 ++-- configs/MEPSF411/config.h | 2 +- configs/MERAKRCF405/config.h | 6 +++--- configs/MERAKRCF722/config.h | 4 ++-- configs/MERCURYG4/config.h | 2 +- configs/MICOAIR405MINI/config.h | 2 +- configs/MICOAIR743/config.h | 4 ++-- configs/MINI_H743_HD/config.h | 4 ++-- configs/MODULARF4/config.h | 2 +- configs/NAMIMNOF722/config.h | 4 ++-- configs/NBD_GALAXYAIO255/config.h | 4 ++-- configs/NBD_INFINITYAIO255/config.h | 4 ++-- configs/NBD_INFINITYAIOV2/config.h | 4 ++-- configs/NBD_INFINITYAIOV2PRO/config.h | 4 ++-- configs/NEUTRONRCF407/config.h | 6 +++--- configs/NEUTRONRCF411AIO/config.h | 4 ++-- configs/NEUTRONRCF435MINI/config.h | 4 ++-- configs/NEUTRONRCF722AIO/config.h | 4 ++-- configs/NEUTRONRCF745/config.h | 4 ++-- configs/NEUTRONRCF745VTX/config.h | 4 ++-- configs/NEUTRONRCF7AIO/config.h | 4 ++-- configs/NEUTRONRCG4AIO/config.h | 4 ++-- configs/NEUTRONRCH743AIO/config.h | 4 ++-- configs/NEUTRONRCH7BT/config.h | 4 ++-- configs/NIDICI_F4/config.h | 6 +++--- configs/NUCLEOF446/config.h | 2 +- configs/NUCLEOF722/config.h | 4 ++-- configs/ODDITYRCF7AIO/config.h | 4 ++-- configs/OMNIBUSF4/config.h | 6 +++--- configs/OMNIBUSF4FW/config.h | 4 ++-- configs/OMNIBUSF4NANO/config.h | 4 ++-- configs/OMNIBUSF4SD/config.h | 4 ++-- configs/OMNIBUSF4V6/config.h | 4 ++-- configs/OMNIBUSF7/config.h | 4 ++-- configs/OMNIBUSF7V2/config.h | 4 ++-- configs/OMNINXT4/config.h | 4 ++-- configs/OMNINXT7/config.h | 2 +- configs/ORBITF435/config.h | 4 ++-- configs/ORQAF7/config.h | 4 ++-- configs/PODIUMF4/config.h | 6 +++--- configs/PRINCIPIOTF7/config.h | 4 ++-- configs/PYRODRONEF4PDB/config.h | 4 ++-- configs/RADIOLINKF722/config.h | 4 ++-- configs/REVO/config.h | 6 +++--- configs/REVOLT/config.h | 2 +- configs/REVOLTOSD/config.h | 2 +- configs/RRIOT_F722/config.h | 4 ++-- configs/RUSHCORE7/config.h | 4 ++-- configs/RUSHF7AIO/config.h | 4 ++-- configs/SDMODELH7/config.h | 6 +++--- configs/SDMODELH7V2/config.h | 6 +++--- configs/SEQUREH7/config.h | 4 ++-- configs/SKYSTARSF405/config.h | 2 +- configs/SKYSTARSF7HD/config.h | 4 ++-- configs/SKYSTARSF7HDPRO/config.h | 2 +- configs/SKYSTARSF7RS/config.h | 2 +- configs/SKYSTARSH7HD/config.h | 4 ++-- configs/SKYZONEF405/config.h | 6 +++--- configs/SOLOGOODF405/config.h | 4 ++-- configs/SOLOGOODF722/config.h | 4 ++-- configs/SOULF4/config.h | 6 +++--- configs/SPARKY2/config.h | 6 +++--- configs/SPEDIXF4/config.h | 6 +++--- configs/SPEDIXF405/config.h | 4 ++-- configs/SPEDIXF722/config.h | 4 ++-- configs/SPEEDYBEEF4/config.h | 6 +++--- configs/SPEEDYBEEF405AIO/config.h | 4 ++-- configs/SPEEDYBEEF405MINI/config.h | 6 +++--- configs/SPEEDYBEEF405V3/config.h | 6 +++--- configs/SPEEDYBEEF405V4/config.h | 6 +++--- configs/SPEEDYBEEF7/config.h | 4 ++-- configs/SPEEDYBEEF7MINI/config.h | 4 ++-- configs/SPEEDYBEEF7MINIV2/config.h | 4 ++-- configs/SPEEDYBEEF7V2/config.h | 4 ++-- configs/SPEEDYBEEF7V3/config.h | 4 ++-- configs/SPEEDYBEE_F745_AIO/config.h | 4 ++-- configs/SPRACINGF4EVO/config.h | 6 +++--- configs/SPRACINGF4NEO/config.h | 6 +++--- configs/SPRACINGF7DUAL/config.h | 4 ++-- configs/SPRACINGH7EVO/config.h | 4 ++-- configs/SPRACINGH7EXTREME/config.h | 6 +++--- configs/SPRACINGH7NANO/config.h | 6 +++--- configs/SPRACINGH7RF/config.h | 4 ++-- configs/SPRACINGH7ZERO/config.h | 6 +++--- configs/STELLARF4/config.h | 6 +++--- configs/STELLARF7/config.h | 4 ++-- configs/STELLARF7V2/config.h | 4 ++-- configs/STELLARF7_DUAL_HD/config.h | 4 ++-- configs/STM32F411DISCOVERY/config.h | 4 ++-- configs/SUB250F411/config.h | 4 ++-- configs/SUB250REDFOXF722AIO/config.h | 4 ++-- configs/SYNERGYF4/config.h | 2 +- configs/TAKERF411/config.h | 4 ++-- configs/TAKERF722SE/config.h | 4 ++-- configs/TAKERG4AIO/config.h | 4 ++-- configs/TALONF7FUSION/config.h | 2 +- configs/TBS_LUCID_H7/config.h | 4 ++-- configs/TCMM405V3/config.h | 4 ++-- configs/TCMMF7/config.h | 4 ++-- configs/TMH7/config.h | 6 +++--- configs/TMOTORF4/config.h | 6 +++--- configs/TMOTORF7/config.h | 2 +- configs/TMOTORF722SE/config.h | 4 ++-- configs/TMOTORF7V2/config.h | 4 ++-- configs/TMOTORH743/config.h | 4 ++-- configs/TMOTORVELOXF7SE/config.h | 4 ++-- configs/TMOTORVELOXF7V2/config.h | 4 ++-- configs/TMVELOXF411/config.h | 4 ++-- configs/TMVELOXF7/config.h | 4 ++-- configs/TUNERCF435/config.h | 4 ++-- configs/UAVPNG030MINI/config.h | 4 ++-- configs/VEKTORF722/config.h | 4 ++-- configs/VGOODF722DUAL/config.h | 4 ++-- configs/VGOODRCF4/config.h | 4 ++-- configs/VIVAF4AIO/config.h | 6 +++--- configs/WARPF7/config.h | 2 +- configs/WIZZF7HD/config.h | 2 +- configs/XRACERF4/config.h | 4 ++-- configs/YUPIF7/config.h | 4 ++-- configs/ZEEZF7V2/config.h | 2 +- configs/ZEEZF7V3/config.h | 2 +- configs/ZEUSF4EVO/config.h | 4 ++-- configs/ZEUSF722_AIO/config.h | 2 +- 344 files changed, 700 insertions(+), 700 deletions(-) diff --git a/configs/ACCIF405/config.h b/configs/ACCIF405/config.h index 6f3133c1..f43f0678 100644 --- a/configs/ACCIF405/config.h +++ b/configs/ACCIF405/config.h @@ -125,8 +125,8 @@ #define ADC1_DMA_OPT 1 // BARO I2C -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 diff --git a/configs/ACCIF435/config.h b/configs/ACCIF435/config.h index 3db11003..8f169570 100644 --- a/configs/ACCIF435/config.h +++ b/configs/ACCIF435/config.h @@ -125,8 +125,8 @@ #define ADC1_DMA_OPT 1 // BARO I2C -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 diff --git a/configs/AG3XF4/config.h b/configs/AG3XF4/config.h index 42199a6c..a6930616 100644 --- a/configs/AG3XF4/config.h +++ b/configs/AG3XF4/config.h @@ -99,7 +99,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO #define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH @@ -109,7 +109,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG_FLIP diff --git a/configs/AG3XF7/config.h b/configs/AG3XF7/config.h index 6d6e1f55..d3110746 100644 --- a/configs/AG3XF7/config.h +++ b/configs/AG3XF7/config.h @@ -98,7 +98,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#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/AIKONF4/config.h b/configs/AIKONF4/config.h index 63b03a83..e7d75c24 100644 --- a/configs/AIKONF4/config.h +++ b/configs/AIKONF4/config.h @@ -100,8 +100,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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 @@ -109,6 +109,6 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/AIRBOTF4/config.h b/configs/AIRBOTF4/config.h index 2e010bcc..7e162992 100644 --- a/configs/AIRBOTF4/config.h +++ b/configs/AIRBOTF4/config.h @@ -101,12 +101,12 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO #define BARO_SPI_INSTANCE SPI1 #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/AIRBOTF4SD/config.h b/configs/AIRBOTF4SD/config.h index e5df050d..61d38b9e 100644 --- a/configs/AIRBOTF4SD/config.h +++ b/configs/AIRBOTF4SD/config.h @@ -104,7 +104,7 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO #define BARO_SPI_INSTANCE SPI1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD @@ -113,7 +113,7 @@ #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 diff --git a/configs/AIRBOTF4V2/config.h b/configs/AIRBOTF4V2/config.h index 42c9d8ee..3cfec6d6 100644 --- a/configs/AIRBOTF4V2/config.h +++ b/configs/AIRBOTF4V2/config.h @@ -89,7 +89,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI1 #define GYRO_1_SPI_INSTANCE SPI3 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/AIRBOTG4AIO/config.h b/configs/AIRBOTG4AIO/config.h index a1ab33e7..e64fcb90 100644 --- a/configs/AIRBOTG4AIO/config.h +++ b/configs/AIRBOTG4AIO/config.h @@ -113,8 +113,8 @@ #define DEFAULT_CURRENT_METER_SCALE 179 #define BEEPER_INVERTED -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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 index d24652a3..9a48c687 100644 --- a/configs/AIRBOTSUPERF4/config.h +++ b/configs/AIRBOTSUPERF4/config.h @@ -122,8 +122,8 @@ #define SPI3_TX_DMA_OPT 5 #define ADC_INSTANCE ADC1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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 index da87ffea..f4a666a9 100644 --- a/configs/AIRF7/config.h +++ b/configs/AIRF7/config.h @@ -84,8 +84,8 @@ #define ADC1_DMA_OPT 1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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 index a83a4b1c..2fd2be7c 100644 --- a/configs/ALIENFLIGHTF4/config.h +++ b/configs/ALIENFLIGHTF4/config.h @@ -107,8 +107,8 @@ #define MAG_ALIGN CW180_DEG_FLIP #define MAG_ALIGN_PITCH 1800 #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/ANYFCF7/config.h b/configs/ANYFCF7/config.h index b229ac5b..51b1daa3 100644 --- a/configs/ANYFCF7/config.h +++ b/configs/ANYFCF7/config.h @@ -115,16 +115,16 @@ #define SPI4_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define BEEPER_INVERTED #define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 diff --git a/configs/ANYFCM7/config.h b/configs/ANYFCM7/config.h index d21c5e51..9d1e0552 100644 --- a/configs/ANYFCM7/config.h +++ b/configs/ANYFCM7/config.h @@ -101,8 +101,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#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 index 7093bc9b..2c763b7a 100644 --- a/configs/AOCODAF405/config.h +++ b/configs/AOCODAF405/config.h @@ -92,8 +92,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -102,7 +102,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW0_DEG_FLIP diff --git a/configs/AOCODAF405V2MPU6000/config.h b/configs/AOCODAF405V2MPU6000/config.h index 7a79f6e6..806720cc 100644 --- a/configs/AOCODAF405V2MPU6000/config.h +++ b/configs/AOCODAF405V2MPU6000/config.h @@ -95,9 +95,9 @@ #define ADC_INSTANCE ADC3 #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/AOCODAF405V2MPU6500/config.h b/configs/AOCODAF405V2MPU6500/config.h index 174f9f48..43b41022 100644 --- a/configs/AOCODAF405V2MPU6500/config.h +++ b/configs/AOCODAF405V2MPU6500/config.h @@ -95,9 +95,9 @@ #define ADC_INSTANCE ADC3 #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/AOCODAF722MINI/config.h b/configs/AOCODAF722MINI/config.h index 1120cb3d..40aeb152 100644 --- a/configs/AOCODAF722MINI/config.h +++ b/configs/AOCODAF722MINI/config.h @@ -94,9 +94,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/AOCODAF722MINIV2/config.h b/configs/AOCODAF722MINIV2/config.h index f1ede0e0..0e31490d 100644 --- a/configs/AOCODAF722MINIV2/config.h +++ b/configs/AOCODAF722MINIV2/config.h @@ -97,8 +97,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/AOCODARCF405V3/config.h b/configs/AOCODARCF405V3/config.h index b3da3711..3d44c6f9 100644 --- a/configs/AOCODARCF405V3/config.h +++ b/configs/AOCODARCF405V3/config.h @@ -106,8 +106,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 #define MSP_UART SERIAL_PORT_UART5 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/AOCODARCF405V3SD/config.h b/configs/AOCODARCF405V3SD/config.h index 691a5385..864805b3 100644 --- a/configs/AOCODARCF405V3SD/config.h +++ b/configs/AOCODARCF405V3SD/config.h @@ -106,8 +106,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 #define MSP_UART SERIAL_PORT_UART5 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/AOCODARCF405_AIO/config.h b/configs/AOCODARCF405_AIO/config.h index b70ed770..722be91e 100644 --- a/configs/AOCODARCF405_AIO/config.h +++ b/configs/AOCODARCF405_AIO/config.h @@ -89,8 +89,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 //TODO #define MOTOR_PWM_PROTOCOL DSHOT600 diff --git a/configs/AOCODARCF411_AIO/config.h b/configs/AOCODARCF411_AIO/config.h index 702eb2f7..de69b1f9 100644 --- a/configs/AOCODARCF411_AIO/config.h +++ b/configs/AOCODARCF411_AIO/config.h @@ -83,8 +83,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/AOCODARCF722_AIO/config.h b/configs/AOCODARCF722_AIO/config.h index 172ebd50..0b03eddf 100644 --- a/configs/AOCODARCF722_AIO/config.h +++ b/configs/AOCODARCF722_AIO/config.h @@ -120,10 +120,10 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 650 -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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 index c2320617..c5c78797 100644 --- a/configs/AOCODARCF7DUAL/config.h +++ b/configs/AOCODARCF7DUAL/config.h @@ -100,8 +100,8 @@ #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 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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/AOCODARCH7DUAL/config.h b/configs/AOCODARCH7DUAL/config.h index d4bb6fd4..94b1df7d 100644 --- a/configs/AOCODARCH7DUAL/config.h +++ b/configs/AOCODARCH7DUAL/config.h @@ -127,8 +127,8 @@ #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 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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/APEXF7/config.h b/configs/APEXF7/config.h index 32afe941..0fa3a2a3 100644 --- a/configs/APEXF7/config.h +++ b/configs/APEXF7/config.h @@ -89,8 +89,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/APEXF72023/config.h b/configs/APEXF72023/config.h index 3498563f..7463e414 100644 --- a/configs/APEXF72023/config.h +++ b/configs/APEXF72023/config.h @@ -91,8 +91,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/ARGUSF7AIO/config.h b/configs/ARGUSF7AIO/config.h index cdf65f5e..36de997d 100644 --- a/configs/ARGUSF7AIO/config.h +++ b/configs/ARGUSF7AIO/config.h @@ -100,8 +100,8 @@ #define ADC1_DMA_OPT 1 #define ADC_INSTANCE ADC1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/AXISFLYINGF7/config.h b/configs/AXISFLYINGF7/config.h index fa49146c..02d6d779 100644 --- a/configs/AXISFLYINGF7/config.h +++ b/configs/AXISFLYINGF7/config.h @@ -93,8 +93,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/AXISFLYINGF7PRO/config.h b/configs/AXISFLYINGF7PRO/config.h index cdb27025..8bef321b 100644 --- a/configs/AXISFLYINGF7PRO/config.h +++ b/configs/AXISFLYINGF7PRO/config.h @@ -102,8 +102,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/BAYCK_DOLPHIN/config.h b/configs/BAYCK_DOLPHIN/config.h index 36cb9538..49087371 100644 --- a/configs/BAYCK_DOLPHIN/config.h +++ b/configs/BAYCK_DOLPHIN/config.h @@ -104,7 +104,7 @@ #define ADC_INSTANCE ADC1 #define ADC1_DMA_OPT 11 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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/BEASTFPVF722/config.h b/configs/BEASTFPVF722/config.h index 2081520f..c76cfc18 100644 --- a/configs/BEASTFPVF722/config.h +++ b/configs/BEASTFPVF722/config.h @@ -95,8 +95,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/BEEROTORF4/config.h b/configs/BEEROTORF4/config.h index 724ca755..be4f8dbd 100644 --- a/configs/BEEROTORF4/config.h +++ b/configs/BEEROTORF4/config.h @@ -104,7 +104,7 @@ #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/BETAFLIGHTF4/config.h b/configs/BETAFLIGHTF4/config.h index 40b23697..d1eebb06 100644 --- a/configs/BETAFLIGHTF4/config.h +++ b/configs/BETAFLIGHTF4/config.h @@ -93,13 +93,13 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/BETAFPVF405/config.h b/configs/BETAFPVF405/config.h index 55764bb5..c1d86568 100644 --- a/configs/BETAFPVF405/config.h +++ b/configs/BETAFPVF405/config.h @@ -100,7 +100,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define BARO_SPI_INSTANCE SPI3 #define DEFAULT_BARO_DEVICE BARO_NONE diff --git a/configs/BETAFPVG473/config.h b/configs/BETAFPVG473/config.h index 70227303..c1b5bd16 100644 --- a/configs/BETAFPVG473/config.h +++ b/configs/BETAFPVG473/config.h @@ -91,8 +91,8 @@ #define VTX_SMARTAUDIO_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART3 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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/BETAFPVH743/config.h b/configs/BETAFPVH743/config.h index d6d36bf8..369e6cbd 100644 --- a/configs/BETAFPVH743/config.h +++ b/configs/BETAFPVH743/config.h @@ -118,9 +118,9 @@ #define TIMUP8_DMA_OPT 0 #define TIMUP0_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_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/BLADE_F7/config.h b/configs/BLADE_F7/config.h index 514cc028..67a3b8b4 100644 --- a/configs/BLADE_F7/config.h +++ b/configs/BLADE_F7/config.h @@ -95,8 +95,8 @@ #define ADC1_DMA_OPT 1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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 index 8d80608a..8049376e 100644 --- a/configs/BLADE_F7_AIO/config.h +++ b/configs/BLADE_F7_AIO/config.h @@ -103,8 +103,8 @@ #define ADC3_DMA_OPT 1 #define ADC_INSTANCE ADC3 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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 index 19e3bed1..b2a39775 100644 --- a/configs/BLADE_F7_HD/config.h +++ b/configs/BLADE_F7_HD/config.h @@ -91,8 +91,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/BLUEJAYF4/config.h b/configs/BLUEJAYF4/config.h index 5368a049..8e891139 100644 --- a/configs/BLUEJAYF4/config.h +++ b/configs/BLUEJAYF4/config.h @@ -85,8 +85,8 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 @@ -94,6 +94,6 @@ #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/BRAHMA_F405/config.h b/configs/BRAHMA_F405/config.h index 676f6592..1919ed74 100644 --- a/configs/BRAHMA_F405/config.h +++ b/configs/BRAHMA_F405/config.h @@ -91,8 +91,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_I2C_ADDRESS 119 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/BROTHERHOBBYF405V2/config.h b/configs/BROTHERHOBBYF405V2/config.h index 371eb35e..6d17798f 100644 --- a/configs/BROTHERHOBBYF405V2/config.h +++ b/configs/BROTHERHOBBYF405V2/config.h @@ -93,8 +93,8 @@ #define SPI2_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 // #define SERIALRX_PROVIDER CRSF #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/BROTHERHOBBYF405V3/config.h b/configs/BROTHERHOBBYF405V3/config.h index 4bb6cac7..0445eb9e 100644 --- a/configs/BROTHERHOBBYF405V3/config.h +++ b/configs/BROTHERHOBBYF405V3/config.h @@ -92,8 +92,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/BROTHERHOBBYF435/config.h b/configs/BROTHERHOBBYF435/config.h index 46157028..a8b561f2 100644 --- a/configs/BROTHERHOBBYF435/config.h +++ b/configs/BROTHERHOBBYF435/config.h @@ -90,8 +90,8 @@ #define USE_BARO_DPS310 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 // UART & VCP #define UART1_RX_PIN PA10 diff --git a/configs/CADDXF4/config.h b/configs/CADDXF4/config.h index 2c356a39..1354346f 100644 --- a/configs/CADDXF4/config.h +++ b/configs/CADDXF4/config.h @@ -104,8 +104,8 @@ #define ADC3_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define BEEPER_INVERTED #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/CADDXF4_AIO_ELRS/config.h b/configs/CADDXF4_AIO_ELRS/config.h index 79b4f7ee..8e68650b 100644 --- a/configs/CADDXF4_AIO_ELRS/config.h +++ b/configs/CADDXF4_AIO_ELRS/config.h @@ -94,8 +94,8 @@ #define ADC1_DMA_OPT 1 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#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 @@ -107,7 +107,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/CCRCF435AIO/config.h b/configs/CCRCF435AIO/config.h index 5690ed4f..a7afa171 100644 --- a/configs/CCRCF435AIO/config.h +++ b/configs/CCRCF435AIO/config.h @@ -97,8 +97,8 @@ #define DEFAULT_ALIGN_BOARD_YAW -45 #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#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/CCRCF722D/config.h b/configs/CCRCF722D/config.h index 0743584e..a4680371 100644 --- a/configs/CCRCF722D/config.h +++ b/configs/CCRCF722D/config.h @@ -96,8 +96,8 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/CHONKERH735/config.h b/configs/CHONKERH735/config.h index 087c9703..7a183097 100644 --- a/configs/CHONKERH735/config.h +++ b/configs/CHONKERH735/config.h @@ -109,8 +109,8 @@ Details: https://github.com/crteensy/yolo-chonker/tree/as-built-20230303 #define ADC1_DMA_OPT 8 #define ADC3_DMA_OPT 9 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI4 #define GYRO_1_SPI_INSTANCE SPI2 #define GYRO_2_SPI_INSTANCE SPI3 diff --git a/configs/CKFLIGHTF4/config.h b/configs/CKFLIGHTF4/config.h index 90ae9ac8..7487f1b2 100644 --- a/configs/CKFLIGHTF4/config.h +++ b/configs/CKFLIGHTF4/config.h @@ -89,7 +89,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define BARO_SPI_INSTANCE SPI1 diff --git a/configs/CLRACINGF7/config.h b/configs/CLRACINGF7/config.h index d1123bfa..72a40b61 100644 --- a/configs/CLRACINGF7/config.h +++ b/configs/CLRACINGF7/config.h @@ -106,7 +106,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/CRAZYBEEF405/config.h b/configs/CRAZYBEEF405/config.h index 0777ef78..a5038cb6 100644 --- a/configs/CRAZYBEEF405/config.h +++ b/configs/CRAZYBEEF405/config.h @@ -89,8 +89,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 diff --git a/configs/CYCLONEF405_PRO/config.h b/configs/CYCLONEF405_PRO/config.h index 239963d4..7dab925e 100644 --- a/configs/CYCLONEF405_PRO/config.h +++ b/configs/CYCLONEF405_PRO/config.h @@ -99,8 +99,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #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 index 4e7645fe..d4de7c18 100644 --- a/configs/CYCLONEF722_PRO/config.h +++ b/configs/CYCLONEF722_PRO/config.h @@ -97,9 +97,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/DAKEFPVF405/config.h b/configs/DAKEFPVF405/config.h index 58ac9bc1..02f66718 100644 --- a/configs/DAKEFPVF405/config.h +++ b/configs/DAKEFPVF405/config.h @@ -104,7 +104,7 @@ #define ADC2_DMA_OPT 1 #define BARO_SPI_INSTANCE SPI2 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/DAKEFPVF722/config.h b/configs/DAKEFPVF722/config.h index b4960578..a09e806d 100644 --- a/configs/DAKEFPVF722/config.h +++ b/configs/DAKEFPVF722/config.h @@ -111,7 +111,7 @@ #define BARO_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3 #define MAX7456_SPI_INSTANCE SPI2 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/DALRCF405/config.h b/configs/DALRCF405/config.h index a88aa4f0..bd0f8682 100644 --- a/configs/DALRCF405/config.h +++ b/configs/DALRCF405/config.h @@ -96,8 +96,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 @@ -107,7 +107,7 @@ //TODO #define OSD_DISPLAYPORT_DEVICE MAX7456 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/DALRCF722DUAL/config.h b/configs/DALRCF722DUAL/config.h index 06c513c3..73895735 100644 --- a/configs/DALRCF722DUAL/config.h +++ b/configs/DALRCF722DUAL/config.h @@ -94,9 +94,9 @@ #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/DARWINF411/config.h b/configs/DARWINF411/config.h index 93d1a931..056589d6 100644 --- a/configs/DARWINF411/config.h +++ b/configs/DARWINF411/config.h @@ -87,8 +87,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define I2C1_CLOCKSPEED 400 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/DARWINF435/config.h b/configs/DARWINF435/config.h index 1b574fdf..01766ee2 100644 --- a/configs/DARWINF435/config.h +++ b/configs/DARWINF435/config.h @@ -96,8 +96,8 @@ #define GYRO_1_ALIGN CW180_DEG #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#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/DARWINF722HD/config.h b/configs/DARWINF722HD/config.h index 2c33d6bd..a278ccf6 100644 --- a/configs/DARWINF722HD/config.h +++ b/configs/DARWINF722HD/config.h @@ -105,9 +105,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/DARWINF722HDV2/config.h b/configs/DARWINF722HDV2/config.h index bccf64a4..086bd9e4 100644 --- a/configs/DARWINF722HDV2/config.h +++ b/configs/DARWINF722HDV2/config.h @@ -110,8 +110,8 @@ 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 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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/DFR_F722_DUAL_HD/config.h b/configs/DFR_F722_DUAL_HD/config.h index b3f73703..57d129f1 100644 --- a/configs/DFR_F722_DUAL_HD/config.h +++ b/configs/DFR_F722_DUAL_HD/config.h @@ -104,8 +104,8 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/DREAMFLYF405/config.h b/configs/DREAMFLYF405/config.h index f0d196d2..68277144 100644 --- a/configs/DREAMFLYF405/config.h +++ b/configs/DREAMFLYF405/config.h @@ -111,8 +111,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO diff --git a/configs/DREAMFLYF722/config.h b/configs/DREAMFLYF722/config.h index 67f52d15..2d02ff14 100644 --- a/configs/DREAMFLYF722/config.h +++ b/configs/DREAMFLYF722/config.h @@ -109,8 +109,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/DREAMWORKSF722/config.h b/configs/DREAMWORKSF722/config.h index d4f13cf2..081bb118 100644 --- a/configs/DREAMWORKSF722/config.h +++ b/configs/DREAMWORKSF722/config.h @@ -100,8 +100,8 @@ #define ADC3_DMA_OPT 1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/DRONIUSF7/config.h b/configs/DRONIUSF7/config.h index 52a6035b..eade07d0 100644 --- a/configs/DRONIUSF7/config.h +++ b/configs/DRONIUSF7/config.h @@ -87,8 +87,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_I2C_ADDRESS 119 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/DYSF4PRO/config.h b/configs/DYSF4PRO/config.h index 2490064e..b237b65c 100644 --- a/configs/DYSF4PRO/config.h +++ b/configs/DYSF4PRO/config.h @@ -97,7 +97,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON @@ -106,7 +106,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/EACHINEF722/config.h b/configs/EACHINEF722/config.h index a1d81aa2..c442c65e 100644 --- a/configs/EACHINEF722/config.h +++ b/configs/EACHINEF722/config.h @@ -105,7 +105,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_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 index b0c3acd7..dd7e5f76 100644 --- a/configs/EACHINEF722_AIO/config.h +++ b/configs/EACHINEF722_AIO/config.h @@ -102,7 +102,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_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/EAGLEF405/config.h b/configs/EAGLEF405/config.h index 5c8d72c5..20c9ad88 100644 --- a/configs/EAGLEF405/config.h +++ b/configs/EAGLEF405/config.h @@ -92,8 +92,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/EAGLEF722/config.h b/configs/EAGLEF722/config.h index f7a22696..a48f39c1 100644 --- a/configs/EAGLEF722/config.h +++ b/configs/EAGLEF722/config.h @@ -91,8 +91,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO diff --git a/configs/ELINF405/config.h b/configs/ELINF405/config.h index 40ad3749..6cd4f345 100644 --- a/configs/ELINF405/config.h +++ b/configs/ELINF405/config.h @@ -112,7 +112,7 @@ #define SYSTEM_HSE_MHZ 8 //TODO #define VCD_VIDEO_SYSTEM NTSC #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_BOX 40 #define PINIO2_BOX 41 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/EXF722DUAL/config.h b/configs/EXF722DUAL/config.h index 17eae7d1..0432be4c 100644 --- a/configs/EXF722DUAL/config.h +++ b/configs/EXF722DUAL/config.h @@ -101,9 +101,9 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/EXUAVF4PRO/config.h b/configs/EXUAVF4PRO/config.h index a35123f1..2c55d238 100644 --- a/configs/EXUAVF4PRO/config.h +++ b/configs/EXUAVF4PRO/config.h @@ -98,7 +98,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -106,7 +106,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define PINIO1_BOX 40 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/F4BY/config.h b/configs/F4BY/config.h index 6e19c381..048e24b7 100644 --- a/configs/F4BY/config.h +++ b/configs/F4BY/config.h @@ -108,15 +108,15 @@ #define SPI2_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG #define GYRO_1_ALIGN_YAW 900 diff --git a/configs/FLAOF405X8/config.h b/configs/FLAOF405X8/config.h index 73031ced..aa558b2a 100644 --- a/configs/FLAOF405X8/config.h +++ b/configs/FLAOF405X8/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FLASHHOBBYF405/config.h b/configs/FLASHHOBBYF405/config.h index 7a9918ca..f7686d13 100644 --- a/configs/FLASHHOBBYF405/config.h +++ b/configs/FLASHHOBBYF405/config.h @@ -100,8 +100,8 @@ #define ADC1_DMA_OPT 0 #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/FLASHHOBBYF722/config.h b/configs/FLASHHOBBYF722/config.h index d5bdc1ae..384a6cff 100644 --- a/configs/FLASHHOBBYF722/config.h +++ b/configs/FLASHHOBBYF722/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 0 #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/FLYCOLORF4/config.h b/configs/FLYCOLORF4/config.h index 4dbb0b58..c7101daf 100644 --- a/configs/FLYCOLORF4/config.h +++ b/configs/FLYCOLORF4/config.h @@ -96,8 +96,8 @@ #define SERIALRX_UART SERIAL_PORT_UART4 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/FLYCOLORF7/config.h b/configs/FLYCOLORF7/config.h index f22963d1..3992fade 100644 --- a/configs/FLYCOLORF7/config.h +++ b/configs/FLYCOLORF7/config.h @@ -100,8 +100,8 @@ #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FLYCOLORF7MICRO/config.h b/configs/FLYCOLORF7MICRO/config.h index 740bd555..5614b458 100755 --- a/configs/FLYCOLORF7MICRO/config.h +++ b/configs/FLYCOLORF7MICRO/config.h @@ -100,8 +100,8 @@ #define SERIALRX_UART SERIAL_PORT_UART4 #define ADC_INSTANCE ADC1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/FLYCOLORF7MINI/config.h b/configs/FLYCOLORF7MINI/config.h index 03b1d43e..7bb994df 100644 --- a/configs/FLYCOLORF7MINI/config.h +++ b/configs/FLYCOLORF7MINI/config.h @@ -97,7 +97,7 @@ #define ADC3_DMA_OPT 0 #define ADC_INSTANCE ADC3 -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/FLYCOLORF7V2/config.h b/configs/FLYCOLORF7V2/config.h index cbc20669..fbd48549 100644 --- a/configs/FLYCOLORF7V2/config.h +++ b/configs/FLYCOLORF7V2/config.h @@ -101,8 +101,8 @@ #define SERIALRX_UART SERIAL_PORT_USART1 #define MSP_UART SERIAL_PORT_UART4 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #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 index 0c0ef741..f5db194e 100644 --- a/configs/FLYCOLORF7_AIO/config.h +++ b/configs/FLYCOLORF7_AIO/config.h @@ -98,8 +98,8 @@ #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FLYFISHRCF405/config.h b/configs/FLYFISHRCF405/config.h index 6d7f4861..fef911a3 100644 --- a/configs/FLYFISHRCF405/config.h +++ b/configs/FLYFISHRCF405/config.h @@ -101,8 +101,8 @@ #define ADC3_DMA_OPT 1 #define ADC_INSTANCE ADC3 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -112,7 +112,7 @@ #define SYSTEM_HSE_MHZ 8 #define FLASH_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG #define GYRO_1_ALIGN_YAW 900 diff --git a/configs/FLYSPARKF4/config.h b/configs/FLYSPARKF4/config.h index 8ec96885..0835b0fa 100644 --- a/configs/FLYSPARKF4/config.h +++ b/configs/FLYSPARKF4/config.h @@ -96,8 +96,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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_OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FLYWOOF405/config.h b/configs/FLYWOOF405/config.h index b5750b2f..d597b078 100644 --- a/configs/FLYWOOF405/config.h +++ b/configs/FLYWOOF405/config.h @@ -97,8 +97,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF #define ADC_INSTANCE ADC1 @@ -109,7 +109,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_BOX 40 #define PINIO2_BOX 41 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/FLYWOOF405NANO/config.h b/configs/FLYWOOF405NANO/config.h index ac4a38fa..4c30dca5 100644 --- a/configs/FLYWOOF405NANO/config.h +++ b/configs/FLYWOOF405NANO/config.h @@ -96,9 +96,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC @@ -106,6 +106,6 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/FLYWOOF405PRO/config.h b/configs/FLYWOOF405PRO/config.h index 442b11b2..22276957 100644 --- a/configs/FLYWOOF405PRO/config.h +++ b/configs/FLYWOOF405PRO/config.h @@ -95,16 +95,16 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 170 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG_FLIP diff --git a/configs/FLYWOOF405S_AIO/config.h b/configs/FLYWOOF405S_AIO/config.h index 8ece6cd3..63dfc2fc 100644 --- a/configs/FLYWOOF405S_AIO/config.h +++ b/configs/FLYWOOF405S_AIO/config.h @@ -95,15 +95,15 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 170 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/FLYWOOF411/config.h b/configs/FLYWOOF411/config.h index 5c6d92d7..5c105c97 100644 --- a/configs/FLYWOOF411/config.h +++ b/configs/FLYWOOF411/config.h @@ -88,8 +88,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define ADC_INSTANCE ADC1 diff --git a/configs/FLYWOOF411EVO_HD/config.h b/configs/FLYWOOF411EVO_HD/config.h index f3e71043..c7e8330d 100644 --- a/configs/FLYWOOF411EVO_HD/config.h +++ b/configs/FLYWOOF411EVO_HD/config.h @@ -80,8 +80,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define ADC_INSTANCE ADC1 diff --git a/configs/FLYWOOF411HEX/config.h b/configs/FLYWOOF411HEX/config.h index 173f4581..8b943a9f 100644 --- a/configs/FLYWOOF411HEX/config.h +++ b/configs/FLYWOOF411HEX/config.h @@ -80,8 +80,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/FLYWOOF411V2/config.h b/configs/FLYWOOF411V2/config.h index 2dcfd33d..713d25bb 100644 --- a/configs/FLYWOOF411V2/config.h +++ b/configs/FLYWOOF411V2/config.h @@ -83,8 +83,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/FLYWOOF411_5IN1_AIO/config.h b/configs/FLYWOOF411_5IN1_AIO/config.h index 5dfaf990..26cdc13c 100644 --- a/configs/FLYWOOF411_5IN1_AIO/config.h +++ b/configs/FLYWOOF411_5IN1_AIO/config.h @@ -84,7 +84,7 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_FRSKY_D #define RX_SPI_INSTANCE SPI3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FLYWOOF722PRO/config.h b/configs/FLYWOOF722PRO/config.h index 06335573..c4d974e1 100644 --- a/configs/FLYWOOF722PRO/config.h +++ b/configs/FLYWOOF722PRO/config.h @@ -98,8 +98,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FLYWOOF722PROV2/config.h b/configs/FLYWOOF722PROV2/config.h index 2beb8c1b..4577c9b6 100644 --- a/configs/FLYWOOF722PROV2/config.h +++ b/configs/FLYWOOF722PROV2/config.h @@ -99,8 +99,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FLYWOOF745/config.h b/configs/FLYWOOF745/config.h index dcbd1975..e791840c 100644 --- a/configs/FLYWOOF745/config.h +++ b/configs/FLYWOOF745/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_AUTO #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FLYWOOF745AIO/config.h b/configs/FLYWOOF745AIO/config.h index 8cebb2e1..a3edfa92 100644 --- a/configs/FLYWOOF745AIO/config.h +++ b/configs/FLYWOOF745AIO/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FLYWOOF745HEX/config.h b/configs/FLYWOOF745HEX/config.h index 94a65aba..389fa9a3 100644 --- a/configs/FLYWOOF745HEX/config.h +++ b/configs/FLYWOOF745HEX/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_AUTO #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FLYWOOF745NANO/config.h b/configs/FLYWOOF745NANO/config.h index 0ff588f6..62edc2c2 100644 --- a/configs/FLYWOOF745NANO/config.h +++ b/configs/FLYWOOF745NANO/config.h @@ -99,8 +99,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_DEVICE BARO_BMP280 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FLYWOOF7DUAL/config.h b/configs/FLYWOOF7DUAL/config.h index 9bbee5df..afea1a50 100644 --- a/configs/FLYWOOF7DUAL/config.h +++ b/configs/FLYWOOF7DUAL/config.h @@ -107,9 +107,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define ADC_INSTANCE ADC3 diff --git a/configs/FOXEERF405/config.h b/configs/FOXEERF405/config.h index 1107cdac..6930a5b9 100644 --- a/configs/FOXEERF405/config.h +++ b/configs/FOXEERF405/config.h @@ -102,7 +102,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/FOXEERF405V2/config.h b/configs/FOXEERF405V2/config.h index 0de86ed2..0fe12226 100644 --- a/configs/FOXEERF405V2/config.h +++ b/configs/FOXEERF405V2/config.h @@ -101,11 +101,11 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 //TODO set usb_msc_pin_pullup = ON #define FLASH_SPI_INSTANCE SPI2 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FOXEERF722DUAL/config.h b/configs/FOXEERF722DUAL/config.h index 15a36cee..427196b0 100644 --- a/configs/FOXEERF722DUAL/config.h +++ b/configs/FOXEERF722DUAL/config.h @@ -93,8 +93,8 @@ #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FOXEERF722V2/config.h b/configs/FOXEERF722V2/config.h index 00339784..dd89c584 100644 --- a/configs/FOXEERF722V2/config.h +++ b/configs/FOXEERF722V2/config.h @@ -90,8 +90,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FOXEERF722V3/config.h b/configs/FOXEERF722V3/config.h index df8cfdfc..c2ae2de0 100644 --- a/configs/FOXEERF722V3/config.h +++ b/configs/FOXEERF722V3/config.h @@ -91,8 +91,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FOXEERF722V4/config.h b/configs/FOXEERF722V4/config.h index 06a64bd2..be3feab8 100644 --- a/configs/FOXEERF722V4/config.h +++ b/configs/FOXEERF722V4/config.h @@ -95,8 +95,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/FOXEERF745V2_AIO/config.h b/configs/FOXEERF745V2_AIO/config.h index 4dd9f467..1ef4c30e 100644 --- a/configs/FOXEERF745V2_AIO/config.h +++ b/configs/FOXEERF745V2_AIO/config.h @@ -88,8 +88,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/FOXEERF745V3_AIO/config.h b/configs/FOXEERF745V3_AIO/config.h index 1a47a050..7ccc8a53 100644 --- a/configs/FOXEERF745V3_AIO/config.h +++ b/configs/FOXEERF745V3_AIO/config.h @@ -89,8 +89,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/FOXEERF745V4_AIO/config.h b/configs/FOXEERF745V4_AIO/config.h index 8b3a395b..bb2960bd 100644 --- a/configs/FOXEERF745V4_AIO/config.h +++ b/configs/FOXEERF745V4_AIO/config.h @@ -91,8 +91,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/FOXEERF745_AIO/config.h b/configs/FOXEERF745_AIO/config.h index 3fbd76ae..3a0d6aca 100644 --- a/configs/FOXEERF745_AIO/config.h +++ b/configs/FOXEERF745_AIO/config.h @@ -89,8 +89,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/FOXEERH743/config.h b/configs/FOXEERH743/config.h index 966728a1..dac759fb 100644 --- a/configs/FOXEERH743/config.h +++ b/configs/FOXEERH743/config.h @@ -114,9 +114,9 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/FOXEERH743V2/config.h b/configs/FOXEERH743V2/config.h index 10ed780f..946bc6cf 100644 --- a/configs/FOXEERH743V2/config.h +++ b/configs/FOXEERH743V2/config.h @@ -118,8 +118,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH //TODO #define MOTOR_PWM_PROTOCOL DSHOT600 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/FPVM_BETAFLIGHTF7/config.h b/configs/FPVM_BETAFLIGHTF7/config.h index aaf1efe7..87e6b12f 100644 --- a/configs/FPVM_BETAFLIGHTF7/config.h +++ b/configs/FPVM_BETAFLIGHTF7/config.h @@ -97,13 +97,13 @@ #define ADC1_DMA_OPT 1 -#define MAG_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 BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI4 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/FREEAXISF4/config.h b/configs/FREEAXISF4/config.h index a31bed59..114d74ca 100644 --- a/configs/FREEAXISF4/config.h +++ b/configs/FREEAXISF4/config.h @@ -78,8 +78,8 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/FURYF4/config.h b/configs/FURYF4/config.h index 57afec31..3ed40b55 100644 --- a/configs/FURYF4/config.h +++ b/configs/FURYF4/config.h @@ -89,8 +89,8 @@ #define SPI2_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 @@ -98,7 +98,7 @@ #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/FURYF4OSD/config.h b/configs/FURYF4OSD/config.h index 3952f75d..8b3d4b0b 100644 --- a/configs/FURYF4OSD/config.h +++ b/configs/FURYF4OSD/config.h @@ -96,11 +96,11 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/GEELANGF411/config.h b/configs/GEELANGF411/config.h index c2543315..077964a2 100644 --- a/configs/GEELANGF411/config.h +++ b/configs/GEELANGF411/config.h @@ -77,8 +77,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO @@ -88,7 +88,7 @@ #define DEFAULT_CURRENT_METER_SCALE 100 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/GEMEF411/config.h b/configs/GEMEF411/config.h index a0ebf3d1..cdf098f0 100644 --- a/configs/GEMEF411/config.h +++ b/configs/GEMEF411/config.h @@ -85,8 +85,8 @@ #define ADC1_DMA_OPT 0 #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO diff --git a/configs/GEPRCF405/config.h b/configs/GEPRCF405/config.h index aa12c549..4ea1cbf0 100644 --- a/configs/GEPRCF405/config.h +++ b/configs/GEPRCF405/config.h @@ -104,8 +104,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#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/GEPRCF405_BT_HD/config.h b/configs/GEPRCF405_BT_HD/config.h index 608c2a81..34c66112 100644 --- a/configs/GEPRCF405_BT_HD/config.h +++ b/configs/GEPRCF405_BT_HD/config.h @@ -109,8 +109,8 @@ //TODO aux 0 0 0 1700 2100 0 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/GEPRCF411/config.h b/configs/GEPRCF411/config.h index e4d82f90..e18482f2 100644 --- a/configs/GEPRCF411/config.h +++ b/configs/GEPRCF411/config.h @@ -83,8 +83,8 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC //TODO #define VBAT_DETECT_CELL_VOLTAGE 300 diff --git a/configs/GEPRCF411_AIO/config.h b/configs/GEPRCF411_AIO/config.h index 4454d0d9..fba7eb88 100644 --- a/configs/GEPRCF411_AIO/config.h +++ b/configs/GEPRCF411_AIO/config.h @@ -89,8 +89,8 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 100 diff --git a/configs/GEPRCF722/config.h b/configs/GEPRCF722/config.h index 73592076..4be0aa61 100644 --- a/configs/GEPRCF722/config.h +++ b/configs/GEPRCF722/config.h @@ -103,8 +103,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/GEPRCF722BT/config.h b/configs/GEPRCF722BT/config.h index 30997957..d712714f 100644 --- a/configs/GEPRCF722BT/config.h +++ b/configs/GEPRCF722BT/config.h @@ -89,9 +89,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/GEPRCF722_BT_HD/config.h b/configs/GEPRCF722_BT_HD/config.h index 5b7b2cb4..bf876108 100644 --- a/configs/GEPRCF722_BT_HD/config.h +++ b/configs/GEPRCF722_BT_HD/config.h @@ -99,8 +99,8 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/GEPRCF722_BT_HD_V3/config.h b/configs/GEPRCF722_BT_HD_V3/config.h index 45063051..bf170e31 100644 --- a/configs/GEPRCF722_BT_HD_V3/config.h +++ b/configs/GEPRCF722_BT_HD_V3/config.h @@ -91,8 +91,8 @@ #define ADC3_DMA_OPT 1 #define ADC_INSTANCE ADC3 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define USE_SDCARD_SPI #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/GEPRCF745_BT_HD/config.h b/configs/GEPRCF745_BT_HD/config.h index 8c055def..414457f7 100644 --- a/configs/GEPRCF745_BT_HD/config.h +++ b/configs/GEPRCF745_BT_HD/config.h @@ -120,8 +120,8 @@ #define MSP_UART SERIAL_PORT_USART3 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 //TODO #define BLACKBOX_SAMPLE_RATE 1/1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/GEPRC_F722_AIO/config.h b/configs/GEPRC_F722_AIO/config.h index 310f0479..370b8006 100644 --- a/configs/GEPRC_F722_AIO/config.h +++ b/configs/GEPRC_F722_AIO/config.h @@ -95,8 +95,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 //TODO #define BLACKBOX_P_RATIO 16 diff --git a/configs/GEP_F405_VTX_V3/config.h b/configs/GEP_F405_VTX_V3/config.h index d73577f5..248b7ac7 100644 --- a/configs/GEP_F405_VTX_V3/config.h +++ b/configs/GEP_F405_VTX_V3/config.h @@ -102,7 +102,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/GRAVITYF7/config.h b/configs/GRAVITYF7/config.h index 8ff9e8fc..091541ef 100644 --- a/configs/GRAVITYF7/config.h +++ b/configs/GRAVITYF7/config.h @@ -89,9 +89,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_I2C_ADDRESS 119 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/HAKRCF405/config.h b/configs/HAKRCF405/config.h index a5522d7b..9f9fb07c 100644 --- a/configs/HAKRCF405/config.h +++ b/configs/HAKRCF405/config.h @@ -98,7 +98,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/HAKRCF405D/config.h b/configs/HAKRCF405D/config.h index 86ecb249..228092e0 100644 --- a/configs/HAKRCF405D/config.h +++ b/configs/HAKRCF405D/config.h @@ -106,15 +106,15 @@ #define SPI3_TX_DMA_OPT 1 #define ADC1_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define DEFAULT_CURRENT_METER_SCALE 179 diff --git a/configs/HAKRCF405V2/config.h b/configs/HAKRCF405V2/config.h index bc880642..03cc5ef3 100644 --- a/configs/HAKRCF405V2/config.h +++ b/configs/HAKRCF405V2/config.h @@ -101,8 +101,8 @@ #define ADC3_DMA_OPT 0 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define BEEPER_INVERTED #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/HAKRCF411D/config.h b/configs/HAKRCF411D/config.h index bcdc8e3c..bb142b16 100644 --- a/configs/HAKRCF411D/config.h +++ b/configs/HAKRCF411D/config.h @@ -88,14 +88,14 @@ #define ADC1_DMA_OPT 0 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define MAX7456_SPI_INSTANCE SPI2 #define PINIO1_BOX 40 #define PINIO2_BOX 41 diff --git a/configs/HAKRCF722D/config.h b/configs/HAKRCF722D/config.h index fb2086c7..c132db1c 100644 --- a/configs/HAKRCF722D/config.h +++ b/configs/HAKRCF722D/config.h @@ -112,8 +112,8 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/HAKRCF722MINI/config.h b/configs/HAKRCF722MINI/config.h index 9cf9e7f1..dc13680f 100644 --- a/configs/HAKRCF722MINI/config.h +++ b/configs/HAKRCF722MINI/config.h @@ -106,9 +106,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/HAKRCF722V2/config.h b/configs/HAKRCF722V2/config.h index 600b57e3..9b685ff4 100644 --- a/configs/HAKRCF722V2/config.h +++ b/configs/HAKRCF722V2/config.h @@ -99,9 +99,9 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 diff --git a/configs/HAKRCF7230D/config.h b/configs/HAKRCF7230D/config.h index d89e4e2c..acd521c5 100644 --- a/configs/HAKRCF7230D/config.h +++ b/configs/HAKRCF7230D/config.h @@ -109,9 +109,9 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/HELSEL_STRIKERF7/config.h b/configs/HELSEL_STRIKERF7/config.h index 887f445d..099e2963 100644 --- a/configs/HELSEL_STRIKERF7/config.h +++ b/configs/HELSEL_STRIKERF7/config.h @@ -76,8 +76,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 179 diff --git a/configs/HGLRCF405/config.h b/configs/HGLRCF405/config.h index 7163e2ec..0bfc7898 100644 --- a/configs/HGLRCF405/config.h +++ b/configs/HGLRCF405/config.h @@ -94,7 +94,7 @@ #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define MAG_ALIGN DEFAULT -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI3 @@ -112,7 +112,7 @@ #define MAX7456_SPI_INSTANCE SPI3 //TODO #define MAX7456_PREINIT_OPU OFF //TODO #define LED_INVERSION 0 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 //TODO #define DASHBOARD_I2C_ADDR 60 //TODO #define USB_MSC_PIN_PULLUP ON #define FLASH_SPI_INSTANCE SPI2 diff --git a/configs/HGLRCF405AS/config.h b/configs/HGLRCF405AS/config.h index c831cefc..f4fe5e67 100644 --- a/configs/HGLRCF405AS/config.h +++ b/configs/HGLRCF405AS/config.h @@ -96,9 +96,9 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define RX_SPI_INSTANCE SPI3 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH @@ -108,7 +108,7 @@ #define SYSTEM_HSE_MHZ 8 #define MAX7456_CLOCK_CONFIG_DEFAULT MAX7456_CLOCK_CONFIG_DOUBLE #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/HGLRCF405V2/config.h b/configs/HGLRCF405V2/config.h index b855991e..ff3db53e 100644 --- a/configs/HGLRCF405V2/config.h +++ b/configs/HGLRCF405V2/config.h @@ -95,8 +95,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/HGLRCF722/config.h b/configs/HGLRCF722/config.h index ee374f9c..07c1c3c3 100644 --- a/configs/HGLRCF722/config.h +++ b/configs/HGLRCF722/config.h @@ -104,9 +104,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/HGLRCF722AIO/config.h b/configs/HGLRCF722AIO/config.h index b997fda9..aa9b5b4e 100644 --- a/configs/HGLRCF722AIO/config.h +++ b/configs/HGLRCF722AIO/config.h @@ -101,8 +101,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON //TODO #define MOTOR_PWM_PROTOCOL DSHOT600 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/HGLRCF722AIO_X6/config.h b/configs/HGLRCF722AIO_X6/config.h index a1e059d1..f0238635 100644 --- a/configs/HGLRCF722AIO_X6/config.h +++ b/configs/HGLRCF722AIO_X6/config.h @@ -100,8 +100,8 @@ #define DEFAULT_MIXER MIXER_Y6 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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 MOTOR_PWM_PROTOCOL DSHOT600 diff --git a/configs/HGLRCF722E/config.h b/configs/HGLRCF722E/config.h index cf67da5f..cdcb10f1 100644 --- a/configs/HGLRCF722E/config.h +++ b/configs/HGLRCF722E/config.h @@ -102,7 +102,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI1 diff --git a/configs/HGLRCF722MINI/config.h b/configs/HGLRCF722MINI/config.h index fc5f25c7..a97ba5e1 100644 --- a/configs/HGLRCF722MINI/config.h +++ b/configs/HGLRCF722MINI/config.h @@ -97,8 +97,8 @@ #define ADC_INSTANCE ADC3 #define MSP_UART SERIAL_PORT_UART5 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/HGLRCF722MINIV2/config.h b/configs/HGLRCF722MINIV2/config.h index 60b2500e..485cd6ac 100644 --- a/configs/HGLRCF722MINIV2/config.h +++ b/configs/HGLRCF722MINIV2/config.h @@ -96,8 +96,8 @@ #define ADC3_DMA_OPT 0 #define ADC_INSTANCE ADC3 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/HIFIONRCF7/config.h b/configs/HIFIONRCF7/config.h index f03b8ceb..746ae509 100644 --- a/configs/HIFIONRCF7/config.h +++ b/configs/HIFIONRCF7/config.h @@ -96,8 +96,8 @@ #define ADC3_DMA_OPT 1 #define ADC_INSTANCE ADC3 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/HOBBYWING_XROTORF4G3/config.h b/configs/HOBBYWING_XROTORF4G3/config.h index ad88d2b2..6525dd9a 100644 --- a/configs/HOBBYWING_XROTORF4G3/config.h +++ b/configs/HOBBYWING_XROTORF4G3/config.h @@ -100,7 +100,7 @@ #define SPI2_TX_DMA_OPT 0 #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON @@ -112,7 +112,7 @@ #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/HOBBYWING_XROTORF7CONV/config.h b/configs/HOBBYWING_XROTORF7CONV/config.h index ab87d893..84ec7162 100644 --- a/configs/HOBBYWING_XROTORF7CONV/config.h +++ b/configs/HOBBYWING_XROTORF7CONV/config.h @@ -101,9 +101,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 diff --git a/configs/IFLIGHT_BLITZ_F435/config.h b/configs/IFLIGHT_BLITZ_F435/config.h index e5723cd1..134559e3 100644 --- a/configs/IFLIGHT_BLITZ_F435/config.h +++ b/configs/IFLIGHT_BLITZ_F435/config.h @@ -99,8 +99,8 @@ #define I2C1_SDA_PIN PB9 #define I2C2_SCL_PIN PH2 #define I2C2_SDA_PIN PH3 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_DPS310 // UART & VCP diff --git a/configs/IFLIGHT_BLITZ_F722/config.h b/configs/IFLIGHT_BLITZ_F722/config.h index c2d7c83d..3dea1664 100644 --- a/configs/IFLIGHT_BLITZ_F722/config.h +++ b/configs/IFLIGHT_BLITZ_F722/config.h @@ -97,9 +97,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON diff --git a/configs/IFLIGHT_BLITZ_F722_X1/config.h b/configs/IFLIGHT_BLITZ_F722_X1/config.h index 7e9c29da..73ce5b4b 100644 --- a/configs/IFLIGHT_BLITZ_F722_X1/config.h +++ b/configs/IFLIGHT_BLITZ_F722_X1/config.h @@ -94,9 +94,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/IFLIGHT_BLITZ_F7_AIO/config.h b/configs/IFLIGHT_BLITZ_F7_AIO/config.h index 9975153b..eba2dcb2 100644 --- a/configs/IFLIGHT_BLITZ_F7_AIO/config.h +++ b/configs/IFLIGHT_BLITZ_F7_AIO/config.h @@ -109,7 +109,7 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_I2C_INSTANCE (I2CDEV_4) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH @@ -119,6 +119,6 @@ #define DEFAULT_CURRENT_METER_SCALE 200 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI4 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/IFLIGHT_BLITZ_F7_PRO/config.h b/configs/IFLIGHT_BLITZ_F7_PRO/config.h index f1ea1d14..7bf2d52e 100644 --- a/configs/IFLIGHT_BLITZ_F7_PRO/config.h +++ b/configs/IFLIGHT_BLITZ_F7_PRO/config.h @@ -93,9 +93,9 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/IFLIGHT_BORG_F435S/config.h b/configs/IFLIGHT_BORG_F435S/config.h index 6040765d..f1983354 100644 --- a/configs/IFLIGHT_BORG_F435S/config.h +++ b/configs/IFLIGHT_BORG_F435S/config.h @@ -86,8 +86,8 @@ #define USE_BARO_DPS310 #define I2C1_SCL_PIN PB6 #define I2C1_SDA_PIN PB7 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 // UART #define UART1_RX_PIN PA10 diff --git a/configs/IFLIGHT_DEFENDER_F411/config.h b/configs/IFLIGHT_DEFENDER_F411/config.h index 38f3a98f..469f509f 100644 --- a/configs/IFLIGHT_DEFENDER_F411/config.h +++ b/configs/IFLIGHT_DEFENDER_F411/config.h @@ -81,8 +81,8 @@ #define ADC1_DMA_OPT 1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/IFLIGHT_F405_AIO/config.h b/configs/IFLIGHT_F405_AIO/config.h index 550a287a..be130cd2 100644 --- a/configs/IFLIGHT_F405_AIO/config.h +++ b/configs/IFLIGHT_F405_AIO/config.h @@ -93,7 +93,7 @@ #define DEFAULT_PID_PROCESS_DENOM 1 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_BOX 40 #define PINIO2_BOX 41 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/IFLIGHT_F405_TWING/config.h b/configs/IFLIGHT_F405_TWING/config.h index 106f85ad..2faf6e60 100644 --- a/configs/IFLIGHT_F405_TWING/config.h +++ b/configs/IFLIGHT_F405_TWING/config.h @@ -93,9 +93,9 @@ #define ADC1_DMA_OPT 1 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON @@ -105,7 +105,7 @@ #define DEFAULT_PID_PROCESS_DENOM 1 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_BOX 40 #define PINIO2_BOX 41 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/IFLIGHT_F411_AIO32/config.h b/configs/IFLIGHT_F411_AIO32/config.h index 14dca9e5..f01d8e15 100644 --- a/configs/IFLIGHT_F411_AIO32/config.h +++ b/configs/IFLIGHT_F411_AIO32/config.h @@ -86,9 +86,9 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC //TODO #define VBAT_DETECT_CELL_VOLTAGE 300 diff --git a/configs/IFLIGHT_F411_PRO/config.h b/configs/IFLIGHT_F411_PRO/config.h index 47767467..1c063fd6 100644 --- a/configs/IFLIGHT_F411_PRO/config.h +++ b/configs/IFLIGHT_F411_PRO/config.h @@ -85,8 +85,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/IFLIGHT_F722_TWING/config.h b/configs/IFLIGHT_F722_TWING/config.h index 89eb7f92..9081f42d 100644 --- a/configs/IFLIGHT_F722_TWING/config.h +++ b/configs/IFLIGHT_F722_TWING/config.h @@ -103,8 +103,8 @@ #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/IFLIGHT_F745_AIO/config.h b/configs/IFLIGHT_F745_AIO/config.h index 455c12b2..99e680b2 100644 --- a/configs/IFLIGHT_F745_AIO/config.h +++ b/configs/IFLIGHT_F745_AIO/config.h @@ -105,8 +105,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/IFLIGHT_F745_AIO_V2/config.h b/configs/IFLIGHT_F745_AIO_V2/config.h index 8728b929..ebb63e53 100644 --- a/configs/IFLIGHT_F745_AIO_V2/config.h +++ b/configs/IFLIGHT_F745_AIO_V2/config.h @@ -106,9 +106,9 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON diff --git a/configs/IFLIGHT_H743_AIO/config.h b/configs/IFLIGHT_H743_AIO/config.h index f5aa4191..151032f5 100644 --- a/configs/IFLIGHT_H743_AIO/config.h +++ b/configs/IFLIGHT_H743_AIO/config.h @@ -97,8 +97,8 @@ #define TIMUP4_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/IFLIGHT_H743_AIO_V2/config.h b/configs/IFLIGHT_H743_AIO_V2/config.h index f2b31e02..1e4e0fb6 100644 --- a/configs/IFLIGHT_H743_AIO_V2/config.h +++ b/configs/IFLIGHT_H743_AIO_V2/config.h @@ -113,15 +113,15 @@ #define TIMUP8_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 100 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI4 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_2_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/IFLIGHT_H7_TWING/config.h b/configs/IFLIGHT_H7_TWING/config.h index a38ffca0..cdddfa55 100644 --- a/configs/IFLIGHT_H7_TWING/config.h +++ b/configs/IFLIGHT_H7_TWING/config.h @@ -110,15 +110,15 @@ #define TIMUP8_DMA_OPT 4 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI4 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_2_SPI_INSTANCE SPI2 #define GYRO_2_ALIGN CW90_DEG diff --git a/configs/IFLIGHT_SUCCEX_E_F4/config.h b/configs/IFLIGHT_SUCCEX_E_F4/config.h index 49f8413b..24817433 100644 --- a/configs/IFLIGHT_SUCCEX_E_F4/config.h +++ b/configs/IFLIGHT_SUCCEX_E_F4/config.h @@ -85,8 +85,8 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC @@ -95,7 +95,7 @@ #define DEFAULT_PID_PROCESS_DENOM 1 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/IFLIGHT_SUCCEX_E_F7/config.h b/configs/IFLIGHT_SUCCEX_E_F7/config.h index 6da3a7c0..59249a6e 100644 --- a/configs/IFLIGHT_SUCCEX_E_F7/config.h +++ b/configs/IFLIGHT_SUCCEX_E_F7/config.h @@ -97,8 +97,8 @@ #define ADC3_DMA_OPT 0 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/JBF7/config.h b/configs/JBF7/config.h index d20d9def..04924e22 100644 --- a/configs/JBF7/config.h +++ b/configs/JBF7/config.h @@ -101,9 +101,9 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/JBF7_DJI/config.h b/configs/JBF7_DJI/config.h index 0d359f8d..a314eeaf 100644 --- a/configs/JBF7_DJI/config.h +++ b/configs/JBF7_DJI/config.h @@ -101,9 +101,9 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/JBF7_V2/config.h b/configs/JBF7_V2/config.h index e56404f8..b0c06cd1 100644 --- a/configs/JBF7_V2/config.h +++ b/configs/JBF7_V2/config.h @@ -95,9 +95,9 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/JHEF405PRO/config.h b/configs/JHEF405PRO/config.h index 17f3de9b..6c2828a5 100644 --- a/configs/JHEF405PRO/config.h +++ b/configs/JHEF405PRO/config.h @@ -93,8 +93,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/JHEF411/config.h b/configs/JHEF411/config.h index 6c7f4773..1d91c891 100644 --- a/configs/JHEF411/config.h +++ b/configs/JHEF411/config.h @@ -88,9 +88,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/JHEF411HD/config.h b/configs/JHEF411HD/config.h index 56dd3017..8cb31399 100644 --- a/configs/JHEF411HD/config.h +++ b/configs/JHEF411HD/config.h @@ -85,8 +85,8 @@ #define ADC1_DMA_OPT 0 #define ADC_INSTANCE ADC1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/JHEF435/config.h b/configs/JHEF435/config.h index 9b439a23..960dde3f 100644 --- a/configs/JHEF435/config.h +++ b/configs/JHEF435/config.h @@ -96,6 +96,6 @@ #define DEFAULT_ALIGN_BOARD_YAW -45 #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define LED0_INVERTED diff --git a/configs/JHEF722HD/config.h b/configs/JHEF722HD/config.h index 4eb5dae6..a798acbe 100644 --- a/configs/JHEF722HD/config.h +++ b/configs/JHEF722HD/config.h @@ -98,8 +98,8 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/JHEF745/config.h b/configs/JHEF745/config.h index d5ff3355..aef1e380 100644 --- a/configs/JHEF745/config.h +++ b/configs/JHEF745/config.h @@ -100,8 +100,8 @@ #define ADC1_DMA_OPT 1 #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/JHEF745V2/config.h b/configs/JHEF745V2/config.h index b7612856..fd489107 100644 --- a/configs/JHEF745V2/config.h +++ b/configs/JHEF745V2/config.h @@ -79,8 +79,8 @@ #define ADC1_DMA_OPT 1 #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/JHEF7DUAL/config.h b/configs/JHEF7DUAL/config.h index dd852e16..0aad149d 100644 --- a/configs/JHEF7DUAL/config.h +++ b/configs/JHEF7DUAL/config.h @@ -101,8 +101,8 @@ #define ADC3_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/JHEH743_AIO/config.h b/configs/JHEH743_AIO/config.h index f13f3469..cff16ea6 100644 --- a/configs/JHEH743_AIO/config.h +++ b/configs/JHEH743_AIO/config.h @@ -112,9 +112,9 @@ #define TIMUP4_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/JHEH743_HD/config.h b/configs/JHEH743_HD/config.h index b5b1ae12..bebaba21 100644 --- a/configs/JHEH743_HD/config.h +++ b/configs/JHEH743_HD/config.h @@ -127,8 +127,8 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 4 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH diff --git a/configs/JMIF722A/config.h b/configs/JMIF722A/config.h index 4b875d3e..c1bddf91 100644 --- a/configs/JMIF722A/config.h +++ b/configs/JMIF722A/config.h @@ -99,8 +99,8 @@ #define ADC1_DMA_OPT 1 #define ADC_INSTANCE ADC1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/KD722/config.h b/configs/KD722/config.h index 96d0c2b4..c87028d2 100644 --- a/configs/KD722/config.h +++ b/configs/KD722/config.h @@ -87,8 +87,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/KROOZX/config.h b/configs/KROOZX/config.h index ff76bd11..2e088acd 100644 --- a/configs/KROOZX/config.h +++ b/configs/KROOZX/config.h @@ -94,7 +94,7 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/LDARC_F411/config.h b/configs/LDARC_F411/config.h index 74680c2d..67ef9904 100644 --- a/configs/LDARC_F411/config.h +++ b/configs/LDARC_F411/config.h @@ -81,8 +81,8 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC //TODO #define VBAT_DETECT_CELL_VOLTAGE 300 diff --git a/configs/LUXF4OSD/config.h b/configs/LUXF4OSD/config.h index 7ad52d7b..e0edb8b3 100644 --- a/configs/LUXF4OSD/config.h +++ b/configs/LUXF4OSD/config.h @@ -99,7 +99,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -107,7 +107,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/LUXHDAIO-G4/config.h b/configs/LUXHDAIO-G4/config.h index 5cfa1f91..383fb932 100644 --- a/configs/LUXHDAIO-G4/config.h +++ b/configs/LUXHDAIO-G4/config.h @@ -95,8 +95,8 @@ #define DEFAULT_CURRENT_METER_SCALE 179 #define BEEPER_INVERTED -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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/LUXMICROAIO/config.h b/configs/LUXMICROAIO/config.h index a2ed42a3..5ce4fc62 100644 --- a/configs/LUXMICROAIO/config.h +++ b/configs/LUXMICROAIO/config.h @@ -106,8 +106,8 @@ #define DEFAULT_CURRENT_METER_SCALE 179 #define BEEPER_INVERTED -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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/MAMBAF405US/config.h b/configs/MAMBAF405US/config.h index 8d334969..69963931 100644 --- a/configs/MAMBAF405US/config.h +++ b/configs/MAMBAF405US/config.h @@ -110,7 +110,7 @@ #define ESCSERIAL_PIN PB9 #define PINIO1_PIN PB0 -#define MAG_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/MAMBAF405US_I2C/config.h b/configs/MAMBAF405US_I2C/config.h index c63d9d25..f723e237 100644 --- a/configs/MAMBAF405US_I2C/config.h +++ b/configs/MAMBAF405US_I2C/config.h @@ -110,8 +110,8 @@ #define ESCSERIAL_PIN PB9 #define PINIO1_PIN PB0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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_OFF diff --git a/configs/MAMBAF405_2022A/config.h b/configs/MAMBAF405_2022A/config.h index f8cd0ebc..0191761f 100644 --- a/configs/MAMBAF405_2022A/config.h +++ b/configs/MAMBAF405_2022A/config.h @@ -99,8 +99,8 @@ #define PINIO1_PIN PC2 #define PINIO2_PIN PC5 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/MAMBAF405_2022B/config.h b/configs/MAMBAF405_2022B/config.h index d75ab07e..727b0ab9 100644 --- a/configs/MAMBAF405_2022B/config.h +++ b/configs/MAMBAF405_2022B/config.h @@ -96,9 +96,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MAMBAF722/config.h b/configs/MAMBAF722/config.h index a2380d6a..82ede5c1 100644 --- a/configs/MAMBAF722/config.h +++ b/configs/MAMBAF722/config.h @@ -106,7 +106,7 @@ #define PINIO1_PIN PB0 -#define MAG_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/MAMBAF722_2022A/config.h b/configs/MAMBAF722_2022A/config.h index d1ef1eaa..5c122aea 100644 --- a/configs/MAMBAF722_2022A/config.h +++ b/configs/MAMBAF722_2022A/config.h @@ -97,9 +97,9 @@ #define PINIO1_PIN PC2 #define PINIO2_PIN PC0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 diff --git a/configs/MAMBAF722_2022B/config.h b/configs/MAMBAF722_2022B/config.h index 68e4fa32..db996237 100644 --- a/configs/MAMBAF722_2022B/config.h +++ b/configs/MAMBAF722_2022B/config.h @@ -98,9 +98,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MAMBAF722_I2C/config.h b/configs/MAMBAF722_I2C/config.h index cb74bbd8..ca80b8ef 100644 --- a/configs/MAMBAF722_I2C/config.h +++ b/configs/MAMBAF722_I2C/config.h @@ -112,8 +112,8 @@ #define PINIO1_PIN PB0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/MAMBAF722_X8/config.h b/configs/MAMBAF722_X8/config.h index fc14873e..1184393c 100644 --- a/configs/MAMBAF722_X8/config.h +++ b/configs/MAMBAF722_X8/config.h @@ -95,9 +95,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 diff --git a/configs/MAMBAG4/config.h b/configs/MAMBAG4/config.h index 239bae9e..18f43ef5 100644 --- a/configs/MAMBAG4/config.h +++ b/configs/MAMBAG4/config.h @@ -82,8 +82,8 @@ #define ADC2_DMA_OPT 11 #define ADC_INSTANCE ADC2 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define BEEPER_INVERTED #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/MAMBAH743/config.h b/configs/MAMBAH743/config.h index 3b8a0695..96d73def 100644 --- a/configs/MAMBAH743/config.h +++ b/configs/MAMBAH743/config.h @@ -119,8 +119,8 @@ #define TIMUP8_DMA_OPT 4 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 //TODO #define SDCARD_MODE OFF #define FLASH_SPI_INSTANCE SPI3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MAMBAH743_2022B/config.h b/configs/MAMBAH743_2022B/config.h index 9921e8b8..1a73766c 100644 --- a/configs/MAMBAH743_2022B/config.h +++ b/configs/MAMBAH743_2022B/config.h @@ -118,8 +118,8 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 4 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 //TODO #define SDCARD_MODE OFF #define FLASH_SPI_INSTANCE SPI3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MATEKF405AIO/config.h b/configs/MATEKF405AIO/config.h index cb344714..cf35765d 100644 --- a/configs/MATEKF405AIO/config.h +++ b/configs/MATEKF405AIO/config.h @@ -98,8 +98,8 @@ #define SPI3_TX_DMA_OPT 1 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 @@ -111,7 +111,7 @@ #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/MATEKF405CTR/config.h b/configs/MATEKF405CTR/config.h index 7e53750e..47c2bcbc 100644 --- a/configs/MATEKF405CTR/config.h +++ b/configs/MATEKF405CTR/config.h @@ -99,9 +99,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -112,6 +112,6 @@ #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/MATEKF405MINI/config.h b/configs/MATEKF405MINI/config.h index 1efc82b3..6622fe6c 100644 --- a/configs/MATEKF405MINI/config.h +++ b/configs/MATEKF405MINI/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -108,7 +108,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/MATEKF405SE/config.h b/configs/MATEKF405SE/config.h index 6075c9b1..320ad776 100644 --- a/configs/MATEKF405SE/config.h +++ b/configs/MATEKF405SE/config.h @@ -100,9 +100,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_I2C_ADDRESS 118 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF diff --git a/configs/MATEKF405STD/config.h b/configs/MATEKF405STD/config.h index bfe858e9..e20f8fb2 100644 --- a/configs/MATEKF405STD/config.h +++ b/configs/MATEKF405STD/config.h @@ -101,9 +101,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -114,6 +114,6 @@ #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/MATEKF405STD_CLONE/config.h b/configs/MATEKF405STD_CLONE/config.h index 46a7fc11..0bb229e6 100644 --- a/configs/MATEKF405STD_CLONE/config.h +++ b/configs/MATEKF405STD_CLONE/config.h @@ -108,9 +108,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -121,6 +121,6 @@ #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/MATEKF405TE/config.h b/configs/MATEKF405TE/config.h index 32907ec0..a675009c 100644 --- a/configs/MATEKF405TE/config.h +++ b/configs/MATEKF405TE/config.h @@ -102,9 +102,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SCALE 210 diff --git a/configs/MATEKF405TE_SD/config.h b/configs/MATEKF405TE_SD/config.h index cb8c8761..13b7e000 100644 --- a/configs/MATEKF405TE_SD/config.h +++ b/configs/MATEKF405TE_SD/config.h @@ -101,9 +101,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SCALE 210 diff --git a/configs/MATEKF411/config.h b/configs/MATEKF411/config.h index 0d4bb393..582ac2af 100644 --- a/configs/MATEKF411/config.h +++ b/configs/MATEKF411/config.h @@ -82,9 +82,9 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_DEVICE BARO_NONE #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/MATEKF411SE/config.h b/configs/MATEKF411SE/config.h index e796efe3..281e41e7 100644 --- a/configs/MATEKF411SE/config.h +++ b/configs/MATEKF411SE/config.h @@ -85,9 +85,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC //TODO #define VBAT_DETECT_CELL_VOLTAGE 300 diff --git a/configs/MATEKF722/config.h b/configs/MATEKF722/config.h index 9938919d..1722ec6a 100644 --- a/configs/MATEKF722/config.h +++ b/configs/MATEKF722/config.h @@ -100,9 +100,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/MATEKF722HD/config.h b/configs/MATEKF722HD/config.h index dfa6d02e..adf1c5c3 100644 --- a/configs/MATEKF722HD/config.h +++ b/configs/MATEKF722HD/config.h @@ -108,9 +108,9 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define BARO_BUSTYPE I2C -#define BARO_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/MATEKF722MINI/config.h b/configs/MATEKF722MINI/config.h index 347be8fd..7f573387 100644 --- a/configs/MATEKF722MINI/config.h +++ b/configs/MATEKF722MINI/config.h @@ -107,9 +107,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BARO_DEVICE BARO_NONE #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/MATEKF722SE/config.h b/configs/MATEKF722SE/config.h index 6a2ecc9f..8f0db397 100644 --- a/configs/MATEKF722SE/config.h +++ b/configs/MATEKF722SE/config.h @@ -108,9 +108,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/MATEKH743/config.h b/configs/MATEKH743/config.h index fa50e708..810318d7 100644 --- a/configs/MATEKH743/config.h +++ b/configs/MATEKH743/config.h @@ -139,8 +139,8 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART6 diff --git a/configs/MEPSF411/config.h b/configs/MEPSF411/config.h index bdcdf8d7..65bbb83d 100644 --- a/configs/MEPSF411/config.h +++ b/configs/MEPSF411/config.h @@ -79,7 +79,7 @@ #define ADC1_DMA_OPT 1 -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO diff --git a/configs/MERAKRCF405/config.h b/configs/MERAKRCF405/config.h index 2376def8..916c947d 100644 --- a/configs/MERAKRCF405/config.h +++ b/configs/MERAKRCF405/config.h @@ -87,8 +87,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -97,7 +97,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI1 #define GYRO_1_SPI_INSTANCE SPI2 #define GYRO_2_SPI_INSTANCE SPI2 diff --git a/configs/MERAKRCF722/config.h b/configs/MERAKRCF722/config.h index 859cf364..38a43bfe 100644 --- a/configs/MERAKRCF722/config.h +++ b/configs/MERAKRCF722/config.h @@ -86,8 +86,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/MERCURYG4/config.h b/configs/MERCURYG4/config.h index b4abdf9b..89b1c2c2 100644 --- a/configs/MERCURYG4/config.h +++ b/configs/MERCURYG4/config.h @@ -84,7 +84,7 @@ #define SPI2_TX_DMA_OPT 10 #define SPI2_RX_DMA_OPT 11 -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/MICOAIR405MINI/config.h b/configs/MICOAIR405MINI/config.h index 68301fa0..0ffddd02 100644 --- a/configs/MICOAIR405MINI/config.h +++ b/configs/MICOAIR405MINI/config.h @@ -100,7 +100,7 @@ #define GYRO_1_SPI_INSTANCE SPI2 #define SDCARD_SPI_INSTANCE SPI3 #define MAX7456_SPI_INSTANCE SPI1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define SYSTEM_HSE_MHZ 8 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/MICOAIR743/config.h b/configs/MICOAIR743/config.h index b2d742f5..d2ae385f 100644 --- a/configs/MICOAIR743/config.h +++ b/configs/MICOAIR743/config.h @@ -121,8 +121,8 @@ #define MAX7456_SPI_INSTANCE SPI1 #define SDIO_USE_4BIT 1 #define SDIO_DEVICE SDIODEV_1 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define MAG_I2C_ADDRESS 14 #define MAG_ALIGN CW90_DEG #define MAG_ALIGN_YAW 900 diff --git a/configs/MINI_H743_HD/config.h b/configs/MINI_H743_HD/config.h index dbab1cbb..69bda749 100644 --- a/configs/MINI_H743_HD/config.h +++ b/configs/MINI_H743_HD/config.h @@ -125,8 +125,8 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 4 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_2 +#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/MODULARF4/config.h b/configs/MODULARF4/config.h index 2fed5bb4..35c56318 100644 --- a/configs/MODULARF4/config.h +++ b/configs/MODULARF4/config.h @@ -87,7 +87,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/NAMIMNOF722/config.h b/configs/NAMIMNOF722/config.h index fdde1d52..71aa3612 100644 --- a/configs/NAMIMNOF722/config.h +++ b/configs/NAMIMNOF722/config.h @@ -96,8 +96,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/NBD_GALAXYAIO255/config.h b/configs/NBD_GALAXYAIO255/config.h index 5374b3cf..ebb1e7e2 100644 --- a/configs/NBD_GALAXYAIO255/config.h +++ b/configs/NBD_GALAXYAIO255/config.h @@ -99,9 +99,9 @@ #define TIMUP5_DMA_OPT 4 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/NBD_INFINITYAIO255/config.h b/configs/NBD_INFINITYAIO255/config.h index 1832d069..3b4697df 100644 --- a/configs/NBD_INFINITYAIO255/config.h +++ b/configs/NBD_INFINITYAIO255/config.h @@ -80,8 +80,8 @@ #define ADC1_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON diff --git a/configs/NBD_INFINITYAIOV2/config.h b/configs/NBD_INFINITYAIOV2/config.h index 349a7cbb..337e11ce 100644 --- a/configs/NBD_INFINITYAIOV2/config.h +++ b/configs/NBD_INFINITYAIOV2/config.h @@ -77,8 +77,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/NBD_INFINITYAIOV2PRO/config.h b/configs/NBD_INFINITYAIOV2PRO/config.h index 64cfaa05..b76e135d 100644 --- a/configs/NBD_INFINITYAIOV2PRO/config.h +++ b/configs/NBD_INFINITYAIOV2PRO/config.h @@ -84,8 +84,8 @@ #define ADC1_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO diff --git a/configs/NEUTRONRCF407/config.h b/configs/NEUTRONRCF407/config.h index 1f76e386..a1bb7a79 100644 --- a/configs/NEUTRONRCF407/config.h +++ b/configs/NEUTRONRCF407/config.h @@ -105,8 +105,8 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -114,7 +114,7 @@ #define DEFAULT_CURRENT_METER_SCALE 100 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_CONFIG 129 #define PINIO1_BOX 0 #define PINIO2_BOX 40 diff --git a/configs/NEUTRONRCF411AIO/config.h b/configs/NEUTRONRCF411AIO/config.h index fe2515a4..8d6db811 100644 --- a/configs/NEUTRONRCF411AIO/config.h +++ b/configs/NEUTRONRCF411AIO/config.h @@ -85,9 +85,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/NEUTRONRCF435MINI/config.h b/configs/NEUTRONRCF435MINI/config.h index 4ad5207f..6b7ab854 100644 --- a/configs/NEUTRONRCF435MINI/config.h +++ b/configs/NEUTRONRCF435MINI/config.h @@ -97,8 +97,8 @@ #define DEFAULT_ALIGN_BOARD_YAW -45 #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#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/NEUTRONRCF722AIO/config.h b/configs/NEUTRONRCF722AIO/config.h index d7e3be0f..35648952 100644 --- a/configs/NEUTRONRCF722AIO/config.h +++ b/configs/NEUTRONRCF722AIO/config.h @@ -86,9 +86,9 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON diff --git a/configs/NEUTRONRCF745/config.h b/configs/NEUTRONRCF745/config.h index 05f1cba1..ab0067bb 100644 --- a/configs/NEUTRONRCF745/config.h +++ b/configs/NEUTRONRCF745/config.h @@ -129,8 +129,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON diff --git a/configs/NEUTRONRCF745VTX/config.h b/configs/NEUTRONRCF745VTX/config.h index 422f78c4..4e519e73 100644 --- a/configs/NEUTRONRCF745VTX/config.h +++ b/configs/NEUTRONRCF745VTX/config.h @@ -130,8 +130,8 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON diff --git a/configs/NEUTRONRCF7AIO/config.h b/configs/NEUTRONRCF7AIO/config.h index 715f7802..7be47091 100644 --- a/configs/NEUTRONRCF7AIO/config.h +++ b/configs/NEUTRONRCF7AIO/config.h @@ -111,9 +111,9 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON diff --git a/configs/NEUTRONRCG4AIO/config.h b/configs/NEUTRONRCG4AIO/config.h index 67bb4dc8..1138a1f5 100644 --- a/configs/NEUTRONRCG4AIO/config.h +++ b/configs/NEUTRONRCG4AIO/config.h @@ -86,8 +86,8 @@ #define TIMUP4_DMA_OPT 0 #define TIMUP5_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/NEUTRONRCH743AIO/config.h b/configs/NEUTRONRCH743AIO/config.h index 7ee4a840..c6ce3b2d 100644 --- a/configs/NEUTRONRCH743AIO/config.h +++ b/configs/NEUTRONRCH743AIO/config.h @@ -123,9 +123,9 @@ #define TIMUP8_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_TELEMETRY DSHOT_TELEMETRY_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/NEUTRONRCH7BT/config.h b/configs/NEUTRONRCH7BT/config.h index d44ffa4f..d0f7ce27 100644 --- a/configs/NEUTRONRCH7BT/config.h +++ b/configs/NEUTRONRCH7BT/config.h @@ -128,10 +128,10 @@ #define TIMUP8_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define USE_MAG -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/NIDICI_F4/config.h b/configs/NIDICI_F4/config.h index 5a9d4cd6..036fd014 100644 --- a/configs/NIDICI_F4/config.h +++ b/configs/NIDICI_F4/config.h @@ -90,8 +90,8 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -99,7 +99,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_BOX 40 #define PINIO2_BOX 41 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/NUCLEOF446/config.h b/configs/NUCLEOF446/config.h index f1dd583a..dfa393e0 100644 --- a/configs/NUCLEOF446/config.h +++ b/configs/NUCLEOF446/config.h @@ -122,7 +122,7 @@ //#define ADC2_DMA_OPT 1 // DMA 2 Stream 3 Channel 1 (compat default) #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_H8_3D -#define I2C_DEVICE (I2CDEV_2) +#define I2C_DEVICE I2CDEV_2 #define MAX_SUPPORTED_MOTORS 12 diff --git a/configs/NUCLEOF722/config.h b/configs/NUCLEOF722/config.h index 9e437862..68533ec5 100644 --- a/configs/NUCLEOF722/config.h +++ b/configs/NUCLEOF722/config.h @@ -77,7 +77,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 diff --git a/configs/ODDITYRCF7AIO/config.h b/configs/ODDITYRCF7AIO/config.h index 9630d7c7..1fa6941b 100644 --- a/configs/ODDITYRCF7AIO/config.h +++ b/configs/ODDITYRCF7AIO/config.h @@ -99,8 +99,8 @@ #define ADC1_DMA_OPT 1 #define ADC_INSTANCE ADC1 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_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/OMNIBUSF4/config.h b/configs/OMNIBUSF4/config.h index 2afda0e5..3e4c0db3 100644 --- a/configs/OMNIBUSF4/config.h +++ b/configs/OMNIBUSF4/config.h @@ -98,9 +98,9 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define RX_SPI_INSTANCE SPI3 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH @@ -110,7 +110,7 @@ #define SYSTEM_HSE_MHZ 8 #define MAX7456_CLOCK_CONFIG_DEFAULT MAX7456_CLOCK_CONFIG_DOUBLE #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/OMNIBUSF4FW/config.h b/configs/OMNIBUSF4FW/config.h index 1a3d2332..b5d5851c 100644 --- a/configs/OMNIBUSF4FW/config.h +++ b/configs/OMNIBUSF4FW/config.h @@ -93,7 +93,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI3 #define ADC_INSTANCE ADC2 @@ -105,7 +105,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI3 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/OMNIBUSF4NANO/config.h b/configs/OMNIBUSF4NANO/config.h index d3921ccf..72240a2a 100644 --- a/configs/OMNIBUSF4NANO/config.h +++ b/configs/OMNIBUSF4NANO/config.h @@ -105,8 +105,8 @@ #define BEEPER_INVERTED -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI1 #define FLASH_SPI_INSTANCE SPI2 diff --git a/configs/OMNIBUSF4SD/config.h b/configs/OMNIBUSF4SD/config.h index 80fd8b23..95eb3395 100644 --- a/configs/OMNIBUSF4SD/config.h +++ b/configs/OMNIBUSF4SD/config.h @@ -104,7 +104,7 @@ #define SPI2_TX_DMA_OPT 0 #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO #define BARO_SPI_INSTANCE SPI3 #define ADC_INSTANCE ADC2 @@ -120,7 +120,7 @@ #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/OMNIBUSF4V6/config.h b/configs/OMNIBUSF4V6/config.h index 6cfaa1eb..ee256ab5 100644 --- a/configs/OMNIBUSF4V6/config.h +++ b/configs/OMNIBUSF4V6/config.h @@ -94,7 +94,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI3 #define ADC_INSTANCE ADC2 @@ -104,7 +104,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/OMNIBUSF7/config.h b/configs/OMNIBUSF7/config.h index c0af291b..98fea652 100644 --- a/configs/OMNIBUSF7/config.h +++ b/configs/OMNIBUSF7/config.h @@ -96,7 +96,7 @@ #define SPI4_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO #define BARO_SPI_INSTANCE SPI1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD @@ -107,6 +107,6 @@ #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI3 #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/OMNIBUSF7V2/config.h b/configs/OMNIBUSF7V2/config.h index a6312405..03c51d1e 100644 --- a/configs/OMNIBUSF7V2/config.h +++ b/configs/OMNIBUSF7V2/config.h @@ -97,7 +97,7 @@ #define SPI4_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO #define BARO_SPI_INSTANCE SPI1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -107,7 +107,7 @@ #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI3 #define GYRO_1_ALIGN CW90_DEG #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/OMNINXT4/config.h b/configs/OMNINXT4/config.h index 71c348ec..0dd6f449 100644 --- a/configs/OMNINXT4/config.h +++ b/configs/OMNINXT4/config.h @@ -106,7 +106,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH @@ -116,7 +116,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/OMNINXT7/config.h b/configs/OMNINXT7/config.h index cf18cc39..cb565d0b 100644 --- a/configs/OMNINXT7/config.h +++ b/configs/OMNINXT7/config.h @@ -104,7 +104,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/ORBITF435/config.h b/configs/ORBITF435/config.h index 40927e74..af198c24 100644 --- a/configs/ORBITF435/config.h +++ b/configs/ORBITF435/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON diff --git a/configs/ORQAF7/config.h b/configs/ORQAF7/config.h index 3caabae1..688b70f9 100644 --- a/configs/ORQAF7/config.h +++ b/configs/ORQAF7/config.h @@ -114,8 +114,8 @@ #define DEFAULT_CURRENT_METER_SCALE 108 #define SERIALRX_UART SERIAL_PORT_USART2 #define GPS_UART SERIAL_PORT_USART6 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/PODIUMF4/config.h b/configs/PODIUMF4/config.h index 9a507bce..aebb6d38 100644 --- a/configs/PODIUMF4/config.h +++ b/configs/PODIUMF4/config.h @@ -93,9 +93,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/PRINCIPIOTF7/config.h b/configs/PRINCIPIOTF7/config.h index 0f236a60..bef72fb7 100644 --- a/configs/PRINCIPIOTF7/config.h +++ b/configs/PRINCIPIOTF7/config.h @@ -101,7 +101,7 @@ #define USE_BARO #define USE_BARO_DPS310 -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 /* // SPI barometer for older board revision @@ -112,7 +112,7 @@ #define BARO_HARDWARE AUTO */ -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 // Flash Configuration diff --git a/configs/PYRODRONEF4PDB/config.h b/configs/PYRODRONEF4PDB/config.h index 36db2065..3f1eea64 100644 --- a/configs/PYRODRONEF4PDB/config.h +++ b/configs/PYRODRONEF4PDB/config.h @@ -84,8 +84,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define FLASH_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/configs/RADIOLINKF722/config.h b/configs/RADIOLINKF722/config.h index 713348ce..1296891e 100644 --- a/configs/RADIOLINKF722/config.h +++ b/configs/RADIOLINKF722/config.h @@ -95,8 +95,8 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/REVO/config.h b/configs/REVO/config.h index d1b05f82..ad200550 100644 --- a/configs/REVO/config.h +++ b/configs/REVO/config.h @@ -94,10 +94,10 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/REVOLT/config.h b/configs/REVOLT/config.h index 6f0bb23e..c54ba038 100644 --- a/configs/REVOLT/config.h +++ b/configs/REVOLT/config.h @@ -79,6 +79,6 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/REVOLTOSD/config.h b/configs/REVOLTOSD/config.h index 085dc4ef..e2822ced 100644 --- a/configs/REVOLTOSD/config.h +++ b/configs/REVOLTOSD/config.h @@ -85,6 +85,6 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/RRIOT_F722/config.h b/configs/RRIOT_F722/config.h index a52fc5e4..c4f75131 100644 --- a/configs/RRIOT_F722/config.h +++ b/configs/RRIOT_F722/config.h @@ -92,8 +92,8 @@ #define GYRO_1_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/RUSHCORE7/config.h b/configs/RUSHCORE7/config.h index 50b2bcfd..bcbe29e4 100644 --- a/configs/RUSHCORE7/config.h +++ b/configs/RUSHCORE7/config.h @@ -92,8 +92,8 @@ #define ADC3_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/RUSHF7AIO/config.h b/configs/RUSHF7AIO/config.h index 279ab3d7..1985d04d 100644 --- a/configs/RUSHF7AIO/config.h +++ b/configs/RUSHF7AIO/config.h @@ -102,8 +102,8 @@ TIMER_PIN_MAP( 0, PB3, 1, 0) #define ADC_INSTANCE ADC3 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#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/SDMODELH7/config.h b/configs/SDMODELH7/config.h index 1b552f11..fd7fa7f5 100644 --- a/configs/SDMODELH7/config.h +++ b/configs/SDMODELH7/config.h @@ -109,8 +109,8 @@ #define SERIALRX_UART SERIAL_PORT_USART6 #define ESC_SENSOR_UART SERIAL_PORT_USART7 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC @@ -119,7 +119,7 @@ #define BEEPER_INVERTED #define FLASH_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_CONFIG 129 #define PINIO2_CONFIG 129 #define PINIO1_BOX 0 diff --git a/configs/SDMODELH7V2/config.h b/configs/SDMODELH7V2/config.h index c53fce6f..62dcaa28 100644 --- a/configs/SDMODELH7V2/config.h +++ b/configs/SDMODELH7V2/config.h @@ -120,9 +120,9 @@ #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_LED_STRIP | FEATURE_GPS | FEATURE_TELEMETRY ) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define MAG_I2C_ADDRESS 14 -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC @@ -133,7 +133,7 @@ #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_CONFIG 129 #define PINIO2_CONFIG 129 #define PINIO1_BOX 40 diff --git a/configs/SEQUREH7/config.h b/configs/SEQUREH7/config.h index 564a260c..fdd6fd97 100644 --- a/configs/SEQUREH7/config.h +++ b/configs/SEQUREH7/config.h @@ -108,8 +108,8 @@ #define MSP_DISPLAYPORT_UART SERIAL_PORT_USART7 #define ESC_SENSOR_UART SERIAL_PORT_USART8 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF diff --git a/configs/SKYSTARSF405/config.h b/configs/SKYSTARSF405/config.h index b689d037..8dc38034 100644 --- a/configs/SKYSTARSF405/config.h +++ b/configs/SKYSTARSF405/config.h @@ -98,7 +98,7 @@ #define SPI3_TX_DMA_OPT 0 #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI2 diff --git a/configs/SKYSTARSF7HD/config.h b/configs/SKYSTARSF7HD/config.h index ceff6b68..d693f9f9 100644 --- a/configs/SKYSTARSF7HD/config.h +++ b/configs/SKYSTARSF7HD/config.h @@ -91,8 +91,8 @@ #define ADC2_DMA_OPT 0 //TODO #define CAMERA_CONTROL_MODE SOFTWARE_PWM -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC2 //TODO #define DSHOT_IDLE_VALUE 450 diff --git a/configs/SKYSTARSF7HDPRO/config.h b/configs/SKYSTARSF7HDPRO/config.h index f478f684..03789a91 100644 --- a/configs/SKYSTARSF7HDPRO/config.h +++ b/configs/SKYSTARSF7HDPRO/config.h @@ -97,7 +97,7 @@ #define SPI3_TX_DMA_OPT 0 #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI2 diff --git a/configs/SKYSTARSF7RS/config.h b/configs/SKYSTARSF7RS/config.h index 86c51eef..6b18c8de 100644 --- a/configs/SKYSTARSF7RS/config.h +++ b/configs/SKYSTARSF7RS/config.h @@ -101,7 +101,7 @@ #define SPI3_TX_DMA_OPT 0 #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define BARO_SPI_INSTANCE SPI2 #define ADC_INSTANCE ADC2 diff --git a/configs/SKYSTARSH7HD/config.h b/configs/SKYSTARSH7HD/config.h index 5029d95b..5b86f0c3 100644 --- a/configs/SKYSTARSH7HD/config.h +++ b/configs/SKYSTARSH7HD/config.h @@ -130,8 +130,8 @@ #define TIMUP8_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#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 diff --git a/configs/SKYZONEF405/config.h b/configs/SKYZONEF405/config.h index 9c5fcc7b..6694cf41 100644 --- a/configs/SKYZONEF405/config.h +++ b/configs/SKYZONEF405/config.h @@ -93,8 +93,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -102,7 +102,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/SOLOGOODF405/config.h b/configs/SOLOGOODF405/config.h index 0728e99b..4f0afeaf 100644 --- a/configs/SOLOGOODF405/config.h +++ b/configs/SOLOGOODF405/config.h @@ -98,8 +98,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/SOLOGOODF722/config.h b/configs/SOLOGOODF722/config.h index 13e880e3..aab47d9a 100644 --- a/configs/SOLOGOODF722/config.h +++ b/configs/SOLOGOODF722/config.h @@ -95,8 +95,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 diff --git a/configs/SOULF4/config.h b/configs/SOULF4/config.h index 973118e2..9b6cd99c 100644 --- a/configs/SOULF4/config.h +++ b/configs/SOULF4/config.h @@ -96,12 +96,12 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/SPARKY2/config.h b/configs/SPARKY2/config.h index e9a67d3c..924ad4e5 100644 --- a/configs/SPARKY2/config.h +++ b/configs/SPARKY2/config.h @@ -88,11 +88,11 @@ #define ADC1_DMA_OPT 1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/SPEDIXF4/config.h b/configs/SPEDIXF4/config.h index 417be28f..5a7c7e6f 100644 --- a/configs/SPEDIXF4/config.h +++ b/configs/SPEDIXF4/config.h @@ -98,8 +98,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_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 @@ -107,7 +107,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/SPEDIXF405/config.h b/configs/SPEDIXF405/config.h index 98fcaf06..6ac15450 100644 --- a/configs/SPEDIXF405/config.h +++ b/configs/SPEDIXF405/config.h @@ -100,8 +100,8 @@ #define ADC1_DMA_OPT 0 #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/SPEDIXF722/config.h b/configs/SPEDIXF722/config.h index e19941ba..02fb4fc7 100644 --- a/configs/SPEDIXF722/config.h +++ b/configs/SPEDIXF722/config.h @@ -99,8 +99,8 @@ #define ADC1_DMA_OPT 0 #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF diff --git a/configs/SPEEDYBEEF4/config.h b/configs/SPEEDYBEEF4/config.h index 31d955fa..d5d77833 100644 --- a/configs/SPEEDYBEEF4/config.h +++ b/configs/SPEEDYBEEF4/config.h @@ -91,8 +91,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -101,7 +101,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_CONFIG 129 #define PINIO1_BOX 0 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/SPEEDYBEEF405AIO/config.h b/configs/SPEEDYBEEF405AIO/config.h index 333d9a08..d1220bf7 100644 --- a/configs/SPEEDYBEEF405AIO/config.h +++ b/configs/SPEEDYBEEF405AIO/config.h @@ -85,8 +85,8 @@ #define ADC1_DMA_OPT 1 #define SYSTEM_HSE_MHZ 8 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_ALIGN_BOARD_YAW -45 #define GYRO_1_ALIGN CW180_DEG diff --git a/configs/SPEEDYBEEF405MINI/config.h b/configs/SPEEDYBEEF405MINI/config.h index 8c7fadb8..4c535d72 100644 --- a/configs/SPEEDYBEEF405MINI/config.h +++ b/configs/SPEEDYBEEF405MINI/config.h @@ -91,8 +91,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 #define MSP_UART SERIAL_PORT_UART4 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -102,7 +102,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_CONFIG 129 #define PINIO1_BOX 0 #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/SPEEDYBEEF405V3/config.h b/configs/SPEEDYBEEF405V3/config.h index cc4e492b..3a588c14 100644 --- a/configs/SPEEDYBEEF405V3/config.h +++ b/configs/SPEEDYBEEF405V3/config.h @@ -94,9 +94,9 @@ #define SPI2_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON @@ -108,7 +108,7 @@ #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define PINIO1_CONFIG 129 #define PINIO1_BOX 0 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/SPEEDYBEEF405V4/config.h b/configs/SPEEDYBEEF405V4/config.h index 2e44d2ae..526583c4 100644 --- a/configs/SPEEDYBEEF405V4/config.h +++ b/configs/SPEEDYBEEF405V4/config.h @@ -96,8 +96,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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_OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -109,7 +109,7 @@ #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define PINIO1_CONFIG 129 #define PINIO1_BOX 0 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/SPEEDYBEEF7/config.h b/configs/SPEEDYBEEF7/config.h index 7235a98a..bca1dfe9 100644 --- a/configs/SPEEDYBEEF7/config.h +++ b/configs/SPEEDYBEEF7/config.h @@ -98,9 +98,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_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/SPEEDYBEEF7MINI/config.h b/configs/SPEEDYBEEF7MINI/config.h index de30f0a6..2748eedd 100644 --- a/configs/SPEEDYBEEF7MINI/config.h +++ b/configs/SPEEDYBEEF7MINI/config.h @@ -98,8 +98,8 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/SPEEDYBEEF7MINIV2/config.h b/configs/SPEEDYBEEF7MINIV2/config.h index 2320ddf1..bd96ac4d 100644 --- a/configs/SPEEDYBEEF7MINIV2/config.h +++ b/configs/SPEEDYBEEF7MINIV2/config.h @@ -97,8 +97,8 @@ #define SPI3_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/SPEEDYBEEF7V2/config.h b/configs/SPEEDYBEEF7V2/config.h index 4b523d26..67e43d2d 100644 --- a/configs/SPEEDYBEEF7V2/config.h +++ b/configs/SPEEDYBEEF7V2/config.h @@ -90,9 +90,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define USE_BARO -#define BARO_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/SPEEDYBEEF7V3/config.h b/configs/SPEEDYBEEF7V3/config.h index 5bc4c8ed..6da6434f 100644 --- a/configs/SPEEDYBEEF7V3/config.h +++ b/configs/SPEEDYBEEF7V3/config.h @@ -99,8 +99,8 @@ #define ADC1_DMA_OPT 1 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/SPEEDYBEE_F745_AIO/config.h b/configs/SPEEDYBEE_F745_AIO/config.h index bcc2019b..c64f9a89 100644 --- a/configs/SPEEDYBEE_F745_AIO/config.h +++ b/configs/SPEEDYBEE_F745_AIO/config.h @@ -86,8 +86,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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/SPRACINGF4EVO/config.h b/configs/SPRACINGF4EVO/config.h index 2538b5b9..bcad32cc 100644 --- a/configs/SPRACINGF4EVO/config.h +++ b/configs/SPRACINGF4EVO/config.h @@ -105,8 +105,8 @@ #define SPI2_TX_DMA_OPT 0 #define ADC3_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC @@ -116,5 +116,5 @@ #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 //TODO #define VTX_SPI_BUS 3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/SPRACINGF4NEO/config.h b/configs/SPRACINGF4NEO/config.h index d704829f..789f6e2e 100644 --- a/configs/SPRACINGF4NEO/config.h +++ b/configs/SPRACINGF4NEO/config.h @@ -107,8 +107,8 @@ #define SPI2_TX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -121,5 +121,5 @@ #define SYSTEM_HSE_MHZ 8 //TODO #define VTX_SPI_BUS 3 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/SPRACINGF7DUAL/config.h b/configs/SPRACINGF7DUAL/config.h index dfb4002d..47744cef 100644 --- a/configs/SPRACINGF7DUAL/config.h +++ b/configs/SPRACINGF7DUAL/config.h @@ -112,8 +112,8 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/SPRACINGH7EVO/config.h b/configs/SPRACINGH7EVO/config.h index b38f3dbf..4c2fe575 100644 --- a/configs/SPRACINGH7EVO/config.h +++ b/configs/SPRACINGH7EVO/config.h @@ -110,8 +110,8 @@ #define I2C4_SDA_PIN NONE -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 #define ENSURE_MPU_DATA_READY_IS_LOW diff --git a/configs/SPRACINGH7EXTREME/config.h b/configs/SPRACINGH7EXTREME/config.h index 281d4fad..38f7da86 100644 --- a/configs/SPRACINGH7EXTREME/config.h +++ b/configs/SPRACINGH7EXTREME/config.h @@ -100,7 +100,7 @@ #define USE_I2C_DEVICE_1 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 -#define I2C_DEVICE (I2CDEV_1) +#define I2C_DEVICE I2CDEV_1 #define ENSURE_MPU_DATA_READY_IS_LOW @@ -234,8 +234,8 @@ #define TIMUP8_DMA_OPT 2 #define TIMUP0_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define MAX7456_SPI_INSTANCE SPI4 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/SPRACINGH7NANO/config.h b/configs/SPRACINGH7NANO/config.h index f0554cc0..a42e82cd 100644 --- a/configs/SPRACINGH7NANO/config.h +++ b/configs/SPRACINGH7NANO/config.h @@ -95,7 +95,7 @@ #define USE_I2C_DEVICE_1 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 -#define I2C_DEVICE (I2CDEV_1) +#define I2C_DEVICE I2CDEV_1 #define USE_I2C_DEVICE_4 #define I2C4_SCL_PIN PB6 // Shared with motor outputs 5/6 @@ -224,10 +224,10 @@ #define TIMUP8_DMA_OPT 2 //TODO #define MAG_BUSTYPE I2C -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define GYRO_1_SPI_INSTANCE SPI2 diff --git a/configs/SPRACINGH7RF/config.h b/configs/SPRACINGH7RF/config.h index 374b4e74..c3b9a191 100644 --- a/configs/SPRACINGH7RF/config.h +++ b/configs/SPRACINGH7RF/config.h @@ -96,8 +96,8 @@ #define I2C2_SCL_PIN PB10 #define I2C2_SDA_PIN PB11 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_2 #define ENSURE_MPU_DATA_READY_IS_LOW diff --git a/configs/SPRACINGH7ZERO/config.h b/configs/SPRACINGH7ZERO/config.h index 03b98f59..f708494d 100644 --- a/configs/SPRACINGH7ZERO/config.h +++ b/configs/SPRACINGH7ZERO/config.h @@ -105,7 +105,7 @@ #define USE_I2C_DEVICE_1 // Connected to BMP388 only #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 -#define I2C_DEVICE (I2CDEV_1) +#define I2C_DEVICE I2CDEV_1 #define I2C2_SCL_PIN NONE #define I2C2_SDA_PIN NONE @@ -225,10 +225,10 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 2 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 #define GYRO_1_SPI_INSTANCE SPI3 diff --git a/configs/STELLARF4/config.h b/configs/STELLARF4/config.h index e7bc2e13..d1099a5a 100644 --- a/configs/STELLARF4/config.h +++ b/configs/STELLARF4/config.h @@ -104,9 +104,9 @@ //TODO beacon RX_LOST //TODO beacon RX_SET -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_I2C_INSTANCE I2CDEV_2 +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON //TODO #define MOTOR_PWM_PROTOCOL DSHOT300 diff --git a/configs/STELLARF7/config.h b/configs/STELLARF7/config.h index b61cade9..44a110b0 100644 --- a/configs/STELLARF7/config.h +++ b/configs/STELLARF7/config.h @@ -96,8 +96,8 @@ //TODO beacon RX_LOST //TODO beacon RX_SET -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/STELLARF7V2/config.h b/configs/STELLARF7V2/config.h index 6ab5438e..b8406e7f 100644 --- a/configs/STELLARF7V2/config.h +++ b/configs/STELLARF7V2/config.h @@ -102,8 +102,8 @@ //TODO beacon RX_LOST //TODO beacon RX_SET -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/STELLARF7_DUAL_HD/config.h b/configs/STELLARF7_DUAL_HD/config.h index 5a10c309..0c2cef53 100644 --- a/configs/STELLARF7_DUAL_HD/config.h +++ b/configs/STELLARF7_DUAL_HD/config.h @@ -91,8 +91,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/STM32F411DISCOVERY/config.h b/configs/STM32F411DISCOVERY/config.h index a3eea790..5fc23d23 100644 --- a/configs/STM32F411DISCOVERY/config.h +++ b/configs/STM32F411DISCOVERY/config.h @@ -74,8 +74,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_PWM_HZ 2000 diff --git a/configs/SUB250F411/config.h b/configs/SUB250F411/config.h index 10ec115b..0d14bee3 100644 --- a/configs/SUB250F411/config.h +++ b/configs/SUB250F411/config.h @@ -80,8 +80,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH //TODO #define DSHOT_IDLE_VALUE 800 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/SUB250REDFOXF722AIO/config.h b/configs/SUB250REDFOXF722AIO/config.h index a3675ac4..b8e51c86 100644 --- a/configs/SUB250REDFOXF722AIO/config.h +++ b/configs/SUB250REDFOXF722AIO/config.h @@ -99,9 +99,9 @@ #define ADC3_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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 diff --git a/configs/SYNERGYF4/config.h b/configs/SYNERGYF4/config.h index b5c1cd7c..d6278965 100644 --- a/configs/SYNERGYF4/config.h +++ b/configs/SYNERGYF4/config.h @@ -104,7 +104,7 @@ #define DEFAULT_PID_PROCESS_DENOM 1 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define PINIO1_BOX 40 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/TAKERF411/config.h b/configs/TAKERF411/config.h index 817fcf99..625ed907 100644 --- a/configs/TAKERF411/config.h +++ b/configs/TAKERF411/config.h @@ -80,8 +80,8 @@ #define SERIALRX_UART SERIAL_PORT_USART2 -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH //TODO #define DSHOT_IDLE_VALUE 800 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/TAKERF722SE/config.h b/configs/TAKERF722SE/config.h index f2d9f2a8..6d3495dd 100644 --- a/configs/TAKERF722SE/config.h +++ b/configs/TAKERF722SE/config.h @@ -107,8 +107,8 @@ // serial 5 1024 115200 57600 0 115200 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/TAKERG4AIO/config.h b/configs/TAKERG4AIO/config.h index 131aa759..ca8b9a90 100644 --- a/configs/TAKERG4AIO/config.h +++ b/configs/TAKERG4AIO/config.h @@ -113,6 +113,6 @@ #define DEFAULT_ALIGN_BOARD_YAW 45 #define GYRO_1_ALIGN CW270_DEG -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 // Defines the I2C instance for magnetometer and barometer diff --git a/configs/TALONF7FUSION/config.h b/configs/TALONF7FUSION/config.h index a63fa18d..a887e75d 100644 --- a/configs/TALONF7FUSION/config.h +++ b/configs/TALONF7FUSION/config.h @@ -92,7 +92,7 @@ #define ADC1_DMA_OPT 1 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BARO_DEVICE BARO_NONE #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/TBS_LUCID_H7/config.h b/configs/TBS_LUCID_H7/config.h index e933335a..4bc0d813 100644 --- a/configs/TBS_LUCID_H7/config.h +++ b/configs/TBS_LUCID_H7/config.h @@ -48,8 +48,8 @@ #define USE_BARO #define USE_BARO_DPS310 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/configs/TCMM405V3/config.h b/configs/TCMM405V3/config.h index 04469589..4c4a2d4b 100644 --- a/configs/TCMM405V3/config.h +++ b/configs/TCMM405V3/config.h @@ -95,8 +95,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TCMMF7/config.h b/configs/TCMMF7/config.h index 8c713390..d601ccb0 100644 --- a/configs/TCMMF7/config.h +++ b/configs/TCMMF7/config.h @@ -105,8 +105,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TMH7/config.h b/configs/TMH7/config.h index 334a5185..a24a1be6 100644 --- a/configs/TMH7/config.h +++ b/configs/TMH7/config.h @@ -111,15 +111,15 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 200 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG diff --git a/configs/TMOTORF4/config.h b/configs/TMOTORF4/config.h index ed6a3dcb..247bfca6 100644 --- a/configs/TMOTORF4/config.h +++ b/configs/TMOTORF4/config.h @@ -97,8 +97,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 +#define BARO_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 @@ -106,7 +106,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_2_SPI_INSTANCE SPI1 diff --git a/configs/TMOTORF7/config.h b/configs/TMOTORF7/config.h index ec00f79e..9d208db3 100644 --- a/configs/TMOTORF7/config.h +++ b/configs/TMOTORF7/config.h @@ -102,7 +102,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define BARO_SPI_INSTANCE SPI3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TMOTORF722SE/config.h b/configs/TMOTORF722SE/config.h index 584586a8..3148227d 100644 --- a/configs/TMOTORF722SE/config.h +++ b/configs/TMOTORF722SE/config.h @@ -104,8 +104,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TMOTORF7V2/config.h b/configs/TMOTORF7V2/config.h index ec810177..6a29bdc8 100644 --- a/configs/TMOTORF7V2/config.h +++ b/configs/TMOTORF7V2/config.h @@ -103,8 +103,8 @@ #define ADC1_DMA_OPT 0 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TMOTORH743/config.h b/configs/TMOTORH743/config.h index f39b9f8b..7e23e39b 100644 --- a/configs/TMOTORH743/config.h +++ b/configs/TMOTORH743/config.h @@ -127,8 +127,8 @@ // #define TIMUP8_DMA_OPT 0 #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define MAX7456_SPI_INSTANCE SPI3 #define BEEPER_INVERTED diff --git a/configs/TMOTORVELOXF7SE/config.h b/configs/TMOTORVELOXF7SE/config.h index dfc4ea67..efbd812d 100644 --- a/configs/TMOTORVELOXF7SE/config.h +++ b/configs/TMOTORVELOXF7SE/config.h @@ -96,8 +96,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TMOTORVELOXF7V2/config.h b/configs/TMOTORVELOXF7V2/config.h index 412fc804..3054b88d 100644 --- a/configs/TMOTORVELOXF7V2/config.h +++ b/configs/TMOTORVELOXF7V2/config.h @@ -91,9 +91,9 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/TMVELOXF411/config.h b/configs/TMVELOXF411/config.h index 3b6e5e24..ac2eeff4 100644 --- a/configs/TMVELOXF411/config.h +++ b/configs/TMVELOXF411/config.h @@ -74,8 +74,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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_AUTO diff --git a/configs/TMVELOXF7/config.h b/configs/TMVELOXF7/config.h index 87c12c7f..5f4fba42 100644 --- a/configs/TMVELOXF7/config.h +++ b/configs/TMVELOXF7/config.h @@ -97,8 +97,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/TUNERCF435/config.h b/configs/TUNERCF435/config.h index 63c6dcee..6701162a 100644 --- a/configs/TUNERCF435/config.h +++ b/configs/TUNERCF435/config.h @@ -104,5 +104,5 @@ #define GYRO_1_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_2 diff --git a/configs/UAVPNG030MINI/config.h b/configs/UAVPNG030MINI/config.h index 4146ec37..094aa7e8 100644 --- a/configs/UAVPNG030MINI/config.h +++ b/configs/UAVPNG030MINI/config.h @@ -76,11 +76,11 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG #define GYRO_1_ALIGN_YAW 1800 diff --git a/configs/VEKTORF722/config.h b/configs/VEKTORF722/config.h index 33281180..06e4b741 100644 --- a/configs/VEKTORF722/config.h +++ b/configs/VEKTORF722/config.h @@ -92,8 +92,8 @@ #define ADC3_DMA_OPT 0 #define MSP_UART SERIAL_PORT_UART5 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/VGOODF722DUAL/config.h b/configs/VGOODF722DUAL/config.h index 43c85195..be859c9d 100644 --- a/configs/VGOODF722DUAL/config.h +++ b/configs/VGOODF722DUAL/config.h @@ -96,8 +96,8 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#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/VGOODRCF4/config.h b/configs/VGOODRCF4/config.h index e2a3e896..18713f55 100644 --- a/configs/VGOODRCF4/config.h +++ b/configs/VGOODRCF4/config.h @@ -99,8 +99,8 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_2) +#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/VIVAF4AIO/config.h b/configs/VIVAF4AIO/config.h index 52670b64..c50f7cd9 100644 --- a/configs/VIVAF4AIO/config.h +++ b/configs/VIVAF4AIO/config.h @@ -92,14 +92,14 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 +#define BARO_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_1) +#define DASHBOARD_I2C_INSTANCE I2CDEV_1 #define FLASH_SPI_INSTANCE SPI2 #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/configs/WARPF7/config.h b/configs/WARPF7/config.h index 842e3e7b..f79c6999 100644 --- a/configs/WARPF7/config.h +++ b/configs/WARPF7/config.h @@ -125,7 +125,7 @@ #define SPI3_RX_DMA_OPT 0 #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/WIZZF7HD/config.h b/configs/WIZZF7HD/config.h index ad5a8c94..4bdd33e5 100644 --- a/configs/WIZZF7HD/config.h +++ b/configs/WIZZF7HD/config.h @@ -90,7 +90,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/XRACERF4/config.h b/configs/XRACERF4/config.h index 5412ed0c..6efb0895 100644 --- a/configs/XRACERF4/config.h +++ b/configs/XRACERF4/config.h @@ -94,7 +94,7 @@ #define ADC2_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE I2CDEV_2 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -102,7 +102,7 @@ #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI3 -#define DASHBOARD_I2C_INSTANCE (I2CDEV_2) +#define DASHBOARD_I2C_INSTANCE I2CDEV_2 #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG diff --git a/configs/YUPIF7/config.h b/configs/YUPIF7/config.h index a6834cd4..a5fb2209 100644 --- a/configs/YUPIF7/config.h +++ b/configs/YUPIF7/config.h @@ -88,9 +88,9 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO -#define BARO_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/ZEEZF7V2/config.h b/configs/ZEEZF7V2/config.h index 3066d005..88bae999 100644 --- a/configs/ZEEZF7V2/config.h +++ b/configs/ZEEZF7V2/config.h @@ -96,7 +96,7 @@ #define MAG_I2C_INSTANCE (I2CDEV_3) #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define BEEPER_INVERTED #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/ZEEZF7V3/config.h b/configs/ZEEZF7V3/config.h index 9767c94c..c8ee61f8 100644 --- a/configs/ZEEZF7V3/config.h +++ b/configs/ZEEZF7V3/config.h @@ -100,7 +100,7 @@ #define MAG_I2C_INSTANCE (I2CDEV_3) #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/ZEUSF4EVO/config.h b/configs/ZEUSF4EVO/config.h index 28c4ecec..1fea103e 100644 --- a/configs/ZEUSF4EVO/config.h +++ b/configs/ZEUSF4EVO/config.h @@ -82,8 +82,8 @@ #define ADC1_DMA_OPT 0 #define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/ZEUSF722_AIO/config.h b/configs/ZEUSF722_AIO/config.h index 1427b193..dd794872 100644 --- a/configs/ZEUSF722_AIO/config.h +++ b/configs/ZEUSF722_AIO/config.h @@ -104,7 +104,7 @@ #define ADC1_DMA_OPT 1 -#define MAG_I2C_INSTANCE (I2CDEV_1) +#define MAG_I2C_INSTANCE I2CDEV_1 #define USE_BARO #define BARO_SPI_INSTANCE SPI1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH