aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Compass: don't use ternary operator in place of if/else

Browse Source
This commit is contained in:
Lucas De Marchi 2015-12-14 15:58:00 -02:00 committed by Andrew Tridgell
parent 5a085b1610
commit 766252cd87
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Compass/Compass.cpp
View File

@ -431,8 +431,11 @@ void Compass::_detect_backends(void)
// detect_mpu9250() failed will cause panic if no actual mpu9250 backend, // detect_mpu9250() failed will cause panic if no actual mpu9250 backend,
// in BH, only one compass should be detected // in BH, only one compass should be detected
AP_Compass_Backend *backend = AP_Compass_HMC5843::detect_i2c(*this, hal.i2c); AP_Compass_Backend *backend = AP_Compass_HMC5843::detect_i2c(*this, hal.i2c);
backend ? _add_backend(backend) if (backend) {
: _add_backend(AP_Compass_AK8963::detect_mpu9250(*this, 0)); _add_backend(backend);
} else {
_add_backend(AP_Compass_AK8963::detect_mpu9250(*this, 0));
}
#elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX && \ #elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX && \
CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_NONE && \ CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_NONE && \
CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_BEBOP && \ CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_BEBOP && \