aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-12-21 12:11:07 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-12-21 12:11:07 +0100
commitff25dd81eed5ec88b7c39151782929d755e3fd4a (patch)
tree3fe92c9345701aa0aa53bcad13ae9308f6bf50a9
parent923346c8ed03374aaa8883309eb45d70730b0e0b (diff)
parentae48bb5d180cc85472943d5505450dc698f2cce6 (diff)
downloadpx4-firmware-ff25dd81eed5ec88b7c39151782929d755e3fd4a.tar.gz
px4-firmware-ff25dd81eed5ec88b7c39151782929d755e3fd4a.tar.bz2
px4-firmware-ff25dd81eed5ec88b7c39151782929d755e3fd4a.zip
Merge branch 'master' of github.com:PX4/Firmware
-rw-r--r--src/modules/position_estimator_inav/position_estimator_inav_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_main.c b/src/modules/position_estimator_inav/position_estimator_inav_main.c
index 296919c04..0af01cba1 100644
--- a/src/modules/position_estimator_inav/position_estimator_inav_main.c
+++ b/src/modules/position_estimator_inav/position_estimator_inav_main.c
@@ -1052,10 +1052,6 @@ int position_estimator_inav_thread_main(int argc, char *argv[])
landed = false;
landed_time = 0;
}
- /* reset xy velocity estimates when landed */
- x_est[1] = 0.0f;
- y_est[1] = 0.0f;
-
} else {
if (alt_disp2 < land_disp2 && thrust < params.land_thr) {
if (landed_time == 0) {