diff --git a/src/main/drivers/barometer/barometer_lps.c b/src/main/drivers/barometer/barometer_lps.c index e78f3cef92..d46bf3f086 100644 --- a/src/main/drivers/barometer/barometer_lps.c +++ b/src/main/drivers/barometer/barometer_lps.c @@ -3,7 +3,7 @@ #include -#if defined(USE_BARO) && (defined(USE_BARO_LPS) || defined(USE_BARO_SPI_LPS)) +#if defined(USE_BARO) && defined(USE_BARO_SPI_LPS) #include "build/build_config.h" diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 05fae49e9b..511853f426 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -226,7 +226,7 @@ void spiPreInit(void) #ifdef USE_BARO_SPI_MS5611 spiPreInitCs(IO_TAG(MS5611_CS_PIN)); #endif -#ifdef USE_BARO_LPS +#ifdef USE_BARO_SPI_LPS spiPreInitCs(IO_TAG(LPS_CS_PIN)); #endif #ifdef USE_MAG_SPI_HMC5883 diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c index efb1bc8476..b4879b3a03 100644 --- a/src/main/sensors/barometer.c +++ b/src/main/sensors/barometer.c @@ -65,7 +65,7 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig) // a. Precedence is in the order of popularity; BMP280, MS5611 then BMP085, then // b. If SPI variant is specified, it is likely onboard, so take it. -#if !(defined(DEFAULT_BARO_SPI_BMP280) || defined(DEFAULT_BARO_BMP280) || defined(DEFAULT_BARO_SPI_MS5611) || defined(DEFAULT_BARO_MS5611) || defined(DEFAULT_BARO_BMP085) || defined(DEFAULT_BARO_LPS)) +#if !(defined(DEFAULT_BARO_SPI_BMP280) || defined(DEFAULT_BARO_BMP280) || defined(DEFAULT_BARO_SPI_MS5611) || defined(DEFAULT_BARO_MS5611) || defined(DEFAULT_BARO_BMP085) || defined(DEFAULT_BARO_SPI_LPS)) #if defined(USE_BARO_BMP280) || defined(USE_BARO_SPI_BMP280) #if defined(USE_BARO_SPI_BMP280) #define DEFAULT_BARO_SPI_BMP280 @@ -78,7 +78,7 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig) #else #define DEFAULT_BARO_MS5611 #endif -#elif defined(USE_BARO_LPS) +#elif defined(USE_BARO_SPI_LPS) #define DEFAULT_BARO_SPI_LPS #elif defined(DEFAULT_BARO_BMP085) #define DEFAULT_BARO_BMP085 @@ -196,7 +196,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse) FALLTHROUGH; case BARO_LPS: -#if defined(USE_BARO_LPS) +#if defined(USE_BARO_SPI_LPS) if (lpsDetect(dev)) { baroHardware = BARO_LPS; break; diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h index 0d032cf745..133d085e84 100644 --- a/src/main/target/WORMFC/target.h +++ b/src/main/target/WORMFC/target.h @@ -53,7 +53,7 @@ //BARO #define USE_BARO -#define USE_BARO_LPS +#define USE_BARO_SPI_LPS #define LPS_SPI_INSTANCE SPI3 #define LPS_CS_PIN PB8