Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: tidy external baro probing

This commit is contained in:
Peter Barker 2023-04-14 14:35:51 +10:00 committed by Peter Barker
parent 7f42f1d89f
commit 100b8d3915
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Baro/AP_Baro.cpp
View File

@ -62,10 +62,6 @@
#define HAL_BARO_FILTER_DEFAULT 0 // turned off by default
#endif
#if !defined(HAL_PROBE_EXTERNAL_I2C_BAROS) && !HAL_MINIMIZE_FEATURES
#define HAL_PROBE_EXTERNAL_I2C_BAROS
#endif
#ifndef HAL_BARO_PROBE_EXT_DEFAULT
#define HAL_BARO_PROBE_EXT_DEFAULT 0
#endif
@ -173,7 +169,7 @@ const AP_Param::GroupInfo AP_Baro::var_info[] = {
// @Increment: 1
AP_GROUPINFO("_FLTR_RNG", 13, AP_Baro, _filter_range, HAL_BARO_FILTER_DEFAULT),
#if defined(HAL_PROBE_EXTERNAL_I2C_BAROS) || defined(AP_BARO_MSP_ENABLED)
#if AP_BARO_PROBE_EXTERNAL_I2C_BUSES || AP_BARO_MSP_ENABLED
// @Param: _PROBE_EXT
// @DisplayName: External barometers to probe
// @Description: This sets which types of external i2c barometer to look for. It is a bitmask of barometer types. The I2C buses to probe is based on BARO_EXT_BUS. If BARO_EXT_BUS is -1 then it will probe all external buses, otherwise it will probe just the bus number given in BARO_EXT_BUS.
@ -766,7 +762,7 @@ void AP_Baro::init(void)
#endif
}
#ifdef HAL_PROBE_EXTERNAL_I2C_BAROS
#if AP_BARO_PROBE_EXTERNAL_I2C_BUSES
_probe_i2c_barometers();
#endif

5
libraries/AP_Baro/AP_Baro_config.h
View File

@ -80,3 +80,8 @@
#ifndef AP_BARO_DRONECAN_ENABLED
#define AP_BARO_DRONECAN_ENABLED (AP_BARO_BACKEND_DEFAULT_ENABLED && HAL_ENABLE_DRONECAN_DRIVERS)
#endif
#ifndef AP_BARO_PROBE_EXTERNAL_I2C_BUSES
#define AP_BARO_PROBE_EXTERNAL_I2C_BUSES 1
#endif