fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-28 13:14:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTasks: fix multiple comments

Browse Source
This commit is contained in:
MaEtUgR 2018-06-26 15:05:14 +02:00 committed by ChristophTobler
parent 675b6bbabc
commit 8d88fa2fca
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/FlightTasks/FlightTasks.cpp
View File

@ -131,7 +131,7 @@ int FlightTasks::switchTask(FlightTaskIndex new_task_index)
return 0;
}
/* subscription failed */
// subscription failed
if (!_current_task.task->initializeSubscriptions(_subscription_array)) {
_current_task.task->~FlightTask();
_current_task.task = nullptr;
@ -141,7 +141,7 @@ int FlightTasks::switchTask(FlightTaskIndex new_task_index)
_subscription_array.forcedUpdate(); // make sure data is available for all new subscriptions
/* activation failed */
// activation failed
if (!_current_task.task->updateInitialize() || !_current_task.task->activate()) {
_current_task.task->~FlightTask();
_current_task.task = nullptr;
@ -154,7 +154,7 @@ int FlightTasks::switchTask(FlightTaskIndex new_task_index)
int FlightTasks::switchTask(int new_task_index)
{
/* make sure we are in range of the enumeration before casting */
// make sure we are in range of the enumeration before casting
if (static_cast<int>(FlightTaskIndex::None) <= new_task_index &&
static_cast<int>(FlightTaskIndex::Count) > new_task_index) {
return switchTask(FlightTaskIndex(new_task_index));

2
src/lib/FlightTasks/FlightTasks.hpp
View File

@ -105,7 +105,7 @@ public:
/**
* Switch to the next task in the available list (for testing)
* @return true on success, false on error
* @return 1 on success, <0 on error
*/
int switchTask() { return switchTask(static_cast<int>(_current_task.index) + 1); }

2
src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
View File

@ -81,7 +81,7 @@ protected:
private:
float _r = 0.f; /**< radius with which to orbit the target */
float _v = 0.f; /**< tangential velocity for orbiting in m/s */
float _v = 0.f; /**< clockwise tangential velocity for orbiting in m/s */
matrix::Vector2f _center; /**< local frame coordinates of the center point */
// TODO: create/use parameters for limits