Skip to content

Commit

Permalink
Jaykeeb Orba Layout Addition and Touch-Up (qmk#21349)
Browse files Browse the repository at this point in the history 
* [chore] correct layout data

* [chore] rename LAYOUT to LAYOUT_625u_space

* [style] friendly-format info.json

* [enhancement] add LAYOUT_7u_space
  • Loading branch information
@noroadsleft @autoferrit
noroadsleft authored and autoferrit committed Dec 6, 2023
1 parent 33b91ef commit 77814dd
Show file tree
Hide file tree
Showing 3 changed files with 162 additions and 79 deletions.
233 changes: 158 additions & 75 deletions keyboards/jaykeeb/orba/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,87 +23,170 @@
"pid": "0x0769",
"vid": "0x414C"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_625u_space"
},
"layouts": {
"LAYOUT": {
"LAYOUT_625u_space": {
"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": "`", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "-", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "=", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "6", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "7", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "8", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "9", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "0", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},

{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1},
{"label": "Q", "matrix": [1, 1], "x": 1, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5, "y": 1},
{"label": "P7", "matrix": [1, 6], "x": 6, "y": 1},
{"label": "P8", "matrix": [1, 7], "x": 7, "y": 1},
{"label": "P9", "matrix": [1, 8], "x": 8, "y": 1},
{"label": "Y", "matrix": [1, 9], "x": 9, "y": 1},
{"label": "U", "matrix": [1, 10], "x": 10, "y": 1},
{"label": "I", "matrix": [1, 11], "x": 11, "y": 1},
{"label": "O", "matrix": [1, 12], "x": 12, "y": 1},
{"label": "P", "matrix": [1, 13], "x": 13, "y": 1},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1},

{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2},
{"label": "A", "matrix": [2, 1], "x": 1, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5, "y": 2},
{"label": "P4", "matrix": [2, 6], "x": 6, "y": 2},
{"label": "P5", "matrix": [2, 7], "x": 7, "y": 2},
{"label": "P6", "matrix": [2, 8], "x": 8, "y": 2},
{"label": "H", "matrix": [2, 9], "x": 9, "y": 2},
{"label": "J", "matrix": [2, 10], "x": 10, "y": 2},
{"label": "K", "matrix": [2, 11], "x": 11, "y": 2},
{"label": "L", "matrix": [2, 12], "x": 12, "y": 2},
{"label": ":", "matrix": [2, 13], "x": 13, "y": 2},
{"label": "", "matrix": [2, 14], "x": 14, "y": 2},
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2},

