Skip to content

Commit

Permalink
[refactor] LAYOUT_60_iso macro
Browse files Browse the repository at this point in the history 
Move the JSON object for the Enter key to the end of the home row.

This commit fixes a key sequence error with the `60_iso` Community
Layout support.
  • Loading branch information
@noroadsleft
noroadsleft committed Jun 20, 2023
1 parent 2fe287a commit 9103e11
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion keyboards/prototypist/pt60/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
{"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", "x": 13.75, "y": 1, "w": 1.25, "h": 2},

{"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
Expand All @@ -142,6 +141,7 @@
{"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", "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "label": "|", "x": 1.25, "y": 3},
Expand Down
14 changes: 7 additions & 7 deletions keyboards/prototypist/pt60/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
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_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, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 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(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
Expand Down

0 comments on commit 9103e11

Please sign in to comment.