diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-10 14:11:25 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-10 14:11:25 +0200 |
| commit | fc1669b0969890456f9151dd9719af87df62e69c (patch) | |
| tree | ceee6fa9a7642b4ef2b63921299c006987add5a8 /src/modules/navigator/mission.cpp | |
| parent | 9b2d444cc56eaaedcf271f200b93dcca94623209 (diff) | |
| parent | 58cae259e40a3dcab132f42348d57767fca600a1 (diff) | |
| download | px4-firmware-fc1669b0969890456f9151dd9719af87df62e69c.tar.gz px4-firmware-fc1669b0969890456f9151dd9719af87df62e69c.tar.bz2 px4-firmware-fc1669b0969890456f9151dd9719af87df62e69c.zip | |
Merge branch master into dataman_state_nav_rewrite
Diffstat (limited to 'src/modules/navigator/mission.cpp')
| -rw-r--r-- | src/modules/navigator/mission.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp index 06e915f27..eb8dcc717 100644 --- a/src/modules/navigator/mission.cpp +++ b/src/modules/navigator/mission.cpp @@ -66,6 +66,8 @@ Mission::Mission(Navigator *navigator, const char *name) : _offboard_mission({0}), _current_onboard_mission_index(-1), _current_offboard_mission_index(-1), + _need_takeoff(true), + _takeoff(false), _mission_result_pub(-1), _mission_result({0}), _mission_type(MISSION_TYPE_NONE), @@ -399,7 +401,7 @@ Mission::set_mission_items() takeoff_alt = fmaxf(takeoff_alt, _navigator->get_home_position()->alt + _param_takeoff_alt.get()); } - mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: takeoff to %.1fm above home", takeoff_alt - _navigator->get_home_position()->alt); + mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: takeoff to %.1fm above home", (double)(takeoff_alt - _navigator->get_home_position()->alt)); _mission_item.lat = _navigator->get_global_position()->lat; _mission_item.lon = _navigator->get_global_position()->lon; |