Skip to content

Commit

Permalink
mavlink_ulog: always update ulog_stream_acked uorb even check_for_upd…
Browse files Browse the repository at this point in the history
…ates not set

If update not called, it may lead to infinite loop in case check_for_updates
not set and there are new messages in ulog_stream_acked uorb.
  • Loading branch information
jnippula committed Jan 17, 2024
1 parent f42b0db commit 58c3799
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions src/modules/mavlink/mavlink_ulog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,31 +180,33 @@ int MavlinkULog::handle_update(mavlink_channel_t channel)
++_current_num_msgs;
}

if (check_for_updates && _ulog_stream_acked_sub.updated()) {
if (_ulog_stream_acked_sub.updated()) {
_ulog_stream_acked_sub.update();

const ulog_stream_s &ulog_data = _ulog_stream_acked_sub.get();
if (check_for_updates) {
const ulog_stream_s &ulog_data = _ulog_stream_acked_sub.get();

if (ulog_data.timestamp > 0) {
_sent_tries = 1;
_last_sent_time = hrt_absolute_time();
lock();
_wait_for_ack_sequence = ulog_data.msg_sequence;
_ack_received = false;
unlock();

mavlink_logging_data_acked_t msg;
msg.sequence = ulog_data.msg_sequence;
msg.length = ulog_data.length;
msg.first_message_offset = ulog_data.first_message_offset;
msg.target_system = _target_system;
msg.target_component = _target_component;
memcpy(msg.data, ulog_data.data, sizeof(msg.data));
mavlink_msg_logging_data_acked_send_struct(channel, &msg);
if (ulog_data.timestamp > 0) {
_sent_tries = 1;
_last_sent_time = hrt_absolute_time();
lock();
_wait_for_ack_sequence = ulog_data.msg_sequence;
_ack_received = false;
unlock();

}
mavlink_logging_data_acked_t msg;
msg.sequence = ulog_data.msg_sequence;
msg.length = ulog_data.length;
msg.first_message_offset = ulog_data.first_message_offset;
msg.target_system = _target_system;
msg.target_component = _target_component;
memcpy(msg.data, ulog_data.data, sizeof(msg.data));
mavlink_msg_logging_data_acked_send_struct(channel, &msg);

++_current_num_msgs;
}

++_current_num_msgs;
}
}
}

Expand Down

0 comments on commit 58c3799

Please sign in to comment.