Skip to content

Commit 86428dc

Browse files
committed
Support serial driver
1 parent ccca9bc commit 86428dc

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-can-bridge",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"author": "REV Robotics",
55
"description": "Get CAN Data",
66
"license": "MIT",

src/canWrapper.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <rev/CANBridgeUtils.h>
66
#include <rev/Drivers/CandleWinUSB/CandleWinUSBDriver.h>
77
#include <rev/Drivers/CandleWinUSB/CandleWinUSBDevice.h>
8+
#include <rev/Drivers/SerialPort/SerialDriver.h>
89
#include <utils/ThreadUtils.h>
910
#include <hal/HAL.h>
1011
#include <hal/CAN.h>
@@ -22,6 +23,7 @@
2223
#define DEVICE_NOT_FOUND_ERROR "Device not found. Make sure to run getDevices()"
2324

2425
rev::usb::CandleWinUSBDriver* driver = new rev::usb::CandleWinUSBDriver();
26+
rev::usb::SerialDriver* serialDriver = new rev::usb::SerialDriver();
2527
std::map<std::string, std::shared_ptr<rev::usb::CANDevice>> CANDeviceMap;
2628
std::set<std::string> devicesRegisteredToHal;
2729
bool halInitialized = false;
@@ -50,6 +52,11 @@ bool addDeviceToMap(std::string descriptor) {
5052
CANDeviceMap[descriptor] = std::move(canDevice);
5153
return true;
5254
}
55+
std::unique_ptr<rev::usb::CANDevice> serialCanDevice = serialDriver->CreateDeviceFromDescriptor(descriptor_chars);
56+
if (serialCanDevice != nullptr) {
57+
CANDeviceMap[descriptor] = std::move(serialCanDevice);
58+
return true;
59+
}
5360
return false;
5461
} catch (...) {
5562
return false;

0 commit comments

Comments
 (0)