rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

OP-334 Now fill the bcdDevice and other fields (except HID page info) on Linux too.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2994 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-03-06 22:57:34 +00:00 committed by edouard
parent b71bc49ce3
commit 61c8ea9185
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ground/openpilotgcs/src/plugins/rawhid/usbmonitor_linux.cpp
View File

@ -144,9 +144,9 @@ QList<USBPortInfo> USBMonitor::availableDevices(int vid, int pid, int bcdDevice)
QList<USBPortInfo> thePortsWeWant; QList<USBPortInfo> thePortsWeWant;
foreach (USBPortInfo port, allPorts) { foreach (USBPortInfo port, allPorts) {
thePortsWeWant.append(port); if((port.vendorID==vid || vid==-1) && (port.productID==pid || vid==-1) && (port.bcdDevice==bcdDevice || bcdDevice==-1))
thePortsWeWant.append(port);
} }
return thePortsWeWant; return thePortsWeWant;
} }
@ -155,6 +155,9 @@ USBPortInfo USBMonitor::makePortInfo(struct udev_device *dev)
{ {
USBPortInfo prtInfo; USBPortInfo prtInfo;
//////////
// Debug info
//////////
printf(" Node: %s", udev_device_get_devnode(dev)); printf(" Node: %s", udev_device_get_devnode(dev));
printf(" Subsystem: %s", udev_device_get_subsystem(dev)); printf(" Subsystem: %s", udev_device_get_subsystem(dev));
printf(" Devtype: %s", udev_device_get_devtype(dev)); printf(" Devtype: %s", udev_device_get_devtype(dev));
@ -166,18 +169,32 @@ USBPortInfo USBMonitor::makePortInfo(struct udev_device *dev)
the USB device. Note that USB strings are Unicode, UCS2 the USB device. Note that USB strings are Unicode, UCS2
encoded, but the strings returned from encoded, but the strings returned from
udev_device_get_sysattr_value() are UTF-8 encoded. */ udev_device_get_sysattr_value() are UTF-8 encoded. */
printf(" VID/PID: %s %s", printf(" VID/PID/bcdDevice : %s %s %s",
udev_device_get_sysattr_value(dev,"idVendor"), udev_device_get_sysattr_value(dev,"idVendor"),
udev_device_get_sysattr_value(dev, "idProduct")); udev_device_get_sysattr_value(dev, "idProduct"),
udev_device_get_sysattr_value(dev,"bcdDevice"));
printf(" %s - %s", printf(" %s - %s",
udev_device_get_sysattr_value(dev,"manufacturer"), udev_device_get_sysattr_value(dev,"manufacturer"),
udev_device_get_sysattr_value(dev,"product")); udev_device_get_sysattr_value(dev,"product"));
printf(" serial: %s", printf(" serial: %s",
udev_device_get_sysattr_value(dev, "serial")); udev_device_get_sysattr_value(dev, "serial"));
//////////
// Debug info end
//////////
prtInfo.vendorID = QString(udev_device_get_sysattr_value(dev, "idVendor")).toInt(); prtInfo.vendorID = QString(udev_device_get_sysattr_value(dev, "idVendor")).toInt();
prtInfo.productID = QString(udev_device_get_sysattr_value(dev, "idProduct")).toInt(); prtInfo.productID = QString(udev_device_get_sysattr_value(dev, "idProduct")).toInt();
prtInfo.serialNumber = QString(udev_device_get_sysattr_value(dev, "serial")); prtInfo.serialNumber = QString(udev_device_get_sysattr_value(dev, "serial"));
prtInfo.manufacturer = QString(udev_device_get_sysattr_value(dev,"manufacturer"));
prtInfo.product = QString(udev_device_get_sysattr_value(dev,"product"));
// prtInfo.UsagePage = QString(udev_device_get_sysattr_value(dev,""));
// prtInfo.Usage = QString(udev_device_get_sysattr_value(dev,""));
prtInfo.bcdDevice = QString(udev_device_get_sysattr_value(dev,"bcdDevice")).toInt();
return prtInfo; return prtInfo;