diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-12 12:35:35 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-12 12:35:35 +0200 |
| commit | 3f1f015fe0998618318c196dc15e245bd4c05675 (patch) | |
| tree | fe05d99620e006b623555eaed953a9327b08c2d1 /src/modules/mavlink/mavlink_main.h | |
| parent | bf41d11fa4b13f27135363b5d6bc4a7555241d90 (diff) | |
| parent | 44481e3773b7a576b31727c64931216112d953e0 (diff) | |
| download | px4-firmware-3f1f015fe0998618318c196dc15e245bd4c05675.tar.gz px4-firmware-3f1f015fe0998618318c196dc15e245bd4c05675.tar.bz2 px4-firmware-3f1f015fe0998618318c196dc15e245bd4c05675.zip | |
Merge branch 'mavlink_stack' into dataman_state
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index e31bbbb31..61fd7afe2 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -280,11 +280,16 @@ private: int size; char *data; }; - mavlink_message_buffer _message_buffer; + mavlink_message_buffer _message_buffer; - pthread_mutex_t _message_buffer_mutex; + 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; + param_t _param_system_type; + param_t _param_use_hil_gps; /** * Send one parameter. |