From ada55c690dc3a569da88b077d724966d0b1e9a6f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 8 Aug 2022 15:38:19 -0700 Subject: [PATCH] Fixed Joy-Con type detection for the Nintendo Joy-Con Charging Grip --- src/joystick/SDL_joystick.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c index 2155a48d0c..0d778a739e 100644 --- a/src/joystick/SDL_joystick.c +++ b/src/joystick/SDL_joystick.c @@ -1983,6 +1983,13 @@ SDL_GetJoystickGameControllerTypeFromVIDPID(Uint16 vendor, Uint16 product, const type = SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT; } + } else if (vendor == USB_VENDOR_NINTENDO && product == USB_PRODUCT_NINTENDO_SWITCH_JOYCON_GRIP) { + if (name && SDL_strstr(name, "(L)") != NULL) { + type = SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT; + } else { + type = SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT; + } + } else if (vendor == USB_VENDOR_NINTENDO && product == USB_PRODUCT_NINTENDO_SWITCH_JOYCON_PAIR) { type = SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR;