diff options
| author | Siarhei Vishniakou <svv@google.com> | 2020-02-27 11:30:54 -0800 |
|---|---|---|
| committer | Siarhei Vishniakou <svv@google.com> | 2020-02-27 11:30:54 -0800 |
| commit | 76baf21e11aeef4fe26efac1db058018e5af92d6 (patch) | |
| tree | c47d0410e5ea58274709ce2824b9d8fbea96ce29 | |
| parent | 84d6a305a21af9a5cd40ee065835c3daab2f78af (diff) | |
Update nintendo joystick layout
Now that we will have the correct hid-nintendo driver in the kernel, we
need to update the joystick layout to ensure correct operation.
This change requires the hid-nintendo patch from:
https://android-review.googlesource.com/c/kernel/common/+/1246269/
Test: verified via bluetooth and usb using controllerTester app
Test: atest NintendoSwitchProTest
Bug: 135136477
Change-Id: I8d5c660864a46e8fcd6967c7fffd42460f86e36f
| -rw-r--r-- | data/keyboards/Vendor_057e_Product_2009.kl | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/data/keyboards/Vendor_057e_Product_2009.kl b/data/keyboards/Vendor_057e_Product_2009.kl index b36e946a547f..3c6b11e4640c 100644 --- a/data/keyboards/Vendor_057e_Product_2009.kl +++ b/data/keyboards/Vendor_057e_Product_2009.kl @@ -19,25 +19,25 @@ # Mapping according to https://developer.android.com/training/game-controllers/controller-input.html -# Button labeled as "Y" but should really produce keycode "X" -key 0x132 BUTTON_X # Button labeled as "B" but should really produce keycode "A" key 0x130 BUTTON_A # Button labeled as "A" but should really produce keycode "B" key 0x131 BUTTON_B # Button labeled as "X" but should really product keycode "Y" key 0x133 BUTTON_Y +# Button labeled as "Y" but should really produce keycode "X" +key 0x134 BUTTON_X # Button labeled as "L" -key 0x134 BUTTON_L1 +key 0x136 BUTTON_L1 # Button labeled as "R" -key 0x135 BUTTON_R1 +key 0x137 BUTTON_R1 # No LT / RT axes on this controller. Instead, there are keys. # Trigger labeled as "ZL" -key 0x136 BUTTON_L2 +key 0x138 BUTTON_L2 # Trigger labeled as "ZR" -key 0x137 BUTTON_R2 +key 0x139 BUTTON_R2 # Left Analog Stick axis 0x00 X @@ -47,22 +47,30 @@ axis 0x03 Z axis 0x04 RZ # Left stick click (generates linux BTN_SELECT) -key 0x13a BUTTON_THUMBL +key 0x13d BUTTON_THUMBL # Right stick click (generates linux BTN_START) -key 0x13b BUTTON_THUMBR +key 0x13e BUTTON_THUMBR -# Hat +# Currently, the dpad produces key events +key 0x220 DPAD_UP +key 0x221 DPAD_DOWN +key 0x222 DPAD_LEFT +key 0x223 DPAD_RIGHT + +# Hat - currently not being produced by hid-nintendo, but an upcoming patch set will change the behaviour. +# Keep these mappings in anticipation of that change axis 0x10 HAT_X axis 0x11 HAT_Y # Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt # Minus -key 0x138 BUTTON_SELECT +key 0x13a BUTTON_SELECT + # Plus -key 0x139 BUTTON_START +key 0x13b BUTTON_START # Circle -key 0x13d BUTTON_MODE +key 0x135 BUTTON_MODE # Home key key 0x13c HOME |