gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved reliability detecting FlyDigi Vader controllers

Browse Source
This commit is contained in:
Sam Lantinga
2025-06-16 11:07:50 -07:00
parent 0e262dfd44
commit b833c618a9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/hidapi/SDL_hidapi_flydigi.c
View File

@@ -95,19 +95,18 @@ static void UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
{ {
SDL_DriverFlydigi_Context *ctx = (SDL_DriverFlydigi_Context *)device->context; SDL_DriverFlydigi_Context *ctx = (SDL_DriverFlydigi_Context *)device->context;
for (int attempt = 0; ctx->deviceID == 0 && attempt < 3; ++attempt) { // Detecting the Vader 2 can take over 1000 read retries, so be generous here
for (int attempt = 0; ctx->deviceID == 0 && attempt < 30; ++attempt) {
const Uint8 request[] = { FLYDIGI_CMD_REPORT_ID, FLYDIGI_GET_INFO_COMMAND, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; const Uint8 request[] = { FLYDIGI_CMD_REPORT_ID, FLYDIGI_GET_INFO_COMMAND, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int size = SDL_hid_write(device->dev, request, sizeof(request)); // This write will occasionally return -1, so ignore failure here and try again
if (size < 0) { (void)SDL_hid_write(device->dev, request, sizeof(request));
break;
}
// Read the reply // Read the reply
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
SDL_Delay(1); SDL_Delay(1);
Uint8 data[USB_PACKET_LENGTH]; Uint8 data[USB_PACKET_LENGTH];
size = SDL_hid_read_timeout(device->dev, data, sizeof(data), 0); int size = SDL_hid_read_timeout(device->dev, data, sizeof(data), 0);
if (size < 0) { if (size < 0) {
break; break;
} }