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

FlightTask: inherit from Block instead of SuperBlock

Browse Source 
I think this is more how it's meant to be
This commit is contained in:
Beat Küng 2017-11-20 17:05:38 +01:00
parent 9b571abb47
commit b0fdbf5136
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/FlightTasks/tasks/FlightTask.hpp
View File

@ -50,11 +50,11 @@
#include "../SubscriptionArray.hpp"
class FlightTask : public control::SuperBlock
class FlightTask : public control::Block
{
public:
FlightTask(SuperBlock *parent, const char *name) :
SuperBlock(parent, name)
FlightTask(control::SuperBlock *parent, const char *name) :
Block(parent, name)
{
_time_stamp_activate = hrt_absolute_time();
};

2
src/lib/FlightTasks/tasks/FlightTaskManual.cpp
View File

@ -46,7 +46,7 @@
using namespace matrix;
FlightTaskManual::FlightTaskManual(SuperBlock *parent, const char *name) :
FlightTaskManual::FlightTaskManual(control::SuperBlock *parent, const char *name) :
FlightTask(parent, name),
_xy_vel_man_expo(parent, "MPC_XY_MAN_EXPO", false),
_z_vel_man_expo(parent, "MPC_Z_MAN_EXPO", false),

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

@ -50,7 +50,7 @@
class FlightTaskManual : public FlightTask
{
public:
FlightTaskManual(SuperBlock *parent, const char *name);
FlightTaskManual(control::SuperBlock *parent, const char *name);
virtual ~FlightTaskManual() = default;

2
src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
View File

@ -45,7 +45,7 @@
using namespace matrix;
FlightTaskOrbit::FlightTaskOrbit(SuperBlock *parent, const char *name) :
FlightTaskOrbit::FlightTaskOrbit(control::SuperBlock *parent, const char *name) :
FlightTaskManual(parent, name)
{
_r = 1.f;

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

@ -46,7 +46,7 @@
class FlightTaskOrbit : public FlightTaskManual
{
public:
FlightTaskOrbit(SuperBlock *parent, const char *name);
FlightTaskOrbit(control::SuperBlock *parent, const char *name);
virtual ~FlightTaskOrbit() = default;