Merge fix-no-comments-for-phys to dev

astand · astand · commit 1301ed8d513d · 2024-06-30T16:00:05.000+03:00
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 - Head part info conversion to source code comments in mon-generator module
 - FindVersion function improved
+- Missing comments from dbc for signals based on real data types (floating-point variables, denoted by '_ro' and '_phys').
 
 ## [v3.0] - 2023-10-09
 
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -187,7 +187,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
         {
           for (size_t i = 0; i < msg->Signals.size(); i++)
           {
-            if (cmmnt.SigName == msg->Signals[i].Name)
+            if ((cmmnt.SigName == msg->Signals[i].Name) || ((cmmnt.SigName + "_ro") == msg->Signals[i].Name))
             {
               SignalDescriptor_t& sig = msg->Signals[i];
               // signal has been found, update commnet text
diff --git a/test/gencode/lib/testdb.h b/test/gencode/lib/testdb.h
@@ -344,6 +344,7 @@ typedef struct
   // <Checksum:kXor4:1>
   uint8_t CS : 4;                            //      Bits= 4
 
+  // Test floating point value.
   uint16_t Accel_ro;                         //      Bits=12 Offset= -100.0             Factor= 0.1             Unit:'m/s'
 
 #ifdef TESTDB_USE_SIGFLOAT
@@ -404,6 +405,7 @@ typedef struct
   // <Checksum:kXor4:1>
   uint8_t CS;                                //      Bits= 4
 
+  // Test floating point value.
   uint16_t Accel_ro;                         //      Bits=12 Offset= -100.0             Factor= 0.1             Unit:'m/s'
 
 #ifdef TESTDB_USE_SIGFLOAT

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`187`	`187`	`{`
`188`	`188`	`for (size_t i = 0; i < msg->Signals.size(); i++)`
`189`	`189`	`{`
`190`		`- if (cmmnt.SigName == msg->Signals[i].Name)`
	`190`	`+ if ((cmmnt.SigName == msg->Signals[i].Name) \|\| ((cmmnt.SigName + "_ro") == msg->Signals[i].Name))`
`191`	`191`	`{`
`192`	`192`	`SignalDescriptor_t& sig = msg->Signals[i];`
`193`	`193`	`// signal has been found, update commnet text`