Fix PS/2 protocol build options
11 files changed, 518 insertions(+), 335 deletions(-) M converter/ps2_usb/Makefile R converter/ps2_usb/{Makefile.pjrc_usart => Makefile.jis} M converter/ps2_usb/Makefile.vusb M converter/ps2_usb/README D converter/ps2_usb/README.vusb R converter/ps2_usb/{config_pjrc_usart => config}.h D converter/ps2_usb/config_pjrc.h D converter/ps2_usb/config_vusb.h A converter/ps2_usb/keymap_jis.c M converter/ps2_usb/usbconfig.h M protocol/ps2.c
M converter/ps2_usb/Makefile => converter/ps2_usb/Makefile +28 -14
@@ 1,10 1,5 @@ # # Makefile for PJRC Teensy # # Target file name (without extension). TARGET = ps2_usb_pjrc TARGET = ps2_usb # Directory common source filess exist TOP_DIR = ../.. @@ 12,14 7,6 @@ TOP_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . # keyboard dependent files SRC = keymap.c \ matrix.c \ led.c \ ps2.c CONFIG_H = config_pjrc.h # MCU name, you MUST set this to match the board you are using # type "make clean" after changing this, so all files will be rebuilt @@ 44,6 31,33 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control NKRO_ENABLE = yes # USB Nkey Rollover PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened) #PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin #PS2_USE_BUSYWAIT = yes # uses primitive reference code # keyboard dependent files SRC = keymap.c \ matrix.c \ led.c ifdef PS2_USE_USART SRC += protocol/ps2_usart.c OPT_DEFS += -DPS2_USE_USART endif ifdef PS2_USE_INT SRC += protocol/ps2.c OPT_DEFS += -DPS2_USE_INT endif ifdef PS2_USE_BUSYWAIT SRC += protocol/ps2.c OPT_DEFS += -DPS2_USE_BUSYWAIT endif #CONFIG_H = config_pjrc_usart.h CONFIG_H = config.h #---------------- Programming Options --------------------------
R converter/ps2_usb/Makefile.pjrc_usart => converter/ps2_usb/Makefile.jis +28 -14
@@ 1,10 1,5 @@ # # Makefile for PJRC Teensy # # Target file name (without extension). TARGET = ps2_usb_pjrc_usart TARGET = ps2_usb_jis # Directory common source filess exist TOP_DIR = ../.. @@ 12,14 7,6 @@ TOP_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . # keyboard dependent files SRC = keymap.c \ matrix.c \ led.c \ ps2_usart.c CONFIG_H = config_pjrc_usart.h # MCU name, you MUST set this to match the board you are using # type "make clean" after changing this, so all files will be rebuilt @@ 44,6 31,33 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control NKRO_ENABLE = yes # USB Nkey Rollover #PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened) #PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin PS2_USE_BUSYWAIT = yes # uses primitive reference code # keyboard dependent files SRC = keymap_jis.c \ matrix.c \ led.c ifdef PS2_USE_USART SRC += protocol/ps2_usart.c OPT_DEFS += -DPS2_USE_USART endif ifdef PS2_USE_INT SRC += protocol/ps2.c OPT_DEFS += -DPS2_USE_INT endif ifdef PS2_USE_BUSYWAIT SRC += protocol/ps2.c OPT_DEFS += -DPS2_USE_BUSYWAIT endif #CONFIG_H = config_pjrc_usart.h CONFIG_H = config.h #---------------- Programming Options --------------------------
M converter/ps2_usb/Makefile.vusb => converter/ps2_usb/Makefile.vusb +7 -9
@@ 1,8 1,3 @@ # # Makefile for V-USB # # Target file name (without extension). TARGET = ps2_usb_vusb @@ 15,15 10,18 @@ TARGET_DIR = . # keyboard dependent files SRC = keymap.c \ matrix.c \ led.c \ ps2_usart.c led.c # Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful. SRC += protocol/ps2_usart.c OPT_DEFS += -DPS2_USE_USART CONFIG_H = config_vusb.h CONFIG_H = config.h # V-USB debug level: To use ps2_usart.c level must be 0 # ps2_usart.c requires USART to receive PS/2 signal. OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS += -DDEBUG_LEVEL=0 # MCU name, you MUST set this to match the board you are using
M converter/ps2_usb/README => converter/ps2_usb/README +61 -55
@@ 1,7 1,7 @@ PS/2 to USB keyboard converter ============================== This firmware converts PS/2 keyboard protocol to USB and for now supports only Scan Code Set 2. This will works on USB AVR(ATMega32U4, AT90USB) or V-USB. This firmware converts PS/2 keyboard protocol to USB and supports only Scan Code Set 2. This will works on USB AVR(ATMega32U4, AT90USB) or V-USB(ATMega168, 328...). Features @@ 19,25 19,29 @@ Keymap customization PS/2 signal handling implementations ------------------------------------ Following three methods are used to implement PS/2 signal handling. a. Simple and stupid wait & read loop(intensive use of cycles) This is implemented with (expected) portable C code for reference. See ps2.c. b. Interrupt driven See ps2_intr.c c. Using USART hardware module(no cycle needed) This uses AVR USART function to recevie PS/2 signal and be used in V-USB converter. See ps2_usart.c. Build Converter --------------- Connect PS/2 keyboard into Teensy with 4 lines(Vcc, GND, Data, Clock). For a. Simple and stupid and b. Interrupt implementaion: By default Clock is on PF0 and Data on PF1. You can change this pin configuration by editing config_pjrc.h. In this photo Vcc is yellow, GND is green, Data is red and Clock is black. http://img17.imageshack.us/img17/7243/201101181933.jpg For c. USART implementation: In case of Teensny(ATMega32u4) CLock is on PD5 and Data on PD2. a. Simple and stupid busy-wait(ps2.c) This is expected to implemented with portable C code for reference. b. Interrupt driven(ps2.c) Uses external interrupt to detect falling edge of clock line. c. USART hardware module(ps2_usart.c) Uses AVR USART engine to recevie PS/2 signal. Recomended and default. This is required to work with V-USB, preceding two methods tend to miss signal edges while V-USB handles USB. To select method edit Makefile. Connect Wires ------------- In case of Teensy2.0(ATMega32U4): 0. Connect Vcc and GND. 1. Connect Clock and Data line. For a. Clock is on PF0 and Data on PF1. For b. Clock is on PD1 and Data on PD2. For c. Clock is on PD5 and Data on PD2. 2. Optionally you need pull-up register. 1K-10K Ohm is OK. To change pin configuration edit config.h. Build Frimware @@ 45,12 49,12 @@ Build Frimware 1. Edit Makefile for build options and MCU setting. Use 'atmega32u4' for Teensy 2.0 or 'at90usb1286' for Teensy++ 2.0. 2. make Just type 'make' in a terminal. Use '-f Makefile.pjrc_intr' option to use b. Interrupt. Use '-f Makefile.pjrc_usart' option to use c. USART. Use '-f Makefile.vusb' option to build V-USB converter. 3. program with Teensy Loader. http://www.pjrc.com/teensy/loader.html Just type `make` in a terminal. Use `-f Makefile.vusb` option to build V-USB converter. Use `-f Makefile.jis` option to use JIS keyboard. 3. program MCU. In case of Teensy use `Teensy Loader`.(http://www.pjrc.com/teensy/loader.html) Otherwise you want to use `avrdude` or `dfu-programmer`. Demonstration of Features @@ 83,34 87,36 @@ Fn layer function: Keymap ------ You can change a keymap by editing code of keymap.c like following. How to define the keymap is probably obvious. You can find key symbols in usb_keycodes.h. To define keymap layer switching may needs a bit of your effort at this time. /* Default Layer: plain keymap * ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,-----------. * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|Slp|Wak| * `---' `---------------' `---------------' `---------------' `-----------' `-----------' * ,-----------------------------------------------------------. ,-----------. ,---------------. * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| /| *| -| * |-----------------------------------------------------------| |-----------| |---------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| | * |-----------------------------------------------------------| `-----------' |-----------| +| * |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| | * |-----------------------------------------------------------| ,---. |---------------| * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| | * |-----------------------------------------------------------| ,-----------. |-----------|Ent| * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl| |Lef|Dow|Rig| | 0| .| | * `-----------------------------------------------------------' `-----------' `---------------' */ KEYMAP( ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, PWR, F13, F14, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS, LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT ), You can change a keymap by editing code of keymap. See common/keycode.h for key symbols. V-USB Support ------------- You can also use this converter on ATmega(168/328) with V-USB instead of Teensy. The converter on V-USB lacks some features for now: USB NKRO and System/Media control. Circuit ------- +---+ +---------------+ USB GND | | ATmega168 | === C3 | | 5V <-------+--------+---|Vcc,AVCC | PS/2 R1 | | ==== D- <----+--+-----R2-----|INT1 RXD|------->DATA D+ <----|---+----R3-----|INT0 XCK|------->CLOCK Z1 Z2 | | ->5V GND<----+---+--+--+-----|GND | ->GND | | | | | C2-+--|XTAL1 | | X1 | | +--C3-+--|XTAL2 | +---------------+ R1: 1.5K Ohm R2,R3: 68 Ohm Z1,Z2: Zenner 3.6V C1,C2: 22pF C3: 0.1uF X1: Crystal 20MHz(16MHz/12MHz) EOF
D converter/ps2_usb/README.vusb => converter/ps2_usb/README.vusb +0 -37
@@ 1,37 0,0 @@ V-USB Support ============= You can also use this converter on ATmega(168/328) with V-USB instead of Teensy. The converter on V-USB lacks some features for now: USB NKRO and System/Media control. To build a firmware use Makefile.vusb instead of Makefile. Circuit ------- +---+ +---------------+ USB GND | | ATmega168 | === C3 | | 5V <-------+--------+---|Vcc,AVCC | PS/2 R1 | | ==== D- <----+--+-----R2-----|INT1 RXD|------->DATA D+ <----|---+----R3-----|INT0 XCK|------->CLOCK Z1 Z2 | | ->5V GND<----+---+--+--+-----|GND | ->GND | | | | | C2-+--|XTAL1 | | X1 | | +--C3-+--|XTAL2 | +---------------+ R1: 1.5K Ohm R2,R3: 68 Ohm Z1,Z2: Zenner 3.6V C1,C2: 22pF C3: 0.1uF X1: Crystal 20MHz(16MHz/12MHz) This is my V-USB converter on breadboard. [IMG]http://i.imgur.com/8jJCZl.jpg[/IMG] EOF
R converter/ps2_usb/config_pjrc_usart.h => converter/ps2_usb/config.h +89 -6
@@ 18,13 18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef CONFIG_H #define CONFIG_H #include <avr/interrupt.h> /* controller configuration */ #include "controller_teensy.h" #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x6513 #define PRODUCT_ID 0x6512 #define MANUFACTURER t.m.k. #define PRODUCT PS/2 keyboard converter(USART) #define PRODUCT PS/2 keyboard converter #define DESCRIPTION convert PS/2 keyboard to USB @@ 46,7 47,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif /* PS/2 lines */ #ifdef PS2_USE_USART #if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) /* XCK for clock line and RXD for data line */ #define PS2_CLOCK_PORT PORTD #define PS2_CLOCK_PIN PIND #define PS2_CLOCK_DDR DDRD @@ 56,9 59,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PS2_DATA_DDR DDRD #define PS2_DATA_BIT 2 // synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge // set DDR of CLOCK as input to be slave /* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ /* set DDR of CLOCK as input to be slave */ #define PS2_USART_INIT() do { \ PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \ PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \ @@ 88,4 90,85 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1))) #define PS2_USART_RX_VECT USART1_RX_vect #elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__) /* XCK for clock line and RXD for data line */ #define PS2_CLOCK_PORT PORTD #define PS2_CLOCK_PIN PIND #define PS2_CLOCK_DDR DDRD #define PS2_CLOCK_BIT 4 #define PS2_DATA_PORT PORTD #define PS2_DATA_PIN PIND #define PS2_DATA_DDR DDRD #define PS2_DATA_BIT 0 /* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ /* set DDR of CLOCK as input to be slave */ #define PS2_USART_INIT() do { \ PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \ PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \ UCSR0C = ((1 << UMSEL00) | \ (3 << UPM00) | \ (0 << USBS0) | \ (3 << UCSZ00) | \ (0 << UCPOL0)); \ UCSR0A = 0; \ UBRR0H = 0; \ UBRR0L = 0; \ } while (0) #define PS2_USART_RX_INT_ON() do { \ UCSR0B = ((1 << RXCIE0) | \ (1 << RXEN0)); \ } while (0) #define PS2_USART_RX_POLL_ON() do { \ UCSR0B = (1 << RXEN0); \ } while (0) #define PS2_USART_OFF() do { \ UCSR0C = 0; \ UCSR0B &= ~((1 << RXEN0) | \ (1 << TXEN0)); \ } while (0) #define PS2_USART_RX_READY (UCSR0A & (1<<RXC0)) #define PS2_USART_RX_DATA UDR0 #define PS2_USART_ERROR (UCSR0A & ((1<<FE0) | (1<<DOR0) | (1<<UPE0))) #define PS2_USART_RX_VECT USART_RX_vect #endif #endif #ifdef PS2_USE_INT /* uses INT1 for clock line(ATMega32U4) */ #define PS2_CLOCK_PORT PORTD #define PS2_CLOCK_PIN PIND #define PS2_CLOCK_DDR DDRD #define PS2_CLOCK_BIT 1 #define PS2_DATA_PORT PORTD #define PS2_DATA_PIN PIND #define PS2_DATA_DDR DDRD #define PS2_DATA_BIT 2 #define PS2_INT_INIT() do { \ EICRA |= ((1<<ISC11) | \ (0<<ISC10)); \ } while (0) #define PS2_INT_ON() do { \ EIMSK |= (1<<INT1); \ } while (0) #define PS2_INT_OFF() do { \ EIMSK &= ~(1<<INT1); \ } while (0) #define PS2_INT_VECT INT1_vect #endif #ifdef PS2_USE_BUSYWAIT #define PS2_CLOCK_PORT PORTF #define PS2_CLOCK_PIN PINF #define PS2_CLOCK_DDR DDRF #define PS2_CLOCK_BIT 0 #define PS2_DATA_PORT PORTF #define PS2_DATA_PIN PINF #define PS2_DATA_DDR DDRF #define PS2_DATA_BIT 1 #endif #endif
D converter/ps2_usb/config_pjrc.h => converter/ps2_usb/config_pjrc.h +0 -59
@@ 1,59 0,0 @@ /* Copyright 2011 Jun Wako <wakojun@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef CONFIG_H #define CONFIG_H /* controller configuration */ #include "controller_teensy.h" #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x6512 #define MANUFACTURER t.m.k. #define PRODUCT PS/2 keyboard converter #define DESCRIPTION convert PS/2 keyboard to USB /* matrix size */ #define MATRIX_ROWS 32 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 /* key combination for command */ #define IS_COMMAND() ( \ keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) || \ keyboard_report->mods == (MOD_BIT(KB_LCTRL) | MOD_BIT(KB_RSHIFT)) \ ) /* mouse keys */ #ifdef MOUSEKEY_ENABLE # define MOUSEKEY_DELAY_TIME 255 #endif /* PS/2 lines */ #define PS2_CLOCK_PORT PORTF #define PS2_CLOCK_PIN PINF #define PS2_CLOCK_DDR DDRF #define PS2_CLOCK_BIT 0 #define PS2_DATA_PORT PORTF #define PS2_DATA_PIN PINF #define PS2_DATA_DDR DDRF #define PS2_DATA_BIT 1 #endif
D converter/ps2_usb/config_vusb.h => converter/ps2_usb/config_vusb.h +0 -133
@@ 1,133 0,0 @@ /* Copyright 2011 Jun Wako <wakojun@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef CONFIG_H #define CONFIG_H #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x2233 // TODO: share these strings with usbconfig.h // Edit usbconfig.h to change these. #define MANUFACTURER t.m.k. #define PRODUCT PS/2 keyboard converter #define DESCRIPTION convert PS/2 keyboard to USB /* matrix size */ #define MATRIX_ROWS 32 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 /* key combination for command */ #define IS_COMMAND() ( \ keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) || \ keyboard_report->mods == (MOD_BIT(KB_LCTRL) | MOD_BIT(KB_RSHIFT)) \ ) /* mouse keys */ #ifdef MOUSEKEY_ENABLE # define MOUSEKEY_DELAY_TIME 255 #endif /* PS/2 lines */ #define PS2_CLOCK_PORT PORTD #define PS2_CLOCK_PIN PIND #define PS2_CLOCK_DDR DDRD #define PS2_CLOCK_BIT 4 #define PS2_DATA_PORT PORTD #define PS2_DATA_PIN PIND #define PS2_DATA_DDR DDRD #define PS2_DATA_BIT 0 // Synchronous USART is used to receive data from keyboard. // Use RXD pin for PS/2 DATA line and XCK for PS/2 CLOCK. // NOTE: This is recomended strongly if you use V-USB library. #define PS2_USE_USART // External or Pin Change Interrupt is used to receive data from keyboard. // Use INT1 or PCINTxx for PS/2 CLOCK line. see below. //#define PS2_USE_INT #ifdef PS2_USE_USART // synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge // set DDR of CLOCK as input to be slave #define PS2_USART_INIT() do { \ PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \ PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \ UCSR0C = ((1 << UMSEL00) | \ (3 << UPM00) | \ (0 << USBS0) | \ (3 << UCSZ00) | \ (0 << UCPOL0)); \ UCSR0A = 0; \ UBRR0H = 0; \ UBRR0L = 0; \ } while (0) #define PS2_USART_RX_INT_ON() do { \ UCSR0B = ((1 << RXCIE0) | \ (1 << RXEN0)); \ } while (0) #define PS2_USART_RX_POLL_ON() do { \ UCSR0B = (1 << RXEN0); \ } while (0) #define PS2_USART_OFF() do { \ UCSR0C = 0; \ UCSR0B &= ~((1 << RXEN0) | \ (1 << TXEN0)); \ } while (0) #define PS2_USART_RX_READY (UCSR0A & (1<<RXC0)) #define PS2_USART_RX_DATA UDR0 #define PS2_USART_ERROR (UCSR0A & ((1<<FE0) | (1<<DOR0) | (1<<UPE0))) #define PS2_USART_RX_VECT USART_RX_vect #endif #ifdef PS2_USE_INT /* INT1 #define PS2_INT_INIT() do { \ EICRA |= ((1<<ISC11) | \ (0<<ISC10)); \ } while (0) #define PS2_INT_ON() do { \ EIMSK |= (1<<INT1); \ } while (0) #define PS2_INT_OFF() do { \ EIMSK &= ~(1<<INT1); \ } while (0) #define PS2_INT_VECT INT1_vect */ /* PCINT20 */ #define PS2_INT_INIT() do { \ PCICR |= (1<<PCIE2); \ } while (0) #define PS2_INT_ON() do { \ PCMSK2 |= (1<<PCINT20); \ } while (0) #define PS2_INT_OFF() do { \ PCMSK2 &= ~(1<<PCINT20); \ PCICR &= ~(1<<PCIE2); \ } while (0) #define PS2_INT_VECT PCINT2_vect #endif #endif
A converter/ps2_usb/keymap_jis.c => converter/ps2_usb/keymap_jis.c +297 -0
@@ 0,0 1,297 @@ /* Copyright 2011 Jun Wako <wakojun@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* * Keymap for PS/2 keyboard */ #include <stdint.h> #include <stdbool.h> #include <avr/pgmspace.h> #include "usb_keycodes.h" #include "print.h" #include "debug.h" #include "util.h" #include "keymap.h" // Following macros help you to define a keymap with the form of actual keyboard layout. /* US layout plus all other various keys */ #define KEYMAP_ALL( \ K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \ \ K61, /* for European ISO */ \ K51, K13, K6A, K64, K67, /* for Japanese JIS */ \ K08, K10, K18, K20, K28, K30, K38, K40, K48, K50, K57, K5F, /* F13-24 */ \ KB7, KBF, KDE, /* System Power, Sleep, Wake */ \ KA3, KB2, KA1, /* Mute, Volume Up, Volume Down */ \ KCD, K95, KBB, KB4, KD0, /* Next, Previous, Stop, Pause, Media Select */ \ KC8, KAB, KC0, /* Mail, Calculator, My Computer */ \ K90, KBA, KB8, KB0, /* WWW Search, Home, Back, Forward */ \ KA8, KA0, K98 /* WWW Stop, Refresh, Favorites */ \ ) { \ { KB_NO, KB_##K01, KB_NO, KB_##K03, KB_##K04, KB_##K05, KB_##K06, KB_##K07 }, \ { KB_##K08, KB_##K09, KB_##K0A, KB_##K0B, KB_##K0C, KB_##K0D, KB_##K0E, KB_NO }, \ { KB_##K10, KB_##K11, KB_##K12, KB_##K13, KB_##K14, KB_##K15, KB_##K16, KB_NO }, \ { KB_##K18, KB_NO, KB_##K1A, KB_##K1B, KB_##K1C, KB_##K1D, KB_##K1E, KB_NO }, \ { KB_##K20, KB_##K21, KB_##K22, KB_##K23, KB_##K24, KB_##K25, KB_##K26, KB_NO }, \ { KB_##K28, KB_##K29, KB_##K2A, KB_##K2B, KB_##K2C, KB_##K2D, KB_##K2E, KB_NO }, \ { KB_##K30, KB_##K31, KB_##K32, KB_##K33, KB_##K34, KB_##K35, KB_##K36, KB_NO }, \ { KB_##K38, KB_NO, KB_##K3A, KB_##K3B, KB_##K3C, KB_##K3D, KB_##K3E, KB_NO }, \ { KB_##K40, KB_##K41, KB_##K42, KB_##K43, KB_##K44, KB_##K45, KB_##K46, KB_NO }, \ { KB_##K48, KB_##K49, KB_##K4A, KB_##K4B, KB_##K4C, KB_##K4D, KB_##K4E, KB_NO }, \ { KB_##K50, KB_##K51, KB_##K52, KB_NO, KB_##K54, KB_##K55, KB_NO, KB_##K57 }, \ { KB_##K58, KB_##K59, KB_##K5A, KB_##K5B, KB_NO, KB_##K5D, KB_NO, KB_##K5F }, \ { KB_NO, KB_##K61, KB_NO, KB_NO, KB_##K64, KB_NO, KB_##K66, KB_##K67 }, \ { KB_NO, KB_##K69, KB_##K6A, KB_##K6B, KB_##K6C, KB_NO, KB_NO, KB_NO }, \ { KB_##K70, KB_##K71, KB_##K72, KB_##K73, KB_##K74, KB_##K75, KB_##K76, KB_##K77 }, \ { KB_##K78, KB_##K79, KB_##K7A, KB_##K7B, KB_##K7C, KB_##K7D, KB_##K7E, KB_NO }, \ { KB_NO, KB_NO, KB_NO, KB_##K83, KB_NO, KB_NO, KB_NO, KB_NO }, \ { KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO }, \ { KB_##K90, KB_##K91, KB_NO, KB_NO, KB_##K94, KB_##K95, KB_NO, KB_NO }, \ { KB_##K98, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_##K9F }, \ { KB_##KA0, KB_##KA1, KB_NO, KB_##KA3, KB_NO, KB_NO, KB_NO, KB_##KA7 }, \ { KB_##KA8, KB_NO, KB_NO, KB_##KAB, KB_NO, KB_NO, KB_NO, KB_##KAF }, \ { KB_##KB0, KB_NO, KB_##KB2, KB_NO, KB_##KB4, KB_NO, KB_NO, KB_##KB7 }, \ { KB_##KB8, KB_NO, KB_##KBA, KB_##KBB, KB_NO, KB_NO, KB_NO, KB_##KBF }, \ { KB_##KC0, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO }, \ { KB_##KC8, KB_NO, KB_##KCA, KB_NO, KB_NO, KB_##KCD, KB_NO, KB_NO }, \ { KB_##KD0, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO }, \ { KB_NO, KB_NO, KB_##KDA, KB_NO, KB_NO, KB_NO, KB_##KDE, KB_NO }, \ { KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO }, \ { KB_NO, KB_##KE9, KB_NO, KB_##KEB, KB_##KEC, KB_NO, KB_NO, KB_NO }, \ { KB_##KF0, KB_##KF1, KB_##KF2, KB_NO, KB_##KF4, KB_##KF5, KB_NO, KB_NO }, \ { KB_NO, KB_NO, KB_##KFA, KB_NO, KB_##KFC, KB_##KFD, KB_##KFE, KB_NO }, \ } /* JIS layout */ #define KEYMAP_JIS( \ K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, KF1,KE9,KFA, K6C,K75,K7D, \ K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D, K5A, K6B,K73,K74,K79, \ K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51, K59, KF5, K69,K72,K7A, \ K14,K9F,K11, K67,K29,K64,K13, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \ ) \ KEYMAP_ALL( \ K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \ \ NUBS, \ K51, K13, K6A, K64, K67, \ F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \ SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \ AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \ MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \ MAIL, CALCULATOR, MY_COMPUTER, \ WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \ WWW_STOP, WWW_REFRESH, WWW_FAVORITES \ ) #define KEYMAP_JIS_COMPACT( \ K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, \ K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, \ K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D, K5A, \ K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51, K59, \ K14,K9F,K11, K67,K29,K64,K13, K91,KA7,KAF,K94 \ ) \ KEYMAP_ALL( \ ESC,F1, F2, F3, F4, F5, F6, F7, F8, F9, F10,F11,F12, PSCR,SLCK,BRK, \ K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, \ K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, DEL, END, PGDN, P7, P8, P9, \ K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, P4, P5, P6, PPLS, \ K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, UP, P1, P2, P3, \ K14,K9F,K11, K29, K91,KA7,KAF,K94, LEFT,DOWN,RGHT, P0, PDOT,PENT, \ \ NUBS, \ K51, K13, K6A, K64, K67, \ F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \ SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \ AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \ MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \ MAIL, CALCULATOR, MY_COMPUTER, \ WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \ WWW_STOP, WWW_REFRESH, WWW_FAVORITES \ ) // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. static const uint8_t PROGMEM fn_layer[] = { 1, // Fn0 2, // Fn1 1, // Fn2 2, // Fn3 3, // Fn4 4, // Fn5 0, // Fn6 0 // Fn7 }; // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. // See layer.c for details. static const uint8_t PROGMEM fn_keycode[] = { KB_SCLN, // Fn0 KB_SLSH, // Fn1 KB_BSPC, // Fn2 KB_NO, // Fn3 KB_NO, // Fn4 KB_SPC, // Fn5 KB_NO, // Fn6 KB_NO // Fn7 }; // The keymap is a 32*8 byte array which convert a PS/2 scan code into a USB keycode. // See usb_keycodes.h for USB keycodes. You should omit a 'KB_' prefix of USB keycodes in keymap macro. // Use KEYMAP_ISO() or KEYMAP_JIS() instead of KEYMAP() if your keyboard is ISO or JIS. static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 0: JIS LAYOUT * ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,-----------. * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|Slp|Wak| * `---' `---------------' `---------------' `---------------' `-----------' `-----------' * ,-----------------------------------------------------------. ,-----------. ,---------------. * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| JY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| * |-----------------------------------------------------------| |-----------| |---------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Ret | |Del|End|PgD| | 7| 8| 9| | * |------------------------------------------------------` | `-----------' |-----------| +| * |CapsLo| A| S| D| F| G| H| J| K| L| ;| :| \| | | 4| 5| 6| | * |-----------------------------------------------------------| ,---. |---------------| * |Shift | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3| | * |-----------------------------------------------------------| ,-----------. |-----------|Ent| * |Ctrl |Gui |Alt |MHEN| Space |HENK|KANA|Alt |Gui |Menu|Ctrl| |Lef|Dow|Rig| | 0| .| | * `-----------------------------------------------------------' `-----------' `---------------' */ /* KEYMAP_JIS( ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, DEL, END, PGDN, P7, P8, P9, CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT,BSLS, ENT, P4, P5, P6, PPLS, LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RO, RSFT, UP, P1, P2, P3, LCTL,LGUI,LALT, MHEN,SPC, HENK,KANA, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT ), */ /* 0: HHKB-wise * ,-----------------------------------------------------------. * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| * |-----------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Bsp | * |------------------------------------------------------` | * |Ctrl | A| S| D| F| G| H| J| K| L| ;| :|Ret| | * |-----------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | * |-----------------------------------------------------------| * |Ctrl |Gui |Alt |MHEN| Space |HENK|KANA|Alt |Gui |Menu|Ctrl| * `-----------------------------------------------------------' */ KEYMAP_JIS_COMPACT( ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,BSPC, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, LCTL,A, S, D, F, G, H, J, K, L, FN0, QUOT,GRV, ENT, LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN1, RSFT, FN4, LCTL,LGUI,LALT, LALT,FN5, FN2, FN3, RALT,RGUI,APP, LGUI ), /* 1: Mouse keys * ,-----------------------------------------------------------. * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa| * |-----------------------------------------------------------| * |Tab |MwL|MwU|McU|WwU|WwR|MwL|MwD|MwU|MwR| | | | \| * |-----------------------------------------------------------| * |CapsLo| |McL|McD|McR| |McL|McD|McU|McR|Fn0| |Return | * |-----------------------------------------------------------| * |Shift |VoD|VoU|Mut|Mb2|Mb3|Mb2|Mb1|VoD|VoU|Mut|Shift | * |-----------------------------------------------------------| * |Ctrl |Gui |Alt | Mb1 |Alt |Gui |Menu|Ctrl| * `-----------------------------------------------------------' * Mc = mouse cursor, Mw = mouse wheel, Mb = mouse button * Vo = Volume, Mut = Mute */ KEYMAP_JIS_COMPACT( GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL, TAB, WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, NO, ENT, LSFT,NO, NO, BTN1,BTN2,BTN3,BTN2,BTN1,BTN2,BTN3,NO, RSFT, RSFT, LCTL,LGUI,LALT, LALT,BTN1,FN2, RALT, RALT,RGUI,APP, LGUI ), /* 2: Cursor keys * ,-----------------------------------------------------------. * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa| * |-----------------------------------------------------------| * |Tab |Hom|PgU| Up|PgU|End|Hom|PgD|PgU|End| | | | \| * |-----------------------------------------------------------| * |CapsLo| |Lef|Dow|Rig| |Lef|Dow| Up|Rig| | |Return | * |-----------------------------------------------------------| * |Shift | | | | | |Hom|PgD|PgU|End|Fn1|Shift | * |-----------------------------------------------------------| * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl| * `-----------------------------------------------------------' */ KEYMAP_JIS_COMPACT( GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL, TAB, HOME,PGUP,UP, PGDN,END, HOME,PGDN,PGUP,END, NO, NO, NO, LCTL,HOME,LEFT,DOWN,RGHT,END, LEFT,DOWN,UP, RGHT,NO, NO, NO, ENT, LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN1, RSFT, RSFT, LCTL,LGUI,LALT, LALT,BTN1,BSPC,FN3, RALT,RGUI,APP, LGUI ), /* 3: HHKB Fn layer */ KEYMAP_JIS_COMPACT( GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL, CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, NO, LCTL,VOLD,VOLU,MUTE,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT,NO, ENT, LSFT,NO, NO, NO, NO, NO, NO, NO, END, PGDN,DOWN,RSFT, FN4, LCTL,LGUI,LALT, LALT,SPC, BSPC,NO, RALT,RGUI,APP, LGUI ), /* 4: Number */ KEYMAP_JIS_COMPACT( GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL, TAB, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, LCTL,1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, ENT, LSFT,NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, RSFT, RSFT, LCTL,LGUI,LALT, LALT,FN5, BSPC,NO, RALT,RGUI,APP, LGUI ), }; uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) { return pgm_read_byte(&keymaps[(layer)][(row)][(col)]); } uint8_t keymap_fn_layer(uint8_t fn_bits) { return pgm_read_byte(&fn_layer[biton(fn_bits)]); } uint8_t keymap_fn_keycode(uint8_t fn_bits) { return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); }
M converter/ps2_usb/usbconfig.h => converter/ps2_usb/usbconfig.h +0 -1
@@ 11,7 11,6 @@ #ifndef __usbconfig_h_included__ #define __usbconfig_h_included__ #include "config_vusb.h" /* General Description:
M protocol/ps2.c => protocol/ps2.c +8 -7
@@ 89,8 89,9 @@ uint8_t ps2_error = PS2_ERR_NONE; void ps2_host_init(void) { #ifdef PS2_INT_ENABLE PS2_INT_ENABLE(); #ifdef PS2_USE_INT PS2_INT_INIT(); PS2_INT_ON(); idle(); #else inhibit(); @@ 103,8 104,8 @@ uint8_t ps2_host_send(uint8_t data) uint8_t res = 0; bool parity = true; ps2_error = PS2_ERR_NONE; #ifdef PS2_INT_DISABLE PS2_INT_DISABLE(); #ifdef PS2_USE_INT PS2_INT_OFF(); #endif /* terminate a transmission if we have */ inhibit(); @@ 144,8 145,8 @@ uint8_t ps2_host_send(uint8_t data) res = ps2_host_recv_response(); ERROR: #ifdef PS2_INT_ENABLE PS2_INT_ENABLE(); #ifdef PS2_USE_INT PS2_INT_ON(); idle(); #else inhibit(); @@ 173,7 174,7 @@ uint8_t ps2_host_recv_response(void) return data; } #ifndef PS2_INT_VECT #ifndef PS2_USE_INT uint8_t ps2_host_recv(void) { return ps2_host_recv_response();