From 5a1068f11ead1142f0d00aed0a9df16514f2275b Mon Sep 17 00:00:00 2001 From: jet Date: Mon, 17 Jun 2019 11:22:17 -0700 Subject: [PATCH] Fix LPC15XX extended CAN ID conversion --- targets/TARGET_NXP/TARGET_LPC15XX/can_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/TARGET_NXP/TARGET_LPC15XX/can_api.c b/targets/TARGET_NXP/TARGET_LPC15XX/can_api.c index bb922b5cec1..922032998d2 100644 --- 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;