Fix wired DS4 PS/touchpad button masking in PS4 USB host parser#250
Open
0xSt0le wants to merge 1 commit into
Open
Fix wired DS4 PS/touchpad button masking in PS4 USB host parser#2500xSt0le wants to merge 1 commit into
0xSt0le wants to merge 1 commit into
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #209.
In Firmware/RP2040/src/USBHost/HostDriver/PS4/PS4.cpp, buttons[2] is masked with PS4::COUNTER_MASK (0xFC) before the PS and touchpad bits are checked. On wired DS4 USB reports, the PS and touchpad bits are the low two bits of buttons[2], so the current mask clears them before MAP_BUTTON_SYS / MAP_BUTTON_MISC are tested.
This line changes the mask to preserve the low two bits while clearing the counter bits:
in_report_.buttons[2] &= static_cast<uint8_t>(~PS4::COUNTER_MASK);
Tested: