From 8d0f4f64e787f983a238685f3bad5c310530ef8a Mon Sep 17 00:00:00 2001
From: LandryNorris <landry.norris@live.com>
Date: Thu, 19 Sep 2024 11:19:53 -0500
Subject: [PATCH] Use HAL macro

---
 src/main/native/include/rev/CANMessage.h                        | 2 --
 .../include/rev/Drivers/CandleWinUSB/CandleWinUSBDeviceThread.h | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/native/include/rev/CANMessage.h b/src/main/native/include/rev/CANMessage.h
index 4b46a58..5500749 100644
--- 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
index d8906d3..0415c53 100644
--- 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) {