Browse Source

FlightTaskManual: define as abstract class

sbg
Dennis Mannhart 7 years ago committed by Beat Küng
parent
commit
3b4870b2c2
  1. 4
      src/lib/FlightTasks/FlightTasks.cpp
  2. 2
      src/lib/FlightTasks/FlightTasks.hpp
  3. 9
      src/lib/FlightTasks/tasks/FlightTaskManual.cpp
  4. 2
      src/lib/FlightTasks/tasks/FlightTaskManual.hpp

4
src/lib/FlightTasks/FlightTasks.cpp

@ -41,8 +41,8 @@ int FlightTasks::switchTask(int task_number)
switch (task_number) { switch (task_number) {
case 0: case 0:
_current_task = new (&_task_union.manual) FlightTaskManual(this, "MAN"); /* This part will change with the next PR that uses enum */
break; return -1;
case 1: case 1:
_current_task = new (&_task_union.orbit) FlightTaskOrbit(this, "ORB"); _current_task = new (&_task_union.orbit) FlightTaskOrbit(this, "ORB");

2
src/lib/FlightTasks/FlightTasks.hpp

@ -42,7 +42,6 @@
#pragma once #pragma once
#include "tasks/FlightTask.hpp" #include "tasks/FlightTask.hpp"
#include "tasks/FlightTaskManual.hpp"
#include "tasks/FlightTaskManualAltitude.hpp" #include "tasks/FlightTaskManualAltitude.hpp"
#include "tasks/FlightTaskManualPosition.hpp" #include "tasks/FlightTaskManualPosition.hpp"
#include "tasks/FlightTaskManualStabilized.hpp" #include "tasks/FlightTaskManualStabilized.hpp"
@ -122,7 +121,6 @@ private:
TaskUnion() {} TaskUnion() {}
~TaskUnion() {} ~TaskUnion() {}
FlightTaskManual manual;
FlightTaskManualStabilized stabilized; FlightTaskManualStabilized stabilized;
FlightTaskManualAltitude altitude; FlightTaskManualAltitude altitude;
FlightTaskManualPosition position; FlightTaskManualPosition position;

9
src/lib/FlightTasks/tasks/FlightTaskManual.cpp

@ -83,15 +83,6 @@ bool FlightTaskManual::updateInitialize()
return ret; return ret;
} }
bool FlightTaskManual::update()
{
/* Nothing to do.
* The only purpose of this class
* is to provide sticks to child classes.
*/
return true;
}
bool FlightTaskManual::_evaluateSticks() bool FlightTaskManual::_evaluateSticks()
{ {
/* Sticks are rescaled linearly and exponentially from [0,1] to [-1,1] */ /* Sticks are rescaled linearly and exponentially from [0,1] to [-1,1] */

2
src/lib/FlightTasks/tasks/FlightTaskManual.hpp

@ -59,8 +59,6 @@ public:
bool updateInitialize() override; bool updateInitialize() override;
bool update() override;
protected: protected:
bool _sticks_data_required = true; /**< let inherited task-class define if it depends on stick data */ bool _sticks_data_required = true; /**< let inherited task-class define if it depends on stick data */

Loading…
Cancel
Save