diff --git a/src/lib/flight_tasks/tasks/Orbit/FlightTaskOrbit.hpp b/src/lib/flight_tasks/tasks/Orbit/FlightTaskOrbit.hpp index 3b86c336db..0faa2ff908 100644 --- a/src/lib/flight_tasks/tasks/Orbit/FlightTaskOrbit.hpp +++ b/src/lib/flight_tasks/tasks/Orbit/FlightTaskOrbit.hpp @@ -88,11 +88,12 @@ protected: bool setVelocity(const float v); private: - void generate_circle_approach_setpoints(matrix::Vector2f - start_to_circle); /**< generates setpoints to smoothly reach the closest point on the circle when starting from far away */ - void generate_circle_setpoints(matrix::Vector2f center_to_position); /**< generates xy setpoints to orbit the vehicle */ - void generate_circle_yaw_setpoints(matrix::Vector2f - center_to_position); /**< generates yaw setpoints to control the vehicle's heading */ + /** generates setpoints to smoothly reach the closest point on the circle when starting from far away */ + void generate_circle_approach_setpoints(matrix::Vector2f ¢er_to_position); + /** generates xy setpoints to make the vehicle orbit */ + void generate_circle_setpoints(matrix::Vector2f ¢er_to_position); + /** generates yaw setpoints to control the vehicle's heading */ + void generate_circle_yaw_setpoints(matrix::Vector2f ¢er_to_position); float _r = 0.f; /**< radius with which to orbit the target */ float _v = 0.f; /**< clockwise tangential velocity for orbiting in m/s */ @@ -107,8 +108,8 @@ private: const float _velocity_max = 10.f; const float _acceleration_max = 2.f; - int _yaw_behaviour = - orbit_status_s::ORBIT_YAW_BEHAVIOUR_HOLD_FRONT_TO_CIRCLE_CENTER; /**< yaw behaviour during the orbit flight according to MAVLink's ORBIT_YAW_BEHAVIOUR enum */ + /** yaw behaviour during the orbit flight according to MAVLink's ORBIT_YAW_BEHAVIOUR enum */ + int _yaw_behaviour = orbit_status_s::ORBIT_YAW_BEHAVIOUR_HOLD_FRONT_TO_CIRCLE_CENTER; float _initial_heading = 0.f; /**< the heading of the drone when the orbit command was issued */ uORB::Publication _orbit_status_pub{ORB_ID(orbit_status)};