Add notices about Kinect v2

Fixes #485

Signed-off-by: Benn Snyder <[email protected]>

Author: piedar

README.md

@@ -10,6 +10,8 @@ It runs on Linux, OSX, and Windows and supports
 - LED
 - Audio
 
+Notice: If you have the newer Kinect v2 (XBox One), use [OpenKinect/libfreenect2](OpenKinect/libfreenect2) instead.
+
 
 # Build Instructions
 

src/core.c

@@ -47,7 +47,7 @@ FREENECTAPI int freenect_init(freenect_context **ctx, freenect_usb_context *usb_
 
 	memset(*ctx, 0, sizeof(freenect_context));
 
-	(*ctx)->log_level = LL_WARNING;
+	(*ctx)->log_level = LL_NOTICE;
 	(*ctx)->enabled_subdevices = (freenect_device_flags)(FREENECT_DEVICE_MOTOR | FREENECT_DEVICE_CAMERA);
 	res = fnusb_init(&(*ctx)->usb, usb_ctx);
 	if (res < 0) {
@@ -101,12 +101,12 @@ FREENECTAPI int freenect_process_events_timeout(freenect_context *ctx, struct ti
 
 FREENECTAPI int freenect_num_devices(freenect_context *ctx)
 {
-	return fnusb_num_devices(&ctx->usb);
+	return fnusb_num_devices(ctx);
 }
 
 FREENECTAPI int freenect_list_device_attributes(freenect_context *ctx, struct freenect_device_attributes **attribute_list)
 {
-	return fnusb_list_device_attributes(&ctx->usb, attribute_list);
+	return fnusb_list_device_attributes(ctx, attribute_list);
 }
 
 FREENECTAPI void freenect_free_device_attributes(struct freenect_device_attributes *attribute_list)
@@ -185,7 +185,7 @@ FREENECTAPI int freenect_open_device_by_camera_serial(freenect_context *ctx, fre
 	// freenect_open_device with that index.
 	struct freenect_device_attributes* attrlist;
 	struct freenect_device_attributes* item;
-	int count = fnusb_list_device_attributes(&ctx->usb, &attrlist);
+	int count = fnusb_list_device_attributes(ctx, &attrlist);
 	if (count < 0) {
 		FN_ERROR("freenect_open_device_by_camera_serial: Couldn't enumerate serial numbers\n");
 		return count;

src/freenect_internal.h

@@ -139,6 +139,7 @@ static inline int32_t fn_le32s(int32_t s)
 #define PID_NUI_CAMERA 0x02ae
 #define PID_NUI_MOTOR 0x02b0
 #define PID_K4W_CAMERA 0x02bf
+#define PID_KV2_CAMERA 0x02d9 // This identifies the Kinect v2 (XBox One). Use https://github.com/OpenKinect/libfreenect2 instead.
 
 // For K4W: first pid is what it starts out as,
 // second is how it appears with lastest firmware from SDK,

src/usb_libusb10.c

@@ -37,27 +37,39 @@
 #endif 
 
 
-FN_INTERNAL int fnusb_num_devices(fnusb_ctx *ctx)
+FN_INTERNAL int fnusb_num_devices(freenect_context *ctx)
 {
-	libusb_device **devs; 
-	//pointer to pointer of device, used to retrieve a list of devices	
-	ssize_t cnt = libusb_get_device_list (ctx->ctx, &devs); 
-	//get the list of devices	
-	if (cnt < 0)
-		return (-1);
-	int nr = 0, i = 0;
+	libusb_device **devs; // pointer to pointer of device, used to retrieve a list of devices
+	ssize_t count = libusb_get_device_list (ctx->usb.ctx, &devs);
+	if (count < 0)
+		return (count >= INT_MIN) ? (int)count : -1;
+
+	int number_found = 0, i = 0;
 	struct libusb_device_descriptor desc;
-	for (i = 0; i < cnt; ++i)
+	for (i = 0; i < count; ++i)
 	{
 		int r = libusb_get_device_descriptor (devs[i], &desc);
 		if (r < 0)
+		{
+			FN_WARNING("Failed to query USB device descriptor.\n");
 			continue;
-		if (desc.idVendor == VID_MICROSOFT && (desc.idProduct == PID_NUI_CAMERA || desc.idProduct == PID_K4W_CAMERA))
-			nr++;
+		}
+
+		if (desc.idVendor == VID_MICROSOFT)
+		{
+			if (desc.idProduct == PID_NUI_CAMERA || desc.idProduct == PID_K4W_CAMERA)
+			{
+				number_found++;
+			}
+			else if (desc.idProduct == PID_KV2_CAMERA)
+			{
+				FN_NOTICE("Skipping Kinect v2 device (needs https://github.com/libfreenect2).\n");
+			}
+		}
 	}
+
 	libusb_free_device_list (devs, 1);
-	// free the list, unref the devices in it
-	return nr;
+	return number_found;
 }
 
 // Returns 1 if `pid` identifies K4W audio, 0 otherwise
@@ -107,16 +119,14 @@ FN_INTERNAL libusb_device * fnusb_find_connected_audio_device(libusb_device * ca
 	return NULL;
 }
 
-FN_INTERNAL int fnusb_list_device_attributes(fnusb_ctx *ctx, struct freenect_device_attributes** attribute_list)
+FN_INTERNAL int fnusb_list_device_attributes(freenect_context *ctx, struct freenect_device_attributes** attribute_list)
 {
-	// todo: figure out how to log without freenect_context
-
 	*attribute_list = NULL; // initialize some return value in case the user is careless.
 	libusb_device **devs;   // pointer to pointer of device, used to retrieve a list of devices
-	ssize_t count = libusb_get_device_list (ctx->ctx, &devs);
+	ssize_t count = libusb_get_device_list (ctx->usb.ctx, &devs);
 	if (count < 0)
 	{
-		return -1;
+		return (count >= INT_MIN) ? (int)count : -1;
 	}
 
 	struct freenect_device_attributes** next_attr = attribute_list;
@@ -173,23 +183,23 @@ FN_INTERNAL int fnusb_list_device_attributes(fnusb_ctx *ctx, struct freenect_dev
 					res = libusb_get_device_descriptor(audio_device, &audio_desc);
 					if (res != 0)
 					{
-						//FN_ERROR("Failed to get audio serial descriptors of K4W or 1473 device: %d\n", res);
+						FN_WARNING("Failed to get audio serial descriptors of K4W or 1473 device: %d\n", res);
 					}
 					else
 					{
 						libusb_device_handle * audio_handle = NULL;
 						res = libusb_open(audio_device, &audio_handle);
 						if (res != 0)
 						{
-							//FN_ERROR("Failed to open audio device for serial of K4W or 1473 device: %d\n", res);
+							FN_WARNING("Failed to open audio device for serial of K4W or 1473 device: %d\n", res);
 						}
 						else
 						{
 							res = libusb_get_string_descriptor_ascii(audio_handle, audio_desc.iSerialNumber, serial, 256);
 							libusb_close(audio_handle);
 							if (res != 0)
 							{
-								//FN_ERROR("Failed to get audio serial of K4W or 1473 device: %d\n", res);
+								FN_WARNING("Failed to get audio serial of K4W or 1473 device: %d\n", res);
 							}
 						}
 					}

src/usb_libusb10.h

@@ -74,8 +74,8 @@ typedef struct {
 	int dead_xfers;
 } fnusb_isoc_stream;
 
-int fnusb_num_devices(fnusb_ctx *ctx);
-int fnusb_list_device_attributes(fnusb_ctx *ctx, struct freenect_device_attributes** attribute_list);
+int fnusb_num_devices(freenect_context *ctx);
+int fnusb_list_device_attributes(freenect_context *ctx, struct freenect_device_attributes** attribute_list);
 
 int fnusb_init(fnusb_ctx *ctx, freenect_usb_context *usb_ctx);
 int fnusb_shutdown(fnusb_ctx *ctx);