diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-04 15:16:20 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-04 15:16:20 +0200 |
| commit | 09e4cc605ba898c8fc2d92c105ec511ffcb6781d (patch) | |
| tree | b48043207fa9e756aa9ea8574f0c6bd777db9b7f /src | |
| parent | 93295861c532595e080ae61c32d5e2cb625b4eac (diff) | |
| download | px4-firmware-09e4cc605ba898c8fc2d92c105ec511ffcb6781d.tar.gz px4-firmware-09e4cc605ba898c8fc2d92c105ec511ffcb6781d.tar.bz2 px4-firmware-09e4cc605ba898c8fc2d92c105ec511ffcb6781d.zip | |
navigator: use different param names for mission and RTL
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/navigator/mission.cpp | 4 | ||||
| -rw-r--r-- | src/modules/navigator/mission.h | 2 | ||||
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 4 | ||||
| -rw-r--r-- | src/modules/navigator/rtl.cpp | 4 | ||||
| -rw-r--r-- | src/modules/navigator/rtl.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp index 38badcff9..879e5b618 100644 --- a/src/modules/navigator/mission.cpp +++ b/src/modules/navigator/mission.cpp @@ -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"), diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h index f75c8a882..a9ef71606 100644 --- a/src/modules/navigator/mission.h +++ b/src/modules/navigator/mission.h @@ -64,7 +64,7 @@ public: /** * Constructor */ - Mission(Navigator *navigator); + Mission(Navigator *navigator, const char *name); /** * Destructor diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index b7dfec047..e166058b9 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -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), diff --git a/src/modules/navigator/rtl.cpp b/src/modules/navigator/rtl.cpp index 9d7886aa6..10499085b 100644 --- a/src/modules/navigator/rtl.cpp +++ b/src/modules/navigator/rtl.cpp @@ -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({}), diff --git a/src/modules/navigator/rtl.h b/src/modules/navigator/rtl.h index 60336d5d0..a3a819403 100644 --- a/src/modules/navigator/rtl.h +++ b/src/modules/navigator/rtl.h @@ -58,7 +58,7 @@ public: /** * Constructor */ - RTL(Navigator *navigator); + RTL(Navigator *navigator, const char *name); /** * Destructor |