fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 23:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream and resolve merge conflicts.

Browse Source
This commit is contained in:
mcsauder
2016-02-23 19:29:30 -07:00
parent 4ce4724105 237ecfef1a
commit fad1c87631
26 changed files with 1867 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EKF/ekf.cpp
+3
View File
@@ -168,6 +168,9 @@ bool Ekf::update()
fuseDeclination();
}
} else if (_control_status.flags.mag_2D && _control_status.flags.yaw_align) {
fuseMag2D();
} else if (_control_status.flags.mag_hdg && _control_status.flags.yaw_align) {
fuseHeading();