diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-16 13:24:02 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-16 13:24:02 +0100 |
| commit | b596bf6aa56b2039b51a03ab11acf2d7d719195d (patch) | |
| tree | 39046abcf38b91789c03000a946b3aa07a9aa231 /src/modules/mavlink/mavlink_main.cpp | |
| parent | 875ba3bb2babc3787c068a9d2d7917b62bd3cce5 (diff) | |
| download | px4-firmware-b596bf6aa56b2039b51a03ab11acf2d7d719195d.tar.gz px4-firmware-b596bf6aa56b2039b51a03ab11acf2d7d719195d.tar.bz2 px4-firmware-b596bf6aa56b2039b51a03ab11acf2d7d719195d.zip | |
Mavlink: gotten rid of some warnings
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 38f753c39..42504dea9 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -52,7 +52,12 @@ #include <poll.h> #include <termios.h> #include <time.h> +#include <math.h> /* isinf / isnan checks */ + #include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/stat.h> + #include <drivers/device/device.h> #include <drivers/drv_hrt.h> #include <arch/board/board.h> @@ -64,6 +69,7 @@ #include <uORB/topics/parameter_update.h> #include <uORB/topics/mission.h> #include <uORB/topics/mission_result.h> + #include <systemlib/param/param.h> #include <systemlib/err.h> #include <systemlib/perf_counter.h> @@ -72,12 +78,10 @@ #include <dataman/dataman.h> #include <mathlib/mathlib.h> #include <mavlink/mavlink_log.h> -#include <sys/types.h> -#include <sys/stat.h> + #include <commander/px4_custom_mode.h> #include "mavlink_bridge_header.h" -#include "math.h" /* isinf / isnan checks */ #include "mavlink_main.h" #include "mavlink_orb_listener.h" #include "mavlink_receiver.h" @@ -156,9 +160,9 @@ namespace mavlink Mavlink::Mavlink() : device_name("/dev/ttyS1"), - _mavlink_fd(-1), - _next(nullptr), _task_should_exit(false), + _next(nullptr), + _mavlink_fd(-1), thread_running(false), _mavlink_task(-1), _mavlink_incoming_fd(-1), |