From 8d88fa2fca1adcb0e9126d39c8545375810bb064 Mon Sep 17 00:00:00 2001 From: MaEtUgR Date: Tue, 26 Jun 2018 15:05:14 +0200 Subject: [PATCH] FlightTasks: fix multiple comments --- src/lib/FlightTasks/FlightTasks.cpp | 6 +++--- src/lib/FlightTasks/FlightTasks.hpp | 2 +- src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/FlightTasks/FlightTasks.cpp b/src/lib/FlightTasks/FlightTasks.cpp index ef6ba69b50..7405682816 100644 --- a/src/lib/FlightTasks/FlightTasks.cpp +++ b/src/lib/FlightTasks/FlightTasks.cpp @@ -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(FlightTaskIndex::None) <= new_task_index && static_cast(FlightTaskIndex::Count) > new_task_index) { return switchTask(FlightTaskIndex(new_task_index)); diff --git a/src/lib/FlightTasks/FlightTasks.hpp b/src/lib/FlightTasks/FlightTasks.hpp index 6cea623953..b2e13185d0 100644 --- a/src/lib/FlightTasks/FlightTasks.hpp +++ b/src/lib/FlightTasks/FlightTasks.hpp @@ -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(_current_task.index) + 1); } diff --git a/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp b/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp index 2ca1fdcb3a..d40c941372 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp +++ b/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp @@ -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