forked from Archive/PX4-Autopilot
navigator: use different param names for mission and RTL
This commit is contained in:
parent
93295861c5
commit
09e4cc605b
|
@ -57,8 +57,8 @@
|
|||
#include "mission.h"
|
||||
|
||||
|
||||
Mission::Mission(Navigator *navigator) :
|
||||
SuperBlock(NULL, "MIS"),
|
||||
Mission::Mission(Navigator *navigator, const char *name) :
|
||||
SuperBlock(NULL, name),
|
||||
_navigator(navigator),
|
||||
_first_run(true),
|
||||
_param_onboard_enabled(this, "ONBOARD_EN"),
|
||||
|
|
|
@ -64,7 +64,7 @@ public:
|
|||
/**
|
||||
* Constructor
|
||||
*/
|
||||
Mission(Navigator *navigator);
|
||||
Mission(Navigator *navigator, const char *name);
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
|
|
|
@ -121,9 +121,9 @@ Navigator::Navigator() :
|
|||
_geofence_violation_warning_sent(false),
|
||||
_fence_valid(false),
|
||||
_inside_fence(true),
|
||||
_mission(this),
|
||||
_mission(this, "MIS"),
|
||||
//_loiter(&_global_pos, &_home_pos, &_vstatus),
|
||||
_rtl(this),
|
||||
_rtl(this, "RTL"),
|
||||
_waypoint_position_reached(false),
|
||||
_waypoint_yaw_reached(false),
|
||||
_time_first_inside_orbit(0),
|
||||
|
|
|
@ -51,8 +51,8 @@
|
|||
|
||||
#include "rtl.h"
|
||||
|
||||
RTL::RTL(Navigator *navigator) :
|
||||
Mission(navigator),
|
||||
RTL::RTL(Navigator *navigator, const char *name) :
|
||||
Mission(navigator, name),
|
||||
_mavlink_fd(-1),
|
||||
_rtl_state(RTL_STATE_NONE),
|
||||
_home_position({}),
|
||||
|
|
|
@ -58,7 +58,7 @@ public:
|
|||
/**
|
||||
* Constructor
|
||||
*/
|
||||
RTL(Navigator *navigator);
|
||||
RTL(Navigator *navigator, const char *name);
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
|
|
Loading…
Reference in New Issue