mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-23 14:43:35 +08:00
FlightTasks: add stabilized and fix switchTask for Altitude and Position
This commit is contained in:
committed by
Beat Küng
parent
39731277ad
commit
dcdf4d50a0
@@ -53,11 +53,15 @@ int FlightTasks::switchTask(int task_number)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
_current_task = new (&_task_union.altitude) FlightTaskSport(this, "MANALT");
|
_current_task = new (&_task_union.altitude) FlightTaskManualAltitude(this, "MANALT");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
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;
|
break;
|
||||||
|
|
||||||
case -1:
|
case -1:
|
||||||
|
|||||||
@@ -45,6 +45,7 @@
|
|||||||
#include "tasks/FlightTaskManual.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/FlightTaskOrbit.hpp"
|
#include "tasks/FlightTaskOrbit.hpp"
|
||||||
#include "tasks/FlightTaskSport.hpp"
|
#include "tasks/FlightTaskSport.hpp"
|
||||||
|
|
||||||
@@ -122,6 +123,7 @@ private:
|
|||||||
~TaskUnion() {}
|
~TaskUnion() {}
|
||||||
|
|
||||||
FlightTaskManual manual;
|
FlightTaskManual manual;
|
||||||
|
FlightTaskManualStabilized stabilized;
|
||||||
FlightTaskManualAltitude altitude;
|
FlightTaskManualAltitude altitude;
|
||||||
FlightTaskManualPosition position;
|
FlightTaskManualPosition position;
|
||||||
FlightTaskOrbit orbit;
|
FlightTaskOrbit orbit;
|
||||||
|
|||||||
Reference in New Issue
Block a user