Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

mavlink_ulog: clear potential existing ulog_stream messages on start

Browse Source 
- the uorb behavior got recently changed so that we now need to clear
  any potential existing messages when we start log streaming.
- ulog_stream_ack should also not use a queue, since the ack is done
  synchonous between mavlink and the logger.
This commit is contained in:
Beat Küng
2018-08-08 13:52:00 +02:00
parent a936dc291e
commit 5f8c08db79
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_ulog.cpp
+10 -1
View File
@@ -60,6 +60,15 @@ MavlinkULog::MavlinkULog(int datarate, float max_rate_factor, uint8_t target_sys
if (_ulog_stream_sub < 0) { if (_ulog_stream_sub < 0) {
PX4_ERR("orb_subscribe failed (%i)", errno); PX4_ERR("orb_subscribe failed (%i)", errno);
} else {
// make sure we won't read any old messages
struct ulog_stream_s stream_msg;
bool update;
while (orb_check(_ulog_stream_sub, &update) == 0 && update) {
orb_copy(ORB_ID(ulog_stream), _ulog_stream_sub, &stream_msg);
}
} }
_waiting_for_initial_ack = true; _waiting_for_initial_ack = true;
@@ -264,7 +273,7 @@ void MavlinkULog::publish_ack(uint16_t sequence)
ack.sequence = sequence; ack.sequence = sequence;
if (_ulog_stream_ack_pub == nullptr) { if (_ulog_stream_ack_pub == nullptr) {
_ulog_stream_ack_pub = orb_advertise_queue(ORB_ID(ulog_stream_ack), &ack, 3); _ulog_stream_ack_pub = orb_advertise(ORB_ID(ulog_stream_ack), &ack);
} else { } else {
orb_publish(ORB_ID(ulog_stream_ack), _ulog_stream_ack_pub, &ack); orb_publish(ORB_ID(ulog_stream_ack), _ulog_stream_ack_pub, &ack);