File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " node-can-bridge" ,
3
- "version" : " 1.0.1 " ,
3
+ "version" : " 1.0.2 " ,
4
4
"author" : " REV Robotics" ,
5
5
"description" : " Get CAN Data" ,
6
6
"license" : " MIT" ,
Original file line number Diff line number Diff line change 5
5
#include < rev/CANBridgeUtils.h>
6
6
#include < rev/Drivers/CandleWinUSB/CandleWinUSBDriver.h>
7
7
#include < rev/Drivers/CandleWinUSB/CandleWinUSBDevice.h>
8
+ #include < rev/Drivers/SerialPort/SerialDriver.h>
8
9
#include < utils/ThreadUtils.h>
9
10
#include < hal/HAL.h>
10
11
#include < hal/CAN.h>
22
23
#define DEVICE_NOT_FOUND_ERROR " Device not found. Make sure to run getDevices()"
23
24
24
25
rev::usb::CandleWinUSBDriver* driver = new rev::usb::CandleWinUSBDriver();
26
+ rev::usb::SerialDriver* serialDriver = new rev::usb::SerialDriver();
25
27
std::map<std::string, std::shared_ptr<rev::usb::CANDevice>> CANDeviceMap;
26
28
std::set<std::string> devicesRegisteredToHal;
27
29
bool halInitialized = false ;
@@ -50,6 +52,11 @@ bool addDeviceToMap(std::string descriptor) {
50
52
CANDeviceMap[descriptor] = std::move (canDevice);
51
53
return true ;
52
54
}
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
+ }
53
60
return false ;
54
61
} catch (...) {
55
62
return false ;
You can’t perform that action at this time.
0 commit comments