Skip to content

Commit

Permalink
PositionControl - use dynamic constraints to saturate velocity contro…
Browse files Browse the repository at this point in the history
…ller for now as it is needed for the current smooth takeoff logic. Will be reverted after smooth takeoff refactor
  • Loading branch information
bresch committed Feb 8, 2019
1 parent cf2cc49 commit c338a8f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/modules/mc_pos_control/PositionControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ void PositionControl::_positionController()
_vel_sp(0) = vel_sp_xy(0);
_vel_sp(1) = vel_sp_xy(1);
// Constrain velocity in z-direction.
_vel_sp(2) = math::constrain(_vel_sp(2), -MPC_Z_VEL_MAX_UP.get(), MPC_Z_VEL_MAX_DN.get());
_vel_sp(2) = math::constrain(_vel_sp(2), -_constraints.speed_up, _constraints.speed_down);
}

void PositionControl::_velocityController(const float &dt)
Expand Down

0 comments on commit c338a8f

Please sign in to comment.