Skip to content

Commit

Permalink
AutoLineSmoothVel - Reorganize functions declarations to match cpp file
Browse files Browse the repository at this point in the history
  • Loading branch information
bresch committed Sep 24, 2019
1 parent c811cf4 commit 679b165
Showing 1 changed file with 11 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,31 @@ class FlightTaskAutoLineSmoothVel : public FlightTaskAutoMapper2
);

void checkSetpoints(vehicle_local_position_setpoint_s &setpoints);
float _getSpeedAtTarget();
float _getMaxSpeedFromDistance(float braking_distance);
void _generateSetpoints() override; /**< Generate setpoints along line. */

/** determines when to trigger a takeoff (ignored in flight) */
bool _checkTakeoff() override { return _want_takeoff; };
/** Reset position or velocity setpoints in case of EKF reset event */
void _ekfResetHandlerPositionXY() override;
void _ekfResetHandlerVelocityXY() override;
void _ekfResetHandlerPositionZ() override;
void _ekfResetHandlerVelocityZ() override;
void _ekfResetHandlerHeading(float delta_psi) override;

void _generateSetpoints() override; /**< Generate setpoints along line. */
void _generateHeading();
bool _generateHeadingAlongTraj(); /**< Generates heading along trajectory. */

inline float _constrainOneSide(float val, float constraint); /**< Constrain val between INF and constraint */
inline float _constrainAbs(float val, float min, float max); /**< Constrain absolute value of val between min and max */

void _generateHeading();
bool _generateHeadingAlongTraj(); /**< Generates heading along trajectory. */
void _updateTrajConstraints();
float _getSpeedAtTarget();
float _getMaxSpeedFromDistance(float braking_distance);

void _prepareSetpoints(); /**< Generate velocity target points for the trajectory generator. */
void _updateTrajConstraints();
void _generateTrajectory();
VelocitySmoothing _trajectory[3]; ///< Trajectories in x, y and z directions

/** determines when to trigger a takeoff (ignored in flight) */
bool _checkTakeoff() override { return _want_takeoff; };
bool _want_takeoff{false};

VelocitySmoothing _trajectory[3]; ///< Trajectories in x, y and z directions
};

0 comments on commit 679b165

Please sign in to comment.