diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-27 13:36:33 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-27 13:36:33 +0200 |
| commit | 049e448abf8d2cefc31ba5be6563a73f68f7887c (patch) | |
| tree | bb7960cb83d023823b7a2812cac2120e4b12782f /src/modules/navigator/mission.cpp | |
| parent | 19fad94a34da757002fe8d608c125a3afa57e091 (diff) | |
| parent | 3aab37e0e04ce98ddacd99e238e626ab5c3d4445 (diff) | |
| download | px4-firmware-049e448abf8d2cefc31ba5be6563a73f68f7887c.tar.gz px4-firmware-049e448abf8d2cefc31ba5be6563a73f68f7887c.tar.bz2 px4-firmware-049e448abf8d2cefc31ba5be6563a73f68f7887c.zip | |
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules/navigator/mission.cpp')
| -rw-r--r-- | src/modules/navigator/mission.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp index c09f61744..72255103b 100644 --- a/src/modules/navigator/mission.cpp +++ b/src/modules/navigator/mission.cpp @@ -58,8 +58,7 @@ #include "mission.h" Mission::Mission(Navigator *navigator, const char *name) : - NavigatorMode(navigator, name), - MissionBlock(navigator), + MissionBlock(navigator, name), _param_onboard_enabled(this, "ONBOARD_EN"), _onboard_mission({0}), _offboard_mission({0}), |