Added Checksum signal detection.

astand · astand · commit e56d43c7430b · 2021-02-03T18:53:19.000+03:00
diff --git a/src/codegen/fs-creator.cpp b/src/codegen/fs-creator.cpp
@@ -120,6 +120,8 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool
     snprintf(_tmpb, kTmpLen, "%s_AUTO_ROLL", FS.DRVNAME.c_str());
     FS.useroll_def = _tmpb;
 
+    snprintf(_tmpb, kTmpLen, "%s_AUTO_CSM", FS.DRVNAME.c_str());
+    FS.usecsm_def = _tmpb;
   }
 
   return ret;
diff --git a/src/codegen/fs-creator.h b/src/codegen/fs-creator.h
@@ -27,6 +27,7 @@ typedef struct
   std::string usemon_def;
   std::string usesigfloat_def;
   std::string useroll_def;
+  std::string usecsm_def;
 
 } FsDescriptor_t;
 
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -144,6 +144,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
           {
             if (cmmnt.SigName == msg->Signals[i].Name)
             {
+              SignalDescriptor_t& sig = msg->Signals[i];
               // signal has been found, update commnet text
               msg->Signals[i].CommentText = cmmnt.Text;
 
@@ -153,6 +154,38 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
                 // set the RollSig to generate necessary code
                 msg->RollSig = &msg->Signals[i];
               }
+
+              extern std::vector<std::string> resplit(const std::string & s, const std::string & rgx_str);
+
+              size_t openpos = cmmnt.Text.find('<');
+
+              if (openpos != std::string::npos)
+              {
+                size_t closepos = cmmnt.Text.find('>', openpos);
+
+                if ((closepos != std::string::npos) && (closepos > (openpos + 1)))
+                {
+                  auto substr = cmmnt.Text.substr(openpos + 1, closepos - 1);
+
+                  auto meta = resplit(substr, "(\:)");
+
+                  if (meta.size() == 3 && meta[0] == "Checksum")
+                  {
+                    // the signal can be CSM, but additional settings must be
+                    // checked: size, boundary, signal type
+                    bool boundary_ok = (sig.Order == BitLayout::kIntel) ?
+                                       ((sig.StartBit / 8) == ((sig.StartBit + sig.LengthBit - 1) / 8)) :
+                                       ((sig.StartBit / 8) == ((sig.StartBit - sig.LengthBit + 1) / 8));
+
+                    if (sig.IsSimpleSig && boundary_ok && sig.Signed == false)
+                    {
+                      msg->CsmSig = &sig;
+                      msg->CsmMethod = meta[1];
+                      msg->CsmOp = atoi(meta[2].c_str());
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -252,4 +285,7 @@ void DbcScanner::SetDefualtMessage(MessageDescriptor_t* message)
   message->Transmitter = "";
   message->hasPhys = false;
   message->RollSig = nullptr;
+  message->CsmSig = nullptr;
+  message->CsmMethod = "";
+  message->CsmOp = 0;
 }
diff --git a/src/types/message.h b/src/types/message.h
@@ -112,6 +112,15 @@ typedef struct
   // pointer to rolling counter signal
   SignalDescriptor_t* RollSig;
 
+  // pointer to checksum signal
+  SignalDescriptor_t* CsmSig;
+
+  // keeps the method or crc algorythm (will be passed to CRC calc function)
+  std::string CsmMethod;
+
+  // option value (will be passed to CRC calc function)
+  uint32_t CsmOp;
+
   // Message comment
   std::string CommentText;
 

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool`
`120`	`120`	`snprintf(_tmpb, kTmpLen, "%s_AUTO_ROLL", FS.DRVNAME.c_str());`
`121`	`121`	`FS.useroll_def = _tmpb;`
`122`	`122`
	`123`	`+ snprintf(_tmpb, kTmpLen, "%s_AUTO_CSM", FS.DRVNAME.c_str());`
	`124`	`+ FS.usecsm_def = _tmpb;`
`123`	`125`	`}`
`124`	`126`
`125`	`127`	`return ret;`