Skip to content

Commit 941e159

Browse files
noroadsleftnoroadsleft
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents fbf6727 + 7e6eba6 commit 941e159

File tree

2 files changed

+142
-100
lines changed

2 files changed

+142
-100
lines changed

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

Lines changed: 142 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -22,72 +22,148 @@
2222
"layouts": {
2323
"LAYOUT_all": {
2424
"layout": [
25-
{ "label": "Esc", "x": 0, "y": 0 },
26-
{ "label": "!", "x": 1, "y": 0 },
27-
{ "label": "@", "x": 2, "y": 0 },
28-
{ "label": "#", "x": 3, "y": 0 },
29-
{ "label": "$", "x": 4, "y": 0 },
30-
{ "label": "%", "x": 5, "y": 0 },
31-
{ "label": "^", "x": 6, "y": 0 },
32-
{ "label": "&", "x": 7, "y": 0 },
33-
{ "label": "*", "x": 8, "y": 0 },
34-
{ "label": "(", "x": 9, "y": 0 },
35-
{ "label": ")", "x": 10, "y": 0 },
36-
{ "label": "_", "x": 11, "y": 0 },
37-
{ "label": "+", "x": 12, "y": 0 },
38-
{ "label": "|", "x": 13, "y": 0 },
39-
{ "label": "~", "x": 14, "y": 0 },
40-
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
41-
{ "label": "Q", "x": 1.5, "y": 1 },
42-
{ "label": "W", "x": 2.5, "y": 1 },
43-
{ "label": "E", "x": 3.5, "y": 1 },
44-
{ "label": "R", "x": 4.5, "y": 1 },
45-
{ "label": "T", "x": 5.5, "y": 1 },
46-
{ "label": "Y", "x": 6.5, "y": 1 },
47-
{ "label": "U", "x": 7.5, "y": 1 },
48-
{ "label": "I", "x": 8.5, "y": 1 },
49-
{ "label": "O", "x": 9.5, "y": 1 },
50-
{ "label": "P", "x": 10.5, "y": 1 },
51-
{ "label": "{", "x": 11.5, "y": 1 },
52-
{ "label": "}", "x": 12.5, "y": 1 },
53-
{ "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 },
54-
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
55-
{ "label": "A", "x": 1.75, "y": 2 },
56-
{ "label": "S", "x": 2.75, "y": 2 },
57-
{ "label": "D", "x": 3.75, "y": 2 },
58-
{ "label": "F", "x": 4.75, "y": 2 },
59-
{ "label": "G", "x": 5.75, "y": 2 },
60-
{ "label": "H", "x": 6.75, "y": 2 },
61-
{ "label": "J", "x": 7.75, "y": 2 },
62-
{ "label": "K", "x": 8.75, "y": 2 },
63-
{ "label": "L", "x": 9.75, "y": 2 },
64-
{ "label": ":", "x": 10.75, "y": 2 },
65-
{ "label": "\"", "x": 11.75, "y": 2 },
66-
{ "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
67-
{ "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
68-
{ "label": "|", "x": 1.25, "y": 3 },
69-
{ "label": "Z", "x": 2.25, "y": 3 },
70-
{ "label": "X", "x": 3.25, "y": 3 },
71-
{ "label": "C", "x": 4.25, "y": 3 },
72-
{ "label": "V", "x": 5.25, "y": 3 },
73-
{ "label": "B", "x": 6.25, "y": 3 },
74-
{ "label": "N", "x": 7.25, "y": 3 },
75-
{ "label": "M", "x": 8.25, "y": 3 },
76-
{ "label": "<", "x": 9.25, "y": 3 },
77-
{ "label": ">", "x": 10.25, "y": 3 },
78-
{ "label": "?", "x": 11.25, "y": 3 },
79-
{ "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
80-
{ "label": "Fn", "x": 14, "y": 3 },
81-
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
82-
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
83-
{ "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
84-
{ "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 },
85-
{ "label": "Space2", "x": 6, "y": 4, "w": 1.25 },
86-
{ "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 },
87-
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
88-
{ "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 },
89-
{ "label": "Win", "x": 12.5, "y": 4, "w": 1.25 },
90-
{ "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
25+
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
26+
{"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
27+
{"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
28+
{"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
29+
{"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
30+
{"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
31+
{"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
32+
{"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
33+
{"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
34+
{"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
35+
{"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
36+
{"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
37+
{"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
38+
{"label": "|", "matrix": [0, 13], "x": 13, "y": 0},
39+
{"label": "~", "matrix": [0, 14], "x": 14, "y": 0},
40+
41+
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
42+
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
43+
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
44+
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
45+
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
46+
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
47+
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
48+
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
49+
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
50+
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
51+
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
52+
{"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
53+
{"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
54+
{"label": "Backsp.", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
55+
56+
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
57+
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
58+
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
59+
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
60+
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
61+
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
62+
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
63+
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
64+
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
65+
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
66+
{"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
67+
{"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
68+
{"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
69+
70+
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
71+
{"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
72+
{"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
73+
{"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
74+
{"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
75+
{"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
76+
{"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
77+
{"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
78+
{"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
79+
{"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
80+
{"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
81+
{"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
82+
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
83+
{"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
84+
85+
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
86+
{"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
87+
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
88+
{"label": "Space1", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
89+
{"label": "Space2", "matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
90+
{"label": "Space3", "matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
91+
{"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
92+
{"label": "Menu", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
93+
{"label": "Win", "matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
94+
{"label": "Ctrl", "matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}
95+
]
96+
},
97+
98+
"LAYOUT_60_ansi_split_bs_rshift": {
99+
"layout": [
100+
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
101+
{"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
102+
{"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
103+
{"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
104+
{"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
105+
{"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
106+
{"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
107+
{"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
108+
{"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
109+
{"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
110+
{"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
111+
{"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
112+
{"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
113+
{"label": "|", "matrix": [0, 13], "x": 13, "y": 0},
114+
{"label": "~", "matrix": [0, 14], "x": 14, "y": 0},
115+
116+
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
117+
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
118+
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
119+
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
120+
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
121+
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
122+
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
123+
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
124+
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
125+
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
126+
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
127+
{"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
128+
{"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
129+
{"label": "Backsp.", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
130+
131+
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
132+
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
133+
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
134+
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
135+
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
136+
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
137+
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
138+
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
139+
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
140+
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
141+
{"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
142+
{"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
143+
{"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
144+
145+
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
146+
{"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
147+
{"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
148+
{"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
149+
{"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
150+
{"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
151+
{"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
152+
{"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
153+
{"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
154+
{"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
155+
{"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
156+
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
157+
{"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
158+
159+
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
160+
{"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
161+
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
162+
{"label": "Space2", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
163+
{"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
164+
{"label": "Menu", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
165+
{"label": "Win", "matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
166+
{"label": "Ctrl", "matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}
91167
]
92168
}
93169
}

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

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

0 commit comments

Comments
 (0)