From 6d67e8011f13db9bc1dfaae1616d01c22ebf7362 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 1 Dec 2021 22:57:08 -0500 Subject: [PATCH] CAN progress (cherry picked from commit bf98a5387246d03289eef383e5916385353b8b71) --- firmware/controllers/can/can.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firmware/controllers/can/can.h b/firmware/controllers/can/can.h index 76243e9a5d..6492fcdb90 100644 --- a/firmware/controllers/can/can.h +++ b/firmware/controllers/can/can.h @@ -91,7 +91,9 @@ private: #ifdef STM32H7XX #define CAN_SID(f) ((f).std.SID) #define CAN_EID(f) ((f).ext.EID) +#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_ID(f) ((f).IDE ? CAN_EID(f) : CAN_SID(f)) #endif