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

AP_Airspeed: move default type for SITL to be for only Plane

This commit is contained in:
Josh Henderson 2021-11-02 22:32:05 -04:00 committed by Andrew Tridgell
parent af348e6ba1
commit bf65b2eba8
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/AP_Airspeed/AP_Airspeed.cpp
View File

@ -49,19 +49,23 @@ extern const AP_HAL::HAL &hal;
#ifndef ARSPD_DEFAULT_PIN
#define ARSPD_DEFAULT_PIN 1
#endif
#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
#define ARSPD_DEFAULT_TYPE TYPE_ANALOG
#define ARSPD_DEFAULT_PIN 1
#elif APM_BUILD_TYPE(APM_BUILD_Rover) || APM_BUILD_TYPE(APM_BUILD_ArduSub)
#elif APM_BUILD_TYPE(APM_BUILD_ArduPlane)
// The HAL_BOARD_SITL setting is required because of current probe process for MS4525 will
// connect and find the SIM_DLVR sensors & fault as there is no way to tell them apart
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#define ARSPD_DEFAULT_TYPE TYPE_ANALOG
#define ARSPD_DEFAULT_PIN 1
#else
#define ARSPD_DEFAULT_TYPE TYPE_I2C_MS4525
#ifdef HAL_DEFAULT_AIRSPEED_PIN
#define ARSPD_DEFAULT_PIN HAL_DEFAULT_AIRSPEED_PIN
#else
#define ARSPD_DEFAULT_PIN 15
#endif
#endif //CONFIG_HAL_BOARD
#else // All Other Vehicle Types
#define ARSPD_DEFAULT_TYPE TYPE_NONE
#define ARSPD_DEFAULT_PIN 15
#else
#define ARSPD_DEFAULT_TYPE TYPE_I2C_MS4525
#ifdef HAL_DEFAULT_AIRSPEED_PIN
#define ARSPD_DEFAULT_PIN HAL_DEFAULT_AIRSPEED_PIN
#else
#define ARSPD_DEFAULT_PIN 15
#endif
#endif
#ifndef HAL_AIRSPEED_BUS_DEFAULT