fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-17 19:17:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

logger: fix multiple format definitions for multi-instance topics

Browse Source 
With https://github.com/PX4/Firmware/pull/12123 all multi-instance topics
lead to repeated format definitions in the ULog file.
This commit is contained in:
Beat Küng
2019-08-21 16:16:22 +02:00
committed by Daniel Agar
parent 5c68880b56
commit 7f6a9e587f
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/logger.cpp
+8 -10
View File
@@ -1693,6 +1693,13 @@ void Logger::write_format(LogType type, const orb_metadata &meta, WrittenFormats
return;
}
// check if we already wrote the format
for (const auto &written_format : written_formats) {
if (written_format == &meta) {
return;
}
}
// Write the current format (we don't need to check if we already added it to written_formats)
int format_len = snprintf(msg.format, sizeof(msg.format), "%s:%s", meta.o_name, meta.o_fields);
size_t msg_size = sizeof(msg) - sizeof(msg.format) + format_len;
@@ -1764,17 +1771,8 @@ void Logger::write_format(LogType type, const orb_metadata &meta, WrittenFormats
}
if (found_topic) {
// check if we already wrote the format
for (const auto &written_format : written_formats) {
if (written_format == found_topic) {
found_topic = nullptr;
break;
}
}
if (found_topic) {
write_format(type, *found_topic, written_formats, msg, level + 1);
}
write_format(type, *found_topic, written_formats, msg, level + 1);
} else {
PX4_ERR("No definition for topic %s found", fmt);