diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-10 17:08:23 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-10 17:08:23 +0200 |
| commit | e57579fa21ce9be189475e41fbcdb961d7cd32d2 (patch) | |
| tree | 50478ac1b4920ad445abc155fdf1ae1626d6e04d /src/modules/mavlink | |
| parent | bc602ff1e2c2ab6c08a7d5edf0b1f03308e011f8 (diff) | |
| download | px4-firmware-e57579fa21ce9be189475e41fbcdb961d7cd32d2.tar.gz px4-firmware-e57579fa21ce9be189475e41fbcdb961d7cd32d2.tar.bz2 px4-firmware-e57579fa21ce9be189475e41fbcdb961d7cd32d2.zip | |
mavlink, navigator: compile errors/warnings fixed
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 4 | ||||
| -rw-r--r-- | src/modules/mavlink/mavlink_mission.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 5c7eefa98..0d685c3d8 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -226,8 +226,9 @@ Mavlink::Mavlink() : _main_loop_delay(1000), _subscriptions(nullptr), _streams(nullptr), - _mission_result_sub(-1), + _mission_manager(nullptr), _mission_pub(-1), + _mission_result_sub(-1), _mode(MAVLINK_MODE_NORMAL), _total_counter(0), _verbose(false), @@ -245,7 +246,6 @@ Mavlink::Mavlink() : _param_component_id(0), _param_system_type(0), _param_use_hil_gps(0), - _mission_manager(nullptr), /* performance counters */ _loop_perf(perf_alloc(PC_ELAPSED, "mavlink_el")), diff --git a/src/modules/mavlink/mavlink_mission.cpp b/src/modules/mavlink/mavlink_mission.cpp index 0dda2337e..ca01344d4 100644 --- a/src/modules/mavlink/mavlink_mission.cpp +++ b/src/modules/mavlink/mavlink_mission.cpp @@ -69,9 +69,9 @@ MavlinkMissionManager::MavlinkMissionManager(Mavlink *mavlink) : _action_timeout(MAVLINK_MISSION_PROTOCOL_TIMEOUT_DEFAULT), _retry_timeout(MAVLINK_MISSION_RETRY_TIMEOUT_DEFAULT), _max_count(DM_KEY_WAYPOINTS_OFFBOARD_0_MAX), + _dataman_id(0), _count(0), _current_seq(0), - _dataman_id(0), _transfer_dataman_id(0), _transfer_count(0), _transfer_seq(0), |