Skip to content

Commit

Permalink
fix up layouts
Browse files Browse the repository at this point in the history
  • Loading branch information
Xelus22 committed Dec 14, 2024
1 parent 6a2187d commit 7b24c97
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 14 deletions.
82 changes: 76 additions & 6 deletions keyboards/swagkeys/integral/keyboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@
"pid": "0x4F21",
"vid": "0x4E21"
},
"community_layouts": [
"60_ansi_tsangan",
"60_ansi_tsangan_split_bs_rshift"
],
"layouts": {
"LAYOUT": {
"LAYOUT_60_ansi_tsangan_split_bs_rshift": {
"layout": [
{"label": "`~", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
Expand All @@ -47,9 +51,8 @@
{"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, "w": 2},
{"label": "BSLS", "matrix": [0, 14], "x": 13, "y": 0},
{"label": "Backspace", "matrix": [0, 15], "x": 13, "y": 0},
{"label": "Backspace", "matrix": [0, 15], "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},
Expand Down Expand Up @@ -88,9 +91,8 @@
{"label": ",<", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ".>", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "/?", "matrix": [3, 10], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
{"label": "MO", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
{"label": "Shift", "matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
{"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
{"label": "MO", "matrix": [3, 12], "x": 14, "y": 3},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
Expand All @@ -99,6 +101,74 @@
{"label": "FN", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi_tsangan": {
"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, "w": 2},

{"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, 13], "x": 13.5, "y": 1, "w": 1.5},

{"label": "Caps", "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, 12], "x": 12.75, "y": 2, "w": 2.25},

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

{"label": "LCtrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "LGui", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
{"label": "LAlt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 7},
{"label": "RAlt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
{"label": "FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.5},
{"label": "RCtrl", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.5}
]
}
}
}
16 changes: 8 additions & 8 deletions keyboards/swagkeys/integral/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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_BSLS, KC_BSPC,
[0] = LAYOUT_60_ansi_tsangan(
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_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(1), KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL
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, MO(1), KC_RCTL
),
[1] = LAYOUT(
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
[1] = LAYOUT_60_ansi_tsangan(
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)

};
Expand Down

0 comments on commit 7b24c97

Please sign in to comment.