From 79eb74be3f789e96204e392670cc3ba64106b4b7 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 5 Jun 2019 11:35:06 -0700 Subject: [PATCH] Fix bmp280 on FMUv4 --- boards/px4/fmu-v4/init/rc.board_sensors | 2 +- src/drivers/barometer/bmp280/bmp280.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boards/px4/fmu-v4/init/rc.board_sensors b/boards/px4/fmu-v4/init/rc.board_sensors index d11658f080..d0f57537b1 100644 --- a/boards/px4/fmu-v4/init/rc.board_sensors +++ b/boards/px4/fmu-v4/init/rc.board_sensors @@ -16,7 +16,7 @@ fmu sensor_reset 50 hmc5883 -C -T -X start lis3mdl -X start ist8310 start -bmp280 -I start +bmp280 -X start qmc5883 -X start # expansion i2c used for BMM150 rotated by 90deg diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp index a4ec020415..db27333e25 100644 --- a/src/drivers/barometer/bmp280/bmp280.cpp +++ b/src/drivers/barometer/bmp280/bmp280.cpp @@ -541,8 +541,8 @@ struct bmp280_bus_option { #if defined(PX4_I2C_BUS_ONBOARD) && defined(PX4_I2C_OBDEV_BMP280) { BMP280_BUS_I2C_INTERNAL, "/dev/bmp280_i2c_int", &bmp280_i2c_interface, PX4_I2C_BUS_ONBOARD, PX4_I2C_OBDEV_BMP280, false, NULL }, #endif -#if defined(PX4_I2C_BUS_EXPANSION) && defined(PX4_I2C_EXT_OBDEV_BMP280) - { BMP280_BUS_I2C_EXTERNAL, "/dev/bmp280_i2c_ext", &bmp280_i2c_interface, PX4_I2C_BUS_EXPANSION, PX4_I2C_EXT_OBDEV_BMP280, true, NULL }, +#if defined(PX4_I2C_BUS_EXPANSION) && defined(PX4_I2C_OBDEV_BMP280) + { BMP280_BUS_I2C_EXTERNAL, "/dev/bmp280_i2c_ext", &bmp280_i2c_interface, PX4_I2C_BUS_EXPANSION, PX4_I2C_OBDEV_BMP280, true, NULL }, #endif }; #define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0]))