Skip to content

Commit

Permalink
CannonKeys Ellipse Hotswap Layout Macro Addition & Touch-Up (qmk#20560)
Browse files Browse the repository at this point in the history 
* add matrix_diagram.md

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_ansi_tsangan_split_rshift

* refactor default and via keymaps

- use four-space indent
- grid-align keycodes

* copy via keymap to default

The default keymap didn't make sense to me - it included keycodes for features that aren't supported, and the arrow key alignment on the function layer was wonky.

* enable Community Layout support
  • Loading branch information
@noroadsleft @autoferrit
noroadsleft authored and autoferrit committed Dec 6, 2023
1 parent 0ff385e commit d361047
Show file tree
Hide file tree
Showing 4 changed files with 227 additions and 125 deletions.
206 changes: 143 additions & 63 deletions keyboards/cannonkeys/ellipse_hs/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,71 +23,151 @@
"vid": "0xCA04",
"pid": "0x0016"
},
"layout_aliases": {
"LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
},
"community_layouts": [
"60_tsangan_hhkb"
],
"layouts": {
"LAYOUT_all": {
"LAYOUT_60_tsangan_hhkb": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},

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

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

{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
{"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
{"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
{"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "Fn", "matrix": [3, 14], "x": 14, "y": 3},

{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
{"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
{"label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
]
},

"LAYOUT_60_ansi_tsangan_split_rshift": {
"layout": [
{ "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
{ "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
{ "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
{ "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
{ "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
{ "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
{ "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
{ "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
{ "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
{ "label": "Del", "matrix": [0, 13], "x": 13, "y": 0 },
{ "label": "Bksp", "matrix": [0, 14], "x": 14, "y": 0 },
{ "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
{ "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
{ "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
{ "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
{ "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
{ "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
{ "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
{ "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
{ "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
{ "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
{ "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
{ "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
{ "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
{ "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
{ "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
{ "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
{ "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
{ "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
{ "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
{ "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
{ "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
{ "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
{ "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
{ "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
{ "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
{ "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
{ "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
{ "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
{ "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
{ "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
{ "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
{ "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
{ "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
{ "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
{ "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
{ "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0, "w": 2.0 },

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

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

{ "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
{ "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
{ "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
{ "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
{ "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
{ "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
{ "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
{ "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
{ "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
{ "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
{ "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
{ "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },

{ "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
{ "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
{ "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
{ "label": "Space", "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
{ "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
{ "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
{ "label": "Ctrl", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
]
}
}
Expand Down
64 changes: 33 additions & 31 deletions keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,37 @@ enum layer_names {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_all(
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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),

[_FN1] = LAYOUT_all(
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_DEL,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_UP, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, QK_BOOT
),

[_FN2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),

[_FN3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
)

[_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),

[_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
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_DEL,
_______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, QK_BOOT
),

[_FN2] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),

[_FN3] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
)

};
Loading

0 comments on commit d361047

Please sign in to comment.