diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 21:35:46 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 21:35:46 +0200 |
| commit | 5a22ef1c28abfeb0076532a847a9178f9dc1361e (patch) | |
| tree | 323c0a6f48d53b6703a851546d6b7320517dd6ca /src/drivers/ms5611/ms5611_spi.cpp | |
| parent | 0d1ac4235411e8f05f96bcbe51558d92f0d86cf6 (diff) | |
| parent | 5f8baed876a805c2cfae7c0ed0250ae20b501336 (diff) | |
| download | px4-firmware-5a22ef1c28abfeb0076532a847a9178f9dc1361e.tar.gz px4-firmware-5a22ef1c28abfeb0076532a847a9178f9dc1361e.tar.bz2 px4-firmware-5a22ef1c28abfeb0076532a847a9178f9dc1361e.zip | |
Merge branch 'master' of github.com:PX4/Firmware into airspeed_test_fix
Diffstat (limited to 'src/drivers/ms5611/ms5611_spi.cpp')
| -rw-r--r-- | src/drivers/ms5611/ms5611_spi.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/drivers/ms5611/ms5611_spi.cpp b/src/drivers/ms5611/ms5611_spi.cpp index 8759d16a1..5234ce8d6 100644 --- a/src/drivers/ms5611/ms5611_spi.cpp +++ b/src/drivers/ms5611/ms5611_spi.cpp @@ -62,7 +62,7 @@ #ifdef PX4_SPIDEV_BARO -device::Device *MS5611_spi_interface(ms5611::prom_u &prom_buf); +device::Device *MS5611_spi_interface(ms5611::prom_u &prom_buf, bool external_bus); class MS5611_SPI : public device::SPI { @@ -115,9 +115,17 @@ private: }; device::Device * -MS5611_spi_interface(ms5611::prom_u &prom_buf) +MS5611_spi_interface(ms5611::prom_u &prom_buf, bool external_bus) { - return new MS5611_SPI(PX4_SPI_BUS_SENSORS, (spi_dev_e)PX4_SPIDEV_BARO, prom_buf); + if (external_bus) { + #ifdef PX4_SPI_BUS_EXT + return new MS5611_SPI(PX4_SPI_BUS_EXT, (spi_dev_e)PX4_SPIDEV_EXT_BARO, prom_buf); + #else + return nullptr; + #endif + } else { + return new MS5611_SPI(PX4_SPI_BUS_SENSORS, (spi_dev_e)PX4_SPIDEV_BARO, prom_buf); + } } MS5611_SPI::MS5611_SPI(int bus, spi_dev_e device, ms5611::prom_u &prom_buf) : |