diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 10:55:12 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 10:55:12 +0200 |
| commit | 3cebfd40453cc730c298d27790b9492a64f179e0 (patch) | |
| tree | d581550c02af9c682ff30a30645121073ae8befd /src/modules/navigator/mission.h | |
| parent | 70e5d4027a3b1465d5128dbf9a04cbb6545e043d (diff) | |
| parent | 63b7fac10cf4d43e3df7e692336be869a4c124cc (diff) | |
| download | px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.tar.gz px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.tar.bz2 px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.zip | |
Merge remote-tracking branch 'upstream/master' into takeoff_fix
Conflicts:
src/modules/navigator/mission.cpp
Diffstat (limited to 'src/modules/navigator/mission.h')
| -rw-r--r-- | src/modules/navigator/mission.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h index 4737be391..5164737f3 100644 --- a/src/modules/navigator/mission.h +++ b/src/modules/navigator/mission.h @@ -144,11 +144,6 @@ private: */ void report_mission_finished(); - /** - * Publish the mission result so commander and mavlink know what is going on - */ - void publish_mission_result(); - control::BlockParamInt _param_onboard_enabled; control::BlockParamFloat _param_takeoff_alt; control::BlockParamFloat _param_dist_1wp; @@ -162,9 +157,6 @@ private: bool _need_takeoff; /**< if true, then takeoff must be performed before going to the first waypoint (if needed) */ bool _takeoff; /**< takeoff state flag */ - orb_advert_t _mission_result_pub; - struct mission_result_s _mission_result; - enum { MISSION_TYPE_NONE, MISSION_TYPE_ONBOARD, |