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.

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

Jump to bottom

fix xbox controller buttons #47

Merged
merged 3 commits into from
Feb 2, 2021
Merged

fix xbox controller buttons #47

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
d87f61c
fix xbox controller buttons
Feb 2, 2021
e37ef20
add controller and browser details
Feb 2, 2021
d86ce52
updated controller details
Feb 2, 2021
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
2 changes: 1 addition & 1 deletion FtcDashboard/dash/src/enums/GamepadType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default {
} else if (
gamepad.id.search(
new RegExp(`(?=.*${ETPACK_VID})(?=.*${ETPACK_PID})`, 'i'),
)
) !== -1
) {
return GamepadType.SONY_DUALSHOCK_4;
} else {
Expand Down
46 changes: 24 additions & 22 deletions FtcDashboard/dash/src/store/middleware/gamepadMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,34 +112,36 @@ const extractGamepadState = (gamepad: Gamepad) => {
};
case GamepadType.XBOX_360:
return {
// same as SONY_DUALSHOCK_4 except guide and touchpad buttons
// tested with generic controller id='Xbox 360 Controller (XInput STANDARD GAMEPAD)' and mapping='standard'
// on Win10/Chrome v88 and Edge v87
// USB ID=24C6, PID=530A
left_stick_x: cleanMotionValues(gamepad.axes[0]),
left_stick_y: cleanMotionValues(-gamepad.axes[1]),
left_stick_y: cleanMotionValues(gamepad.axes[1]),
right_stick_x: cleanMotionValues(gamepad.axes[3]),
right_stick_y: cleanMotionValues(-gamepad.axes[4]),
right_stick_y: cleanMotionValues(gamepad.axes[4]),

dpad_up: gamepad.buttons[0].pressed,
dpad_down: gamepad.buttons[1].pressed,
dpad_left: gamepad.buttons[2].pressed,
dpad_right: gamepad.buttons[3].pressed,
dpad_up: gamepad.buttons[12].pressed,
dpad_down: gamepad.buttons[13].pressed,
dpad_left: gamepad.buttons[14].pressed,
dpad_right: gamepad.buttons[15].pressed,

a: gamepad.buttons[11].pressed,
b: gamepad.buttons[12].pressed,
x: gamepad.buttons[13].pressed,
y: gamepad.buttons[14].pressed,
a: gamepad.buttons[0].pressed,
b: gamepad.buttons[1].pressed,
x: gamepad.buttons[2].pressed,
y: gamepad.buttons[3].pressed,

guide: false,
start: gamepad.buttons[4].pressed,
back: gamepad.buttons[5].pressed,

left_bumper: gamepad.buttons[8].pressed,
right_bumper: gamepad.buttons[9].pressed,

left_stick_button: gamepad.buttons[6].pressed,
right_stick_button: gamepad.buttons[7].pressed,
// the trigger range is [-1, 1] although it starts at 0.0 for some reason
left_trigger: gamepad.axes[2] === 0.0 ? 0.0 : (gamepad.axes[2] + 1) / 2,
right_trigger:
gamepad.axes[5] === 0.0 ? 0.0 : (gamepad.axes[5] + 1) / 2,
start: gamepad.buttons[9].pressed,
back: gamepad.buttons[8].pressed,

left_bumper: gamepad.buttons[4].pressed,
right_bumper: gamepad.buttons[5].pressed,

left_stick_button: gamepad.buttons[10].pressed,
right_stick_button: gamepad.buttons[11].pressed,
left_trigger: gamepad.buttons[6].value,
right_trigger: gamepad.buttons[7].value,
};
case GamepadType.SONY_DUALSHOCK_4:
return {
Expand Down