From e5f330fbf14acf42c8fa9aa92c6aa6435c9c74ce Mon Sep 17 00:00:00 2001 From: MJ666 Date: Tue, 2 Oct 2018 23:47:04 +0200 Subject: [PATCH] Update Baro driver for generic target --- src/main/drivers/barometer/barometer.h | 4 ---- src/main/sensors/barometer.c | 24 +++--------------------- src/main/target/AG3X/target.h | 4 ++-- src/main/target/AIRHEROF3/target.h | 4 ++-- src/main/target/ALIENFLIGHTNGF7/target.h | 7 ++----- src/main/target/ALIENWHOOP/target.h | 4 ++-- src/main/target/DOGE/target.h | 4 ++-- src/main/target/FRSKYF4/target.h | 4 ++-- src/main/target/NOX/target.h | 4 ++-- src/main/target/OMNIBUS/target.h | 4 ++-- src/main/target/OMNIBUSF4/target.h | 4 ++-- src/main/target/OMNIBUSF4FW/target.h | 4 ++-- src/main/target/OMNIBUSF7/target.h | 4 ++-- src/main/target/OMNINXT/target.h | 4 ++-- src/main/target/REVO/target.h | 4 ++-- src/main/target/UAVPNG030MINI/target.h | 4 ++-- src/main/target/WORMFC/target.h | 4 ++-- src/main/target/common_defaults_post.h | 13 +++++++++++++ 18 files changed, 46 insertions(+), 58 deletions(-) diff --git a/src/main/drivers/barometer/barometer.h b/src/main/drivers/barometer/barometer.h index 625bc48e5..164e225e0 100644 --- a/src/main/drivers/barometer/barometer.h +++ b/src/main/drivers/barometer/barometer.h @@ -37,7 +37,3 @@ typedef struct baroDev_s { baroOpFuncPtr get_up; baroCalculateFuncPtr calculate; } baroDev_t; - -#ifndef BARO_I2C_INSTANCE -#define BARO_I2C_INSTANCE I2C_DEVICE -#endif diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c index 78164ab90..95fdc290b 100644 --- a/src/main/sensors/barometer.c +++ b/src/main/sensors/barometer.c @@ -95,28 +95,10 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig) #endif #endif -#if defined(DEFAULT_BARO_SPI_BMP280) +#if defined(DEFAULT_BARO_SPI_BMP280) || defined(DEFAULT_BARO_SPI_MS5611) || defined(DEFAULT_BARO_SPI_QMP6988) || defined(DEFAULT_BARO_SPI_LPS) barometerConfig->baro_bustype = BUSTYPE_SPI; - barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(BMP280_SPI_INSTANCE)); - barometerConfig->baro_spi_csn = IO_TAG(BMP280_CS_PIN); - barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID); - barometerConfig->baro_i2c_address = 0; -#elif defined(DEFAULT_BARO_SPI_MS5611) - barometerConfig->baro_bustype = BUSTYPE_SPI; - barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(MS5611_SPI_INSTANCE)); - barometerConfig->baro_spi_csn = IO_TAG(MS5611_CS_PIN); - barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID); - barometerConfig->baro_i2c_address = 0; -#elif defined(DEFAULT_BARO_SPI_QMP6988) - barometerConfig->baro_bustype = BUSTYPE_SPI; - barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(QMP6988_SPI_INSTANCE)); - barometerConfig->baro_spi_csn = IO_TAG(QMP6988_CS_PIN); - barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID); - barometerConfig->baro_i2c_address = 0; -#elif defined(DEFAULT_BARO_SPI_LPS) - barometerConfig->baro_bustype = BUSTYPE_SPI; - barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(LPS_SPI_INSTANCE)); - barometerConfig->baro_spi_csn = IO_TAG(LPS_CS_PIN); + barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(BARO_SPI_INSTANCE)); + barometerConfig->baro_spi_csn = IO_TAG(BARO_CS_PIN); barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID); barometerConfig->baro_i2c_address = 0; #elif defined(DEFAULT_BARO_MS5611) || defined(DEFAULT_BARO_BMP280) || defined(DEFAULT_BARO_BMP085)||defined(DEFAULT_BARO_QMP6988) diff --git a/src/main/target/AG3X/target.h b/src/main/target/AG3X/target.h index 91b219d7d..5e61e3b2f 100644 --- a/src/main/target/AG3X/target.h +++ b/src/main/target/AG3X/target.h @@ -72,8 +72,8 @@ #define USE_BARO #define USE_BARO_SPI_BMP280 #define DEFAULT_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI2 -#define BMP280_CS_PIN PB9 +#define BARO_SPI_INSTANCE SPI2 +#define BARO_CS_PIN PB9 #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h index 8e22b6c2a..c5bf44f69 100644 --- a/src/main/target/AIRHEROF3/target.h +++ b/src/main/target/AIRHEROF3/target.h @@ -54,8 +54,8 @@ #define USE_BARO #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI2 -#define BMP280_CS_PIN PB5 +#define BARO_SPI_INSTANCE SPI2 +#define BARO_CS_PIN PB5 #define USE_UART1 #define USE_UART2 diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index eb0fa8090..e749e0b3e 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -75,11 +75,8 @@ #define USE_BARO_BMP280 #define USE_BARO_SPI_BMP280 -#define MS5611_CS_PIN SPI3_NSS_PIN -#define MS5611_SPI_INSTANCE SPI3 - -#define BMP280_CS_PIN SPI3_NSS_PIN -#define BMP280_SPI_INSTANCE SPI3 +#define BARO_CS_PIN SPI3_NSS_PIN +#define BARO_SPI_INSTANCE SPI3 #define USE_SDCARD #define USE_SDCARD_SPI diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h index 6087eb4f4..b3b72bed4 100644 --- a/src/main/target/ALIENWHOOP/target.h +++ b/src/main/target/ALIENWHOOP/target.h @@ -151,8 +151,8 @@ #define USE_BARO #define USE_BARO_BMP280 #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI3 -#define BMP280_CS_PIN SPI3_NSS_PIN +#define BARO_SPI_INSTANCE SPI3 +#define BARO_CS_PIN SPI3_NSS_PIN #endif /* Serial ports etc. diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h index de7071fe0..550079053 100644 --- a/src/main/target/DOGE/target.h +++ b/src/main/target/DOGE/target.h @@ -61,8 +61,8 @@ #define GYRO_1_SPI_INSTANCE SPI1 // tqfp48 pin 25 -#define BMP280_CS_PIN SPI2_NSS_PIN -#define BMP280_SPI_INSTANCE SPI2 +#define BARO_CS_PIN SPI2_NSS_PIN +#define BARO_SPI_INSTANCE SPI2 #define USE_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index 4cbd0529f..78892ffa3 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -51,8 +51,8 @@ #define USE_BARO #define USE_BARO_BMP280 #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI3 -#define BMP280_CS_PIN PB3 +#define BARO_SPI_INSTANCE SPI3 +#define BARO_CS_PIN PB3 #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h index a962d40b0..3684d163d 100644 --- a/src/main/target/NOX/target.h +++ b/src/main/target/NOX/target.h @@ -52,8 +52,8 @@ #define USE_BARO #define USE_BARO_BMP280 #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI2 -#define BMP280_CS_PIN PA9 +#define BARO_SPI_INSTANCE SPI2 +#define BARO_CS_PIN PA9 #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index 4fc8d7e2c..ffb998247 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -74,8 +74,8 @@ #define USE_ACC_SPI_MPU6000 #define ACC_1_ALIGN CW90_DEG -#define BMP280_SPI_INSTANCE SPI1 -#define BMP280_CS_PIN PA13 +#define BARO_SPI_INSTANCE SPI1 +#define BARO_CS_PIN PA13 #define USE_BARO #define USE_BARO_BMP280 diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 60e213302..e75172058 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -122,8 +122,8 @@ #define USE_BARO #if defined(OMNIBUSF4SD) #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI3 -#define BMP280_CS_PIN PB3 // v1 +#define BARO_SPI_INSTANCE SPI3 +#define BARO_CS_PIN PB3 // v1 #endif #define USE_BARO_BMP085 #define USE_BARO_BMP280 diff --git a/src/main/target/OMNIBUSF4FW/target.h b/src/main/target/OMNIBUSF4FW/target.h index 646108c52..503785cf9 100644 --- a/src/main/target/OMNIBUSF4FW/target.h +++ b/src/main/target/OMNIBUSF4FW/target.h @@ -80,8 +80,8 @@ #define USE_BARO #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI3 -#define BMP280_CS_PIN PB3 +#define BARO_SPI_INSTANCE SPI3 +#define BARO_CS_PIN PB3 #define DEFAULT_BARO_SPI_BMP280 #define USE_MAX7456 diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index 570b148c7..5357f53fe 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -205,8 +205,8 @@ #define USE_BARO #define USE_BARO_BMP280 #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI1 -#define BMP280_CS_PIN PA1 +#define BARO_SPI_INSTANCE SPI1 +#define BARO_CS_PIN PA1 #define USE_MAG #define USE_MAG_HMC5883 diff --git a/src/main/target/OMNINXT/target.h b/src/main/target/OMNINXT/target.h index 55d3f016b..bcf7f75d0 100644 --- a/src/main/target/OMNINXT/target.h +++ b/src/main/target/OMNINXT/target.h @@ -82,8 +82,8 @@ #define USE_BARO #define USE_BARO_SPI_LPS -#define LPS_SPI_INSTANCE SPI2 -#define LPS_CS_PIN PA10 +#define BARO_SPI_INSTANCE SPI2 +#define BARO_CS_PIN PA10 #define DEFAULT_BARO_SPI_LPS #define BARO_I2C_INSTANCE (I2CDEV_1) diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 8f63f98ef..f4d05dece 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -151,8 +151,8 @@ #if defined(AIRBOTF4) || defined(AIRBOTF4SD) #define USE_BARO_SPI_BMP280 -#define BMP280_SPI_INSTANCE SPI1 -#define BMP280_CS_PIN PC13 +#define BARO_SPI_INSTANCE SPI1 +#define BARO_CS_PIN PC13 #endif #if defined(AIRBOTF4SD) diff --git a/src/main/target/UAVPNG030MINI/target.h b/src/main/target/UAVPNG030MINI/target.h index 4cd4538a9..60bb5f6fc 100644 --- a/src/main/target/UAVPNG030MINI/target.h +++ b/src/main/target/UAVPNG030MINI/target.h @@ -58,8 +58,8 @@ #define USE_BARO #define USE_BARO_MS5611 #define USE_BARO_SPI_MS5611 -#define MS5611_CS_PIN PE1 -#define MS5611_SPI_INSTANCE SPI1 +#define BARO_CS_PIN PE1 +#define BARO_SPI_INSTANCE SPI1 #if 0 // TODO: Enable SDCard and blackbox logging #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h index dd3776368..1060e0d98 100644 --- a/src/main/target/WORMFC/target.h +++ b/src/main/target/WORMFC/target.h @@ -99,8 +99,8 @@ #if !defined(PIRXF4) #define USE_BARO #define USE_BARO_SPI_LPS -#define LPS_SPI_INSTANCE SPI3 -#define LPS_CS_PIN PB8 +#define BARO_SPI_INSTANCE SPI3 +#define BARO_CS_PIN PB8 #endif //UARTs diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h index 22aca0034..49bf2bea3 100644 --- a/src/main/target/common_defaults_post.h +++ b/src/main/target/common_defaults_post.h @@ -355,3 +355,16 @@ #define RANGEFINDER_HCSR04_ECHO_PIN NONE #endif #endif + +// Baro +#if defined(USE_BARO) +#ifndef BARO_SPI_INSTANCE +#define BARO_SPI_INSTANCE NULL +#endif +#ifndef BARO_CS_PIN +#define BARO_CS_PIN NONE +#endif +#ifndef BARO_I2C_INSTANCE +#define BARO_I2C_INSTANCE I2C_DEVICE +#endif +#endif