diff --git a/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.cpp b/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.cpp index a4efbcb8707e690bfefe918a179f62214d02e1a1..46d4fb5b3f0faa0f9c5d14c00d03f3073b99e57b 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.cpp +++ b/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.cpp @@ -46,8 +46,7 @@ FlightTaskManualStabilized::FlightTaskManualStabilized(control::SuperBlock *pare _tilt_max_man(parent, "MPC_MAN_TILT_MAX", false), _throttle_min(parent, "MPC_THR_MIN", false), _throttle_max(parent, "MPC_THR_MAX", false), - _throttle_hover(parent, "MPC_THR_HOVER", false), - _yaw_rate_max(parent, "MPC_MAN_Y_MAX", false) + _throttle_hover(parent, "MPC_THR_HOVER", false) {} bool FlightTaskManualStabilized::activate() @@ -61,8 +60,6 @@ void FlightTaskManualStabilized::_scaleSticks() /* Scale sticks to yaw and thrust using * linear scale for yaw and piecewise linear map for thrust. */ _yawspeed_setpoint = _sticks(3) * math::radians(_yaw_rate_scaling.get()); - _yawspeed_setpoint = math::sign(_yawspeed_setpoint) * math::min(fabsf(_yawspeed_setpoint), - math::radians(_yaw_rate_max.get())); _throttle = _throttleCurve(); } diff --git a/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.hpp b/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.hpp index 921597a61a2264268cefa76ae362a142c1e53e7c..0f6aa1698607a7cb9de014d331c0fd18cca4006d 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.hpp +++ b/src/lib/FlightTasks/tasks/FlightTaskManualStabilized.hpp @@ -71,5 +71,4 @@ private: control::BlockParamFloat _throttle_min; /**< minimum throttle that always has to be satisfied in flight*/ control::BlockParamFloat _throttle_max; /**< maximum throttle that always has to be satisfied in flight*/ control::BlockParamFloat _throttle_hover; /**< throttle value at which vehicle is at hover equilibrium */ - control::BlockParamFloat _yaw_rate_max; /** manual maximum yawspeed */ };