Merge remote-tracking branch 'tmk/master'

diff --git a/converter/ps2_usb/config.h b/converter/ps2_usb/config.h
index 2fd3ad7f56650ebb572b97503dff58e795bf742f..ceee05b041deea797033e402960972d48d0eacf8 100644 (file)
--- a/converter/ps2_usb/config.h
+++ b/converter/ps2_usb/config.h
@@ -29,8 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* matrix size */
-#define MATRIX_ROWS 32  // keycode bit: 3-0
-#define MATRIX_COLS 8   // keycode bit: 6-4
+#define MATRIX_ROWS 32  // keycode bit: 7-3
+#define MATRIX_COLS 8   // keycode bit: 2-0
 
 
 /* key combination for command */

diff --git a/converter/terminal_usb/Makefile b/converter/terminal_usb/Makefile
index 78208f7f497055633526de9beacba6ad76f46eff..fc07155f69a732590277b517f8ea7386b3d2b7b6 100644 (file)
--- a/converter/terminal_usb/Makefile
+++ b/converter/terminal_usb/Makefile
@@ -75,10 +75,8 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 #
 # PS/2 protocol implementations
-#      USART is recommended if it is available, others are for reference purpose.
-#      INT implementation will drop simultaneous key strokes.
 #
-#PS2_USE_USART = yes   # uses hardware USART engine for PS/2 signal receive(recomened)
+#PS2_USE_USART = yes   # uses hardware USART engine for PS/2 signal receive
 PS2_USE_INT = yes      # uses external interrupt for falling edge of PS/2 clock pin
 #PS2_USE_BUSYWAIT = yes        # uses primitive reference code
 

diff --git a/converter/terminal_usb/README b/converter/terminal_usb/README
index 6ff1bc92f3bae3d89edd783090ab9a9619d1c8bc..b3aadeaef288656e3845ffcffaa4ee4c35a9d751 100644 (file)
--- a/converter/terminal_usb/README
+++ b/converter/terminal_usb/README
@@ -11,8 +11,8 @@ CONNECTION
 ----------
 Keyboard    ATMega32U4
 ----------------------
-Data:       PD2
-Clock:      PD5
+Data:       PD0
+Clock:      PD1
 
 And VCC and GND, of course. See RESOURCE for keyboard connector pin assign.
 
@@ -32,6 +32,5 @@ Soarer's Converter: http://geekhack.org/index.php?topic=17458.0
 KbdBabel: http://www.kbdbabel.org/
 RJ45 Connector: http://www.kbdbabel.org/conn/kbd_connector_ibmterm.png
 DIN Connector: http://www.kbdbabel.org/conn/kbd_connector_ibm3179_318x_319x.png
-WinAVR: http://winavr.sourceforge.net/
 
 EOF

diff --git a/converter/terminal_usb/config.h b/converter/terminal_usb/config.h
index ea5ce62caaeb0953d0ef8c27575f91ca57665a09..6191f72819910f4f61f68a30b1db8e09b4764c13 100644 (file)
--- a/converter/terminal_usb/config.h
+++ b/converter/terminal_usb/config.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* matrix size */
-#define MATRIX_ROWS 17  // keycode bit: 3-0
-#define MATRIX_COLS 8   // keycode bit: 6-4
+#define MATRIX_ROWS 17  // keycode bit: 7-3
+#define MATRIX_COLS 8   // keycode bit: 2-0
 
 
 /* legacy keymap support */

diff --git a/converter/terminal_usb/keymap.c b/converter/terminal_usb/keymap.c
index 9b01b8917b7a62e1c3b8a0d4173cd2e8817d7531..55b127f058160486e3ec474baea89a29cc5a3755 100644 (file)
--- a/converter/terminal_usb/keymap.c
+++ b/converter/terminal_usb/keymap.c
@@ -164,11 +164,11 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                      F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
                      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,
 
-    PSCR,ESC,   ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, NO,  BSPC,  INS, HOME,PGUP,  NLCK,PSLS,PAST,PMNS,
+    PSCR,ESC,   GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, NO,  BSPC,  INS, HOME,PGUP,  NLCK,PSLS,PAST,PMNS,
     SLCK,INT4,  TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     NO,    DEL, END, PGDN,  P7,  P8,  P9,  PPLS,
-    PAUS,INT5,  LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     BSLS,ENT,        UP,         P4,  P5,  P6,  PCMM,
+    PAUS,INT5,  CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     BSLS,ENT,        UP,         P4,  P5,  P6,  PCMM,
     APP, INT6,  LSFT,LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     NO,  RSFT,  LEFT,INT2,RGHT,  P1,  P2,  P3,  PENT,
-    RGUI,LGUI,  LCTL,     LALT,               SPC,                          LGUI,     GRV,        DOWN,       NO,  P0,  PDOT,NO
+    RGUI,LGUI,  LCTL,     LALT,               SPC,                          RALT,     RCTL,       DOWN,       NO,  P0,  PDOT,NO
     ),
 
 /* 101-key keymaps

diff --git a/tmk_core/doc/USB_NKRO.txt b/tmk_core/doc/USB_NKRO.txt
index d9f1d122921441ce13c8d42c9683e93fe12490d0..ddf79c25690856e2691d38d794c3ef7d2d25043d 100644 (file)
--- a/tmk_core/doc/USB_NKRO.txt
+++ b/tmk_core/doc/USB_NKRO.txt
@@ -155,6 +155,6 @@ AquaKeyTest.exe http://geekhack.org/showthread.php?t=6643
 Linux:
 xkeycaps
 xev
-showkeys
+showkey
 
 EOF

diff --git a/tmk_core/doc/keycode.txt b/tmk_core/doc/keycode.txt
index 1712929cefa36e7a8e5cc2b6b35366404053f8a1..ee4b4f6f285f421d84c2acdc7e728b501b7df762 100644 (file)
--- a/tmk_core/doc/keycode.txt
+++ b/tmk_core/doc/keycode.txt
@@ -84,7 +84,7 @@ KC_PAUSE            KC_PAUS         48 Keyboard Pause1
 KC_INSERT           KC_INS          49 Keyboard Insert1
 KC_HOME                             4A Keyboard Home1
 KC_PGUP                             4B Keyboard PageUp1
-KC_DELETE           KC_DELETE       4C Keyboard Delete Forward
+KC_DELETE           KC_DEL          4C Keyboard Delete Forward
 KC_END                              4D Keyboard End1
 KC_PGDOWN           KC_PGDN         4E Keyboard PageDown1
 KC_RIGHT            KC_RGHT         4F Keyboard RightArrow1
@@ -201,7 +201,7 @@ KC_MEDIA_STOP       KC_MSTP         Stop
 KC_MEDIA_FAST_FORWARD   KC_MFFD     Fast Forward
 KC_MEDIA_REWIND     KC_MRWD         Rewind
 KC_MEDIA_PLAY_PAUSE KC_MPLY         Play/Pause
-KC_EJCT             KC_MEDIA_EJECT  Stop/Eject
+KC_MEDIA_EJECT      KC_EJCT         Stop/Eject
 KC_MEDIA_SELECT     KC_MSEL         AL Consumer Control Configuration
 KC_MAIL             KC_MAIL         AL Email Reader
 KC_CALCULATOR       KC_CALC         AL Calculator