Skip to content

Commit

Permalink
Wolf Neely65 Touch-Up (qmk#22045)
Browse files Browse the repository at this point in the history 
* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

[style]

* Touch-up keymaps

- grid-align keycodes
- use QMK-native keycode aliases

[refactor]

* Fix keymaps

Fix keycodes being assigned out of order with respect to `info.json`.

- move XT function keys to left side
- move keycodes for position [2, 14] from Home Row to Number Row

[bugfix]

* Rename `LAYOUT` to `LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs`

[refactor]

* Add `LAYOUT_65_xt_ansi_blocker_tsangan_wkl`

[enhancement]
  • Loading branch information
@noroadsleft
noroadsleft authored Sep 18, 2023
1 parent b5181e3 commit 25df4ba
Show file tree
Hide file tree
Showing 4 changed files with 222 additions and 104 deletions.
256 changes: 178 additions & 78 deletions keyboards/wolf/neely65/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,86 +23,186 @@
"pid": "0x0071",
"vid": "0x5453"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs"
},
"layouts": {
"LAYOUT": {
"LAYOUT_65_xt_ansi_blocker_tsangan_wkl": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},

{"matrix": [0, 2], "x": 2.5, "y": 0},
{"matrix": [0, 3], "x": 3.5, "y": 0},
{"matrix": [0, 4], "x": 4.5, "y": 0},
{"matrix": [0, 5], "x": 5.5, "y": 0},
{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 7], "x": 7.5, "y": 0},
{"matrix": [0, 8], "x": 8.5, "y": 0},
{"matrix": [0, 9], "x": 9.5, "y": 0},
{"matrix": [0, 10], "x": 10.5, "y": 0},
{"matrix": [0, 11], "x": 11.5, "y": 0},
{"matrix": [0, 12], "x": 12.5, "y": 0},
{"matrix": [0, 13], "x": 13.5, "y": 0},
{"matrix": [0, 14], "x": 14.5, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
{"matrix": [0, 16], "x": 17.5, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},

{"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
{"matrix": [1, 3], "x": 4, "y": 1},
{"matrix": [1, 4], "x": 5, "y": 1},
{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [1, 9], "x": 10, "y": 1},
{"matrix": [1, 10], "x": 11, "y": 1},
{"matrix": [1, 11], "x": 12, "y": 1},
{"matrix": [1, 12], "x": 13, "y": 1},
{"matrix": [1, 13], "x": 14, "y": 1},
{"matrix": [1, 14], "x": 15, "y": 1},
{"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
{"matrix": [1, 16], "x": 17.5, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},

{"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
{"matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [2, 4], "x": 5.25, "y": 2},
{"matrix": [2, 5], "x": 6.25, "y": 2},
{"matrix": [2, 6], "x": 7.25, "y": 2},
{"matrix": [2, 7], "x": 8.25, "y": 2},
{"matrix": [2, 8], "x": 9.25, "y": 2},
{"matrix": [2, 9], "x": 10.25, "y": 2},
{"matrix": [2, 10], "x": 11.25, "y": 2},
{"matrix": [2, 11], "x": 12.25, "y": 2},
{"matrix": [2, 12], "x": 13.25, "y": 2},
{"matrix": [2, 13], "x": 14.25, "y": 2},
{"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
{"matrix": [2, 16], "x": 17.5, "y": 2},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},

{"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 4.75, "y": 3},
{"matrix": [3, 4], "x": 5.75, "y": 3},
{"matrix": [3, 5], "x": 6.75, "y": 3},
{"matrix": [3, 6], "x": 7.75, "y": 3},
{"matrix": [3, 7], "x": 8.75, "y": 3},
{"matrix": [3, 8], "x": 9.75, "y": 3},
{"matrix": [3, 9], "x": 10.75, "y": 3},
{"matrix": [3, 10], "x": 11.75, "y": 3},
{"matrix": [3, 11], "x": 12.75, "y": 3},
{"matrix": [3, 12], "x": 13.75, "y": 3},
{"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
{"matrix": [3, 15], "x": 16.5, "y": 3},
{"matrix": [3, 16], "x": 17.5, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},

{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
{"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
{"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5},
{"matrix": [4, 14], "x": 15.5, "y": 4},
{"matrix": [4, 15], "x": 16.5, "y": 4},
{"matrix": [4, 16], "x": 17.5, "y": 4}
]
},
"LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs": {
"layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 },
{ "matrix": [0, 2], "x": 2.5, "y": 0 },
{ "matrix": [0, 3], "x": 3.5, "y": 0 },
{ "matrix": [0, 4], "x": 4.5, "y": 0 },
{ "matrix": [0, 5], "x": 5.5, "y": 0 },
{ "matrix": [0, 6], "x": 6.5, "y": 0 },
{ "matrix": [0, 7], "x": 7.5, "y": 0 },
{ "matrix": [0, 8], "x": 8.5, "y": 0 },
{ "matrix": [0, 9], "x": 9.5, "y": 0 },
{ "matrix": [0, 10], "x": 10.5, "y": 0 },
{ "matrix": [0, 11], "x": 11.5, "y": 0 },
{ "matrix": [0, 12], "x": 12.5, "y": 0 },
{ "matrix": [0, 13], "x": 13.5, "y": 0 },
{ "matrix": [0, 14], "x": 14.5, "y": 0 },
{ "matrix": [0, 15], "x": 15.5, "y": 0 },
{ "matrix": [2, 14], "x": 16.5, "y": 0 },
{ "matrix": [0, 16], "x": 17.5, "y": 0 },
{ "matrix": [1, 0], "x": 0, "y": 1 },
{ "matrix": [1, 1], "x": 1, "y": 1 },
{ "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1 },
{ "matrix": [1, 3], "x": 4, "y": 1 },
{ "matrix": [1, 4], "x": 5, "y": 1 },
{ "matrix": [1, 5], "x": 6, "y": 1 },
{ "matrix": [1, 6], "x": 7, "y": 1 },
{ "matrix": [1, 7], "x": 8, "y": 1 },
{ "matrix": [1, 8], "x": 9, "y": 1 },
{ "matrix": [1, 9], "x": 10, "y": 1 },
{ "matrix": [1, 10], "x": 11, "y": 1 },
{ "matrix": [1, 11], "x": 12, "y": 1 },
{ "matrix": [1, 12], "x": 13, "y": 1 },
{ "matrix": [1, 13], "x": 14, "y": 1 },
{ "matrix": [1, 14], "x": 15, "y": 1 },
{ "matrix": [1, 15], "w": 1.5, "x": 16, "y": 1 },
{ "matrix": [1, 16], "x": 17.5, "y": 1 },
{ "matrix": [2, 0], "x": 0, "y": 2 },
{ "matrix": [2, 1], "x": 1, "y": 2 },
{ "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2 },
{ "matrix": [2, 3], "x": 4.25, "y": 2 },
{ "matrix": [2, 4], "x": 5.25, "y": 2 },
{ "matrix": [2, 5], "x": 6.25, "y": 2 },
{ "matrix": [2, 6], "x": 7.25, "y": 2 },
{ "matrix": [2, 7], "x": 8.25, "y": 2 },
{ "matrix": [2, 8], "x": 9.25, "y": 2 },
{ "matrix": [2, 9], "x": 10.25, "y": 2 },
{ "matrix": [2, 10], "x": 11.25, "y": 2 },
{ "matrix": [2, 11], "x": 12.25, "y": 2 },
{ "matrix": [2, 12], "x": 13.25, "y": 2 },
{ "matrix": [2, 13], "x": 14.25, "y": 2 },
{ "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2 },
{ "matrix": [2, 16], "x": 17.5, "y": 2 },
{ "matrix": [3, 0], "x": 0, "y": 3 },
{ "matrix": [3, 1], "x": 1, "y": 3 },
{ "matrix": [3, 2], "w": 2.25, "x": 2.5, "y": 3 },
{ "matrix": [3, 3], "x": 4.75, "y": 3 },
{ "matrix": [3, 4], "x": 5.75, "y": 3 },
{ "matrix": [3, 5], "x": 6.75, "y": 3 },
{ "matrix": [3, 6], "x": 7.75, "y": 3 },
{ "matrix": [3, 7], "x": 8.75, "y": 3 },
{ "matrix": [3, 8], "x": 9.75, "y": 3 },
{ "matrix": [3, 9], "x": 10.75, "y": 3 },
{ "matrix": [3, 10], "x": 11.75, "y": 3 },
{ "matrix": [3, 11], "x": 12.75, "y": 3 },
{ "matrix": [3, 12], "x": 13.75, "y": 3 },
{ "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3 },
{ "matrix": [3, 15], "x": 16.5, "y": 3 },
{ "matrix": [3, 16], "x": 17.5, "y": 3 },
{ "matrix": [4, 0], "x": 0, "y": 4 },
{ "matrix": [4, 1], "x": 1, "y": 4 },
{ "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
{ "matrix": [4, 4], "w": 1.5, "x": 4.75, "y": 4 },
{ "matrix": [4, 7], "w": 7, "x": 6.25, "y": 4 },
{ "matrix": [4, 12], "w": 1.5, "x": 13.25, "y": 4 },
{ "matrix": [4, 14], "x": 15.5, "y": 4 },
{ "matrix": [4, 15], "x": 16.5, "y": 4 },
{ "matrix": [4, 16], "x": 17.5, "y": 4 }
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},

{"matrix": [0, 2], "x": 2.5, "y": 0},
{"matrix": [0, 3], "x": 3.5, "y": 0},
{"matrix": [0, 4], "x": 4.5, "y": 0},
{"matrix": [0, 5], "x": 5.5, "y": 0},
{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 7], "x": 7.5, "y": 0},
{"matrix": [0, 8], "x": 8.5, "y": 0},
{"matrix": [0, 9], "x": 9.5, "y": 0},
{"matrix": [0, 10], "x": 10.5, "y": 0},
{"matrix": [0, 11], "x": 11.5, "y": 0},
{"matrix": [0, 12], "x": 12.5, "y": 0},
{"matrix": [0, 13], "x": 13.5, "y": 0},
{"matrix": [0, 14], "x": 14.5, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [2, 14], "x": 16.5, "y": 0},
{"matrix": [0, 16], "x": 17.5, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},

{"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
{"matrix": [1, 3], "x": 4, "y": 1},
{"matrix": [1, 4], "x": 5, "y": 1},
{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [1, 9], "x": 10, "y": 1},
{"matrix": [1, 10], "x": 11, "y": 1},
{"matrix": [1, 11], "x": 12, "y": 1},
{"matrix": [1, 12], "x": 13, "y": 1},
{"matrix": [1, 13], "x": 14, "y": 1},
{"matrix": [1, 14], "x": 15, "y": 1},
{"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
{"matrix": [1, 16], "x": 17.5, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},

{"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
{"matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [2, 4], "x": 5.25, "y": 2},
{"matrix": [2, 5], "x": 6.25, "y": 2},
{"matrix": [2, 6], "x": 7.25, "y": 2},
{"matrix": [2, 7], "x": 8.25, "y": 2},
{"matrix": [2, 8], "x": 9.25, "y": 2},
{"matrix": [2, 9], "x": 10.25, "y": 2},
{"matrix": [2, 10], "x": 11.25, "y": 2},
{"matrix": [2, 11], "x": 12.25, "y": 2},
{"matrix": [2, 12], "x": 13.25, "y": 2},
{"matrix": [2, 13], "x": 14.25, "y": 2},
{"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
{"matrix": [2, 16], "x": 17.5, "y": 2},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},

{"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 4.75, "y": 3},
{"matrix": [3, 4], "x": 5.75, "y": 3},
{"matrix": [3, 5], "x": 6.75, "y": 3},
{"matrix": [3, 6], "x": 7.75, "y": 3},
{"matrix": [3, 7], "x": 8.75, "y": 3},
{"matrix": [3, 8], "x": 9.75, "y": 3},
{"matrix": [3, 9], "x": 10.75, "y": 3},
{"matrix": [3, 10], "x": 11.75, "y": 3},
{"matrix": [3, 11], "x": 12.75, "y": 3},
{"matrix": [3, 12], "x": 13.75, "y": 3},
{"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
{"matrix": [3, 15], "x": 16.5, "y": 3},
{"matrix": [3, 16], "x": 17.5, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},

{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
{"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
{"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5},
{"matrix": [4, 14], "x": 15.5, "y": 4},
{"matrix": [4, 15], "x": 16.5, "y": 4},
{"matrix": [4, 16], "x": 17.5, "y": 4}
]
}
}
}
}
26 changes: 13 additions & 13 deletions keyboards/wolf/neely65/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT(
QK_GESC, 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_HOME, KC_F1, KC_F2,
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_PGUP, KC_F3, KC_F4,
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_DEL, KC_ENT, KC_PGDN, KC_F5, KC_F6,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_END, KC_F7, KC_F8,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_APP, KC_F9, KC_F10
[0] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
KC_F1, KC_F2, QK_GESC, 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_DEL, KC_HOME,
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_BSLS, KC_PGUP,
KC_F5, KC_F6, 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_ENT, KC_PGDN,
KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_END,
KC_F9, KC_F10, KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_APP
),

[1] = LAYOUT(
KC_GRV, 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_DEL, KC_AUDIO_VOL_UP, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_DOWN, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_NEXT_TRACK, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS
[1] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
KC_TRNS, KC_TRNS, KC_GRV, 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_DEL, KC_TRNS, KC_VOLU,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE
)
};
};
Loading

0 comments on commit 25df4ba

Please sign in to comment.