landdetector + mc_pos_control cherry-pick fix

This commit is contained in:
Dennis Mannhart
2017-07-10 10:22:23 +02:00
committed by Lorenz Meier
parent 69ecfef8a4
commit e6f7af2dcf
2 changed files with 3 additions and 2 deletions
@@ -1807,7 +1807,7 @@ MulticopterPositionControl::calculate_thrust_setpoint(float dt)
thrust_sp(1) = 0.0f;
}
if (!in_auto_takeoff) {
if (!in_auto_takeoff()) {
if (_vehicle_land_detected.ground_contact) {
/* if still or already on ground command zero xy thrust_sp in body
* frame to consider uneven ground */