From 98e4afaf6ec94833d2b1105ea10ef92465b2e273 Mon Sep 17 00:00:00 2001 From: Dennis Mannhart Date: Thu, 28 Dec 2017 20:51:30 +0100 Subject: [PATCH] FlightTaskSport: temporary inherit from FlightTaskManualPosition --- src/lib/FlightTasks/tasks/FlightTaskSport.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/FlightTasks/tasks/FlightTaskSport.hpp b/src/lib/FlightTasks/tasks/FlightTaskSport.hpp index daace5ea1e..8703afbf4d 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskSport.hpp +++ b/src/lib/FlightTasks/tasks/FlightTaskSport.hpp @@ -41,24 +41,24 @@ #pragma once -#include "FlightTaskManual.hpp" +#include "FlightTaskManualPosition.hpp" -class FlightTaskSport : public FlightTaskManual +class FlightTaskSport : public FlightTaskManualPosition { public: FlightTaskSport(control::SuperBlock *parent, const char *name) : - FlightTaskManual(parent, name), + FlightTaskManualPosition(parent, name), _velocity_hor_max(parent, "MPC_XY_VEL_MAX", false) { } virtual ~FlightTaskSport() = default; protected: - void _scaleVelocity(matrix::Vector3f &velocity) override + void _scaleVelocity(matrix::Vector3f &velocity) { const matrix::Vector3f velocity_scale(_velocity_hor_max.get(), _velocity_hor_max.get(), - (velocity(2) > 0.0f) ? _z_vel_max_down.get() : _z_vel_max_up.get()); + (velocity(2) > 0.0f) ? _vel_max_down.get() : _vel_max_up.get()); velocity = velocity.emult(velocity_scale); }