FIX: Fix for generic DualShock4 InputDeviceMatcher claiming DualSense devices too #1998
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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.
jfreire-unity
approved these changes
Sep 10, 2024
|
Sorry @stefanunity could you take this one over from me |
stefanunity
approved these changes
Sep 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
A previous PR (#1990) improved the performance on DualShockSupport initialization by no longer requiring a RegEx match for DualShock3 and DualShock4 devices.
Unfortunately this had the unintended consequence of causing a DualSense device to be recognized as DualShock4.
This PR addresses that defect.
Changes made
Removing the extra .WithManufacturerContains() line reduces the score returned by these generic matchers ensuring the PID/VID matcher wins when matching DualSense devices.
Testing
Local testing, automated tests.
Risk
No risk - just restores the previous behaviour.
Checklist
Changed,Fixed,Addedsections.Area_CanDoX,Area_CanDoX_EvenIfYIsTheCase,Area_WhenIDoX_AndYHappens_ThisIsTheResult.During merge:
NEW: ___.FIX: ___.DOCS: ___.CHANGE: ___.RELEASE: 1.1.0-preview.3.After merge: