Skip to content

Commit

Permalink
Add LAYOUT_all to support ANSI and ISO keyboards with the same firmware
Browse files Browse the repository at this point in the history 
Add a LAYOUT_all similar to other keyboards that defines all available keys.
Change the default keymap to use the _all layout so both ANSI and ISO Model M
variants work out of the box.
  • Loading branch information
@nuess0r
nuess0r committed Oct 23, 2024
1 parent e4db3ef commit 0bc6391
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 2 deletions.
125 changes: 125 additions & 0 deletions keyboards/ibm/model_m/ctrl_m/keyboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,131 @@
{"label": "\u2193", "matrix": [7, 11], "x": 16.25, "y": 5.5},
{"label": "\u2192", "matrix": [7, 12], "x": 17.25, "y": 5.5},

{"label": "0", "matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
{"label": ".", "matrix": [0, 13], "x": 20.5, "y": 5.5}
]
},
"LAYOUT_all": {
"layout": [
{"label": "Esc", "matrix": [0, 2], "x": 0, "y": 0},

{"label": "F1", "matrix": [2, 3], "x": 2, "y": 0},
{"label": "F2", "matrix": [2, 4], "x": 3, "y": 0},
{"label": "F3", "matrix": [1, 4], "x": 4, "y": 0},
{"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},

{"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
{"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
{"label": "F7", "matrix": [1, 9], "x": 8.5, "y": 0},
{"label": "F8", "matrix": [2, 9], "x": 9.5, "y": 0},

{"label": "F9", "matrix": [2, 6], "x": 11, "y": 0},
{"label": "F10", "matrix": [3, 6], "x": 12, "y": 0},
{"label": "F11", "matrix": [3, 11], "x": 13, "y": 0},
{"label": "F12", "matrix": [3, 12], "x": 14, "y": 0},

{"label": "PrtSc", "matrix": [3, 15], "x": 15.25, "y": 0},
{"label": "Scroll Lock", "matrix": [4, 15], "x": 16.25, "y": 0},
{"label": "Pause", "matrix": [6, 14], "x": 17.25, "y": 0},

{"label": "~", "matrix": [2, 2], "x": 0, "y": 1.5},
{"label": "!", "matrix": [3, 2], "x": 1, "y": 1.5},
{"label": "@", "matrix": [3, 3], "x": 2, "y": 1.5},
{"label": "#", "matrix": [3, 4], "x": 3, "y": 1.5},
{"label": "$", "matrix": [3, 5], "x": 4, "y": 1.5},
{"label": "%", "matrix": [2, 5], "x": 5, "y": 1.5},
{"label": "^", "matrix": [2, 7], "x": 6, "y": 1.5},
{"label": "&", "matrix": [3, 7], "x": 7, "y": 1.5},
{"label": "*", "matrix": [3, 8], "x": 8, "y": 1.5},
{"label": "(", "matrix": [3, 9], "x": 9, "y": 1.5},
{"label": ")", "matrix": [3, 10], "x": 10, "y": 1.5},
{"label": "_", "matrix": [2, 10], "x": 11, "y": 1.5},
{"label": "+", "matrix": [2, 8], "x": 12, "y": 1.5},
{"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},

{"label": "Insert", "matrix": [2, 12], "x": 15.25, "y": 1.5},
{"label": "Home", "matrix": [2, 14], "x": 16.25, "y": 1.5},
{"label": "PgUp", "matrix": [2, 13], "x": 17.25, "y": 1.5},

{"label": "Num Lock", "matrix": [6, 11], "x": 18.5, "y": 1.5},
{"label": "/", "matrix": [6, 12], "x": 19.5, "y": 1.5},
{"label": "*", "matrix": [6, 13], "x": 20.5, "y": 1.5},
{"label": "-", "matrix": [7, 13], "x": 21.5, "y": 1.5},

{"label": "Tab", "matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
{"label": "Q", "matrix": [4, 2], "x": 1.5, "y": 2.5},
{"label": "W", "matrix": [4, 3], "x": 2.5, "y": 2.5},
{"label": "E", "matrix": [4, 4], "x": 3.5, "y": 2.5},
{"label": "R", "matrix": [4, 5], "x": 4.5, "y": 2.5},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2.5},
{"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 2.5},
{"label": "U", "matrix": [4, 7], "x": 7.5, "y": 2.5},
{"label": "I", "matrix": [4, 8], "x": 8.5, "y": 2.5},
{"label": "O", "matrix": [4, 9], "x": 9.5, "y": 2.5},
{"label": "P", "matrix": [4, 10], "x": 10.5, "y": 2.5},
{"label": "{", "matrix": [1, 10], "x": 11.5, "y": 2.5},
{"label": "}", "matrix": [1, 8], "x": 12.5, "y": 2.5},
{"label": "|", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},

{"label": "Delete", "matrix": [2, 11], "x": 15.25, "y": 2.5},
{"label": "End", "matrix": [3, 14], "x": 16.25, "y": 2.5},
{"label": "PgDn", "matrix": [3, 13], "x": 17.25, "y": 2.5},

{"label": "7", "matrix": [4, 11], "x": 18.5, "y": 2.5},
{"label": "8", "matrix": [4, 12], "x": 19.5, "y": 2.5},
{"label": "9", "matrix": [4, 13], "x": 20.5, "y": 2.5},
{"label": "+", "matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},

{"label": "Caps Lock", "matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
{"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5},
{"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5},
{"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5},
{"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5},
{"label": "G", "matrix": [0, 5], "x": 5.75, "y": 3.5},
{"label": "H", "matrix": [0, 7], "x": 6.75, "y": 3.5},
{"label": "J", "matrix": [5, 7], "x": 7.75, "y": 3.5},
{"label": "K", "matrix": [5, 8], "x": 8.75, "y": 3.5},
{"label": "L", "matrix": [5, 9], "x": 9.75, "y": 3.5},
{"label": ":", "matrix": [5, 10], "x": 10.75, "y": 3.5},
{"label": "\"", "matrix": [0, 10], "x": 11.75, "y": 3.5},
{"label": "NUHS", "matrix": [6, 10], "x": 12.75, "y": 3.5},
{"label": "Enter", "matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},

{"label": "4", "matrix": [1, 11], "x": 18.5, "y": 3.5},
{"label": "5", "matrix": [1, 12], "x": 19.5, "y": 3.5},
{"label": "6", "matrix": [1, 13], "x": 20.5, "y": 3.5},

{"label": "Shift", "matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
{"label": "NUBS", "matrix": [0, 3], "x": 1.25, "y": 4.5},
{"label": "Z", "matrix": [6, 2], "x": 2.25, "y": 4.5},
{"label": "X", "matrix": [6, 3], "x": 3.25, "y": 4.5},
{"label": "C", "matrix": [6, 4], "x": 4.25, "y": 4.5},
{"label": "V", "matrix": [6, 5], "x": 5.25, "y": 4.5},
{"label": "B", "matrix": [7, 5], "x": 6.25, "y": 4.5},
{"label": "N", "matrix": [7, 7], "x": 7.25, "y": 4.5},
{"label": "M", "matrix": [6, 7], "x": 8.25, "y": 4.5},
{"label": "<", "matrix": [6, 8], "x": 9.25, "y": 4.5},
{"label": ">", "matrix": [6, 9], "x": 10.25, "y": 4.5},
{"label": "?", "matrix": [7, 10], "x": 11.25, "y": 4.5},
{"label": "Shift", "matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},

{"label": "\u2191", "matrix": [0, 14], "x": 16.25, "y": 4.5},

{"label": "1", "matrix": [5, 11], "x": 18.5, "y": 4.5},
{"label": "2", "matrix": [5, 12], "x": 19.5, "y": 4.5},
{"label": "3", "matrix": [5, 13], "x": 20.5, "y": 4.5},
{"label": "Enter", "matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},

{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
{"label": "Alt", "matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
{"label": "Alt", "matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
{"label": "Ctrl", "matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},

{"label": "\u2190", "matrix": [7, 14], "x": 15.25, "y": 5.5},
{"label": "\u2193", "matrix": [7, 11], "x": 16.25, "y": 5.5},
{"label": "\u2192", "matrix": [7, 12], "x": 17.25, "y": 5.5},

{"label": "0", "matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
{"label": ".", "matrix": [0, 13], "x": 20.5, "y": 5.5}
]
Expand Down
4 changes: 2 additions & 2 deletions keyboards/ibm/model_m/ctrl_m/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ enum layers {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BL0] = LAYOUT_fullsize_iso_wkl( /* Base layer - standard layout without any special functions */
[_BL0] = LAYOUT_all( /* Base layer - standard layout without any special functions */
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_SCRL, 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_NUM, 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 , KC_PPLS,
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_BSLS, KC_DEL , KC_END , KC_PGDN, KC_P7, KC_P8 , KC_P9 , KC_PPLS,
KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_P4, KC_P5 , KC_P6 ,
KC_LSFT, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP , KC_P1, KC_P2 , KC_P3 , KC_PENT,
KC_LCTL, KC_LALT, KC_SPC , KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
Expand Down

0 comments on commit 0bc6391

Please sign in to comment.