Commit4d0d2b0

committed

Added support for CAN FD 64 byte payload length

1 parent1918702 commit4d0d2b0Copy full SHA for 4d0d2b0

File tree

+21

-6

lines changed

+21

-6

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),`
`6`	`6`
`7`	`7`	`##[Unreleased]`
`8`	`8`
	`9`	`+###Added`
	`10`	`+`
	`11`	`+- CAN FD frames with max DLC (64 bytes) are supported`
	`12`	`+`
`9`	`13`	`##[v3.0] - 2023-10-09`
`10`	`14`
`11`	`15`	`###Added`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`#include<memory>`
`3`	`3`	`#include"c-sigprinter.h"`
`4`	`4`	`#include"helpers/formatter.h"`
	`5`	`+#include"conf-and-limits.h"`
`5`	`6`
`6`	`7`	`// work buffer for all snprintf operations`
`7`	`8`	`staticconstsize_t WBUFF_LEN =2048;`
`@@ -190,9 +191,9 @@ std::string CSigPrinter::PrintSignalExpr(const SignalDescriptor_t* sig, std::vec`
`190`	`191`	`uint16_t startb = (uint16_t)((sig->Order == BitLayout::kIntel) ?`
`191`	`192`	`(sig->StartBit + (sig->LengthBit -1)) : (sig->StartBit));`
`192`	`193`
`193`		`-if (startb >63)`
	`194`	`+if (startb >CONF_LIMIT_HIGHEST_BIT_POSITION)`
`194`	`195`	`{`
`195`		`- startb =63;`
	`196`	`+ startb =CONF_LIMIT_HIGHEST_BIT_POSITION;`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`uint32_t bn = (startb /8);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`#include<stdint.h>`
`4`	`4`
`5`	`5`	`#defineCODEGEN_LIB_VERSION_MAJ (3)`
`6`		`-#defineCODEGEN_LIB_VERSION_MIN (0)`
	`6`	`+#defineCODEGEN_LIB_VERSION_MIN (1)`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,9 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+#include<stdint.h>`
	`4`	`+`
	`5`	`+//! Maximum length of CAN frame payload in bytes`
	`6`	`+#defineCONF_LIMIT_MAX_DLC 64u`
	`7`	`+`
	`8`	`+//! The highest possible bit position based on MAX Data size`
	`9`	`+#defineCONF_LIMIT_HIGHEST_BIT_POSITION (CONF_LIMIT_MAX_DLC * 8u) - 1u`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-#include"dbclineparser.h"`
`2`		`-#include<helpers/formatter.h>`
`3`	`1`	`#include<stdlib.h>`
`4`	`2`	`#include<clocale>`
`5`	`3`	`#include<regex>`
`6`	`4`	`#include<math.h>`
`7`	`5`	`#include<limits.h>`
	`6`	`+#include"helpers/formatter.h"`
	`7`	`+#include"dbclineparser.h"`
	`8`	`+#include"conf-and-limits.h"`
`8`	`9`
`9`	`10`	`/// @brief Minimal possible value for Factor/Offset`
`10`	`11`	`constexprdouble MIN_FAC_OFF =0.000000001;`
`@@ -136,7 +137,7 @@ bool DbcLineParser::ParseMessageLine(MessageDescriptor_t* msg, const std::string`
`136`	`137`
`137`	`138`	`msg->DLC =atoi(items[4].c_str());`
`138`	`139`
`139`		`-if ((msg->MsgID &0x60000000) !=0 \|\| msg->DLC ==0 \|\| msg->DLC >8)`
	`140`	`+if ((msg->MsgID &0x60000000) !=0 \|\| msg->DLC ==0 \|\| msg->DLC >CONF_LIMIT_MAX_DLC)`
`140`	`141`	`{`
`141`	`142`	`returnfalse;`
`142`	`143`	`}`

Comments

(0)