Use HAL macro

REVrobotics · Sep 19, 2024 · 8d0f4f6 · 8d0f4f6
1 parent 273bc50
commit 8d0f4f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/main/native/include/rev/CANMessage.h b/src/main/native/include/rev/CANMessage.h
@@ -36,8 +36,6 @@
 #include <iostream>
 #include <chrono>
 
-#define EXTENDED_ID_MASK 0x40000000
-#define REMOTE_FRAME_MASK 0x80000000
 #define NON_RESERVED_ARB_ID_MASK 0x1FFFFFFF
 
 namespace rev {

diff --git a/src/main/native/include/rev/Drivers/CandleWinUSB/CandleWinUSBDeviceThread.h b/src/main/native/include/rev/Drivers/CandleWinUSB/CandleWinUSBDeviceThread.h
@@ -176,7 +176,7 @@ class CandleWinUSBDeviceThread :public DriverDeviceThread {
             uint32_t messageId = el.m_msg.GetMessageId() & NON_RESERVED_ARB_ID_MASK;
 
             bool isExtended = true; // FRC CAN is always extended
-            bool isRtr = messageId & REMOTE_FRAME_MASK;
+            bool isRtr = messageId & HAL_CAN_IS_FRAME_REMOTE;
 
             frame.can_id = messageId;
             if(isExtended) {