Skip to content

Commit 2ec4c6c

Browse files
authored
Merge pull request #38 from REVrobotics/fix/rtr-mask
2 parents 77162c1 + dbfe43a commit 2ec4c6c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ 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() & NON_RESERVED_ARB_ID_MASK;
177-
178176
bool isExtended = true; // FRC CAN is always extended
179-
bool isRtr = messageId & HAL_CAN_IS_FRAME_REMOTE;
177+
bool isRtr = el.m_msg.GetMessageId() & HAL_CAN_IS_FRAME_REMOTE;
178+
179+
uint32_t messageId = el.m_msg.GetMessageId() & NON_RESERVED_ARB_ID_MASK;
180180

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

0 commit comments

Comments
 (0)