diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-08 21:22:46 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-08 21:22:46 +0200 |
| commit | 80a59a6d078a367256c92f105ab468a8eb66fdfe (patch) | |
| tree | b52e5478e253d795862b754ea4d82c2a6ba7785c | |
| parent | 13be060dae1bca1f4a38970a88a48243ab54d185 (diff) | |
| parent | 523606668f8c940357cd9c46b0995035eced7659 (diff) | |
| download | px4-firmware-80a59a6d078a367256c92f105ab468a8eb66fdfe.tar.gz px4-firmware-80a59a6d078a367256c92f105ab468a8eb66fdfe.tar.bz2 px4-firmware-80a59a6d078a367256c92f105ab468a8eb66fdfe.zip | |
Merge pull request #817 from PX4/mc_land_fix
MC land detector fix
| -rw-r--r-- | src/modules/position_estimator_inav/position_estimator_inav_main.c | 2 | ||||
| -rw-r--r-- | src/modules/position_estimator_inav/position_estimator_inav_params.c | 2 |
2 files changed, 2 insertions, 2 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 368fa6ee2..763b87563 100644 --- a/src/modules/position_estimator_inav/position_estimator_inav_main.c +++ b/src/modules/position_estimator_inav/position_estimator_inav_main.c @@ -763,7 +763,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; } diff --git a/src/modules/position_estimator_inav/position_estimator_inav_params.c b/src/modules/position_estimator_inav/position_estimator_inav_params.c index b71f9472f..dcad5c03b 100644 --- a/src/modules/position_estimator_inav/position_estimator_inav_params.c +++ b/src/modules/position_estimator_inav/position_estimator_inav_params.c @@ -56,7 +56,7 @@ PARAM_DEFINE_FLOAT(INAV_SONAR_FILT, 0.05f); PARAM_DEFINE_FLOAT(INAV_SONAR_ERR, 0.5f); PARAM_DEFINE_FLOAT(INAV_LAND_T, 3.0f); PARAM_DEFINE_FLOAT(INAV_LAND_DISP, 0.7f); -PARAM_DEFINE_FLOAT(INAV_LAND_THR, 0.3f); +PARAM_DEFINE_FLOAT(INAV_LAND_THR, 0.2f); int parameters_init(struct position_estimator_inav_param_handles *h) { |