summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2012-04-17 21:34:01 +0100
committerdakkar <dakkar@thenautilus.net>2012-04-17 21:34:01 +0100
commit1625977d4d47c84cf0f5290e1e75a60394f1efb6 (patch)
tree8de26fb904f9ea4cdd7dff20dc4b2fb6c0cd9c80
parentupdate from ICS 4.0.0 (diff)
downloadtf101-dvorak-keyboard-1625977d4d47c84cf0f5290e1e75a60394f1efb6.tar.gz
tf101-dvorak-keyboard-1625977d4d47c84cf0f5290e1e75a60394f1efb6.tar.bz2
tf101-dvorak-keyboard-1625977d4d47c84cf0f5290e1e75a60394f1efb6.zip
Update from ICS 4.0.4
-rw-r--r--keylayout/AVRCP.kl4
-rw-r--r--keylayout/Generic.kl2
-rw-r--r--keylayout/Vendor_045e_Product_028e.kl32
-rw-r--r--keylayout/Vendor_046d_Product_c216.kl29
-rw-r--r--keylayout/Vendor_054c_Product_0268.kl23
5 files changed, 28 insertions, 62 deletions
diff --git a/keylayout/AVRCP.kl b/keylayout/AVRCP.kl
index 4c91ece..736b43c 100644
--- a/keylayout/AVRCP.kl
+++ b/keylayout/AVRCP.kl
@@ -14,8 +14,8 @@
# Key layout used for Bluetooth AVRCP support.
-key 200 MEDIA_PLAY_PAUSE WAKE
-key 201 MEDIA_PLAY_PAUSE WAKE
+key 200 MEDIA_PLAY WAKE
+key 201 MEDIA_PAUSE WAKE
key 166 MEDIA_STOP WAKE
key 163 MEDIA_NEXT WAKE
key 165 MEDIA_PREVIOUS WAKE
diff --git a/keylayout/Generic.kl b/keylayout/Generic.kl
index ae84c92..fdd9040 100644
--- a/keylayout/Generic.kl
+++ b/keylayout/Generic.kl
@@ -115,7 +115,7 @@ key 88 F12
# key 93 "KEY_KATAKANAHIRAGANA"
# key 94 "KEY_MUHENKAN"
key 95 NUMPAD_COMMA
-key 96 ENTER
+key 96 NUMPAD_ENTER
key 97 CTRL_RIGHT
key 98 NUMPAD_DIVIDE
key 99 SYSRQ
diff --git a/keylayout/Vendor_045e_Product_028e.kl b/keylayout/Vendor_045e_Product_028e.kl
index cdbdca3..99f046a 100644
--- a/keylayout/Vendor_045e_Product_028e.kl
+++ b/keylayout/Vendor_045e_Product_028e.kl
@@ -15,25 +15,20 @@
#
# XBox 360 USB Controller
#
-# NVIDIA Normalized Gamepad
-key 0x130 BUTTON_A
-key 0x131 BUTTON_B
-key 0x133 BUTTON_X
-key 0x134 BUTTON_Y
-# Button "LB" maps to BUTTON_L1.
-key 0x136 BUTTON_L1
-# Button "RB" maps to BUTTON_R1.
-key 0x137 BUTTON_R1
-key 0x13a BACK
-key 0x13b BUTTON_START
-# Button with Xbox logo maps to HOME.
-key 0x13c HOME
-# These two keycodes are for click (press from above) on analog control sticks.
-key 0x13d BUTTON_THUMBL
-key 0x13e BUTTON_THUMBR
+key 304 BUTTON_A
+key 305 BUTTON_B
+key 307 BUTTON_X
+key 308 BUTTON_Y
+key 310 BUTTON_L1
+key 311 BUTTON_R1
+key 314 BUTTON_SELECT
+key 315 BUTTON_START
+key 316 BUTTON_MODE
+key 317 BUTTON_THUMBL
+key 318 BUTTON_THUMBR
-# Left (0x00, 0x01) and right (0x03, 0x04) analog control stick.
+# Left and right stick.
# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd.
# This confuses applications that rely on the flat value because the joystick actually
# settles in a flat range of +/- 4096 or so.
@@ -43,12 +38,9 @@ axis 0x03 Z flat 4096
axis 0x04 RZ flat 4096
# Triggers.
-# (Shoulder trigger buttons marked with "LT" and "RT" are analog.
-# Each axis has range from 0 to 255.)
axis 0x02 LTRIGGER
axis 0x05 RTRIGGER
# Hat.
-# (D-pad is reported as analog. Each axis has range from -1 to 1.)
axis 0x10 HAT_X
axis 0x11 HAT_Y
diff --git a/keylayout/Vendor_046d_Product_c216.kl b/keylayout/Vendor_046d_Product_c216.kl
index b9d86b1..6743323 100644
--- a/keylayout/Vendor_046d_Product_c216.kl
+++ b/keylayout/Vendor_046d_Product_c216.kl
@@ -14,43 +14,24 @@
#
# Logitech Dual Action Controller
-# All buttons map to logical codes correspondent to button layout,
-# using Microsoft X-Box and Logitech F310/F710 as a reference.
#
-# NVIDIA Normalized Gamepad
-# Button "1" maps to BUTTON_X.
-key 0x120 BUTTON_X
-# Button "2" maps to BUTTON_A.
-key 0x121 BUTTON_A
-# Button "3" maps to BUTTON_B.
-key 0x122 BUTTON_B
-# Button "4" maps to BUTTON_Y.
-key 0x123 BUTTON_Y
-# Button "5" maps to BUTTON_L1.
+key 0x120 BUTTON_A
+key 0x123 BUTTON_B
+key 0x121 BUTTON_X
+key 0x122 BUTTON_Y
key 0x124 BUTTON_L1
-# Button "6" maps to BUTTON_R1.
key 0x125 BUTTON_R1
-# Button "7" maps to BUTTON_L2.
key 0x126 BUTTON_L2
-# Button "8" maps to BUTTON_R2.
key 0x127 BUTTON_R2
-# Button "9" maps to BACK.
-key 0x128 BACK
-# Button "10" maps to BUTTON_START.
+key 0x128 BUTTON_SELECT
key 0x129 BUTTON_START
-# These two keycodes are for click (press from above) on analog control sticks.
key 0x12a BUTTON_THUMBL
key 0x12b BUTTON_THUMBR
-# Left (0x00, 0x01) and right (0x02, 0x05) analog control stick.
-# (Each axis has range from 0 to 255.)
axis 0x00 X
axis 0x01 Y
axis 0x02 Z
axis 0x05 RZ
-
-# Hat.
-# (D-pad is reported as analog. Each axis has range from -1 to 1.)
axis 0x10 HAT_X
axis 0x11 HAT_Y
diff --git a/keylayout/Vendor_054c_Product_0268.kl b/keylayout/Vendor_054c_Product_0268.kl
index cc31980..f8ac6a3 100644
--- a/keylayout/Vendor_054c_Product_0268.kl
+++ b/keylayout/Vendor_054c_Product_0268.kl
@@ -15,34 +15,27 @@
#
# Sony Playstation(R)3 Controller
#
-# NVIDIA Normalized Gamepad
key 0x124 DPAD_UP
key 0x125 DPAD_RIGHT
key 0x126 DPAD_DOWN
key 0x127 DPAD_LEFT
-# Button "Select" maps to BACK.
-key 0x120 BACK
+key 0x120 BUTTON_SELECT
key 0x123 BUTTON_START
-# Button with square image maps to BUTTON_X, due to placement analogy.
-key 0x12f BUTTON_X
-# Button with triangle image maps to BUTTON_Y, due to placement analogy.
-key 0x12c BUTTON_Y
-# Button with cross image maps to BUTTON_A, due to placement analogy.
-key 0x12e BUTTON_A
-# Button with circle image maps to BUTTON_B, due to placement analogy.
-key 0x12d BUTTON_B
+key 0x12f BUTTON_A
+key 0x12c BUTTON_B
+key 0x12e BUTTON_X
+key 0x12d BUTTON_Y
key 0x12a BUTTON_L1
key 0x12b BUTTON_R1
key 0x128 BUTTON_L2
key 0x129 BUTTON_R2
-# These two keycodes are for click (press from above) on analog sticks.
key 0x121 BUTTON_THUMBL
key 0x122 BUTTON_THUMBR
-# Button with PlayStation logo maps to HOME
-key 0x2d0 HOME
+# PS key
+key 0x2d0 BUTTON_1
# Left Analog Stick
axis 0x00 X
@@ -52,7 +45,7 @@ axis 0x01 Y
axis 0x02 Z
axis 0x05 RZ
-# D-pad axes
+# DPAD
# axis 0x2c -HAT_Y
# axis 0x2d +HAT_X
# axis 0x2e +HAT_Y