diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-22 11:13:11 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-22 11:13:11 +0200 |
| commit | 302233a34f23a57b67d4ebb8ba3e553ad9d8c445 (patch) | |
| tree | 9fa902073c358151e1ca27430e00919048006d76 /src/modules/position_estimator_inav/position_estimator_inav_main.c | |
| parent | dfd9601b571057e73668d9b39d584bc4eb9cc305 (diff) | |
| parent | f0e28a60ca216ec147b359eef5500f190f192c82 (diff) | |
| download | px4-firmware-302233a34f23a57b67d4ebb8ba3e553ad9d8c445.tar.gz px4-firmware-302233a34f23a57b67d4ebb8ba3e553ad9d8c445.tar.bz2 px4-firmware-302233a34f23a57b67d4ebb8ba3e553ad9d8c445.zip | |
Merge branch 'master' into mpc_local_pos
Diffstat (limited to 'src/modules/position_estimator_inav/position_estimator_inav_main.c')
| -rw-r--r-- | src/modules/position_estimator_inav/position_estimator_inav_main.c | 2 |
1 files changed, 1 insertions, 1 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 dc85f7482..368424853 100644 --- a/src/modules/position_estimator_inav/position_estimator_inav_main.c +++ b/src/modules/position_estimator_inav/position_estimator_inav_main.c @@ -864,7 +864,7 @@ int position_estimator_inav_thread_main(int argc, char *argv[]) float thrust = armed.armed ? actuator.control[3] : 0.0f; if (landed) { - if (alt_disp2 > land_disp2 && thrust > params.land_thr) { + if (alt_disp2 > land_disp2 || thrust > params.land_thr) { landed = false; landed_time = 0; } |