Skip to content
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.

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

Fixing Incorrect Xbox One S PID #828

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/assets/joystick-profiles.ts
Expand Up @@ -161,6 +161,11 @@ export const availableGamepadToCockpitMaps: { [key in JoystickModel]: GamepadToC
axes: [0, 1, 2, 3],
buttons: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],
},
[JoystickModel.XboxOne_Wireless]: {
name: 'Xbox One S',
axes: [0, 1, 2, 3],
buttons: [0, 1, 2, 3, 4, 11, 6, 7, 8, 9, 5, 11, 12, 13, 14, 15, 16, 17],
},
[JoystickModel.XboxOneS_Bluetooth]: {
name: 'Xbox One S',
axes: [0, 1, 2, 3],
Expand Down
4 changes: 3 additions & 1 deletion src/libs/joystick/manager.ts
Expand Up @@ -18,6 +18,7 @@ export enum EventType {
export enum JoystickModel {
DualSense = 'DualSense (PS5)',
DualShock4 = 'DualShock (PS4)',
XboxOne_Wireless = 'Xbox One Wireless Controller',
XboxOneS_Bluetooth = 'Xbox One S (bluetooth)',
XboxController_Bluetooth = 'Xbox controller (bluetooth)',
XboxController_Wired = 'Xbox controller (wired)',
Expand All @@ -31,7 +32,8 @@ const JoystickMapVidPid: Map<string, JoystickModel> = new Map([
// Sony
['054c:0ce6', JoystickModel.DualSense],
['054c:09cc', JoystickModel.DualShock4],
['045e:02e0', JoystickModel.XboxOneS_Bluetooth],
['045e:02e0', JoystickModel.XboxOne_Wireless],
['045e:02fd', JoystickModel.XboxOneS_Bluetooth],
['045e:0b13', JoystickModel.XboxController_Bluetooth],
['045e:0b12', JoystickModel.XboxController_Wired],
['28de:11ff', JoystickModel.XboxController_360],
Expand Down