Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-03 12:14:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: fixed FMUv1 baro and enable in-tree driver for PHMINI

Browse Source
This commit is contained in:
Andrew Tridgell 2016-11-09 11:34:16 +11:00
parent fcf0a4ea59
commit 565f1986e0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Baro/AP_Baro.cpp
View File

@ -292,8 +292,14 @@ void AP_Baro::init(void)
} }
#if HAL_BARO_DEFAULT == HAL_BARO_PX4 || HAL_BARO_DEFAULT == HAL_BARO_VRBRAIN #if HAL_BARO_DEFAULT == HAL_BARO_PX4 || HAL_BARO_DEFAULT == HAL_BARO_VRBRAIN
if (AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_TEST_V1 || if (AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_TEST_V1) {
AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_TEST_V2) { #ifdef HAL_BARO_MS5611_I2C_BUS
drivers[0] = new AP_Baro_MS5611(*this,
std::move(hal.i2c_mgr->get_device(HAL_BARO_MS5611_I2C_BUS, HAL_BARO_MS5611_I2C_ADDR)));
_num_drivers = 1;
#endif
} else if (AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_TEST_V2 ||
AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_PHMINI) {
drivers[0] = new AP_Baro_MS5611(*this, drivers[0] = new AP_Baro_MS5611(*this,
std::move(hal.spi->get_device(HAL_BARO_MS5611_NAME))); std::move(hal.spi->get_device(HAL_BARO_MS5611_NAME)));
_num_drivers = 1; _num_drivers = 1;