Skip to content

Commit bfe3d50

Browse files
authored
Merge pull request #14597 from CalSol/lpc15xx_extended_can_5_15
LPC15xx extended CAN fix (5.15)
2 parents 972c8fd + 5a1068f commit bfe3d50

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

targets/TARGET_NXP/TARGET_LPC15XX/can_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ int can_read(can_t *obj, CAN_Message *msg, int handle) {
649649

650650
if (LPC_C_CAN0->CANIF2_ARB2 & CANIFn_ARB2_XTD) {
651651
msg->format = CANExtended;
652-
msg->id = (LPC_C_CAN0->CANIF2_ARB1 & 0x1FFF) << 16;
653-
msg->id |= (LPC_C_CAN0->CANIF2_ARB2 & 0x1FFF);
652+
msg->id = (LPC_C_CAN0->CANIF2_ARB2 & 0x1FFF) << 16;
653+
msg->id |= (LPC_C_CAN0->CANIF2_ARB1 & 0xFFFF);
654654
} else {
655655
msg->format = CANStandard;
656656
msg->id = (LPC_C_CAN0->CANIF2_ARB2 & 0x1FFF) >> 2;

0 commit comments

Comments
 (0)