[Bf-blender-cvs] [46bc9bc] HMD_viewport: - Updated Oculus CV1 support

TheOnlyJoey noreply at git.blender.org
Sat Oct 29 16:58:25 CEST 2016


Commit: 46bc9bcbba679aefbd601e96d234870ca2670daf
Author: TheOnlyJoey
Date:   Sat Oct 29 16:01:03 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB46bc9bcbba679aefbd601e96d234870ca2670daf

- Updated Oculus CV1 support

===================================================================

M	extern/openhmd/src/drv_oculus_rift/packet.c
M	extern/openhmd/src/drv_oculus_rift/rift.c

===================================================================

diff --git a/extern/openhmd/src/drv_oculus_rift/packet.c b/extern/openhmd/src/drv_oculus_rift/packet.c
index ad57bfd..1bf4743 100644
--- a/extern/openhmd/src/drv_oculus_rift/packet.c
+++ b/extern/openhmd/src/drv_oculus_rift/packet.c
@@ -200,7 +200,7 @@ int encode_enable_components(unsigned char* buffer, bool display, bool audio)
 		flags |= 1;
 	if (audio)
 		flags |= 2;
-	flags |= 4; // I don't know what it is. Wireless?
+//	flags |= 4; // I don't know what it is. Wireless?
 	WRITE8(flags);
 	return 4;
 }
diff --git a/extern/openhmd/src/drv_oculus_rift/rift.c b/extern/openhmd/src/drv_oculus_rift/rift.c
index 5fb62da..f6399d6 100644
--- a/extern/openhmd/src/drv_oculus_rift/rift.c
+++ b/extern/openhmd/src/drv_oculus_rift/rift.c
@@ -141,7 +141,8 @@ static void update_device(ohmd_device* device)
 		// send keep alive message
 		pkt_keep_alive keep_alive = { 0, priv->sensor_config.keep_alive_interval };
 		int ka_size = encode_keep_alive(buffer, &keep_alive);
-		send_feature_report(priv, buffer, ka_size);
+		if (send_feature_report(priv, buffer, ka_size) == -1)
+			LOGE("error sending keepalive");
 
 		// Update the time of the last keep alive we have sent.
 		priv->last_keep_alive = t;
@@ -276,13 +277,15 @@ static ohmd_device* open_device(ohmd_driver* driver, ohmd_device_desc* desc)
 	if (desc->revision == REV_CV1)
 	{
 		size = encode_enable_components(buf, true, true);
-		send_feature_report(priv, buf, size);
+		if (send_feature_report(priv, buf, size) == -1)
+			LOGE("error turning the screens on");
 	}
 
 	// set keep alive interval to n seconds
 	pkt_keep_alive keep_alive = { 0, KEEP_ALIVE_VALUE };
 	size = encode_keep_alive(buf, &keep_alive);
-	send_feature_report(priv, buf, size);
+	if (send_feature_report(priv, buf, size) == -1)
+		LOGE("error setting up keepalive");
 
 	// Update the time of the last keep alive we have sent.
 	priv->last_keep_alive = ohmd_get_tick();




More information about the Bf-blender-cvs mailing list