mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-11-07 03:41:35 +08:00
FlightTasks: remove all remaining unnecessary semicolons
This commit is contained in:
@@ -54,14 +54,14 @@ class FlightTasks : control::SuperBlock
|
|||||||
public:
|
public:
|
||||||
FlightTasks() :
|
FlightTasks() :
|
||||||
SuperBlock(nullptr, "TSK")
|
SuperBlock(nullptr, "TSK")
|
||||||
{};
|
{}
|
||||||
|
|
||||||
~FlightTasks()
|
~FlightTasks()
|
||||||
{
|
{
|
||||||
if (_current_task) {
|
if (_current_task) {
|
||||||
_current_task->~FlightTask();
|
_current_task->~FlightTask();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Call regularly in the control loop cycle to execute the task
|
* Call regularly in the control loop cycle to execute the task
|
||||||
@@ -159,19 +159,19 @@ public:
|
|||||||
* Get the number of the active task
|
* Get the number of the active task
|
||||||
* @return number of active task, -1 if there is none
|
* @return number of active task, -1 if there is none
|
||||||
*/
|
*/
|
||||||
int get_active_task() const { return _current_task_index; };
|
int get_active_task() const { return _current_task_index; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if any task is active
|
* Check if any task is active
|
||||||
* @return true if a task is active, false if not
|
* @return true if a task is active, false if not
|
||||||
*/
|
*/
|
||||||
bool is_any_task_active() const { return _current_task; };
|
bool is_any_task_active() const { return _current_task; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the task number exists
|
* Check if the task number exists
|
||||||
* @return true if yes, false if not
|
* @return true if yes, false if not
|
||||||
*/
|
*/
|
||||||
bool is_task_number_valid(int task_number) const { return task_number > -1 && task_number < _task_count; };
|
bool is_task_number_valid(int task_number) const { return task_number > -1 && task_number < _task_count; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static constexpr int _task_count = 2;
|
static constexpr int _task_count = 2;
|
||||||
|
|||||||
@@ -109,10 +109,10 @@ protected:
|
|||||||
void _set_acceleration_setpoint(const matrix::Vector3f &acceleration_setpoint) { acceleration_setpoint.copyToRaw(&_vehicle_local_position_setpoint.acc_x); }
|
void _set_acceleration_setpoint(const matrix::Vector3f &acceleration_setpoint) { acceleration_setpoint.copyToRaw(&_vehicle_local_position_setpoint.acc_x); }
|
||||||
|
|
||||||
/* Put the yaw angle produced by the task into the setpoint message */
|
/* Put the yaw angle produced by the task into the setpoint message */
|
||||||
void _set_yaw_setpoint(const float &yaw) { _vehicle_local_position_setpoint.yaw = yaw; };
|
void _set_yaw_setpoint(const float &yaw) { _vehicle_local_position_setpoint.yaw = yaw; }
|
||||||
|
|
||||||
/* Put the yaw anglular rate produced by the task into the setpoint message */
|
/* Put the yaw anglular rate produced by the task into the setpoint message */
|
||||||
void _set_yawspeed_setpoint(const float &yawspeed) { _vehicle_local_position_setpoint.yawspeed = yawspeed; };
|
void _set_yawspeed_setpoint(const float &yawspeed) { _vehicle_local_position_setpoint.yawspeed = yawspeed; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uORB::Subscription<vehicle_local_position_s> *_sub_vehicle_local_position{nullptr};
|
uORB::Subscription<vehicle_local_position_s> *_sub_vehicle_local_position{nullptr};
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
matrix::Vector<float, 4> _sticks;
|
matrix::Vector<float, 4> _sticks;
|
||||||
|
|
||||||
float get_input_frame_yaw() { return _yaw; };
|
float get_input_frame_yaw() { return _yaw; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uORB::Subscription<manual_control_setpoint_s> *_sub_manual_control_setpoint{nullptr};
|
uORB::Subscription<manual_control_setpoint_s> *_sub_manual_control_setpoint{nullptr};
|
||||||
|
|||||||
Reference in New Issue
Block a user