mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-04 17:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sensor timestamp calculation for third-party PS5 controllers

Browse Source
This commit is contained in:
Sam Lantinga
2023-09-18 11:50:56 -07:00
parent c0443e5d12
commit 7059a55ccc
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/joystick/hidapi/SDL_hidapi_ps5.c
View File

@@ -102,7 +102,7 @@ typedef struct
Uint8 rgucAccelX[2]; /* 21 */ Uint8 rgucAccelX[2]; /* 21 */
Uint8 rgucAccelY[2]; /* 23 */ Uint8 rgucAccelY[2]; /* 23 */
Uint8 rgucAccelZ[2]; /* 25 */ Uint8 rgucAccelZ[2]; /* 25 */
Uint8 rgucSensorTimestamp[4]; /* 27 - 32 bit little endian */ Uint8 rgucSensorTimestamp[2]; /* 27 - 16/32 bit little endian */
} PS5StatePacketCommon_t; } PS5StatePacketCommon_t;
@@ -154,7 +154,9 @@ typedef struct
Uint8 rgucAccelX[2]; /* 21 */ Uint8 rgucAccelX[2]; /* 21 */
Uint8 rgucAccelY[2]; /* 23 */ Uint8 rgucAccelY[2]; /* 23 */
Uint8 rgucAccelZ[2]; /* 25 */ Uint8 rgucAccelZ[2]; /* 25 */
Uint8 rgucSensorTimestamp[4]; /* 27 - 32 bit little endian */ Uint8 rgucSensorTimestamp[2]; /* 27 - 16 bit little endian */
Uint8 ucBatteryLevel; /* 29 */
Uint8 ucUnknown; /* 30 */
Uint8 ucTouchpadCounter1; /* 31 - high bit clear + counter */ Uint8 ucTouchpadCounter1; /* 31 - high bit clear + counter */
Uint8 rgucTouchpadData1[3]; /* 32 - X/Y, 12 bits per axis */ Uint8 rgucTouchpadData1[3]; /* 32 - X/Y, 12 bits per axis */
Uint8 ucTouchpadCounter2; /* 35 - high bit clear + counter */ Uint8 ucTouchpadCounter2; /* 35 - high bit clear + counter */
@@ -1308,22 +1310,34 @@ static void HIDAPI_DriverPS5_HandleStatePacketCommon(SDL_Joystick *joystick, SDL
SDL_SendJoystickAxis(timestamp, joystick, SDL_GAMEPAD_AXIS_RIGHTY, axis); SDL_SendJoystickAxis(timestamp, joystick, SDL_GAMEPAD_AXIS_RIGHTY, axis);
if (ctx->report_sensors) { if (ctx->report_sensors) {
Uint32 tick;
Uint32 delta; Uint32 delta;
Uint64 sensor_timestamp; Uint64 sensor_timestamp;
float data[3]; float data[3];
tick = LOAD32(packet->rgucSensorTimestamp[0], if (ctx->use_alternate_report) {
packet->rgucSensorTimestamp[1], /* 16-bit timestamp */
packet->rgucSensorTimestamp[2], Uint16 tick = LOAD16(packet->rgucSensorTimestamp[0],
packet->rgucSensorTimestamp[3]); packet->rgucSensorTimestamp[1]);
if (ctx->last_tick < tick) { if (ctx->last_tick < tick) {
delta = (tick - ctx->last_tick); delta = (tick - ctx->last_tick);
} else {
delta = (SDL_MAX_UINT16 - ctx->last_tick + tick + 1);
}
ctx->last_tick = tick;
} else { } else {
delta = (SDL_MAX_UINT32 - ctx->last_tick + tick + 1); /* 32-bit timestamp */
Uint32 tick = LOAD32(packet->rgucSensorTimestamp[0],
packet->rgucSensorTimestamp[1],
packet->rgucSensorTimestamp[2],
packet->rgucSensorTimestamp[3]);
if (ctx->last_tick < tick) {
delta = (tick - ctx->last_tick);
} else {
delta = (SDL_MAX_UINT32 - ctx->last_tick + tick + 1);
}
ctx->last_tick = tick;
} }
ctx->sensor_ticks += delta; ctx->sensor_ticks += delta;
ctx->last_tick = tick;
/* Sensor timestamp is in 0.33us units */ /* Sensor timestamp is in 0.33us units */
sensor_timestamp = (ctx->sensor_ticks * SDL_NS_PER_US) / 3; sensor_timestamp = (ctx->sensor_ticks * SDL_NS_PER_US) / 3;