Skip to content

Commit d5cc3fd

Browse files
authored
FIX: Fix for generic DualShock4 InputDeviceMatcher claiming DualSense devices too (ISX-1411)
FIX: Fixed DualSense controllers being recognized as DualShock4 (ISX-1411) * [InputSystem] Fix for generic DualShock4 InputDeviceMatcher claiming DualSense devices too! o The generic DualShock4GamepadHID InputDeviceMatcher would erroneously claim to match DualSense devices based on the simplistic count of how many properties match. o The previous regex removal change added another WithManufacturerContains() which increased their score when comparing against DualSense controllers making the DualShock4 the best match. o Removing the additional property match restores the original behaviour. o DualShock3GamepadHID has also been fixed here. o These generic matchers are problematic and were only added to work around a defect in an older version of OSX when connecting over Bluetooth where no product or vendor were reported. This defect is no longer present on MacOS but these matchers are kept to support off-brand devices. o Ideally we could weight VID and PID properties more heavily. * Added CHANGELOG entry for FIX: DualSense controllers being recognized as DualShock4
1 parent 97ab628 commit d5cc3fd

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ however, it has to be formatted properly to pass verification tests.
2424
- Fixed 'OnDrop' event not called when 'IPointerDownHandler' is also listened. [ISXB-1014](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1014)
2525
- Fixed InputSystemUIInputModule calling pointer events on parent objects even when the "Send Pointer Hover To Parent" is off. [ISXB-586](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-586)
2626
- Improved performance of disconnected device activation (ISX-1450)
27+
- Fixed DualSense controllers being recognized as DualShock4 (ISX-1411)
2728

2829
### Changed
2930
- Use `ProfilerMarker` instead of `Profiler.BeginSample` and `Profiler.EndSample` when appropriate to enable recording of profiling data.

Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public static void Initialize()
5454
new InputDeviceMatcher()
5555
.WithInterface("HID")
5656
.WithManufacturerContains("Sony")
57-
.WithManufacturerContains("Entertainment")
5857
.WithProduct("Wireless Controller"));
5958

6059
InputSystem.RegisterLayout<DualShock3GamepadHID>(
@@ -67,7 +66,6 @@ public static void Initialize()
6766
new InputDeviceMatcher()
6867
.WithInterface("HID")
6968
.WithManufacturerContains("Sony")
70-
.WithManufacturerContains("Entertainment")
7169
.WithProduct("PLAYSTATION(R)3 Controller", supportRegex: false));
7270
#endif
7371
}

0 commit comments

Comments
 (0)