dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

EKF: Don't make detection of indoor operation dependent on optical flow 

This is required because it can take several seconds for an optical flow sensor operation to be confirmed and there are also many use cases for indoor operation where no optical flow is used.
This commit is contained in:
Paul Riseborough 2018-05-16 21:56:15 +10:00 committed by Lorenz Meier
parent 1562a82dc2
commit f59cd0f5b0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
EKF/control.cpp
View File

@ -1400,13 +1400,8 @@ void Ekf::controlMagFusion()
_control_status.flags.mag_dec = false; _control_status.flags.mag_dec = false;
} }
// If optical flow is enabled there is no other aiding active and GPS checks are failing, then assume that we are operating // If GPS is not being used and there is no other earth frame aiding, assume that we are operating indoors and the magnetometer is unreliable.
// indoors and the magnetometer is unreliable. Becasue the optical flow sensor is body fixed, absolute yaw if ((!_control_status.flags.gps || !(_params.fusion_mode & MASK_USE_GPS)) && !_control_status.flags.ev_pos) {
// wrt North is not required for navigation and it is safer not to use the magnetometer.
if (((_params.fusion_mode & MASK_USE_OF) || _mag_use_inhibit)
&& !_control_status.flags.gps
&& !_control_status.flags.ev_pos
&& ((_time_last_imu - _last_gps_pass_us > (uint64_t)5e6) || !(_params.fusion_mode & MASK_USE_GPS))) {
_mag_use_inhibit = true; _mag_use_inhibit = true;
} else { } else {
_mag_use_inhibit = false; _mag_use_inhibit = false;