diff --git a/firmware/controllers/can/can.h b/firmware/controllers/can/can.h index bdac32c78d..68ecdb4b70 100644 --- a/firmware/controllers/can/can.h +++ b/firmware/controllers/can/can.h @@ -97,9 +97,11 @@ private: #ifdef STM32H7XX #define CAN_SID(f) ((f).std.SID) #define CAN_EID(f) ((f).ext.EID) +#define CAN_ISX(f) ((f).common.XTD) #define CAN_ID(f) ((f).common.XTD ? CAN_EID(f) : CAN_SID(f)) #else #define CAN_SID(f) ((f).SID) #define CAN_EID(f) ((f).EID) +#define CAN_ISX(f) ((f).IDE) #define CAN_ID(f) ((f).IDE ? CAN_EID(f) : CAN_SID(f)) #endif diff --git a/firmware/controllers/can/can_rx.cpp b/firmware/controllers/can/can_rx.cpp index 456d911e4e..c8154b95f7 100644 --- a/firmware/controllers/can/can_rx.cpp +++ b/firmware/controllers/can/can_rx.cpp @@ -75,7 +75,7 @@ static void printPacket(const size_t busIndex, const CANRxFrame &rx) { int id = CAN_ID(rx); - if (rx.IDE == CAN_IDE_EXT) { + if (CAN_ISX(rx)) { // print extended IDs in hex only efiPrintf("CAN%d RX: ID %07x DLC %d: %02x %02x %02x %02x %02x %02x %02x %02x", busIndex,