Skip to content

FIX: Fix for generic DualShock4 InputDeviceMatcher claiming DualSense devices too #1998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 12, 2024
Merged

FIX: Fix for generic DualShock4 InputDeviceMatcher claiming DualSense devices too #1998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3e63c9
[InputSystem] Fix for generic DualShock4 InputDeviceMatcher claiming …
AlexTyrer Sep 10, 2024
6590310
Added CHANGELOG entry for FIX: DualSense controllers being recognized…
AlexTyrer Sep 10, 2024
5bec057
Merge branch 'develop' into isx-1411-input-device-matcher-dualshock-fix
AlexTyrer Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ however, it has to be formatted properly to pass verification tests.
- Fixed 'OnDrop' event not called when 'IPointerDownHandler' is also listened. [ISXB-1014](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1014)
- 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)
- Improved performance of disconnected device activation (ISX-1450)
- Fixed DualSense controllers being recognized as DualShock4 (ISX-1411)

### Changed
- Use `ProfilerMarker` instead of `Profiler.BeginSample` and `Profiler.EndSample` when appropriate to enable recording of profiling data.
Expand Down
2 changes: 0 additions & 2 deletions Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public static void Initialize()
new InputDeviceMatcher()
.WithInterface("HID")
.WithManufacturerContains("Sony")
.WithManufacturerContains("Entertainment")
.WithProduct("Wireless Controller"));

InputSystem.RegisterLayout<DualShock3GamepadHID>(
Expand All @@ -67,7 +66,6 @@ public static void Initialize()
new InputDeviceMatcher()
.WithInterface("HID")
.WithManufacturerContains("Sony")
.WithManufacturerContains("Entertainment")
.WithProduct("PLAYSTATION(R)3 Controller", supportRegex: false));
#endif
}
Expand Down