Browse Source

FlightTask: set min_distance_to_ground to NAN as default and when

distance sensor is used to SENS_FLOW_MINRNG
sbg
Dennis Mannhart 7 years ago committed by Lorenz Meier
parent
commit
bd85f5f993
  1. 1
      src/lib/FlightTasks/tasks/FlightTask.cpp
  2. 1
      src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp

1
src/lib/FlightTasks/tasks/FlightTask.cpp

@ -117,4 +117,5 @@ void FlightTask::_setDefaultConstraints() @@ -117,4 +117,5 @@ void FlightTask::_setDefaultConstraints()
_constraints.speed_down = MPC_Z_VEL_MAX_DN.get();
_constraints.tilt = math::radians(MPC_TILTMAX_AIR.get());
_constraints.landing_gear = vehicle_constraints_s::GEAR_KEEP;
_constraints.min_distance_to_ground = NAN;
}

1
src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp

@ -54,6 +54,7 @@ bool FlightTaskManualAltitude::activate() @@ -54,6 +54,7 @@ bool FlightTaskManualAltitude::activate()
_position_setpoint(2) = _position(2);
_velocity_setpoint(2) = 0.0f;
_setDefaultConstraints();
_constraints.min_distance_to_ground = SENS_FLOW_MINRNG.get();
return ret;
}

Loading…
Cancel
Save