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

Reset the LED state after Bluetooth connection has completed on the PS5 controller

This commit is contained in:
Sam Lantinga 2020-11-21 11:59:01 -08:00
parent 120dc280ca
commit 870841c414
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,11 +130,18 @@ typedef enum {
k_EDS5EffectNone, k_EDS5EffectNone,
k_EDS5EffectRumbleStart, k_EDS5EffectRumbleStart,
k_EDS5EffectRumble, k_EDS5EffectRumble,
k_EDS5EffectLEDReset,
k_EDS5EffectLED, k_EDS5EffectLED,
k_EDS5EffectPadLights, k_EDS5EffectPadLights,
k_EDS5EffectMicLight, k_EDS5EffectMicLight,
} EDS5Effect; } EDS5Effect;
typedef enum {
k_EDS5LEDResetStateNone,
k_EDS5LEDResetStatePending,
k_EDS5LEDResetStateComplete,
} EDS5LEDResetState;
typedef struct { typedef struct {
Sint16 bias; Sint16 bias;
float sensitivity; float sensitivity;
@ -152,6 +159,7 @@ typedef struct {
Uint8 led_red; Uint8 led_red;
Uint8 led_green; Uint8 led_green;
Uint8 led_blue; Uint8 led_blue;
EDS5LEDResetState led_reset_state;
union union
{ {
PS5SimpleStatePacket_t simple; PS5SimpleStatePacket_t simple;
@ -364,6 +372,14 @@ HIDAPI_DriverPS5_UpdateEffects(SDL_HIDAPI_Device *device, EDS5Effect effect)
} }
effects = (DS5EffectsState_t *)&data[offset]; effects = (DS5EffectsState_t *)&data[offset];
/* Make sure the Bluetooth connection sequence has completed before sending LED color change */
if (effect == k_EDS5EffectLED && ctx->is_bluetooth) {
if (ctx->led_reset_state != k_EDS5LEDResetStateComplete) {
ctx->led_reset_state = k_EDS5LEDResetStatePending;
return 0;
}
}
if (ctx->rumble_left || ctx->rumble_right) { if (ctx->rumble_left || ctx->rumble_right) {
effects->ucEnableBits1 |= 0x01; /* Enable rumble emulation */ effects->ucEnableBits1 |= 0x01; /* Enable rumble emulation */
effects->ucEnableBits1 |= 0x02; /* Disable audio haptics */ effects->ucEnableBits1 |= 0x02; /* Disable audio haptics */
@ -382,6 +398,9 @@ HIDAPI_DriverPS5_UpdateEffects(SDL_HIDAPI_Device *device, EDS5Effect effect)
case k_EDS5EffectRumble: case k_EDS5EffectRumble:
/* Already handled above */ /* Already handled above */
break; break;
case k_EDS5EffectLEDReset:
effects->ucEnableBits2 |= 0x08; /* Reset LED state */
break;
case k_EDS5EffectLED: case k_EDS5EffectLED:
effects->ucEnableBits2 |= 0x04; /* Enable LED color */ effects->ucEnableBits2 |= 0x04; /* Enable LED color */
@ -448,6 +467,27 @@ HIDAPI_DriverPS5_SetBluetooth(SDL_HIDAPI_Device *device, SDL_bool is_bluetooth)
} }
} }
static void
HIDAPI_DriverPS5_CheckPendingLEDReset(SDL_HIDAPI_Device *device)
{
SDL_DriverPS5_Context *ctx = (SDL_DriverPS5_Context *)device->context;
const PS5StatePacket_t *packet = &ctx->last_state.state;
/* Check the timer to make sure the Bluetooth connection LED animation is complete */
const Uint32 connection_complete = 10000000;
Uint32 timer = ((Uint32)packet->rgucTimer1[0] << 0) |
((Uint32)packet->rgucTimer1[1] << 8) |
((Uint32)packet->rgucTimer1[2] << 16) |
((Uint32)packet->rgucTimer1[3] << 24);
if (timer >= connection_complete) {
HIDAPI_DriverPS5_UpdateEffects(device, k_EDS5EffectLEDReset);
ctx->led_reset_state = k_EDS5LEDResetStateComplete;
HIDAPI_DriverPS5_UpdateEffects(device, k_EDS5EffectLED);
}
}
static void static void
HIDAPI_DriverPS5_SetDevicePlayerIndex(SDL_HIDAPI_Device *device, SDL_JoystickID instance_id, int player_index) HIDAPI_DriverPS5_SetDevicePlayerIndex(SDL_HIDAPI_Device *device, SDL_JoystickID instance_id, int player_index)
{ {
@ -831,6 +871,9 @@ HIDAPI_DriverPS5_UpdateDevice(SDL_HIDAPI_Device *device)
case k_EPS5ReportIdBluetoothState: case k_EPS5ReportIdBluetoothState:
HIDAPI_DriverPS5_SetBluetooth(device, SDL_TRUE); HIDAPI_DriverPS5_SetBluetooth(device, SDL_TRUE);
HIDAPI_DriverPS5_HandleStatePacket(joystick, device->dev, ctx, (PS5StatePacket_t *)&data[2]); HIDAPI_DriverPS5_HandleStatePacket(joystick, device->dev, ctx, (PS5StatePacket_t *)&data[2]);
if (ctx->led_reset_state == k_EDS5LEDResetStatePending) {
HIDAPI_DriverPS5_CheckPendingLEDReset(device);
}
break; break;
default: default:
#ifdef DEBUG_JOYSTICK #ifdef DEBUG_JOYSTICK