Skip to content

Commit

Permalink
ProtoTypist PT-80 Refactor (qmk#21325)
Browse files Browse the repository at this point in the history
* [style] friendly-format info.json

* [docs] add layout/matrix diagram

* [style] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] LAYOUT_all macro

Move the JSON object for the Enter key to the end of the home row.

* [style] refactor default keymap

- update keycode grid alignment
- remove trailing whitespace

* [refactor] LAYOUT_tkl_iso macro

Move the JSON object for the Enter key to the end of the home row.

This commit fixes a key sequence error with the `tkl_iso` Community
Layout support.

* [style] refactor default_ansi keymap

- update keycode grid alignment
- remove trailing whitespace

* [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

Fix incorrect matrix position assignments on the function row keys for
the `LAYOUT_tkl_iso` macro.

* [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

Fix incorrect matrix position assignments on the function row keys for
the `LAYOUT_tkl_ansi` macro.
  • Loading branch information
noroadsleft authored and thismarvin committed Sep 27, 2023
1 parent 64254ab commit c141019
Show file tree
Hide file tree
Showing 5 changed files with 185 additions and 147 deletions.
152 changes: 80 additions & 72 deletions keyboards/prototypist/pt80/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
{"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
{"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
{"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},

{"matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25},
{"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
{"matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25},
Expand All @@ -62,7 +63,8 @@
{"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
{"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
{"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
{"matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25},

{"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
{"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
{"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
{"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
Expand All @@ -75,11 +77,11 @@
{"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
{"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
{"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
{"matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25},
{"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
{"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
{"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
{"matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25},

{"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
{"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
{"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
{"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
Expand All @@ -92,7 +94,9 @@
{"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
{"matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25},
{"matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25},
{"matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25},
{"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},

{"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 1.25},
{"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
{"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
{"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
Expand All @@ -104,17 +108,18 @@
{"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
{"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
{"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
{"matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25},
{"matrix": [4, 12], "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75},
{"matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25},
{"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
{"matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25},
{"matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25},
{"matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25},
{"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
{"matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25},
{"matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25},
{"matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25},
{"matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25},

{"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
{"matrix": [5, 10], "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25},
{"matrix": [5, 11], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 12], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
{"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
{"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
{"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
Expand All @@ -123,22 +128,22 @@
"LAYOUT_tkl_iso": {
"layout": [
{"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
{"matrix": [0, 1], "label": "F1", "x": 2, "y": 0},
{"matrix": [0, 2], "label": "F2", "x": 3, "y": 0},
{"matrix": [0, 3], "label": "F3", "x": 4, "y": 0},
{"matrix": [0, 4], "label": "F4", "x": 5, "y": 0},
{"matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0},
{"matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0},
{"matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0},
{"matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0},
{"matrix": [0, 9], "label": "F9", "x": 11, "y": 0},
{"matrix": [0, 10], "label": "F10", "x": 12, "y": 0},
{"matrix": [0, 11], "label": "F11", "x": 13, "y": 0},
{"matrix": [0, 12], "label": "F12", "x": 14, "y": 0},

{"matrix": [0, 2], "label": "F1", "x": 2, "y": 0},
{"matrix": [0, 3], "label": "F2", "x": 3, "y": 0},
{"matrix": [0, 4], "label": "F3", "x": 4, "y": 0},
{"matrix": [0, 5], "label": "F4", "x": 5, "y": 0},
{"matrix": [0, 6], "label": "F5", "x": 6.5, "y": 0},
{"matrix": [0, 7], "label": "F6", "x": 7.5, "y": 0},
{"matrix": [0, 8], "label": "F7", "x": 8.5, "y": 0},
{"matrix": [0, 9], "label": "F8", "x": 9.5, "y": 0},
{"matrix": [0, 10], "label": "F9", "x": 11, "y": 0},
{"matrix": [0, 11], "label": "F10", "x": 12, "y": 0},
{"matrix": [0, 12], "label": "F11", "x": 13, "y": 0},
{"matrix": [0, 13], "label": "F12", "x": 14, "y": 0},
{"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
{"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
{"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},

{"matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25},
{"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
{"matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25},
Expand All @@ -152,12 +157,12 @@
{"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
{"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
{"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
{"matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25},

{"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25, "w": 2},
{"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
{"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
{"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
{"matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25},

{"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
{"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
{"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
{"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
Expand All @@ -170,11 +175,11 @@
{"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
{"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
{"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
{"matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25},
{"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
{"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
{"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
{"matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25},

{"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
{"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
{"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
{"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
Expand All @@ -187,7 +192,9 @@
{"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
{"matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25},
{"matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25},
{"matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25},
{"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},

{"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 1.25},
{"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
{"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
{"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
Expand All @@ -199,17 +206,17 @@
{"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
{"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
{"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
{"matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25},

{"matrix": [4, 12], "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75},
{"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
{"matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25},
{"matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25},
{"matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25},
{"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
{"matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25},
{"matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25},
{"matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25},
{"matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25},

{"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
{"matrix": [5, 10], "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25},
{"matrix": [5, 11], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 12], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
{"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
{"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
{"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
Expand All @@ -218,22 +225,22 @@
"LAYOUT_tkl_ansi": {
"layout": [
{"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
{"matrix": [0, 1], "label": "F1", "x": 2, "y": 0},
{"matrix": [0, 2], "label": "F2", "x": 3, "y": 0},
{"matrix": [0, 3], "label": "F3", "x": 4, "y": 0},
{"matrix": [0, 4], "label": "F4", "x": 5, "y": 0},
{"matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0},
{"matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0},
{"matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0},
{"matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0},
{"matrix": [0, 9], "label": "F9", "x": 11, "y": 0},
{"matrix": [0, 10], "label": "F10", "x": 12, "y": 0},
{"matrix": [0, 11], "label": "F11", "x": 13, "y": 0},
{"matrix": [0, 12], "label": "F12", "x": 14, "y": 0},

{"matrix": [0, 2], "label": "F1", "x": 2, "y": 0},
{"matrix": [0, 3], "label": "F2", "x": 3, "y": 0},
{"matrix": [0, 4], "label": "F3", "x": 4, "y": 0},
{"matrix": [0, 5], "label": "F4", "x": 5, "y": 0},
{"matrix": [0, 6], "label": "F5", "x": 6.5, "y": 0},
{"matrix": [0, 7], "label": "F6", "x": 7.5, "y": 0},
{"matrix": [0, 8], "label": "F7", "x": 8.5, "y": 0},
{"matrix": [0, 9], "label": "F8", "x": 9.5, "y": 0},
{"matrix": [0, 10], "label": "F9", "x": 11, "y": 0},
{"matrix": [0, 11], "label": "F10", "x": 12, "y": 0},
{"matrix": [0, 12], "label": "F11", "x": 13, "y": 0},
{"matrix": [0, 13], "label": "F12", "x": 14, "y": 0},
{"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
{"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
{"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},

{"matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25},
{"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
{"matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25},
Expand All @@ -247,12 +254,12 @@
{"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
{"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
{"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
{"matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25},

{"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25, "w": 2},
{"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
{"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
{"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
{"matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25},

{"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
{"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
{"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
{"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
Expand All @@ -265,11 +272,12 @@
{"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
{"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
{"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
{"matrix": [2, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 2.25},
{"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
{"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
{"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
{"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
{"matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25},

{"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
{"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
{"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
{"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
Expand All @@ -281,9 +289,9 @@
{"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
{"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
{"matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25},
{"matrix": [3, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25},
{"matrix": [4, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 4.25},
{"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},

{"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 2.25},
{"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
{"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
{"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
Expand All @@ -294,17 +302,17 @@
{"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
{"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
{"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
{"matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25},

{"matrix": [4, 12], "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75},
{"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
{"matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25},
{"matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25},
{"matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25},
{"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
{"matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25},
{"matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25},
{"matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25},
{"matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25},

{"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
{"matrix": [5, 10], "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25},
{"matrix": [5, 11], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 12], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
{"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
{"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
{"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
{"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
Expand Down
Loading

0 comments on commit c141019

Please sign in to comment.