From 41b132e57696e085050b36bc58fe220dbd528b17 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Nov 2016 15:29:42 +1100 Subject: [PATCH] AP_Baro: setup for new board PX4 IDs --- libraries/AP_Baro/AP_Baro.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro.cpp b/libraries/AP_Baro/AP_Baro.cpp index 37762e4cd2..b96fe0d5b3 100644 --- a/libraries/AP_Baro/AP_Baro.cpp +++ b/libraries/AP_Baro/AP_Baro.cpp @@ -292,19 +292,19 @@ void AP_Baro::init(void) } #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_PX4V1) { #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 || + } else if (AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_PIXHAWK || AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_PHMINI || AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_PH2SLIM) { drivers[0] = new AP_Baro_MS5611(*this, std::move(hal.spi->get_device(HAL_BARO_MS5611_NAME))); _num_drivers = 1; - } else if (AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_TEST_V3) { + } else if (AP_BoardConfig::get_board_type() == AP_BoardConfig::PX4_BOARD_PIXHAWK2) { drivers[0] = new AP_Baro_MS5611(*this, std::move(hal.spi->get_device(HAL_BARO_MS5611_SPI_EXT_NAME))); drivers[1] = new AP_Baro_MS5611(*this,