From c0bc49f035bbec28dbcf667585122843fb63a30f Mon Sep 17 00:00:00 2001 From: ESASHIKA Kaoru Date: Thu, 18 Jan 2024 17:48:35 +0100 Subject: [PATCH] GHOST: Support for Additional 3Dconnextion Devices Add support for additional 3Dconnextion devices, specifically the Space Mouse Pro Wireless when connected directly and for the wireless connection. Pull Request: https://projects.blender.org/blender/blender/pulls/116393 --- intern/ghost/intern/GHOST_NDOFManager.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/intern/ghost/intern/GHOST_NDOFManager.cc b/intern/ghost/intern/GHOST_NDOFManager.cc index deb13741a92..361eac0cc6c 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cc +++ b/intern/ghost/intern/GHOST_NDOFManager.cc @@ -302,8 +302,8 @@ bool GHOST_NDOFManager::setDevice(ushort vendor_id, ushort product_id) break; case 0x256F: /* 3Dconnexion. */ switch (product_id) { - case 0xC62E: /* Plugged in. */ - case 0xC62F: /* Wireless. */ + case 0xC62E: /* SpaceMouse Wireless (cabled). */ + case 0xC62F: /* SpaceMouse Wireless Receiver. */ case 0xC658: /* Wireless (3DConnexion Universal Wireless Receiver in WIN32), see #82412. */ { device_type_ = NDOF_SpaceMouseWireless; @@ -311,8 +311,11 @@ bool GHOST_NDOFManager::setDevice(ushort vendor_id, ushort product_id) hid_map_ = ndof_HID_map_Modern3Dx; break; } - case 0xC631: /* Plugged in. */ - case 0xC632: /* Wireless. */ + case 0xC631: /* SpaceMouse Pro Wireless (cabled). */ + case 0xC632: /* SpaceMouse Pro Wireless Receiver. */ + case 0xC638: /* SpaceMouse Pro Wireless BT (cabled), see #116393. + * 3Dconnexion docs describe this as "Wireless BT", but it is cabled. */ + case 0xC652: /* Universal Receiver. */ { device_type_ = NDOF_SpaceMouseProWireless; hid_map_button_num_ = 27; /* 15 physical buttons, but HID codes range from 0 to 26. */