{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Z", "matrix": [3, 1], "x": 1, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 2, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 4, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 5, "y": 3},
{"label": "P1", "matrix": [3, 6], "x": 6, "y": 3},
{"label": "P2", "matrix": [3, 7], "x": 7, "y": 3},
{"label": "P3", "matrix": [3, 8], "x": 8, "y": 3},
{"label": "N", "matrix": [3, 9], "x": 9, "y": 3},
{"label": "M", "matrix": [3, 10], "x": 10, "y": 3},
{"label": ",", "matrix": [3, 11], "x": 11, "y": 3},
{"label": ".", "matrix": [3, 12], "x": 12, "y": 3},
{"label": "/", "matrix": [3, 13], "x": 13, "y": 3},
{"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3},
{"label": "Enter", "matrix": [3, 15], "x": 15, "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},
{"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_7u_space": {
"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": "`", "matrix": [0, 6], "x": 6, "y": 0 },
{"label": "-", "matrix": [0, 7], "x": 7, "y": 0 },
{"label": "=", "matrix": [0, 8], "x": 8, "y": 0 },
{"label": "6", "matrix": [0, 9], "x": 9, "y": 0 },
{"label": "7", "matrix": [0, 10], "x": 10, "y": 0 },
{"label": "8", "matrix": [0, 11], "x": 11, "y": 0 },
{"label": "9", "matrix": [0, 12], "x": 12, "y": 0 },
{"label": "0", "matrix": [0, 13], "x": 13, "y": 0 },
{"label": "Delete", "matrix": [0, 14], "x": 13, "y": 0 },
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0 },
{"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": "`", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "-", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "=", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "6", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "7", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "8", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "9", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "0", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},

{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
{"label": "Q", "matrix": [1, 1], "x": 1, "y": 1 },
{"label": "W", "matrix": [1, 2], "x": 2, "y": 1 },
{"label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
{"label": "R", "matrix": [1, 4], "x": 4, "y": 1 },
{"label": "T", "matrix": [1, 5], "x": 5, "y": 1 },
{"label": "P7", "matrix": [1, 6], "x": 6, "y": 1 },
{"label": "P8", "matrix": [1, 7], "x": 7, "y": 1 },
{"label": "P9", "matrix": [1, 8], "x": 8, "y": 1 },
{"label": "Y", "matrix": [1, 9], "x": 9, "y": 1 },
{"label": "U", "matrix": [1, 10], "x": 10, "y": 1 },
{"label": "I", "matrix": [1, 11], "x": 11, "y": 1 },
{"label": "O", "matrix": [1, 12], "x": 12, "y": 1 },
{"label": "P", "matrix": [1, 13], "x": 13, "y": 1 },
{"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1 },
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1 },
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1},
{"label": "Q", "matrix": [1, 1], "x": 1, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5, "y": 1},
{"label": "P7", "matrix": [1, 6], "x": 6, "y": 1},
{"label": "P8", "matrix": [1, 7], "x": 7, "y": 1},
{"label": "P9", "matrix": [1, 8], "x": 8, "y": 1},
{"label": "Y", "matrix": [1, 9], "x": 9, "y": 1},
{"label": "U", "matrix": [1, 10], "x": 10, "y": 1},
{"label": "I", "matrix": [1, 11], "x": 11, "y": 1},
{"label": "O", "matrix": [1, 12], "x": 12, "y": 1},
{"label": "P", "matrix": [1, 13], "x": 13, "y": 1},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1},

{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2 },
{"label": "A", "matrix": [2, 1], "x": 1, "y": 2 },
{"label": "S", "matrix": [2, 2], "x": 2, "y": 2 },
{"label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
{"label": "F", "matrix": [2, 4], "x": 4, "y": 2 },
{"label": "G", "matrix": [2, 5], "x": 5, "y": 2 },
{"label": "P4", "matrix": [2, 6], "x": 6, "y": 2 },
{"label": "P5", "matrix": [2, 7], "x": 7, "y": 2 },
{"label": "P6", "matrix": [2, 8], "x": 8, "y": 2 },
{"label": "H", "matrix": [2, 9], "x": 9, "y": 2 },
{"label": "J", "matrix": [2, 10], "x": 10, "y": 2 },
{"label": "K", "matrix": [2, 11], "x": 11, "y": 2 },
{"label": "L", "matrix": [2, 12], "x": 12, "y": 2 },
{"label": ":", "matrix": [2, 13], "x": 13, "y": 2 },
{"label": "", "matrix": [2, 14], "x": 13, "y": 2 },
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2 },
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2},
{"label": "A", "matrix": [2, 1], "x": 1, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5, "y": 2},
{"label": "P4", "matrix": [2, 6], "x": 6, "y": 2},
{"label": "P5", "matrix": [2, 7], "x": 7, "y": 2},
{"label": "P6", "matrix": [2, 8], "x": 8, "y": 2},
{"label": "H", "matrix": [2, 9], "x": 9, "y": 2},
{"label": "J", "matrix": [2, 10], "x": 10, "y": 2},
{"label": "K", "matrix": [2, 11], "x": 11, "y": 2},
{"label": "L", "matrix": [2, 12], "x": 12, "y": 2},
{"label": ":", "matrix": [2, 13], "x": 13, "y": 2},
{"label": "", "matrix": [2, 14], "x": 14, "y": 2},
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2},

{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3 },
{"label": "Z", "matrix": [3, 1], "x": 1, "y": 3 },
{"label": "X", "matrix": [3, 2], "x": 2, "y": 3 },
{"label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
{"label": "V", "matrix": [3, 4], "x": 4, "y": 3 },
{"label": "B", "matrix": [3, 5], "x": 5, "y": 3 },
{"label": "P1", "matrix": [3, 6], "x": 6, "y": 3 },
{"label": "P2", "matrix": [3, 7], "x": 7, "y": 3 },
{"label": "P3", "matrix": [3, 8], "x": 8, "y": 3 },
{"label": "N", "matrix": [3, 9], "x": 9, "y": 3 },
{"label": "M", "matrix": [3, 10], "x": 10, "y": 3 },
{"label": ",", "matrix": [3, 11], "x": 11, "y": 3 },
{"label": ".", "matrix": [3, 12], "x": 12, "y": 3 },
{"label": "/", "matrix": [3, 13], "x": 13, "y": 3 },
{"label": "\u2191", "matrix": [3, 14], "x": 13, "y": 3 },
{"label": "Enter", "matrix": [3, 15], "x": 15, "y": 3 },
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Z", "matrix": [3, 1], "x": 1, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 2, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 4, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 5, "y": 3},
{"label": "P1", "matrix": [3, 6], "x": 6, "y": 3},
{"label": "P2", "matrix": [3, 7], "x": 7, "y": 3},
{"label": "P3", "matrix": [3, 8], "x": 8, "y": 3},
{"label": "N", "matrix": [3, 9], "x": 9, "y": 3},
{"label": "M", "matrix": [3, 10], "x": 10, "y": 3},
{"label": ",", "matrix": [3, 11], "x": 11, "y": 3},
{"label": ".", "matrix": [3, 12], "x": 12, "y": 3},
{"label": "/", "matrix": [3, 13], "x": 13, "y": 3},
{"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3},
{"label": "Enter", "matrix": [3, 15], "x": 15, "y": 3},

{"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
{"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
{"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
{"label": "Space", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
{"label": "Fn", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
{"label": "Ctrl","matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
{"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4 },
{"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4 },
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4 }
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
{"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
{"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4}
]
}
}
}
}
4 changes: 2 additions & 2 deletions keyboards/jaykeeb/orba/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │Ctrl│GUI │Alt │ │ FN │Ctrl│ │ ← │ ↓ │ → │
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
*/
[0] = LAYOUT(
[0] = LAYOUT_625u_space(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_PGDN,
Expand All @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),


[1] = LAYOUT(
[1] = LAYOUT_625u_space(
_______, 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, QK_RBT, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
Expand Down
4 changes: 2 additions & 2 deletions keyboards/jaykeeb/orba/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │Ctrl│GUI │Alt │ │ FN │Ctrl│ │ ← │ ↓ │ → │
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
*/
[0] = LAYOUT(
[0] = LAYOUT_625u_space(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_PGDN,
Expand All @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),


[1] = LAYOUT(
[1] = LAYOUT_625u_space(
_______, 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, QK_RBT, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
Expand Down

0 comments on commit 77814dd

Please sign in to comment.