rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

OP-958: WINDOWS HACK: do not filter out the bl.

Browse Source
This commit is contained in:
Mathieu Rondonneau 2013-05-29 05:57:46 -07:00
parent 660a175a53
commit afeeed6f65
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_win.cpp
View File

@ -131,7 +131,8 @@ QList<USBPortInfo> USBMonitor::availableDevices(int vid, int pid, int bcdDeviceM
#define TCHARToQString(x) QString::fromLocal8Bit((x)) #define TCHARToQString(x) QString::fromLocal8Bit((x))
#define TCHARToQStringN(x, y) QString::fromLocal8Bit((x), (y)) #define TCHARToQStringN(x, y) QString::fromLocal8Bit((x), (y))
#endif /*UNICODE*/ #endif /*UNICODE*/
#define HIDMATCHSTRING "COL01" #define MATCHOPHIDSTRING "COL01"
#define MATCHOPBLSTRING "161A0549"
void USBMonitor::setUpNotifications() void USBMonitor::setUpNotifications()
{ {
@ -194,7 +195,8 @@ bool USBMonitor::matchAndDispatchChangedDevice(const QString & deviceID, const G
DWORD nSize = 0; DWORD nSize = 0;
TCHAR buf[MAX_PATH]; TCHAR buf[MAX_PATH];
if (SetupDiGetDeviceInstanceId(devInfo, &spDevInfoData, buf, MAX_PATH, &nSize) && if (SetupDiGetDeviceInstanceId(devInfo, &spDevInfoData, buf, MAX_PATH, &nSize) &&
deviceID.contains(TCHARToQString(buf)) && deviceID.contains(HIDMATCHSTRING)) { // we found a match deviceID.contains(TCHARToQString(buf)) && (deviceID.contains(MATCHOPHIDSTRING) ||
deviceID.contains(MATCHOPBLSTRING))) { // we found a match
USBPortInfo info; USBPortInfo info;
info.devicePath = deviceID; info.devicePath = deviceID;
if (wParam == DBT_DEVICEARRIVAL) { if (wParam == DBT_DEVICEARRIVAL) {