Merge pull request #14597 from CalSol/lpc15xx_extended_can_5_15

LPC15xx extended CAN fix (5.15)
ARMmbed · Jun 15, 2021 · bfe3d50 · bfe3d50
2 parents 972c8fd + 5a1068f
commit bfe3d50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/targets/TARGET_NXP/TARGET_LPC15XX/can_api.c b/targets/TARGET_NXP/TARGET_LPC15XX/can_api.c
@@ -649,8 +649,8 @@ int can_read(can_t *obj, CAN_Message *msg, int handle) {
 
         if (LPC_C_CAN0->CANIF2_ARB2 & CANIFn_ARB2_XTD) {
             msg->format = CANExtended;
-            msg->id = (LPC_C_CAN0->CANIF2_ARB1 & 0x1FFF) << 16;
-            msg->id |= (LPC_C_CAN0->CANIF2_ARB2 & 0x1FFF);
+            msg->id = (LPC_C_CAN0->CANIF2_ARB2 & 0x1FFF) << 16;
+            msg->id |= (LPC_C_CAN0->CANIF2_ARB1 & 0xFFFF);
         } else {
             msg->format = CANStandard;
             msg->id = (LPC_C_CAN0->CANIF2_ARB2 & 0x1FFF) >> 2;