max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tmk/master'

Browse source
This commit is contained in:
Mark Sikora 2019-05-05 17:22:43 -04:00
commit eeb596b283
7 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
converter/ps2_usb/config.h
View file

@ -29,8 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* matrix size */ /* matrix size */
#define MATRIX_ROWS 32 // keycode bit: 3-0 #define MATRIX_ROWS 32 // keycode bit: 7-3
#define MATRIX_COLS 8 // keycode bit: 6-4 #define MATRIX_COLS 8 // keycode bit: 2-0
/* key combination for command */ /* key combination for command */

4
converter/terminal_usb/Makefile
View file

@ -75,10 +75,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
# #
# PS/2 protocol implementations # 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_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes # uses primitive reference code #PS2_USE_BUSYWAIT = yes # uses primitive reference code

5
converter/terminal_usb/README
View file

@ -11,8 +11,8 @@ CONNECTION
---------- ----------
Keyboard ATMega32U4 Keyboard ATMega32U4
---------------------- ----------------------
Data: PD2 Data: PD0
Clock: PD5 Clock: PD1
And VCC and GND, of course. See RESOURCE for keyboard connector pin assign. 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/ KbdBabel: http://www.kbdbabel.org/
RJ45 Connector: http://www.kbdbabel.org/conn/kbd_connector_ibmterm.png RJ45 Connector: http://www.kbdbabel.org/conn/kbd_connector_ibmterm.png
DIN Connector: http://www.kbdbabel.org/conn/kbd_connector_ibm3179_318x_319x.png DIN Connector: http://www.kbdbabel.org/conn/kbd_connector_ibm3179_318x_319x.png
WinAVR: http://winavr.sourceforge.net/
EOF EOF

4
converter/terminal_usb/config.h
View file

@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* matrix size */ /* matrix size */
#define MATRIX_ROWS 17 // keycode bit: 3-0 #define MATRIX_ROWS 17 // keycode bit: 7-3
#define MATRIX_COLS 8 // keycode bit: 6-4 #define MATRIX_COLS 8 // keycode bit: 2-0
/* legacy keymap support */ /* legacy keymap support */

6
converter/terminal_usb/keymap.c
View file

@ -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, F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, 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, 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, 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 /* 101-key keymaps

2
tmk_core/doc/USB_NKRO.txt
View file

@ -155,6 +155,6 @@ AquaKeyTest.exe http://geekhack.org/showthread.php?t=6643
Linux: Linux:
xkeycaps xkeycaps
xev xev
showkeys showkey
EOF EOF

4
tmk_core/doc/keycode.txt
View file

@ -84,7 +84,7 @@ KC_PAUSE KC_PAUS 48 Keyboard Pause1
KC_INSERT KC_INS 49 Keyboard Insert1 KC_INSERT KC_INS 49 Keyboard Insert1
KC_HOME 4A Keyboard Home1 KC_HOME 4A Keyboard Home1
KC_PGUP 4B Keyboard PageUp1 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_END 4D Keyboard End1
KC_PGDOWN KC_PGDN 4E Keyboard PageDown1 KC_PGDOWN KC_PGDN 4E Keyboard PageDown1
KC_RIGHT KC_RGHT 4F Keyboard RightArrow1 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_FAST_FORWARD KC_MFFD Fast Forward
KC_MEDIA_REWIND KC_MRWD Rewind KC_MEDIA_REWIND KC_MRWD Rewind
KC_MEDIA_PLAY_PAUSE KC_MPLY Play/Pause 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_MEDIA_SELECT KC_MSEL AL Consumer Control Configuration
KC_MAIL KC_MAIL AL Email Reader KC_MAIL KC_MAIL AL Email Reader
KC_CALCULATOR KC_CALC AL Calculator KC_CALCULATOR KC_CALC AL Calculator