From 338ca3104cf597336df81ff2a4fccc5c293674ae Mon Sep 17 00:00:00 2001 From: Dennis Mannhart Date: Tue, 31 Jul 2018 10:15:30 +0200 Subject: [PATCH] FlightTaskAutoLine: remove activate method bc uses same impl as FlightTaskAutoMapper --- src/lib/FlightTasks/tasks/FlightTaskAutoLine.cpp | 8 -------- src/lib/FlightTasks/tasks/FlightTaskAutoLine.hpp | 1 - 2 files changed, 9 deletions(-) diff --git a/src/lib/FlightTasks/tasks/FlightTaskAutoLine.cpp b/src/lib/FlightTasks/tasks/FlightTaskAutoLine.cpp index fde1ec11fd..32796930da 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskAutoLine.cpp +++ b/src/lib/FlightTasks/tasks/FlightTaskAutoLine.cpp @@ -43,12 +43,6 @@ using namespace matrix; #define SIGMA_SINGLE_OP 0.000001f #define SIGMA_NORM 0.001f -bool FlightTaskAutoLine::activate() -{ - return FlightTaskAutoMapper::activate(); -} - - void FlightTaskAutoLine::_generateSetpoints() { _generateAltitudeSetpoints(); @@ -61,8 +55,6 @@ void FlightTaskAutoLine::_generateSetpoints() } } - - void FlightTaskAutoLine::_generateXYsetpoints() { Vector2f pos_sp_to_dest = Vector2f(&(_target - _position_setpoint)(0)); diff --git a/src/lib/FlightTasks/tasks/FlightTaskAutoLine.hpp b/src/lib/FlightTasks/tasks/FlightTaskAutoLine.hpp index 96973e5b5f..dd7f669263 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskAutoLine.hpp +++ b/src/lib/FlightTasks/tasks/FlightTaskAutoLine.hpp @@ -47,7 +47,6 @@ class FlightTaskAutoLine : public FlightTaskAutoMapper public: FlightTaskAutoLine() = default; virtual ~FlightTaskAutoLine() = default; - bool activate() override; protected: