Commitd4e1603

committed

Added more signal type class (3 classes for now).

1 parent11426cc commitd4e1603Copy full SHA for d4e1603

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,12 +161,15 @@ bool DbcLineParser::ParseSignalLine(SignalDescriptor_t* sig, const std::string&`
`161`	`161`
`162`	`162`	`// get info about factor or offset double nature`
`163`	`163`	`sig->IsDoubleSig =false;`
	`164`	`+ sig->IsSimpleSig =false;`
`164`	`165`
`165`	`166`	`// for enabling double conversation the factor or offset`
`166`	`167`	`// substring must have dot ('.') character`
`167`	`168`	`if (valpart[3].find_first_of('.') != std::string::npos \|\|`
`168`	`169`	`valpart[4].find_first_of('.') != std::string::npos)`
	`170`	`+ {`
`169`	`171`	`sig->IsDoubleSig =true;`
	`172`	`+ }`
`170`	`173`
`171`	`174`	`// factor = double;`
`172`	`175`	`// offset = double;`
`@@ -193,6 +196,12 @@ bool DbcLineParser::ParseSignalLine(SignalDescriptor_t* sig, const std::string&`
`193`	`196`	`sig->Signed = (valpart[2].find('-') == -1) ?0 :1;`
`194`	`197`
`195`	`198`	`sig->Type =GetSigType(sig);`
	`199`	`+`
	`200`	`+// mark all simple signals to make using them easier`
	`201`	`+if (!sig->IsDoubleSig && (sig->Factor ==1) && (sig->Offset ==0))`
	`202`	`+ {`
	`203`	`+ sig->IsSimpleSig =true;`
	`204`	`+ }`
`196`	`205`	`}`
`197`	`206`
`198`	`207`	`if (tailpart.size() ==3)`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,21 @@ typedef struct`
`38`	`38`
`39`	`39`	`uint8_t LengthBit;`
`40`	`40`
	`41`	`+// By next two fields any signal can be strictly related to one of`
	`42`	`+// 3 signal type:`
	`43`	`+// 1 double based scaled value (IsDoubleSig == true)`
	`44`	`+// 2 integer based scaled value (IsDoubleSig == false && IsSimpleSig == false)`
	`45`	`+// 3 simple (IsDoubleSig == false && IsSimpleSig == true)`
	`46`	`+`
`41`	`47`	`// this flag shows when factor (or offset) is double`
`42`	`48`	`// it is used when *_from_S and _to_S macros is generated`
`43`	`49`	`bool IsDoubleSig;`
`44`	`50`
	`51`	`+// this flag shows if the signal has factor = 1 and offset = 0`
	`52`	`+// to reject any sigfloat or "toS"/"fromS" operations`
	`53`	`+// this only when : IsDoubleSig == true \|\| ((s.Factor != 1) \|\| (s.Offset != 0)`
	`54`	`+bool IsSimpleSig;`
	`55`	`+`
`45`	`56`	`double Factor;`
`46`	`57`
`47`	`58`	`double Offset;`

Comments

(0)