mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-22 05:43:33 +08:00
navigator: use different param names for mission and RTL
This commit is contained in:
@@ -57,8 +57,8 @@
|
|||||||
#include "mission.h"
|
#include "mission.h"
|
||||||
|
|
||||||
|
|
||||||
Mission::Mission(Navigator *navigator) :
|
Mission::Mission(Navigator *navigator, const char *name) :
|
||||||
SuperBlock(NULL, "MIS"),
|
SuperBlock(NULL, name),
|
||||||
_navigator(navigator),
|
_navigator(navigator),
|
||||||
_first_run(true),
|
_first_run(true),
|
||||||
_param_onboard_enabled(this, "ONBOARD_EN"),
|
_param_onboard_enabled(this, "ONBOARD_EN"),
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
Mission(Navigator *navigator);
|
Mission(Navigator *navigator, const char *name);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destructor
|
* Destructor
|
||||||
|
|||||||
@@ -121,9 +121,9 @@ Navigator::Navigator() :
|
|||||||
_geofence_violation_warning_sent(false),
|
_geofence_violation_warning_sent(false),
|
||||||
_fence_valid(false),
|
_fence_valid(false),
|
||||||
_inside_fence(true),
|
_inside_fence(true),
|
||||||
_mission(this),
|
_mission(this, "MIS"),
|
||||||
//_loiter(&_global_pos, &_home_pos, &_vstatus),
|
//_loiter(&_global_pos, &_home_pos, &_vstatus),
|
||||||
_rtl(this),
|
_rtl(this, "RTL"),
|
||||||
_waypoint_position_reached(false),
|
_waypoint_position_reached(false),
|
||||||
_waypoint_yaw_reached(false),
|
_waypoint_yaw_reached(false),
|
||||||
_time_first_inside_orbit(0),
|
_time_first_inside_orbit(0),
|
||||||
|
|||||||
@@ -51,8 +51,8 @@
|
|||||||
|
|
||||||
#include "rtl.h"
|
#include "rtl.h"
|
||||||
|
|
||||||
RTL::RTL(Navigator *navigator) :
|
RTL::RTL(Navigator *navigator, const char *name) :
|
||||||
Mission(navigator),
|
Mission(navigator, name),
|
||||||
_mavlink_fd(-1),
|
_mavlink_fd(-1),
|
||||||
_rtl_state(RTL_STATE_NONE),
|
_rtl_state(RTL_STATE_NONE),
|
||||||
_home_position({}),
|
_home_position({}),
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
RTL(Navigator *navigator);
|
RTL(Navigator *navigator, const char *name);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destructor
|
* Destructor
|
||||||
|
|||||||
Reference in New Issue
Block a user