From c0ee79594bb8a25ec7c0cfc1e15e0be422130905 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 9 Jun 2021 23:19:21 +0200 Subject: [PATCH 1/9] trying one map --- keyboards/converter/ibmpc_usb/ibmpc_usb.c | 141 ++++++++++++++++++ keyboards/converter/ibmpc_usb/ibmpc_usb.h | 121 ++++++++++----- .../ibmpc_usb/keymaps/default/keymap.c | 2 +- .../ibmpc_usb/keymaps/marfrit/keymap.c | 9 +- keyboards/converter/ibmpc_usb/rules.mk | 3 +- 5 files changed, 230 insertions(+), 46 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.c b/keyboards/converter/ibmpc_usb/ibmpc_usb.c index f4d77ed83935..3aa393f1834e 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.c +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.c @@ -16,3 +16,144 @@ along with this program. If not, see . */ #include "ibmpc_usb.h" + +const uint8_t PROGMEM map_cs1[MATRIX_ROWS][MATRIX_COLS] = { + { KC_NO, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 }, /* 00-07 */ + { KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,KC_TAB }, /* 08-0F */ + { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I }, /* 10-17 */ + { KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_LCTL, KC_A, KC_S, }, /* 18-1F */ + { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, /* 20-27 */ + { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, /* 28-2F */ + { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, /* 30-37 */ + { KC_LALT, KC_SPACE, KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 }, /* 38-3F */ + { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, /* 40-47 */ + { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, /* 48-4F */ + { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, /* 50-57 */ + { KC_F12, KC_PEQL, KC_LGUI, KC_RGUI, KC_APP, KC_MUTE, KC_VOLD, KC_VOLU }, /* 58-5F */ + { KC_UP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F13, KC_F14, KC_F15, KC_F16 }, /* 60-67 */ + { KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_PENT }, /* 68-6F */ + { KC_KANA, KC_INSERT,KC_DELETE,KC_RO, KC_HOME, KC_END, KC_F24, KC_PGUP }, /* 70-77 */ + { KC_PGDN, KC_HENK, KC_RCTL, KC_MHEN, KC_RALT, KC_JYEN, KC_PCMM, KC_PSLS }, /* 78-7F */ +}; + + +/* + * Scan Code Set 2: + * ,-----------------------------------------------. + * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24| + * ,---. |-----------------------------------------------| ,-----------. ,-----------. + * |Esc| |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut| + * `---' `-----------------------------------------------' `-----------' `-----------' + * ,-----------------------------------------------------------. ,-----------. ,---------------. + * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| + * |-----------------------------------------------------------| |-----------| |---------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| + * |-----------------------------------------------------------| `-----------' |---------------| + * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| ^a|Entr| | 4| 5| 6|KP,| + * |-----------------------------------------------------------| ,---. |---------------| + * |Shft| <| Z| X| C| V| B| N| M| ,| .| /| RO|Shift | |Up | | 1| 2| 3|Ent| + * |-----------------------------------------------------------| ,-----------. |---------------| + * |Ctl|Gui|Alt|MHEN| Space |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | #| 0| .|KP=| + * `-----------------------------------------------------------' `-----------' `---------------' + * + * ,-----------------------------------------------. + * | 08| 10| 18| 20| 28| 30| 38| 40| 48| 50| 57| 5F| + * ,---. |-----------------------------------------------| ,-----------. ,-----------. + * | 76| | 05| 06| 04| 0C| 03| 0B| 83| 0A| 01| 09| 78| 07| |+7C| 7E|+77| |*21|*32|*23| + * `---' `-----------------------------------------------' `-----------' `-----------' + * ,-----------------------------------------------------------. ,-----------. ,---------------. + * | 0E| 16| 1E| 26| 25| 2E| 36| 3D| 3E| 46| 45| 4E| 55| 6A| 66| |*70|*6C|*7D| | 77|*4A| 7C| 7B| + * |-----------------------------------------------------------| |-----------| |---------------| + * | 0D | 15| 1D| 24| 2D| 2C| 35| 3C| 43| 44| 4D| 54| 5B| 5D | |*71|*69|*7A| | 6C| 75| 7D| 79| + * |-----------------------------------------------------------| `-----------' |---------------| + * | 58 | 1C| 1B| 23| 2B| 34| 33| 3B| 42| 4B| 4C| 52| ^a| 5A | | 6B| 73| 74| 6D| + * |-----------------------------------------------------------| ,---. |---------------| + * | 12 | 61| 1A| 22| 21| 2A| 32| 31| 3A| 41| 49| 4A| 51| 59 | |*75| | 69| 72| 7A|*5A| + * |-----------------------------------------------------------| ,-----------. |---------------| + * | 14|*1F| 11| 67 | 29 | 64 | 13 |*11|*27|*2F|*14| |*6B|*72|*74| | 68| 70| 71| 63| + * `-----------------------------------------------------------' `-----------' `---------------' + * *: E0-prefixed codes. See cs2_e0code() for remapping to unimap array. + * +: Special codes sequence + * ^a: ISO hash key and US backslash use identical code 5D. + * 51, 63, 68, 6A, 6D: Hidden keys in IBM model M [6] + */ +const uint8_t PROGMEM map_cs2[MATRIX_ROWS][MATRIX_COLS] = { + { KC_PAUS, KC_F9, KC_F7, KC_F5, KC_F3, K0C, KC_F2, KC_F12 }, /* 00-07 */ + { KC_F13, KC_F10, KC_F8, KC_F6, KC_F4, KC_TAB, KC_GRV, KC_RALT }, /* 08-0F */ + { KC_F14, KC_LALT, KC_LSHIFT,KC_KANA, KC_LCTL, KC_Q, KC_1, KC_RCTL }, /* 10-17 */ + { KC_F15, KC_LGUI, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_RGUI }, /* 18-1F */ + { KC_F16, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_END }, /* 20-27 */ + { KC_F17, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_HOME }, /* 28-2F */ + { KC_F18, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_DEL }, /* 30-37 */ + { KC_F19, KC_INS, KC_M, KC_J, KC_U, KC_7, KC_8, KC_DOWN }, /* 38-3F */ + { KC_F20, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_RIGHT }, /* 40-47 */ + { KC_F21, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_UP }, /* 48-4F */ + { KC_F22, KC_RO, KC_QUOTE, KC_LEFT, KC_LBRC, KC_EQUAL, KC_PGDN, KC_F23 }, /* 50-57 */ + { KC_CAPS, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_APP, KC_BSLASH,KC_PGUP, KC_F24 }, /* 58-5F */ + { KC_PSLS, KC_NUBS, KC_PENT, KC_PEQL, KC_HENK, KC_VOLD, KC_BSPACE,KC_MHEN }, /* 60-67 */ + { KC_NUHS, KC_P1, KC_JYEN, KC_P4, KC_P7, KC_PCMM, KC_VOLU, KC_MUTE }, /* 68-6F */ + { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ + { KC_F11, KC_PPLS, KC_P3, KC_PMNS, KC_PAST, KC_P9, KC_SLCK, KC_PSCR }, /* 78-7F */ +}; + + +/* + * Scan Code Set 3: + * ,-----------------------------------------------. + * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24| + * |-----------------------------------------------| + * |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| + * `-----------------------------------------------' + * ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. + * |Mut|HEN| | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY| BS| | /|PgU|PgD| |Esc|NmL|ScL| *| + * |-------| |-----------------------------------------------------------| |-----------| |---------------| + * |VUp|Pau| |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |End|Ins|Del| | 7| 8| 9| +| + * |-------| |-----------------------------------------------------------| `-----------' |-----------|---| + * |VDn|MHE| |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #| Ret| |JPY|Up | #| | 4| 5| 6| -| + * |-------| |-----------------------------------------------------------| ,-----------. |---------------| + * |PrS|App| |Shif| \| Z| X| C| V| B| N| M| ,| ,| /| RO| Shift| |Lef|Hom|Rig| | 1| 2| 3|Ent| + * |-------| |-----------------------------------------------------------| `-----------' |-----------|---| + * |Gui|Gui| |Ctrl| |Alt | Space |Alt | |Ctrl| | RO|Dow|KAN| | ,| 0| .| =| + * `-------' `----' `---------------------------------------' `----' ---`---'--- `---------------' + * + * ,-----------------------------------------------. + * | 08| 10| 18| 20| 28| 30| 38| 40| 48| 50| 57| 5F| + * |-----------------------------------------------| + * | 07| 0F| 17| 1F| 27| 2F| 37| 3F| 47| 4F| 56| 5E| + * `-----------------------------------------------' + * ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. + * | 05| 06| | 0E| 16| 1E| 26| 25| 2E| 36| 3D| 3E| 46| 45| 4E| 55| 5D| 66| | 67| 6E| 6F| | 76| 77| 7E|*84| + * |-------| |-----------------------------------------------------------| |-----------| |---------------| + * | 04| 0C| | 0D | 15| 1D| 24| 2D| 2C| 35| 3C| 43| 44| 4D| 54| 5B| 5C | | 64| 65| 6D| | 6C| 75| 7D| 7C| + * |-------| |-----------------------------------------------------------| `-----------' |---------------| + * | 03| 0B| | 14 | 1C| 1B| 23| 2B| 34| 33| 3B| 42| 4B| 4C| 52| 53| 5A | |-26| 63|-25| | 6B| 73| 74| 7B| + * |-------| |-----------------------------------------------------------| ,-----------. |---------------| + * |*83| 0A| | 12 | 13| 1A| 22| 21| 2A| 32| 31| 3A| 41| 49| 4A| 51| 59 | | 61| 62| 6A| | 69| 72| 7A| 79| + * |-------| |-----------------------------------------------------------| `-----------' |---------------| + * | 01| 09| | 11 | |19 | 29 |39 | | 58 | |-16| 60|-1E| | 68| 70| 71| 78| + * `-------' `-----' `---------------------------------------' `-----' ---`---'--- `---------------' + * *: Special codes remapped 83->02, 84->7F + * -: G80-2551 specific 80-prefixed codes remapped: 26->5D, 25->53, 16->51, 1E->00 + * 51, 5C, 5D, 68, 78: Hidden keys in IBM 122-key terminal keyboard [7] + */ +const uint8_t PROGMEM map_cs3[MATRIX_ROWS][MATRIX_COLS] = { + { KC_KANA, KC_LGUI, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE, KC_HENK, K0C }, /* 00-07 */ + { KC_F13, KC_RGUI, KC_APP, KC_MHEN, KC_PAUS, KC_TAB, KC_GRV, KC_F2 }, /* 08-0F */ + { KC_F14, KC_LCTL, KC_LSHIFT,KC_NUBS, KC_CAPS, KC_Q, KC_1, KC_F3 }, /* 10-17 */ + { KC_F15, KC_LALT, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_F4 }, /* 18-1F */ + { KC_F16, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_F5 }, /* 20-27 */ + { KC_F17, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_F6 }, /* 28-2F */ + { KC_F18, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_F7 }, /* 30-37 */ + { KC_F19, KC_RALT, KC_M, KC_J, KC_U, KC_7, KC_8, KC_F8 }, /* 38-3F */ + { KC_F20, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_F9 }, /* 40-47 */ + { KC_F21, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_F10 }, /* 48-4F */ + { KC_F22, KC_RO, KC_QUOTE, KC_NUHS, KC_LBRC, KC_EQUAL, KC_F11, KC_F23 }, /* 50-57 */ + { KC_RCTL, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_BSLASH,KC_JYEN, KC_F12, KC_F24 }, /* 58-5F */ + { KC_DOWN, KC_LEFT, KC_HOME, KC_UP, KC_END, KC_INS, KC_BSPACE,KC_PSLS }, /* 60-67 */ + { KC_PCMM, KC_P1, KC_RIGHT, KC_P4, KC_P7, KC_DEL, KC_PGUP, KC_PGDN }, /* 68-6F */ + { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ + { KC_PEQL, KC_PENT, KC_P3, KC_PMNS, KC_PPLS, KC_P9, KC_SLCK, KC_PAST }, /* 78-7F */ +}; + + + diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.h b/keyboards/converter/ibmpc_usb/ibmpc_usb.h index f67a9bd9c4b3..1aefbee26513 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.h +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.h @@ -19,6 +19,7 @@ along with this program. If not, see . #define IBMPC_USB_H #include "quantum.h" +#define XXX KC_NO void matrix_init_user(void); @@ -28,6 +29,46 @@ void matrix_init_user(void); but the mapping is not finished yet. */ +/* + F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24. + F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F10, F12. + +PF1, PF2, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, STB,BSP, INS, HOM, PUP, NLK, SLS, AST, MNS, +PF3, PF4, TAB, Q, W, E, R, T, Y, U, I, O, P, [, ], DEL, END, PDN, 7, 8, 9, PLS, +PF5, PF6, CLK, A, S, D, F, G, H, J, K L, ;, ', \, ENT, UP, 4, 5, 6, COM, +PF7, PF8, LSF, <, Z, X, C, V, B, N, M, ,, ., /, STB RSF, LFT, SHT, RGT, 1, 2, 3, ENT, +PF9, PF10. LCL, LAT, SPC, RAT, RCL, DN, STB, 0, DOT + +*/ +#define LAYOUT_127(\ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ + K0C, K0D, K0E, K0F, K10, K11, K12, K13, K14, K15, K16, K17, \ +\ +K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ +K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, \ +K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, \ +K5B, K5C, K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, K70, K71, \ +K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, \ +K7D, K7E \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ + { K10, K11, K12, K13, K14, K15, K16, K17 }, \ + { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { K20, K21, K22, K23, K24, K25, K26, K27 }, \ + { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ + { K30, K31, K32, K33, K34, K35, K36, K37 }, \ + { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ + { K40, K41, K42, K43, K44, K45, K46, K47 }, \ + { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ + { K70, K71, K72, K73, K74, K75, K76, K77 }, \ + { K78, K79, K7A, K7B, K7C, K7D, K7E, XXX } \ +} + #define LAYOUT_105( \ K76, K05,K06,K04,K0C,K03,K0B,K02,K0A,K01,K09,K78,K07, K7F,K7E,K00, \ K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, K39,K2F,K5E, K77,K60,K7C,K7B, \ @@ -36,25 +77,25 @@ void matrix_init_user(void); K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, K4F, K69,K72,K7A, \ K14,K19,K11, K29, K0F,K1F,K5C,K17, K53,K3F,K47, K70, K71,K62 \ ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { KC_NO, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { KC_NO, K11, K12, KC_NO, K14, K15, K16, K17 }, \ - { KC_NO, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { KC_NO, K21, K22, K23, K24, K25, K26, K27 }, \ - { KC_NO, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { KC_NO, K31, K32, K33, K34, K35, K36, K37 }, \ - { KC_NO, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { KC_NO, K41, K42, K43, K44, K45, K46, K47 }, \ - { KC_NO, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { KC_NO, KC_NO, K52, K53, K54, K55, K56, KC_NO }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, KC_NO }, \ - { K60, K61, K62, KC_NO, KC_NO, KC_NO, K66, KC_NO }, \ - { KC_NO, K69, KC_NO, K6B, K6C, KC_NO, KC_NO, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ + { XXX, K11, K12, XXX, K14, K15, K16, K17 }, \ + { XXX, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { XXX, K21, K22, K23, K24, K25, K26, K27 }, \ + { XXX, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ + { XXX, K31, K32, K33, K34, K35, K36, K37 }, \ + { XXX, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ + { XXX, K41, K42, K43, K44, K45, K46, K47 }, \ + { XXX, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ + { XXX, XXX, K52, K53, K54, K55, K56, XXX }, \ + { K58, K59, K5A, K5B, K5C, K5D, K5E, XXX }, \ + { K60, K61, K62, XXX, XXX, XXX, K66, XXX }, \ + { XXX, K69, XXX, K6B, K6C, XXX, XXX, XXX }, \ + { K70, K71, K72, K73, K74, K75, K76, K77 }, \ + { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ } -#define LAYOUT_122( \ +#define LAYOUT_CS3( \ K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F, \ K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E, \ \ @@ -64,22 +105,22 @@ void matrix_init_user(void); K02,K0A, K12,K13,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K51,K59, K61,K62,K6A, K69,K72,K7A,K79, \ K01,K09, K11, K19, K29, K39, K58, K60, K68,K70,K71,K78 \ ) { \ - { KC_NO, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ + { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ + { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ + { K10, K11, K12, K13, K14, K15, K16, K17 }, \ + { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { K20, K21, K22, K23, K24, K25, K26, K27 }, \ + { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ + { K30, K31, K32, K33, K34, K35, K36, K37 }, \ + { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ + { K40, K41, K42, K43, K44, K45, K46, K47 }, \ + { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ + { K70, K71, K72, K73, K74, K75, K76, K77 }, \ + { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ } #define LAYOUT_xt( \ @@ -89,7 +130,7 @@ void matrix_init_user(void); K41, K42, K2A, K2B, K2C, K2D, K2E, K2F, K30, K31, K32, K33, K34, K35, K36, K37, K4F, K50, K51, K4E, \ K43, K44, K38, K39, K3A, K52, K53 \ ) { \ - { KC_NO, K01, K02, K03, K04, K05, K06, K07 }, \ + { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ { K10, K11, K12, K13, K14, K15, K16, K17 }, \ { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ @@ -99,12 +140,12 @@ void matrix_init_user(void); { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ { K40, K41, K42, K43, K44, K45, K46, K47 }, \ { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ + { K50, K51, K52, K53, XXX, XXX, XXX, XXX }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ } typedef enum { NONE, PC_XT, PC_AT, PC_TERMINAL, PC_AT_Z150 } keyboard_kind_t; diff --git a/keyboards/converter/ibmpc_usb/keymaps/default/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/default/keymap.c index f1aabcf1c6b1..41767d620d66 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/default/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/default/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT_105( + LAYOUT_ALL( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c index 83206ead573d..57f1892a8a6b 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c @@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 122 keys, but 127 matrix positions (stabilizer inserts can be replaced by flipper an converted to keys) */ -/* - LAYOUT_122( + + LAYOUT_127( KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, @@ -39,8 +39,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PAUS,KC_INT5, KC_LCTL, KC_H, LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_O, KC_D, RSFT_T(KC_T), RCTL_T(KC_R), LALT_T(KC_N), KC_S, KC_QUOT, KC_BSLS, KC_ENT, KC_UP, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_APP, KC_INT6, KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_NO, KC_RSFT, KC_LEFT, KC_INT2,KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, KC_RGUI,KC_LGUI, KC_CAPS, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_DOWN, KC_NO, KC_P0, KC_PDOT,KC_NO + ), -*/ +/* LAYOUT_xt( KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_SLCK, KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PMNS, @@ -48,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F7, KC_F8, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_F9, KC_F10, KC_LALT, KC_SPC, KC_CAPS, KC_P0, KC_PDOT ), - +*/ }; void keyboard_post_init_user(void) { diff --git a/keyboards/converter/ibmpc_usb/rules.mk b/keyboards/converter/ibmpc_usb/rules.mk index 25d97d3ad3cc..fea6bcdd43fd 100644 --- a/keyboards/converter/ibmpc_usb/rules.mk +++ b/keyboards/converter/ibmpc_usb/rules.mk @@ -25,4 +25,5 @@ API_SYSEX_ENABLE = no SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes -SRC = matrix.c ibmpc.c ibmpc_usb.c +SRC = matrix.c ibmpc.c +#ibmpc_usb.c From 2b7fbcc7b5c513328c2c7adaeeddd739217a805e Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Mon, 14 Jun 2021 13:23:25 +0200 Subject: [PATCH 2/9] map map map --- keyboards/converter/ibmpc_usb/ibmpc_usb.c | 63 +++++++++---------- keyboards/converter/ibmpc_usb/ibmpc_usb.h | 11 ++-- .../ibmpc_usb/keymaps/marfrit/keymap.c | 23 +++++++ keyboards/converter/ibmpc_usb/matrix_122.txt | 20 ++++++ 4 files changed, 78 insertions(+), 39 deletions(-) create mode 100644 keyboards/converter/ibmpc_usb/matrix_122.txt diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.c b/keyboards/converter/ibmpc_usb/ibmpc_usb.c index 3aa393f1834e..5eb64efd65b0 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.c +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.c @@ -25,7 +25,7 @@ const uint8_t PROGMEM map_cs1[MATRIX_ROWS][MATRIX_COLS] = { { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, /* 20-27 */ { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, /* 28-2F */ { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, /* 30-37 */ - { KC_LALT, KC_SPACE, KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 }, /* 38-3F */ + { KC_LALT, KC_SPACE, KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 }, /* 38-3F */ { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, /* 40-47 */ { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, /* 48-4F */ { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, /* 50-57 */ @@ -78,22 +78,22 @@ const uint8_t PROGMEM map_cs1[MATRIX_ROWS][MATRIX_COLS] = { * 51, 63, 68, 6A, 6D: Hidden keys in IBM model M [6] */ const uint8_t PROGMEM map_cs2[MATRIX_ROWS][MATRIX_COLS] = { - { KC_PAUS, KC_F9, KC_F7, KC_F5, KC_F3, K0C, KC_F2, KC_F12 }, /* 00-07 */ - { KC_F13, KC_F10, KC_F8, KC_F6, KC_F4, KC_TAB, KC_GRV, KC_RALT }, /* 08-0F */ - { KC_F14, KC_LALT, KC_LSHIFT,KC_KANA, KC_LCTL, KC_Q, KC_1, KC_RCTL }, /* 10-17 */ - { KC_F15, KC_LGUI, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_RGUI }, /* 18-1F */ - { KC_F16, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_END }, /* 20-27 */ - { KC_F17, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_HOME }, /* 28-2F */ - { KC_F18, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_DEL }, /* 30-37 */ - { KC_F19, KC_INS, KC_M, KC_J, KC_U, KC_7, KC_8, KC_DOWN }, /* 38-3F */ - { KC_F20, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_RIGHT }, /* 40-47 */ - { KC_F21, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_UP }, /* 48-4F */ - { KC_F22, KC_RO, KC_QUOTE, KC_LEFT, KC_LBRC, KC_EQUAL, KC_PGDN, KC_F23 }, /* 50-57 */ - { KC_CAPS, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_APP, KC_BSLASH,KC_PGUP, KC_F24 }, /* 58-5F */ + { KC_PAUS, 0x08, 0x06, 0x04, 0x02, 0x00, 0x01, 0x0B }, /* 00-07 */ + { 0x0C, 0x09, 0x07, 0x05, 0x03, KC_TAB, KC_GRV, KC_RALT }, /* 08-0F */ + { 0x0D, KC_LALT, KC_LSHIFT,KC_KANA, KC_LCTL, KC_Q, KC_1, KC_RCTL }, /* 10-17 */ + { 0x0E, KC_LGUI, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_RGUI }, /* 18-1F */ + { 0x0F, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_END }, /* 20-27 */ + { 0x10, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_HOME }, /* 28-2F */ + { 0x11, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_DEL }, /* 30-37 */ + { 0x12, KC_INS, KC_M, KC_J, KC_U, KC_7, KC_8, KC_DOWN }, /* 38-3F */ + { 0x13, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_RIGHT }, /* 40-47 */ + { 0x14, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_UP }, /* 48-4F */ + { 0x15, KC_RO, KC_QUOTE, KC_LEFT, KC_LBRC, KC_EQUAL, KC_PGDN, 0x16 }, /* 50-57 */ + { KC_CAPS, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_APP, KC_BSLASH,KC_PGUP, 0x17 }, /* 58-5F */ { KC_PSLS, KC_NUBS, KC_PENT, KC_PEQL, KC_HENK, KC_VOLD, KC_BSPACE,KC_MHEN }, /* 60-67 */ { KC_NUHS, KC_P1, KC_JYEN, KC_P4, KC_P7, KC_PCMM, KC_VOLU, KC_MUTE }, /* 68-6F */ { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ - { KC_F11, KC_PPLS, KC_P3, KC_PMNS, KC_PAST, KC_P9, KC_SLCK, KC_PSCR }, /* 78-7F */ + { 0x0A, KC_PPLS, KC_P3, KC_PMNS, KC_PAST, KC_P9, KC_SLCK, KC_PSCR }, /* 78-7F */ }; @@ -137,23 +137,20 @@ const uint8_t PROGMEM map_cs2[MATRIX_ROWS][MATRIX_COLS] = { * 51, 5C, 5D, 68, 78: Hidden keys in IBM 122-key terminal keyboard [7] */ const uint8_t PROGMEM map_cs3[MATRIX_ROWS][MATRIX_COLS] = { - { KC_KANA, KC_LGUI, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE, KC_HENK, K0C }, /* 00-07 */ - { KC_F13, KC_RGUI, KC_APP, KC_MHEN, KC_PAUS, KC_TAB, KC_GRV, KC_F2 }, /* 08-0F */ - { KC_F14, KC_LCTL, KC_LSHIFT,KC_NUBS, KC_CAPS, KC_Q, KC_1, KC_F3 }, /* 10-17 */ - { KC_F15, KC_LALT, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_F4 }, /* 18-1F */ - { KC_F16, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_F5 }, /* 20-27 */ - { KC_F17, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_F6 }, /* 28-2F */ - { KC_F18, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_F7 }, /* 30-37 */ - { KC_F19, KC_RALT, KC_M, KC_J, KC_U, KC_7, KC_8, KC_F8 }, /* 38-3F */ - { KC_F20, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_F9 }, /* 40-47 */ - { KC_F21, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_F10 }, /* 48-4F */ - { KC_F22, KC_RO, KC_QUOTE, KC_NUHS, KC_LBRC, KC_EQUAL, KC_F11, KC_F23 }, /* 50-57 */ - { KC_RCTL, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_BSLASH,KC_JYEN, KC_F12, KC_F24 }, /* 58-5F */ - { KC_DOWN, KC_LEFT, KC_HOME, KC_UP, KC_END, KC_INS, KC_BSPACE,KC_PSLS }, /* 60-67 */ - { KC_PCMM, KC_P1, KC_RIGHT, KC_P4, KC_P7, KC_DEL, KC_PGUP, KC_PGDN }, /* 68-6F */ - { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ - { KC_PEQL, KC_PENT, KC_P3, KC_PMNS, KC_PPLS, KC_P9, KC_SLCK, KC_PAST }, /* 78-7F */ + { XXX, 0x73, 0x5C, 0x47, 0x30, 0x18, 0x19, 0x00 }, /* 00-07 */ + { 0x0C, 0x74, 0x5D, 0x48, 0x31, 0x32, 0x1A, 0x01 }, /* 08-0F */ + { 0x0D, 0x75, 0x5E, 0x5F, 0x49, 0x33, 0x1B, 0x02 }, /* 10-17 */ + { 0x0E, 0x76, 0x60, 0x4B, 0x4A, 0x34, 0x1C, 0x03 }, /* 18-1F */ + { 0x1F, 0x62, 0x61, 0x4C, 0x35, 0x1E, 0x1D, 0x04 }, /* 20-27 */ + { 0x10, 0x77, 0x63, 0x4D, 0x37, 0x36, 0x1F, 0x05 }, /* 28-2F */ + { 0x11, 0x65, 0x64, 0x4F, 0x4E, 0x38, 0x20, 0x06 }, /* 30-37 */ + { 0x12, 0x78, 0x66, 0x50, 0x39, 0x21, 0x22, 0x07 }, /* 38-3F */ + { 0x13, 0x67, 0x51, 0x3A, 0x3B, 0x24, 0x23, 0x08 }, /* 40-47 */ + { 0x14, 0x68, 0x69, 0x52, 0x53, 0x3C, 0x25, 0x09 }, /* 48-4F */ + { 0x15, 0x6A, 0x54, 0x55, 0x3D, 0x26, 0x0A, 0x16 }, /* 50-57 */ + { 0x79, 0x6B, 0x56, 0x3E, 0x3F, 0x27, 0x0B, 0x17 }, /* 58-5F */ + { 0x7A, 0x6C, 0x6D, 0x57, 0x40, 0x41, 0x28, 0x29 }, /* 60-67 */ + { 0x7B, 0x6F, 0x6E, 0x58, 0x43, 0x42, 0x2A, 0x2B }, /* 68-6F */ + { 0x7C, 0x7D, 0x70, 0x59, 0x5A, 0x44, 0x2C, 0x2D }, /* 70-77 */ + { 0x7E, 0x72, 0x71, 0x5B, 0x46, 0x45, 0x2E, 0x2F }, /* 78-7F */ }; - - - diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.h b/keyboards/converter/ibmpc_usb/ibmpc_usb.h index 1aefbee26513..ba6e9e67415a 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.h +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.h @@ -44,12 +44,11 @@ PF9, PF10. LCL, LAT, SPC, RAT, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ K0C, K0D, K0E, K0F, K10, K11, K12, K13, K14, K15, K16, K17, \ \ -K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ -K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, \ -K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, \ -K5B, K5C, K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, K70, K71, \ -K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, \ -K7D, K7E \ +K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ +K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, K46, \ +K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, \ +K5C, K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, K70, K71, K72, \ +K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E \ ) { \ { K00, K01, K02, K03, K04, K05, K06, K07 }, \ { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c index 57f1892a8a6b..c82c6332255a 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c @@ -59,3 +59,26 @@ void keyboard_post_init_user(void) { //debug_keyboard=true; //debug_mouse=true; } + +//action_t action_for_key(uint8_t layer, keypos_t key) + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + uint8_t unimap_pos; + switch (keyboard_kind) { + case PC_XT: + unimap_pos = pgm_read_byte(&map_cs1[key.row][key.col]); + break; + case PC_AT: + unimap_pos = pgm_read_byte(&map_cs2[key.row][key.col]); + break; + case PC_TERMINAL: + unimap_pos = pgm_read_byte(&map_cs3[key.row][key.col]); + break; + default: + return (action_t)ACTION_NO; + } + + if (unimap_pos == UNIMAP_NO) return (action_t)ACTION_NO; + + return (action_t)pgm_read_word(&actionmaps[(layer)][(unimap_pos & 0x70) >> 4][(unimap_pos & 0x0f)]); +} diff --git a/keyboards/converter/ibmpc_usb/matrix_122.txt b/keyboards/converter/ibmpc_usb/matrix_122.txt new file mode 100644 index 000000000000..29671e68970c --- /dev/null +++ b/keyboards/converter/ibmpc_usb/matrix_122.txt @@ -0,0 +1,20 @@ + 00 01 02 03 04 05 06 07 08 09 0A 0B + 0C 0D 0E 0F 10 11 12 13 14 15 16 17 + +18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F +30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F 40 41 42 43 44 45 46 +47 48 49 4A 4B 4C 4D 4E 4F 50 51 52 53 54 55 56 57 58 59 5A 5B +5C 5D 5E 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 +73 74 75 76 77 78 79 7A 7B 7C 7D 7E + +leer 27 3f 6a 7b 7e + + + 08 10 18 20 28 30 38 40 48 50 57 5F + 07 0F 17 1F 27 2F 37 3F 47 4F 56 5E + +05 06 0E 16 1E 26 25 2E 36 3D 3E 46 45 4E 55 5D 66 67 6E 6F 76 77 7E 84 +04 0C 0D 15 1D 24 2D 2C 35 3C 43 44 4D 54 5B 5C 64 65 6D 6C 75 7D 7C +03 0B 14 1C 1B 23 2B 34 33 3B 42 4B 4C 52 53 5A 63 6B 73 74 7B +83 0A 12 13 1A 22 21 2A 32 31 3A 41 49 4A 51 59 61 62 6A 69 72 7A 79 +01 09 11 19 29 39 58 60 68 70 71 78 From 908bf3a0a59c9a61a219438f708697aaa1772e6f Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 23 Jun 2021 00:00:47 +0200 Subject: [PATCH 3/9] created translation matrix --- keyboards/converter/ibmpc_usb/ibmpc_usb.c | 137 ------------------ keyboards/converter/ibmpc_usb/ibmpc_usb.h | 136 ++++++----------- .../ibmpc_usb/keymaps/marfrit/keymap.c | 27 +--- .../ibmpc_usb/keymaps/marfrit/rules.mk | 8 +- keyboards/converter/ibmpc_usb/matrix.c | 97 ++++++++++++- 5 files changed, 146 insertions(+), 259 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.c b/keyboards/converter/ibmpc_usb/ibmpc_usb.c index 5eb64efd65b0..e678fef821e0 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.c +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.c @@ -17,140 +17,3 @@ along with this program. If not, see . #include "ibmpc_usb.h" -const uint8_t PROGMEM map_cs1[MATRIX_ROWS][MATRIX_COLS] = { - { KC_NO, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 }, /* 00-07 */ - { KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,KC_TAB }, /* 08-0F */ - { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I }, /* 10-17 */ - { KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_LCTL, KC_A, KC_S, }, /* 18-1F */ - { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, /* 20-27 */ - { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, /* 28-2F */ - { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, /* 30-37 */ - { KC_LALT, KC_SPACE, KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 }, /* 38-3F */ - { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, /* 40-47 */ - { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, /* 48-4F */ - { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, /* 50-57 */ - { KC_F12, KC_PEQL, KC_LGUI, KC_RGUI, KC_APP, KC_MUTE, KC_VOLD, KC_VOLU }, /* 58-5F */ - { KC_UP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F13, KC_F14, KC_F15, KC_F16 }, /* 60-67 */ - { KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_PENT }, /* 68-6F */ - { KC_KANA, KC_INSERT,KC_DELETE,KC_RO, KC_HOME, KC_END, KC_F24, KC_PGUP }, /* 70-77 */ - { KC_PGDN, KC_HENK, KC_RCTL, KC_MHEN, KC_RALT, KC_JYEN, KC_PCMM, KC_PSLS }, /* 78-7F */ -}; - - -/* - * Scan Code Set 2: - * ,-----------------------------------------------. - * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24| - * ,---. |-----------------------------------------------| ,-----------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut| - * `---' `-----------------------------------------------' `-----------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| - * |-----------------------------------------------------------| |-----------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| - * |-----------------------------------------------------------| `-----------' |---------------| - * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| ^a|Entr| | 4| 5| 6|KP,| - * |-----------------------------------------------------------| ,---. |---------------| - * |Shft| <| Z| X| C| V| B| N| M| ,| .| /| RO|Shift | |Up | | 1| 2| 3|Ent| - * |-----------------------------------------------------------| ,-----------. |---------------| - * |Ctl|Gui|Alt|MHEN| Space |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | #| 0| .|KP=| - * `-----------------------------------------------------------' `-----------' `---------------' - * - * ,-----------------------------------------------. - * | 08| 10| 18| 20| 28| 30| 38| 40| 48| 50| 57| 5F| - * ,---. |-----------------------------------------------| ,-----------. ,-----------. - * | 76| | 05| 06| 04| 0C| 03| 0B| 83| 0A| 01| 09| 78| 07| |+7C| 7E|+77| |*21|*32|*23| - * `---' `-----------------------------------------------' `-----------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | 0E| 16| 1E| 26| 25| 2E| 36| 3D| 3E| 46| 45| 4E| 55| 6A| 66| |*70|*6C|*7D| | 77|*4A| 7C| 7B| - * |-----------------------------------------------------------| |-----------| |---------------| - * | 0D | 15| 1D| 24| 2D| 2C| 35| 3C| 43| 44| 4D| 54| 5B| 5D | |*71|*69|*7A| | 6C| 75| 7D| 79| - * |-----------------------------------------------------------| `-----------' |---------------| - * | 58 | 1C| 1B| 23| 2B| 34| 33| 3B| 42| 4B| 4C| 52| ^a| 5A | | 6B| 73| 74| 6D| - * |-----------------------------------------------------------| ,---. |---------------| - * | 12 | 61| 1A| 22| 21| 2A| 32| 31| 3A| 41| 49| 4A| 51| 59 | |*75| | 69| 72| 7A|*5A| - * |-----------------------------------------------------------| ,-----------. |---------------| - * | 14|*1F| 11| 67 | 29 | 64 | 13 |*11|*27|*2F|*14| |*6B|*72|*74| | 68| 70| 71| 63| - * `-----------------------------------------------------------' `-----------' `---------------' - * *: E0-prefixed codes. See cs2_e0code() for remapping to unimap array. - * +: Special codes sequence - * ^a: ISO hash key and US backslash use identical code 5D. - * 51, 63, 68, 6A, 6D: Hidden keys in IBM model M [6] - */ -const uint8_t PROGMEM map_cs2[MATRIX_ROWS][MATRIX_COLS] = { - { KC_PAUS, 0x08, 0x06, 0x04, 0x02, 0x00, 0x01, 0x0B }, /* 00-07 */ - { 0x0C, 0x09, 0x07, 0x05, 0x03, KC_TAB, KC_GRV, KC_RALT }, /* 08-0F */ - { 0x0D, KC_LALT, KC_LSHIFT,KC_KANA, KC_LCTL, KC_Q, KC_1, KC_RCTL }, /* 10-17 */ - { 0x0E, KC_LGUI, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_RGUI }, /* 18-1F */ - { 0x0F, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_END }, /* 20-27 */ - { 0x10, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_HOME }, /* 28-2F */ - { 0x11, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_DEL }, /* 30-37 */ - { 0x12, KC_INS, KC_M, KC_J, KC_U, KC_7, KC_8, KC_DOWN }, /* 38-3F */ - { 0x13, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_RIGHT }, /* 40-47 */ - { 0x14, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_UP }, /* 48-4F */ - { 0x15, KC_RO, KC_QUOTE, KC_LEFT, KC_LBRC, KC_EQUAL, KC_PGDN, 0x16 }, /* 50-57 */ - { KC_CAPS, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_APP, KC_BSLASH,KC_PGUP, 0x17 }, /* 58-5F */ - { KC_PSLS, KC_NUBS, KC_PENT, KC_PEQL, KC_HENK, KC_VOLD, KC_BSPACE,KC_MHEN }, /* 60-67 */ - { KC_NUHS, KC_P1, KC_JYEN, KC_P4, KC_P7, KC_PCMM, KC_VOLU, KC_MUTE }, /* 68-6F */ - { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ - { 0x0A, KC_PPLS, KC_P3, KC_PMNS, KC_PAST, KC_P9, KC_SLCK, KC_PSCR }, /* 78-7F */ -}; - - -/* - * Scan Code Set 3: - * ,-----------------------------------------------. - * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24| - * |-----------------------------------------------| - * |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| - * `-----------------------------------------------' - * ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. - * |Mut|HEN| | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY| BS| | /|PgU|PgD| |Esc|NmL|ScL| *| - * |-------| |-----------------------------------------------------------| |-----------| |---------------| - * |VUp|Pau| |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |End|Ins|Del| | 7| 8| 9| +| - * |-------| |-----------------------------------------------------------| `-----------' |-----------|---| - * |VDn|MHE| |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #| Ret| |JPY|Up | #| | 4| 5| 6| -| - * |-------| |-----------------------------------------------------------| ,-----------. |---------------| - * |PrS|App| |Shif| \| Z| X| C| V| B| N| M| ,| ,| /| RO| Shift| |Lef|Hom|Rig| | 1| 2| 3|Ent| - * |-------| |-----------------------------------------------------------| `-----------' |-----------|---| - * |Gui|Gui| |Ctrl| |Alt | Space |Alt | |Ctrl| | RO|Dow|KAN| | ,| 0| .| =| - * `-------' `----' `---------------------------------------' `----' ---`---'--- `---------------' - * - * ,-----------------------------------------------. - * | 08| 10| 18| 20| 28| 30| 38| 40| 48| 50| 57| 5F| - * |-----------------------------------------------| - * | 07| 0F| 17| 1F| 27| 2F| 37| 3F| 47| 4F| 56| 5E| - * `-----------------------------------------------' - * ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. - * | 05| 06| | 0E| 16| 1E| 26| 25| 2E| 36| 3D| 3E| 46| 45| 4E| 55| 5D| 66| | 67| 6E| 6F| | 76| 77| 7E|*84| - * |-------| |-----------------------------------------------------------| |-----------| |---------------| - * | 04| 0C| | 0D | 15| 1D| 24| 2D| 2C| 35| 3C| 43| 44| 4D| 54| 5B| 5C | | 64| 65| 6D| | 6C| 75| 7D| 7C| - * |-------| |-----------------------------------------------------------| `-----------' |---------------| - * | 03| 0B| | 14 | 1C| 1B| 23| 2B| 34| 33| 3B| 42| 4B| 4C| 52| 53| 5A | |-26| 63|-25| | 6B| 73| 74| 7B| - * |-------| |-----------------------------------------------------------| ,-----------. |---------------| - * |*83| 0A| | 12 | 13| 1A| 22| 21| 2A| 32| 31| 3A| 41| 49| 4A| 51| 59 | | 61| 62| 6A| | 69| 72| 7A| 79| - * |-------| |-----------------------------------------------------------| `-----------' |---------------| - * | 01| 09| | 11 | |19 | 29 |39 | | 58 | |-16| 60|-1E| | 68| 70| 71| 78| - * `-------' `-----' `---------------------------------------' `-----' ---`---'--- `---------------' - * *: Special codes remapped 83->02, 84->7F - * -: G80-2551 specific 80-prefixed codes remapped: 26->5D, 25->53, 16->51, 1E->00 - * 51, 5C, 5D, 68, 78: Hidden keys in IBM 122-key terminal keyboard [7] - */ -const uint8_t PROGMEM map_cs3[MATRIX_ROWS][MATRIX_COLS] = { - { XXX, 0x73, 0x5C, 0x47, 0x30, 0x18, 0x19, 0x00 }, /* 00-07 */ - { 0x0C, 0x74, 0x5D, 0x48, 0x31, 0x32, 0x1A, 0x01 }, /* 08-0F */ - { 0x0D, 0x75, 0x5E, 0x5F, 0x49, 0x33, 0x1B, 0x02 }, /* 10-17 */ - { 0x0E, 0x76, 0x60, 0x4B, 0x4A, 0x34, 0x1C, 0x03 }, /* 18-1F */ - { 0x1F, 0x62, 0x61, 0x4C, 0x35, 0x1E, 0x1D, 0x04 }, /* 20-27 */ - { 0x10, 0x77, 0x63, 0x4D, 0x37, 0x36, 0x1F, 0x05 }, /* 28-2F */ - { 0x11, 0x65, 0x64, 0x4F, 0x4E, 0x38, 0x20, 0x06 }, /* 30-37 */ - { 0x12, 0x78, 0x66, 0x50, 0x39, 0x21, 0x22, 0x07 }, /* 38-3F */ - { 0x13, 0x67, 0x51, 0x3A, 0x3B, 0x24, 0x23, 0x08 }, /* 40-47 */ - { 0x14, 0x68, 0x69, 0x52, 0x53, 0x3C, 0x25, 0x09 }, /* 48-4F */ - { 0x15, 0x6A, 0x54, 0x55, 0x3D, 0x26, 0x0A, 0x16 }, /* 50-57 */ - { 0x79, 0x6B, 0x56, 0x3E, 0x3F, 0x27, 0x0B, 0x17 }, /* 58-5F */ - { 0x7A, 0x6C, 0x6D, 0x57, 0x40, 0x41, 0x28, 0x29 }, /* 60-67 */ - { 0x7B, 0x6F, 0x6E, 0x58, 0x43, 0x42, 0x2A, 0x2B }, /* 68-6F */ - { 0x7C, 0x7D, 0x70, 0x59, 0x5A, 0x44, 0x2C, 0x2D }, /* 70-77 */ - { 0x7E, 0x72, 0x71, 0x5B, 0x46, 0x45, 0x2E, 0x2F }, /* 78-7F */ -}; diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.h b/keyboards/converter/ibmpc_usb/ibmpc_usb.h index ba6e9e67415a..f4f442cd361c 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.h +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.h @@ -41,16 +41,16 @@ PF9, PF10. LCL, LAT, SPC, RAT, */ #define LAYOUT_127(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K0C, K0D, K0E, K0F, K10, K11, K12, K13, K14, K15, K16, K17, \ + K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ + K0D, K0E, K0F, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ \ -K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ -K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, K46, \ -K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, \ -K5C, K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, K70, K71, K72, \ -K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E \ +K19, K1A, K1B, K1C, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K30, \ +K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, K46, K47, \ +K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, \ +K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, K70, K71, K72, K73, \ +K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \ ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ { K10, K11, K12, K13, K14, K15, K16, K17 }, \ { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ @@ -65,86 +65,7 @@ K73, K74, K75, K76, K77, K78, { K60, K61, K62, K63, K64, K65, K66, K67 }, \ { K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K78, K79, K7A, K7B, K7C, K7D, K7E, XXX } \ -} - -#define LAYOUT_105( \ - K76, K05,K06,K04,K0C,K03,K0B,K02,K0A,K01,K09,K78,K07, K7F,K7E,K00, \ - K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, K39,K2F,K5E, K77,K60,K7C,K7B, \ - K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, K37,K27,K56, K6C,K75,K7D, \ - K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D,K5A, K6B,K73,K74,K79, \ - K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, K4F, K69,K72,K7A, \ - K14,K19,K11, K29, K0F,K1F,K5C,K17, K53,K3F,K47, K70, K71,K62 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { XXX, K11, K12, XXX, K14, K15, K16, K17 }, \ - { XXX, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { XXX, K21, K22, K23, K24, K25, K26, K27 }, \ - { XXX, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { XXX, K31, K32, K33, K34, K35, K36, K37 }, \ - { XXX, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { XXX, K41, K42, K43, K44, K45, K46, K47 }, \ - { XXX, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { XXX, XXX, K52, K53, K54, K55, K56, XXX }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, XXX }, \ - { K60, K61, K62, XXX, XXX, XXX, K66, XXX }, \ - { XXX, K69, XXX, K6B, K6C, XXX, XXX, XXX }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ -} - -#define LAYOUT_CS3( \ - K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F, \ - K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E, \ - \ - K05,K06, K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K5D,K66, K67,K6E,K6F, K76,K77,K7E,K7F, \ - K04,K0C, K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, K5C, K64,K65,K6D, K6C,K75,K7D,K7C, \ - K03,K0B, K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K53,K5A, K63, K6B,K73,K74,K7B, \ - K02,K0A, K12,K13,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K51,K59, K61,K62,K6A, K69,K72,K7A,K79, \ - K01,K09, K11, K19, K29, K39, K58, K60, K68,K70,K71,K78 \ -) { \ - { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ -} - -#define LAYOUT_xt( \ - K3B, K3C, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K45, K46, \ - K3D, K3E, K0F, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K47, K48, K49, K4A, \ - K3F, K40, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K1C, K4B, K4C, K4D, \ - K41, K42, K2A, K2B, K2C, K2D, K2E, K2F, K30, K31, K32, K33, K34, K35, K36, K37, K4F, K50, K51, K4E, \ - K43, K44, K38, K39, K3A, K52, K53 \ -) { \ - { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ + { K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ } typedef enum { NONE, PC_XT, PC_AT, PC_TERMINAL, PC_AT_Z150 } keyboard_kind_t; @@ -156,5 +77,44 @@ typedef enum { NONE, PC_XT, PC_AT, PC_TERMINAL, PC_AT_Z150 } keyboard_kind_t; extern uint16_t keyboard_id; extern keyboard_kind_t keyboard_kind; +/* +const uint8_t PROGMEM map_cs1[MATRIX_ROWS][MATRIX_COLS] = { + { XXX, 0x1A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 }, 00-07 */ +/* { KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,KC_TAB }, 08-0F */ +/* { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I }, 10-17 */ +/* { KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_LCTL, KC_A, KC_S, }, 18-1F */ +/* { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, 20-27 */ +/* { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, 28-2F */ +/* { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, 30-37 */ +/* { KC_LALT, KC_SPACE, KC_CAPS, 0x0D, KC_F2, KC_F3, KC_F4, KC_F5 }, 38-3F */ +/* { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, 40-47 */ +/* { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, 48-4F */ +/* { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, 50-57 */ +/* { KC_F12, KC_PEQL, KC_LGUI, KC_RGUI, KC_APP, KC_MUTE, KC_VOLD, KC_VOLU }, 58-5F */ +/* { KC_UP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F13, KC_F14, KC_F15, KC_F16 }, 60-67 */ +/* { KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_PENT }, 68-6F */ +/* { KC_KANA, KC_INSERT,KC_DELETE,KC_RO, KC_HOME, KC_END, KC_F24, KC_PGUP }, 70-77 */ +/* { KC_PGDN, KC_HENK, KC_RCTL, KC_MHEN, KC_RALT, KC_JYEN, KC_PCMM, KC_PSLS }, 78-7F */ +/*};*/ +/* +const uint8_t PROGMEM map_cs3[MATRIX_ROWS][MATRIX_COLS] = { + { XXX, 0x73, 0x5C, 0x47, 0x30, 0x18, 0x19, 0x00 }, 00-07 + { 0x0C, 0x74, 0x5D, 0x48, 0x31, 0x32, 0x1A, 0x01 }, 08-0F + { 0x0D, 0x75, 0x5E, 0x5F, 0x49, 0x33, 0x1B, 0x02 }, 10-17 + { 0x0E, 0x76, 0x60, 0x4B, 0x4A, 0x34, 0x1C, 0x03 }, 18-1F + { 0x1F, 0x62, 0x61, 0x4C, 0x35, 0x1E, 0x1D, 0x04 }, 20-27 + { 0x10, 0x77, 0x63, 0x4D, 0x37, 0x36, 0x1F, 0x05 }, 28-2F + { 0x11, 0x65, 0x64, 0x4F, 0x4E, 0x38, 0x20, 0x06 }, 30-37 + { 0x12, 0x78, 0x66, 0x50, 0x39, 0x21, 0x22, 0x07 }, 38-3F + { 0x13, 0x67, 0x51, 0x3A, 0x3B, 0x24, 0x23, 0x08 }, 40-47 + { 0x14, 0x68, 0x69, 0x52, 0x53, 0x3C, 0x25, 0x09 }, 48-4F + { 0x15, 0x6A, 0x54, 0x55, 0x3D, 0x26, 0x0A, 0x16 }, 50-57 + { 0x79, 0x6B, 0x56, 0x3E, 0x3F, 0x27, 0x0B, 0x17 }, 58-5F + { 0x7A, 0x6C, 0x6D, 0x57, 0x40, 0x41, 0x28, 0x29 }, 60-67 + { 0x7B, 0x6F, 0x6E, 0x58, 0x43, 0x42, 0x2A, 0x2B }, 68-6F + { 0x7C, 0x7D, 0x70, 0x59, 0x5A, 0x44, 0x2C, 0x2D }, 70-77 + { 0x7E, 0x72, 0x71, 0x5B, 0x46, 0x45, 0x2E, 0x2F }, 78-7F +}; +*/ #endif diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c index c82c6332255a..4674dc66c9d6 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c @@ -34,10 +34,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - RESET ,KC_ESC, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, + RESET ,KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, KC_SLCK,KC_MPLY, KC_TAB, ALL_T(KC_K), KC_U, KC_Q, KC_DOT, KC_J, KC_V, KC_G, KC_C, KC_L, KC_F, KC_LBRC, KC_RBRC, KC_NO, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_PAUS,KC_INT5, KC_LCTL, KC_H, LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_O, KC_D, RSFT_T(KC_T), RCTL_T(KC_R), LALT_T(KC_N), KC_S, KC_QUOT, KC_BSLS, KC_ENT, KC_UP, KC_P4, KC_P5, KC_P6, KC_PCMM, - KC_APP, KC_INT6, KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_NO, KC_RSFT, KC_LEFT, KC_INT2,KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_APP, KC_PSCR, KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_NO, KC_RSFT, KC_LEFT, KC_INT2,KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, KC_RGUI,KC_LGUI, KC_CAPS, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_DOWN, KC_NO, KC_P0, KC_PDOT,KC_NO ), @@ -59,26 +59,3 @@ void keyboard_post_init_user(void) { //debug_keyboard=true; //debug_mouse=true; } - -//action_t action_for_key(uint8_t layer, keypos_t key) - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - uint8_t unimap_pos; - switch (keyboard_kind) { - case PC_XT: - unimap_pos = pgm_read_byte(&map_cs1[key.row][key.col]); - break; - case PC_AT: - unimap_pos = pgm_read_byte(&map_cs2[key.row][key.col]); - break; - case PC_TERMINAL: - unimap_pos = pgm_read_byte(&map_cs3[key.row][key.col]); - break; - default: - return (action_t)ACTION_NO; - } - - if (unimap_pos == UNIMAP_NO) return (action_t)ACTION_NO; - - return (action_t)pgm_read_word(&actionmaps[(layer)][(unimap_pos & 0x70) >> 4][(unimap_pos & 0x0f)]); -} diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk b/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk index c774b0816f14..24f5a68b8ef9 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk @@ -3,11 +3,11 @@ # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 diff --git a/keyboards/converter/ibmpc_usb/matrix.c b/keyboards/converter/ibmpc_usb/matrix.c index 113be018511e..010fbf4aada6 100644 --- a/keyboards/converter/ibmpc_usb/matrix.c +++ b/keyboards/converter/ibmpc_usb/matrix.c @@ -424,25 +424,112 @@ uint8_t matrix_get_row(uint8_t row) return matrix[row]; } +const uint8_t map_cs1[MATRIX_ROWS][MATRIX_COLS] = { + { XXX , 0x1a, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21 }, /* 00-07 */ + { 0x22, 0x23, 0x24, 0x25, KC_MINUS, KC_EQUAL, KC_BSPACE,KC_TAB }, /* 08-0F */ + { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I }, /* 10-17 */ + { KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_LCTL, KC_A, KC_S, }, /* 18-1F */ + { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, /* 20-27 */ + { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, /* 28-2F */ + { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, /* 30-37 */ + { KC_LALT, KC_SPACE, KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 }, /* 38-3F */ + { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, /* 40-47 */ + { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, /* 48-4F */ + { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, /* 50-57 */ + { KC_F12, KC_PEQL, KC_LGUI, KC_RGUI, KC_APP, KC_MUTE, KC_VOLD, KC_VOLU }, /* 58-5F */ + { KC_UP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F13, KC_F14, KC_F15, KC_F16 }, /* 60-67 */ + { KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_PENT }, /* 68-6F */ + { KC_KANA, KC_INSERT,KC_DELETE,KC_RO, KC_HOME, KC_END, KC_F24, KC_PGUP }, /* 70-77 */ + { KC_PGDN, KC_HENK, KC_RCTL, KC_MHEN, KC_RALT, KC_JYEN, KC_PCMM, KC_PSLS }, /* 78-7F */ +}; + +const uint8_t map_cs2[MATRIX_ROWS][MATRIX_COLS] = { + { 0x48, 0x15, 0x13, 0x11, 0x0F, 0x0D, 0x0E, 0x18 }, /* 00-07 */ + { 0x01, 0x16, 0x14, 0x12, 0x10, 0x33, 0x1B, 0x79 }, /* 08-0F */ + { 0x02, 0x77, 0x5F, XXX , 0x76, 0x34, 0x1C, 0x7A }, /* 10-17 */ + { 0x03, 0x75, 0x61, 0x4c, 0x4b, 0x35, 0x1D, 0x74 }, /* 18-1F */ + { 0x04, 0x63, 0x62, 0x4d, 0x36, 0x1F, 0x1E, 0x42 }, /* 20-27 */ + { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x2B }, /* 28-2F */ + { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x41 }, /* 30-37 */ + { 0x07, 0x2A, 0x67, 0x51, 0x3A, 0x22, 0x23, 0x7b }, /* 38-3F */ + { 0x08, 0x69, 0x52, 0x3B, 0x3D, 0x25, 0x24, 0x6f }, /* 40-47 */ + { 0x09, 0x68, 0x6a, 0x53, 0x54, 0x3C, 0x26, 0x58 }, /* 48-4F */ + { 0x0A, XXX , 0x55, 0x6d, 0x3E, 0x27, 0x43, 0x0B }, /* 50-57 */ + { 0x4a, 0x6C, 0x57, 0x3F, 0x5d, 0x28, 0x2C, 0x0C }, /* 58-5F */ + { 0x2e, 0x60, 0x73, 0x7f, XXX , XXX , 0x29, XXX }, /* 60-67 */ + { 0x56, 0x70, XXX , 0x59, 0x44, 0x5c, XXX , XXX }, /* 68-6F */ + { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x1A, 0x2d }, /* 70-77 */ + { 0x17, 0x47, 0x72, 0x30, 0x2F, 0x46, 0x31, 0x5e }, /* 78-7F */ +}; + +const uint8_t map_cs3[MATRIX_ROWS][MATRIX_COLS] = { + { KC_KANA, KC_LGUI, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE, KC_HENK, KC_F1 }, /* 00-07 */ + { KC_F13, KC_RGUI, KC_APP, KC_MHEN, KC_PAUS, KC_TAB, KC_GRV, KC_F2 }, /* 08-0F */ + { KC_F14, KC_LCTL, KC_LSHIFT,KC_NUBS, KC_CAPS, KC_Q, KC_1, KC_F3 }, /* 10-17 */ + { KC_F15, KC_LALT, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_F4 }, /* 18-1F */ + { KC_F16, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_F5 }, /* 20-27 */ + { KC_F17, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_F6 }, /* 28-2F */ + { KC_F18, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_F7 }, /* 30-37 */ + { KC_F19, KC_RALT, KC_M, KC_J, KC_U, KC_7, KC_8, KC_F8 }, /* 38-3F */ + { KC_F20, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_F9 }, /* 40-47 */ + { KC_F21, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_F10 }, /* 48-4F */ + { KC_F22, KC_RO, KC_QUOTE, KC_NUHS, KC_LBRC, KC_EQUAL, KC_F11, KC_F23 }, /* 50-57 */ + { KC_RCTL, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_BSLASH,KC_JYEN, KC_F12, KC_F24 }, /* 58-5F */ + { KC_DOWN, KC_LEFT, KC_HOME, KC_UP, KC_END, KC_INS, KC_BSPACE,KC_PSLS }, /* 60-67 */ + { KC_PCMM, KC_P1, KC_RIGHT, KC_P4, KC_P7, KC_DEL, KC_PGUP, KC_PGDN }, /* 68-6F */ + { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ + { KC_PEQL, KC_PENT, KC_P3, KC_PMNS, KC_PPLS, KC_P9, KC_SLCK, KC_PAST }, /* 78-7F */ +}; + + inline static void matrix_make(uint8_t code) { - if (!matrix_is_on(ROW(code), COL(code))) { - matrix[ROW(code)] |= 1< Date: Wed, 23 Jun 2021 13:02:42 +0200 Subject: [PATCH 4/9] Changed info.json --- keyboards/converter/ibmpc_usb/info.json | 998 +++++++++++++++--------- 1 file changed, 647 insertions(+), 351 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/info.json b/keyboards/converter/ibmpc_usb/info.json index 7e893e74bef6..0e127d0e0843 100644 --- a/keyboards/converter/ibmpc_usb/info.json +++ b/keyboards/converter/ibmpc_usb/info.json @@ -2,356 +2,652 @@ "keyboard_name": "converter/ibmpc_usb", "url": "", "maintainer": "qmk", - "width": 22.5, - "height": 6.5, + "width": 25, + "height": 7.5, "layouts": { - "LAYOUT_122": { - "layout": [ - {"label":"F13", "x":3.25, "y":0}, - {"label":"F14", "x":4.25, "y":0}, - {"label":"F15", "x":5.25, "y":0}, - {"label":"F16", "x":6.25, "y":0}, - {"label":"F17", "x":7.25, "y":0}, - {"label":"F18", "x":8.25, "y":0}, - {"label":"F19", "x":9.25, "y":0}, - {"label":"F20", "x":10.25, "y":0}, - {"label":"F21", "x":11.25, "y":0}, - {"label":"F22", "x":12.25, "y":0}, - {"label":"F23", "x":13.25, "y":0}, - {"label":"F24", "x":14.25, "y":0}, - {"label":"F1", "x":3.25, "y":1}, - {"label":"F2", "x":4.25, "y":1}, - {"label":"F3", "x":5.25, "y":1}, - {"label":"F4", "x":6.25, "y":1}, - {"label":"F5", "x":7.25, "y":1}, - {"label":"F6", "x":8.25, "y":1}, - {"label":"F7", "x":9.25, "y":1}, - {"label":"F8", "x":10.25, "y":1}, - {"label":"F9", "x":11.25, "y":1}, - {"label":"F10", "x":12.25, "y":1}, - {"label":"F11", "x":13.25, "y":1}, - {"label":"F12", "x":14.25, "y":1}, - {"label":"Print Screen", "x":0, "y":3}, - {"label":"Esc", "x":1, "y":3}, - {"label":"Esc", "x":2.25, "y":3}, - {"label":"1", "x":3.25, "y":3}, - {"label":"2", "x":4.25, "y":3}, - {"label":"3", "x":5.25, "y":3}, - {"label":"4", "x":6.25, "y":3}, - {"label":"5", "x":7.25, "y":3}, - {"label":"6", "x":8.25, "y":3}, - {"label":"7", "x":9.25, "y":3}, - {"label":"8", "x":10.25, "y":3}, - {"label":"9", "x":11.25, "y":3}, - {"label":"0", "x":12.25, "y":3}, - {"label":"-", "x":13.25, "y":3}, - {"label":"=", "x":14.25, "y":3}, - {"label":"No", "x":15.25, "y":3}, - {"label":"Back Space", "x":16.25, "y":3}, - {"label":"Insert", "x":17.5, "y":3}, - {"label":"Home", "x":18.5, "y":3}, - {"label":"Page Up", "x":19.5, "y":3}, - {"label":"Num Lock", "x":20.75, "y":3}, - {"label":"/", "x":21.75, "y":3}, - {"label":"*", "x":22.75, "y":3}, - {"label":"-", "x":23.75, "y":3}, - {"label":"Scroll Lock", "x":0, "y":4}, - {"label":"Int4", "x":1, "y":4}, - {"label":"Tab", "x":2.25, "y":4, "w":1.5}, - {"label":"Q", "x":3.75, "y":4}, - {"label":"W", "x":4.75, "y":4}, - {"label":"E", "x":5.75, "y":4}, - {"label":"R", "x":6.75, "y":4}, - {"label":"T", "x":7.75, "y":4}, - {"label":"Y", "x":8.75, "y":4}, - {"label":"U", "x":9.75, "y":4}, - {"label":"I", "x":10.75, "y":4}, - {"label":"O", "x":11.75, "y":4}, - {"label":"P", "x":12.75, "y":4}, - {"label":"[", "x":13.75, "y":4}, - {"label":"]", "x":14.75, "y":4}, - {"label":"No", "x":15.75, "y":4, "w":1.5}, - {"label":"Delete", "x":17.5, "y":4}, - {"label":"End", "x":18.5, "y":4}, - {"label":"Page Down", "x":19.5, "y":4}, - {"label":"7", "x":20.75, "y":4}, - {"label":"8", "x":21.75, "y":4}, - {"label":"9", "x":22.75, "y":4}, - {"label":"+", "x":23.75, "y":4}, - {"label":"Pause", "x":0, "y":5}, - {"label":"Int5", "x":1, "y":5}, - {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75}, - {"label":"A", "x":4, "y":5}, - {"label":"S", "x":5, "y":5}, - {"label":"D", "x":6, "y":5}, - {"label":"F", "x":7, "y":5}, - {"label":"G", "x":8, "y":5}, - {"label":"H", "x":9, "y":5}, - {"label":"J", "x":10, "y":5}, - {"label":"K", "x":11, "y":5}, - {"label":"L", "x":12, "y":5}, - {"label":";", "x":13, "y":5}, - {"label":"'", "x":14, "y":5}, - {"label":"\\", "x":15, "y":5}, - {"label":"Enter", "x":16, "y":5, "w":1.25}, - {"label":"Up", "x":18.5, "y":5}, - {"label":"4", "x":20.75, "y":5}, - {"label":"5", "x":21.75, "y":5}, - {"label":"6", "x":22.75, "y":5}, - {"label":",", "x":23.75, "y":5}, - {"label":"App", "x":0, "y":6}, - {"label":"Int6", "x":1, "y":6}, - {"label":"Shift", "x":2.25, "y":6, "w":1.25}, - {"label":"ISO \\", "x":3.5, "y":6}, - {"label":"Z", "x":4.5, "y":6}, - {"label":"X", "x":5.5, "y":6}, - {"label":"C", "x":6.5, "y":6}, - {"label":"V", "x":7.5, "y":6}, - {"label":"B", "x":8.5, "y":6}, - {"label":"N", "x":9.5, "y":6}, - {"label":"M", "x":10.5, "y":6}, - {"label":",", "x":11.5, "y":6}, - {"label":".", "x":12.5, "y":6}, - {"label":"/", "x":13.5, "y":6}, - {"label":"No", "x":14.5, "y":6}, - {"label":"Shift", "x":15.5, "y":6, "w":1.75}, - {"label":"Left", "x":17.5, "y":6}, - {"label":"Int2", "x":18.5, "y":6}, - {"label":"Right", "x":19.5, "y":6}, - {"label":"1", "x":20.75, "y":6}, - {"label":"2", "x":21.75, "y":6}, - {"label":"3", "x":22.75, "y":6}, - {"label":"Enter", "x":23.75, "y":6}, - {"label":"RGUI", "x":0, "y":7}, - {"label":"lgui", "x":1, "y":7}, - {"label":"Ctrl", "x":2.25, "y":7, "w":1.5}, - {"label":"Alt", "x":4.75, "y":7, "w":1.5}, - {"label":"Space", "x":6.25, "y":7, "w":7}, - {"label":"Alt", "x":13.25, "y":7, "w":1.5}, - {"label":"Ctrl", "x":15.75, "y":7, "w":1.5}, - {"label":"Down", "x":18.5, "y":7}, - {"label":"No", "x":20.75, "y":7}, - {"label":"0", "x":21.75, "y":7}, - {"label":".", "x":22.75, "y":7}, - {"label":"No", "x":23.75, "y":7} - ] - }, - "LAYOUT_ansi": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Page Up", "x":17.25, "y":1.5}, - {"label":"Num Lock", "x":18.5, "y":1.5}, - {"label":"Num /", "x":19.5, "y":1.5}, - {"label":"Num *", "x":20.5, "y":1.5}, - {"label":"Num -", "x":21.5, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[", "x":11.5, "y":2.5}, - {"label":"]", "x":12.5, "y":2.5}, - {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"Page Down", "x":17.25, "y":2.5}, - {"label":"Num 7", "x":18.5, "y":2.5}, - {"label":"Num 8", "x":19.5, "y":2.5}, - {"label":"Num 9", "x":20.5, "y":2.5}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"Num 4", "x":18.5, "y":3.5}, - {"label":"Num 5", "x":19.5, "y":3.5}, - {"label":"Num 6", "x":20.5, "y":3.5}, - {"label":"Num +", "x":21.5, "y":2.5, "h":2}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",", "x":9.25, "y":4.5}, - {"label":".", "x":10.25, "y":4.5}, - {"label":"/", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"Num 1", "x":18.5, "y":4.5}, - {"label":"Num 2", "x":19.5, "y":4.5}, - {"label":"Num 3", "x":20.5, "y":4.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"GUI", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":15.25, "y":5.5}, - {"label":"Down", "x":16.25, "y":5.5}, - {"label":"Right", "x":17.25, "y":5.5}, - {"label":"Num 0", "x":18.5, "y":5.5, "w":2}, - {"label":"Num .", "x":20.5, "y":5.5}, - {"label":"Num Enter", "x":21.5, "y":4.5, "h":2} - ] - }, - "LAYOUT_105": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Print Screen", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Page Up", "x":17.25, "y":1.5}, - {"label":"Num Lock", "x":18.5, "y":1.5}, - {"label":"Num /", "x":19.5, "y":1.5}, - {"label":"Num *", "x":20.5, "y":1.5}, - {"label":"Num -", "x":21.5, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[", "x":11.5, "y":2.5}, - {"label":"]", "x":12.5, "y":2.5}, - {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"Page Down", "x":17.25, "y":2.5}, - {"label":"Num 7", "x":18.5, "y":2.5}, - {"label":"Num 8", "x":19.5, "y":2.5}, - {"label":"Num 9", "x":20.5, "y":2.5}, - {"label":"Num +", "x":21.5, "y":2.5, "h":2}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":";", "x":10.75, "y":3.5}, - {"label":"'", "x":11.75, "y":3.5}, - {"label":"ISO #", "x":12.75, "y":3.5}, - {"label":"Num 4", "x":18.5, "y":3.5}, - {"label":"Num 5", "x":19.5, "y":3.5}, - {"label":"Num 6", "x":20.5, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":1.25}, - {"label":"ISO \\", "x":1.25, "y":4.5}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",", "x":9.25, "y":4.5}, - {"label":".", "x":10.25, "y":4.5}, - {"label":"/", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"Num 1", "x":18.5, "y":4.5}, - {"label":"Num 2", "x":19.5, "y":4.5}, - {"label":"Num 3", "x":20.5, "y":4.5}, - {"label":"Num Enter", "x":21.5, "y":4.5, "h":2}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, - {"label":"GUI", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":15.25, "y":5.5}, - {"label":"Down", "x":16.25, "y":5.5}, - {"label":"Right", "x":17.25, "y":5.5}, - {"label":"Num 0", "x":18.5, "y":5.5, "w":2}, - {"label":"Num .", "x":20.5, "y":5.5} - ] - } + "LAYOUT": { + "layout": [ + { + "label": "F13", + "x": 3.5, + "y": 0 + }, + { + "label": "F14", + "x": 4.5, + "y": 0 + }, + { + "label": "F15", + "x": 5.5, + "y": 0 + }, + { + "label": "F16", + "x": 6.5, + "y": 0 + }, + { + "label": "F17", + "x": 7.5, + "y": 0 + }, + { + "label": "F18", + "x": 8.5, + "y": 0 + }, + { + "label": "F19", + "x": 9.5, + "y": 0 + }, + { + "label": "F20", + "x": 10.5, + "y": 0 + }, + { + "label": "F21", + "x": 11.5, + "y": 0 + }, + { + "label": "F22", + "x": 12.5, + "y": 0 + }, + { + "label": "F23", + "x": 13.5, + "y": 0 + }, + { + "label": "F24", + "x": 14.5, + "y": 0 + }, + { + "label": "F1", + "x": 3.5, + "y": 1 + }, + { + "label": "F2", + "x": 4.5, + "y": 1 + }, + { + "label": "F3", + "x": 5.5, + "y": 1 + }, + { + "label": "F4", + "x": 6.5, + "y": 1 + }, + { + "label": "F5", + "x": 7.5, + "y": 1 + }, + { + "label": "F6", + "x": 8.5, + "y": 1 + }, + { + "label": "F7", + "x": 9.5, + "y": 1 + }, + { + "label": "F8", + "x": 10.5, + "y": 1 + }, + { + "label": "F9", + "x": 11.5, + "y": 1 + }, + { + "label": "F10", + "x": 12.5, + "y": 1 + }, + { + "label": "F11", + "x": 13.5, + "y": 1 + }, + { + "label": "F12", + "x": 14.5, + "y": 1 + }, + { + "label": "RST", + "x": 0, + "y": 2.5 + }, + { + "label": "ESC", + "x": 1, + "y": 2.5 + }, + { + "label": "\u00ac", + "x": 2.5, + "y": 2.5 + }, + { + "label": "!", + "x": 3.5, + "y": 2.5 + }, + { + "label": "\"", + "x": 4.5, + "y": 2.5 + }, + { + "label": "\u00a3", + "x": 5.5, + "y": 2.5 + }, + { + "label": "$", + "x": 6.5, + "y": 2.5 + }, + { + "label": "%", + "x": 7.5, + "y": 2.5 + }, + { + "label": "^", + "x": 8.5, + "y": 2.5 + }, + { + "label": "&", + "x": 9.5, + "y": 2.5 + }, + { + "label": "*", + "x": 10.5, + "y": 2.5 + }, + { + "label": "(", + "x": 11.5, + "y": 2.5 + }, + { + "label": ")", + "x": 12.5, + "y": 2.5 + }, + { + "label": "_", + "x": 13.5, + "y": 2.5 + }, + { + "label": "+", + "x": 14.5, + "y": 2.5 + }, + { + "label": "Break", + "x": 15.5, + "y": 2.5 + }, + { + "label": "Bspc", + "x": 16.5, + "y": 2.5 + }, + { + "label": "Insert", + "x": 17.75, + "y": 2.5 + }, + { + "label": "Home", + "x": 18.75, + "y": 2.5 + }, + { + "label": "PgUp", + "x": 19.75, + "y": 2.5 + }, + { + "label": "Num Lock", + "x": 21, + "y": 2.5 + }, + { + "label": "/", + "x": 22, + "y": 2.5 + }, + { + "label": "*", + "x": 23, + "y": 2.5 + }, + { + "label": "-", + "x": 24, + "y": 2.5 + }, + { + "label": "Scroll Lock", + "x": 0, + "y": 3.5 + }, + { + "x": 1, + "y": 3.5 + }, + { + "label": "Tab", + "x": 2.5, + "y": 3.5, + "w": 1.5 + }, + { + "label": "Q", + "x": 4, + "y": 3.5 + }, + { + "label": "W", + "x": 5, + "y": 3.5 + }, + { + "label": "E", + "x": 6, + "y": 3.5 + }, + { + "label": "R", + "x": 7, + "y": 3.5 + }, + { + "label": "T", + "x": 8, + "y": 3.5 + }, + { + "label": "Y", + "x": 9, + "y": 3.5 + }, + { + "label": "U", + "x": 10, + "y": 3.5 + }, + { + "label": "I", + "x": 11, + "y": 3.5 + }, + { + "label": "O", + "x": 12, + "y": 3.5 + }, + { + "label": "P", + "x": 13, + "y": 3.5 + }, + { + "label": "{", + "x": 14, + "y": 3.5 + }, + { + "label": "}", + "x": 15, + "y": 3.5 + }, + { + "label": "SysRq", + "x": 16, + "y": 3.5, + "w": 1.5 + }, + { + "label": "Delete", + "x": 17.75, + "y": 3.5 + }, + { + "label": "End", + "x": 18.75, + "y": 3.5 + }, + { + "label": "PgDn", + "x": 19.75, + "y": 3.5 + }, + { + "label": "7", + "x": 21, + "y": 3.5 + }, + { + "label": "8", + "x": 22, + "y": 3.5 + }, + { + "label": "9", + "x": 23, + "y": 3.5 + }, + { + "label": "+", + "x": 24, + "y": 3.5 + }, + { + "label": "Pause", + "x": 0, + "y": 4.5 + }, + { + "x": 1, + "y": 4.5 + }, + { + "label": "Caps Lock", + "x": 2.5, + "y": 4.5, + "w": 1.75 + }, + { + "label": "A", + "x": 4.25, + "y": 4.5 + }, + { + "label": "S", + "x": 5.25, + "y": 4.5 + }, + { + "label": "D", + "x": 6.25, + "y": 4.5 + }, + { + "label": "F", + "x": 7.25, + "y": 4.5 + }, + { + "label": "G", + "x": 8.25, + "y": 4.5 + }, + { + "label": "H", + "x": 9.25, + "y": 4.5 + }, + { + "label": "J", + "x": 10.25, + "y": 4.5 + }, + { + "label": "K", + "x": 11.25, + "y": 4.5 + }, + { + "label": "L", + "x": 12.25, + "y": 4.5 + }, + { + "label": ":", + "x": 13.25, + "y": 4.5 + }, + { + "label": "@", + "x": 14.25, + "y": 4.5 + }, + { + "label": "~", + "x": 15.25, + "y": 4.5 + }, + { + "label": "Enter", + "x": 16.25, + "y": 4.5, + "w": 1.25 + }, + { + "label": "\u2191", + "x": 18.75, + "y": 4.5 + }, + { + "label": "4", + "x": 21, + "y": 4.5 + }, + { + "label": "5", + "x": 22, + "y": 4.5 + }, + { + "label": "6", + "x": 23, + "y": 4.5 + }, + { + "label": ",", + "x": 24, + "y": 4.5 + }, + { + "label": "App", + "x": 0, + "y": 5.5 + }, + { + "label": "Prt Scr", + "x": 1, + "y": 5.5 + }, + { + "label": "Shift", + "x": 2.5, + "y": 5.5, + "w": 1.25 + }, + { + "label": "|", + "x": 3.75, + "y": 5.5 + }, + { + "label": "Z", + "x": 4.75, + "y": 5.5 + }, + { + "label": "X", + "x": 5.75, + "y": 5.5 + }, + { + "label": "C", + "x": 6.75, + "y": 5.5 + }, + { + "label": "V", + "x": 7.75, + "y": 5.5 + }, + { + "label": "B", + "x": 8.75, + "y": 5.5 + }, + { + "label": "N", + "x": 9.75, + "y": 5.5 + }, + { + "label": "M", + "x": 10.75, + "y": 5.5 + }, + { + "label": "<", + "x": 11.75, + "y": 5.5 + }, + { + "label": ">", + "x": 12.75, + "y": 5.5 + }, + { + "label": "?", + "x": 13.75, + "y": 5.5 + }, + { + "x": 14.75, + "y": 5.5 + }, + { + "label": "Shift", + "x": 15.75, + "y": 5.5, + "w": 1.75 + }, + { + "label": "\u2190", + "x": 17.75, + "y": 5.5 + }, + { + "label": "Line", + "x": 18.75, + "y": 5.5 + }, + { + "label": "\u2192", + "x": 19.75, + "y": 5.5 + }, + { + "label": "1", + "x": 21, + "y": 5.5 + }, + { + "label": "2", + "x": 22, + "y": 5.5 + }, + { + "label": "3", + "x": 23, + "y": 5.5 + }, + { + "label": "Enter", + "x": 24, + "y": 5.5 + }, + { + "label": "RGui", + "x": 0, + "y": 6.5 + }, + { + "label": "LGui", + "x": 1, + "y": 6.5 + }, + { + "label": "Ctrl", + "x": 2.5, + "y": 6.5, + "w": 1.5 + }, + { + "label": "Alt", + "x": 5, + "y": 6.5, + "w": 1.5 + }, + { + "x": 6.5, + "y": 6.5, + "w": 7 + }, + { + "label": "AltGr", + "x": 13.5, + "y": 6.5, + "w": 1.5 + }, + { + "label": "Ctrl", + "x": 16, + "y": 6.5, + "w": 1.5 + }, + { + "label": "\u2193", + "x": 18.75, + "y": 6.5 + }, + { + "x": 21, + "y": 6.5 + }, + { + "label": "0", + "x": 22, + "y": 6.5 + }, + { + "label": ".", + "x": 23, + "y": 6.5 + }, + { + "x": 24, + "y": 6.5 + } + ] + } } - } +} From 3f51336ca131657e4b93c108baec2073a971b633 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 23 Jun 2021 13:04:22 +0200 Subject: [PATCH 5/9] change layout name --- keyboards/converter/ibmpc_usb/ibmpc_usb.h | 2 +- keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.h b/keyboards/converter/ibmpc_usb/ibmpc_usb.h index f4f442cd361c..a5b52bd011c7 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.h +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.h @@ -40,7 +40,7 @@ PF7, PF8, LSF, <, Z, X, C, V, B, N, M, ,, ., /, STB PF9, PF10. LCL, LAT, SPC, RAT, RCL, DN, STB, 0, DOT */ -#define LAYOUT_127(\ +#define LAYOUT(\ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K0D, K0E, K0F, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ \ diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c index 4674dc66c9d6..b366555a9ef3 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 122 keys, but 127 matrix positions (stabilizer inserts can be replaced by flipper an converted to keys) */ - LAYOUT_127( + LAYOUT( KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, From c2a45baef793d2b4b2c6c29bdc04f5538be3e88c Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 23 Jun 2021 17:20:58 +0200 Subject: [PATCH 6/9] keycode poker --- .../ibmpc_usb/keymaps/marfrit/keymap.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c index b366555a9ef3..52e45757a910 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c @@ -18,15 +18,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* LAYOUT_105( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, ALL_T(KC_K), KC_U, KC_Q, KC_DOT, KC_J, KC_V, KC_G, KC_C, KC_L, KC_F, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, - KC_CAPS, KC_H, LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_O, KC_D, RSFT_T(KC_T), RCTL_T(KC_R), LALT_T(KC_N), KC_S, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT - ),*/ - /* 122 keys, but 127 matrix positions (stabilizer inserts can be replaced by flipper an converted to keys) */ @@ -34,11 +25,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - RESET ,KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, - KC_SLCK,KC_MPLY, KC_TAB, ALL_T(KC_K), KC_U, KC_Q, KC_DOT, KC_J, KC_V, KC_G, KC_C, KC_L, KC_F, KC_LBRC, KC_RBRC, KC_NO, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_PAUS,KC_INT5, KC_LCTL, KC_H, LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_O, KC_D, RSFT_T(KC_T), RCTL_T(KC_R), LALT_T(KC_N), KC_S, KC_QUOT, KC_BSLS, KC_ENT, KC_UP, KC_P4, KC_P5, KC_P6, KC_PCMM, - KC_APP, KC_PSCR, KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_NO, KC_RSFT, KC_LEFT, KC_INT2,KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_RGUI,KC_LGUI, KC_CAPS, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_DOWN, KC_NO, KC_P0, KC_PDOT,KC_NO + RESET ,KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BRK, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, KC_NLCK, KC_PSLS,KC_PAST,KC_PMNS, + KC_SLCK,KC_MPLY, KC_TAB, ALL_T(KC_K), KC_U, KC_Q, KC_DOT, KC_J, KC_V, KC_G, KC_C, KC_L, KC_F, KC_LBRC, KC_RBRC, KC_SYSREQ, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_PAUS,KC_INT5, KC_LCTL, KC_H, LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_O, KC_D, RSFT_T(KC_T), RCTL_T(KC_R), LALT_T(KC_N), KC_S, KC_QUOT, KC_BSLS, KC_ENT, KC_UP, KC_P4, KC_P5, KC_P6, KC_PCMM, + KC_APP, KC_PSCR, KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_NO, KC_RSFT, KC_LEFT, KC_INT2,KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_RGUI,KC_LGUI, KC_CAPS, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_DOWN, KC_SYSREQ, KC_P0, KC_PDOT,KC_NO ), /* From 4fce61962a022be08fbfeaa95f525c6fcab33d5a Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 23 Jun 2021 22:01:32 +0200 Subject: [PATCH 7/9] added mapping mappings --- keyboards/converter/ibmpc_usb/ibmpc_usb.h | 12 ++-- .../ibmpc_usb/keymaps/marfrit/keymap.c | 2 +- keyboards/converter/ibmpc_usb/matrix.c | 70 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.h b/keyboards/converter/ibmpc_usb/ibmpc_usb.h index a5b52bd011c7..bf4c2cc4d914 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.h +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.h @@ -31,13 +31,13 @@ void matrix_init_user(void); /* F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24. - F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F10, F12. + F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12. -PF1, PF2, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, STB,BSP, INS, HOM, PUP, NLK, SLS, AST, MNS, -PF3, PF4, TAB, Q, W, E, R, T, Y, U, I, O, P, [, ], DEL, END, PDN, 7, 8, 9, PLS, -PF5, PF6, CLK, A, S, D, F, G, H, J, K L, ;, ', \, ENT, UP, 4, 5, 6, COM, -PF7, PF8, LSF, <, Z, X, C, V, B, N, M, ,, ., /, STB RSF, LFT, SHT, RGT, 1, 2, 3, ENT, -PF9, PF10. LCL, LAT, SPC, RAT, RCL, DN, STB, 0, DOT +RST, ESC, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, STB,BSP, INS, HOM, PUP, NLK, SLS, AST, MNS, +SLK, MPL, TAB, Q, W, E, R, T, Y, U, I, O, P, [, ], STB DEL, END, PDN, 7, 8, 9, PLS, +BRK, INT5, CLK, A, S, D, F, G, H, J, K L, ;, ', \, ENT, UP, 4, 5, 6, COM, +APP, PSC, LSF, <, Z, X, C, V, B, N, M, ,, ., /, STB RSF, LFT, SHT, RGT, 1, 2, 3, ENT, +RGU, LGU, LCL, LAT, SPC, RAT, RCL, DN, STB, 0, STB, DOT */ #define LAYOUT(\ diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c index 52e45757a910..997cd49bd57a 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - RESET ,KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BRK, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, KC_NLCK, KC_PSLS,KC_PAST,KC_PMNS, + RESET ,KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NUHS, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, KC_NLCK, KC_PSLS,KC_PAST,KC_PMNS, KC_SLCK,KC_MPLY, KC_TAB, ALL_T(KC_K), KC_U, KC_Q, KC_DOT, KC_J, KC_V, KC_G, KC_C, KC_L, KC_F, KC_LBRC, KC_RBRC, KC_SYSREQ, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_PAUS,KC_INT5, KC_LCTL, KC_H, LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_O, KC_D, RSFT_T(KC_T), RCTL_T(KC_R), LALT_T(KC_N), KC_S, KC_QUOT, KC_BSLS, KC_ENT, KC_UP, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_APP, KC_PSCR, KC_LSFT, KC_NUBS, KC_X, RALT_T(KC_Y), KC_SCLN, KC_COMM, KC_SLSH, KC_B, KC_P, KC_W, RALT_T(KC_M), KC_Z, KC_NO, KC_RSFT, KC_LEFT, KC_INT2,KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, diff --git a/keyboards/converter/ibmpc_usb/matrix.c b/keyboards/converter/ibmpc_usb/matrix.c index 010fbf4aada6..a2ac5382f58c 100644 --- a/keyboards/converter/ibmpc_usb/matrix.c +++ b/keyboards/converter/ibmpc_usb/matrix.c @@ -425,22 +425,22 @@ uint8_t matrix_get_row(uint8_t row) } const uint8_t map_cs1[MATRIX_ROWS][MATRIX_COLS] = { - { XXX , 0x1a, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21 }, /* 00-07 */ - { 0x22, 0x23, 0x24, 0x25, KC_MINUS, KC_EQUAL, KC_BSPACE,KC_TAB }, /* 08-0F */ - { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I }, /* 10-17 */ - { KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_LCTL, KC_A, KC_S, }, /* 18-1F */ - { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, /* 20-27 */ - { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, /* 28-2F */ - { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, /* 30-37 */ - { KC_LALT, KC_SPACE, KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 }, /* 38-3F */ - { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, /* 40-47 */ - { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, /* 48-4F */ - { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, /* 50-57 */ - { KC_F12, KC_PEQL, KC_LGUI, KC_RGUI, KC_APP, KC_MUTE, KC_VOLD, KC_VOLU }, /* 58-5F */ - { KC_UP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F13, KC_F14, KC_F15, KC_F16 }, /* 60-67 */ - { KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_PENT }, /* 68-6F */ - { KC_KANA, KC_INSERT,KC_DELETE,KC_RO, KC_HOME, KC_END, KC_F24, KC_PGUP }, /* 70-77 */ - { KC_PGDN, KC_HENK, KC_RCTL, KC_MHEN, KC_RALT, KC_JYEN, KC_PCMM, KC_PSLS }, /* 78-7F */ + { XXX , 0x1a, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21 }, /* 00-07 */ + { 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x29, 0x33 }, /* 08-0F */ + { 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b }, /* 10-17 */ + { 0x3c, 0x3d, 0x3e, 0x3f, 0x57, 0x76, 0x4b, 0x4c }, /* 18-1F */ + { 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54 }, /* 20-27 */ + { 0x55, 0x1b, 0x5f, 0x56, 0x61, 0x62, 0x63, 0x64 }, /* 28-2F */ + { 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6c, 0x2f }, /* 30-37 */ + { 0x77, 0x78, 0x4a, 0x0d, 0x0e, 0x0f, 0x10, 0x11 }, /* 38-3F */ + { 0x12, 0x13, 0x14, 0x15, 0x16, 0x2d, 0x31, 0x44 }, /* 40-47 */ + { 0x45, 0x46, 0x30, 0x59, 0x5a, 0x5b, 0x47, 0x70 }, /* 48-4F */ + { 0x71, 0x72, 0x7d, 0x7e, 0x5e, 0x48, 0x60, 0x17 }, /* 50-57 */ + { 0x18, XXX , 0x75, 0x74, 0x5d, XXX , XXX , XXX }, /* 58-5F */ + { 0x58, 0x6d, 0x7b, 0x6f, 0x01, 0x02, 0x03, 0x04 }, /* 60-67 */ + { 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x73 }, /* 68-6F */ + { XXX , 0x2a, 0x41, XXX , 0x2b, 0x42, 0x0c, 0x2c }, /* 70-77 */ + { 0x43, XXX , 0x7a, XXX , 0x79, XXX, 0x5c, 0x2e }, /* 78-7F */ }; const uint8_t map_cs2[MATRIX_ROWS][MATRIX_COLS] = { @@ -452,33 +452,33 @@ const uint8_t map_cs2[MATRIX_ROWS][MATRIX_COLS] = { { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x2B }, /* 28-2F */ { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x41 }, /* 30-37 */ { 0x07, 0x2A, 0x67, 0x51, 0x3A, 0x22, 0x23, 0x7b }, /* 38-3F */ - { 0x08, 0x69, 0x52, 0x3B, 0x3D, 0x25, 0x24, 0x6f }, /* 40-47 */ - { 0x09, 0x68, 0x6a, 0x53, 0x54, 0x3C, 0x26, 0x58 }, /* 48-4F */ + { 0x08, 0x68, 0x52, 0x3B, 0x3c, 0x25, 0x24, 0x6f }, /* 40-47 */ + { 0x09, 0x69, 0x6a, 0x53, 0x54, 0x3d, 0x26, 0x58 }, /* 48-4F */ { 0x0A, XXX , 0x55, 0x6d, 0x3E, 0x27, 0x43, 0x0B }, /* 50-57 */ { 0x4a, 0x6C, 0x57, 0x3F, 0x5d, 0x28, 0x2C, 0x0C }, /* 58-5F */ { 0x2e, 0x60, 0x73, 0x7f, XXX , XXX , 0x29, XXX }, /* 60-67 */ { 0x56, 0x70, XXX , 0x59, 0x44, 0x5c, XXX , XXX }, /* 68-6F */ { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x1A, 0x2d }, /* 70-77 */ - { 0x17, 0x47, 0x72, 0x30, 0x2F, 0x46, 0x31, 0x5e }, /* 78-7F */ + { 0x17, 0x47, 0x72, 0x30, XXX , 0x46, 0x31, 0x5e }, /* 78-7F */ }; const uint8_t map_cs3[MATRIX_ROWS][MATRIX_COLS] = { - { KC_KANA, KC_LGUI, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE, KC_HENK, KC_F1 }, /* 00-07 */ - { KC_F13, KC_RGUI, KC_APP, KC_MHEN, KC_PAUS, KC_TAB, KC_GRV, KC_F2 }, /* 08-0F */ - { KC_F14, KC_LCTL, KC_LSHIFT,KC_NUBS, KC_CAPS, KC_Q, KC_1, KC_F3 }, /* 10-17 */ - { KC_F15, KC_LALT, KC_Z, KC_S, KC_A, KC_W, KC_2, KC_F4 }, /* 18-1F */ - { KC_F16, KC_C, KC_X, KC_D, KC_E, KC_4, KC_3, KC_F5 }, /* 20-27 */ - { KC_F17, KC_SPACE, KC_V, KC_F, KC_T, KC_R, KC_5, KC_F6 }, /* 28-2F */ - { KC_F18, KC_N, KC_B, KC_H, KC_G, KC_Y, KC_6, KC_F7 }, /* 30-37 */ - { KC_F19, KC_RALT, KC_M, KC_J, KC_U, KC_7, KC_8, KC_F8 }, /* 38-3F */ - { KC_F20, KC_COMMA, KC_K, KC_I, KC_O, KC_0, KC_9, KC_F9 }, /* 40-47 */ - { KC_F21, KC_DOT, KC_SLASH, KC_L, KC_SCOLON,KC_P, KC_MINUS, KC_F10 }, /* 48-4F */ - { KC_F22, KC_RO, KC_QUOTE, KC_NUHS, KC_LBRC, KC_EQUAL, KC_F11, KC_F23 }, /* 50-57 */ - { KC_RCTL, KC_RSHIFT,KC_ENTER, KC_RBRC, KC_BSLASH,KC_JYEN, KC_F12, KC_F24 }, /* 58-5F */ - { KC_DOWN, KC_LEFT, KC_HOME, KC_UP, KC_END, KC_INS, KC_BSPACE,KC_PSLS }, /* 60-67 */ - { KC_PCMM, KC_P1, KC_RIGHT, KC_P4, KC_P7, KC_DEL, KC_PGUP, KC_PGDN }, /* 68-6F */ - { KC_P0, KC_PDOT, KC_P2, KC_P5, KC_P6, KC_P8, KC_ESC, KC_NLCK }, /* 70-77 */ - { KC_PEQL, KC_PENT, KC_P3, KC_PMNS, KC_PPLS, KC_P9, KC_SLCK, KC_PAST }, /* 78-7F */ + { XXX , 0x75, 0x5e, 0x31, XXX , XXX , 0x1a, 0x0d }, /* 00-07 */ + { 0x01, 0x74, 0x5d, XXX , 0x48, 0x33, 0x1b, 0x0e }, /* 08-0F */ + { 0x02, 0x76, 0x5f, 0x60, 0x4a, 0x34, 0x1c, 0x0f }, /* 10-17 */ + { 0x03, 0x77, 0x61, 0x4c, 0x4b, 0x35, 0x1d, 0x10 }, /* 18-1F */ + { 0x04, 0x63, 0x62, 0x4d, 0x36, 0x1f, 0x1e, 0x11 }, /* 20-27 */ + { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x12 }, /* 28-2F */ + { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x13 }, /* 30-37 */ + { 0x07, 0x79, 0x67, 0x51, 0x3a, 0x22, 0x23, 0x14 }, /* 38-3F */ + { 0x08, 0x68, 0x52, 0x3b, 0x3c, 0x25, 0x24, 0x15 }, /* 40-47 */ + { 0x09, 0x69, 0x6a, 0x53, 0x54, 0x3d, 0x26, 0x16 }, /* 48-4F */ + { 0x0a, XXX , 0x55, 0x28, 0x3e, 0x27, 0x17, 0x0b }, /* 50-57 */ + { 0x7a, 0x6c, 0x57, 0x3f, 0x29, XXX , 0x18, 0x0c }, /* 58-5F */ + { 0x7b, 0x6d, 0x2b, 0x58, 0x41, 0x42, 0x29, 0x2a }, /* 60-67 */ + { 0x5c, 0x70, 0x6f, 0x59, 0x44, 0x43, 0x2b, 0x2c }, /* 68-6F */ + { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x2d, 0x2e }, /* 70-77 */ + { XXX , 0x73, 0x72, 0x5c, 0x47, 0x46, 0x2f, 0x30 }, /* 78-7F */ }; From 1a2391c25f78251c9244a27b65a37c9f0ebdb800 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 23 Jun 2021 22:43:57 +0200 Subject: [PATCH 8/9] cleanup --- keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk b/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk index 24f5a68b8ef9..6fe68c9e3a80 100644 --- a/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk +++ b/keyboards/converter/ibmpc_usb/keymaps/marfrit/rules.mk @@ -3,11 +3,11 @@ # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 From fa31ebc00fa8b61e91c7796183fa468c74c709b5 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 23 Jun 2021 22:46:12 +0200 Subject: [PATCH 9/9] cleanup --- keyboards/converter/ibmpc_usb/ibmpc_usb.c | 58 ++++++++++++++++++++ keyboards/converter/ibmpc_usb/ibmpc_usb.h | 43 +-------------- keyboards/converter/ibmpc_usb/matrix.c | 58 -------------------- keyboards/converter/ibmpc_usb/matrix_122.txt | 20 ------- keyboards/converter/ibmpc_usb/rules.mk | 1 - 5 files changed, 61 insertions(+), 119 deletions(-) delete mode 100644 keyboards/converter/ibmpc_usb/matrix_122.txt diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.c b/keyboards/converter/ibmpc_usb/ibmpc_usb.c index e678fef821e0..23c9317aed18 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.c +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.c @@ -17,3 +17,61 @@ along with this program. If not, see . #include "ibmpc_usb.h" + +const uint8_t map_cs1[MATRIX_ROWS][MATRIX_COLS] = { + { XXX , 0x1a, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21 }, /* 00-07 */ + { 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x29, 0x33 }, /* 08-0F */ + { 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b }, /* 10-17 */ + { 0x3c, 0x3d, 0x3e, 0x3f, 0x57, 0x76, 0x4b, 0x4c }, /* 18-1F */ + { 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54 }, /* 20-27 */ + { 0x55, 0x1b, 0x5f, 0x56, 0x61, 0x62, 0x63, 0x64 }, /* 28-2F */ + { 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6c, 0x2f }, /* 30-37 */ + { 0x77, 0x78, 0x4a, 0x0d, 0x0e, 0x0f, 0x10, 0x11 }, /* 38-3F */ + { 0x12, 0x13, 0x14, 0x15, 0x16, 0x2d, 0x31, 0x44 }, /* 40-47 */ + { 0x45, 0x46, 0x30, 0x59, 0x5a, 0x5b, 0x47, 0x70 }, /* 48-4F */ + { 0x71, 0x72, 0x7d, 0x7e, 0x5e, 0x48, 0x60, 0x17 }, /* 50-57 */ + { 0x18, XXX , 0x75, 0x74, 0x5d, XXX , XXX , XXX }, /* 58-5F */ + { 0x58, 0x6d, 0x7b, 0x6f, 0x01, 0x02, 0x03, 0x04 }, /* 60-67 */ + { 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x73 }, /* 68-6F */ + { XXX , 0x2a, 0x41, XXX , 0x2b, 0x42, 0x0c, 0x2c }, /* 70-77 */ + { 0x43, XXX , 0x7a, XXX , 0x79, XXX, 0x5c, 0x2e }, /* 78-7F */ +}; + +const uint8_t map_cs2[MATRIX_ROWS][MATRIX_COLS] = { + { 0x48, 0x15, 0x13, 0x11, 0x0F, 0x0D, 0x0E, 0x18 }, /* 00-07 */ + { 0x01, 0x16, 0x14, 0x12, 0x10, 0x33, 0x1B, 0x79 }, /* 08-0F */ + { 0x02, 0x77, 0x5F, XXX , 0x76, 0x34, 0x1C, 0x7A }, /* 10-17 */ + { 0x03, 0x75, 0x61, 0x4c, 0x4b, 0x35, 0x1D, 0x74 }, /* 18-1F */ + { 0x04, 0x63, 0x62, 0x4d, 0x36, 0x1F, 0x1E, 0x42 }, /* 20-27 */ + { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x2B }, /* 28-2F */ + { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x41 }, /* 30-37 */ + { 0x07, 0x2A, 0x67, 0x51, 0x3A, 0x22, 0x23, 0x7b }, /* 38-3F */ + { 0x08, 0x68, 0x52, 0x3B, 0x3c, 0x25, 0x24, 0x6f }, /* 40-47 */ + { 0x09, 0x69, 0x6a, 0x53, 0x54, 0x3d, 0x26, 0x58 }, /* 48-4F */ + { 0x0A, XXX , 0x55, 0x6d, 0x3E, 0x27, 0x43, 0x0B }, /* 50-57 */ + { 0x4a, 0x6C, 0x57, 0x3F, 0x5d, 0x28, 0x2C, 0x0C }, /* 58-5F */ + { 0x2e, 0x60, 0x73, 0x7f, XXX , XXX , 0x29, XXX }, /* 60-67 */ + { 0x56, 0x70, XXX , 0x59, 0x44, 0x5c, XXX , XXX }, /* 68-6F */ + { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x1A, 0x2d }, /* 70-77 */ + { 0x17, 0x47, 0x72, 0x30, XXX , 0x46, 0x31, 0x5e }, /* 78-7F */ +}; + +const uint8_t map_cs3[MATRIX_ROWS][MATRIX_COLS] = { + { XXX , 0x75, 0x5e, 0x31, XXX , XXX , 0x1a, 0x0d }, /* 00-07 */ + { 0x01, 0x74, 0x5d, XXX , 0x48, 0x33, 0x1b, 0x0e }, /* 08-0F */ + { 0x02, 0x76, 0x5f, 0x60, 0x4a, 0x34, 0x1c, 0x0f }, /* 10-17 */ + { 0x03, 0x77, 0x61, 0x4c, 0x4b, 0x35, 0x1d, 0x10 }, /* 18-1F */ + { 0x04, 0x63, 0x62, 0x4d, 0x36, 0x1f, 0x1e, 0x11 }, /* 20-27 */ + { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x12 }, /* 28-2F */ + { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x13 }, /* 30-37 */ + { 0x07, 0x79, 0x67, 0x51, 0x3a, 0x22, 0x23, 0x14 }, /* 38-3F */ + { 0x08, 0x68, 0x52, 0x3b, 0x3c, 0x25, 0x24, 0x15 }, /* 40-47 */ + { 0x09, 0x69, 0x6a, 0x53, 0x54, 0x3d, 0x26, 0x16 }, /* 48-4F */ + { 0x0a, XXX , 0x55, 0x28, 0x3e, 0x27, 0x17, 0x0b }, /* 50-57 */ + { 0x7a, 0x6c, 0x57, 0x3f, 0x29, XXX , 0x18, 0x0c }, /* 58-5F */ + { 0x7b, 0x6d, 0x2b, 0x58, 0x41, 0x42, 0x29, 0x2a }, /* 60-67 */ + { 0x5c, 0x70, 0x6f, 0x59, 0x44, 0x43, 0x2b, 0x2c }, /* 68-6F */ + { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x2d, 0x2e }, /* 70-77 */ + { XXX , 0x73, 0x72, 0x5c, 0x47, 0x46, 0x2f, 0x30 }, /* 78-7F */ +}; + diff --git a/keyboards/converter/ibmpc_usb/ibmpc_usb.h b/keyboards/converter/ibmpc_usb/ibmpc_usb.h index bf4c2cc4d914..fac5f36b73c8 100644 --- a/keyboards/converter/ibmpc_usb/ibmpc_usb.h +++ b/keyboards/converter/ibmpc_usb/ibmpc_usb.h @@ -77,44 +77,7 @@ typedef enum { NONE, PC_XT, PC_AT, PC_TERMINAL, PC_AT_Z150 } keyboard_kind_t; extern uint16_t keyboard_id; extern keyboard_kind_t keyboard_kind; -/* -const uint8_t PROGMEM map_cs1[MATRIX_ROWS][MATRIX_COLS] = { - { XXX, 0x1A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 }, 00-07 */ -/* { KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,KC_TAB }, 08-0F */ -/* { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I }, 10-17 */ -/* { KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_LCTL, KC_A, KC_S, }, 18-1F */ -/* { KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, 20-27 */ -/* { KC_QUOTE, KC_GRAVE, KC_LSHIFT,KC_BSLASH,KC_Z, KC_X, KC_C, KC_V, }, 28-2F */ -/* { KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,KC_PAST }, 30-37 */ -/* { KC_LALT, KC_SPACE, KC_CAPS, 0x0D, KC_F2, KC_F3, KC_F4, KC_F5 }, 38-3F */ -/* { KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_SLCK, KC_P7 }, 40-47 */ -/* { KC_P8, KC_P9, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1 }, 48-4F */ -/* { KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PSCR, KC_PAUSE, KC_NUHS, KC_F11 }, 50-57 */ -/* { KC_F12, KC_PEQL, KC_LGUI, KC_RGUI, KC_APP, KC_MUTE, KC_VOLD, KC_VOLU }, 58-5F */ -/* { KC_UP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F13, KC_F14, KC_F15, KC_F16 }, 60-67 */ -/* { KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_PENT }, 68-6F */ -/* { KC_KANA, KC_INSERT,KC_DELETE,KC_RO, KC_HOME, KC_END, KC_F24, KC_PGUP }, 70-77 */ -/* { KC_PGDN, KC_HENK, KC_RCTL, KC_MHEN, KC_RALT, KC_JYEN, KC_PCMM, KC_PSLS }, 78-7F */ -/*};*/ - -/* -const uint8_t PROGMEM map_cs3[MATRIX_ROWS][MATRIX_COLS] = { - { XXX, 0x73, 0x5C, 0x47, 0x30, 0x18, 0x19, 0x00 }, 00-07 - { 0x0C, 0x74, 0x5D, 0x48, 0x31, 0x32, 0x1A, 0x01 }, 08-0F - { 0x0D, 0x75, 0x5E, 0x5F, 0x49, 0x33, 0x1B, 0x02 }, 10-17 - { 0x0E, 0x76, 0x60, 0x4B, 0x4A, 0x34, 0x1C, 0x03 }, 18-1F - { 0x1F, 0x62, 0x61, 0x4C, 0x35, 0x1E, 0x1D, 0x04 }, 20-27 - { 0x10, 0x77, 0x63, 0x4D, 0x37, 0x36, 0x1F, 0x05 }, 28-2F - { 0x11, 0x65, 0x64, 0x4F, 0x4E, 0x38, 0x20, 0x06 }, 30-37 - { 0x12, 0x78, 0x66, 0x50, 0x39, 0x21, 0x22, 0x07 }, 38-3F - { 0x13, 0x67, 0x51, 0x3A, 0x3B, 0x24, 0x23, 0x08 }, 40-47 - { 0x14, 0x68, 0x69, 0x52, 0x53, 0x3C, 0x25, 0x09 }, 48-4F - { 0x15, 0x6A, 0x54, 0x55, 0x3D, 0x26, 0x0A, 0x16 }, 50-57 - { 0x79, 0x6B, 0x56, 0x3E, 0x3F, 0x27, 0x0B, 0x17 }, 58-5F - { 0x7A, 0x6C, 0x6D, 0x57, 0x40, 0x41, 0x28, 0x29 }, 60-67 - { 0x7B, 0x6F, 0x6E, 0x58, 0x43, 0x42, 0x2A, 0x2B }, 68-6F - { 0x7C, 0x7D, 0x70, 0x59, 0x5A, 0x44, 0x2C, 0x2D }, 70-77 - { 0x7E, 0x72, 0x71, 0x5B, 0x46, 0x45, 0x2E, 0x2F }, 78-7F -}; -*/ +extern const uint8_t map_cs1[MATRIX_ROWS][MATRIX_COLS]; +extern const uint8_t map_cs2[MATRIX_ROWS][MATRIX_COLS]; +extern const uint8_t map_cs3[MATRIX_ROWS][MATRIX_COLS]; #endif diff --git a/keyboards/converter/ibmpc_usb/matrix.c b/keyboards/converter/ibmpc_usb/matrix.c index a2ac5382f58c..82bce9249675 100644 --- a/keyboards/converter/ibmpc_usb/matrix.c +++ b/keyboards/converter/ibmpc_usb/matrix.c @@ -424,64 +424,6 @@ uint8_t matrix_get_row(uint8_t row) return matrix[row]; } -const uint8_t map_cs1[MATRIX_ROWS][MATRIX_COLS] = { - { XXX , 0x1a, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21 }, /* 00-07 */ - { 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x29, 0x33 }, /* 08-0F */ - { 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b }, /* 10-17 */ - { 0x3c, 0x3d, 0x3e, 0x3f, 0x57, 0x76, 0x4b, 0x4c }, /* 18-1F */ - { 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54 }, /* 20-27 */ - { 0x55, 0x1b, 0x5f, 0x56, 0x61, 0x62, 0x63, 0x64 }, /* 28-2F */ - { 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6c, 0x2f }, /* 30-37 */ - { 0x77, 0x78, 0x4a, 0x0d, 0x0e, 0x0f, 0x10, 0x11 }, /* 38-3F */ - { 0x12, 0x13, 0x14, 0x15, 0x16, 0x2d, 0x31, 0x44 }, /* 40-47 */ - { 0x45, 0x46, 0x30, 0x59, 0x5a, 0x5b, 0x47, 0x70 }, /* 48-4F */ - { 0x71, 0x72, 0x7d, 0x7e, 0x5e, 0x48, 0x60, 0x17 }, /* 50-57 */ - { 0x18, XXX , 0x75, 0x74, 0x5d, XXX , XXX , XXX }, /* 58-5F */ - { 0x58, 0x6d, 0x7b, 0x6f, 0x01, 0x02, 0x03, 0x04 }, /* 60-67 */ - { 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x73 }, /* 68-6F */ - { XXX , 0x2a, 0x41, XXX , 0x2b, 0x42, 0x0c, 0x2c }, /* 70-77 */ - { 0x43, XXX , 0x7a, XXX , 0x79, XXX, 0x5c, 0x2e }, /* 78-7F */ -}; - -const uint8_t map_cs2[MATRIX_ROWS][MATRIX_COLS] = { - { 0x48, 0x15, 0x13, 0x11, 0x0F, 0x0D, 0x0E, 0x18 }, /* 00-07 */ - { 0x01, 0x16, 0x14, 0x12, 0x10, 0x33, 0x1B, 0x79 }, /* 08-0F */ - { 0x02, 0x77, 0x5F, XXX , 0x76, 0x34, 0x1C, 0x7A }, /* 10-17 */ - { 0x03, 0x75, 0x61, 0x4c, 0x4b, 0x35, 0x1D, 0x74 }, /* 18-1F */ - { 0x04, 0x63, 0x62, 0x4d, 0x36, 0x1F, 0x1E, 0x42 }, /* 20-27 */ - { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x2B }, /* 28-2F */ - { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x41 }, /* 30-37 */ - { 0x07, 0x2A, 0x67, 0x51, 0x3A, 0x22, 0x23, 0x7b }, /* 38-3F */ - { 0x08, 0x68, 0x52, 0x3B, 0x3c, 0x25, 0x24, 0x6f }, /* 40-47 */ - { 0x09, 0x69, 0x6a, 0x53, 0x54, 0x3d, 0x26, 0x58 }, /* 48-4F */ - { 0x0A, XXX , 0x55, 0x6d, 0x3E, 0x27, 0x43, 0x0B }, /* 50-57 */ - { 0x4a, 0x6C, 0x57, 0x3F, 0x5d, 0x28, 0x2C, 0x0C }, /* 58-5F */ - { 0x2e, 0x60, 0x73, 0x7f, XXX , XXX , 0x29, XXX }, /* 60-67 */ - { 0x56, 0x70, XXX , 0x59, 0x44, 0x5c, XXX , XXX }, /* 68-6F */ - { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x1A, 0x2d }, /* 70-77 */ - { 0x17, 0x47, 0x72, 0x30, XXX , 0x46, 0x31, 0x5e }, /* 78-7F */ -}; - -const uint8_t map_cs3[MATRIX_ROWS][MATRIX_COLS] = { - { XXX , 0x75, 0x5e, 0x31, XXX , XXX , 0x1a, 0x0d }, /* 00-07 */ - { 0x01, 0x74, 0x5d, XXX , 0x48, 0x33, 0x1b, 0x0e }, /* 08-0F */ - { 0x02, 0x76, 0x5f, 0x60, 0x4a, 0x34, 0x1c, 0x0f }, /* 10-17 */ - { 0x03, 0x77, 0x61, 0x4c, 0x4b, 0x35, 0x1d, 0x10 }, /* 18-1F */ - { 0x04, 0x63, 0x62, 0x4d, 0x36, 0x1f, 0x1e, 0x11 }, /* 20-27 */ - { 0x05, 0x78, 0x64, 0x4e, 0x38, 0x37, 0x20, 0x12 }, /* 28-2F */ - { 0x06, 0x66, 0x65, 0x50, 0x4f, 0x39, 0x21, 0x13 }, /* 30-37 */ - { 0x07, 0x79, 0x67, 0x51, 0x3a, 0x22, 0x23, 0x14 }, /* 38-3F */ - { 0x08, 0x68, 0x52, 0x3b, 0x3c, 0x25, 0x24, 0x15 }, /* 40-47 */ - { 0x09, 0x69, 0x6a, 0x53, 0x54, 0x3d, 0x26, 0x16 }, /* 48-4F */ - { 0x0a, XXX , 0x55, 0x28, 0x3e, 0x27, 0x17, 0x0b }, /* 50-57 */ - { 0x7a, 0x6c, 0x57, 0x3f, 0x29, XXX , 0x18, 0x0c }, /* 58-5F */ - { 0x7b, 0x6d, 0x2b, 0x58, 0x41, 0x42, 0x29, 0x2a }, /* 60-67 */ - { 0x5c, 0x70, 0x6f, 0x59, 0x44, 0x43, 0x2b, 0x2c }, /* 68-6F */ - { 0x7d, 0x7e, 0x71, 0x5a, 0x5b, 0x45, 0x2d, 0x2e }, /* 70-77 */ - { XXX , 0x73, 0x72, 0x5c, 0x47, 0x46, 0x2f, 0x30 }, /* 78-7F */ -}; - - inline static void matrix_make(uint8_t code) { diff --git a/keyboards/converter/ibmpc_usb/matrix_122.txt b/keyboards/converter/ibmpc_usb/matrix_122.txt deleted file mode 100644 index 29671e68970c..000000000000 --- a/keyboards/converter/ibmpc_usb/matrix_122.txt +++ /dev/null @@ -1,20 +0,0 @@ - 00 01 02 03 04 05 06 07 08 09 0A 0B - 0C 0D 0E 0F 10 11 12 13 14 15 16 17 - -18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F -30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F 40 41 42 43 44 45 46 -47 48 49 4A 4B 4C 4D 4E 4F 50 51 52 53 54 55 56 57 58 59 5A 5B -5C 5D 5E 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 -73 74 75 76 77 78 79 7A 7B 7C 7D 7E - -leer 27 3f 6a 7b 7e - - - 08 10 18 20 28 30 38 40 48 50 57 5F - 07 0F 17 1F 27 2F 37 3F 47 4F 56 5E - -05 06 0E 16 1E 26 25 2E 36 3D 3E 46 45 4E 55 5D 66 67 6E 6F 76 77 7E 84 -04 0C 0D 15 1D 24 2D 2C 35 3C 43 44 4D 54 5B 5C 64 65 6D 6C 75 7D 7C -03 0B 14 1C 1B 23 2B 34 33 3B 42 4B 4C 52 53 5A 63 6B 73 74 7B -83 0A 12 13 1A 22 21 2A 32 31 3A 41 49 4A 51 59 61 62 6A 69 72 7A 79 -01 09 11 19 29 39 58 60 68 70 71 78 diff --git a/keyboards/converter/ibmpc_usb/rules.mk b/keyboards/converter/ibmpc_usb/rules.mk index fea6bcdd43fd..6ef413edb1c4 100644 --- a/keyboards/converter/ibmpc_usb/rules.mk +++ b/keyboards/converter/ibmpc_usb/rules.mk @@ -26,4 +26,3 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes SRC = matrix.c ibmpc.c -#ibmpc_usb.c