Skip to content

Commit

Permalink
QwertleKeys Calice Layout Addition (#20782)
Browse files Browse the repository at this point in the history 
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_2u_bs

* info.json: edit maintainer field

Reference the maintainer's GitHub username.
  • Loading branch information
@noroadsleft
noroadsleft authored May 9, 2023
1 parent 7dc2e63 commit 08f8c9d
Show file tree
Hide file tree
Showing 2 changed files with 223 additions and 101 deletions.
306 changes: 205 additions & 101 deletions keyboards/qwertlekeys/calice/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"keyboard_name": "Calice",
"manufacturer": "QwertleKeys",
"url": "",
"maintainer": "Jels",
"maintainer": "Jels02",
"usb": {
"vid": "0x716B",
"pid": "0x0001",
Expand All @@ -29,106 +29,210 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [1, 0], "x": 0, "y": 0},
{"matrix": [0, 0], "x": 1.25, "y": 0},
{"matrix": [1, 1], "x": 2.25, "y": 0},
{"matrix": [0, 1], "x": 3.25, "y": 0},
{"matrix": [1, 2], "x": 4.25, "y": 0},
{"matrix": [0, 2], "x": 5.75, "y": 0},
{"matrix": [1, 3], "x": 6.75, "y": 0},
{"matrix": [0, 4], "x": 7.75, "y": 0},
{"matrix": [1, 4], "x": 8.75, "y": 0},

{"matrix": [0, 5], "x": 10.25, "y": 0},
{"matrix": [1, 5], "x": 11.25, "y": 0},
{"matrix": [0, 6], "x": 12.25, "y": 0},
{"matrix": [1, 6], "x": 13.25, "y": 0},

{"matrix": [0, 7], "x": 14.5, "y": 0},

{"matrix": [1, 7], "x": 16.25, "y": 0},

{"matrix": [3, 0], "x": 0.75, "y": 1.25},
{"matrix": [2, 0], "x": 1.75, "y": 1.25},
{"matrix": [3, 1], "x": 2.75, "y": 1.25},
{"matrix": [2, 1], "x": 3.75, "y": 1.25},
{"matrix": [3, 2], "x": 4.75, "y": 1.25},
{"matrix": [2, 2], "x": 5.75, "y": 1.25},
{"matrix": [3, 3], "x": 6.75, "y": 1.25},

{"matrix": [2, 4], "x": 8.25, "y": 1.25},
{"matrix": [3, 4], "x": 9.25, "y": 1.25},
{"matrix": [2, 5], "x": 10.25, "y": 1.25},
{"matrix": [3, 5], "x": 11.25, "y": 1.25},
{"matrix": [2, 6], "x": 12.25, "y": 1.25},
{"matrix": [3, 6], "x": 13.25, "y": 1.25},
{"matrix": [5, 6], "x": 14.25, "y": 1.25},
{"matrix": [2, 7], "x": 15.25, "y": 1.25},

{"matrix": [3, 7], "x": 16.5, "y": 1},

{"matrix": [5, 0], "x": 0.5, "y": 2.25, "w": 1.5},
{"matrix": [4, 0], "x": 2, "y": 2.25},
{"matrix": [5, 1], "x": 3, "y": 2.25},
{"matrix": [4, 1], "x": 4, "y": 2.25},
{"matrix": [5, 2], "x": 5, "y": 2.25},
{"matrix": [4, 2], "x": 6, "y": 2.25},

{"matrix": [5, 3], "x": 8, "y": 2.25},
{"matrix": [4, 4], "x": 9, "y": 2.25},
{"matrix": [5, 4], "x": 10, "y": 2.25},
{"matrix": [4, 5], "x": 11, "y": 2.25},
{"matrix": [5, 5], "x": 12, "y": 2.25},
{"matrix": [4, 6], "x": 13, "y": 2.25},
{"matrix": [7, 6], "x": 14, "y": 2.25},
{"matrix": [4, 7], "x": 15, "y": 2.25, "w": 1.5},

{"matrix": [5, 7], "x": 16.75, "y": 2},

{"matrix": [7, 0], "x": 0.25, "y": 3.25, "w": 1.75},
{"matrix": [6, 0], "x": 2, "y": 3.25},
{"matrix": [7, 1], "x": 3, "y": 3.25},
{"matrix": [6, 1], "x": 4, "y": 3.25},
{"matrix": [7, 2], "x": 5, "y": 3.25},
{"matrix": [6, 2], "x": 6, "y": 3.25},

{"matrix": [7, 3], "x": 8.5, "y": 3.25},
{"matrix": [6, 4], "x": 9.5, "y": 3.25},
{"matrix": [7, 4], "x": 10.5, "y": 3.25},
{"matrix": [6, 5], "x": 11.5, "y": 3.25},
{"matrix": [7, 5], "x": 12.5, "y": 3.25},
{"matrix": [6, 6], "x": 13.5, "y": 3.25},
{"matrix": [6, 7], "x": 14.5, "y": 3.25, "w": 2.25},

{"matrix": [7, 7], "x": 17, "y": 3},

{"matrix": [9, 0], "x": 0, "y": 4.25, "w": 2.25},
{"matrix": [8, 0], "x": 2.25, "y": 4.25},
{"matrix": [9, 1], "x": 3.25, "y": 4.25},
{"matrix": [8, 1], "x": 4.25, "y": 4.25},
{"matrix": [9, 2], "x": 5.25, "y": 4.25},
{"matrix": [8, 2], "x": 6.25, "y": 4.25},

{"matrix": [9, 3], "x": 8.25, "y": 4.25},
{"matrix": [8, 4], "x": 9.25, "y": 4.25},
{"matrix": [9, 4], "x": 10.25, "y": 4.25},
{"matrix": [8, 5], "x": 11.25, "y": 4.25},
{"matrix": [9, 5], "x": 12.25, "y": 4.25},
{"matrix": [8, 6], "x": 13.25, "y": 4.25},
{"matrix": [9, 6], "x": 14.25, "y": 4.25, "w": 1.75},
{"matrix": [8, 7], "x": 16, "y": 4.25},

{"matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.5},
{"matrix": [10, 0], "x": 2.75, "y": 5.25, "w": 1.5},
{"matrix": [11, 2], "x": 4.25, "y": 5.25, "w": 2.25},
{"matrix": [10, 2], "x": 6.5, "y": 5.25},

{"matrix": [10, 4], "x": 7.75, "y": 5.25, "w": 2.75},
{"matrix": [10, 5], "x": 10.5, "y": 5.25, "w": 1.5},

{"matrix": [11, 6], "x": 15, "y": 5.25},
{"matrix": [10, 7], "x": 16, "y": 5.25},
{"matrix": [11, 7], "x": 17, "y": 5.25}
{"label": "Esc", "matrix": [1, 0], "x": 0, "y": 0},

{"label": "F1", "matrix": [0, 0], "x": 1.25, "y": 0},
{"label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0},
{"label": "F3", "matrix": [0, 1], "x": 3.25, "y": 0},
{"label": "F4", "matrix": [1, 2], "x": 4.25, "y": 0},

{"label": "F5", "matrix": [0, 2], "x": 5.75, "y": 0},
{"label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0},
{"label": "F7", "matrix": [0, 4], "x": 7.75, "y": 0},
{"label": "F8", "matrix": [1, 4], "x": 8.75, "y": 0},

{"label": "F9", "matrix": [0, 5], "x": 10.25, "y": 0},
{"label": "F10", "matrix": [1, 5], "x": 11.25, "y": 0},
{"label": "F11", "matrix": [0, 6], "x": 12.25, "y": 0},
{"label": "F12", "matrix": [1, 6], "x": 13.25, "y": 0},

{"label": "F13", "matrix": [0, 7], "x": 14.5, "y": 0},

{"label": "Delete", "matrix": [1, 7], "x": 16.25, "y": 0},

{"label": "`", "matrix": [3, 0], "x": 0.75, "y": 1.25},
{"label": "1", "matrix": [2, 0], "x": 1.75, "y": 1.25},
{"label": "2", "matrix": [3, 1], "x": 2.75, "y": 1.25},
{"label": "3", "matrix": [2, 1], "x": 3.75, "y": 1.25},
{"label": "4", "matrix": [3, 2], "x": 4.75, "y": 1.25},
{"label": "5", "matrix": [2, 2], "x": 5.75, "y": 1.25},
{"label": "6", "matrix": [3, 3], "x": 6.75, "y": 1.25},

{"label": "7", "matrix": [2, 4], "x": 8.25, "y": 1.25},
{"label": "8", "matrix": [3, 4], "x": 9.25, "y": 1.25},
{"label": "9", "matrix": [2, 5], "x": 10.25, "y": 1.25},
{"label": "0", "matrix": [3, 5], "x": 11.25, "y": 1.25},
{"label": "-", "matrix": [2, 6], "x": 12.25, "y": 1.25},
{"label": "=", "matrix": [3, 6], "x": 13.25, "y": 1.25},
{"label": "Backspace", "matrix": [5, 6], "x": 14.25, "y": 1.25},
{"label": "`", "matrix": [2, 7], "x": 15.25, "y": 1.25},

{"label": "Home", "matrix": [3, 7], "x": 16.5, "y": 1},

{"label": "Tab", "matrix": [5, 0], "x": 0.5, "y": 2.25, "w": 1.5},
{"label": "Q", "matrix": [4, 0], "x": 2, "y": 2.25},
{"label": "W", "matrix": [5, 1], "x": 3, "y": 2.25},
{"label": "E", "matrix": [4, 1], "x": 4, "y": 2.25},
{"label": "R", "matrix": [5, 2], "x": 5, "y": 2.25},
{"label": "T", "matrix": [4, 2], "x": 6, "y": 2.25},

{"label": "Y", "matrix": [5, 3], "x": 8, "y": 2.25},
{"label": "U", "matrix": [4, 4], "x": 9, "y": 2.25},
{"label": "I", "matrix": [5, 4], "x": 10, "y": 2.25},
{"label": "O", "matrix": [4, 5], "x": 11, "y": 2.25},
{"label": "P", "matrix": [5, 5], "x": 12, "y": 2.25},
{"label": "[", "matrix": [4, 6], "x": 13, "y": 2.25},
{"label": "]", "matrix": [7, 6], "x": 14, "y": 2.25},
{"label": "\\", "matrix": [4, 7], "x": 15, "y": 2.25, "w": 1.5},

{"label": "Page Up", "matrix": [5, 7], "x": 16.75, "y": 2},

{"label": "Caps Lock", "matrix": [7, 0], "x": 0.25, "y": 3.25, "w": 1.75},
{"label": "A", "matrix": [6, 0], "x": 2, "y": 3.25},
{"label": "S", "matrix": [7, 1], "x": 3, "y": 3.25},
{"label": "D", "matrix": [6, 1], "x": 4, "y": 3.25},
{"label": "F", "matrix": [7, 2], "x": 5, "y": 3.25},
{"label": "G", "matrix": [6, 2], "x": 6, "y": 3.25},

{"label": "H", "matrix": [7, 3], "x": 8.5, "y": 3.25},
{"label": "J", "matrix": [6, 4], "x": 9.5, "y": 3.25},
{"label": "K", "matrix": [7, 4], "x": 10.5, "y": 3.25},
{"label": "L", "matrix": [6, 5], "x": 11.5, "y": 3.25},
{"label": ";", "matrix": [7, 5], "x": 12.5, "y": 3.25},
{"label": "'", "matrix": [6, 6], "x": 13.5, "y": 3.25},
{"label": "Enter", "matrix": [6, 7], "x": 14.5, "y": 3.25, "w": 2.25},

{"label": "Page Down", "matrix": [7, 7], "x": 17, "y": 3},

{"label": "Shift", "matrix": [9, 0], "x": 0, "y": 4.25, "w": 2.25},
{"label": "Z", "matrix": [8, 0], "x": 2.25, "y": 4.25},
{"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.25},
{"label": "C", "matrix": [8, 1], "x": 4.25, "y": 4.25},
{"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.25},
{"label": "B", "matrix": [8, 2], "x": 6.25, "y": 4.25},

{"label": "B", "matrix": [9, 3], "x": 8.25, "y": 4.25},
{"label": "N", "matrix": [8, 4], "x": 9.25, "y": 4.25},
{"label": "M", "matrix": [9, 4], "x": 10.25, "y": 4.25},
{"label": ",", "matrix": [8, 5], "x": 11.25, "y": 4.25},
{"label": ".", "matrix": [9, 5], "x": 12.25, "y": 4.25},
{"label": "/", "matrix": [8, 6], "x": 13.25, "y": 4.25},
{"label": "Shift", "matrix": [9, 6], "x": 14.25, "y": 4.25, "w": 1.75},
{"label": "\u2191", "matrix": [8, 7], "x": 16, "y": 4.25},

{"label": "Ctrl", "matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.5},
{"label": "Alt", "matrix": [10, 0], "x": 2.75, "y": 5.25, "w": 1.5},
{"label": "Space", "matrix": [11, 2], "x": 4.25, "y": 5.25, "w": 2.25},
{"label": "Fn", "matrix": [10, 2], "x": 6.5, "y": 5.25},
{"label": "Space", "matrix": [10, 4], "x": 7.75, "y": 5.25, "w": 2.75},
{"label": "Alt", "matrix": [10, 5], "x": 10.5, "y": 5.25, "w": 1.5},

{"label": "\u2190", "matrix": [11, 6], "x": 15, "y": 5.25},
{"label": "\u2193", "matrix": [10, 7], "x": 16, "y": 5.25},
{"label": "\u2192", "matrix": [11, 7], "x": 17, "y": 5.25}
]
},
"LAYOUT_2u_bs": {
"layout": [
{"label": "Esc", "matrix": [1, 0], "x": 0, "y": 0},

{"label": "F1", "matrix": [0, 0], "x": 1.25, "y": 0},
{"label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0},
{"label": "F3", "matrix": [0, 1], "x": 3.25, "y": 0},
{"label": "F4", "matrix": [1, 2], "x": 4.25, "y": 0},

{"label": "F5", "matrix": [0, 2], "x": 5.75, "y": 0},
{"label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0},
{"label": "F7", "matrix": [0, 4], "x": 7.75, "y": 0},
{"label": "F8", "matrix": [1, 4], "x": 8.75, "y": 0},

{"label": "F9", "matrix": [0, 5], "x": 10.25, "y": 0},
{"label": "F10", "matrix": [1, 5], "x": 11.25, "y": 0},
{"label": "F11", "matrix": [0, 6], "x": 12.25, "y": 0},
{"label": "F12", "matrix": [1, 6], "x": 13.25, "y": 0},

{"label": "F13", "matrix": [0, 7], "x": 14.5, "y": 0},

{"label": "Delete", "matrix": [1, 7], "x": 16.25, "y": 0},

{"label": "`", "matrix": [3, 0], "x": 0.75, "y": 1.25},
{"label": "1", "matrix": [2, 0], "x": 1.75, "y": 1.25},
{"label": "2", "matrix": [3, 1], "x": 2.75, "y": 1.25},
{"label": "3", "matrix": [2, 1], "x": 3.75, "y": 1.25},
{"label": "4", "matrix": [3, 2], "x": 4.75, "y": 1.25},
{"label": "5", "matrix": [2, 2], "x": 5.75, "y": 1.25},
{"label": "6", "matrix": [3, 3], "x": 6.75, "y": 1.25},

{"label": "7", "matrix": [2, 4], "x": 8.25, "y": 1.25},
{"label": "8", "matrix": [3, 4], "x": 9.25, "y": 1.25},
{"label": "9", "matrix": [2, 5], "x": 10.25, "y": 1.25},
{"label": "0", "matrix": [3, 5], "x": 11.25, "y": 1.25},
{"label": "-", "matrix": [2, 6], "x": 12.25, "y": 1.25},
{"label": "=", "matrix": [3, 6], "x": 13.25, "y": 1.25},
{"label": "Backspace", "matrix": [5, 6], "x": 14.25, "y": 1.25, "w": 2},
{"label": "Home", "matrix": [3, 7], "x": 16.5, "y": 1},

{"label": "Tab", "matrix": [5, 0], "x": 0.5, "y": 2.25, "w": 1.5},
{"label": "Q", "matrix": [4, 0], "x": 2, "y": 2.25},
{"label": "W", "matrix": [5, 1], "x": 3, "y": 2.25},
{"label": "E", "matrix": [4, 1], "x": 4, "y": 2.25},
{"label": "R", "matrix": [5, 2], "x": 5, "y": 2.25},
{"label": "T", "matrix": [4, 2], "x": 6, "y": 2.25},

{"label": "Y", "matrix": [5, 3], "x": 8, "y": 2.25},
{"label": "U", "matrix": [4, 4], "x": 9, "y": 2.25},
{"label": "I", "matrix": [5, 4], "x": 10, "y": 2.25},
{"label": "O", "matrix": [4, 5], "x": 11, "y": 2.25},
{"label": "P", "matrix": [5, 5], "x": 12, "y": 2.25},
{"label": "[", "matrix": [4, 6], "x": 13, "y": 2.25},
{"label": "]", "matrix": [7, 6], "x": 14, "y": 2.25},
{"label": "\\", "matrix": [4, 7], "x": 15, "y": 2.25, "w": 1.5},

{"label": "Page Up", "matrix": [5, 7], "x": 16.75, "y": 2},

{"label": "Caps Lock", "matrix": [7, 0], "x": 0.25, "y": 3.25, "w": 1.75},
{"label": "A", "matrix": [6, 0], "x": 2, "y": 3.25},
{"label": "S", "matrix": [7, 1], "x": 3, "y": 3.25},
{"label": "D", "matrix": [6, 1], "x": 4, "y": 3.25},
{"label": "F", "matrix": [7, 2], "x": 5, "y": 3.25},
{"label": "G", "matrix": [6, 2], "x": 6, "y": 3.25},

{"label": "H", "matrix": [7, 3], "x": 8.5, "y": 3.25},
{"label": "J", "matrix": [6, 4], "x": 9.5, "y": 3.25},
{"label": "K", "matrix": [7, 4], "x": 10.5, "y": 3.25},
{"label": "L", "matrix": [6, 5], "x": 11.5, "y": 3.25},
{"label": ";", "matrix": [7, 5], "x": 12.5, "y": 3.25},
{"label": "'", "matrix": [6, 6], "x": 13.5, "y": 3.25},
{"label": "Enter", "matrix": [6, 7], "x": 14.5, "y": 3.25, "w": 2.25},

{"label": "Page Down", "matrix": [7, 7], "x": 17, "y": 3},

{"label": "Shift", "matrix": [9, 0], "x": 0, "y": 4.25, "w": 2.25},
{"label": "Z", "matrix": [8, 0], "x": 2.25, "y": 4.25},
{"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.25},
{"label": "C", "matrix": [8, 1], "x": 4.25, "y": 4.25},
{"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.25},
{"label": "B", "matrix": [8, 2], "x": 6.25, "y": 4.25},

{"label": "B", "matrix": [9, 3], "x": 8.25, "y": 4.25},
{"label": "N", "matrix": [8, 4], "x": 9.25, "y": 4.25},
{"label": "M", "matrix": [9, 4], "x": 10.25, "y": 4.25},
{"label": ",", "matrix": [8, 5], "x": 11.25, "y": 4.25},
{"label": ".", "matrix": [9, 5], "x": 12.25, "y": 4.25},
{"label": "/", "matrix": [8, 6], "x": 13.25, "y": 4.25},
{"label": "Shift", "matrix": [9, 6], "x": 14.25, "y": 4.25, "w": 1.75},
{"label": "\u2191", "matrix": [8, 7], "x": 16, "y": 4.25},

{"label": "Ctrl", "matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.5},
{"label": "Alt", "matrix": [10, 0], "x": 2.75, "y": 5.25, "w": 1.5},
{"label": "Space", "matrix": [11, 2], "x": 4.25, "y": 5.25, "w": 2.25},
{"label": "Fn", "matrix": [10, 2], "x": 6.5, "y": 5.25},
{"label": "Space", "matrix": [10, 4], "x": 7.75, "y": 5.25, "w": 2.75},
{"label": "Alt", "matrix": [10, 5], "x": 10.5, "y": 5.25, "w": 1.5},

{"label": "\u2190", "matrix": [11, 6], "x": 15, "y": 5.25},
{"label": "\u2193", "matrix": [10, 7], "x": 16, "y": 5.25},
{"label": "\u2192", "matrix": [11, 7], "x": 17, "y": 5.25}
]
}
}
Expand Down
18 changes: 18 additions & 0 deletions keyboards/qwertlekeys/calice/matrix_diagram.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Matrix Diagram for QwertleKeys Calice

```
┌───┐┌───┬───┬───┬───┐┌───┬───┐ ┌───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
│10 ││00 │11 │01 │12 ││02 │13 │ │04 │14 ││05 │15 │06 │16 ││07 │ │17 │
└───┘└───┴───┴───┴───┘└───┴───┘ └───┴───┘└───┴───┴───┴───┘└───┘ └┬──┴┐
┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐│37 │ ┌───────┐
│30 │20 │31 │21 │32 │22 │33 │ │24 │34 │25 │35 │26 │36 │56 │27 │└┬──┴┐ │56 │ 2u Backspace
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ │57 │ └───────┘
│50 │40 │51 │41 │52 │42 │ │53 │44 │54 │45 │55 │46 │76 │47 │ └┬──┴┐
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ │77 │
│70 │60 │71 │61 │72 │62 │ │73 │64 │74 │65 │75 │66 │67 │ └───┘
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
│90 │80 │91 │81 │92 │82 │ │93 │84 │94 │85 │95 │86 │96 │87 │
├─────┬──┴──┬┴───┴┬──┴───┴──┬┴──┐ ├───┴───┴──┬┴───┴┬──┴───┴──┬───┼───┼───┐
│B0 │ │A0 │B2 │A2 │ │A4 │A5 │ │B6 │A7 │B7 │
└─────┘ └─────┴─────────┴───┘ └──────────┴─────┘ └───┴───┴───┘
```

0 comments on commit 08f8c9d

Please sign in to comment.