Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/hidapi/SDL_hidapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,13 @@ bool SDL_HIDAPI_ShouldIgnoreDevice(int bus, Uint16 vendor_id, Uint16 product_id,
(usage == USB_USAGE_GENERIC_KEYBOARD || usage == USB_USAGE_GENERIC_MOUSE)) {
return true;
}
} else if (vendor_id == USB_VENDOR_FLYDIGI && product_id == USB_PRODUCT_FLYDIGI_GAMEPAD) {
} else if (vendor_id == USB_VENDOR_FLYDIGI_V1 && product_id == USB_PRODUCT_FLYDIGI_V1_GAMEPAD) {
if (usage_page == USB_USAGEPAGE_VENDOR_FLYDIGI) {
return false;
}
return true;
} else if (vendor_id == USB_VENDOR_FLYDIGI_V2 &&
(product_id == USB_PRODUCT_FLYDIGI_V2_APEX || product_id == USB_PRODUCT_FLYDIGI_V2_VADER)) {
if (usage_page == USB_USAGEPAGE_VENDOR_FLYDIGI) {
return false;
}
Expand Down
3 changes: 3 additions & 0 deletions src/joystick/SDL_gamepad.c
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,9 @@ static GamepadMapping_t *SDL_CreateMappingForHIDAPIGamepad(SDL_GUID guid)
if (guid.data[15] >= SDL_FLYDIGI_VADER2) {
// Vader series of controllers have C/Z buttons
SDL_strlcat(mapping_string, "misc2:b15,misc3:b16,", sizeof(mapping_string));
} else if (guid.data[15] == SDL_FLYDIGI_APEX5) {
// Apex 5 has additional shoulder macro buttons
SDL_strlcat(mapping_string, "misc2:b15,misc3:b16,", sizeof(mapping_string));
}
} else if (vendor == USB_VENDOR_8BITDO && product == USB_PRODUCT_8BITDO_ULTIMATE2_WIRELESS) {
SDL_strlcat(mapping_string, "paddle1:b12,paddle2:b11,paddle3:b14,paddle4:b13,", sizeof(mapping_string));
Expand Down
12 changes: 11 additions & 1 deletion src/joystick/SDL_joystick.c
Original file line number Diff line number Diff line change
Expand Up @@ -3234,7 +3234,17 @@ bool SDL_IsJoystickSInputController(Uint16 vendor_id, Uint16 product_id)

bool SDL_IsJoystickFlydigiController(Uint16 vendor_id, Uint16 product_id)
{
return vendor_id == USB_VENDOR_FLYDIGI && product_id == USB_PRODUCT_FLYDIGI_GAMEPAD;
if (vendor_id == USB_VENDOR_FLYDIGI_V1) {
if (product_id == USB_PRODUCT_FLYDIGI_V1_GAMEPAD) {
return true;
}
}
if (vendor_id == USB_VENDOR_FLYDIGI_V2) {
if (product_id == USB_PRODUCT_FLYDIGI_V2_APEX || product_id == USB_PRODUCT_FLYDIGI_V2_VADER) {
return true;
}
}
return false;
}

bool SDL_IsJoystickSteamDeck(Uint16 vendor_id, Uint16 product_id)
Expand Down
Loading
Loading