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

Merge pull request #301 from PX4/pr-fix_hagl_valid

Browse Source 
return hagl valid false if update was rejected
This commit is contained in:
ChristophTobler
2017-07-13 17:28:53 +02:00
committed by GitHub
parent d69cc3d7c8 d2945abd85
commit 667517a9b6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EKF/terrain_estimator.cpp
+2 -1
View File
@@ -145,6 +145,7 @@ void Ekf::fuseHagl()
}
} else {
_innov_check_fail_status.flags.reject_hagl = true;
return;
}
}
@@ -155,7 +156,7 @@ bool Ekf::get_terrain_vert_pos(float *ret)
{
memcpy(ret, &_terrain_vpos, sizeof(float));
if (_terrain_initialised && _range_data_continuous) {
if (_terrain_initialised && _range_data_continuous && !_innov_check_fail_status.flags.reject_hagl) {
return true;
} else {