Merge pull request #138 from pickledgator/evTesting

EV testing
This commit is contained in:
Paul Riseborough
2016-05-19 12:56:41 +10:00
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -333,7 +333,7 @@ bool Ekf::update()
// if we aren't doing any aiding, fake GPS measurements at the last known position to constrain drift
// Coincide fake measurements with baro data for efficiency with a minimum fusion rate of 5Hz
if (!_control_status.flags.gps && !_control_status.flags.opt_flow
if (!_control_status.flags.gps && !_control_status.flags.opt_flow && !_control_status.flags.ev_pos
&& ((_time_last_imu - _time_last_fake_gps > 2e5) || _fuse_height)) {
_fuse_pos = true;
_time_last_fake_gps = _time_last_imu;