From eb4bca11c52bc23b10df6fae52d0634a393a46b0 Mon Sep 17 00:00:00 2001 From: enricobuehler Date: Tue, 14 Jul 2026 12:06:22 +0200 Subject: [PATCH] feat(android): Switch 2 Pro Controller + Joy-Con 2 pair declare SwitchPro 057E:2069 (Pro Controller 2) and 057E:2068 (Joy-Con 2 pair) are the same full pad surface as the OG Pro and ride the same virtual hid-nintendo pad. Mirrors SDL, which folds both to its public NINTENDO_SWITCH_PRO type (the SDL clients bundle 3.4.10, whose switch2 hidapi driver already covers them end to end incl. gyro + GL/GR paddles-as-paddle-buttons). :kit Kotlin compile green. Co-Authored-By: Claude Fable 5 --- .../kit/src/main/kotlin/io/unom/punktfunk/kit/Gamepad.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clients/android/kit/src/main/kotlin/io/unom/punktfunk/kit/Gamepad.kt b/clients/android/kit/src/main/kotlin/io/unom/punktfunk/kit/Gamepad.kt index 1fc05171..03d106c3 100644 --- a/clients/android/kit/src/main/kotlin/io/unom/punktfunk/kit/Gamepad.kt +++ b/clients/android/kit/src/main/kotlin/io/unom/punktfunk/kit/Gamepad.kt @@ -69,8 +69,10 @@ object Gamepad { private val PID_DUALSHOCK4 = setOf(0x05C4, 0x09CC) // Nintendo: Switch Pro Controller — the host builds the virtual hid-nintendo pad (correct - // glyphs + positional layout). - private val PID_SWITCHPRO = setOf(0x2009) + // glyphs + positional layout). The Switch 2 Pro Controller (0x2069) and a Joy-Con 2 pair + // (0x2068) are the same full pad surface and ride the same virtual pad (SDL folds them to + // its NINTENDO_SWITCH_PRO type too). + private val PID_SWITCHPRO = setOf(0x2009, 0x2069, 0x2068) // Valve: Steam Deck built-in controller (0x1205); classic Steam Controller wired (0x1102) / // dongle (0x1142). The host builds the virtual hid-steam pad; rich-input capture (paddles /