fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTasks: add stabilized and fix switchTask for Altitude and Position

Browse Source
This commit is contained in:
Dennis Mannhart 2017-12-29 10:09:05 +01:00 committed by Beat Küng
parent 39731277ad
commit dcdf4d50a0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/FlightTasks/FlightTasks.cpp
View File

@ -53,11 +53,15 @@ int FlightTasks::switchTask(int task_number)
break;
case 3:
_current_task = new (&_task_union.altitude) FlightTaskSport(this, "MANALT");
_current_task = new (&_task_union.altitude) FlightTaskManualAltitude(this, "MANALT");
break;
case 4:
_current_task = new (&_task_union.position) FlightTaskSport(this, "MANPOS");
_current_task = new (&_task_union.position) FlightTaskManualPosition(this, "MANPOS");
break;
case 5:
_current_task = new (&_task_union.stabilized) FlightTaskManualStabilized(this, "MANSTAB");
break;
case -1:

2
src/lib/FlightTasks/FlightTasks.hpp
View File

@ -45,6 +45,7 @@
#include "tasks/FlightTaskManual.hpp"
#include "tasks/FlightTaskManualAltitude.hpp"
#include "tasks/FlightTaskManualPosition.hpp"
#include "tasks/FlightTaskManualStabilized.hpp"
#include "tasks/FlightTaskOrbit.hpp"
#include "tasks/FlightTaskSport.hpp"
@ -122,6 +123,7 @@ private:
~TaskUnion() {}
FlightTaskManual manual;
FlightTaskManualStabilized stabilized;
FlightTaskManualAltitude altitude;
FlightTaskManualPosition position;
FlightTaskOrbit orbit;