Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rart67M: rename LAYOUT_all to LAYOUT #20787

Merged
merged 3 commits into from
May 8, 2023
+74 −71
Merged

Rart67M: rename LAYOUT_all to LAYOUT #20787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1c314f
info.json: apply friendly formatting
noroadsleft May 8, 2023
0ab5cfc
rename LAYOUT_all to LAYOUT
noroadsleft May 8, 2023
bdb190f
info.json: remove trailing spaces
noroadsleft May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 68 additions & 65 deletions keyboards/rart/rart67m/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,77 +15,80 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
"layouts": {
"LAYOUT_all": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [1, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [0, 3], "x": 6, "y": 0},
{"matrix": [1, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [0, 5], "x": 10, "y": 0},
{"matrix": [1, 5], "x": 11, "y": 0},
{"matrix": [0, 6], "x": 12, "y": 0},
{"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
{"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
{"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
{"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
{"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
{"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
{"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2},

{"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [3, 0], "x": 1.5, "y": 1},
{"matrix": [2, 1], "x": 2.5, "y": 1},
{"matrix": [3, 1], "x": 3.5, "y": 1},
{"matrix": [2, 2], "x": 4.5, "y": 1},
{"matrix": [3, 2], "x": 5.5, "y": 1},
{"matrix": [2, 3], "x": 6.5, "y": 1},
{"matrix": [3, 3], "x": 7.5, "y": 1},
{"matrix": [2, 4], "x": 8.5, "y": 1},
{"matrix": [3, 4], "x": 9.5, "y": 1},
{"matrix": [2, 5], "x": 10.5, "y": 1},
{"matrix": [3, 5], "x": 11.5, "y": 1},
{"matrix": [2, 6], "x": 12.5, "y": 1},
{"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
{"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
{"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
{"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
{"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
{"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
{"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
{"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
{"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
{"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
{"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
{"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
{"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},

{"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [5, 0], "x": 1.75, "y": 2},
{"matrix": [4, 1], "x": 2.75, "y": 2},
{"matrix": [5, 1], "x": 3.75, "y": 2},
{"matrix": [4, 2], "x": 4.75, "y": 2},
{"matrix": [5, 2], "x": 5.75, "y": 2},
{"matrix": [4, 3], "x": 6.75, "y": 2},
{"matrix": [5, 3], "x": 7.75, "y": 2},
{"matrix": [4, 4], "x": 8.75, "y": 2},
{"matrix": [5, 4], "x": 9.75, "y": 2},
{"matrix": [4, 5], "x": 10.75, "y": 2},
{"matrix": [5, 5], "x": 11.75, "y": 2},
{"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [5, 6], "x": 15, "y": 2},
{"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
{"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
{"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
{"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
{"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
{"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
{"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
{"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
{"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
{"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
{"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
{"label": "Page Up", "matrix": [5, 6], "x": 15, "y": 2},

{"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [7, 0], "x": 2.25, "y": 3},
{"matrix": [6, 1], "x": 3.25, "y": 3},
{"matrix": [7, 1], "x": 4.25, "y": 3},
{"matrix": [6, 2], "x": 5.25, "y": 3},
{"matrix": [7, 2], "x": 6.25, "y": 3},
{"matrix": [6, 3], "x": 7.25, "y": 3},
{"matrix": [7, 3], "x": 8.25, "y": 3},
{"matrix": [6, 4], "x": 9.25, "y": 3},
{"matrix": [7, 4], "x": 10.25, "y": 3},
{"matrix": [6, 5], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [6, 6], "x": 14, "y": 3},
{"matrix": [7, 6], "x": 15, "y": 3},
{"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [7, 0], "x": 2.25, "y": 3},
{"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3},
{"label": "C", "matrix": [7, 1], "x": 4.25, "y": 3},
{"label": "V", "matrix": [6, 2], "x": 5.25, "y": 3},
{"label": "B", "matrix": [7, 2], "x": 6.25, "y": 3},
{"label": "N", "matrix": [6, 3], "x": 7.25, "y": 3},
{"label": "M", "matrix": [7, 3], "x": 8.25, "y": 3},
{"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": ".", "matrix": [7, 4], "x": 10.25, "y": 3},
{"label": "/", "matrix": [6, 5], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [6, 6], "x": 14, "y": 3},
{"label": "Page Down", "matrix": [7, 6], "x": 15, "y": 3},

{"matrix": [0, 7], "x": 0, "y": 4, "w": 1.5},
{"matrix": [1, 7], "x": 1.5, "y": 4, "w": 1.5},
{"matrix": [2, 7], "x": 3, "y": 4, "w": 7},
{"matrix": [3, 7], "x": 10, "y": 4, "w": 1.5},
{"matrix": [4, 7], "x": 11.5, "y": 4, "w": 1.5},
{"matrix": [5, 7], "x": 13, "y": 4},
{"matrix": [6, 7], "x": 14, "y": 4},
{"matrix": [7, 7], "x": 15, "y": 4}
{"label": "Ctrl", "matrix": [0, 7], "x": 0, "y": 4, "w": 1.5},
{"label": "Alt", "matrix": [1, 7], "x": 1.5, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [2, 7], "x": 3, "y": 4, "w": 7},
{"label": "Fn", "matrix": [3, 7], "x": 10, "y": 4, "w": 1.5},
{"label": "Ctrl", "matrix": [4, 7], "x": 11.5, "y": 4, "w": 1.5},
{"label": "\u2190", "matrix": [5, 7], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [6, 7], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [7, 7], "x": 15, "y": 4}
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/rart/rart67m/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
#define ANIM_SIZE 512

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT(
KC_ESC, 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_PGUP,
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_UP, KC_PGDN,
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

[1] = LAYOUT_all(
[1] = LAYOUT(
KC_GRV, 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_DEL,
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,
Expand Down
8 changes: 4 additions & 4 deletions keyboards/rart/rart67m/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,31 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT(
KC_ESC, 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_PGUP,
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_UP, KC_PGDN,
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

[1] = LAYOUT_all(
[1] = LAYOUT(
KC_GRV, 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_DEL,
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_TRNS, KC_TRNS
),

[2] = LAYOUT_all(
[2] = LAYOUT(
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_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
),

[3] = LAYOUT_all(
[3] = LAYOUT(
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,
Expand Down