diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-10 15:12:09 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-10 15:12:09 +0200 |
| commit | fb4bcf87ba036a2791f303deee8eeda4174bad61 (patch) | |
| tree | 45df857bb35d4b6a2f044bb1d1f24be035ccfa20 /src/modules/mavlink/mavlink_main.h | |
| parent | 7bfcaafc1631cab603191777e2e63f69755e334d (diff) | |
| parent | 92766a8626fdf143e46159d9a7e367ade6ae4376 (diff) | |
| download | px4-firmware-fb4bcf87ba036a2791f303deee8eeda4174bad61.tar.gz px4-firmware-fb4bcf87ba036a2791f303deee8eeda4174bad61.tar.bz2 px4-firmware-fb4bcf87ba036a2791f303deee8eeda4174bad61.zip | |
Merge branch 'master' into mavlink_stack
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 1f0445cb6..85a88442c 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -93,6 +93,7 @@ struct mavlink_wpm_storage { uint8_t current_partner_compid; uint64_t timestamp_lastaction; uint64_t timestamp_last_send_setpoint; + uint64_t timestamp_last_send_request; uint32_t timeout; int current_dataman_id; }; @@ -221,8 +222,6 @@ private: int _mavlink_fd; bool _task_running; - perf_counter_t _loop_perf; /**< loop performance counter */ - /* states */ bool _hil_enabled; /**< Hardware In the Loop mode */ bool _use_hil_gps; /**< Accept GPS HIL messages (for example from an external motion capturing system to fake indoor gps) */ @@ -282,6 +281,7 @@ private: pthread_mutex_t _message_buffer_mutex; + perf_counter_t _loop_perf; /**< loop performance counter */ bool _param_initialized; param_t _param_system_id; param_t _param_component_id; |