diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 07:32:36 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 07:32:36 +0200 |
commit | 512584ed750d58e2f87c509ebe7f4cf36984ac3d (patch) | |
tree | 232e9b26a3014f777f0926ceeb76f0954a66f208 /src/modules/navigator/mission.cpp | |
parent | 103b129f0d48bf84b6161a4b55cb8dd649b8c903 (diff) | |
parent | 680ebf29c3f8298e63d4c4d9c9076464e6f4b3c1 (diff) | |
download | px4-firmware-512584ed750d58e2f87c509ebe7f4cf36984ac3d.tar.gz px4-firmware-512584ed750d58e2f87c509ebe7f4cf36984ac3d.tar.bz2 px4-firmware-512584ed750d58e2f87c509ebe7f4cf36984ac3d.zip |
Merge pull request #1145 from DonLakeFlyer/MoreWarnings
Fix compiler warnings
Diffstat (limited to 'src/modules/navigator/mission.cpp')
-rw-r--r-- | src/modules/navigator/mission.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp index cf6a764bf..d39ca6cf9 100644 --- a/src/modules/navigator/mission.cpp +++ b/src/modules/navigator/mission.cpp @@ -65,11 +65,11 @@ 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), - _need_takeoff(true), - _takeoff(false) + _mission_type(MISSION_TYPE_NONE) { /* load initial params */ updateParams(); @@ -334,7 +334,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; |