From a0de8b92816289ef10bdd1d3b75d86008435b9eb Mon Sep 17 00:00:00 2001 From: ot0tot <36753790+ot0tot@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:55:27 -0500 Subject: [PATCH] Remove USE_BARO defines where no specific hardware is defined (#201) * Remove USE_BARO defines where no specific hardware is defined Per https://discord.com/channels/868013470023548938/924169278926770207/1168257438416375919 One liner: `sed -i '/BARO/d' $(grep -L USE_BARO_ $(grep - lR USE_BARO ./*))` * Don't remove baro define Baro define added in https://github.com/betaflight/config/pull/233 --- configs/AIRBOTF7HDV/config.h | 2 -- configs/ALIENFLIGHTF4/config.h | 2 -- configs/AOCODAF405/config.h | 2 -- configs/AOCODAF722BLE/config.h | 2 -- configs/ARESF7/config.h | 2 -- configs/ATOMRCF405/config.h | 2 -- configs/ATOMRCF411/config.h | 2 -- configs/ATOMRCF722/config.h | 2 -- configs/BEEROTORF4/config.h | 2 -- configs/BETAFPVF411/config.h | 3 --- configs/BETAFPVF722/config.h | 3 --- configs/BLUEJAYF4/config.h | 2 -- configs/CLRACINGF7/config.h | 2 -- configs/CYCLONEF405_PRO/config.h | 2 -- configs/DFR_F722_DUAL_HD/config.h | 2 -- configs/DRONIUSF7/config.h | 3 --- configs/DYSF44530D/config.h | 2 -- configs/DYSF4PRO/config.h | 2 -- configs/ELINF405/config.h | 2 -- configs/ELINF722/config.h | 2 -- configs/EXUAVF4PRO/config.h | 2 -- configs/FLYCOLORF7/config.h | 2 -- configs/FLYCOLORF7_AIO/config.h | 2 -- configs/FLYWOOF411EVO_HD/config.h | 2 -- configs/FLYWOOF411HEX/config.h | 2 -- configs/FLYWOOF411_5IN1_AIO/config.h | 2 -- configs/FOXEERF722DUAL/config.h | 2 -- configs/FOXEERF722V2/config.h | 2 -- configs/FOXEERF722V3/config.h | 2 -- configs/FOXEERF745V2_AIO/config.h | 2 -- configs/FOXEERF745V3_AIO/config.h | 2 -- configs/FOXEERF745_AIO/config.h | 2 -- configs/FPVM_BETAFLIGHTF7/config.h | 3 --- configs/FURYF4/config.h | 2 -- configs/GEELANGF411/config.h | 2 -- configs/GEMEF411/config.h | 2 -- configs/GEPRCF411_AIO/config.h | 2 -- configs/GEPRCF411_PRO/config.h | 2 -- configs/GEPRCF722_BT_HD/config.h | 2 -- configs/GEPRCF745_BT_HD/config.h | 2 -- configs/GEP_F405_VTX_V3/config.h | 2 -- configs/HAKRCF405/config.h | 2 -- configs/HAKRCF411/config.h | 2 -- configs/HAKRCF722/config.h | 2 -- configs/HIFIONRCF7/config.h | 2 -- configs/HOBBYWING_XROTORF4G3/config.h | 3 --- configs/HYBRIDG4/config.h | 2 -- configs/IFLIGHT_BLITZ_F405/config.h | 2 -- configs/IFLIGHT_BLITZ_F411RX/config.h | 2 -- configs/KD722/config.h | 2 -- configs/KROOZX/config.h | 2 -- configs/LDARC_F411/config.h | 2 -- configs/LUXAIO/config.h | 2 -- configs/LUXF4OSD/config.h | 2 -- configs/MAMBAF405US/config.h | 2 -- configs/MAMBAF405_2022A/config.h | 2 -- configs/MAMBAF722/config.h | 2 -- configs/MATEKF405AIO/config.h | 3 --- configs/MATEKF405MINI/config.h | 3 --- configs/MERAKRCF405/config.h | 2 -- configs/MERAKRCF722/config.h | 2 -- configs/NUCLEOF446/config.h | 2 -- configs/NUCLEOF722/config.h | 2 -- configs/PODIUMF4/config.h | 2 -- configs/PYRODRONEF4PDB/config.h | 3 --- configs/PYRODRONEF7/config.h | 2 -- configs/REVO/config.h | 2 -- configs/REVONANO/config.h | 2 -- configs/RUSHCORE7/config.h | 2 -- configs/SIRMIXALOT/config.h | 3 --- configs/SKYSTARSF411/config.h | 3 --- configs/SKYSTARSF7HD/config.h | 3 --- configs/SKYZONEF405/config.h | 2 -- configs/SPCMAKERF411/config.h | 2 -- configs/SPEEDYBEEF4/config.h | 2 -- configs/SPEEDYBEEF7MINI/config.h | 2 -- configs/SPEEDYBEEF7MINIV2/config.h | 2 -- configs/SPRACINGF4EVO/config.h | 2 -- configs/SPRACINGF4NEO/config.h | 2 -- configs/SPRACINGF7DUAL/config.h | 2 -- configs/TCMMF411/config.h | 3 --- configs/TCMMF7/config.h | 2 -- configs/TMH7/config.h | 2 -- configs/TMOTORF722SE/config.h | 2 -- configs/TMPACERF7/config.h | 2 -- configs/TMPACERF7MINI/config.h | 2 -- configs/TMVELOXF7/config.h | 2 -- configs/UAVPNG030MINI/config.h | 3 --- configs/VIVAF4AIO/config.h | 2 -- configs/WIZZF7HD/config.h | 2 -- configs/XRACERF4/config.h | 2 -- 91 files changed, 195 deletions(-) diff --git a/configs/AIRBOTF7HDV/config.h b/configs/AIRBOTF7HDV/config.h index 257c241e..0d1d8584 100644 --- a/configs/AIRBOTF7HDV/config.h +++ b/configs/AIRBOTF7HDV/config.h @@ -76,8 +76,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/ALIENFLIGHTF4/config.h b/configs/ALIENFLIGHTF4/config.h index ce4101b2..9b623012 100644 --- a/configs/ALIENFLIGHTF4/config.h +++ b/configs/ALIENFLIGHTF4/config.h @@ -108,8 +108,6 @@ #define MAG_ALIGN_PITCH 1800 #define MAG_ALIGN_YAW 1800 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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/AOCODAF405/config.h b/configs/AOCODAF405/config.h index 2f15f5bf..040b67e1 100644 --- a/configs/AOCODAF405/config.h +++ b/configs/AOCODAF405/config.h @@ -93,8 +93,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/AOCODAF722BLE/config.h b/configs/AOCODAF722BLE/config.h index 442c1b2d..a11dd7ff 100644 --- a/configs/AOCODAF722BLE/config.h +++ b/configs/AOCODAF722BLE/config.h @@ -91,8 +91,6 @@ #define ADC3_DMA_OPT 0 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/ARESF7/config.h b/configs/ARESF7/config.h index 76d144d1..7ed700c5 100644 --- a/configs/ARESF7/config.h +++ b/configs/ARESF7/config.h @@ -87,8 +87,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/ATOMRCF405/config.h b/configs/ATOMRCF405/config.h index 3257e2f1..f06e6cdf 100644 --- a/configs/ATOMRCF405/config.h +++ b/configs/ATOMRCF405/config.h @@ -92,8 +92,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/ATOMRCF411/config.h b/configs/ATOMRCF411/config.h index 0639bf0c..f84105c8 100644 --- a/configs/ATOMRCF411/config.h +++ b/configs/ATOMRCF411/config.h @@ -73,8 +73,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/ATOMRCF722/config.h b/configs/ATOMRCF722/config.h index 8a9da611..549e8d76 100644 --- a/configs/ATOMRCF722/config.h +++ b/configs/ATOMRCF722/config.h @@ -91,8 +91,6 @@ #define ADC1_DMA_OPT 0 -#define USE_BARO -#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/BEEROTORF4/config.h b/configs/BEEROTORF4/config.h index facf84da..4fe06c35 100644 --- a/configs/BEEROTORF4/config.h +++ b/configs/BEEROTORF4/config.h @@ -94,8 +94,6 @@ #define SPI3_RX_DMA_OPT 0 #define ADC1_DMA_OPT 0 -#define USE_BARO -#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/BETAFPVF411/config.h b/configs/BETAFPVF411/config.h index 265fc9a9..56a93aa0 100644 --- a/configs/BETAFPVF411/config.h +++ b/configs/BETAFPVF411/config.h @@ -84,9 +84,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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_AUTO diff --git a/configs/BETAFPVF722/config.h b/configs/BETAFPVF722/config.h index aa1b0633..01d99e26 100644 --- a/configs/BETAFPVF722/config.h +++ b/configs/BETAFPVF722/config.h @@ -74,7 +74,6 @@ #define ADC_RSSI_PIN PC2 #define ADC_CURR_PIN PC1 #define FLASH_CS_PIN PB12 -#define BARO_CS_PIN PC13 #define MAX7456_SPI_CS_PIN PA15 #define GYRO_1_EXTI_PIN PC4 #define GYRO_2_EXTI_PIN PB2 @@ -94,8 +93,6 @@ #define ADC1_DMA_OPT 0 -#define USE_BARO -#define BARO_SPI_INSTANCE SPI3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH //TODO #define DSHOT_IDLE_VALUE 450 diff --git a/configs/BLUEJAYF4/config.h b/configs/BLUEJAYF4/config.h index 54b6205b..68036af4 100644 --- a/configs/BLUEJAYF4/config.h +++ b/configs/BLUEJAYF4/config.h @@ -86,8 +86,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED diff --git a/configs/CLRACINGF7/config.h b/configs/CLRACINGF7/config.h index a945e238..738277cc 100644 --- a/configs/CLRACINGF7/config.h +++ b/configs/CLRACINGF7/config.h @@ -107,8 +107,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/CYCLONEF405_PRO/config.h b/configs/CYCLONEF405_PRO/config.h index 6b96ca0b..3c83e20a 100644 --- a/configs/CYCLONEF405_PRO/config.h +++ b/configs/CYCLONEF405_PRO/config.h @@ -88,8 +88,6 @@ #define ADC3_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 diff --git a/configs/DFR_F722_DUAL_HD/config.h b/configs/DFR_F722_DUAL_HD/config.h index 580c2b52..1a7d09d7 100644 --- a/configs/DFR_F722_DUAL_HD/config.h +++ b/configs/DFR_F722_DUAL_HD/config.h @@ -102,8 +102,6 @@ #define ADC3_DMA_OPT 0 #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 USE_ADC diff --git a/configs/DRONIUSF7/config.h b/configs/DRONIUSF7/config.h index c24096f1..a93f28e2 100644 --- a/configs/DRONIUSF7/config.h +++ b/configs/DRONIUSF7/config.h @@ -79,9 +79,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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/DYSF44530D/config.h b/configs/DYSF44530D/config.h index 639e4261..e754119b 100644 --- a/configs/DYSF44530D/config.h +++ b/configs/DYSF44530D/config.h @@ -96,8 +96,6 @@ #define SPI3_TX_DMA_OPT 1 #define ADC1_DMA_OPT 0 -#define USE_BARO -#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/DYSF4PRO/config.h b/configs/DYSF4PRO/config.h index e8939723..120ef68c 100644 --- a/configs/DYSF4PRO/config.h +++ b/configs/DYSF4PRO/config.h @@ -98,8 +98,6 @@ #define ADC2_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define USE_ADC #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/ELINF405/config.h b/configs/ELINF405/config.h index 86ae77e7..373d776c 100644 --- a/configs/ELINF405/config.h +++ b/configs/ELINF405/config.h @@ -89,8 +89,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) //TODO #define SERIALRX_HALFDUPLEX ON #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/ELINF722/config.h b/configs/ELINF722/config.h index cdc98523..3938b640 100644 --- a/configs/ELINF722/config.h +++ b/configs/ELINF722/config.h @@ -86,8 +86,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) //TODO #define SERIALRX_HALFDUPLEX ON #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/EXUAVF4PRO/config.h b/configs/EXUAVF4PRO/config.h index f35b7082..b55eb375 100644 --- a/configs/EXUAVF4PRO/config.h +++ b/configs/EXUAVF4PRO/config.h @@ -99,8 +99,6 @@ #define ADC2_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define USE_ADC #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FLYCOLORF7/config.h b/configs/FLYCOLORF7/config.h index b2eb0eb4..6acb5fb8 100644 --- a/configs/FLYCOLORF7/config.h +++ b/configs/FLYCOLORF7/config.h @@ -99,8 +99,6 @@ #define ADC3_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FLYCOLORF7_AIO/config.h b/configs/FLYCOLORF7_AIO/config.h index 3155f9cd..1f093a0c 100644 --- a/configs/FLYCOLORF7_AIO/config.h +++ b/configs/FLYCOLORF7_AIO/config.h @@ -91,8 +91,6 @@ #define ADC3_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FLYWOOF411EVO_HD/config.h b/configs/FLYWOOF411EVO_HD/config.h index a3cd7676..0fcb5e88 100644 --- a/configs/FLYWOOF411EVO_HD/config.h +++ b/configs/FLYWOOF411EVO_HD/config.h @@ -81,8 +81,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define USE_ADC diff --git a/configs/FLYWOOF411HEX/config.h b/configs/FLYWOOF411HEX/config.h index 808b4d40..90e29827 100644 --- a/configs/FLYWOOF411HEX/config.h +++ b/configs/FLYWOOF411HEX/config.h @@ -81,8 +81,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/FLYWOOF411_5IN1_AIO/config.h b/configs/FLYWOOF411_5IN1_AIO/config.h index 1fef8c7f..ac1a7891 100644 --- a/configs/FLYWOOF411_5IN1_AIO/config.h +++ b/configs/FLYWOOF411_5IN1_AIO/config.h @@ -85,8 +85,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_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/FOXEERF722DUAL/config.h b/configs/FOXEERF722DUAL/config.h index afb8b1de..fafacceb 100644 --- a/configs/FOXEERF722DUAL/config.h +++ b/configs/FOXEERF722DUAL/config.h @@ -94,8 +94,6 @@ #define ADC3_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FOXEERF722V2/config.h b/configs/FOXEERF722V2/config.h index 68e2b17f..53ef0288 100644 --- a/configs/FOXEERF722V2/config.h +++ b/configs/FOXEERF722V2/config.h @@ -91,8 +91,6 @@ #define ADC3_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FOXEERF722V3/config.h b/configs/FOXEERF722V3/config.h index 713fafd9..2fe9edef 100644 --- a/configs/FOXEERF722V3/config.h +++ b/configs/FOXEERF722V3/config.h @@ -92,8 +92,6 @@ #define ADC3_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/FOXEERF745V2_AIO/config.h b/configs/FOXEERF745V2_AIO/config.h index 6aad610c..f889a106 100644 --- a/configs/FOXEERF745V2_AIO/config.h +++ b/configs/FOXEERF745V2_AIO/config.h @@ -89,8 +89,6 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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 381c3f1f..8502ad32 100644 --- a/configs/FOXEERF745V3_AIO/config.h +++ b/configs/FOXEERF745V3_AIO/config.h @@ -90,8 +90,6 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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 f6e499aa..72a79a56 100644 --- a/configs/FOXEERF745_AIO/config.h +++ b/configs/FOXEERF745_AIO/config.h @@ -90,8 +90,6 @@ #define MAG_ALIGN CW180_DEG #define MAG_ALIGN_YAW 1800 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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/FPVM_BETAFLIGHTF7/config.h b/configs/FPVM_BETAFLIGHTF7/config.h index 63c681a5..2b8d8604 100644 --- a/configs/FPVM_BETAFLIGHTF7/config.h +++ b/configs/FPVM_BETAFLIGHTF7/config.h @@ -68,7 +68,6 @@ #define ADC_VBAT_PIN PC3 #define ADC_RSSI_PIN PC5 #define ADC_CURR_PIN PC2 -#define BARO_CS_PIN PA1 #define FLASH_CS_PIN PE4 #define MAX7456_SPI_CS_PIN PB12 #define GYRO_1_EXTI_PIN PD0 @@ -97,8 +96,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_SPI_INSTANCE SPI1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_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 4a401033..2125b594 100644 --- a/configs/FURYF4/config.h +++ b/configs/FURYF4/config.h @@ -90,8 +90,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED diff --git a/configs/GEELANGF411/config.h b/configs/GEELANGF411/config.h index cf70e521..2340f462 100644 --- a/configs/GEELANGF411/config.h +++ b/configs/GEELANGF411/config.h @@ -78,8 +78,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/GEMEF411/config.h b/configs/GEMEF411/config.h index 09a3f7d3..6ed85b83 100644 --- a/configs/GEMEF411/config.h +++ b/configs/GEMEF411/config.h @@ -86,8 +86,6 @@ #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/GEPRCF411_AIO/config.h b/configs/GEPRCF411_AIO/config.h index 40b86787..e6a7b572 100644 --- a/configs/GEPRCF411_AIO/config.h +++ b/configs/GEPRCF411_AIO/config.h @@ -90,8 +90,6 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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/GEPRCF411_PRO/config.h b/configs/GEPRCF411_PRO/config.h index b98528fb..a734a04e 100644 --- a/configs/GEPRCF411_PRO/config.h +++ b/configs/GEPRCF411_PRO/config.h @@ -75,8 +75,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/GEPRCF722_BT_HD/config.h b/configs/GEPRCF722_BT_HD/config.h index de2b52e7..a4f148e1 100644 --- a/configs/GEPRCF722_BT_HD/config.h +++ b/configs/GEPRCF722_BT_HD/config.h @@ -104,8 +104,6 @@ #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/GEPRCF745_BT_HD/config.h b/configs/GEPRCF745_BT_HD/config.h index c5ae07ed..cbbfc67f 100644 --- a/configs/GEPRCF745_BT_HD/config.h +++ b/configs/GEPRCF745_BT_HD/config.h @@ -104,8 +104,6 @@ #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) //TODO #define BLACKBOX_SAMPLE_RATE 1/1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/GEP_F405_VTX_V3/config.h b/configs/GEP_F405_VTX_V3/config.h index ca6111d4..7948db07 100644 --- a/configs/GEP_F405_VTX_V3/config.h +++ b/configs/GEP_F405_VTX_V3/config.h @@ -88,8 +88,6 @@ #define ADC1_DMA_OPT 1 #define ADC2_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/HAKRCF405/config.h b/configs/HAKRCF405/config.h index cc501715..c4d1a6c6 100644 --- a/configs/HAKRCF405/config.h +++ b/configs/HAKRCF405/config.h @@ -90,8 +90,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/HAKRCF411/config.h b/configs/HAKRCF411/config.h index ea1e12c3..b83ad3a8 100644 --- a/configs/HAKRCF411/config.h +++ b/configs/HAKRCF411/config.h @@ -77,8 +77,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/HAKRCF722/config.h b/configs/HAKRCF722/config.h index 7ee58d20..d5f06d0d 100644 --- a/configs/HAKRCF722/config.h +++ b/configs/HAKRCF722/config.h @@ -86,8 +86,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/HIFIONRCF7/config.h b/configs/HIFIONRCF7/config.h index 3f0b742e..ebddd4da 100644 --- a/configs/HIFIONRCF7/config.h +++ b/configs/HIFIONRCF7/config.h @@ -92,8 +92,6 @@ #define ADC3_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/HOBBYWING_XROTORF4G3/config.h b/configs/HOBBYWING_XROTORF4G3/config.h index 4eeecdf8..e716c865 100644 --- a/configs/HOBBYWING_XROTORF4G3/config.h +++ b/configs/HOBBYWING_XROTORF4G3/config.h @@ -71,7 +71,6 @@ #define ADC_VBAT_PIN PC2 #define ADC_RSSI_PIN PA0 #define ADC_CURR_PIN PC1 -#define BARO_CS_PIN PB3 #define SDCARD_SPI_CS_PIN PB12 #define SDCARD_DETECT_PIN PB7 #define FLASH_CS_PIN PB12 @@ -102,8 +101,6 @@ #define ADC2_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_SPI_INSTANCE SPI3 #define USE_ADC #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/HYBRIDG4/config.h b/configs/HYBRIDG4/config.h index 4aac6412..daf689a2 100644 --- a/configs/HYBRIDG4/config.h +++ b/configs/HYBRIDG4/config.h @@ -77,8 +77,6 @@ #define TIMUP4_DMA_OPT 0 #define TIMUP5_DMA_OPT 0 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 diff --git a/configs/IFLIGHT_BLITZ_F405/config.h b/configs/IFLIGHT_BLITZ_F405/config.h index 694198c3..7b130997 100644 --- a/configs/IFLIGHT_BLITZ_F405/config.h +++ b/configs/IFLIGHT_BLITZ_F405/config.h @@ -82,8 +82,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/IFLIGHT_BLITZ_F411RX/config.h b/configs/IFLIGHT_BLITZ_F411RX/config.h index c6e34cfc..2b4f5ba1 100644 --- a/configs/IFLIGHT_BLITZ_F411RX/config.h +++ b/configs/IFLIGHT_BLITZ_F411RX/config.h @@ -74,8 +74,6 @@ #define ADC1_DMA_OPT 0 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define RX_SPI_INSTANCE SPI3 #define RX_SPI_LED_INVERTED diff --git a/configs/KD722/config.h b/configs/KD722/config.h index 3280c5d6..2a513cc9 100644 --- a/configs/KD722/config.h +++ b/configs/KD722/config.h @@ -88,8 +88,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #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 0da59365..38461276 100644 --- a/configs/KROOZX/config.h +++ b/configs/KROOZX/config.h @@ -95,8 +95,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_3) #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 688a8647..0583f234 100644 --- a/configs/LDARC_F411/config.h +++ b/configs/LDARC_F411/config.h @@ -82,8 +82,6 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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/LUXAIO/config.h b/configs/LUXAIO/config.h index f5a8c305..8359ea57 100644 --- a/configs/LUXAIO/config.h +++ b/configs/LUXAIO/config.h @@ -82,8 +82,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/LUXF4OSD/config.h b/configs/LUXF4OSD/config.h index 058f56cc..6c864b4c 100644 --- a/configs/LUXF4OSD/config.h +++ b/configs/LUXF4OSD/config.h @@ -100,8 +100,6 @@ #define ADC2_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define USE_ADC #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MAMBAF405US/config.h b/configs/MAMBAF405US/config.h index ba8ae6df..e5fed4f4 100644 --- a/configs/MAMBAF405US/config.h +++ b/configs/MAMBAF405US/config.h @@ -112,8 +112,6 @@ #define ESCSERIAL_PIN PB9 #define PINIO1_PIN PB0 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define MAG_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MAMBAF405_2022A/config.h b/configs/MAMBAF405_2022A/config.h index 84352eb8..8ba81535 100644 --- a/configs/MAMBAF405_2022A/config.h +++ b/configs/MAMBAF405_2022A/config.h @@ -98,8 +98,6 @@ #define PINIO2_PIN PC5 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 diff --git a/configs/MAMBAF722/config.h b/configs/MAMBAF722/config.h index c68a3f68..db452c33 100644 --- a/configs/MAMBAF722/config.h +++ b/configs/MAMBAF722/config.h @@ -108,8 +108,6 @@ #define PINIO1_PIN PB0 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define MAG_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/MATEKF405AIO/config.h b/configs/MATEKF405AIO/config.h index 14830b6c..7e8fb802 100644 --- a/configs/MATEKF405AIO/config.h +++ b/configs/MATEKF405AIO/config.h @@ -99,9 +99,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define DEFAULT_BARO_DEVICE BARO_NONE #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/MATEKF405MINI/config.h b/configs/MATEKF405MINI/config.h index 09834723..a73ac6e1 100644 --- a/configs/MATEKF405MINI/config.h +++ b/configs/MATEKF405MINI/config.h @@ -99,9 +99,6 @@ #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/MERAKRCF405/config.h b/configs/MERAKRCF405/config.h index 4af84b1e..f99ea233 100644 --- a/configs/MERAKRCF405/config.h +++ b/configs/MERAKRCF405/config.h @@ -88,8 +88,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/MERAKRCF722/config.h b/configs/MERAKRCF722/config.h index 1d9d5523..d9719034 100644 --- a/configs/MERAKRCF722/config.h +++ b/configs/MERAKRCF722/config.h @@ -87,8 +87,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/NUCLEOF446/config.h b/configs/NUCLEOF446/config.h index ce1a2fac..a36c01ac 100644 --- a/configs/NUCLEOF446/config.h +++ b/configs/NUCLEOF446/config.h @@ -36,8 +36,6 @@ #define USE_FAKE_GYRO #define USE_GYRO_SPI_MPU6500 #define USE_GYRO_SPI_MPU9250 -#define USE_BARO -#define USE_FAKE_BARO #define USE_MAG #define USE_FAKE_MAG //#define USE_MAX7456 diff --git a/configs/NUCLEOF722/config.h b/configs/NUCLEOF722/config.h index 8b34fee2..fa2b5b62 100644 --- a/configs/NUCLEOF722/config.h +++ b/configs/NUCLEOF722/config.h @@ -78,7 +78,5 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 diff --git a/configs/PODIUMF4/config.h b/configs/PODIUMF4/config.h index 89ab4b2e..14358108 100644 --- a/configs/PODIUMF4/config.h +++ b/configs/PODIUMF4/config.h @@ -94,8 +94,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define SYSTEM_HSE_MHZ 8 #define DASHBOARD_I2C_INSTANCE (I2CDEV_1) #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/PYRODRONEF4PDB/config.h b/configs/PYRODRONEF4PDB/config.h index 4af133bc..78ed4d10 100644 --- a/configs/PYRODRONEF4PDB/config.h +++ b/configs/PYRODRONEF4PDB/config.h @@ -69,7 +69,6 @@ #define MAX7456_SPI_CS_PIN PB12 #define GYRO_1_EXTI_PIN PC4 #define GYRO_1_CS_PIN PA4 -#define BARO_CS_PIN PC14 #define FLASH_CS_PIN PC13 #define I2C2_SCL_PIN PB10 #define I2C2_SDA_PIN PB11 @@ -86,8 +85,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define FLASH_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/configs/PYRODRONEF7/config.h b/configs/PYRODRONEF7/config.h index 2c93ba30..63087e0d 100644 --- a/configs/PYRODRONEF7/config.h +++ b/configs/PYRODRONEF7/config.h @@ -96,8 +96,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/REVO/config.h b/configs/REVO/config.h index 754f8e87..0af2551f 100644 --- a/configs/REVO/config.h +++ b/configs/REVO/config.h @@ -95,8 +95,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define SYSTEM_HSE_MHZ 8 #define DASHBOARD_I2C_INSTANCE (I2CDEV_1) #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/REVONANO/config.h b/configs/REVONANO/config.h index 30666c84..ec5d98be 100644 --- a/configs/REVONANO/config.h +++ b/configs/REVONANO/config.h @@ -82,8 +82,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_3) #define SYSTEM_HSE_MHZ 8 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI2 diff --git a/configs/RUSHCORE7/config.h b/configs/RUSHCORE7/config.h index 46cd78cf..56f262c6 100644 --- a/configs/RUSHCORE7/config.h +++ b/configs/RUSHCORE7/config.h @@ -93,8 +93,6 @@ #define ADC3_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/SIRMIXALOT/config.h b/configs/SIRMIXALOT/config.h index 82610162..0c085395 100644 --- a/configs/SIRMIXALOT/config.h +++ b/configs/SIRMIXALOT/config.h @@ -61,7 +61,6 @@ #define ADC_VBAT_PIN PC2 #define ADC_RSSI_PIN PC3 #define ADC_CURR_PIN PC1 -#define BARO_CS_PIN PB9 #define FLASH_CS_PIN PC0 #define MAX7456_SPI_CS_PIN PC14 #define GYRO_1_EXTI_PIN PC4 @@ -78,8 +77,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_SPI_INSTANCE SPI3 //TODO #define SERIALRX_INVERTED ON //TODO #define SERIALRX_HALFDUPLEX ON #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH diff --git a/configs/SKYSTARSF411/config.h b/configs/SKYSTARSF411/config.h index 5fb10c1b..b4db7ba2 100644 --- a/configs/SKYSTARSF411/config.h +++ b/configs/SKYSTARSF411/config.h @@ -91,9 +91,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) -#define DEFAULT_BARO_DEVICE BARO_NONE #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define FLASH_SPI_INSTANCE SPI3 diff --git a/configs/SKYSTARSF7HD/config.h b/configs/SKYSTARSF7HD/config.h index 0e8a6eae..2924c8c8 100644 --- a/configs/SKYSTARSF7HD/config.h +++ b/configs/SKYSTARSF7HD/config.h @@ -77,7 +77,6 @@ #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define PINIO1_PIN PB0 -#define BARO_CS_PIN PB1 #define TIMER_PIN_MAPPING \ TIMER_PIN_MAP( 0, PB4 , 1, -1) \ @@ -93,8 +92,6 @@ //TODO #define CAMERA_CONTROL_MODE SOFTWARE_PWM #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_SPI_INSTANCE SPI2 #define USE_ADC #define ADC_INSTANCE ADC2 diff --git a/configs/SKYZONEF405/config.h b/configs/SKYZONEF405/config.h index 7c1bafb8..542453a3 100644 --- a/configs/SKYZONEF405/config.h +++ b/configs/SKYZONEF405/config.h @@ -94,8 +94,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/SPCMAKERF411/config.h b/configs/SPCMAKERF411/config.h index 16628ec7..15a49b54 100644 --- a/configs/SPCMAKERF411/config.h +++ b/configs/SPCMAKERF411/config.h @@ -77,8 +77,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/SPEEDYBEEF4/config.h b/configs/SPEEDYBEEF4/config.h index f6d11204..193ff5b4 100644 --- a/configs/SPEEDYBEEF4/config.h +++ b/configs/SPEEDYBEEF4/config.h @@ -92,8 +92,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/SPEEDYBEEF7MINI/config.h b/configs/SPEEDYBEEF7MINI/config.h index 264c9a46..e7531297 100644 --- a/configs/SPEEDYBEEF7MINI/config.h +++ b/configs/SPEEDYBEEF7MINI/config.h @@ -99,8 +99,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/SPEEDYBEEF7MINIV2/config.h b/configs/SPEEDYBEEF7MINIV2/config.h index ec3b1954..287265b4 100644 --- a/configs/SPEEDYBEEF7MINIV2/config.h +++ b/configs/SPEEDYBEEF7MINIV2/config.h @@ -98,8 +98,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON diff --git a/configs/SPRACINGF4EVO/config.h b/configs/SPRACINGF4EVO/config.h index 750a5ed8..91dcc538 100644 --- a/configs/SPRACINGF4EVO/config.h +++ b/configs/SPRACINGF4EVO/config.h @@ -106,8 +106,6 @@ #define ADC3_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/SPRACINGF4NEO/config.h b/configs/SPRACINGF4NEO/config.h index 9d1efed8..5d3f7c29 100644 --- a/configs/SPRACINGF4NEO/config.h +++ b/configs/SPRACINGF4NEO/config.h @@ -108,8 +108,6 @@ #define ADC1_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/SPRACINGF7DUAL/config.h b/configs/SPRACINGF7DUAL/config.h index 19bd52d7..e509e908 100644 --- a/configs/SPRACINGF7DUAL/config.h +++ b/configs/SPRACINGF7DUAL/config.h @@ -113,8 +113,6 @@ #define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC3 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD diff --git a/configs/TCMMF411/config.h b/configs/TCMMF411/config.h index cb5edf49..adb234bd 100644 --- a/configs/TCMMF411/config.h +++ b/configs/TCMMF411/config.h @@ -64,7 +64,6 @@ #define MAX7456_SPI_CS_PIN PB12 #define GYRO_1_EXTI_PIN PA1 #define GYRO_1_CS_PIN PA4 -#define BARO_CS_PIN PA15 #define TIMER_PIN_MAPPING \ TIMER_PIN_MAP( 0, PA3 , 3, -1) \ @@ -80,8 +79,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO diff --git a/configs/TCMMF7/config.h b/configs/TCMMF7/config.h index 05da153c..9911ea2d 100644 --- a/configs/TCMMF7/config.h +++ b/configs/TCMMF7/config.h @@ -106,8 +106,6 @@ #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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 caf0b82d..18b2a5da 100644 --- a/configs/TMH7/config.h +++ b/configs/TMH7/config.h @@ -112,8 +112,6 @@ #define TIMUP8_DMA_OPT 0 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/TMOTORF722SE/config.h b/configs/TMOTORF722SE/config.h index 0fe5f961..06608269 100644 --- a/configs/TMOTORF722SE/config.h +++ b/configs/TMOTORF722SE/config.h @@ -105,8 +105,6 @@ #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#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/TMPACERF7/config.h b/configs/TMPACERF7/config.h index b71bcbea..9ce48a51 100644 --- a/configs/TMPACERF7/config.h +++ b/configs/TMPACERF7/config.h @@ -86,8 +86,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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 179 diff --git a/configs/TMPACERF7MINI/config.h b/configs/TMPACERF7MINI/config.h index 5a730520..6ab86e1b 100644 --- a/configs/TMPACERF7MINI/config.h +++ b/configs/TMPACERF7MINI/config.h @@ -80,8 +80,6 @@ #define ADC1_DMA_OPT 1 -#define USE_BARO -#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/TMVELOXF7/config.h b/configs/TMVELOXF7/config.h index 2fc5472d..a5dace38 100644 --- a/configs/TMVELOXF7/config.h +++ b/configs/TMVELOXF7/config.h @@ -98,8 +98,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/UAVPNG030MINI/config.h b/configs/UAVPNG030MINI/config.h index 220e6321..cb0e76a8 100644 --- a/configs/UAVPNG030MINI/config.h +++ b/configs/UAVPNG030MINI/config.h @@ -61,7 +61,6 @@ #define SPI1_SDO_PIN PA7 #define ESCSERIAL_PIN PA2 #define ADC_VBAT_PIN PC1 -#define BARO_CS_PIN PE1 #define COMPASS_EXTI_PIN PE12 #define GYRO_1_EXTI_PIN PE0 #define GYRO_1_CS_PIN PA4 @@ -78,8 +77,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_SPI_INSTANCE SPI1 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 diff --git a/configs/VIVAF4AIO/config.h b/configs/VIVAF4AIO/config.h index 431e73ea..fb22b57a 100644 --- a/configs/VIVAF4AIO/config.h +++ b/configs/VIVAF4AIO/config.h @@ -93,8 +93,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_1) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC1 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/configs/WIZZF7HD/config.h b/configs/WIZZF7HD/config.h index a64f3c69..f7641325 100644 --- a/configs/WIZZF7HD/config.h +++ b/configs/WIZZF7HD/config.h @@ -91,8 +91,6 @@ #define ADC1_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_1) #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 9da48fec..e5f66b80 100644 --- a/configs/XRACERF4/config.h +++ b/configs/XRACERF4/config.h @@ -95,8 +95,6 @@ #define ADC2_DMA_OPT 1 #define MAG_I2C_INSTANCE (I2CDEV_2) -#define USE_BARO -#define BARO_I2C_INSTANCE (I2CDEV_2) #define USE_ADC #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH