Added command line option to turn on or off the code generation based on multiplexor master signal values for multiplexed signals.

By default it is off so this new code has no affect.

Author: calumroy

src/app.cpp

@@ -145,7 +145,7 @@ void CoderApp::GenerateCode()
 
   if (ret)
   {
-    cigen.Generate(scanner.dblist, fscreator.FS);
+    cigen.Generate(scanner.dblist, fscreator.FS, Params.is_multiplex_enabled);
   }
   else
   {
@@ -283,8 +283,8 @@ void CoderApp::PrintHelp()
   std::cout << "   -nofmon:\t no ***-fmon.c generation" << std::endl;
   std::cout << std::endl;
   std::cout << "   -driverdir\t the output path (-out) will be appended by driver name" << std::endl;
-  std::cout << "   -gendate\t the generation date will be included in the header comment section of the source file." <<
-    std::endl;
+  std::cout << "   -gendate\t the generation date will be included in the header comment section of the source file." << std::endl;
+  std::cout << "   -multiplex or -muxgen\t enable multiplex signal packing/unpacking code generation based on multiplexor master signal values for multiplexed signals." << std::endl;
   std::cout << std::endl;
 
   std::cout << "examples:" << std::endl;
@@ -295,10 +295,7 @@ void CoderApp::PrintHelp()
     << std::endl;
   std::cout << "./dbccoder -dbc /home/user/docs/driveshaft.dbc -out /home/user/docs/gen/ -drvname drivedb -nodeutils -rw"
     << std::endl;
-
-  std::cout <<
-    "./dbccoder -dbc /home/user/docs/driveshaft.dbc -out /home/user/docs/gen/ -drvname drivedb -nodeutils" << std::endl;
-
+  std::cout << "./dbccoder -dbc /home/user/docs/driveshaft.dbc -out /home/user/docs/gen/ -drvname drivedb -nodeutils" << std::endl;
   std::cout << "./dbccoder -dbc /home/user/docs/driveshaft.dbc -out /home/user/docs/gen/ -drvname drivedb" << std::endl;
   std::cout << std::endl;
 }

src/codegen/c-main-generator.cpp

@@ -31,8 +31,11 @@ const char* extend_func_body =
   "  return ((val ^ m) - m);\n"
   "}\n\n";
 
-void CiMainGenerator::Generate(DbcMessageList_t& dlist, const AppSettings_t& fsd)
+void CiMainGenerator::Generate(DbcMessageList_t& dlist, const AppSettings_t& fsd, bool mux_enabled)
 {
+  // set multiplexor master signal values is enabled for multiplexed signals
+  is_multiplex_enabled = mux_enabled;
+
   // Load income messages to sig printer
   sigprt.LoadMessages(dlist.msgs);
 
@@ -714,13 +717,15 @@ void CiMainGenerator::WriteUnpackBody(const CiExpr_t* sgs)
 
     // Check if the signal is multiplexed
     bool isMultiplexed = (signal.Multiplex == MultiplexType::kMulValue);
-    if (isMultiplexed)
+
+    // Generate the if statement only if multiplex is enabled
+    if (is_multiplex_enabled && isMultiplexed)
     {
       fwriter.Append("  if (_m->%s == %d) {", masterSignal->Name.c_str(), signal.MultiplexValue);
     }
 
     // Set the indentation level based on whether the signal is multiplexed
-    const char* indent = isMultiplexed ? "    " : "  ";
+    const char* indent = (is_multiplex_enabled && isMultiplexed) ? "    " : "  ";
 
     // Unpack the signal
     if (signal.Signed)
@@ -757,8 +762,8 @@ void CiMainGenerator::WriteUnpackBody(const CiExpr_t* sgs)
       fwriter.Append("");
     }
 
-    // Close the if statement if the signal was multiplexed
-    if (isMultiplexed)
+    // Close the if statement if the signal was multiplexed and if multiplexing is enabled
+    if (is_multiplex_enabled && isMultiplexed)
     {
       fwriter.Append("  }");
     }
@@ -811,6 +816,7 @@ void CiMainGenerator::WriteUnpackBody(const CiExpr_t* sgs)
   fwriter.Append("  return %s_CANID;", sgs->msg.Name.c_str());
 }
 
+
 void CiMainGenerator::WritePackStructBody(const CiExpr_t* sgs)
 {
   fwriter.Append("{");
@@ -836,7 +842,7 @@ void CiMainGenerator::WritePackArrayBody(const CiExpr_t* sgs)
 
 void CiMainGenerator::PrintPackCommonText(const std::string& arrtxt, const CiExpr_t* sgs)
 {
-  // this function will print body of packing function
+  // this function will print the body of the packing function
 
   // print array content clearing loop
   fwriter.Append("  uint8_t i; for (i = 0u; i < %s(%s_DLC); %s[i++] = %s);",
@@ -900,8 +906,7 @@ void CiMainGenerator::PrintPackCommonText(const std::string& arrtxt, const CiExp
   // Generate packing code for each byte in the CAN message
   for (size_t i = 0; i < sgs->to_bytes.size(); i++)
   {
-
-    if (masterSignal)
+    if (is_multiplex_enabled && masterSignal)
     {
       bool first = true;
       // Handle the case where only a master multiplexor signal exists and there are no other kMulValue signal types in the CAN msg.
@@ -949,7 +954,8 @@ void CiMainGenerator::PrintPackCommonText(const std::string& arrtxt, const CiExp
     }
     else 
     {
-      // Handle for when there is no master multiplexor signal. Just pack the signal values from all signals making up this byte.
+      // Handle for when there is no master multiplexor signal or when multiplexing is disabled.
+      // Just pack the signal values from all signals making up this byte.
       if ( !sgs->to_bytes[i].empty() )
       {
         fwriter.Append("  %s[%d] |= (uint8_t) ( %s );", arrtxt.c_str(), i, sgs->to_bytes[i].c_str());

src/codegen/c-main-generator.h

@@ -10,7 +10,7 @@
 
 class CiMainGenerator {
  public:
-  void Generate(DbcMessageList_t& dlist, const AppSettings_t& fsd);
+  void Generate(DbcMessageList_t& dlist, const AppSettings_t& fsd, bool mux_enabled);
 
  private:
 
@@ -39,4 +39,6 @@ class CiMainGenerator {
   // Macro for frame DLC validation
   std::string prt_dlcValidateMacroName;
   const AppSettings_t* fdesc;
+  // Bool to turn on or off code generation based on multiplexor master signal values is enabled for multiplexed signals.
+  bool is_multiplex_enabled;
 };

src/options-parser.cpp

@@ -86,6 +86,10 @@ OptionsParser::GenOptions OptionsParser::GetOptions(int argc, char** argv)
     {
       retpairs.add_gen_date = true;
     }
+    else if (temppairs[i].first.compare("-multiplex") == 0 || temppairs[i].first.compare("-muxgen") == 0)
+    {
+      retpairs.is_multiplex_enabled = true;
+    }
   }
 
   return retpairs;

src/options-parser.h

@@ -48,6 +48,9 @@ class OptionsParser {
 
     /// @brief help is requested
     bool is_help{false};
+
+    /// @brief Code generation based on multiplexor master signal values is enabled for multiplexed signals. 
+    bool is_multiplex_enabled{false};
   };
 
   /// @brief Parses arguments and theirs optional values