[Bf-blender-cvs] [bd678f1] master: ndof: detect SpaceMouse Enterprise

[Mike Erwin]

Commit: bd678f179b3e9d8e551c6f827ba97ed1defe1de2
Author: Mike Erwin
Date:   Fri May 27 15:34:40 2016 -0400
Branches: master
https://developer.blender.org/rBbd678f179b3e9d8e551c6f827ba97ed1defe1de2

ndof: detect SpaceMouse Enterprise

New device! Lots of buttons!

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

M	intern/ghost/intern/GHOST_NDOFManager.cpp
M	intern/ghost/intern/GHOST_NDOFManager.h

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

diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index 27285e4..f18b791 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -299,6 +299,12 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
 					m_buttonMask = 0x07C0F137;
 					m_hidMap = Modern3Dx_HID_map;
 					break;
+				case 0xC633:
+					puts("ndof: using SpaceMouse Enterprise");
+					m_deviceType = NDOF_SpaceMouseEnterprise;
+					m_buttonCount = 31;
+					m_hidMap = Modern3Dx_HID_map;
+					break;
 
 				default:
 					printf("ndof: unknown 3Dconnexion product %04hx\n", product_id);
diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h
index ba82f37..d3c70bb 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.h
+++ b/intern/ghost/intern/GHOST_NDOFManager.h
@@ -40,6 +40,7 @@ typedef enum {
 	NDOF_SpaceMousePro,
 	NDOF_SpaceMouseWireless,
 	NDOF_SpaceMouseProWireless,
+	NDOF_SpaceMouseEnterprise,
 
 	// older devices
 	NDOF_SpacePilot,