xt_usb: Fix for reserved codes

diff --git a/converter/xt_usb/matrix.c b/converter/xt_usb/matrix.c
index 473151cb32248d21e74e338851ef00e123ee15e0..fe4eebf3e1bde471a4abeabbd6ed0ad957f229a2 100644 (file)
--- a/converter/xt_usb/matrix.c
+++ b/converter/xt_usb/matrix.c
@@ -76,7 +76,7 @@ static uint8_t move_e0code(uint8_t code) {
         case 0x1D: return 0x7A; // Right Ctrl
         case 0x38: return 0x7C; // Right Alt
     }
-    return code;
+    return 0x00;
 }
 
 uint8_t matrix_scan(void)
@@ -204,17 +204,18 @@ XT Scancodes
 54-7F: Not used in original XT keyboard
 
        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-    50  -   -   -   -   *   *   x   x   x   x   *   *   *   *   *   *
+    50  -   -   -   -   *   *   x   x   x   x   *   *   *   o   o   o
     60  *   *   *   *   x   x   x   x   x   x   x   x   x   x   x   *
     70  x   *   *   x   *   *   x   *   *   x   *   x   *   x   x   *
 
 -: codes existed in original XT keyboard
 *: E0-escaped codes converted into unused code area(internal use in TMK)
 x: Non-espcaped codes(not used in real keyboards probably, for CodeSet2-CodeSet1 translation purpose)
+o: reserved
 
 Usage in TMK:
 
-    00  reserved*
+    00  (reserved) DO NOT USE
     54  PrintScr*
     55  Pause*
     56  Euro2
@@ -224,9 +225,9 @@ Usage in TMK:
     5A  LGUI*
     5B  RGUI*
     5C  APP*
-    5D  reserved*
-    5E  reserved*
-    5F  reserved*
+    5D  (reserved)
+    5E  (reserved)
+    5F  (reserved)
     60  cursor*
     61  cursor*
     62  cursor*

diff --git a/converter/xt_usb/unimap_common.h b/converter/xt_usb/unimap_common.h
index 28e41512c92362e59a4a89098a488e7b5a3184d7..34700067e2602455e327c9a033fc7a986ad334ed 100644 (file)
--- a/converter/xt_usb/unimap_common.h
+++ b/converter/xt_usb/unimap_common.h
@@ -84,7 +84,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
 const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = {
-    { UNIMAP_NUHS,  UNIMAP_ESC,   UNIMAP_1,     UNIMAP_2,     UNIMAP_3,     UNIMAP_4,     UNIMAP_5,     UNIMAP_6     }, /* 00-07 */
+    { UNIMAP_NO,    UNIMAP_ESC,   UNIMAP_1,     UNIMAP_2,     UNIMAP_3,     UNIMAP_4,     UNIMAP_5,     UNIMAP_6     }, /* 00-07 */
     { UNIMAP_7,     UNIMAP_8,     UNIMAP_9,     UNIMAP_0,     UNIMAP_MINUS, UNIMAP_EQUAL, UNIMAP_BSPACE,UNIMAP_TAB   }, /* 08-0F */
     { UNIMAP_Q,     UNIMAP_W,     UNIMAP_E,     UNIMAP_R,     UNIMAP_T,     UNIMAP_Y,     UNIMAP_U,     UNIMAP_I     }, /* 10-17 */
     { UNIMAP_O,     UNIMAP_P,     UNIMAP_LBRC,  UNIMAP_RBRC,  UNIMAP_ENTER, UNIMAP_LCTL,  UNIMAP_A,     UNIMAP_S,    }, /* 18-1F */
@@ -95,11 +95,12 @@ const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = {
     { UNIMAP_F6,    UNIMAP_F7,    UNIMAP_F8,    UNIMAP_F9,    UNIMAP_F10,   UNIMAP_NLCK,  UNIMAP_SLCK,  UNIMAP_P7    }, /* 40-47 */
     { UNIMAP_P8,    UNIMAP_P9,    UNIMAP_PMNS,  UNIMAP_P4,    UNIMAP_P5,    UNIMAP_P6,    UNIMAP_PPLS,  UNIMAP_P1    }, /* 48-4F */
     { UNIMAP_P2,    UNIMAP_P3,    UNIMAP_P0,    UNIMAP_PDOT,  UNIMAP_PSCR,  UNIMAP_PAUSE, UNIMAP_NUHS,  UNIMAP_F11   }, /* 50-57 */
-    { UNIMAP_F12,   UNIMAP_PEQL,  UNIMAP_LGUI,  UNIMAP_RGUI,  UNIMAP_APP,   UNIMAP_VOLD,  UNIMAP_VOLU,  UNIMAP_MUTE  }, /* 58-5F */
+    { UNIMAP_F12,   UNIMAP_PEQL,  UNIMAP_LGUI,  UNIMAP_RGUI,  UNIMAP_APP,   UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO    }, /* 58-5F */
     { UNIMAP_UP,    UNIMAP_LEFT,  UNIMAP_DOWN,  UNIMAP_RIGHT, UNIMAP_F13,   UNIMAP_F14,   UNIMAP_F15,   UNIMAP_F16   }, /* 60-67 */
     { UNIMAP_F17,   UNIMAP_F18,   UNIMAP_F19,   UNIMAP_F20,   UNIMAP_F21,   UNIMAP_F22,   UNIMAP_F23,   UNIMAP_PENT  }, /* 68-6F */
     { UNIMAP_KANA,  UNIMAP_INSERT,UNIMAP_DELETE,UNIMAP_RO,    UNIMAP_HOME,  UNIMAP_END,   UNIMAP_F24,   UNIMAP_PGUP  }, /* 70-77 */
     { UNIMAP_PGDN,  UNIMAP_HENK,  UNIMAP_RCTL,  UNIMAP_MHEN,  UNIMAP_RALT,  UNIMAP_JYEN,  UNIMAP_PCMM,  UNIMAP_PSLS  }, /* 78-7F */
 };
+// unused unimap codes: NUHS, VOLD, VOLU, MUTE
 
 #endif