Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass up to OpenNI2 the USB Product and Vendor IDs. #422

Closed
wants to merge 1 commit into from
Closed

Pass up to OpenNI2 the USB Product and Vendor IDs. #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions OpenNI2-FreenectDriver/src/DeviceDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
#include "DepthStream.hpp"
#include "ColorStream.hpp"

#include <libusb.h>
#include "../../src/freenect_internal.h"


namespace FreenectDriver
{
Expand Down Expand Up @@ -246,14 +249,35 @@ namespace FreenectDriver
std::string uri = devid_to_uri(i);

WriteMessage("Found device " + uri);

OniDeviceInfo info;
strncpy(info.uri, uri.c_str(), ONI_MAX_STR);
strncpy(info.vendor, "Microsoft", ONI_MAX_STR);
strncpy(info.name, "Kinect", ONI_MAX_STR);
devices[info] = NULL;
deviceConnected(&info);
deviceStateChanged(&info, 0);

freenect_device* dev;
int e;

if (!(e = freenect_open_device(m_ctx, &dev, i)))
{
struct libusb_device_descriptor desc;

if (!(e = libusb_get_device_descriptor (libusb_get_device(dev->usb_cam.dev), &desc)))
{
OniDeviceInfo info;

info.usbVendorId = desc.idVendor;
info.usbProductId = desc.idProduct;
strncpy(info.uri, uri.c_str(), ONI_MAX_STR);
strncpy(info.vendor, "Microsoft", ONI_MAX_STR);
strncpy(info.name, "Kinect", ONI_MAX_STR);

if (!(e = freenect_close_device(dev)))
{
devices[info] = NULL;
deviceConnected(&info);
deviceStateChanged(&info, 0);
}
else WriteMessage("Unable to close query of device " + uri + " error:"+ to_string(e));
}
else WriteMessage("Unable to query usb device " + uri + " error:"+ to_string(e));
}
else WriteMessage("Unable to query device " + uri + " error:" + to_string(e));
}
return ONI_STATUS_OK;
}
Expand Down