Commitcf4ac28

committed

Simple support for multiplexed signals.

1 parentb952fab commitcf4ac28Copy full SHA for cf4ac28

File tree

+35

-3

lines changed

+35

-3

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,15 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi`
`322`	`322`	`fwriter->AppendLine(" //" +std::regex_replace(sig.ValueText,std::regex("\n"),"\n //"));`
`323`	`323`	`}`
`324`	`324`
	`325`	`+if (sig.Multiplex == MultiplexType::kMulValue)`
	`326`	`+ {`
	`327`	`+ fwriter->AppendLine(" // multiplex variable");`
	`328`	`+ }`
	`329`	`+elseif (sig.Multiplex == MultiplexType::kMaster)`
	`330`	`+ {`
	`331`	`+ fwriter->AppendLine(" // MULTIPLEX master signal");`
	`332`	`+ }`
	`333`	`+`
`325`	`334`	`std::string dtype ="";`
`326`	`335`
`327`	`336`	`dtype +="" +PrintType((int)sig.Type) +"" + sig.Name;`

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,25 @@ bool DbcLineParser::ParseSignalLine(SignalDescriptor_t* sig, const std::string&`
`153`	`153`	`// split middle part on dedicated values`
`154`	`154`	`auto valpart =resplit(trim(tailpart[0]),kRegSigReceivers, -1);`
`155`	`155`
`156`		`- halfs =resplit(halfs[0],kRegSigSplit0, -1);`
	`156`	`+ halfs =resplit(halfs[0],kRegValTable,0);`
`157`	`157`
`158`		`-if (halfs.size() >1)`
	`158`	`+if (halfs.size() >=2)`
`159`	`159`	`{`
`160`		`- sig->Name = halfs[halfs.size() -1];`
	`160`	`+ sig->Name = halfs[1];`
	`161`	`+ sig->Multiplex = MultiplexType::kNone;`
	`162`	`+`
	`163`	`+if (halfs.size() ==3)`
	`164`	`+ {`
	`165`	`+// Multiplex signal, put additional comment`
	`166`	`+if (halfs[2] =="M")`
	`167`	`+ {`
	`168`	`+ sig->Multiplex = MultiplexType::kMaster;`
	`169`	`+ }`
	`170`	`+else`
	`171`	`+ {`
	`172`	`+ sig->Multiplex = MultiplexType::kMulValue;`
	`173`	`+ }`
	`174`	`+ }`
`161`	`175`	`}`
`162`	`176`	`else`
`163`	`177`	`{`

Lines changed: 9 additions & 0 deletions

Comments

(0)