From 3b4870b2c20643b33184a02d9a0097feb9364879 Mon Sep 17 00:00:00 2001
From: Dennis Mannhart <dennis.mannhart@gmail.com>
Date: Thu, 4 Jan 2018 17:46:13 +0100
Subject: [PATCH] FlightTaskManual: define as abstract class

---
 src/lib/FlightTasks/FlightTasks.cpp            | 4 ++--
 src/lib/FlightTasks/FlightTasks.hpp            | 2 --
 src/lib/FlightTasks/tasks/FlightTaskManual.cpp | 9 ---------
 src/lib/FlightTasks/tasks/FlightTaskManual.hpp | 2 --
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/lib/FlightTasks/FlightTasks.cpp b/src/lib/FlightTasks/FlightTasks.cpp
index ba8b08c91b..b84fa5ab85 100644
--- a/src/lib/FlightTasks/FlightTasks.cpp
+++ b/src/lib/FlightTasks/FlightTasks.cpp
@@ -41,8 +41,8 @@ int FlightTasks::switchTask(int task_number)
 
 	switch (task_number) {
 	case 0:
-		_current_task = new (&_task_union.manual) FlightTaskManual(this, "MAN");
-		break;
+		/* This part will change with the next PR that uses enum */
+		return -1;
 
 	case 1:
 		_current_task = new (&_task_union.orbit) FlightTaskOrbit(this, "ORB");
diff --git a/src/lib/FlightTasks/FlightTasks.hpp b/src/lib/FlightTasks/FlightTasks.hpp
index 850dbe00f7..65c4bd1c74 100644
--- a/src/lib/FlightTasks/FlightTasks.hpp
+++ b/src/lib/FlightTasks/FlightTasks.hpp
@@ -42,7 +42,6 @@
 #pragma once
 
 #include "tasks/FlightTask.hpp"
-#include "tasks/FlightTaskManual.hpp"
 #include "tasks/FlightTaskManualAltitude.hpp"
 #include "tasks/FlightTaskManualPosition.hpp"
 #include "tasks/FlightTaskManualStabilized.hpp"
@@ -122,7 +121,6 @@ private:
 		TaskUnion() {}
 		~TaskUnion() {}
 
-		FlightTaskManual manual;
 		FlightTaskManualStabilized stabilized;
 		FlightTaskManualAltitude altitude;
 		FlightTaskManualPosition position;
diff --git a/src/lib/FlightTasks/tasks/FlightTaskManual.cpp b/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
index 68980cfa0f..82e32c65c7 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
@@ -83,15 +83,6 @@ bool FlightTaskManual::updateInitialize()
 	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()
 {
 	/* Sticks are rescaled linearly and exponentially from [0,1] to [-1,1] */
diff --git a/src/lib/FlightTasks/tasks/FlightTaskManual.hpp b/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
index 903c8b3e9e..8b4ec1ef5a 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
@@ -59,8 +59,6 @@ public:
 
 	bool updateInitialize() override;
 
-	bool update() override;
-
 protected:
 
 	bool _sticks_data_required = true; /**< let inherited task-class define if it depends on stick data */