Skip to content

Commit

Permalink
ProtoTypist PT-60 Refactor (qmk#21322)
Browse files Browse the repository at this point in the history
  • Loading branch information
@noroadsleft @thismarvin
noroadsleft authored and thismarvin committed Sep 27, 2023
1 parent 8f51387 commit 64254ab
Show file tree
Hide file tree
Showing 5 changed files with 103 additions and 72 deletions.
90 changes: 47 additions & 43 deletions keyboards/prototypist/pt60/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
{"matrix": [0, 12], "label": "+", "x": 12, "y": 0},
{"matrix": [0, 13], "label": "Back", "x": 13, "y": 0},
{"matrix": [2, 13], "label": "Delete", "x": 14, "y": 0},
{"matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1},

{"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
{"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
{"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
Expand All @@ -55,8 +56,8 @@
{"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
{"matrix": [1, 11], "label": "{", "x": 11.5, "y": 1},
{"matrix": [1, 12], "label": "}", "x": 12.5, "y": 1},
{"matrix": [1, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1},
{"matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2},

{"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
{"matrix": [2, 2], "label": "S", "x": 2.75, "y": 2},
{"matrix": [2, 3], "label": "D", "x": 3.75, "y": 2},
Expand All @@ -69,8 +70,9 @@
{"matrix": [2, 10], "label": ":", "x": 10.75, "y": 2},
{"matrix": [2, 11], "label": "@", "x": 11.75, "y": 2},
{"matrix": [2, 12], "label": "~", "x": 12.75, "y": 2},
{"matrix": [1, 13], "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2},

{"matrix": [3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3},
{"matrix": [3, 0], "label": "Shift", "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "label": "|", "x": 1.25, "y": 3},
{"matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3},
{"matrix": [3, 3], "label": "X", "x": 3.25, "y": 3},
Expand All @@ -82,16 +84,17 @@
{"matrix": [3, 9], "label": "<", "x": 9.25, "y": 3},
{"matrix": [3, 10], "label": ">", "x": 10.25, "y": 3},
{"matrix": [3, 11], "label": "?", "x": 11.25, "y": 3},
{"matrix": [3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3},
{"matrix": [3, 12], "label": "Shift", "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [3, 13], "label": "Fn", "x": 14, "y": 3},
{"matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4},
{"matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4},
{"matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4},
{"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
{"matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4},
{"matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4},
{"matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4},
{"matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4}

{"matrix": [4, 0], "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 10], "label": "AltGr", "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "label": "Win", "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "label": "Fn", "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 13], "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso": {
Expand All @@ -109,9 +112,9 @@
{"matrix": [0, 10], "label": ")", "x": 10, "y": 0},
{"matrix": [0, 11], "label": "_", "x": 11, "y": 0},
{"matrix": [0, 12], "label": "+", "x": 12, "y": 0},
{"matrix": [0, 13], "label": "Back", "w": 2, "x": 13, "y": 0},
{"matrix": [0, 13], "label": "Back", "x": 13, "y": 0, "w": 2},

{"matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1},
{"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
{"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
{"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
Expand All @@ -124,8 +127,8 @@
{"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
{"matrix": [1, 11], "label": "{", "x": 11.5, "y": 1},
{"matrix": [1, 12], "label": "}", "x": 12.5, "y": 1},
{"matrix": [1, 13], "label": "Enter", "h": 2, "w": 1.25, "x": 13.75, "y": 1},
{"matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2},

{"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
{"matrix": [2, 2], "label": "S", "x": 2.75, "y": 2},
{"matrix": [2, 3], "label": "D", "x": 3.75, "y": 2},
Expand All @@ -138,8 +141,9 @@
{"matrix": [2, 10], "label": ":", "x": 10.75, "y": 2},
{"matrix": [2, 11], "label": "@", "x": 11.75, "y": 2},
{"matrix": [2, 12], "label": "~", "x": 12.75, "y": 2},
{"matrix": [1, 13], "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2},

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

{"matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4},
{"matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4},
{"matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4},
{"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
{"matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4},
{"matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4},
{"matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4},
{"matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4}
{"matrix": [4, 0], "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 10], "label": "AltGr", "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "label": "Win", "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "label": "Fn", "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 13], "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
Expand All @@ -178,9 +182,9 @@
{"matrix": [0, 10], "label": ")", "x": 10, "y": 0},
{"matrix": [0, 11], "label": "_", "x": 11, "y": 0},
{"matrix": [0, 12], "label": "+", "x": 12, "y": 0},
{"matrix": [0, 13], "label": "Back", "w": 2, "x": 13, "y": 0},
{"matrix": [0, 13], "label": "Back", "x": 13, "y": 0, "w": 2},

{"matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1},
{"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
{"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
{"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
Expand All @@ -193,8 +197,9 @@
{"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
{"matrix": [1, 11], "label": "{", "x": 11.5, "y": 1},
{"matrix": [1, 12], "label": "}", "x": 12.5, "y": 1},
{"matrix": [1, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 1},
{"matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2},
{"matrix": [1, 13], "label": "|", "x": 13.5, "y": 1, "w": 1.5},

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

{"matrix": [3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3},
{"matrix": [2, 12], "label": "Enter", "x": 12.75, "y": 2, "w": 2.25},

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

{"matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4},
{"matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4},
{"matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4},
{"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
{"matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4},
{"matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4},
{"matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4},
{"matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4}
{"matrix": [4, 0], "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 10], "label": "AltGr", "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "label": "Win", "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "label": "Fn", "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 13], "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25}
]
}
}
Expand Down
24 changes: 12 additions & 12 deletions keyboards/prototypist/pt60/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_60_iso(
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_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_ENT,
KC_LGUI, 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_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_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_LGUI, 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
),

[1] = LAYOUT_60_iso(
EE_CLR, 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_VOLU,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),
_______, _______, _______, _______, _______, _______, _______, _______
),

[2] = LAYOUT_60_iso(
_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, MO(3)
),

[3] = LAYOUT_60_iso(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
};
16 changes: 8 additions & 8 deletions keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_60_ansi(
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_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_LGUI, 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,
KC_LGUI, 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,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
),

[1] = LAYOUT_60_ansi(
EE_CLR, 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_VOLU,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),
_______, _______, _______, _______, _______, _______, _______, _______
),

[2] = LAYOUT_60_ansi(
_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, MO(3)
),

[3] = LAYOUT_60_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
Loading

0 comments on commit 64254ab

Please sign in to comment.