Skip to content

Commit 273bc50

Browse files
committed
Mask out reserved bits when giving ID to candlelib
1 parent 07998fa commit 273bc50

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
#define EXTENDED_ID_MASK 0x40000000
4040
#define REMOTE_FRAME_MASK 0x80000000
41+
#define NON_RESERVED_ARB_ID_MASK 0x1FFFFFFF
4142

4243
namespace rev {
4344
namespace usb {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class CandleWinUSBDeviceThread :public DriverDeviceThread {
173173
candle_frame_t frame;
174174
frame.can_dlc = el.m_msg.GetSize();
175175

176-
uint32_t messageId = el.m_msg.GetMessageId();
176+
uint32_t messageId = el.m_msg.GetMessageId() & NON_RESERVED_ARB_ID_MASK;
177177

178178
bool isExtended = true; // FRC CAN is always extended
179179
bool isRtr = messageId & REMOTE_FRAME_MASK;

0 commit comments

Comments
 (0)