fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 06:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

ulog stream msgs: rename 'sequence' fields as they are protected names in fastrtpsgen

Browse Source
This commit is contained in:
TSC21
2019-10-14 16:37:17 +01:00
committed by Nuno Marques
parent 88a7e3df09
commit 10e3bcd138
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/log_writer_mavlink.cpp
+3 -3
View File
@@ -72,7 +72,7 @@ void LogWriterMavlink::start_log()
ulog_stream_ack_s ack;
orb_copy(ORB_ID(ulog_stream_ack), _ulog_stream_ack_sub, &ack);
_ulog_stream_data.sequence = 0;
_ulog_stream_data.msg_sequence = 0;
_ulog_stream_data.length = 0;
_ulog_stream_data.first_message_offset = 0;
@@ -160,7 +160,7 @@ int LogWriterMavlink::publish_message()
ulog_stream_ack_s ack;
orb_copy(ORB_ID(ulog_stream_ack), _ulog_stream_ack_sub, &ack);
if (ack.sequence == _ulog_stream_data.sequence) {
if (ack.msg_sequence == _ulog_stream_data.msg_sequence) {
got_ack = true;
}
@@ -178,7 +178,7 @@ int LogWriterMavlink::publish_message()
PX4_DEBUG("got ack in %i ms", (int)(hrt_elapsed_time(&started) / 1000));
}
_ulog_stream_data.sequence++;
_ulog_stream_data.msg_sequence++;
_ulog_stream_data.length = 0;
_ulog_stream_data.first_message_offset = 255;
return 0;