Merge branch 'main' into prs-to-unofficial-rev-port/include-static-artifacts

# Conflicts:
#	.github/workflows/build.yml
#	src/main/native/cpp/Drivers/Serial/SerialDevice.cpp
#	src/main/native/include/rev/Drivers/SerialPort/SerialDevice.h

Author: ItsHarper

publish.gradle

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
 
 ext.licenseFile = files("$rootDir/LICENSE.txt")
 
-def pubVersion = '2.5.0'
+def pubVersion = '2.6.0'
 
 def outputsFolder = file("$buildDir/allOutputs")
 

src/main/native/cpp/Drivers/CandleWinUSB/CandleWinUSBDevice.cpp

@@ -33,6 +33,7 @@
 
 #include <iostream> //TODO: Remove
 #include <thread>
+#include <map>
 
 #include <hal/simulation/CanData.h>
 #include <hal/CAN.h>
@@ -191,6 +192,11 @@ bool CandleWinUSBDevice::IsConnected()
     return true;
 }
 
+bool CandleWinUSBDevice::CopyReceivedMessagesMap(std::map<uint32_t, std::shared_ptr<CANMessage>>& receivedMessagesMap)
+{
+    return m_thread.ReceiveMessage(receivedMessagesMap);
+}
+
 
 } // namespace usb
 } // namespace rev

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

@@ -29,6 +29,7 @@
 #pragma once
 
 #include <string>
+#include <map>
 
 #include "rev/CANMessage.h"
 #include "rev/CANStatus.h"
@@ -81,6 +82,8 @@ class CANDevice {
     virtual void setThreadPriority(utils::ThreadPriority priority) {};
     virtual void stopRepeatedMessage(uint32_t messageId) {};
     virtual void ClearSendQueue() {};
+
+    virtual bool CopyReceivedMessagesMap(std::map<uint32_t, std::shared_ptr<CANMessage>>& receivedMessagesMap) = 0;
 };
 
 } // namespace usb

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

@@ -65,6 +65,7 @@ class CandleWinUSBDevice : public CANDevice {
     virtual void setThreadPriority(utils::ThreadPriority priority);
     virtual void stopRepeatedMessage(uint32_t messageId);
     virtual void ClearSendQueue();
+    virtual bool CopyReceivedMessagesMap(std::map<uint32_t, std::shared_ptr<CANMessage>>& receivedMessagesMap) override;
 private:
     candle_handle m_handle;
     CandleWinUSBDeviceThread m_thread;

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

@@ -173,10 +173,10 @@ class CandleWinUSBDeviceThread :public DriverDeviceThread {
             candle_frame_t frame;
             frame.can_dlc = el.m_msg.GetSize();
 
-            uint32_t messageId = el.m_msg.GetMessageId() & NON_RESERVED_ARB_ID_MASK;
-
             bool isExtended = true; // FRC CAN is always extended
-            bool isRtr = messageId & HAL_CAN_IS_FRAME_REMOTE;
+            bool isRtr = el.m_msg.GetMessageId() & HAL_CAN_IS_FRAME_REMOTE;
+
+            uint32_t messageId = el.m_msg.GetMessageId() & NON_RESERVED_ARB_ID_MASK;
 
             frame.can_id = messageId;
             if(isExtended) {

vendordeps/CANBridge.json

@@ -1,7 +1,7 @@
 {
     "fileName": "CANBridge.json",
     "name": "CANBridge",
-    "version": "2.5.0",
+    "version": "2.6.0",
     "uuid": "34b37c7c-8acc-405f-9631-d21f20dc59d8",
     "mavenUrls": [
         "http://www.revrobotics.com/content/sw/max/sdk/maven/"