Skip to content

Commit fff2da0

Browse files
committed
Preserve SpaceNavigator detection from #7544
PR #7544 added the plain SpaceNavigator to the SE(3) product-string allowlist while this branch was open. Carry that support over to the id-based matching and add the device's USB identifier, which the author verified against hardware (046d:c626), so the SpaceNavigator is also found when the HID backend cannot read its product string.
1 parent 995692f commit fff2da0

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

docs/source/overview/imitation-learning/teleop_imitation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ the key bindings are:
192192
- "c 189:* rmw"
193193
194194
Isaac Lab supports the SpaceMouse Compact, SpaceMouse Wireless and SpaceNavigator for Notebooks
195-
from 3Dconnexion. SE(3) teleoperation additionally supports the 3Dconnexion Universal Receiver.
195+
from 3Dconnexion. SE(3) teleoperation additionally supports the SpaceNavigator and the
196+
3Dconnexion Universal Receiver.
196197
197198
198199

source/isaaclab/changelog.d/rwiltz-fix-spacemouse-detection.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ Fixed
99
found or opened name the enumerated devices and the required permissions.
1010
* Fixed SpaceMouse discovery giving up when the first supported device could not be opened. Discovery now
1111
continues to the remaining devices and only reports the open failures if none of them could be opened.
12+
* Added the USB identifier of the 3Dconnexion SpaceNavigator, so the device added in :github:`7544` is also
13+
detected when the HID backend cannot read its product string.

source/isaaclab/isaaclab/devices/spacemouse/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def convert_buffer(b1, b2):
5353
# (see the Universal Receiver branch in the listener threads) and is unverified against hardware, so
5454
# they are matched by product string only.
5555
SPACEMOUSE_USB_IDS: dict[tuple[int, int], str] = {
56+
(0x046D, 0xC626): "SpaceNavigator",
5657
(0x256F, 0xC62E): "SpaceMouse Wireless",
5758
(0x256F, 0xC635): "SpaceMouse Compact",
5859
}

0 commit comments

Comments
 (0)