From b78f0b0881c3ed135cc3008cd32783990143225d Mon Sep 17 00:00:00 2001 From: Nathan S <55564547+NathanX-S@users.noreply.github.com> Date: Mon, 6 Jan 2020 04:53:58 -0500 Subject: [PATCH] device: add support for DualShock Gen 2 (PS4) controllers on Windows Closes #831 Co-authored-by: rdb --- panda/src/device/winRawInputDevice.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/panda/src/device/winRawInputDevice.cxx b/panda/src/device/winRawInputDevice.cxx index 843e434a16..3651f14fb8 100644 --- a/panda/src/device/winRawInputDevice.cxx +++ b/panda/src/device/winRawInputDevice.cxx @@ -69,6 +69,18 @@ static const struct DeviceMapping { {0x0955, 0x7214, InputDevice::DeviceClass::gamepad, 0, {"face_a", "face_b", 0, "face_x", "face_y", "rshoulder", "lshoulder", "rshoulder", 0, 0, 0, "start", 0, "lstick", "rstick", 0} }, + // Dualshock (PS4) + {0x054c, 0x05c4, InputDevice::DeviceClass::gamepad, 0, + {"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick", "guide", 0} + }, + // Dualshock 2nd Gen (PS4 Slim) + {0x054c, 0x09cc, InputDevice::DeviceClass::gamepad, 0, + {"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick", "guide", 0} + }, + // Dualshock 2nd Gen (PS4 wireless adapter) + {0x054c, 0x0ba0, InputDevice::DeviceClass::gamepad, 0, + {"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick", "guide", 0} + }, {0}, };