diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 15:28:02 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 15:28:02 +0200 |
| commit | 904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e (patch) | |
| tree | 009971a34ecac4218edd58dd50820bb8c2b1cd3f /src/modules/navigator | |
| parent | 59775efaad782a1e4f5e346832407c71f1355c89 (diff) | |
| parent | 2389a11af1249f657d85d36a5e71db83940a7959 (diff) | |
| download | px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.tar.gz px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.tar.bz2 px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.zip | |
Merge branch 'master' into navigator_rewrite_drton
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/mission_block.cpp | 2 | ||||
| -rw-r--r-- | src/modules/navigator/rtl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index cbf7ac987..a1c6f09d0 100644 --- a/src/modules/navigator/mission_block.cpp +++ b/src/modules/navigator/mission_block.cpp @@ -42,6 +42,8 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> +#include <math.h> +#include <float.h> #include <systemlib/err.h> #include <geo/geo.h> diff --git a/src/modules/navigator/rtl.cpp b/src/modules/navigator/rtl.cpp index 6d7afcf4b..142a73409 100644 --- a/src/modules/navigator/rtl.cpp +++ b/src/modules/navigator/rtl.cpp @@ -222,7 +222,7 @@ RTL::set_rtl_item() _navigator->set_can_loiter_at_sp(true); if (autoland) { - mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: RTL: loiter %.1fs", _mission_item.time_inside); + mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: RTL: loiter %.1fs", (double)_mission_item.time_inside); } else { mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: RTL: completed, loiter"); |