From 6b1976d05bd86086c529eefb7e733e3b87b37665 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 10 Mar 2019 22:48:21 +0900 Subject: [PATCH 1/6] terminal_usb: Fix pin configuration in README --- converter/terminal_usb/Makefile | 4 +--- converter/terminal_usb/README | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/converter/terminal_usb/Makefile b/converter/terminal_usb/Makefile index 78208f7f..fc07155f 100644 --- 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 6ff1bc92..b3aadeae 100644 --- 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 From 53f7770217715f75d266bf222c00a45695abacb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?You=20Xiaojie=20/=20=E5=B0=A4=E6=99=93=E6=9D=B0?= Date: Wed, 13 Mar 2019 07:37:46 +0800 Subject: [PATCH 2/6] Correct two errors of keycode.txt (#594) --- tmk_core/doc/keycode.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmk_core/doc/keycode.txt b/tmk_core/doc/keycode.txt index 1712929c..ee4b4f6f 100644 --- 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 From bf030f54202616b0f8955d7cd9fcfb5bf31561ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?You=20Xiaojie=20/=20=E5=B0=A4=E6=99=93=E6=9D=B0?= Date: Mon, 18 Mar 2019 06:55:40 +0800 Subject: [PATCH 3/6] Correct typo for linux "showkey" command (#603) --- tmk_core/doc/USB_NKRO.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmk_core/doc/USB_NKRO.txt b/tmk_core/doc/USB_NKRO.txt index d9f1d122..ddf79c25 100644 --- 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 From 8bb1c010fa075d6971389db8ebab89ac1b05ca15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?You=20Xiaojie=20/=20=E5=B0=A4=E6=99=93=E6=9D=B0?= Date: Mon, 18 Mar 2019 07:01:15 +0800 Subject: [PATCH 4/6] Correct the comments of matrix ROW and COL. (#600) according to the code: static uint8_t matrix[MATRIX_ROWS]; #define ROW(code) (code>>3) #define COL(code) (code&0x07) in converter/ps2_usb/matrix.c ROW is decided by bits 7~4 of scancode COL is decided by bits 2~0 of scancode --- converter/ps2_usb/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/ps2_usb/config.h b/converter/ps2_usb/config.h index 2fd3ad7f..ceee05b0 100644 --- a/converter/ps2_usb/config.h +++ b/converter/ps2_usb/config.h @@ -29,8 +29,8 @@ along with this program. If not, see . /* 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 */ From 826a10752621762806c5c86bef902e5096651dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?You=20Xiaojie=20/=20=E5=B0=A4=E6=99=93=E6=9D=B0?= Date: Mon, 18 Mar 2019 07:03:04 +0800 Subject: [PATCH 5/6] Redefine GRV,CAPS,RALT and RCTL (#596) --- converter/terminal_usb/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/converter/terminal_usb/keymap.c b/converter/terminal_usb/keymap.c index 9b01b891..55b127f0 100644 --- 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 From 494faeb4881deed89677f4d79e986f70b1915451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?You=20Xiaojie=20/=20=E5=B0=A4=E6=99=93=E6=9D=B0?= Date: Mon, 18 Mar 2019 14:47:07 +0800 Subject: [PATCH 6/6] Correct the comments of matrix ROW and COL. (#604) according to the code: static uint8_t matrix[MATRIX_ROWS]; #define ROW(code) (code>>3) #define COL(code) (code&0x07) in converter/terminal_usb/matrix.c ROW is decided by bits 7-4 of scancode COL is decided by bits 2-0 of scancode --- converter/terminal_usb/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/terminal_usb/config.h b/converter/terminal_usb/config.h index ea5ce62c..6191f728 100644 --- a/converter/terminal_usb/config.h +++ b/converter/terminal_usb/config.h @@ -28,8 +28,8 @@ along with this program. If not, see . /* 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 */