Commit ed1d28af authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #4242 from bkueng/fix_ulog_streaming

fix for MAVLinkLogManager
parents d662b4da 9a30008f
...@@ -223,7 +223,6 @@ MAVLinkLogProcessor::_writeUlogMessage(QByteArray& data) ...@@ -223,7 +223,6 @@ MAVLinkLogProcessor::_writeUlogMessage(QByteArray& data)
break; break;
_writeData(data.data(), message_length); _writeData(data.data(), message_length);
data.remove(0, message_length); data.remove(0, message_length);
return data;
} }
return data; return data;
} }
......
...@@ -2090,8 +2090,8 @@ Vehicle::_handleMavlinkLoggingData(mavlink_message_t& message) ...@@ -2090,8 +2090,8 @@ Vehicle::_handleMavlinkLoggingData(mavlink_message_t& message)
void void
Vehicle::_handleMavlinkLoggingDataAcked(mavlink_message_t& message) Vehicle::_handleMavlinkLoggingDataAcked(mavlink_message_t& message)
{ {
mavlink_logging_data_t log; mavlink_logging_data_acked_t log;
mavlink_msg_logging_data_decode(&message, &log); mavlink_msg_logging_data_acked_decode(&message, &log);
_ackMavlinkLogData(log.sequence); _ackMavlinkLogData(log.sequence);
emit mavlinkLogData(this, log.target_system, log.target_component, log.sequence, emit mavlinkLogData(this, log.target_system, log.target_component, log.sequence,
log.first_message_offset, QByteArray((const char*)log.data, log.length), true); log.first_message_offset, QByteArray((const char*)log.data, log.length), true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment