diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-15 14:46:55 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-15 14:46:55 +0200 |
| commit | 80e95c628c9ca3b6c4e504b4f2defcd3684f2b28 (patch) | |
| tree | 5df43b06470fcb985e167efa5a61a625b174e3b4 /src | |
| parent | 2f9415ffd87a09d4ca6d9f54f27306df793cae4d (diff) | |
| parent | 0700a4f6b823b77ad7b343c641ec8fb34f130173 (diff) | |
| download | px4-firmware-80e95c628c9ca3b6c4e504b4f2defcd3684f2b28.tar.gz px4-firmware-80e95c628c9ca3b6c4e504b4f2defcd3684f2b28.tar.bz2 px4-firmware-80e95c628c9ca3b6c4e504b4f2defcd3684f2b28.zip | |
Merge remote-tracking branch 'upstream/mtecs_estimator' into navigator_rewrite_estimator
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/ekf_att_pos_estimator/estimator_23states.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/ekf_att_pos_estimator/estimator_23states.cpp b/src/modules/ekf_att_pos_estimator/estimator_23states.cpp index 45790063f..d364facad 100644 --- a/src/modules/ekf_att_pos_estimator/estimator_23states.cpp +++ b/src/modules/ekf_att_pos_estimator/estimator_23states.cpp @@ -14,6 +14,7 @@ AttPosEKF::AttPosEKF() summedDelAng.zero(); summedDelVel.zero(); + fusionModeGPS = 0; fuseVelData = false; fusePosData = false; fuseHgtData = false; |