Browse Source

AP_NavEKF2: take EAS2TAS from AHRS rather than airspeed

mission-4.1.18
Peter Barker 6 years ago committed by Andrew Tridgell
parent
commit
11f31c2851
  1. 2
      libraries/AP_NavEKF2/AP_NavEKF2_Measurements.cpp
  2. 2
      libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp

2
libraries/AP_NavEKF2/AP_NavEKF2_Measurements.cpp

@ -676,7 +676,7 @@ void NavEKF2_core::readAirSpdData() @@ -676,7 +676,7 @@ void NavEKF2_core::readAirSpdData()
if (aspeed &&
aspeed->use() &&
aspeed->last_update_ms() != timeTasReceived_ms) {
tasDataNew.tas = aspeed->get_airspeed() * aspeed->get_EAS2TAS();
tasDataNew.tas = aspeed->get_airspeed() * AP::ahrs().get_EAS2TAS();
timeTasReceived_ms = aspeed->last_update_ms();
tasDataNew.time_ms = timeTasReceived_ms - frontend->tasDelay_ms;

2
libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp

@ -313,7 +313,7 @@ void NavEKF2_core::detectFlight() @@ -313,7 +313,7 @@ void NavEKF2_core::detectFlight()
// trigger at 8 m/s airspeed
if (_ahrs->airspeed_sensor_enabled()) {
const AP_Airspeed *airspeed = _ahrs->get_airspeed();
if (airspeed->get_airspeed() * airspeed->get_EAS2TAS() > 10.0f) {
if (airspeed->get_airspeed() * AP::ahrs().get_EAS2TAS() > 10.0f) {
highAirSpd = true;
}
}

Loading…
Cancel
Save