encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed spamming the controller with reset IMU commands when they are failing

This commit is contained in:
Sam Lantinga 2022-08-09 21:30:11 -07:00
parent eab27b9049
commit 8e782876bb
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -270,6 +270,7 @@ typedef struct {
SDL_bool m_bReportSensors;
SDL_bool m_bHasSensorData;
Uint32 m_unLastInput;
Uint32 m_unLastIMUReset;
SwitchInputOnlyControllerStatePacket_t m_lastInputOnlyState;
SwitchSimpleStatePacket_t m_lastSimpleState;
@ -1369,7 +1370,7 @@ HIDAPI_DriverSwitch_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joysti
/* Set up for input */
ctx->m_bSyncWrite = SDL_FALSE;
ctx->m_unLastInput = SDL_GetTicks();
ctx->m_unLastIMUReset = ctx->m_unLastInput = SDL_GetTicks();
return SDL_TRUE;
@ -2005,16 +2006,22 @@ static void HandleFullControllerState(SDL_Joystick *joystick, SDL_DriverSwitch_C
} else if (ctx->m_bHasSensorData) {
/* Uh oh, someone turned off the IMU? */
SDL_HIDAPI_Device *device = ctx->device;
const Uint32 IMU_RESET_DELAY_MS = 3000;
Uint32 now = SDL_GetTicks();
if (device->updating) {
SDL_UnlockMutex(device->dev_lock);
}
if (SDL_TICKS_PASSED(now, ctx->m_unLastIMUReset + IMU_RESET_DELAY_MS)) {
SDL_HIDAPI_Device *device = ctx->device;
SetIMUEnabled(ctx, SDL_TRUE);
if (device->updating) {
SDL_UnlockMutex(device->dev_lock);
}
if (device->updating) {
SDL_LockMutex(device->dev_lock);
SetIMUEnabled(ctx, SDL_TRUE);
if (device->updating) {
SDL_LockMutex(device->dev_lock);
}
ctx->m_unLastIMUReset = now;
}
} else {