ghost/ndof: Support for USB ID changes for devices made by 3Dconnextion. #116393

Merged
Harley Acheson merged 3 commits from pluser/blender:pluser-new-3dconnextion into main 2024-01-18 17:48:45 +01:00
Contributor

Recently sold 3Dconnexion devices appear to have changed their USB ID.
This commit adds the ID of the Space Mouse Pro Wireless when connected
directly to the device and the ID of the dongle for wireless connection.

Recently sold 3Dconnexion devices appear to have changed their USB ID. This commit adds the ID of the Space Mouse Pro Wireless when connected directly to the device and the ID of the dongle for wireless connection.
Iliya Katushenock added this to the Platforms, Builds Tests & Devices project 2023-12-20 19:49:41 +01:00
Member

In their docs I am seeing 0xC652 as their "Universal Receiver", but 0xC638 is listed as "SpaceMouse Pro Wireless Bluetooth', not plugged in.

Are you certain of the uses shown in the comments? Otherwise I'd be inclined to add the ones you are wanting to add, but do so with 3dconnexion's descriptions:

      switch (product_id) {
        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;
          hid_map_button_num_ = 2;
          hid_map_ = ndof_HID_map_Modern3Dx;
          break;
        }
        case 0xC631: /* SpaceMouse Pro Wireless (cabled). */
        case 0xC632: /* SpaceMouse Pro Wireless Receiver. */
        case 0xC638: /* SpaceMouse Pro Wireless Bluetooth. */
        case 0xC652: /* Universal Receiver. */
        {
          device_type_ = NDOF_SpaceMouseProWireless;
In [their docs](https://3dconnexion.com/fi/support/faq/how-can-i-check-if-my-usb-3d-mouse-is-recognized-by-windows/) I am seeing 0xC652 as their "Universal Receiver", but 0xC638 is listed as "SpaceMouse Pro Wireless Bluetooth', not plugged in. Are you certain of the uses shown in the comments? Otherwise I'd be inclined to add the ones you are wanting to add, but do so with 3dconnexion's descriptions: ```Cpp switch (product_id) { 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; hid_map_button_num_ = 2; hid_map_ = ndof_HID_map_Modern3Dx; break; } case 0xC631: /* SpaceMouse Pro Wireless (cabled). */ case 0xC632: /* SpaceMouse Pro Wireless Receiver. */ case 0xC638: /* SpaceMouse Pro Wireless Bluetooth. */ case 0xC652: /* Universal Receiver. */ { device_type_ = NDOF_SpaceMouseProWireless; ```
Author
Contributor

Indeed, the display looks strange.
The c638 appears to be Bluetooth at first glance, but it is in fact a wired connection. Perhaps the product name is "SpaceMouse Pro Wireless BT".
If any information is required, I can provide it.

Indeed, the display looks strange. The c638 appears to be Bluetooth at first glance, but it is in fact a wired connection. Perhaps the product name is "SpaceMouse Pro Wireless BT". If any information is required, I can provide it.
Member

Indeed, the display looks strange.
The c638 appears to be Bluetooth at first glance, but it is in fact a wired connection. Perhaps the product name is "SpaceMouse Pro Wireless BT".

It is okay that there might be confusion there, but I would just note that in the comments. So perhaps giving c638 a multi-line comment about how it is described as "SpaceMouse Pro Wireless Bluetooth" but is actually wired.

If any information is required, I can provide it.

No, my only concern here is that this section of hex value identifiers is getting a bit long and as we add more I'd like better comments to differentiate between them better. I would like to take advantage of your knowledge with this as we don't find many people familiar with these devices. Especially with c638 because otherwise someone could "correct" this later, unaware of your determination that it is wired.

If you do not want to add more comments, that would be fine too. I could probably merge this and then add comments afterward. But again, I'd rather you do so since you have more knowledge with these.

> Indeed, the display looks strange. > The c638 appears to be Bluetooth at first glance, but it is in fact a wired connection. Perhaps the product name is "SpaceMouse Pro Wireless BT". It is okay that there might be confusion there, but I would just note that in the comments. So perhaps giving c638 a multi-line comment about how it is described as "SpaceMouse Pro Wireless Bluetooth" but is actually wired. > If any information is required, I can provide it. No, my only concern here is that this section of hex value identifiers is getting a bit long and as we add more I'd like better comments to differentiate between them better. I would like to take advantage of your knowledge with this as we don't find many people familiar with these devices. Especially with c638 because otherwise someone could "correct" this later, unaware of your determination that it is wired. If you do not want to add more comments, that would be fine too. I could probably merge this and then add comments afterward. But again, I'd rather you do so since you have more knowledge with these.
Author
Contributor

I added some comments and rebased. @Harley Would you please review this PR again?

I added some comments and rebased. @Harley Would you please review this PR again?
Harley Acheson requested review from Harley Acheson 2024-01-18 17:27:22 +01:00
Member

That is great. Thank you so much for working on this.

That is great. Thank you so much for working on this.
Harley Acheson added 2 commits 2024-01-18 17:43:53 +01:00
Harley Acheson approved these changes 2024-01-18 17:44:24 +01:00
Harley Acheson merged commit c0bc49f035 into main 2024-01-18 17:48:45 +01:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#116393
No description provided.