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

Removed SDL_AUTO_ENABLE_ENHANCED_FLYDIGI

Browse Source
This commit is contained in:
Sam Lantinga
2025-11-03 08:20:41 -08:00
parent 641deb9c0e
commit 6493be9eea
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,22 +294,7 @@ static bool HIDAPI_DriverFlydigi_InitControllerV2(SDL_HIDAPI_Device *device)
if (data[10] == 1) { if (data[10] == 1) {
ctx->available = true; ctx->available = true;
} else { } else {
#ifdef SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
// The FlyDigi Space Station app isn't available, we need to enable this ourselves
Uint8 enable_acquire[] = {
FLYDIGI_V2_CMD_REPORT_ID,
FLYDIGI_V2_MAGIC1,
FLYDIGI_V2_MAGIC2,
FLYDIGI_V2_SET_STATUS_COMMAND,
0x07, 0xff, 0xff, 0xff, 0xff, 0x01, 0x15
};
if (SDL_hid_write(device->dev, enable_acquire, sizeof(enable_acquire)) < 0) {
return SDL_SetError("Couldn't set controller status");
}
#else
// Click "Allow third-party apps to take over mappings" in the FlyDigi Space Station app // Click "Allow third-party apps to take over mappings" in the FlyDigi Space Station app
#endif // SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
} }
return true; return true;
} }

4
src/joystick/hidapi/SDL_hidapi_flydigi.h
View File

@@ -36,7 +36,3 @@ typedef enum
SDL_FLYDIGI_VADER4_PRO, SDL_FLYDIGI_VADER4_PRO,
} SDL_FlyDigiControllerType; } SDL_FlyDigiControllerType;
#ifndef SDL_PLATFORM_WINDOWS
// The FlyDigi Space Station app isn't available on this platform
#define SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
#endif

4
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@@ -1305,9 +1305,6 @@ bool HIDAPI_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version,
*/ */
SDL_LockJoysticks(); SDL_LockJoysticks();
for (device = SDL_HIDAPI_devices; device; device = device->next) { for (device = SDL_HIDAPI_devices; device; device = device->next) {
#ifdef SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
// The HIDAPI functionality will always be available, so ignore the XInput interface
#else
// The HIDAPI functionality will be available when the FlyDigi Space Station app has // The HIDAPI functionality will be available when the FlyDigi Space Station app has
// enabled third party controller mapping, so the driver needs to be active to watch // enabled third party controller mapping, so the driver needs to be active to watch
// for that change. Since this is dynamic and we don't have a way to re-trigger device // for that change. Since this is dynamic and we don't have a way to re-trigger device
@@ -1317,7 +1314,6 @@ bool HIDAPI_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version,
if (device->vendor_id == USB_VENDOR_FLYDIGI_V2) { if (device->vendor_id == USB_VENDOR_FLYDIGI_V2) {
continue; continue;
} }
#endif // SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
if (device->driver && if (device->driver &&
HIDAPI_IsEquivalentToDevice(vendor_id, product_id, device)) { HIDAPI_IsEquivalentToDevice(vendor_id, product_id, device)) {