Skip to content

Commit 26b35a5

Browse files
noroadsleftnoroadsleft
authored
4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399)
* add matrix_diagram.md Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files. * info.json: apply friendly formatting * move matrix data to info.json * create keyboard-level info.json * add LAYOUT_60_iso_tsangan * enable Community Layout support
1 parent 38700f7 commit 26b35a5

File tree

8 files changed

+190
-257
lines changed

8 files changed

+190
-257
lines changed

‎keyboards/4pplet/aekiso60/info.json

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
{
2+
"manufacturer": "4pplet",
3+
"url": "",
4+
"maintainer": "4pplet",
5+
"usb": {
6+
"vid": "0x4444"
7+
},
8+
"community_layouts": [
9+
"60_iso_tsangan"
10+
],
11+
"layouts": {
12+
"LAYOUT_all": {
13+
"layout": [
14+
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
15+
{"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
16+
{"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
17+
{"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
18+
{"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
19+
{"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
20+
{"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
21+
{"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
22+
{"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
23+
{"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
24+
{"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
25+
{"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
26+
{"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
27+
{"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},
28+
29+
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
30+
{"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
31+
{"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
32+
{"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
33+
{"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
34+
{"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
35+
{"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
36+
{"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
37+
{"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
38+
{"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
39+
{"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
40+
{"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
41+
{"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},
42+
43+
{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
44+
{"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
45+
{"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
46+
{"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
47+
{"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
48+
{"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
49+
{"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
50+
{"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
51+
{"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
52+
{"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
53+
{"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
54+
{"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
55+
{"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
56+
{"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},
57+
58+
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
59+
{"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
60+
{"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
61+
{"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
62+
{"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
63+
{"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
64+
{"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
65+
{"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
66+
{"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
67+
{"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
68+
{"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
69+
{"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
70+
{"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 1.5},
71+
{"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
72+
73+
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
74+
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
75+
{"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
76+
{"label": "\u25bd", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
77+
{"label": "Space", "matrix": [4, 5], "x": 7, "y": 4},
78+
{"label": "\u25bd", "matrix": [4, 6], "x": 8, "y": 4, "w": 2.75},
79+
{"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
80+
{"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
81+
{"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
82+
]
83+
},
84+
85+
"LAYOUT_60_iso_tsangan": {
86+
"layout": [
87+
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
88+
{"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
89+
{"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
90+
{"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
91+
{"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
92+
{"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
93+
{"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
94+
{"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
95+
{"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
96+
{"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
97+
{"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
98+
{"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
99+
{"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
100+
{"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},
101+
102+
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
103+
{"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
104+
{"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
105+
{"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
106+
{"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
107+
{"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
108+
{"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
109+
{"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
110+
{"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
111+
{"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
112+
{"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
113+
{"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
114+
{"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},
115+
116+
{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
117+
{"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
118+
{"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
119+
{"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
120+
{"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
121+
{"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
122+
{"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
123+
{"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
124+
{"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
125+
{"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
126+
{"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
127+
{"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
128+
{"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
129+
{"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},
130+
131+
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
132+
{"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
133+
{"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
134+
{"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
135+
{"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
136+
{"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
137+
{"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
138+
{"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
139+
{"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
140+
{"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
141+
{"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
142+
{"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
143+
{"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5},
144+
145+
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
146+
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
147+
{"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
148+
{"label": "Space", "matrix": [4, 5], "x": 4.25, "y": 4, "w": 6.5},
149+
{"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
150+
{"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
151+
{"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
152+
]
153+
}
154+
}
155+
}

‎keyboards/4pplet/aekiso60/matrix_diagram.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Matrix Diagram for 4pplet AEKISO60 (Revs. A and B)
2+
3+
```
4+
┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
5+
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
6+
├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
7+
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │ │
8+
├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐1d │
9+
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │ │
10+
├─────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ ┌─────────┐
11+
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │ │3c │ 2.75u RShift
12+
├─────┼───┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴───┴┬──┴──┬┴───┬─┴───┤ └─────────┘
13+
│40 │41 │43 │44 │45 │46 │48 │4a │4b │
14+
└─────┴────┴─────┴──────────┴───┴──────────┴─────┴────┴─────┘
15+
┌─────┬────┬─────┬─────────────────────────┬─────┬────┬─────┐ ─┐
16+
│40 │41 │43 │45 │48 │4a │4b │ ├─ Tsangan
17+
└─────┴────┴─────┴─────────────────────────┴─────┴────┴─────┘ │
18+
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ │
19+
│40 │41 │43 │45 │48 │4a │4b │ │
20+
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ ─┘
21+
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
22+
│40 │ │43 │45 │48 │ │4b │ WKL
23+
└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘
24+
┌─────┬────┬─────┬─────────┬─────┬─────────┬─────┬────┬─────┐ ─┐
25+
│40 │41 │43 │44 │45 │46 │48 │4a │4b │ ├─ same matrix as LAYOUT_all
26+
└─────┴────┴─────┴─────────┴─────┴─────────┴─────┴────┴─────┘ │
27+
┌─────┬────┬─────┬────────┬─────┬──────────┬─────┬────┬─────┐ │
28+
│40 │41 │43 │44 │45 │46 │48 │4a │4b │ │
29+
└─────┴────┴─────┴────────┴─────┴──────────┴─────┴────┴─────┘ │
30+
┌─────┬────┬─────┬─────────┬────┬──────────┬─────┬────┬─────┐ │
31+
│40 │41 │43 │44 │45 │46 │48 │4a │4b │ │
32+
└─────┴────┴─────┴─────────┴────┴──────────┴─────┴────┴─────┘ ─┘
33+
```

‎keyboards/4pplet/aekiso60/rev_a/info.json

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"keyboard_name": "AEKISO60 Rev A",
3-
"manufacturer": "4pplet",
4-
"url": "",
5-
"maintainer": "4pplet",
63
"usb": {
7-
"vid": "0x4444",
84
"pid": "0x0001",
95
"device_version": "0.0.1"
106
},
@@ -13,79 +9,5 @@
139
"esc_output": "C4"
1410
},
1511
"processor": "atmega32u2",
16-
"bootloader": "atmel-dfu",
17-
"layouts": {
18-
"LAYOUT_all": {
19-
"layout": [
20-
{"x":0, "y":0, "w":1.25},
21-
{"x":1.25, "y":0},
22-
{"x":2.25, "y":0},
23-
{"x":3.25, "y":0},
24-
{"x":4.25, "y":0},
25-
{"x":5.25, "y":0},
26-
{"x":6.25, "y":0},
27-
{"x":7.25, "y":0},
28-
{"x":8.25, "y":0},
29-
{"x":9.25, "y":0},
30-
{"x":10.25, "y":0},
31-
{"x":11.25, "y":0},
32-
{"x":12.25, "y":0},
33-
{"x":13.25, "y":0, "w":1.75},
34-
35-
{"x":0, "y":1, "w":1.75},
36-
{"x":1.75, "y":1},
37-
{"x":2.75, "y":1},
38-
{"x":3.75, "y":1},
39-
{"x":4.75, "y":1},
40-
{"x":5.75, "y":1},
41-
{"x":6.75, "y":1},
42-
{"x":7.75, "y":1},
43-
{"x":8.75, "y":1},
44-
{"x":9.75, "y":1},
45-
{"x":10.75, "y":1},
46-
{"x":11.75, "y":1},
47-
{"x":12.75, "y":1},
48-
49-
{"x":0, "y":2, "w":2},
50-
{"x":2, "y":2},
51-
{"x":3, "y":2},
52-
{"x":4, "y":2},
53-
{"x":5, "y":2},
54-
{"x":6, "y":2},
55-
{"x":7, "y":2},
56-
{"x":8, "y":2},
57-
{"x":9, "y":2},
58-
{"x":10, "y":2},
59-
{"x":11, "y":2},
60-
{"x":12, "y":2},
61-
{"x":13, "y":2},
62-
{"x":14, "y":1, "h":2},
63-
64-
{"x":0, "y":3, "w":1.5},
65-
{"x":1.5, "y":3},
66-
{"x":2.5, "y":3},
67-
{"x":3.5, "y":3},
68-
{"x":4.5, "y":3},
69-
{"x":5.5, "y":3},
70-
{"x":6.5, "y":3},
71-
{"x":7.5, "y":3},
72-
{"x":8.5, "y":3},
73-
{"x":9.5, "y":3},
74-
{"x":10.5, "y":3},
75-
{"x":11.5, "y":3},
76-
{"x":12.5, "y":3, "w":1.5},
77-
{"x":14, "y":3},
78-
79-
{"x":0, "y":4, "w":1.5},
80-
{"x":1.5, "y":4, "w":1.25},
81-
{"x":2.75, "y":4, "w":1.5},
82-
{"x":4.25, "y":4, "w":2.75},
83-
{"x":7, "y":4},
84-
{"x":8, "y":4, "w":2.75},
85-
{"x":10.75, "y":4, "w":1.5},
86-
{"x":12.25, "y":4, "w":1.25},
87-
{"x":13.5, "y":4, "w":1.5}
88-
]
89-
}
90-
}
12+
"bootloader": "atmel-dfu"
9113
}

‎keyboards/4pplet/aekiso60/rev_a/rev_a.c

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎keyboards/4pplet/aekiso60/rev_a/rev_a.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)