Skip to content

Commit

Permalink
AH Haven80 Community Layout support (qmk#21885)
Browse files Browse the repository at this point in the history 
* [enhancement] correct layout data

* [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_tsangan

* [enhancement] enable Community Layout support

* Haven80 Solder: add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

[enhancement]

* Haven80 Solder: add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

[enhancement]

* Haven80 Solder: add LAYOUT_tkl_f13_iso_tsangan

[enhancement]

* Haven80 Solder: extend Community Layout support

[enhancement]
  • Loading branch information
@noroadsleft @autoferrit
noroadsleft authored and autoferrit committed Dec 6, 2023
1 parent 8b9ecdc commit 6e6786d
Show file tree
Hide file tree
Showing 4 changed files with 463 additions and 154 deletions.
154 changes: 80 additions & 74 deletions keyboards/ah/haven80/hotswap/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@
"rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"],
"cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"]
},
"layout_aliases": {
"LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
},
"community_layouts": [
"tkl_f13_ansi_tsangan"
],
"layouts": {
"LAYOUT": {
"LAYOUT_tkl_f13_ansi_tsangan": {
"layout": [
{ "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 },
{ "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 },
Expand All @@ -21,90 +27,90 @@
{ "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 },
{ "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 },
{ "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 },
{ "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 },
{ "label": "F9", "matrix":[5,7],"x": 9.75, "y": 0 },
{ "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 },
{ "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 },
{ "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 },
{ "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 },
{ "label": "F13", "matrix":[5,3],"x": 14, "y": 0 },
{ "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 },
{ "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 },
{ "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 },

{ "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 },
{ "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 },
{ "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 },
{ "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 },
{ "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 },
{ "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 },
{ "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 },
{ "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 },
{ "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 },
{ "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 },
{ "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 },
{ "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 },
{ "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 },
{ "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
{ "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 },
{ "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 },
{ "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 },
{ "label": "～", "matrix":[1,0],"x": 0, "y": 1.25 },
{ "label": "1", "matrix":[1,1],"x": 1, "y": 1.25 },
{ "label": "2", "matrix":[1,2],"x": 2, "y": 1.25 },
{ "label": "3", "matrix":[1,3],"x": 3, "y": 1.25 },
{ "label": "4", "matrix":[1,4],"x": 4, "y": 1.25 },
{ "label": "5", "matrix":[1,5],"x": 5, "y": 1.25 },
{ "label": "6", "matrix":[1,6],"x": 6, "y": 1.25 },
{ "label": "7", "matrix":[1,7],"x": 7, "y": 1.25 },
{ "label": "8", "matrix":[1,8],"x": 8, "y": 1.25 },
{ "label": "9", "matrix":[6,8],"x": 9, "y": 1.25 },
{ "label": "0", "matrix":[6,7],"x": 10, "y": 1.25 },
{ "label": "-", "matrix":[6,6],"x": 11, "y": 1.25 },
{ "label": "=", "matrix":[6,5],"x": 12, "y": 1.25 },
{ "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.25, "w": 2 },
{ "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.25 },
{ "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.25 },
{ "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.25 },

{ "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 },
{ "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 },
{ "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 },
{ "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 },
{ "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 },
{ "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 },
{ "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 },
{ "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 },
{ "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 },
{ "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 },
{ "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 },
{ "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 },
{ "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 },
{ "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
{ "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 },
{ "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 },
{ "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 },
{ "label": "tab", "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 },
{ "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.25 },
{ "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.25 },
{ "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.25 },
{ "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.25 },
{ "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.25 },
{ "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.25 },
{ "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.25 },
{ "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.25 },
{ "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.25 },
{ "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.25 },
{ "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.25 },
{ "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.25 },
{ "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.25, "w": 1.5 },
{ "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.25 },
{ "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.25 },
{ "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.25 },

{ "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 },
{ "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 },
{ "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 },
{ "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 },
{ "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 },
{ "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 },
{ "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 },
{ "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 },
{ "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 },
{ "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 },
{ "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 },
{ "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 },
{ "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
{ "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 },
{ "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.25 },
{ "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.25 },
{ "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.25 },
{ "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.25 },
{ "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.25 },
{ "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.25 },
{ "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.25 },
{ "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.25 },
{ "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.25 },
{ "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.25 },
{ "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.25 },
{ "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.25, "w": 2.25 },

{ "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
{ "label": "z", "matrix":[4,1],"x": 2.25, "y": 4.5 },
{ "label": "x", "matrix":[4,2],"x": 3.25, "y": 4.5 },
{ "label": "c", "matrix":[4,3],"x": 4.25, "y": 4.5 },
{ "label": "v", "matrix":[4,4],"x": 5.25, "y": 4.5 },
{ "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 },
{ "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 },
{ "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 },
{ "label": ",", "matrix":[4,8],"x": 9.25, "y": 4.5 },
{ "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 },
{ "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 },
{ "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
{ "label": "up", "matrix":[8,1],"x": 16.25, "y": 4.5 },
{ "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.25, "w": 2.25 },
{ "label": "z", "matrix":[4,1],"x": 2.25, "y": 4.25 },
{ "label": "x", "matrix":[4,2],"x": 3.25, "y": 4.25 },
{ "label": "c", "matrix":[4,3],"x": 4.25, "y": 4.25 },
{ "label": "v", "matrix":[4,4],"x": 5.25, "y": 4.25 },
{ "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.25 },
{ "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.25 },
{ "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.25 },
{ "label": ",", "matrix":[4,8],"x": 9.25, "y": 4.25 },
{ "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.25 },
{ "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.25 },
{ "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.25, "w": 2.75 },
{ "label": "up", "matrix":[8,1],"x": 16.25, "y": 4.25 },

{ "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
{ "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 },
{ "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
{ "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
{ "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
{ "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
{ "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
{ "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 },
{ "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 },
{ "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 }
{ "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.25, "w": 1.5 },
{ "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.25 },
{ "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
{ "label": "space", "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
{ "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
{ "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
{ "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
{ "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.25 },
{ "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.25 },
{ "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.25 }
]
}
},
}
}
2 changes: 1 addition & 1 deletion keyboards/ah/haven80/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
[0] = LAYOUT_tkl_f13_ansi_tsangan(
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_F13, 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_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,
Expand Down
2 changes: 1 addition & 1 deletion keyboards/ah/haven80/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
[0] = LAYOUT_tkl_f13_ansi_tsangan(
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_F13, 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_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,
Expand Down
Loading

0 comments on commit 6e6786d

Please sign in to comment.