Fixed composite channel "CAN_RemoteFrame.DLC" missing.

ihedvall · Mar 8, 2024 · f538c20 · f538c20
1 parent f0ded04
commit f538c20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/mdflib/src/mdfwriter.cpp b/mdflib/src/mdfwriter.cpp
@@ -763,7 +763,7 @@ void MdfWriter::CreateCanRemoteFrameChannel(IChannelGroup& group) const {
   CreateBitChannel(*cn_remote_frame,"CAN_RemoteFrame.IDE", 8 + 3, 7);
 
   auto* frame_dlc = cn_remote_frame->CreateChannelComposition(
-      "CAN_DataFrame.DLC");
+      "CAN_RemoteFrame.DLC");
   if (frame_dlc != nullptr) {
     frame_dlc->Type(ChannelType::FixedLength);
     frame_dlc->Sync(ChannelSyncType::None);

diff --git a/mdflib_test/src/testwrite.cpp b/mdflib_test/src/testwrite.cpp
@@ -8,6 +8,7 @@
 #include <filesystem>
 #include <string>
 #include <thread>
+#include <set>
 
 #include "util/logconfig.h"
 #include "util/logstream.h"
@@ -2419,9 +2420,19 @@ TEST_F(TestWrite, Mdf4MlsdCanConfig) {
   }
   reader.Close();
 
+  std::set<std::string> unique_list;
+
   for (auto& observer : observer_list) {
     ASSERT_TRUE(observer);
     EXPECT_EQ(observer->NofSamples(), 100'000);
+
+    // Verify that the CAN_RemoteFrame.DLC exist
+    const auto name = observer->Name();
+    if (unique_list.find(name) == unique_list.cend()) {
+      unique_list.emplace(name);
+    } else if (name != "t")  {
+      EXPECT_TRUE(false) << "Duplicate: " << name;
+    }
   }
 
 }