Browse Source

FlightTaskManualPosition: rename updateXYsetpoints to updateXYlock

sbg
Dennis Mannhart 7 years ago committed by Beat Küng
parent
commit
5d06464340
  1. 4
      src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp
  2. 4
      src/lib/FlightTasks/tasks/FlightTaskManualPosition.hpp

4
src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp

@ -80,7 +80,7 @@ void FlightTaskManualPosition::_scaleSticks() @@ -80,7 +80,7 @@ void FlightTaskManualPosition::_scaleSticks()
_vel_sp_xy = matrix::Vector2f(vel_sp(0), vel_sp(1));
}
void FlightTaskManualPosition::_updateXYsetpoints()
void FlightTaskManualPosition::_updateXYlock()
{
/* If position lock is not active, position setpoint is set to NAN.*/
const float vel_xy_norm = Vector2f(&_velocity(0)).length();
@ -98,7 +98,7 @@ void FlightTaskManualPosition::_updateXYsetpoints() @@ -98,7 +98,7 @@ void FlightTaskManualPosition::_updateXYsetpoints()
void FlightTaskManualPosition::_updateSetpoints()
{
FlightTaskManualAltitude::_updateSetpoints(); // get yaw and z setpoints
_updateXYsetpoints(); // get xy setpoints
_updateXYlock(); // check for position lock
}
bool FlightTaskManualPosition::update()

4
src/lib/FlightTasks/tasks/FlightTaskManualPosition.hpp

@ -61,9 +61,7 @@ protected: @@ -61,9 +61,7 @@ protected:
control::BlockParamFloat _acc_xy_max;/**< Maximum acceleration horizontally. Only used to compute lock time. */
control::BlockParamFloat _vel_xy_dz; /**< velocity threshold/deadzone to switch into horizontal position hold */
void _updateXYlock(); /**< Applies positon lock based on stick and velocity */
void _updateSetpoints() override;
void _scaleSticks() override;
private:
void _updateXYsetpoints();
};

Loading…
Cancel
Save