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

AP_AHRS: Fall back to DCM airspeed estimate if EKF velocity not available

This commit is contained in:
Paul Riseborough 2021-02-21 09:21:47 +11:00 committed by Andrew Tridgell
parent a50be71b41
commit 1a3258a039
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_AHRS/AP_AHRS_NavEKF.cpp
View File

@ -688,7 +688,8 @@ bool AP_AHRS_NavEKF::airspeed_estimate(float &airspeed_ret) const
// estimate it via nav velocity and wind estimates // estimate it via nav velocity and wind estimates
Vector3f nav_vel; Vector3f nav_vel;
float true_airspeed; float true_airspeed;
if (ret && have_inertial_nav() && get_velocity_NED(nav_vel)) { if (ret && have_inertial_nav()) {
if (get_velocity_NED(nav_vel)) {
Vector3f true_airspeed_vec = nav_vel - wind_vel; Vector3f true_airspeed_vec = nav_vel - wind_vel;
true_airspeed = true_airspeed_vec.length(); true_airspeed = true_airspeed_vec.length();
float gnd_speed = nav_vel.length(); float gnd_speed = nav_vel.length();
@ -700,6 +701,10 @@ bool AP_AHRS_NavEKF::airspeed_estimate(float &airspeed_ret) const
true_airspeed = MAX(0.0f, true_airspeed); true_airspeed = MAX(0.0f, true_airspeed);
} }
airspeed_ret = true_airspeed / get_EAS2TAS(); airspeed_ret = true_airspeed / get_EAS2TAS();
} else {
// fallback to DCM if airspeed estimate if EKF has wind but no velocity estimate
ret = AP_AHRS_DCM::airspeed_estimate(get_active_airspeed_index(), airspeed_ret);
}
} }
return ret; return ret;