fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 05:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTasks: switched to a block hierarchy with parameter names like TSK_ORB_RADIUS in mind

Browse Source
This commit is contained in:
Matthias Grob
2018-04-05 07:30:12 +02:00
committed by Beat Küng
parent 9437326b01
commit 4d05193ad7
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/FlightTasks.hpp
+5 -4
View File
@@ -45,12 +45,13 @@
#include "tasks/FlightTaskManual.hpp" #include "tasks/FlightTaskManual.hpp"
#include "tasks/FlightTaskOrbit.hpp" #include "tasks/FlightTaskOrbit.hpp"
class FlightTasks class FlightTasks : control::SuperBlock
{ {
public: public:
FlightTasks(control::SuperBlock *parent) : FlightTasks() :
Manual(parent, "MAN"), SuperBlock(nullptr, "TSK"),
Orbit(parent, "ORB") Manual(this, "MAN"),
Orbit(this, "ORB")
{}; {};
~FlightTasks() {}; ~FlightTasks() {};
src/lib/FlightTasks/tasks/FlightTaskManual.hpp
+6 -6
View File
@@ -49,12 +49,12 @@ class FlightTaskManual : public FlightTask
public: public:
FlightTaskManual(SuperBlock *parent, const char *name) : FlightTaskManual(SuperBlock *parent, const char *name) :
FlightTask(parent, name), FlightTask(parent, name),
_xy_vel_man_expo(nullptr, "MPC_XY_MAN_EXPO"), _xy_vel_man_expo(parent, "MPC_XY_MAN_EXPO", false),
_z_vel_man_expo(nullptr, "MPC_Z_MAN_EXPO"), _z_vel_man_expo(parent, "MPC_Z_MAN_EXPO", false),
_hold_dz(nullptr, "MPC_HOLD_DZ"), _hold_dz(parent, "MPC_HOLD_DZ", false),
_velocity_hor_manual(nullptr, "MPC_VEL_MANUAL"), _velocity_hor_manual(parent, "MPC_VEL_MANUAL", false),
_z_vel_max_up(nullptr, "MPC_Z_VEL_MAX_UP"), _z_vel_max_up(parent, "MPC_Z_VEL_MAX_UP", false),
_z_vel_max_down(nullptr, "MPC_Z_VEL_MAX_DN"), _z_vel_max_down(parent, "MPC_Z_VEL_MAX_DN", false),
_sub_control_state(ORB_ID(control_state), 0, 0, &getSubscriptions()) _sub_control_state(ORB_ID(control_state), 0, 0, &getSubscriptions())
{}; {};
virtual ~FlightTaskManual() {}; virtual ~FlightTaskManual() {};