Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
EKF: Fix rebase error
Browse files Browse the repository at this point in the history
  • Loading branch information
priseborough committed Jan 16, 2019
1 parent 69c29ad commit 47cf16f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion EKF/control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ void Ekf::controlGpsFusion()
// use GPS velocity data to check and correct yaw angle if a FW vehicle
if (_control_status.flags.fixed_wing && _control_status.flags.in_air) {
// if flying a fixed wing aircraft, do a complete reset that includes yaw
_flt_mag_align_complete = realignYawGPS();
_control_status.flags.mag_align_complete = realignYawGPS();
}

resetVelocity();
Expand Down

0 comments on commit 47cf16f

Please sign in to comment.