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

Lower amount of debug output in Linux USB Monitor.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3079 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-03-26 11:57:16 +00:00 committed by edouard
parent c9db0794f7
commit 1ef9eceac5
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,33 @@
#define printf qDebug #define printf qDebug
void printPortInfo(struct udev_device *dev)
{
printf(" Node: %s", udev_device_get_devnode(dev));
printf(" Subsystem: %s", udev_device_get_subsystem(dev));
printf(" Devtype: %s", udev_device_get_devtype(dev));
printf(" Action: %s", udev_device_get_action(dev));
/* From here, we can call get_sysattr_value() for each file
in the device's /sys entry. The strings passed into these
functions (idProduct, idVendor, serial, etc.) correspond
directly to the files in the directory which represents
the USB device. Note that USB strings are Unicode, UCS2
encoded, but the strings returned from
udev_device_get_sysattr_value() are UTF-8 encoded. */
printf(" VID/PID/bcdDevice : %s %s %s",
udev_device_get_sysattr_value(dev,"idVendor"),
udev_device_get_sysattr_value(dev, "idProduct"),
udev_device_get_sysattr_value(dev,"bcdDevice"));
printf(" %s - %s",
udev_device_get_sysattr_value(dev,"manufacturer"),
udev_device_get_sysattr_value(dev,"product"));
printf(" serial: %s",
udev_device_get_sysattr_value(dev, "serial"));
}
void USBMonitor::deviceEventReceived() { void USBMonitor::deviceEventReceived() {
qDebug() << "Device event"; qDebug() << "Device event";
@ -46,8 +73,10 @@ void USBMonitor::deviceEventReceived() {
QString action = QString(udev_device_get_action(dev)); QString action = QString(udev_device_get_action(dev));
QString devtype = QString(udev_device_get_devtype(dev)); QString devtype = QString(udev_device_get_devtype(dev));
if (action == "add" && devtype == "usb_device") { if (action == "add" && devtype == "usb_device") {
printPortInfo(dev);
emit deviceDiscovered(makePortInfo(dev)); emit deviceDiscovered(makePortInfo(dev));
} else if (action == "remove" && devtype == "usb_device"){ } else if (action == "remove" && devtype == "usb_device"){
printPortInfo(dev);
emit deviceRemoved(makePortInfo(dev)); emit deviceRemoved(makePortInfo(dev));
} }
@ -147,6 +176,8 @@ QList<USBPortInfo> USBMonitor::availableDevices(int vid, int pid, int bcdDeviceM
} }
USBPortInfo USBMonitor::makePortInfo(struct udev_device *dev) USBPortInfo USBMonitor::makePortInfo(struct udev_device *dev)
{ {
USBPortInfo prtInfo; USBPortInfo prtInfo;
@ -154,29 +185,9 @@ USBPortInfo USBMonitor::makePortInfo(struct udev_device *dev)
////////// //////////
// Debug info // Debug info
////////// //////////
printf(" Node: %s", udev_device_get_devnode(dev)); #ifdef DEBUG
printf(" Subsystem: %s", udev_device_get_subsystem(dev)); printPortInfo(dev);
printf(" Devtype: %s", udev_device_get_devtype(dev)); #endif
printf(" Action: %s", udev_device_get_action(dev));
/* From here, we can call get_sysattr_value() for each file
in the device's /sys entry. The strings passed into these
functions (idProduct, idVendor, serial, etc.) correspond
directly to the files in the directory which represents
the USB device. Note that USB strings are Unicode, UCS2
encoded, but the strings returned from
udev_device_get_sysattr_value() are UTF-8 encoded. */
printf(" VID/PID/bcdDevice : %s %s %s",
udev_device_get_sysattr_value(dev,"idVendor"),
udev_device_get_sysattr_value(dev, "idProduct"),
udev_device_get_sysattr_value(dev,"bcdDevice"));
printf(" %s - %s",
udev_device_get_sysattr_value(dev,"manufacturer"),
udev_device_get_sysattr_value(dev,"product"));
printf(" serial: %s",
udev_device_get_sysattr_value(dev, "serial"));
//////////
// Debug info end
//////////
bool ok; bool ok;