Fixed comment style. CYC value bug.

astand · astand · commit ba889648fc02 · 2021-01-25T20:55:01.000+03:00
diff --git a/src/codegen/c-main-generator.cpp b/src/codegen/c-main-generator.cpp
@@ -146,9 +146,8 @@ void CiMainGenerator::Generate(std::vector<MessageDescriptor_t*>& msgs, const Fs
     // write message typedef s and additional expressions
     MessageDescriptor_t& m = sigprt->sigs_expr[num]->msg;
 
-    fwriter->AppendLine(
-      PrintF("uint32_t Unpack_%s_%s(%s_t* _m, const uint8_t* _d, uint8_t dlc_);",
-             m.Name.c_str(), fsd.DrvName_orig.c_str(), m.Name.c_str()));
+    fwriter->AppendLine(PrintF("uint32_t Unpack_%s_%s(%s_t* _m, const uint8_t* _d, uint8_t dlc_);",
+                               m.Name.c_str(), fsd.DrvName_orig.c_str(), m.Name.c_str()));
 
     fwriter->AppendLine(PrintF("#ifdef %s", fsd.usesruct_def.c_str()));
 
@@ -269,19 +268,35 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi
 
   fwriter->AppendText(PrintF(" Bits=%2d", sig.LengthBit));
 
-  if (sig.Unit.size() > 0)
+  if (sig.IsDoubleSig)
   {
-    fwriter->AppendText(PrintF(" Unit:'%-13s'", sig.Unit.c_str()));
-  }
+    if (sig.Offset != 0)
+    {
+      fwriter->AppendText(PrintF(" Offset= %-18f", sig.Offset));
+    }
 
-  if (sig.Offset != 0)
+    if (sig.Factor != 1)
+    {
+      fwriter->AppendText(PrintF(" Factor= %-15f", sig.Factor));
+    }
+  }
+  else if (sig.IsSimpleSig == false)
   {
-    fwriter->AppendText(PrintF(" Offset= %-18f", sig.Offset));
+    // 2 type of signal
+    if (sig.Offset != 0)
+    {
+      fwriter->AppendText(PrintF(" Offset= %-18d", sig.Offset));
+    }
+
+    if (sig.Factor != 1)
+    {
+      fwriter->AppendText(PrintF(" Factor= %-15d", sig.Factor));
+    }
   }
 
-  if (sig.Factor != 1)
+  if (sig.Unit.size() > 0)
   {
-    fwriter->AppendText(PrintF(" Factor= %-15d", sig.LengthBit));
+    fwriter->AppendText(PrintF(" Unit:'%s'", sig.Unit.c_str()));
   }
 
   fwriter->AppendLine("", 2);
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -76,6 +76,8 @@ void DbcScanner::ParseMessageInfo(istream& readstrm)
       // create instance for the detected message
       pMsg = new MessageDescriptor_t;
 
+      SetDefualtMessage(pMsg);
+
       if (!lparser.ParseMessageLine(pMsg, sline))
       {
         // the message has invalid format so drop it and wait next one
@@ -199,10 +201,10 @@ void DbcScanner::AddMessage(MessageDescriptor_t* message)
     {
       // sort signals by start bit
       std::sort(message->Signals.begin(), message->Signals.end(),
-        [](const SignalDescriptor_t& a, const SignalDescriptor_t& b) -> bool
-        {
-          return a.StartBit < b.StartBit;
-        });
+                [](const SignalDescriptor_t& a, const SignalDescriptor_t& b) -> bool
+      {
+        return a.StartBit < b.StartBit;
+      });
 
       for (size_t i = 0; i < message->Signals.size(); i++)
       {
