OpenNI2-FreenectDriver: Expose USB VID/PID to OpenNI - fixes #422

Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
OpenKinect · Dec 2, 2014 · 3c32fdb · 3c32fdb
1 parent 75ec2a6
commit 3c32fdb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/OpenNI2-FreenectDriver/CMakeLists.txt b/OpenNI2-FreenectDriver/CMakeLists.txt
@@ -17,6 +17,7 @@ set_target_properties(FreenectDriver PROPERTIES
 add_definitions(-DPROJECT_VER="${PROJECT_VER}")
 
 include_directories(extern/OpenNI-Linux-x64-2.2.0.33/Include)
+include_directories(${PROJECT_SOURCE_DIR}/src)
 include_directories(${PROJECT_SOURCE_DIR}/wrappers/cpp)
 
 target_link_libraries(FreenectDriver freenectstatic ${MATH_LIB})

diff --git a/OpenNI2-FreenectDriver/src/DeviceDriver.cpp b/OpenNI2-FreenectDriver/src/DeviceDriver.cpp
@@ -17,6 +17,7 @@
 #include <map>
 #include <string>
 #include "Driver/OniDriverAPI.h"
+#include "freenect_internal.h"
 #include "libfreenect.hpp"
 #include "DepthStream.hpp"
 #include "ColorStream.hpp"
@@ -254,6 +255,18 @@ namespace FreenectDriver
         devices[info] = NULL;
         deviceConnected(&info);
         deviceStateChanged(&info, 0);
+
+        freenect_device* dev;
+        if (freenect_open_device(m_ctx, &dev, i) == 0)
+        {
+          info.usbVendorId = dev->usb_cam.VID;
+          info.usbProductId = dev->usb_cam.PID;
+          freenect_close_device(dev);
+        }
+        else
+        {
+          WriteMessage("Unable to open device to query VID/PID");
+        }
       }
       return ONI_STATUS_OK;
     }