preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for the touchpad button for DualSHock/DualSense controllers

Browse Source
This commit is contained in:
Henrik Rydgård
2026-02-05 02:05:28 +01:00
parent 7adbf0e27e
commit 0fc5e86ca5
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/Hid/DualShock.cpp
+1
View File
@@ -16,6 +16,7 @@ static const ButtonInputMapping g_psInputMappings[] = {
{PS_BTN_OPTIONS, NKCODE_BUTTON_10},
{PS_BTN_L1, NKCODE_BUTTON_7},
{PS_BTN_R1, NKCODE_BUTTON_8},
{PS_BTN_TOUCHPAD, NKCODE_BUTTON_11},
// {PS_BTN_L2, NKCODE_BUTTON_L2}, // These are done by the analog triggers.
// {PS_BTN_R2, NKCODE_BUTTON_R2},
{PS_BTN_L3, NKCODE_BUTTON_THUMBL},
Windows/Hid/SwitchPro.cpp
+20 -3
View File
@@ -84,10 +84,10 @@ struct SwitchProInputReport {
static void ProcessIMU(const u8 *data, HIDControllerState *state) {
// Data contains 3 samples to account for Bluetooth jitter.
// We usually just take the latest one (index 2).
// We just take the latest one (index 2).
const u8* s = &data[24];
// Raw values are Little Endian int16
// Raw values are little endian int16
short ax = (short)(s[0] | (s[1] << 8));
short ay = (short)(s[2] | (s[3] << 8));
short az = (short)(s[4] | (s[5] << 8));
@@ -101,11 +101,29 @@ static void ProcessIMU(const u8 *data, HIDControllerState *state) {
state->accelerometer[1] = ay * ACCEL_SCALE;
state->accelerometer[2] = az * ACCEL_SCALE;
// TODO: Consider if these should be radians or degrees. Check what it is...
state->gyro[0] = gx * GYRO_SCALE;
state->gyro[1] = gy * GYRO_SCALE;
state->gyro[2] = gz * GYRO_SCALE;
}
struct StickCal {
u16 x_center, y_center;
u16 x_min, y_min;
u16 x_max, y_max;
};
// Assuming 'data' is the 9-byte payload starting from byte 20 of the input report
void DecodeCalibration(const u8* data, StickCal* cal) {
// These are 12-bit values packed into 9 bytes
cal->x_max = ((data[1] << 8) & 0xF00) | data[0];
cal->y_max = (data[2] << 4) | (data[1] >> 4);
cal->x_center = ((data[4] << 8) & 0xF00) | data[3];
cal->y_center = (data[5] << 4) | (data[4] >> 4);
cal->x_min = ((data[7] << 8) & 0xF00) | data[6];
cal->y_min = (data[8] << 4) | (data[7] >> 4);
}
static void DecodeSwitchProStick(const u8 *stickData, s8 *outX, s8 *outY) {
int x = ((stickData[1] & 0xF) << 8) | (stickData[0]);
int y = (stickData[1] >> 4) | (stickData[2] << 4);
@@ -117,7 +135,6 @@ static void DecodeSwitchProStick(const u8 *stickData, s8 *outX, s8 *outY) {
*outX = (s8)clamp_value(x, -128, 127);
*outY = (s8)clamp_value(y, -128, 127);
// INFO_LOG(Log::sceCtrl, "Switch Pro input: x=%d, y=%d, cx=%d, cy=%d", x, y, *outX, *outY);
}
// Subcommand helper