diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-05-27 22:34:40 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-05-27 22:34:40 +0300 |
| commit | bd678f179b3e9d8e551c6f827ba97ed1defe1de2 (patch) | |
| tree | 0bd7363bd0338fc71b088e6ffbba15aa5fdc488f /intern | |
| parent | 9449126d7ae6a9a55a312b22c63488a0f40f78ef (diff) | |
ndof: detect SpaceMouse Enterprise
New device! Lots of buttons!
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.cpp | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index 27285e49e9e..f18b7911f45 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 ba82f37bb2a..d3c70bbac50 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, |