mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-30 09:33:33 +08:00
FlightTask: inherit from Block instead of SuperBlock
I think this is more how it's meant to be
This commit is contained in:
@@ -50,11 +50,11 @@
|
|||||||
#include "../SubscriptionArray.hpp"
|
#include "../SubscriptionArray.hpp"
|
||||||
|
|
||||||
|
|
||||||
class FlightTask : public control::SuperBlock
|
class FlightTask : public control::Block
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FlightTask(SuperBlock *parent, const char *name) :
|
FlightTask(control::SuperBlock *parent, const char *name) :
|
||||||
SuperBlock(parent, name)
|
Block(parent, name)
|
||||||
{
|
{
|
||||||
_time_stamp_activate = hrt_absolute_time();
|
_time_stamp_activate = hrt_absolute_time();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
using namespace matrix;
|
using namespace matrix;
|
||||||
|
|
||||||
FlightTaskManual::FlightTaskManual(SuperBlock *parent, const char *name) :
|
FlightTaskManual::FlightTaskManual(control::SuperBlock *parent, const char *name) :
|
||||||
FlightTask(parent, name),
|
FlightTask(parent, name),
|
||||||
_xy_vel_man_expo(parent, "MPC_XY_MAN_EXPO", false),
|
_xy_vel_man_expo(parent, "MPC_XY_MAN_EXPO", false),
|
||||||
_z_vel_man_expo(parent, "MPC_Z_MAN_EXPO", false),
|
_z_vel_man_expo(parent, "MPC_Z_MAN_EXPO", false),
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
class FlightTaskManual : public FlightTask
|
class FlightTaskManual : public FlightTask
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FlightTaskManual(SuperBlock *parent, const char *name);
|
FlightTaskManual(control::SuperBlock *parent, const char *name);
|
||||||
|
|
||||||
virtual ~FlightTaskManual() = default;
|
virtual ~FlightTaskManual() = default;
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
using namespace matrix;
|
using namespace matrix;
|
||||||
|
|
||||||
FlightTaskOrbit::FlightTaskOrbit(SuperBlock *parent, const char *name) :
|
FlightTaskOrbit::FlightTaskOrbit(control::SuperBlock *parent, const char *name) :
|
||||||
FlightTaskManual(parent, name)
|
FlightTaskManual(parent, name)
|
||||||
{
|
{
|
||||||
_r = 1.f;
|
_r = 1.f;
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
class FlightTaskOrbit : public FlightTaskManual
|
class FlightTaskOrbit : public FlightTaskManual
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FlightTaskOrbit(SuperBlock *parent, const char *name);
|
FlightTaskOrbit(control::SuperBlock *parent, const char *name);
|
||||||
|
|
||||||
virtual ~FlightTaskOrbit() = default;
|
virtual ~FlightTaskOrbit() = default;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user