Added auto rolling handling code.

astand · astand · commit d7fdcafbd321 · 2021-02-03T17:00:50.000+03:00
diff --git a/src/codegen/c-main-generator.cpp b/src/codegen/c-main-generator.cpp
@@ -126,13 +126,30 @@ void CiMainGenerator::Gen_MainHeader()
     // Write section for bitfielded part
     fwriter->AppendLine(PrintF("#ifdef %s", fdesc->usebits_def.c_str()), 2);
 
+    SignalDescriptor_t rollsig;
+
+    if (m.RollSig != nullptr)
+    {
+      // rolling counter is detected
+      rollsig = (*m.RollSig);
+      rollsig.CommentText = "";
+      rollsig.Name += "_expt";
+    }
+
     for (size_t signum = 0; signum < m.Signals.size(); signum++)
     {
       SignalDescriptor_t& sig = m.Signals[signum];
       // Write bit-fielded part
       WriteSigStructField(sig, true, max_sig_name_len);
     }
 
+    if (m.RollSig != nullptr)
+    {
+      fwriter->AppendLine(PrintF("#ifdef %s", fdesc->useroll_def.c_str()), 2);
+      WriteSigStructField(rollsig, true, max_sig_name_len);
+      fwriter->AppendLine(PrintF("#endif // %s", fdesc->useroll_def.c_str()), 2);
+    }
+
     // Write clean part
     fwriter->AppendLine("#else", 2);
 
@@ -143,6 +160,13 @@ void CiMainGenerator::Gen_MainHeader()
       WriteSigStructField(sig, false, max_sig_name_len);
     }
 
+    if (m.RollSig != nullptr)
+    {
+      fwriter->AppendLine(PrintF("#ifdef %s", fdesc->useroll_def.c_str()), 2);
+      WriteSigStructField(rollsig, false, max_sig_name_len);
+      fwriter->AppendLine(PrintF("#endif // %s", fdesc->useroll_def.c_str()), 2);
+    }
+
     fwriter->AppendLine(PrintF("#endif // %s", fdesc->usebits_def.c_str()), 2);
 
     // start mon1 section
@@ -422,16 +446,22 @@ void CiMainGenerator::WriteUnpackBody(const CiExpr_t* sgs)
 
   fwriter->AppendLine("  // check DLC correctness");
   fwriter->AppendLine(PrintF("  _m->mon1.dlc_error = (dlc_ < %s_DLC);", sgs->msg.Name.c_str()));
-
-
-  // TODO: put CRC and ROLLING COUNTER tests here
-  // 1
-  // 2
-
-
   fwriter->AppendLine("  _m->mon1.last_cycle = GetSysTick();");
   fwriter->AppendLine("  _m->mon1.frame_cnt++;", 2);
 
+  if (sgs->msg.RollSig != nullptr)
+  {
+    // Put rolling monitor here
+    fwriter->AppendLine(PrintF("#ifdef %s", fdesc->useroll_def.c_str()), 2);
+    fwriter->AppendLine(PrintF("  _m->mon1.roll_error = (_m->%s != _m->%s_expt);",
+                               sgs->msg.RollSig->Name.c_str(), sgs->msg.RollSig->Name.c_str()));
+    fwriter->AppendLine(PrintF("  _m->%s_expt = (_m->%s + 1) & (0x%02XU);", sgs->msg.RollSig->Name.c_str(),
+                               sgs->msg.RollSig->Name.c_str(), (1 << sgs->msg.RollSig->LengthBit) - 1), 2);
+    // Put rolling monitor here
+    fwriter->AppendLine(PrintF("#ifdef // %s", fdesc->useroll_def.c_str()), 2);
+  }
+
+
   auto Fmon_func = "FMon_" + sgs->msg.Name + "_" + fdesc->drvname;
 
   fwriter->AppendLine(PrintF("  %s(&_m->mon1);", Fmon_func.c_str()));
diff --git a/src/codegen/fs-creator.cpp b/src/codegen/fs-creator.cpp
@@ -116,6 +116,10 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool
 
     snprintf(_tmpb, kTmpLen, "%s_USE_CANSTRUCT", FS.DRVNAME.c_str());
     FS.usesruct_def = _tmpb;
+
+    snprintf(_tmpb, kTmpLen, "%s_AUTO_ROLL", FS.DRVNAME.c_str());
+    FS.useroll_def = _tmpb;
+
   }
 
   return ret;
diff --git a/src/codegen/fs-creator.h b/src/codegen/fs-creator.h
@@ -26,6 +26,7 @@ typedef struct
   std::string usesruct_def;
   std::string usemon_def;
   std::string usesigfloat_def;
+  std::string useroll_def;
 
 } FsDescriptor_t;
 
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -146,6 +146,13 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
             {
               // signal has been found, update commnet text
               msg->Signals[i].CommentText = cmmnt.Text;
+
+              // 1 test if signal is rolling
+              if (cmmnt.Text.find("<RollingCounter>") != std::string::npos)
+              {
+                // set the RollSig to generate necessary code
+                msg->RollSig = &msg->Signals[i];
+              }
             }
           }
         }
@@ -244,4 +251,5 @@ void DbcScanner::SetDefualtMessage(MessageDescriptor_t* message)
   message->Signals.clear();
   message->Transmitter = "";
   message->hasPhys = false;
+  message->RollSig = nullptr;
 }
diff --git a/src/types/message.h b/src/types/message.h
@@ -109,6 +109,9 @@ typedef struct
   // flag about having sigfloat fields
   bool hasPhys;
 
+  // pointer to rolling counter signal
+  SignalDescriptor_t* RollSig;
+
   // Message comment
   std::string CommentText;
 

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,10 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool`
`116`	`116`
`117`	`117`	`snprintf(_tmpb, kTmpLen, "%s_USE_CANSTRUCT", FS.DRVNAME.c_str());`
`118`	`118`	`FS.usesruct_def = _tmpb;`
	`119`	`+`
	`120`	`+ snprintf(_tmpb, kTmpLen, "%s_AUTO_ROLL", FS.DRVNAME.c_str());`
	`121`	`+ FS.useroll_def = _tmpb;`
	`122`	`+`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,13 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`146`	`146`	`{`
`147`	`147`	`// signal has been found, update commnet text`
`148`	`148`	`msg->Signals[i].CommentText = cmmnt.Text;`
	`149`	`+`
	`150`	`+ // 1 test if signal is rolling`
	`151`	`+ if (cmmnt.Text.find("<RollingCounter>") != std::string::npos)`
	`152`	`+ {`
	`153`	`+ // set the RollSig to generate necessary code`
	`154`	`+ msg->RollSig = &msg->Signals[i];`
	`155`	`+ }`
`149`	`156`	`}`
`150`	`157`	`}`
`151`	`158`	`}`
`@@ -244,4 +251,5 @@ void DbcScanner::SetDefualtMessage(MessageDescriptor_t* message)`
`244`	`251`	`message->Signals.clear();`
`245`	`252`	`message->Transmitter = "";`
`246`	`253`	`message->hasPhys = false;`
	`254`	`+ message->RollSig = nullptr;`
`247`	`255`	`}`