Make ps2_usart default and fix SpaceFN

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index 04bf28a00c5c995c020654a9ce3d71502089fd73..db0912ebd39926cb855d54dfdb967dade2a7ceda 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -84,9 +84,9 @@ NKRO_ENABLE = yes     # USB Nkey Rollover - not yet supported in LUFA
 
 # PS/2 Options
 #
-#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(recomened)
 #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
 
 
 # Optimize size but this may cause error "relocation truncated to fit"

diff --git a/converter/ps2_usb/keymap_spacefn.c b/converter/ps2_usb/keymap_spacefn.c
index 6b06bae254940e38da3888e4e524eedd6ddcab0d..7f537bfeba3bd902bde05939eadcc57e667e7ca3 100644 (file)
--- a/converter/ps2_usb/keymap_spacefn.c
+++ b/converter/ps2_usb/keymap_spacefn.c
@@ -24,7 +24,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     KEYMAP(
     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,
+    ESC, 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,