diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-17 09:13:00 +0200 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-17 09:13:00 +0200 |
commit | 8bb1f9a4bf3fae0cf8db9a598b4fb1036a9514dd (patch) | |
tree | 88f778c5464aab1c5d9770515acd8fb46b388b42 /src/modules/mavlink/mavlink_main.cpp | |
parent | f4608707389dbc30eb25db524d6e008c8033d052 (diff) | |
parent | 23c82c2dd809aa9a7f5664bfcfe6c7b6576efb64 (diff) | |
download | px4-firmware-8bb1f9a4bf3fae0cf8db9a598b4fb1036a9514dd.tar.gz px4-firmware-8bb1f9a4bf3fae0cf8db9a598b4fb1036a9514dd.tar.bz2 px4-firmware-8bb1f9a4bf3fae0cf8db9a598b4fb1036a9514dd.zip |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
-rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 7707c0bc8..75799804c 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -216,6 +216,7 @@ Mavlink::Mavlink() : _device_name(DEFAULT_DEVICE_NAME), _task_should_exit(false), next(nullptr), + _instance_id(0), _mavlink_fd(-1), _task_running(false), _hil_enabled(false), @@ -231,17 +232,24 @@ Mavlink::Mavlink() : _mission_pub(-1), _mission_result_sub(-1), _mode(MAVLINK_MODE_NORMAL), + _channel(MAVLINK_COMM_0), + _logbuffer{}, _total_counter(0), + _receive_thread{}, _verbose(false), _forwarding_on(false), _passing_on(false), _ftp_on(false), _uart_fd(-1), + _baudrate(57600), + _datarate(10000), _mavlink_param_queue_index(0), + mavlink_link_termination_allowed(false), _subscribe_to_stream(nullptr), _subscribe_to_stream_rate(0.0f), _flow_control_enabled(true), - _message_buffer({}), + _message_buffer{}, + _message_buffer_mutex{}, _param_initialized(false), _param_system_id(0), _param_component_id(0), |