Simple support for multiplexed signals.

astand · astand · commit cf4ac2803744 · 2021-02-17T11:56:42.000+03:00
diff --git a/src/codegen/c-main-generator.cpp b/src/codegen/c-main-generator.cpp
@@ -322,6 +322,15 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi
     fwriter->AppendLine("  // " + std::regex_replace(sig.ValueText, std::regex("\n"), "\n  // "));
   }
 
+  if (sig.Multiplex == MultiplexType::kMulValue)
+  {
+    fwriter->AppendLine("  // multiplex variable");
+  }
+  else if (sig.Multiplex == MultiplexType::kMaster)
+  {
+    fwriter->AppendLine("  // MULTIPLEX master signal");
+  }
+
   std::string dtype = "";
 
   dtype += "  " + PrintType((int)sig.Type) + " " + sig.Name;
diff --git a/src/parser/dbclineparser.cpp b/src/parser/dbclineparser.cpp
@@ -153,11 +153,25 @@ bool DbcLineParser::ParseSignalLine(SignalDescriptor_t* sig, const std::string&
   // split middle part on dedicated values
   auto valpart = resplit(trim(tailpart[0]), kRegSigReceivers, -1);
 
-  halfs = resplit(halfs[0], kRegSigSplit0, -1);
+  halfs = resplit(halfs[0], kRegValTable, 0);
 
-  if (halfs.size() > 1)
+  if (halfs.size() >= 2)
   {
-    sig->Name = halfs[halfs.size() - 1];
+    sig->Name = halfs[1];
+    sig->Multiplex = MultiplexType::kNone;
+
+    if (halfs.size() == 3)
+    {
+      // Multiplex signal, put additional comment
+      if (halfs[2] == "M")
+      {
+        sig->Multiplex = MultiplexType::kMaster;
+      }
+      else
+      {
+        sig->Multiplex = MultiplexType::kMulValue;
+      }
+    }
   }
   else
   {
diff --git a/src/types/message.h b/src/types/message.h
@@ -13,6 +13,13 @@ enum class BitLayout
   kMotorolla
 };
 
+enum class MultiplexType
+{
+  kNone,
+  kMaster,
+  kMulValue
+};
+
 enum class SigType
 {
   i8 = 0,
@@ -77,6 +84,8 @@ typedef struct
 
   std::string ValueText;
 
+  MultiplexType Multiplex;
+
 } SignalDescriptor_t;
 
 typedef struct
