Fix LPC15XX extended CAN ID conversion

pull/14597/head
jet 2019-06-17 11:22:17 -07:00 committed by Jean-Étienne Tremblay
parent 0be7685a27
commit 5a1068f11e
1 changed files with 2 additions and 2 deletions

View File

@ -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;