Commit 39aa684

committed

Fixing bug leading to incorrect length stored when frame lenght exceeds max data lenght.

1 parent bba303d commit 39aa684Copy full SHA for 39aa684

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace arduino`
`22`	`22`	`* STATIC CONST DEFINITION`
`23`	`23`	`**************************************************************************************/`
`24`	`24`
`25`		`-size_t const CanMsg::MAX_DATA_LENGTH;`
	`25`	`+uint8_t const CanMsg::MAX_DATA_LENGTH;`
`26`	`26`	`uint32_t const CanMsg::CAN_EFF_FLAG;`
`27`	`27`	`uint32_t const CanMsg::CAN_SFF_MASK;`
`28`	`28`	`uint32_t const CanMsg::CAN_EFF_MASK;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace arduino`
`33`	`33`	`class CanMsg : public Printable`
`34`	`34`	`{`
`35`	`35`	`public:`
`36`		`- static size_t constexpr MAX_DATA_LENGTH = 8;`
	`36`	`+ static uint8_t constexpr MAX_DATA_LENGTH = 8;`
`37`	`37`
`38`	`38`	`static uint32_t constexpr CAN_EFF_FLAG = 0x80000000U;`
`39`	`39`	`static uint32_t constexpr CAN_SFF_MASK = 0x000007FFU; /* standard frame format (SFF) */`
`@@ -42,10 +42,10 @@ class CanMsg : public Printable`
`42`	`42`
`43`	`43`	`CanMsg(uint32_t const can_id, uint8_t const can_data_len, uint8_t const * can_data_ptr)`
`44`	`44`	`: id{can_id}`
`45`		`- , data_length{can_data_len}`
	`45`	`+ , data_length{min(can_data_len, MAX_DATA_LENGTH)}`
`46`	`46`	`, data{0}`
`47`	`47`	`{`
`48`		`- memcpy(data, can_data_ptr, min(can_data_len, MAX_DATA_LENGTH));`
	`48`	`+ memcpy(data, can_data_ptr, data_length);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`CanMsg() : CanMsg(0, 0, nullptr) { }`

Comments

(0)