ekf2: replace _inhibit_ev_yaw_use with local flag

This commit is contained in:
Daniel Agar
2022-03-21 15:41:31 -04:00
parent cdf9e6d35a
commit 2f0c2fa126
4 changed files with 4 additions and 11 deletions
+4 -2
View File
@@ -201,7 +201,9 @@ void Ekf::controlExternalVisionFusion()
reset = true;
}
if (_inhibit_ev_yaw_use) {
bool inhibit_ev_yaw_use = _control_status.flags.gps || _control_status.flags.gps_yaw;
if (inhibit_ev_yaw_use) {
stopEvYawFusion();
}
@@ -232,7 +234,7 @@ void Ekf::controlExternalVisionFusion()
}
// external vision yaw aiding selection logic
if (!_inhibit_ev_yaw_use && (_params.fusion_mode & MASK_USE_EVYAW) && !_control_status.flags.ev_yaw
if (!inhibit_ev_yaw_use && (_params.fusion_mode & MASK_USE_EVYAW) && !_control_status.flags.ev_yaw
&& _control_status.flags.tilt_align) {
// don't start using EV data unless data is arriving frequently