Skip to content

Commit 8d0f4f6

Browse files
committed
Use HAL macro
1 parent 273bc50 commit 8d0f4f6

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/main/native/include/rev/CANMessage.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#include <iostream>
3737
#include <chrono>
3838

39-
#define EXTENDED_ID_MASK 0x40000000
40-
#define REMOTE_FRAME_MASK 0x80000000
4139
#define NON_RESERVED_ARB_ID_MASK 0x1FFFFFFF
4240

4341
namespace rev {

src/main/native/include/rev/Drivers/CandleWinUSB/CandleWinUSBDeviceThread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class CandleWinUSBDeviceThread :public DriverDeviceThread {
176176
uint32_t messageId = el.m_msg.GetMessageId() & NON_RESERVED_ARB_ID_MASK;
177177

178178
bool isExtended = true; // FRC CAN is always extended
179-
bool isRtr = messageId & REMOTE_FRAME_MASK;
179+
bool isRtr = messageId & HAL_CAN_IS_FRAME_REMOTE;
180180

181181
frame.can_id = messageId;
182182
if(isExtended) {

0 commit comments

Comments
 (0)