diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-02 15:15:26 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-02 15:15:26 +0200 |
| commit | 73d6121a9dbcd438f407edcd9b58bbb31bd94a42 (patch) | |
| tree | cd82ecf355e68b80db6403716b394737f45f5231 /src/modules/navigator | |
| parent | fdceb8b0620c347c9f7f477dbf295dcfff12012c (diff) | |
| parent | f428ebb04f0610c31639d8fe6d121f632c1cad1b (diff) | |
| download | px4-firmware-73d6121a9dbcd438f407edcd9b58bbb31bd94a42.tar.gz px4-firmware-73d6121a9dbcd438f407edcd9b58bbb31bd94a42.tar.bz2 px4-firmware-73d6121a9dbcd438f407edcd9b58bbb31bd94a42.zip | |
Merge branch 'master' into offboard2_merge
Conflicts:
src/modules/uORB/topics/rc_channels.h
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/mission_block.cpp | 4 | ||||
| -rw-r--r-- | src/modules/navigator/rtl.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index 9b8d3d9c7..26a573544 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> @@ -222,7 +224,7 @@ MissionBlock::set_loiter_item(struct position_setpoint_triplet_s *pos_sp_triplet } if (pos_sp_triplet->current.type != SETPOINT_TYPE_LOITER - || pos_sp_triplet->current.loiter_radius != _navigator->get_loiter_radius() + || (fabsf(pos_sp_triplet->current.loiter_radius - _navigator->get_loiter_radius()) > FLT_EPSILON) || pos_sp_triplet->current.loiter_direction != 1 || pos_sp_triplet->previous.valid || !pos_sp_triplet->current.valid diff --git a/src/modules/navigator/rtl.cpp b/src/modules/navigator/rtl.cpp index 043f773a4..597a2c0ec 100644 --- a/src/modules/navigator/rtl.cpp +++ b/src/modules/navigator/rtl.cpp @@ -227,7 +227,7 @@ RTL::set_rtl_item(position_setpoint_triplet_s *pos_sp_triplet) _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"); |