diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 16:33:53 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 16:33:53 +0200 |
| commit | 3c5f35da73cb6c37cf45a06909631e13b762f76d (patch) | |
| tree | aff1847d980932553d7313aca8eec91bdf4009f7 /src/modules/navigator/mission_block.cpp | |
| parent | ff84fb2ac6b4c25feac9c82152c56e89e8ae29fb (diff) | |
| parent | ad4411bfc1894c8a9ca42f563f7bf8207b39e7c1 (diff) | |
| download | px4-firmware-3c5f35da73cb6c37cf45a06909631e13b762f76d.tar.gz px4-firmware-3c5f35da73cb6c37cf45a06909631e13b762f76d.tar.bz2 px4-firmware-3c5f35da73cb6c37cf45a06909631e13b762f76d.zip | |
Merge pull request #1100 from PX4/warning_fixes_v3
Warning fixes v3
Diffstat (limited to 'src/modules/navigator/mission_block.cpp')
| -rw-r--r-- | src/modules/navigator/mission_block.cpp | 4 |
1 files changed, 3 insertions, 1 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 |