summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authortmk <hasu@tmk-kbd.com>2015-04-28 11:27:10 +0900
committertmk <hasu@tmk-kbd.com>2015-04-28 11:27:10 +0900
commit4d116a04e94cf0d19317d5b44e4fa9f34a3e5594 (patch)
tree3a2c044bec35111604aedfd024ab2689b3f40c7c /doc
parent1fe4406f374291ab2e86e95a97341fd9c475fcb8 (diff)
Squashed 'tmk_core/' changes from b9e0ea0..caca2c0
caca2c0 Add mouse support to ADB
5b0835a Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'
f2f7556 Remove unneeded tap delays #201
8124195 Fix URL of HID Usage Tables pdf
0bb4679 Fix typo of doc/keycode.txt
b24fa1a Fix handling of consumer usage #199
6ae1a3d Improve anti-ghosting behavior for fast typing
a4c9763 Fix dfu-programmer parameters
b62b3f2 Move ring_buffer.h file
6ec424f Fix debug print
502fb0c Fix ibm4704 protocol with using interrupt

git-subtree-dir: tmk_core
git-subtree-split: caca2c01553394d959550034c817520d575c7fa0
Diffstat (limited to 'doc')
-rw-r--r--doc/keycode.txt2
-rw-r--r--doc/keymap.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/keycode.txt b/doc/keycode.txt
index 760c726e3b..44d7e27cd6 100644
--- a/doc/keycode.txt
+++ b/doc/keycode.txt
@@ -174,7 +174,7 @@ KC_CLEAR_AGAIN                      A2 Keyboard Clear/Again
 KC_CRSEL                            A3 Keyboard CrSel/Props
 KC_EXSEL                            A4 Keyboard ExSel
 /* Modifiers */
-KC_LCTRL            KC_LCTRL        E0 Keyboard LeftControl
+KC_LCTRL            KC_LCTL         E0 Keyboard LeftControl
 KC_LSHIFT           KC_LSFT         E1 Keyboard LeftShift
 KC_LALT                             E2 Keyboard LeftAlt
 KC_LGUI                             E3 Keyboard Left GUI(Windows/Apple/Meta key)
diff --git a/doc/keymap.md b/doc/keymap.md
index 9d986a8c51..d4a129b208 100644
--- a/doc/keymap.md
+++ b/doc/keymap.md
@@ -198,7 +198,7 @@ There are 8 modifiers which has discrimination between left and right.
  See keycode table in [`doc/keycode.txt`](./keycode.txt) for description of keycodes.
 
  In regard to implementation side most of keycodes are identical with [HID usage][HID_usage](pdf) sent to host for real and some virtual keycodes are defined to support special actions.
-[HID_usage]: http://www.usb.org/developers/devclass_docs/Hut1_11.pdf
+[HID_usage]: http://www.usb.org/developers/hidpage/Hut1_12v2.pdf