Browse Source

ManualVelocitySmoothing - Fix unlock initialization

sbg
bresch 6 years ago committed by Mathieu Bresciani
parent
commit
6f3868b5ba
  1. 5
      src/lib/FlightTasks/tasks/Utility/ManualVelocitySmoothingXY.cpp
  2. 4
      src/lib/FlightTasks/tasks/Utility/ManualVelocitySmoothingZ.cpp

5
src/lib/FlightTasks/tasks/Utility/ManualVelocitySmoothingXY.cpp

@ -111,11 +111,10 @@ void ManualVelocitySmoothingXY::checkPositionLock(Vector2f velocity_target) @@ -111,11 +111,10 @@ void ManualVelocitySmoothingXY::checkPositionLock(Vector2f velocity_target)
// Start the trajectory at the current velocity setpoint
_trajectory[0].setCurrentVelocity(_velocity_setpoint_feedback(0));
_trajectory[1].setCurrentVelocity(_velocity_setpoint_feedback(1));
_position_setpoint_locked(0) = NAN;
_position_setpoint_locked(1) = NAN;
_state.v = _velocity_setpoint_feedback;
resetPositionLock();
}
_position_lock_active = false;
_trajectory[0].setCurrentPosition(_position_estimate(0));
_trajectory[1].setCurrentPosition(_position_estimate(1));
}

4
src/lib/FlightTasks/tasks/Utility/ManualVelocitySmoothingZ.cpp

@ -110,10 +110,10 @@ void ManualVelocitySmoothingZ::checkPositionLock(float velocity_target) @@ -110,10 +110,10 @@ void ManualVelocitySmoothingZ::checkPositionLock(float velocity_target)
if (_position_lock_active) {
// Start the trajectory at the current velocity setpoint
_trajectory.setCurrentVelocity(_velocity_setpoint_feedback);
_position_setpoint_locked = NAN;
_state.v = _velocity_setpoint_feedback;
resetPositionLock();
}
_position_lock_active = false;
_trajectory.setCurrentPosition(_position_estimate);
}
}

Loading…
Cancel
Save