diff options
Diffstat (limited to 'ps2_usb')
| -rw-r--r-- | ps2_usb/Makefile | 18 | ||||
| -rw-r--r-- | ps2_usb/Makefile.vusb | 19 | ||||
| -rw-r--r-- | ps2_usb/config_pjrc.h | 4 | ||||
| -rw-r--r-- | ps2_usb/config_vusb.h | 4 | ||||
| -rw-r--r-- | ps2_usb/keymap.c | 6 | ||||
| -rw-r--r-- | ps2_usb/matrix.c | 1 |
6 files changed, 27 insertions, 25 deletions
diff --git a/ps2_usb/Makefile b/ps2_usb/Makefile index a548b56d4..7352f6b13 100644 --- a/ps2_usb/Makefile +++ b/ps2_usb/Makefile @@ -13,11 +13,11 @@ COMMON_DIR = .. TARGET_DIR = . # keyboard dependent files -TARGET_SRC = main_pjrc.c \ - keymap.c \ - matrix.c \ - led.c \ - ps2.c +SRC = main.c \ + keymap.c \ + matrix.c \ + led.c \ + ps2.c CONFIG_H = config_pjrc.h @@ -42,8 +42,8 @@ F_CPU = 16000000 # comment out to disable the options. # MOUSEKEY_ENABLE = yes # Mouse keys -USB_EXTRA_ENABLE = yes # Audio control and System control -USB_NKRO_ENABLE = yes # USB Nkey Rollover +EXTRAKEY_ENABLE = yes # Audio control and System control +NKRO_ENABLE = yes # USB Nkey Rollover @@ -52,5 +52,5 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex -include $(COMMON_DIR)/Makefile.pjrc -include $(COMMON_DIR)/Makefile.common +include $(COMMON_DIR)/pjrc.mk +include $(COMMON_DIR)/common.mk diff --git a/ps2_usb/Makefile.vusb b/ps2_usb/Makefile.vusb index ff86d7998..5b6978f01 100644 --- a/ps2_usb/Makefile.vusb +++ b/ps2_usb/Makefile.vusb @@ -13,11 +13,11 @@ COMMON_DIR = .. TARGET_DIR = . # keyboard dependent files -TARGET_SRC = main_vusb.c \ - keymap.c \ - matrix.c \ - led.c \ - ps2_usart.c +SRC = main.c \ + keymap.c \ + matrix.c \ + led.c \ + ps2_usart.c CONFIG_H = config_vusb.h @@ -48,8 +48,9 @@ F_CPU = 20000000 # comment out to disable the options. # MOUSEKEY_ENABLE = yes # Mouse keys -USB_EXTRA_ENABLE = yes # Audio control and System control -#USB_NKRO_ENABLE = yes # USB Nkey Rollover +EXTRAKEY_ENABLE = yes # Audio control and System control +#NKRO_ENABLE = yes # USB Nkey Rollover +NO_UART = yes # UART is unavailable @@ -85,5 +86,5 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE -include $(COMMON_DIR)/Makefile.vusb -include $(COMMON_DIR)/Makefile.common +include $(COMMON_DIR)/vusb.mk +include $(COMMON_DIR)/common.mk diff --git a/ps2_usb/config_pjrc.h b/ps2_usb/config_pjrc.h index 56917beec..883ffab27 100644 --- a/ps2_usb/config_pjrc.h +++ b/ps2_usb/config_pjrc.h @@ -35,8 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key combination for command */ #define IS_COMMAND() ( \ - keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \ - keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \ + keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) || \ + keyboard_report->mods == (MOD_BIT(KB_LCTRL) | MOD_BIT(KB_RSHIFT)) \ ) diff --git a/ps2_usb/config_vusb.h b/ps2_usb/config_vusb.h index 426bb61e2..afd2f7911 100644 --- a/ps2_usb/config_vusb.h +++ b/ps2_usb/config_vusb.h @@ -35,8 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key combination for command */ #define IS_COMMAND() ( \ - keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \ - keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \ + keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) || \ + keyboard_report->mods == (MOD_BIT(KB_LCTRL) | MOD_BIT(KB_RSHIFT)) \ ) diff --git a/ps2_usb/keymap.c b/ps2_usb/keymap.c index ef11daa28..e84e8c29b 100644 --- a/ps2_usb/keymap.c +++ b/ps2_usb/keymap.c @@ -124,7 +124,7 @@ static const uint8_t PROGMEM fn_layer[] = { static const uint8_t PROGMEM fn_keycode[] = { KB_SCLN, // Fn0 KB_SLSH, // Fn1 - KB_A, // Fn2 + KB_NO, // Fn2 KB_NO, // Fn3 KB_NO, // Fn4 KB_NO, // Fn5 @@ -154,7 +154,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, 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,FN2, S, D, F, G, H, J, K, L, FN0, QUOT, ENT, P4, P5, P6, PPLS, + CAPS,A, S, D, F, G, H, J, K, L, FN0, QUOT, ENT, P4, P5, P6, PPLS, LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN1, RSFT, UP, P1, P2, P3, LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT ), @@ -204,7 +204,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, TAB, WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSLS, DEL, END, PGDN, P7, P8, P9, - CAPS,FN2, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, ENT, P4, P5, P6, PPLS, + CAPS,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, ENT, P4, P5, P6, PPLS, LSFT,VOLD,VOLU,MUTE,BTN2,BTN3,BTN2,BTN1,VOLD,VOLU,MUTE, RSFT, UP, P1, P2, P3, LCTL,LGUI,LALT, BTN1, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT ), diff --git a/ps2_usb/matrix.c b/ps2_usb/matrix.c index 5d73cc2a3..1aac3f866 100644 --- a/ps2_usb/matrix.c +++ b/ps2_usb/matrix.c @@ -349,6 +349,7 @@ uint8_t matrix_scan(void) default: state = INIT; } + phex(code); } return 1; } |