5bd68e3695a82ff504c358c33445b4530c2a327f
- Author
- Ryan <fauxpark@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Move single `LAYOUT`s to data driven (#20365)
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json
2index 7a71d2b3670352fee127a91606c0f7c990369c59..2773a9fd605cb5637b3427b4e04d82efa40967db 100644
3--- a/keyboards/25keys/aleth42/info.json
4+++ b/keyboards/25keys/aleth42/info.json
5@@ -6,52 +6,5 @@
6 "usb": {
7 "vid": "0x04D8",
8 "pid": "0xEAC8"
9- },
10- "layouts": {
11- "LAYOUT": {
12- "layout": [
13- {"x":0, "y":0},
14- {"x":1, "y":0},
15- {"x":2, "y":0},
16- {"x":3, "y":0},
17- {"x":4, "y":0},
18- {"x":5, "y":0},
19- {"x":6, "y":0},
20- {"x":7, "y":0},
21- {"x":8, "y":0},
22- {"x":9, "y":0},
23- {"x":10, "y":0},
24- {"x":11, "y":0},
25- {"x":0, "y":1, "w":1.25},
26- {"x":1.25, "y":1},
27- {"x":2.25, "y":1},
28- {"x":3.25, "y":1},
29- {"x":4.25, "y":1},
30- {"x":5.25, "y":1},
31- {"x":6.25, "y":1},
32- {"x":7.25, "y":1},
33- {"x":8.25, "y":1},
34- {"x":9.25, "y":1},
35- {"x":10.25, "y":1, "w":1.75},
36- {"x":0, "y":2, "w":1.75},
37- {"x":1.75, "y":2},
38- {"x":2.75, "y":2},
39- {"x":3.75, "y":2},
40- {"x":4.75, "y":2},
41- {"x":5.75, "y":2},
42- {"x":6.75, "y":2},
43- {"x":7.75, "y":2},
44- {"x":8.75, "y":2},
45- {"x":9.75, "y":2},
46- {"x":10.75, "y":2, "w":1.25},
47- {"x":0, "y":3, "w":1.25},
48- {"x":1.25, "y":3},
49- {"x":2.25, "y":3, "w":1.25},
50- {"x":3.5, "y":3, "w":2.75},
51- {"x":6.25, "y":3, "w":2.25},
52- {"x":8.5, "y":3, "w":1.25},
53- {"x":9.75, "y":3},
54- {"x":10.75, "y":3, "w":1.25}]
55- }
56 }
57 }
58diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
59index 3b2395a247f703e0f888727ed535cc880bc35b66..f3741a80b148a9c51ea416881f51b9242af9c0f4 100644
60--- a/keyboards/25keys/aleth42/rev0/info.json
61+++ b/keyboards/25keys/aleth42/rev0/info.json
62@@ -17,5 +17,56 @@
63 "pin": "C7"
64 },
65 "processor": "atmega32u2",
66- "bootloader": "atmel-dfu"
67+ "bootloader": "atmel-dfu",
68+ "layouts": {
69+ "LAYOUT": {
70+ "layout": [
71+ {"matrix": [0, 0], "x": 0, "y": 0},
72+ {"matrix": [0, 1], "x": 1, "y": 0},
73+ {"matrix": [0, 2], "x": 2, "y": 0},
74+ {"matrix": [0, 3], "x": 3, "y": 0},
75+ {"matrix": [0, 4], "x": 4, "y": 0},
76+ {"matrix": [0, 5], "x": 5, "y": 0},
77+ {"matrix": [0, 6], "x": 6, "y": 0},
78+ {"matrix": [0, 7], "x": 7, "y": 0},
79+ {"matrix": [0, 8], "x": 8, "y": 0},
80+ {"matrix": [0, 9], "x": 9, "y": 0},
81+ {"matrix": [0, 10], "x": 10, "y": 0},
82+ {"matrix": [3, 10], "x": 11, "y": 0},
83+
84+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
85+ {"matrix": [1, 1], "x": 1.25, "y": 1},
86+ {"matrix": [1, 2], "x": 2.25, "y": 1},
87+ {"matrix": [1, 3], "x": 3.25, "y": 1},
88+ {"matrix": [1, 4], "x": 4.25, "y": 1},
89+ {"matrix": [1, 5], "x": 5.25, "y": 1},
90+ {"matrix": [1, 6], "x": 6.25, "y": 1},
91+ {"matrix": [1, 7], "x": 7.25, "y": 1},
92+ {"matrix": [1, 8], "x": 8.25, "y": 1},
93+ {"matrix": [1, 9], "x": 9.25, "y": 1},
94+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
95+
96+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
97+ {"matrix": [2, 1], "x": 1.75, "y": 2},
98+ {"matrix": [2, 2], "x": 2.75, "y": 2},
99+ {"matrix": [2, 3], "x": 3.75, "y": 2},
100+ {"matrix": [2, 4], "x": 4.75, "y": 2},
101+ {"matrix": [2, 5], "x": 5.75, "y": 2},
102+ {"matrix": [2, 6], "x": 6.75, "y": 2},
103+ {"matrix": [2, 7], "x": 7.75, "y": 2},
104+ {"matrix": [2, 8], "x": 8.75, "y": 2},
105+ {"matrix": [2, 9], "x": 9.75, "y": 2},
106+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
107+
108+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
109+ {"matrix": [3, 1], "x": 1.25, "y": 3},
110+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
111+ {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
112+ {"matrix": [3, 4], "x": 6.25, "y": 3, "w": 2.25},
113+ {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
114+ {"matrix": [3, 6], "x": 9.75, "y": 3},
115+ {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
116+ ]
117+ }
118+ }
119 }
120diff --git a/keyboards/25keys/aleth42/rev0/rev0.h b/keyboards/25keys/aleth42/rev0/rev0.h
121deleted file mode 100644
122index a5dd74037f1c663463fb42285d8ae1f553b42886..0000000000000000000000000000000000000000
123--- a/keyboards/25keys/aleth42/rev0/rev0.h
124+++ /dev/null
125@@ -1,54 +0,0 @@
126-/* Copyright 2020 monksoffunk
127- *
128- * This program is free software: you can redistribute it and/or modify
129- * it under the terms of the GNU General Public License as published by
130- * the Free Software Foundation, either version 2 of the License, or
131- * (at your option) any later version.
132- *
133- * This program is distributed in the hope that it will be useful,
134- * but WITHOUT ANY WARRANTY; without even the implied warranty of
135- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
136- * GNU General Public License for more details.
137- *
138- * You should have received a copy of the GNU General Public License
139- * along with this program. If not, see <http://www.gnu.org/licenses/>.
140- */
141-
142-#pragma once
143-
144-#include "quantum.h"
145-
146-// for readability
147-#define XXX KC_NO
148-
149-/* This is a shortcut to help you visually see your layout.
150- *
151- * The first section contains all of the arguments representing the physical
152- * layout of the board and position of the keys.
153- *
154- * The second converts the arguments into a two-dimensional array which
155- * represents the switch matrix.
156- */
157-/* ALETH42 layout
158- * ,-----------------------------------------------------------.
159- * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 38 |
160- * |-----------------------------------------------------------|
161- * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A |
162- * |-----------------------------------------------------------|
163- * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A |
164- * |-----------------------------------------------------------|
165- * | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 |
166- * `-----------------------------------------------------------'
167- */
168-#define LAYOUT( \
169- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k38,\
170- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,\
171- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,\
172- k30, k31, k32, k33, k34, k35, k36, k37\
173-) \
174-{ \
175- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A },\
176- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A },\
177- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A },\
178- { k30, k31, k32, k33, k34, k35, k36, k37, XXX, XXX, k38 }\
179-}
180diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
181index d3ed4d6cd053e5ff6a7713a66d0fa074ee7fe083..562020388953f198b877adc471cbe4353a7b9268 100644
182--- a/keyboards/25keys/aleth42/rev1/info.json
183+++ b/keyboards/25keys/aleth42/rev1/info.json
184@@ -22,5 +22,56 @@
185 "breathing": true
186 },
187 "processor": "atmega32u4",
188- "bootloader": "atmel-dfu"
189+ "bootloader": "atmel-dfu",
190+ "layouts": {
191+ "LAYOUT": {
192+ "layout": [
193+ {"matrix": [0, 0], "x": 0, "y": 0},
194+ {"matrix": [0, 1], "x": 1, "y": 0},
195+ {"matrix": [0, 2], "x": 2, "y": 0},
196+ {"matrix": [0, 3], "x": 3, "y": 0},
197+ {"matrix": [0, 4], "x": 4, "y": 0},
198+ {"matrix": [0, 5], "x": 5, "y": 0},
199+ {"matrix": [0, 6], "x": 6, "y": 0},
200+ {"matrix": [0, 7], "x": 7, "y": 0},
201+ {"matrix": [0, 8], "x": 8, "y": 0},
202+ {"matrix": [0, 9], "x": 9, "y": 0},
203+ {"matrix": [0, 10], "x": 10, "y": 0},
204+ {"matrix": [3, 10], "x": 11, "y": 0},
205+
206+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
207+ {"matrix": [1, 1], "x": 1.25, "y": 1},
208+ {"matrix": [1, 2], "x": 2.25, "y": 1},
209+ {"matrix": [1, 3], "x": 3.25, "y": 1},
210+ {"matrix": [1, 4], "x": 4.25, "y": 1},
211+ {"matrix": [1, 5], "x": 5.25, "y": 1},
212+ {"matrix": [1, 6], "x": 6.25, "y": 1},
213+ {"matrix": [1, 7], "x": 7.25, "y": 1},
214+ {"matrix": [1, 8], "x": 8.25, "y": 1},
215+ {"matrix": [1, 9], "x": 9.25, "y": 1},
216+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
217+
218+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
219+ {"matrix": [2, 1], "x": 1.75, "y": 2},
220+ {"matrix": [2, 2], "x": 2.75, "y": 2},
221+ {"matrix": [2, 3], "x": 3.75, "y": 2},
222+ {"matrix": [2, 4], "x": 4.75, "y": 2},
223+ {"matrix": [2, 5], "x": 5.75, "y": 2},
224+ {"matrix": [2, 6], "x": 6.75, "y": 2},
225+ {"matrix": [2, 7], "x": 7.75, "y": 2},
226+ {"matrix": [2, 8], "x": 8.75, "y": 2},
227+ {"matrix": [2, 9], "x": 9.75, "y": 2},
228+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
229+
230+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
231+ {"matrix": [3, 1], "x": 1.25, "y": 3},
232+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
233+ {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
234+ {"matrix": [3, 4], "x": 6.25, "y": 3, "w": 2.25},
235+ {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
236+ {"matrix": [3, 6], "x": 9.75, "y": 3},
237+ {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
238+ ]
239+ }
240+ }
241 }
242diff --git a/keyboards/25keys/aleth42/rev1/rev1.h b/keyboards/25keys/aleth42/rev1/rev1.h
243deleted file mode 100644
244index a5dd74037f1c663463fb42285d8ae1f553b42886..0000000000000000000000000000000000000000
245--- a/keyboards/25keys/aleth42/rev1/rev1.h
246+++ /dev/null
247@@ -1,54 +0,0 @@
248-/* Copyright 2020 monksoffunk
249- *
250- * This program is free software: you can redistribute it and/or modify
251- * it under the terms of the GNU General Public License as published by
252- * the Free Software Foundation, either version 2 of the License, or
253- * (at your option) any later version.
254- *
255- * This program is distributed in the hope that it will be useful,
256- * but WITHOUT ANY WARRANTY; without even the implied warranty of
257- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
258- * GNU General Public License for more details.
259- *
260- * You should have received a copy of the GNU General Public License
261- * along with this program. If not, see <http://www.gnu.org/licenses/>.
262- */
263-
264-#pragma once
265-
266-#include "quantum.h"
267-
268-// for readability
269-#define XXX KC_NO
270-
271-/* This is a shortcut to help you visually see your layout.
272- *
273- * The first section contains all of the arguments representing the physical
274- * layout of the board and position of the keys.
275- *
276- * The second converts the arguments into a two-dimensional array which
277- * represents the switch matrix.
278- */
279-/* ALETH42 layout
280- * ,-----------------------------------------------------------.
281- * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 38 |
282- * |-----------------------------------------------------------|
283- * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A |
284- * |-----------------------------------------------------------|
285- * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A |
286- * |-----------------------------------------------------------|
287- * | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 |
288- * `-----------------------------------------------------------'
289- */
290-#define LAYOUT( \
291- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k38,\
292- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,\
293- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,\
294- k30, k31, k32, k33, k34, k35, k36, k37\
295-) \
296-{ \
297- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A },\
298- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A },\
299- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A },\
300- { k30, k31, k32, k33, k34, k35, k36, k37, XXX, XXX, k38 }\
301-}
302diff --git a/keyboards/30wer/30wer.h b/keyboards/30wer/30wer.h
303deleted file mode 100644
304index e7bce82776b26a969f69fae5780df9429385dddc..0000000000000000000000000000000000000000
305--- a/keyboards/30wer/30wer.h
306+++ /dev/null
307@@ -1,14 +0,0 @@
308-#pragma once
309-
310-#include "quantum.h"
311-
312-#define LAYOUT( \
313- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
314- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
315- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b \
316-) \
317-{ \
318- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
319- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \
320- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \
321-}
322diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json
323index bced976dd56e91698d27199c9c12182bae01c39c..85f3826acd341fb1a34d3387098684e8e175f470 100644
324--- a/keyboards/30wer/info.json
325+++ b/keyboards/30wer/info.json
326@@ -18,44 +18,46 @@
327 "layouts": {
328 "LAYOUT": {
329 "layout": [
330- {"label":"Tab", "x":0, "y":0},
331- {"label":"Q", "x":1, "y":0},
332- {"label":"W", "x":2, "y":0},
333- {"label":"E", "x":3, "y":0},
334- {"label":"R", "x":4, "y":0},
335- {"label":"T", "x":5, "y":0},
336- {"label":"Y", "x":6, "y":0},
337- {"label":"U", "x":7, "y":0},
338- {"label":"I", "x":8, "y":0},
339- {"label":"O", "x":9, "y":0},
340- {"label":"P", "x":10, "y":0},
341- {"label":"Bksp", "x":11, "y":0},
342- {"label":"Delete", "x":12, "y":0, "w":1.25},
343- {"label":"Ctrl", "x":0, "y":1, "w":1.25},
344- {"label":"A", "x":1.25, "y":1},
345- {"label":"S", "x":2.25, "y":1},
346- {"label":"D", "x":3.25, "y":1},
347- {"label":"F", "x":4.25, "y":1},
348- {"label":"G", "x":5.25, "y":1},
349- {"label":"H", "x":6.25, "y":1},
350- {"label":"J", "x":7.25, "y":1},
351- {"label":"K", "x":8.25, "y":1},
352- {"label":"L", "x":9.25, "y":1},
353- {"label":":", "x":10.25, "y":1},
354- {"label":"\"", "x":11.25, "y":1},
355- {"label":"Enter", "x":12.25, "y":1},
356- {"label":"Shift", "x":0, "y":2, "w":1.75},
357- {"label":"Z", "x":1.75, "y":2},
358- {"label":"X", "x":2.75, "y":2},
359- {"label":"C", "x":3.75, "y":2},
360- {"label":"V", "x":4.75, "y":2},
361- {"label":"B", "x":5.75, "y":2},
362- {"label":"N", "x":6.75, "y":2},
363- {"label":"M", "x":7.75, "y":2},
364- {"label":"<", "x":8.75, "y":2},
365- {"label":">", "x":9.75, "y":2},
366- {"label":"?", "x":10.75, "y":2},
367- {"label":"Space", "x":11.75, "y":2, "w":1.5}
368+ {"matrix": [0, 0], "x": 0, "y": 0},
369+ {"matrix": [0, 1], "x": 1, "y": 0},
370+ {"matrix": [0, 2], "x": 2, "y": 0},
371+ {"matrix": [0, 3], "x": 3, "y": 0},
372+ {"matrix": [0, 4], "x": 4, "y": 0},
373+ {"matrix": [0, 5], "x": 5, "y": 0},
374+ {"matrix": [0, 6], "x": 6, "y": 0},
375+ {"matrix": [0, 7], "x": 7, "y": 0},
376+ {"matrix": [0, 8], "x": 8, "y": 0},
377+ {"matrix": [0, 9], "x": 9, "y": 0},
378+ {"matrix": [0, 10], "x": 10, "y": 0},
379+ {"matrix": [0, 11], "x": 11, "y": 0},
380+ {"matrix": [0, 12], "x": 12, "y": 0, "w": 1.25},
381+
382+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
383+ {"matrix": [1, 1], "x": 1.25, "y": 1},
384+ {"matrix": [1, 2], "x": 2.25, "y": 1},
385+ {"matrix": [1, 3], "x": 3.25, "y": 1},
386+ {"matrix": [1, 4], "x": 4.25, "y": 1},
387+ {"matrix": [1, 5], "x": 5.25, "y": 1},
388+ {"matrix": [1, 6], "x": 6.25, "y": 1},
389+ {"matrix": [1, 7], "x": 7.25, "y": 1},
390+ {"matrix": [1, 8], "x": 8.25, "y": 1},
391+ {"matrix": [1, 9], "x": 9.25, "y": 1},
392+ {"matrix": [1, 10], "x": 10.25, "y": 1},
393+ {"matrix": [1, 11], "x": 11.25, "y": 1},
394+ {"matrix": [1, 12], "x": 12.25, "y": 1},
395+
396+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
397+ {"matrix": [2, 1], "x": 1.75, "y": 2},
398+ {"matrix": [2, 2], "x": 2.75, "y": 2},
399+ {"matrix": [2, 3], "x": 3.75, "y": 2},
400+ {"matrix": [2, 4], "x": 4.75, "y": 2},
401+ {"matrix": [2, 5], "x": 5.75, "y": 2},
402+ {"matrix": [2, 6], "x": 6.75, "y": 2},
403+ {"matrix": [2, 7], "x": 7.75, "y": 2},
404+ {"matrix": [2, 8], "x": 8.75, "y": 2},
405+ {"matrix": [2, 9], "x": 9.75, "y": 2},
406+ {"matrix": [2, 10], "x": 10.75, "y": 2},
407+ {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.5}
408 ]
409 }
410 }
411diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json
412index d76688bfc13debfe5dbb16fed40bd83733705bea..2a273231d9de3549de94999c4dbc9f035b86bc4a 100644
413--- a/keyboards/3w6/info.json
414+++ b/keyboards/3w6/info.json
415@@ -6,54 +6,5 @@
416 "usb": {
417 "vid": "0xFEED",
418 "pid": "0x4658"
419- },
420- "layouts": {
421- "LAYOUT": {
422- "layout": [
423- {"label": "k00", "x": 0, "y": 0.8},
424- {"label": "k01", "x": 1, "y": 0.2},
425- {"label": "k02", "x": 2, "y": 0},
426- {"label": "k03", "x": 3, "y": 0.2},
427- {"label": "k04", "x": 4, "y": 0.4},
428-
429- {"label": "k05", "x": 8, "y": 0.4},
430- {"label": "k06", "x": 9, "y": 0.2},
431- {"label": "k07", "x": 10, "y": 0},
432- {"label": "k08", "x": 11, "y": 0.2},
433- {"label": "k09", "x": 12, "y": 0.8},
434-
435- {"label": "k10", "x": 0, "y": 1.8},
436- {"label": "k11", "x": 1, "y": 1.2},
437- {"label": "k12", "x": 2, "y": 1},
438- {"label": "k13", "x": 3, "y": 1.2},
439- {"label": "k14", "x": 4, "y": 1.4},
440-
441- {"label": "k15", "x": 8, "y": 1.4},
442- {"label": "k16", "x": 9, "y": 1.2},
443- {"label": "k17", "x": 10, "y": 1},
444- {"label": "k18", "x": 11, "y": 1.2},
445- {"label": "k19", "x": 12, "y": 1.8},
446-
447- {"label": "k20", "x": 0, "y": 2.8},
448- {"label": "k21", "x": 1, "y": 2.2},
449- {"label": "k22", "x": 2, "y": 2},
450- {"label": "k23", "x": 3, "y": 2.2},
451- {"label": "k24", "x": 4, "y": 2.4},
452-
453- {"label": "k25", "x": 8, "y": 2.4},
454- {"label": "k26", "x": 9, "y": 2.2},
455- {"label": "k27", "x": 10, "y": 2},
456- {"label": "k28", "x": 11, "y": 2.2},
457- {"label": "k29", "x": 12, "y": 2.8},
458-
459- {"label": "k32", "x": 3.2, "y": 3.6},
460- {"label": "k33", "x": 4.2, "y": 3.6},
461- {"label": "k34", "x": 5.2, "y": 3.8},
462-
463- {"label": "k35", "x": 6.8, "y": 3.8},
464- {"label": "k36", "x": 7.8, "y": 3.6},
465- {"label": "k37", "x": 8.8, "y": 3.6}
466- ]
467- }
468 }
469 }
470diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json
471index dab37baf04567243ec99ff77298230abd0212075..2db9363564dab3a2b23ee2bb6d2ac7299e929d02 100644
472--- a/keyboards/3w6/rev1/info.json
473+++ b/keyboards/3w6/rev1/info.json
474@@ -3,5 +3,54 @@
475 "device_version": "0.0.1"
476 },
477 "processor": "atmega32u4",
478- "bootloader": "atmel-dfu"
479+ "bootloader": "atmel-dfu",
480+ "layouts": {
481+ "LAYOUT": {
482+ "layout": [
483+ {"matrix": [0, 0], "x": 0, "y": 0.8},
484+ {"matrix": [0, 1], "x": 1, "y": 0.2},
485+ {"matrix": [0, 2], "x": 2, "y": 0},
486+ {"matrix": [0, 3], "x": 3, "y": 0.2},
487+ {"matrix": [0, 4], "x": 4, "y": 0.4},
488+
489+ {"matrix": [4, 0], "x": 8, "y": 0.4},
490+ {"matrix": [4, 1], "x": 9, "y": 0.2},
491+ {"matrix": [4, 2], "x": 10, "y": 0},
492+ {"matrix": [4, 3], "x": 11, "y": 0.2},
493+ {"matrix": [4, 4], "x": 12, "y": 0.8},
494+
495+ {"matrix": [1, 0], "x": 0, "y": 1.8},
496+ {"matrix": [1, 1], "x": 1, "y": 1.2},
497+ {"matrix": [1, 2], "x": 2, "y": 1},
498+ {"matrix": [1, 3], "x": 3, "y": 1.2},
499+ {"matrix": [1, 4], "x": 4, "y": 1.4},
500+
501+ {"matrix": [5, 0], "x": 8, "y": 1.4},
502+ {"matrix": [5, 1], "x": 9, "y": 1.2},
503+ {"matrix": [5, 2], "x": 10, "y": 1},
504+ {"matrix": [5, 3], "x": 11, "y": 1.2},
505+ {"matrix": [5, 4], "x": 12, "y": 1.8},
506+
507+ {"matrix": [2, 0], "x": 0, "y": 2.8},
508+ {"matrix": [2, 1], "x": 1, "y": 2.2},
509+ {"matrix": [2, 2], "x": 2, "y": 2},
510+ {"matrix": [2, 3], "x": 3, "y": 2.2},
511+ {"matrix": [2, 4], "x": 4, "y": 2.4},
512+
513+ {"matrix": [6, 0], "x": 8, "y": 2.4},
514+ {"matrix": [6, 1], "x": 9, "y": 2.2},
515+ {"matrix": [6, 2], "x": 10, "y": 2},
516+ {"matrix": [6, 3], "x": 11, "y": 2.2},
517+ {"matrix": [6, 4], "x": 12, "y": 2.8},
518+
519+ {"matrix": [3, 2], "x": 3.2, "y": 3.6},
520+ {"matrix": [3, 3], "x": 4.2, "y": 3.6},
521+ {"matrix": [3, 4], "x": 5.2, "y": 3.8},
522+
523+ {"matrix": [7, 0], "x": 6.8, "y": 3.8},
524+ {"matrix": [7, 1], "x": 7.8, "y": 3.6},
525+ {"matrix": [7, 2], "x": 8.8, "y": 3.6}
526+ ]
527+ }
528+ }
529 }
530diff --git a/keyboards/3w6/rev1/rev1.h b/keyboards/3w6/rev1/rev1.h
531deleted file mode 100644
532index ba881ca431ce6e233e3cec5431e321ada9cf837e..0000000000000000000000000000000000000000
533--- a/keyboards/3w6/rev1/rev1.h
534+++ /dev/null
535@@ -1,44 +0,0 @@
536-/* Copyright 2021 weteor
537- *
538- * This program is free software: you can redistribute it and/or modify
539- * it under the terms of the GNU General Public License as published by
540- * the Free Software Foundation, either version 2 of the License, or
541- * (at your option) any later version.
542- *
543- * This program is distributed in the hope that it will be useful,
544- * but WITHOUT ANY WARRANTY; without even the implied warranty of
545- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
546- * GNU General Public License for more details.
547- *
548- * You should have received a copy of the GNU General Public License
549- * along with this program. If not, see <http://www.gnu.org/licenses/>.
550- */
551-
552-#pragma once
553-
554-#include "quantum.h"
555-
556-/* This is a shortcut to help you visually see your layout.
557- *
558- * The first section contains all of the arguments representing the physical
559- * layout of the board and position of the keys.
560- *
561- * The second converts the arguments into a two-dimensional array which
562- * represents the switch matrix.
563- */
564-#define LAYOUT( \
565- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\
566- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
567- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
568- k32, k33, k34, k35, k36, k37\
569-) { \
570- { k00, k01, k02, k03, k04 }, \
571- { k10, k11, k12, k13, k14 }, \
572- { k20, k21, k22, k23, k24 }, \
573- { KC_NO, KC_NO, k32, k33, k34 }, \
574- \
575- { k05, k06, k07, k08, k09 }, \
576- { k15, k16, k17, k18, k19 }, \
577- { k25, k26, k27, k28, k29 }, \
578- { k35, k36, k37, KC_NO, KC_NO }, \
579-}
580diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json
581index 65be217368d2adcb78ed61b2a71f6cbd1691f69d..70ee0e0fcacf0dc636a761ec387beaf2f4ec1ebc 100644
582--- a/keyboards/3w6/rev2/info.json
583+++ b/keyboards/3w6/rev2/info.json
584@@ -3,5 +3,54 @@
585 "device_version": "0.0.2"
586 },
587 "processor": "atmega32u4",
588- "bootloader": "atmel-dfu"
589+ "bootloader": "atmel-dfu",
590+ "layouts": {
591+ "LAYOUT": {
592+ "layout": [
593+ {"matrix": [0, 0], "x": 0, "y": 0.8},
594+ {"matrix": [0, 1], "x": 1, "y": 0.2},
595+ {"matrix": [0, 2], "x": 2, "y": 0},
596+ {"matrix": [0, 3], "x": 3, "y": 0.2},
597+ {"matrix": [0, 4], "x": 4, "y": 0.4},
598+
599+ {"matrix": [4, 0], "x": 8, "y": 0.4},
600+ {"matrix": [4, 1], "x": 9, "y": 0.2},
601+ {"matrix": [4, 2], "x": 10, "y": 0},
602+ {"matrix": [4, 3], "x": 11, "y": 0.2},
603+ {"matrix": [4, 4], "x": 12, "y": 0.8},
604+
605+ {"matrix": [1, 0], "x": 0, "y": 1.8},
606+ {"matrix": [1, 1], "x": 1, "y": 1.2},
607+ {"matrix": [1, 2], "x": 2, "y": 1},
608+ {"matrix": [1, 3], "x": 3, "y": 1.2},
609+ {"matrix": [1, 4], "x": 4, "y": 1.4},
610+
611+ {"matrix": [5, 0], "x": 8, "y": 1.4},
612+ {"matrix": [5, 1], "x": 9, "y": 1.2},
613+ {"matrix": [5, 2], "x": 10, "y": 1},
614+ {"matrix": [5, 3], "x": 11, "y": 1.2},
615+ {"matrix": [5, 4], "x": 12, "y": 1.8},
616+
617+ {"matrix": [2, 0], "x": 0, "y": 2.8},
618+ {"matrix": [2, 1], "x": 1, "y": 2.2},
619+ {"matrix": [2, 2], "x": 2, "y": 2},
620+ {"matrix": [2, 3], "x": 3, "y": 2.2},
621+ {"matrix": [2, 4], "x": 4, "y": 2.4},
622+
623+ {"matrix": [6, 0], "x": 8, "y": 2.4},
624+ {"matrix": [6, 1], "x": 9, "y": 2.2},
625+ {"matrix": [6, 2], "x": 10, "y": 2},
626+ {"matrix": [6, 3], "x": 11, "y": 2.2},
627+ {"matrix": [6, 4], "x": 12, "y": 2.8},
628+
629+ {"matrix": [3, 2], "x": 3.2, "y": 3.6},
630+ {"matrix": [3, 3], "x": 4.2, "y": 3.6},
631+ {"matrix": [3, 4], "x": 5.2, "y": 3.8},
632+
633+ {"matrix": [7, 0], "x": 6.8, "y": 3.8},
634+ {"matrix": [7, 1], "x": 7.8, "y": 3.6},
635+ {"matrix": [7, 2], "x": 8.8, "y": 3.6}
636+ ]
637+ }
638+ }
639 }
640diff --git a/keyboards/3w6/rev2/rev2.c b/keyboards/3w6/rev2/rev2.c
641index 224925111e7d23c1330b755eab895131d13d9c21..e68792cfb239653d697cdb6e5a141d1276bf8956 100644
642--- a/keyboards/3w6/rev2/rev2.c
643+++ b/keyboards/3w6/rev2/rev2.c
644@@ -14,7 +14,7 @@
645 * along with this program. If not, see <http://www.gnu.org/licenses/>.
646 */
647
648-#include "rev2.h"
649+#include "quantum.h"
650
651 #ifdef SWAP_HANDS_ENABLE
652 __attribute__ ((weak))
653diff --git a/keyboards/3w6/rev2/rev2.h b/keyboards/3w6/rev2/rev2.h
654deleted file mode 100644
655index ba881ca431ce6e233e3cec5431e321ada9cf837e..0000000000000000000000000000000000000000
656--- a/keyboards/3w6/rev2/rev2.h
657+++ /dev/null
658@@ -1,44 +0,0 @@
659-/* Copyright 2021 weteor
660- *
661- * This program is free software: you can redistribute it and/or modify
662- * it under the terms of the GNU General Public License as published by
663- * the Free Software Foundation, either version 2 of the License, or
664- * (at your option) any later version.
665- *
666- * This program is distributed in the hope that it will be useful,
667- * but WITHOUT ANY WARRANTY; without even the implied warranty of
668- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
669- * GNU General Public License for more details.
670- *
671- * You should have received a copy of the GNU General Public License
672- * along with this program. If not, see <http://www.gnu.org/licenses/>.
673- */
674-
675-#pragma once
676-
677-#include "quantum.h"
678-
679-/* This is a shortcut to help you visually see your layout.
680- *
681- * The first section contains all of the arguments representing the physical
682- * layout of the board and position of the keys.
683- *
684- * The second converts the arguments into a two-dimensional array which
685- * represents the switch matrix.
686- */
687-#define LAYOUT( \
688- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\
689- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
690- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
691- k32, k33, k34, k35, k36, k37\
692-) { \
693- { k00, k01, k02, k03, k04 }, \
694- { k10, k11, k12, k13, k14 }, \
695- { k20, k21, k22, k23, k24 }, \
696- { KC_NO, KC_NO, k32, k33, k34 }, \
697- \
698- { k05, k06, k07, k08, k09 }, \
699- { k15, k16, k17, k18, k19 }, \
700- { k25, k26, k27, k28, k29 }, \
701- { k35, k36, k37, KC_NO, KC_NO }, \
702-}
703diff --git a/keyboards/40percentclub/half_n_half/half_n_half.h b/keyboards/40percentclub/half_n_half/half_n_half.h
704index bc330c9cb7b821e6e8139fb1b107bd762c905e2b..c9b4e6e73940f0a7254063d6e3b3427a7112156c 100644
705--- a/keyboards/40percentclub/half_n_half/half_n_half.h
706+++ b/keyboards/40percentclub/half_n_half/half_n_half.h
707@@ -16,32 +16,6 @@
708 #pragma once
709
710 #include "quantum.h"
711-#define ___ KC_NO
712-
713-/* This a shortcut to help you visually see your layout.
714- *
715- * The first section contains all of the arguments representing the physical
716- * layout of the board and position of the keys.
717- *
718- * The second converts the arguments into a two-dimensional array which
719- * represents the switch matrix.
720- */
721-#define LAYOUT( \
722- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
723- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
724- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
725- L34, R32 \
726-) { \
727- { L00, L01, L02, L03, L04, L05, L06 }, \
728- { L10, L11, L12, L13, L14, L15, L16 }, \
729- { L20, L21, L22, L23, L24, L25, L26 }, \
730- { ___, ___, ___, ___, L34, ___, ___ }, \
731-\
732- { R06, R05, R04, R03, R02, R01, R00 }, \
733- { R16, R15, R14, R13, R12, R11, R10 }, \
734- { R26, R25, R24, R23, R22, R21, R20 }, \
735- { ___, ___, ___, ___, R32, ___, ___ } \
736-}
737
738 #ifdef USE_I2C
739 #error "I2C not Supported"
740diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
741index 0bec859a5a0ebae2f8f98bb9ec060c0ddd414485..8174e639c23fc58efb8bc3c9029a624cd97d2989 100644
742--- a/keyboards/40percentclub/half_n_half/info.json
743+++ b/keyboards/40percentclub/half_n_half/info.json
744@@ -21,53 +21,57 @@
745 "layouts": {
746 "LAYOUT": {
747 "layout": [
748- {"label":"L00", "x":0, "y":0},
749- {"label":"L01", "x":1, "y":0},
750- {"label":"L02", "x":2, "y":0},
751- {"label":"L03", "x":3, "y":0},
752- {"label":"L04", "x":4, "y":0},
753- {"label":"L05", "x":5, "y":0},
754- {"label":"L06", "x":6, "y":0},
755- {"label":"R00", "x":7, "y":0},
756- {"label":"R01", "x":8, "y":0},
757- {"label":"R02", "x":9, "y":0},
758- {"label":"R03", "x":10, "y":0},
759- {"label":"R04", "x":11, "y":0},
760- {"label":"R05", "x":12, "y":0},
761- {"label":"R06", "x":13, "y":0},
762+ {"matrix": [0, 0], "x": 0, "y": 0},
763+ {"matrix": [0, 1], "x": 1, "y": 0},
764+ {"matrix": [0, 2], "x": 2, "y": 0},
765+ {"matrix": [0, 3], "x": 3, "y": 0},
766+ {"matrix": [0, 4], "x": 4, "y": 0},
767+ {"matrix": [0, 5], "x": 5, "y": 0},
768+ {"matrix": [0, 6], "x": 6, "y": 0},
769
770- {"label":"L10", "x":0, "y":1},
771- {"label":"L11", "x":1, "y":1},
772- {"label":"L12", "x":2, "y":1},
773- {"label":"L13", "x":3, "y":1},
774- {"label":"L14", "x":4, "y":1},
775- {"label":"L15", "x":5, "y":1},
776- {"label":"L16", "x":6, "y":1},
777- {"label":"R10", "x":7, "y":1},
778- {"label":"R11", "x":8, "y":1},
779- {"label":"R12", "x":9, "y":1},
780- {"label":"R13", "x":10, "y":1},
781- {"label":"R14", "x":11, "y":1},
782- {"label":"R15", "x":12, "y":1},
783- {"label":"R16", "x":13, "y":1},
784+ {"matrix": [4, 6], "x": 7, "y": 0},
785+ {"matrix": [4, 5], "x": 8, "y": 0},
786+ {"matrix": [4, 4], "x": 9, "y": 0},
787+ {"matrix": [4, 3], "x": 10, "y": 0},
788+ {"matrix": [4, 2], "x": 11, "y": 0},
789+ {"matrix": [4, 1], "x": 12, "y": 0},
790+ {"matrix": [4, 0], "x": 13, "y": 0},
791
792- {"label":"L20", "x":0, "y":2},
793- {"label":"L21", "x":1, "y":2},
794- {"label":"L22", "x":2, "y":2},
795- {"label":"L23", "x":3, "y":2},
796- {"label":"L24", "x":4, "y":2},
797- {"label":"L25", "x":5, "y":2},
798- {"label":"L26", "x":6, "y":2},
799- {"label":"R20", "x":7, "y":2},
800- {"label":"R21", "x":8, "y":2},
801- {"label":"R22", "x":9, "y":2},
802- {"label":"R23", "x":10, "y":2},
803- {"label":"R24", "x":11, "y":2},
804- {"label":"R25", "x":12, "y":2},
805- {"label":"R26", "x":13, "y":2},
806-
807- {"label":"L34", "x":4, "y":3, "w":2},
808- {"label":"R32", "x":8, "y":3, "w":2}
809+ {"matrix": [1, 0], "x": 0, "y": 1},
810+ {"matrix": [1, 1], "x": 1, "y": 1},
811+ {"matrix": [1, 2], "x": 2, "y": 1},
812+ {"matrix": [1, 3], "x": 3, "y": 1},
813+ {"matrix": [1, 4], "x": 4, "y": 1},
814+ {"matrix": [1, 5], "x": 5, "y": 1},
815+ {"matrix": [1, 6], "x": 6, "y": 1},
816+
817+ {"matrix": [5, 6], "x": 7, "y": 1},
818+ {"matrix": [5, 5], "x": 8, "y": 1},
819+ {"matrix": [5, 4], "x": 9, "y": 1},
820+ {"matrix": [5, 3], "x": 10, "y": 1},
821+ {"matrix": [5, 2], "x": 11, "y": 1},
822+ {"matrix": [5, 1], "x": 12, "y": 1},
823+ {"matrix": [5, 0], "x": 13, "y": 1},
824+
825+ {"matrix": [2, 0], "x": 0, "y": 2},
826+ {"matrix": [2, 1], "x": 1, "y": 2},
827+ {"matrix": [2, 2], "x": 2, "y": 2},
828+ {"matrix": [2, 3], "x": 3, "y": 2},
829+ {"matrix": [2, 4], "x": 4, "y": 2},
830+ {"matrix": [2, 5], "x": 5, "y": 2},
831+ {"matrix": [2, 6], "x": 6, "y": 2},
832+
833+ {"matrix": [6, 6], "x": 7, "y": 2},
834+ {"matrix": [6, 5], "x": 8, "y": 2},
835+ {"matrix": [6, 4], "x": 9, "y": 2},
836+ {"matrix": [6, 3], "x": 10, "y": 2},
837+ {"matrix": [6, 2], "x": 11, "y": 2},
838+ {"matrix": [6, 1], "x": 12, "y": 2},
839+ {"matrix": [6, 0], "x": 13, "y": 2},
840+
841+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
842+
843+ {"matrix": [7, 4], "x": 8, "y": 3, "w": 2}
844diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
845index c0f9ef312663461d51aee3403d4ab2fc900aa0ad..9fa3ab5d413c7bff4ca8249f3ee3ab751eb839b7 100644
846--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
847+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
848@@ -30,7 +30,79 @@
849 "bootloader": "stm32-dfu",
850 "layouts": {
851 "LAYOUT": {
852diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h
853index 02dea9d1ca061218a5e7a177a29e774831a40ec1..7cfb11b3f352f739de29648de6a8500d25f5e12d 100644
854--- a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h
855+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h
856@@ -19,23 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
857 #include "quantum.h"
858
859 void setLayerLed(layer_state_t state);
860-
861-#define LAYOUT( \
862- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k36, \
863- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k56,\
864- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76,\
865- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k96,\
866- k80, k90, k91, k92, k93, k84 ,k94, k85, k95, k86 \
867-) \
868-{ \
869- {k00, k01, k02, k03, k04, k05, k06}, \
870- {k10, k11, k12, k13, k14, k15, k16}, \
871- {k20, k21, k22, k23, k24, k25, k26}, \
872- {k30, k31, k32, k33, k34, k35, k36}, \
873- {k40, k41, k42, k43, k44, k45, k46}, \
874- {k50, k51, k52, k53, k54, k55, k56}, \
875- {k60, k61, k62, k63, k64, k65, k66}, \
876- {k70, k71, k72, k73, k74, k75, k76}, \
877- {k80, KC_NO, KC_NO, KC_NO, k84, k85, k86}, \
878- {k90, k91, k92, k93, k94, k95, k96} \
879-}
880diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json
881index ea24fceea0ff43edb872c1de453cdaf20c6b3b55..fbd30bdd29ef74d6e3a6b70abded271604d61037 100644
882--- a/keyboards/4pplet/waffling60/rev_a/info.json
883+++ b/keyboards/4pplet/waffling60/rev_a/info.json
884@@ -21,7 +21,78 @@
885 "bootloader": "atmel-dfu",
886 "layouts": {
887 "LAYOUT": {
888diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h
889deleted file mode 100644
890index 92384b4840b99461560270cd69c94a77f98ec060..0000000000000000000000000000000000000000
891--- a/keyboards/4pplet/waffling60/rev_a/rev_a.h
892+++ /dev/null
893@@ -1,36 +0,0 @@
894-/*
895-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
896-
897-This program is free software: you can redistribute it and/or modify
898-it under the terms of the GNU General Public License as published by
899-the Free Software Foundation, either version 2 of the License, or
900-(at your option) any later version.
901-
902-This program is distributed in the hope that it will be useful,
903-but WITHOUT ANY WARRANTY; without even the implied warranty of
904-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
905-GNU General Public License for more details.
906-
907-You should have received a copy of the GNU General Public License
908-along with this program. If not, see <http://www.gnu.org/licenses/>.
909-*/
910-#pragma once
911-
912-#include "quantum.h"
913-
914-// k<row><col>
915-#define LAYOUT( \
916- k00, k01, k11, k02, k03, k04, k05, k15, k06, k07, k08, k18, k09, k0a, k1a, \
917- k10, k21, k12, k22, k13, k14, k25, k35, k16, k17, k28, k19, k29, k2a, \
918- k20, k31, k32, k23, k33, k24, k45, k26, k36, k27, k38, k39, k3a, \
919- k30, k40, k41, k42, k43, k34, k44, k55, k46, k37, k47, k48, k49, k4a, \
920- k50, k51, k52, k53, k54, k56, k57, k58, k59, k5a \
921-) \
922-{ \
923- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
924- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
925- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \
926- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
927- {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
928- {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a} \
929-}
930diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
931index 143b9c207f30bb8ce7a118c906ec35737e713897..90fe5d02a227fac1cf49dd55e57737f3728e10b3 100644
932--- a/keyboards/4pplet/waffling60/rev_b/info.json
933+++ b/keyboards/4pplet/waffling60/rev_b/info.json
934@@ -24,7 +24,78 @@
935 "bootloader": "atmel-dfu",
936 "layouts": {
937 "LAYOUT": {
938diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.h b/keyboards/4pplet/waffling60/rev_b/rev_b.h
939index b3949012e9481e3c3fa5062e16154f2c87b8bbe3..57a4964202847f5283151183b3c4efb33ce3ec42 100644
940--- a/keyboards/4pplet/waffling60/rev_b/rev_b.h
941+++ b/keyboards/4pplet/waffling60/rev_b/rev_b.h
942@@ -20,18 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
943 //#define CAPS_LOCK_COLOR HSV_ORANGE
944
945 #include "quantum.h"
946-
947-#define LAYOUT( \
948- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
949- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
950- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
951- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
952- k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \
953-) \
954-{ \
955- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
956- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
957- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
958- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
959- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
960-}
961diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
962index 0f7ba079d57be9f1b78f75bf98918c0d02b8c38b..c33d2b0616c2c5b5a5d96424e738d5459fa5be1d 100644
963--- a/keyboards/4pplet/waffling60/rev_c/info.json
964+++ b/keyboards/4pplet/waffling60/rev_c/info.json
965@@ -24,7 +24,78 @@
966 "bootloader": "atmel-dfu",
967 "layouts": {
968 "LAYOUT": {
969diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.h b/keyboards/4pplet/waffling60/rev_c/rev_c.h
970index c57c0f29c27ac67b5ca8a015bc47273264fcc633..641b6633362e3adad4b7185c0ef3a994dd4d7b97 100644
971--- a/keyboards/4pplet/waffling60/rev_c/rev_c.h
972+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.h
973@@ -20,18 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
974 //#define CAPS_LOCK_COLOR HSV_ORANGE
975
976 #include "quantum.h"
977-
978-#define LAYOUT( \
979- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
980- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
981- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
982- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
983- k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \
984-) \
985-{ \
986- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
987- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
988- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
989- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
990- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
991-}
992diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
993index 18ffba5abc581baf9b8244db32049fc36e0b0c6b..01aba228636bca60827bdd8e7d9a83dd36ae8a58 100644
994--- a/keyboards/4pplet/waffling60/rev_d/info.json
995+++ b/keyboards/4pplet/waffling60/rev_d/info.json
996@@ -20,7 +20,79 @@
997 "bootloader": "stm32-dfu",
998 "layouts": {
999 "LAYOUT": {
1000diff --git a/keyboards/4pplet/waffling60/rev_d/rev_d.h b/keyboards/4pplet/waffling60/rev_d/rev_d.h
1001index a3b75c63b62f50a2a0efb2b61468db132ea7f300..641b6633362e3adad4b7185c0ef3a994dd4d7b97 100644
1002--- a/keyboards/4pplet/waffling60/rev_d/rev_d.h
1003+++ b/keyboards/4pplet/waffling60/rev_d/rev_d.h
1004@@ -20,18 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1005 //#define CAPS_LOCK_COLOR HSV_ORANGE
1006
1007 #include "quantum.h"
1008-
1009-#define LAYOUT( \
1010- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d, \
1011- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
1012- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k3d, \
1013- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4d, \
1014- k40, k41, k42, k44, k46, k48, k49, k4a, k4b, k4c \
1015-) \
1016-{ \
1017- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
1018- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
1019- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
1020- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
1021- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d}, \
1022-}
1023diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
1024index 84f375371d89283750000404dfe1c66004b255ed..3969d98c4247939d133c8f98386240d7ca11b803 100644
1025--- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json
1026+++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
1027@@ -17,7 +17,76 @@
1028 "bootloader": "stm32-dfu",
1029 "layouts": {
1030 "LAYOUT": {
1031diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
1032deleted file mode 100644
1033index 2568bd5650f3ad2f46d66e934085f262a4d2aae5..0000000000000000000000000000000000000000
1034--- a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
1035+++ /dev/null
1036@@ -1,17 +0,0 @@
1037-/*
1038-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
1039-
1040-This program is free software: you can redistribute it and/or modify
1041-it under the terms of the GNU General Public License as published by
1042-the Free Software Foundation, either version 2 of the License, or
1043-(at your option) any later version.
1044-
1045-This program is distributed in the hope that it will be useful,
1046-but WITHOUT ANY WARRANTY; without even the implied warranty of
1047-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1048-GNU General Public License for more details.
1049-
1050-You should have received a copy of the GNU General Public License
1051-along with this program. If not, see <http://www.gnu.org/licenses/>.
1052-*/
1053-#include "rev_d_ansi.h"
1054diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
1055deleted file mode 100644
1056index aaa60a1f339bf2dafbe72bcf0fca15615475e2f5..0000000000000000000000000000000000000000
1057--- a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
1058+++ /dev/null
1059@@ -1,35 +0,0 @@
1060-/*
1061-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
1062-
1063-This program is free software: you can redistribute it and/or modify
1064-it under the terms of the GNU General Public License as published by
1065-the Free Software Foundation, either version 2 of the License, or
1066-(at your option) any later version.
1067-
1068-This program is distributed in the hope that it will be useful,
1069-but WITHOUT ANY WARRANTY; without even the implied warranty of
1070-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1071-GNU General Public License for more details.
1072-
1073-You should have received a copy of the GNU General Public License
1074-along with this program. If not, see <http://www.gnu.org/licenses/>.
1075-*/
1076-#pragma once
1077-
1078-#include "quantum.h"
1079-
1080-// k<row><col>
1081-#define LAYOUT( \
1082- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
1083- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
1084- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
1085- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
1086- k40, k41, k42, k44, k46, k48, k4b, k4c, k4d \
1087-) \
1088-{ \
1089- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
1090- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
1091- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
1092- {k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
1093- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \
1094-}
1095diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json
1096index c920744d27bcae8cd310797784959ee8d7c6af25..cab2fa1c07910e54f84031667d183ec0dc031c9b 100644
1097--- a/keyboards/4pplet/waffling60/rev_d_iso/info.json
1098+++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json
1099@@ -17,7 +17,77 @@
1100 "bootloader": "stm32-dfu",
1101 "layouts": {
1102 "LAYOUT": {
1103diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
1104deleted file mode 100644
1105index 8efa86152e3ae28f89537b29a68b94bf222bcf60..0000000000000000000000000000000000000000
1106--- a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
1107+++ /dev/null
1108@@ -1,17 +0,0 @@
1109-/*
1110-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
1111-
1112-This program is free software: you can redistribute it and/or modify
1113-it under the terms of the GNU General Public License as published by
1114-the Free Software Foundation, either version 2 of the License, or
1115-(at your option) any later version.
1116-
1117-This program is distributed in the hope that it will be useful,
1118-but WITHOUT ANY WARRANTY; without even the implied warranty of
1119-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1120-GNU General Public License for more details.
1121-
1122-You should have received a copy of the GNU General Public License
1123-along with this program. If not, see <http://www.gnu.org/licenses/>.
1124-*/
1125-#include "rev_d_iso.h"
1126diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
1127deleted file mode 100644
1128index 46f0ec65ff80fac98170b57a6bfcd8d37cef0454..0000000000000000000000000000000000000000
1129--- a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
1130+++ /dev/null
1131@@ -1,35 +0,0 @@
1132-/*
1133-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
1134-
1135-This program is free software: you can redistribute it and/or modify
1136-it under the terms of the GNU General Public License as published by
1137-the Free Software Foundation, either version 2 of the License, or
1138-(at your option) any later version.
1139-
1140-This program is distributed in the hope that it will be useful,
1141-but WITHOUT ANY WARRANTY; without even the implied warranty of
1142-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1143-GNU General Public License for more details.
1144-
1145-You should have received a copy of the GNU General Public License
1146-along with this program. If not, see <http://www.gnu.org/licenses/>.
1147-*/
1148-#pragma once
1149-
1150-#include "quantum.h"
1151-
1152-// k<row><col>
1153-#define LAYOUT( \
1154- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
1155- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
1156- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
1157- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
1158- k40, k41, k42, k44, k46, k48, k4b, k4c, k4d \
1159-) \
1160-{ \
1161- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
1162- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
1163- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
1164- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
1165- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \
1166-}
1167diff --git a/keyboards/abacus/abacus.h b/keyboards/abacus/abacus.h
1168deleted file mode 100644
1169index 7f221c3c34734105bde2afaf355f5743eb596d51..0000000000000000000000000000000000000000
1170--- a/keyboards/abacus/abacus.h
1171+++ /dev/null
1172@@ -1,41 +0,0 @@
1173-/* Copyright 2020 nickolaij
1174- *
1175- * This program is free software: you can redistribute it and/or modify
1176- * it under the terms of the GNU General Public License as published by
1177- * the Free Software Foundation, either version 2 of the License, or
1178- * (at your option) any later version.
1179- *
1180- * This program is distributed in the hope that it will be useful,
1181- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1182- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1183- * GNU General Public License for more details.
1184- *
1185- * You should have received a copy of the GNU General Public License
1186- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1187- */
1188-
1189-#pragma once
1190-#include "quantum.h"
1191-#define XXX KC_NO
1192-
1193-
1194-/* This is a shortcut to help you visually see your layout.
1195- *
1196- * The first section contains all of the arguments representing the physical
1197- * layout of the board and position of the keys.
1198- *
1199- * The second converts the arguments into a two-dimensional array which
1200- * represents the switch matrix.
1201- */
1202-#define LAYOUT( \
1203- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
1204- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
1205- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
1206- k30, k31, k32, k33, k34, k35, k36, k37, k38 \
1207-) \
1208-{ \
1209- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
1210- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
1211- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
1212- { k30, k31, k32, k33, XXX, XXX, k34, XXX, k35, k36, k37, k38} \
1213-}
1214diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json
1215index 2b3bfa434b8ab4434a67825d31bc621fd94e18f1..c12d7cb2354188d68bc0d98f7b2ef2edff0ee95f 100644
1216--- a/keyboards/abacus/info.json
1217+++ b/keyboards/abacus/info.json
1218@@ -26,54 +26,54 @@
1219 "layouts": {
1220 "LAYOUT": {
1221 "layout": [
1222- {"label":"k00", "x":0, "y":0},
1223- {"label":"k01", "x":1, "y":0},
1224- {"label":"k02", "x":2, "y":0},
1225- {"label":"k03", "x":3, "y":0},
1226- {"label":"k04", "x":4, "y":0},
1227- {"label":"k05", "x":5, "y":0},
1228- {"label":"k06", "x":6, "y":0},
1229- {"label":"k07", "x":7, "y":0},
1230- {"label":"k08", "x":8, "y":0},
1231- {"label":"k09", "x":9, "y":0},
1232- {"label":"k0a", "x":10, "y":0},
1233- {"label":"k0b", "x":11, "y":0, "w":1.75},
1234+ {"matrix": [0, 0], "x": 0, "y": 0},
1235+ {"matrix": [0, 1], "x": 1, "y": 0},
1236+ {"matrix": [0, 2], "x": 2, "y": 0},
1237+ {"matrix": [0, 3], "x": 3, "y": 0},
1238+ {"matrix": [0, 4], "x": 4, "y": 0},
1239+ {"matrix": [0, 5], "x": 5, "y": 0},
1240+ {"matrix": [0, 6], "x": 6, "y": 0},
1241+ {"matrix": [0, 7], "x": 7, "y": 0},
1242+ {"matrix": [0, 8], "x": 8, "y": 0},
1243+ {"matrix": [0, 9], "x": 9, "y": 0},
1244+ {"matrix": [0, 10], "x": 10, "y": 0},
1245+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
1246
1247- {"label":"k10", "x":0, "y":1, "w":1.25},
1248- {"label":"k11", "x":1.25, "y":1},
1249- {"label":"k12", "x":2.25, "y":1},
1250- {"label":"k13", "x":3.25, "y":1},
1251- {"label":"k14", "x":4.25, "y":1},
1252- {"label":"k15", "x":5.25, "y":1},
1253- {"label":"k16", "x":6.25, "y":1},
1254- {"label":"k17", "x":7.25, "y":1},
1255- {"label":"k18", "x":8.25, "y":1},
1256- {"label":"k19", "x":9.25, "y":1},
1257- {"label":"k1a", "x":10.25, "y":1},
1258- {"label":"k1b", "x":11.25, "y":1, "w":1.5},
1259+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
1260+ {"matrix": [1, 1], "x": 1.25, "y": 1},
1261+ {"matrix": [1, 2], "x": 2.25, "y": 1},
1262+ {"matrix": [1, 3], "x": 3.25, "y": 1},
1263+ {"matrix": [1, 4], "x": 4.25, "y": 1},
1264+ {"matrix": [1, 5], "x": 5.25, "y": 1},
1265+ {"matrix": [1, 6], "x": 6.25, "y": 1},
1266+ {"matrix": [1, 7], "x": 7.25, "y": 1},
1267+ {"matrix": [1, 8], "x": 8.25, "y": 1},
1268+ {"matrix": [1, 9], "x": 9.25, "y": 1},
1269+ {"matrix": [1, 10], "x": 10.25, "y": 1},
1270+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
1271
1272- {"label":"k20", "x":0, "y":2, "w":1.75},
1273- {"label":"k21", "x":1.75, "y":2},
1274- {"label":"k22", "x":2.75, "y":2},
1275- {"label":"k23", "x":3.75, "y":2},
1276- {"label":"k24", "x":4.75, "y":2},
1277- {"label":"k25", "x":5.75, "y":2},
1278- {"label":"k26", "x":6.75, "y":2},
1279- {"label":"k27", "x":7.75, "y":2},
1280- {"label":"k28", "x":8.75, "y":2},
1281- {"label":"k29", "x":9.75, "y":2},
1282- {"label":"k2a", "x":10.75, "y":2},
1283- {"label":"k2b", "x":11.75, "y":2},
1284+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
1285+ {"matrix": [2, 1], "x": 1.75, "y": 2},
1286+ {"matrix": [2, 2], "x": 2.75, "y": 2},
1287+ {"matrix": [2, 3], "x": 3.75, "y": 2},
1288+ {"matrix": [2, 4], "x": 4.75, "y": 2},
1289+ {"matrix": [2, 5], "x": 5.75, "y": 2},
1290+ {"matrix": [2, 6], "x": 6.75, "y": 2},
1291+ {"matrix": [2, 7], "x": 7.75, "y": 2},
1292+ {"matrix": [2, 8], "x": 8.75, "y": 2},
1293+ {"matrix": [2, 9], "x": 9.75, "y": 2},
1294+ {"matrix": [2, 10], "x": 10.75, "y": 2},
1295+ {"matrix": [2, 11], "x": 11.75, "y": 2},
1296
1297- {"label":"k30", "x":0, "y":3, "w":1.25},
1298- {"label":"k31", "x":1.25, "y":3},
1299- {"label":"k32", "x":2.25, "y":3},
1300- {"label":"k33", "x":3.25, "y":3, "w":2.75},
1301- {"label":"k34", "x":6, "y":3, "w":2.75},
1302- {"label":"k35", "x":8.75, "y":3},
1303- {"label":"k36", "x":9.75, "y":3},
1304- {"label":"k37", "x":10.75, "y":3},
1305- {"label":"k38", "x":11.75, "y":3}
1306+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
1307+ {"matrix": [3, 1], "x": 1.25, "y": 3},
1308+ {"matrix": [3, 2], "x": 2.25, "y": 3},
1309+ {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 2.75},
1310+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
1311+ {"matrix": [3, 8], "x": 8.75, "y": 3},
1312+ {"matrix": [3, 9], "x": 9.75, "y": 3},
1313+ {"matrix": [3, 10], "x": 10.75, "y": 3},
1314+ {"matrix": [3, 11], "x": 11.75, "y": 3}
1315 ]
1316 }
1317 }
1318diff --git a/keyboards/acheron/elongate/beta/beta.h b/keyboards/acheron/elongate/beta/beta.h
1319deleted file mode 100644
1320index 6ff32b4f75758e6079b44dd1becc6ef4182d2d2a..0000000000000000000000000000000000000000
1321--- a/keyboards/acheron/elongate/beta/beta.h
1322+++ /dev/null
1323@@ -1,44 +0,0 @@
1324-/* Copyright 2020 Gondolindrim
1325- *
1326- * This program is free software: you can redistribute it and/or modify
1327- * it under the terms of the GNU General Public License as published by
1328- * the Free Software Foundation, either version 2 of the License, or
1329- * (at your option) any later version.
1330- *
1331- * This program is distributed in the hope that it will be useful,
1332- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1333- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1334- * GNU General Public License for more details.
1335- *
1336- * You should have received a copy of the GNU General Public License
1337- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1338- */
1339-
1340-#pragma once
1341-
1342-#include "quantum.h"
1343-
1344-/* This is a shortcut to help you visually see your layout.
1345- *
1346- * The first section contains all of the arguments representing the physical
1347- * layout of the board and position of the Keys.
1348- *
1349- * The second converts the arguments into a two-dimensional array which
1350- * represents the switch matrix.
1351- */
1352-
1353-#define KNO KC_NO
1354-
1355-#define LAYOUT( \
1356- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K49, K41, \
1357- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, K1C, K4A, K42, \
1358- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4B, K44, \
1359- K30, K31, K32, K34, K37, K3A, K3B, K3C, K3D, K4C, K47 \
1360-)\
1361-{\
1362- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
1363- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KNO, K1B, K1C }, \
1364- { K20, KNO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
1365- { K30, K31, K32, KNO, K34, KNO, KNO, K37, KNO, K3A, K3B, K3C, K3D }, \
1366- { KNO, K41, K42, KNO, K44, KNO, KNO, K47, KNO, K49, K4A, K4B, K4C } \
1367-}
1368diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
1369index 7c7c8ebf54f9e20da60c01d04f050c26ed66a77e..5f46a2a48c0a2dd35d9647d7d1aaea51ebf3311c 100644
1370--- a/keyboards/acheron/elongate/beta/info.json
1371+++ b/keyboards/acheron/elongate/beta/info.json
1372@@ -26,63 +26,68 @@
1373 "layouts": {
1374 "LAYOUT": {
1375 "layout": [
1376- {"label":"Tab", "x":0, "y":0},
1377- {"label":"Q", "x":1, "y":0},
1378- {"label":"W", "x":2, "y":0},
1379- {"label":"E", "x":3, "y":0},
1380- {"label":"R", "x":4, "y":0},
1381- {"label":"T", "x":5, "y":0},
1382- {"label":"Y", "x":6, "y":0},
1383- {"label":"U", "x":7, "y":0},
1384- {"label":"I", "x":8, "y":0},
1385- {"label":"O", "x":9, "y":0},
1386- {"label":"P", "x":10, "y":0},
1387- {"label":"Backspace", "x":11, "y":0},
1388- {"label":"7", "x":12.5, "y":0},
1389- {"label":"8", "x":13.5, "y":0},
1390- {"label":"9", "x":14.5, "y":0},
1391+ {"matrix": [0, 0], "x": 0, "y": 0},
1392+ {"matrix": [0, 1], "x": 1, "y": 0},
1393+ {"matrix": [0, 2], "x": 2, "y": 0},
1394+ {"matrix": [0, 3], "x": 3, "y": 0},
1395+ {"matrix": [0, 4], "x": 4, "y": 0},
1396+ {"matrix": [0, 5], "x": 5, "y": 0},
1397+ {"matrix": [0, 6], "x": 6, "y": 0},
1398+ {"matrix": [0, 7], "x": 7, "y": 0},
1399+ {"matrix": [0, 8], "x": 8, "y": 0},
1400+ {"matrix": [0, 9], "x": 9, "y": 0},
1401+ {"matrix": [0, 10], "x": 10, "y": 0},
1402+ {"matrix": [0, 11], "x": 11, "y": 0},
1403
1404- {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
1405- {"label":"A", "x":1.25, "y":1},
1406- {"label":"S", "x":2.25, "y":1},
1407- {"label":"D", "x":3.25, "y":1},
1408- {"label":"F", "x":4.25, "y":1},
1409- {"label":"G", "x":5.25, "y":1},
1410- {"label":"H", "x":6.25, "y":1},
1411- {"label":"J", "x":7.25, "y":1},
1412- {"label":"K", "x":8.25, "y":1},
1413- {"label":"L", "x":9.25, "y":1},
1414- {"label":"Enter", "x":10.25, "y":1, "w":1.75},
1415- {"label":"4", "x":12.5, "y":1},
1416- {"label":"5", "x":13.5, "y":1},
1417- {"label":"6", "x":14.5, "y":1},
1418-
1419- {"label":"Shift", "x":0, "y":2, "w":1.75},
1420- {"label":"Z", "x":1.75, "y":2},
1421- {"label":"X", "x":2.75, "y":2},
1422- {"label":"C", "x":3.75, "y":2},
1423- {"label":"V", "x":4.75, "y":2},
1424- {"label":"B", "x":5.75, "y":2},
1425- {"label":"N", "x":6.75, "y":2},
1426- {"label":"M", "x":7.75, "y":2},
1427- {"label":"<", "x":8.75, "y":2},
1428- {"label":"Fn1", "x":9.75, "y":2, "w":1.25},
1429- {"label":"Up", "x":11.25, "y":2.25},
1430- {"label":"1", "x":12.5, "y":2},
1431- {"label":"2", "x":13.5, "y":2},
1432- {"label":"3", "x":14.5, "y":2},
1433-
1434- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
1435- {"label":"Win", "x":1.25, "y":3},
1436- {"label":"Alt", "x":2.25, "y":3, "w":1.25},
1437- {"label":"Space/Fn2", "x":3.5, "y":3, "w":2.25},
1438- {"label":"Space", "x":6.25, "y":3, "w":2.75},
1439- {"label":"Alt", "x":9, "y":3},
1440- {"label":"Left", "x":10.25, "y":3.25},
1441- {"label":"Down", "x":11.25, "y":3.25},
1442- {"label":"Right", "x":12.25, "y":3.25},
1443- {"label":"0", "x":13.5, "y":3},
1444- {"label":".", "x":14.5, "y":3}
1445+ {"matrix": [0, 12], "x": 12.5, "y": 0},
1446+ {"matrix": [4, 9], "x": 13.5, "y": 0},
1447+ {"matrix": [4, 1], "x": 14.5, "y": 0},
1448+
1449+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
1450+ {"matrix": [1, 1], "x": 1.25, "y": 1},
1451+ {"matrix": [1, 2], "x": 2.25, "y": 1},
1452+ {"matrix": [1, 3], "x": 3.25, "y": 1},
1453+ {"matrix": [1, 4], "x": 4.25, "y": 1},
1454+ {"matrix": [1, 5], "x": 5.25, "y": 1},
1455+ {"matrix": [1, 6], "x": 6.25, "y": 1},
1456+ {"matrix": [1, 7], "x": 7.25, "y": 1},
1457+ {"matrix": [1, 8], "x": 8.25, "y": 1},
1458+ {"matrix": [1, 9], "x": 9.25, "y": 1},
1459+ {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
1460+
1461+ {"matrix": [1, 12], "x": 12.5, "y": 1},
1462+ {"matrix": [4, 10], "x": 13.5, "y": 1},
1463+ {"matrix": [4, 2], "x": 14.5, "y": 1},
1464+
1465+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
1466+ {"matrix": [2, 2], "x": 1.75, "y": 2},
1467+ {"matrix": [2, 3], "x": 2.75, "y": 2},
1468+ {"matrix": [2, 4], "x": 3.75, "y": 2},
1469+ {"matrix": [2, 5], "x": 4.75, "y": 2},
1470+ {"matrix": [2, 6], "x": 5.75, "y": 2},
1471+ {"matrix": [2, 7], "x": 6.75, "y": 2},
1472diff --git a/keyboards/ada/ada1800mini/ada1800mini.h b/keyboards/ada/ada1800mini/ada1800mini.h
1473deleted file mode 100644
1474index 89ac0beba307638d48c9ae3c9ee456a5b19d95bf..0000000000000000000000000000000000000000
1475--- a/keyboards/ada/ada1800mini/ada1800mini.h
1476+++ /dev/null
1477@@ -1,38 +0,0 @@
1478-/* Copyright 2022 peepeetee
1479- *
1480- * This program is free software: you can redistribute it and/or modify
1481- * it under the terms of the GNU General Public License as published by
1482- * the Free Software Foundation, either version 2 of the License, or
1483- * (at your option) any later version.
1484- *
1485- * This program is distributed in the hope that it will be useful,
1486- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1487- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1488- * GNU General Public License for more details.
1489- *
1490- * You should have received a copy of the GNU General Public License
1491- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1492- */
1493-
1494-#pragma once
1495-
1496-#include "quantum.h"
1497-
1498-#define XXX KC_NO
1499-
1500-#define LAYOUT( \
1501- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
1502- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
1503- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, K2E, \
1504- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3C, K3D, K3E, K3B, \
1505- K40, K41, K42, K43, K46, K47, K48, K4D, K4E, K4A, K4B, K4C \
1506-) { \
1507- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
1508- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
1509- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C, K2D, K2E }, \
1510- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D, K3E }, \
1511- { K40, K41, K42, K43, XXX, XXX, K46, K47, K48, XXX, K4A, K4B, K4C, K4D, K4E }, \
1512-}
1513-
1514-// generated by KBFirmware JSON to QMK Parser
1515-// https://noroadsleft.github.io/kbf_qmk_converter/
1516diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
1517index 4af2c200c2d9e38e5b069209ee94d1ea4a486d64..780afec336c7e5c2a2ce38b209f16df592430d65 100644
1518--- a/keyboards/ada/ada1800mini/info.json
1519+++ b/keyboards/ada/ada1800mini/info.json
1520@@ -21,76 +21,89 @@
1521 "layouts": {
1522 "LAYOUT": {
1523 "layout": [
1524- { "label": "K00 (D0,F1)", "x": 0, "y": 0 },
1525- { "label": "K01 (D0,F4)", "x": 1.25, "y": 0 },
1526- { "label": "K02 (D0,F5)", "x": 2.25, "y": 0 },
1527- { "label": "K03 (D0,F6)", "x": 3.25, "y": 0 },
1528- { "label": "K04 (D0,F7)", "x": 4.5, "y": 0 },
1529- { "label": "K05 (D0,C7)", "x": 5.5, "y": 0 },
1530- { "label": "K06 (D0,C6)", "x": 6.5, "y": 0 },
1531- { "label": "K07 (D0,B6)", "x": 7.5, "y": 0 },
1532- { "label": "K08 (D0,B5)", "x": 8.75, "y": 0 },
1533- { "label": "K09 (D0,B4)", "x": 9.75, "y": 0 },
1534- { "label": "K0A (D0,D7)", "x": 10.75, "y": 0 },
1535- { "label": "K0B (D0,D6)", "x": 12, "y": 0 },
1536- { "label": "K0C (D0,B3)", "x": 13.5, "y": 0 },
1537- { "label": "K0D (D0,B2)", "x": 14.5, "y": 0 },
1538- { "label": "K0E (D0,B1)", "x": 15.5, "y": 0 },
1539- { "label": "K10 (D1,F1)", "x": 0, "y": 1.25, "w": 1.5 },
1540- { "label": "K11 (D1,F4)", "x": 1.5, "y": 1.25 },
1541- { "label": "K12 (D1,F5)", "x": 2.5, "y": 1.25 },
1542- { "label": "K13 (D1,F6)", "x": 3.5, "y": 1.25 },
1543- { "label": "K14 (D1,F7)", "x": 4.5, "y": 1.25 },
1544- { "label": "K15 (D1,C7)", "x": 5.5, "y": 1.25 },
1545- { "label": "K16 (D1,C6)", "x": 6.5, "y": 1.25 },
1546- { "label": "K17 (D1,B6)", "x": 7.5, "y": 1.25 },
1547- { "label": "K18 (D1,B5)", "x": 8.5, "y": 1.25 },
1548- { "label": "K19 (D1,B4)", "x": 9.5, "y": 1.25 },
1549- { "label": "K1A (D1,D7)", "x": 10.5, "y": 1.25 },
1550- { "label": "K1B (D1,D6)", "x": 11.5, "y": 1.25, "w": 1.5 },
1551- { "label": "K1C (D1,B3)", "x": 13.5, "y": 1.25 },
1552- { "label": "K1D (D1,B2)", "x": 14.5, "y": 1.25 },
1553- { "label": "K1E (D1,B1)", "x": 15.5, "y": 1.25 },
1554- { "label": "K20 (D2,F1)", "x": 0, "y": 2.25, "w": 1.75 },
1555- { "label": "K21 (D2,F4)", "x": 1.75, "y": 2.25 },
1556- { "label": "K22 (D2,F5)", "x": 2.75, "y": 2.25 },
1557- { "label": "K23 (D2,F6)", "x": 3.75, "y": 2.25 },
1558- { "label": "K24 (D2,F7)", "x": 4.75, "y": 2.25 },
1559- { "label": "K25 (D2,C7)", "x": 5.75, "y": 2.25 },
1560- { "label": "K26 (D2,C6)", "x": 6.75, "y": 2.25 },
1561- { "label": "K27 (D2,B6)", "x": 7.75, "y": 2.25 },
1562- { "label": "K28 (D2,B5)", "x": 8.75, "y": 2.25 },
1563- { "label": "K29 (D2,B4)", "x": 9.75, "y": 2.25 },
1564- { "label": "K2A (D2,D7)", "x": 10.75, "y": 2.25, "w": 2.25 },
1565- { "label": "K2C (D2,B3)", "x": 13.5, "y": 2.25 },
1566- { "label": "K2D (D2,B2)", "x": 14.5, "y": 2.25 },
1567- { "label": "K2E (D2,B1)", "x": 15.5, "y": 2.25 },
1568- { "label": "K30 (D3,F1)", "x": 0, "y": 3.25, "w": 2.25 },
1569- { "label": "K31 (D3,F4)", "x": 2.25, "y": 3.25 },
1570- { "label": "K32 (D3,F5)", "x": 3.25, "y": 3.25 },
1571- { "label": "K33 (D3,F6)", "x": 4.25, "y": 3.25 },
1572- { "label": "K34 (D3,F7)", "x": 5.25, "y": 3.25 },
1573- { "label": "K35 (D3,C7)", "x": 6.25, "y": 3.25 },
1574- { "label": "K36 (D3,C6)", "x": 7.25, "y": 3.25 },
1575- { "label": "K37 (D3,B6)", "x": 8.25, "y": 3.25 },
1576- { "label": "K38 (D3,B5)", "x": 9.25, "y": 3.25 },
1577- { "label": "K39 (D3,B4)", "x": 10.25, "y": 3.25, "w": 1.75 },
1578- { "label": "K3C (D3,B3)", "x": 13.5, "y": 3.25 },
1579- { "label": "K3D (D3,B2)", "x": 14.5, "y": 3.25 },
1580- { "label": "K3E (D3,B1)", "x": 15.5, "y": 3.25 },
1581- { "label": "K3B (D3,D6)", "x": 12.25, "y": 3.5 },
1582- { "label": "K40 (D5,F1)", "x": 0, "y": 4.25, "w": 1.25 },
1583- { "label": "K41 (D5,F4)", "x": 1.25, "y": 4.25, "w": 1.25 },
1584- { "label": "K42 (D5,F5)", "x": 2.5, "y": 4.25, "w": 1.25 },
1585- { "label": "K43 (D5,F6)", "x": 3.75, "y": 4.25, "w": 2.75 },
1586- { "label": "K46 (D5,C6)", "x": 6.5, "y": 4.25, "w": 2.25 },
1587- { "label": "K47 (D5,B6)", "x": 8.75, "y": 4.25 },
1588- { "label": "K48 (D5,B5)", "x": 9.75, "y": 4.25, "w": 1.25 },
1589- { "label": "K4D (D5,B2)", "x": 14.5, "y": 4.25 },
1590- { "label": "K4E (D5,B1)", "x": 15.5, "y": 4.25 },
1591- { "label": "K4A (D5,D7)", "x": 11.25, "y": 4.5 },
1592- { "label": "K4B (D5,D6)", "x": 12.25, "y": 4.5 },
1593- { "label": "K4C (D5,B3)", "x": 13.25, "y": 4.5 }
1594+ {"matrix": [0, 0], "x": 0, "y": 0},
1595+
1596+ {"matrix": [0, 1], "x": 1.25, "y": 0},
1597+ {"matrix": [0, 2], "x": 2.25, "y": 0},
1598+ {"matrix": [0, 3], "x": 3.25, "y": 0},
1599+
1600+ {"matrix": [0, 4], "x": 4.5, "y": 0},
1601+ {"matrix": [0, 5], "x": 5.5, "y": 0},
1602+ {"matrix": [0, 6], "x": 6.5, "y": 0},
1603+ {"matrix": [0, 7], "x": 7.5, "y": 0},
1604+
1605+ {"matrix": [0, 8], "x": 8.75, "y": 0},
1606+ {"matrix": [0, 9], "x": 9.75, "y": 0},
1607+ {"matrix": [0, 10], "x": 10.75, "y": 0},
1608+
1609+ {"matrix": [0, 11], "x": 12, "y": 0},
1610+
1611+ {"matrix": [0, 12], "x": 13.5, "y": 0},
1612+ {"matrix": [0, 13], "x": 14.5, "y": 0},
1613+ {"matrix": [0, 14], "x": 15.5, "y": 0},
1614+
1615+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
1616+ {"matrix": [1, 1], "x": 1.5, "y": 1.25},
1617+ {"matrix": [1, 2], "x": 2.5, "y": 1.25},
1618+ {"matrix": [1, 3], "x": 3.5, "y": 1.25},
1619+ {"matrix": [1, 4], "x": 4.5, "y": 1.25},
1620diff --git a/keyboards/ada/infinity81/infinity81.h b/keyboards/ada/infinity81/infinity81.h
1621deleted file mode 100644
1622index 199c6f36428a277235826a041e77c58b9a28b5f3..0000000000000000000000000000000000000000
1623--- a/keyboards/ada/infinity81/infinity81.h
1624+++ /dev/null
1625@@ -1,30 +0,0 @@
1626-// Copyright 2022 peepeetee (@peepeetee)
1627-// SPDX-License-Identifier: GPL-2.0-or-later
1628-
1629-#pragma once
1630-
1631-#include "quantum.h"
1632-
1633-/* This is a shortcut to help you visually see your layout.
1634- *
1635- * The first section contains all of the arguments representing the physical
1636- * layout of the board and position of the keys.
1637- *
1638- * The second converts the arguments into a two-dimensional array which
1639- * represents the switch matrix.
1640- */
1641-#define LAYOUT( \
1642- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
1643- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
1644- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
1645- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
1646- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \
1647- K500, K501, K502, K505, K510, K511, K512, K513, K514 \
1648-) { \
1649- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, KC_NO }, \
1650- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
1651- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
1652- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \
1653- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \
1654- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514 } \
1655-}
1656diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
1657index cc16b67c046ea42689d2e0629166b8c9ec98f8fa..f957a01094c43f744cab725d8c04fc098087dfa3 100644
1658--- a/keyboards/ada/infinity81/info.json
1659+++ b/keyboards/ada/infinity81/info.json
1660@@ -21,86 +21,94 @@
1661 "layouts": {
1662 "LAYOUT": {
1663 "layout": [
1664- { "label": "K00 (B3,D1)", "x": 0, "y": 0 },
1665- { "label": "K01 (B3,D2)", "x": 1.25, "y": 0 },
1666- { "label": "K02 (B3,D3)", "x": 2.25, "y": 0 },
1667- { "label": "K03 (B3,D5)", "x": 3.25, "y": 0 },
1668- { "label": "K04 (B3,D4)", "x": 4.25, "y": 0 },
1669- { "label": "K05 (B3,D6)", "x": 5.5, "y": 0 },
1670- { "label": "K06 (B3,D7)", "x": 6.5, "y": 0 },
1671- { "label": "K07 (B3,B4)", "x": 7.5, "y": 0 },
1672- { "label": "K08 (B3,B5)", "x": 8.5, "y": 0 },
1673- { "label": "K09 (B3,B6)", "x": 9.75, "y": 0 },
1674- { "label": "K0A (B3,C6)", "x": 10.75, "y": 0 },
1675- { "label": "K0B (B3,C7)", "x": 11.75, "y": 0 },
1676- { "label": "K0C (B3,F5)", "x": 12.75, "y": 0 },
1677- { "label": "K10 (B2,D1)", "x": 0, "y": 1.25 },
1678- { "label": "K11 (B2,D2)", "x": 1, "y": 1.25 },
1679- { "label": "K12 (B2,D3)", "x": 2, "y": 1.25 },
1680- { "label": "K13 (B2,D5)", "x": 3, "y": 1.25 },
1681- { "label": "K14 (B2,D4)", "x": 4, "y": 1.25 },
1682- { "label": "K15 (B2,D6)", "x": 5, "y": 1.25 },
1683- { "label": "K16 (B2,D7)", "x": 6, "y": 1.25 },
1684- { "label": "K17 (B2,B4)", "x": 7, "y": 1.25 },
1685- { "label": "K18 (B2,B5)", "x": 8, "y": 1.25 },
1686- { "label": "K19 (B2,B6)", "x": 9, "y": 1.25 },
1687- { "label": "K1A (B2,C6)", "x": 10, "y": 1.25 },
1688- { "label": "K1B (B2,C7)", "x": 11, "y": 1.25 },
1689- { "label": "K1C (B2,F5)", "x": 12, "y": 1.25 },
1690- { "label": "K1D (B2,F1)", "x": 13, "y": 1.25, "w": 2 },
1691- { "label": "K1E (B2,F4)", "x": 15, "y": 1.25 },
1692- { "label": "K20 (B1,D1)", "x": 0, "y": 2.25, "w": 1.5 },
1693- { "label": "K21 (B1,D2)", "x": 1.5, "y": 2.25 },
1694- { "label": "K22 (B1,D3)", "x": 2.5, "y": 2.25 },
1695- { "label": "K23 (B1,D5)", "x": 3.5, "y": 2.25 },
1696- { "label": "K24 (B1,D4)", "x": 4.5, "y": 2.25 },
1697- { "label": "K25 (B1,D6)", "x": 5.5, "y": 2.25 },
1698- { "label": "K26 (B1,D7)", "x": 6.5, "y": 2.25 },
1699- { "label": "K27 (B1,B4)", "x": 7.5, "y": 2.25 },
1700- { "label": "K28 (B1,B5)", "x": 8.5, "y": 2.25 },
1701- { "label": "K29 (B1,B6)", "x": 9.5, "y": 2.25 },
1702- { "label": "K2A (B1,C6)", "x": 10.5, "y": 2.25 },
1703- { "label": "K2B (B1,C7)", "x": 11.5, "y": 2.25 },
1704- { "label": "K2C (B1,F5)", "x": 12.5, "y": 2.25 },
1705- { "label": "K2D (B1,F1)", "x": 13.5, "y": 2.25, "w": 1.5 },
1706- { "label": "K2E (B1,F4)", "x": 15, "y": 2.25 },
1707- { "label": "K30 (B0,D1)", "x": 0, "y": 3.25, "w": 1.75 },
1708- { "label": "K31 (B0,D2)", "x": 1.75, "y": 3.25 },
1709- { "label": "K32 (B0,D3)", "x": 2.75, "y": 3.25 },
1710- { "label": "K33 (B0,D5)", "x": 3.75, "y": 3.25 },
1711- { "label": "K34 (B0,D4)", "x": 4.75, "y": 3.25 },
1712- { "label": "K35 (B0,D6)", "x": 5.75, "y": 3.25 },
1713- { "label": "K36 (B0,D7)", "x": 6.75, "y": 3.25 },
1714- { "label": "K37 (B0,B4)", "x": 7.75, "y": 3.25 },
1715- { "label": "K38 (B0,B5)", "x": 8.75, "y": 3.25 },
1716- { "label": "K39 (B0,B6)", "x": 9.75, "y": 3.25 },
1717- { "label": "K3A (B0,C6)", "x": 10.75, "y": 3.25 },
1718- { "label": "K3B (B0,C7)", "x": 11.75, "y": 3.25 },
1719- { "label": "K3D (B0,F1)", "x": 12.75, "y": 3.25, "w": 2.25 },
1720- { "label": "K3E (B0,F4)", "x": 15, "y": 3.25 },
1721- { "label": "K40 (F6,D1)", "x": 0, "y": 4.25, "w": 2.25 },
1722- { "label": "K41 (F6,D2)", "x": 2.25, "y": 4.25 },
1723- { "label": "K42 (F6,D3)", "x": 3.25, "y": 4.25 },
1724- { "label": "K43 (F6,D5)", "x": 4.25, "y": 4.25 },
1725- { "label": "K44 (F6,D4)", "x": 5.25, "y": 4.25 },
1726- { "label": "K45 (F6,D6)", "x": 6.25, "y": 4.25 },
1727- { "label": "K46 (F6,D7)", "x": 7.25, "y": 4.25 },
1728- { "label": "K47 (F6,B4)", "x": 8.25, "y": 4.25 },
1729- { "label": "K48 (F6,B5)", "x": 9.25, "y": 4.25 },
1730- { "label": "K49 (F6,B6)", "x": 10.25, "y": 4.25 },
1731- { "label": "K4A (F6,C6)", "x": 11.25, "y": 4.25 },
1732- { "label": "K4B (F6,C7)", "x": 12.25, "y": 4.25, "w": 1.75 },
1733- { "label": "K4D (F6,F1)", "x": 14, "y": 4.25 },
1734- { "label": "K4E (F6,F4)", "x": 15, "y": 4.25 },
1735- { "label": "K50 (B7,D1)", "x": 0, "y": 5.25, "w": 1.25 },
1736- { "label": "K51 (B7,D2)", "x": 1.25, "y": 5.25, "w": 1.25 },
1737- { "label": "K52 (B7,D3)", "x": 2.5, "y": 5.25, "w": 1.25 },
1738- { "label": "K55 (B7,D6)", "x": 3.75, "y": 5.25, "w": 6.25 },
1739- { "label": "K5A (B7,C6)", "x": 10, "y": 5.25, "w": 1.25 },
1740- { "label": "K5B (B7,C7)", "x": 11.25, "y": 5.25, "w": 1.25 },
1741- { "label": "K5C (B7,F5)", "x": 13, "y": 5.25 },
1742- { "label": "K5D (B7,F1)", "x": 14, "y": 5.25 },
1743- { "label": "K5E (B7,F4)", "x": 15, "y": 5.25 }
1744+ {"matrix": [0, 0], "x": 0, "y": 0},
1745+
1746+ {"matrix": [0, 1], "x": 1.25, "y": 0},
1747+ {"matrix": [0, 2], "x": 2.25, "y": 0},
1748+ {"matrix": [0, 3], "x": 3.25, "y": 0},
1749+ {"matrix": [0, 4], "x": 4.25, "y": 0},
1750+
1751+ {"matrix": [0, 5], "x": 5.5, "y": 0},
1752+ {"matrix": [0, 6], "x": 6.5, "y": 0},
1753+ {"matrix": [0, 7], "x": 7.5, "y": 0},
1754+ {"matrix": [0, 8], "x": 8.5, "y": 0},
1755+
1756+ {"matrix": [0, 9], "x": 9.75, "y": 0},
1757+ {"matrix": [0, 10], "x": 10.75, "y": 0},
1758+ {"matrix": [0, 11], "x": 11.75, "y": 0},
1759+ {"matrix": [0, 12], "x": 12.75, "y": 0},
1760diff --git a/keyboards/adelheid/adelheid.h b/keyboards/adelheid/adelheid.h
1761deleted file mode 100644
1762index 48d315f30f7bfc5585e42162d7e6fb5f15ecf006..0000000000000000000000000000000000000000
1763--- a/keyboards/adelheid/adelheid.h
1764+++ /dev/null
1765@@ -1,45 +0,0 @@
1766-/* Copyright 2020 floookay
1767- *
1768- * This program is free software: you can redistribute it and/or modify
1769- * it under the terms of the GNU General Public License as published by
1770- * the Free Software Foundation, either version 2 of the License, or
1771- * (at your option) any later version.
1772- *
1773- * This program is distributed in the hope that it will be useful,
1774- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1775- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1776- * GNU General Public License for more details.
1777- *
1778- * You should have received a copy of the GNU General Public License
1779- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1780- */
1781-#pragma once
1782-
1783-#include "quantum.h"
1784-
1785-/* This a shortcut to help you visually see your layout.
1786- *
1787- * The first section contains all of the arguments representing the physical
1788- * layout of the board and position of the keys.
1789- *
1790- * The second converts the arguments into a two-dimensional array which
1791- * represents the switch matrix.
1792- */
1793-#define LAYOUT( \
1794- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
1795- \
1796- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k2E, \
1797- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
1798- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k4E, \
1799- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \
1800- k50, k52, k54, k55, k57, k59, k5C, k5D, k5E \
1801-) \
1802-{ \
1803- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
1804- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
1805- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
1806- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
1807- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E }, \
1808- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, k4E }, \
1809- { k50, KC_NO, k52, KC_NO, k54, k55, KC_NO, k57, KC_NO, k59, KC_NO, KC_NO, k5C, k5D, k5E } \
1810-}
1811diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json
1812index c323d62a7503e8092043a6a1dc199d2a96221373..fa203432c1234508c57ea4768f2bf1e65bbb1778 100644
1813--- a/keyboards/adelheid/info.json
1814+++ b/keyboards/adelheid/info.json
1815@@ -21,93 +21,98 @@
1816 "layouts": {
1817 "LAYOUT": {
1818 "layout": [
1819- { "label": "k00", "x": 0, "y": 0 },
1820- { "label": "k01", "x": 1.25, "y": 0 },
1821- { "label": "k02", "x": 2.25, "y": 0 },
1822- { "label": "k03", "x": 3.5, "y": 0 },
1823- { "label": "k04", "x": 4.5, "y": 0 },
1824- { "label": "k05", "x": 5.75, "y": 0 },
1825- { "label": "k06", "x": 6.75, "y": 0 },
1826- { "label": "k07", "x": 9.75, "y": 0 },
1827- { "label": "k08", "x": 10.75, "y": 0 },
1828- { "label": "k09", "x": 12, "y": 0 },
1829- { "label": "k0A", "x": 13, "y": 0 },
1830- { "label": "k0B", "x": 14.25, "y": 0 },
1831- { "label": "k0C", "x": 15.25, "y": 0 },
1832- { "label": "k0D", "x": 16.5, "y": 0 },
1833- { "label": "k0E", "x": 17.75, "y": 0 },
1834+ {"matrix": [0, 0], "x": 0, "y": 0},
1835+ {"matrix": [0, 1], "x": 1.25, "y": 0},
1836+ {"matrix": [0, 2], "x": 2.25, "y": 0},
1837+ {"matrix": [0, 3], "x": 3.5, "y": 0},
1838+ {"matrix": [0, 4], "x": 4.5, "y": 0},
1839+ {"matrix": [0, 5], "x": 5.75, "y": 0},
1840+ {"matrix": [0, 6], "x": 6.75, "y": 0},
1841+ {"matrix": [0, 7], "x": 9.75, "y": 0},
1842+ {"matrix": [0, 8], "x": 10.75, "y": 0},
1843+ {"matrix": [0, 9], "x": 12, "y": 0},
1844+ {"matrix": [0, 10], "x": 13, "y": 0},
1845+ {"matrix": [0, 11], "x": 14.25, "y": 0},
1846+ {"matrix": [0, 12], "x": 15.25, "y": 0},
1847+ {"matrix": [0, 13], "x": 16.5, "y": 0},
1848+ {"matrix": [0, 14], "x": 17.75, "y": 0},
1849
1850- { "label": "k10", "x": 0.75, "y": 1.25 },
1851- { "label": "k11", "x": 1.75, "y": 1.25 },
1852- { "label": "k12", "x": 2.75, "y": 1.25 },
1853- { "label": "k13", "x": 4, "y": 1.25 },
1854- { "label": "k14", "x": 5, "y": 1.25 },
1855- { "label": "k15", "x": 6, "y": 1.25 },
1856- { "label": "k16", "x": 7, "y": 1.25 },
1857- { "label": "k17", "x": 9.5, "y": 1.25 },
1858- { "label": "k18", "x": 10.5, "y": 1.25 },
1859- { "label": "k19", "x": 11.5, "y": 1.25 },
1860- { "label": "k1A", "x": 12.5, "y": 1.25 },
1861- { "label": "k1B", "x": 13.75, "y": 1.25 },
1862- { "label": "k1C", "x": 14.75, "y": 1.25 },
1863- { "label": "k1D", "x": 15.75, "y": 1.25 },
1864- { "label": "k1E", "x": 16.75, "y": 1.25 },
1865- { "label": "k2E", "x": 18, "y": 1 },
1866+ {"matrix": [2, 0], "x": 0.75, "y": 1.25},
1867+ {"matrix": [2, 1], "x": 1.75, "y": 1.25},
1868+ {"matrix": [2, 2], "x": 2.75, "y": 1.25},
1869+ {"matrix": [2, 3], "x": 4, "y": 1.25},
1870+ {"matrix": [2, 4], "x": 5, "y": 1.25},
1871+ {"matrix": [2, 5], "x": 6, "y": 1.25},
1872+ {"matrix": [2, 6], "x": 7, "y": 1.25},
1873+ {"matrix": [2, 7], "x": 9.5, "y": 1.25},
1874+ {"matrix": [2, 8], "x": 10.5, "y": 1.25},
1875+ {"matrix": [2, 9], "x": 11.5, "y": 1.25},
1876+ {"matrix": [2, 10], "x": 12.5, "y": 1.25},
1877+ {"matrix": [2, 11], "x": 13.75, "y": 1.25},
1878+ {"matrix": [2, 12], "x": 14.75, "y": 1.25},
1879+ {"matrix": [2, 13], "x": 15.75, "y": 1.25},
1880+ {"matrix": [2, 14], "x": 16.75, "y": 1.25},
1881
1882- { "label": "k20", "x": 0.5, "y": 2.25, "w": 1.5 },
1883- { "label": "k21", "x": 2, "y": 2.25 },
1884- { "label": "k22", "x": 3.5, "y": 2.25 },
1885- { "label": "k23", "x": 4.5, "y": 2.25 },
1886- { "label": "k24", "x": 5.5, "y": 2.25 },
1887- { "label": "k25", "x": 6.5, "y": 2.25 },
1888- { "label": "k26", "x": 9, "y": 2.25 },
1889- { "label": "k27", "x": 10, "y": 2.25 },
1890- { "label": "k28", "x": 11, "y": 2.25 },
1891- { "label": "k29", "x": 12, "y": 2.25 },
1892- { "label": "k2A", "x": 13, "y": 2.25 },
1893- { "label": "k2B", "x": 14.5, "y": 2.25 },
1894- { "label": "k2C", "x": 15.5, "y": 2.25 },
1895- { "label": "k2D", "x": 16.5, "y": 2.25, "w": 1.5 },
1896- { "label": "k3E", "x": 18.25, "y": 2 },
1897+ {"matrix": [3, 14], "x": 18, "y": 1},
1898
1899- { "label": "k30", "x": 0.25, "y": 3.25, "w": 1.75 },
1900- { "label": "k31", "x": 2, "y": 3.25 },
1901- { "label": "k32", "x": 3.75, "y": 3.25 },
1902- { "label": "k33", "x": 4.75, "y": 3.25 },
1903- { "label": "k34", "x": 5.75, "y": 3.25 },
1904- { "label": "k35", "x": 6.75, "y": 3.25 },
1905- { "label": "k36", "x": 9.25, "y": 3.25 },
1906- { "label": "k37", "x": 10.25, "y": 3.25 },
1907- { "label": "k38", "x": 11.25, "y": 3.25 },
1908- { "label": "k39", "x": 12.25, "y": 3.25 },
1909- { "label": "k3A", "x": 14, "y": 3.25 },
1910- { "label": "k3B", "x": 15, "y": 3.25 },
1911- { "label": "k3C", "x": 16, "y": 3.25, "w": 2.25 },
1912- { "label": "k4E", "x": 18.5, "y": 3 },
1913+ {"matrix": [3, 0], "x": 0.5, "y": 2.25, "w": 1.5},
1914+ {"matrix": [3, 1], "x": 2, "y": 2.25},
1915diff --git a/keyboards/adm42/adm42.h b/keyboards/adm42/adm42.h
1916deleted file mode 100644
1917index 536fb51da510ffa7244f670a3e4f741b306d863f..0000000000000000000000000000000000000000
1918--- a/keyboards/adm42/adm42.h
1919+++ /dev/null
1920@@ -1,31 +0,0 @@
1921-/* Copyright 2020-2022 Lorenzo Leonini
1922- * SPDX-License-Identifier: GPL-2.0-only
1923- *
1924- * This program is free software: you can redistribute it and/or modify
1925- * it under the terms of the GNU General Public License version 2 as
1926- * published by the Free Software Foundation.
1927- *
1928- * This program is distributed in the hope that it will be useful,
1929- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1930- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1931- * GNU General Public License for more details.
1932- *
1933- * You should have received a copy of the GNU General Public License
1934- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1935- */
1936-
1937-#pragma once
1938-
1939-#include "quantum.h"
1940-
1941-#define LAYOUT( \
1942- K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
1943- K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
1944- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
1945- K404, K405, K406, K407, K408, K409 \
1946-) { \
1947- { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \
1948- { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \
1949- { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \
1950- { KC_NO, KC_NO, KC_NO, K404, K405, K407, K406, K408, K409, KC_NO, KC_NO, KC_NO } \
1951-}
1952diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
1953index 3fc07a2c1c5ebb9fd9c5db330a7fd9dd171e2d8f..0ffebff135ab93454dca966c9559274149ae8869 100644
1954--- a/keyboards/adm42/info.json
1955+++ b/keyboards/adm42/info.json
1956@@ -28,51 +28,55 @@
1957 "layouts": {
1958 "LAYOUT": {
1959 "layout": [
1960- {"label":"GUI/`~", "x":0, "y":0.8},
1961- {"label":"Q", "x":1, "y":0.8},
1962- {"label":"W", "x":2, "y":0},
1963- {"label":"E", "x":3, "y":0},
1964- {"label":"R", "x":4, "y":0.5},
1965- {"label":"T", "x":5, "y":0.5},
1966- {"label":"Y", "x":7.5, "y":0.5},
1967- {"label":"U", "x":8.5, "y":0.5},
1968- {"label":"I", "x":9.5, "y":0},
1969- {"label":"O", "x":10.5, "y":0},
1970- {"label":"P", "x":11.5, "y":0.8},
1971- {"label":"GUI/=+", "x":12.5, "y":0.8},
1972+ {"matrix": [0, 0], "x": 0, "y": 0.8},
1973+ {"matrix": [0, 1], "x": 1, "y": 0.8},
1974+ {"matrix": [0, 2], "x": 2, "y": 0},
1975+ {"matrix": [0, 3], "x": 3, "y": 0},
1976+ {"matrix": [0, 4], "x": 4, "y": 0.5},
1977+ {"matrix": [0, 5], "x": 5, "y": 0.5},
1978
1979- {"label":"Ctrl/Tab", "x":0, "y":1.8},
1980- {"label":"A", "x":1, "y":1.8},
1981- {"label":"S", "x":2, "y":1},
1982- {"label":"D", "x":3, "y":1},
1983- {"label":"F", "x":4, "y":1.5},
1984- {"label":"G", "x":5, "y":1.5},
1985- {"label":"H", "x":7.5, "y":1.5},
1986- {"label":"J", "x":8.5, "y":1.5},
1987- {"label":"K", "x":9.5, "y":1},
1988- {"label":"L", "x":10.5, "y":1},
1989- {"label":";:", "x":11.5, "y":1.8},
1990- {"label":"Ctrl/'\"", "x":12.5, "y":1.8},
1991+ {"matrix": [0, 6], "x": 7.5, "y": 0.5},
1992+ {"matrix": [0, 7], "x": 8.5, "y": 0.5},
1993+ {"matrix": [0, 8], "x": 9.5, "y": 0},
1994+ {"matrix": [0, 9], "x": 10.5, "y": 0},
1995+ {"matrix": [0, 10], "x": 11.5, "y": 0.8},
1996+ {"matrix": [0, 11], "x": 12.5, "y": 0.8},
1997
1998- {"label":"Alt", "x":0, "y":2.8},
1999- {"label":"Z", "x":1, "y":2.8},
2000- {"label":"X", "x":2, "y":2},
2001- {"label":"C", "x":3, "y":2},
2002- {"label":"V", "x":4, "y":2.5},
2003- {"label":"B", "x":5, "y":2.5},
2004- {"label":"N", "x":7.5, "y":2.5},
2005- {"label":"M", "x":8.5, "y":2.5},
2006- {"label":",<", "x":9.5, "y":2},
2007- {"label":".>", "x":10.5, "y":2},
2008- {"label":"/?", "x":11.5, "y":2.8},
2009- {"label":"Alt", "x":12.5, "y":2.8},
2010+ {"matrix": [1, 0], "x": 0, "y": 1.8},
2011+ {"matrix": [1, 1], "x": 1, "y": 1.8},
2012+ {"matrix": [1, 2], "x": 2, "y": 1},
2013+ {"matrix": [1, 3], "x": 3, "y": 1},
2014+ {"matrix": [1, 4], "x": 4, "y": 1.5},
2015+ {"matrix": [1, 5], "x": 5, "y": 1.5},
2016
2017- {"label":"Special/Esc", "x":4.25, "y":3.55},
2018- {"label":"Shift/Backspace", "x":5.25, "y":3.65},
2019- {"label":"Adm/Delete", "x":6.25, "y":1.875, "h":1.25},
2020- {"label":"Extra/Enter", "x":6.25, "y":4.05},
2021- {"label":"Shift/Space", "x":7.25, "y":3.65},
2022- {"label":"Special/Alt", "x":8.25, "y":3.55}
2023+ {"matrix": [1, 6], "x": 7.5, "y": 1.5},
2024+ {"matrix": [1, 7], "x": 8.5, "y": 1.5},
2025+ {"matrix": [1, 8], "x": 9.5, "y": 1},
2026+ {"matrix": [1, 9], "x": 10.5, "y": 1},
2027+ {"matrix": [1, 10], "x": 11.5, "y": 1.8},
2028+ {"matrix": [1, 11], "x": 12.5, "y": 1.8},
2029+
2030+ {"matrix": [2, 0], "x": 0, "y": 2.8},
2031+ {"matrix": [2, 1], "x": 1, "y": 2.8},
2032+ {"matrix": [2, 2], "x": 2, "y": 2},
2033+ {"matrix": [2, 3], "x": 3, "y": 2},
2034+ {"matrix": [2, 4], "x": 4, "y": 2.5},
2035+ {"matrix": [2, 5], "x": 5, "y": 2.5},
2036+
2037+ {"matrix": [2, 6], "x": 7.5, "y": 2.5},
2038+ {"matrix": [2, 7], "x": 8.5, "y": 2.5},
2039+ {"matrix": [2, 8], "x": 9.5, "y": 2},
2040+ {"matrix": [2, 9], "x": 10.5, "y": 2},
2041+ {"matrix": [2, 10], "x": 11.5, "y": 2.8},
2042+ {"matrix": [2, 11], "x": 12.5, "y": 2.8},
2043+
2044+ {"matrix": [3, 3], "x": 4.25, "y": 3.55},
2045+ {"matrix": [3, 4], "x": 5.25, "y": 3.65},
2046+ {"matrix": [3, 6], "x": 6.25, "y": 1.875, "h": 1.25},
2047+
2048+ {"matrix": [3, 5], "x": 6.25, "y": 4.05},
2049+ {"matrix": [3, 7], "x": 7.25, "y": 3.65},
2050+ {"matrix": [3, 8], "x": 8.25, "y": 3.55}
2051 ]
2052 }
2053 }
2054diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
2055index 1014362503c7eb13f87274c4e9d4773ae4a645bd..3daf3326acd7c8a8ad03704ebc0e27ef0b20b7d4 100644
2056--- a/keyboards/adpenrose/kintsugi/info.json
2057+++ b/keyboards/adpenrose/kintsugi/info.json
2058@@ -26,75 +26,75 @@
2059 "layouts": {
2060 "LAYOUT": {
2061 "layout": [
2062- {"label":"Esc", "x":0, "y":0},
2063- {"label":"1", "x":1, "y":0},
2064- {"label":"2", "x":2, "y":0},
2065- {"label":"3", "x":3, "y":0},
2066- {"label":"4", "x":4, "y":0},
2067- {"label":"5", "x":5, "y":0},
2068- {"label":"6", "x":6, "y":0},
2069- {"label":"7", "x":7, "y":0},
2070- {"label":"8", "x":8, "y":0},
2071- {"label":"9", "x":9, "y":0},
2072- {"label":"0", "x":10, "y":0},
2073- {"label":"-", "x":11, "y":0},
2074- {"label":"=", "x":12, "y":0},
2075- {"label":"Backspace", "x":13, "y":0, "w":2},
2076+ {"matrix": [0, 0], "x": 0, "y": 0},
2077+ {"matrix": [0, 1], "x": 1, "y": 0},
2078+ {"matrix": [0, 2], "x": 2, "y": 0},
2079+ {"matrix": [0, 3], "x": 3, "y": 0},
2080+ {"matrix": [0, 4], "x": 4, "y": 0},
2081+ {"matrix": [0, 5], "x": 5, "y": 0},
2082+ {"matrix": [0, 6], "x": 6, "y": 0},
2083+ {"matrix": [5, 0], "x": 7, "y": 0},
2084+ {"matrix": [5, 1], "x": 8, "y": 0},
2085+ {"matrix": [5, 2], "x": 9, "y": 0},
2086+ {"matrix": [5, 3], "x": 10, "y": 0},
2087+ {"matrix": [5, 4], "x": 11, "y": 0},
2088+ {"matrix": [5, 5], "x": 12, "y": 0},
2089+ {"matrix": [5, 6], "x": 13, "y": 0, "w": 2},
2090
2091- {"label":"Tab", "x":0, "y":1, "w":1.5},
2092- {"label":"Q", "x":1.5, "y":1},
2093- {"label":"W", "x":2.5, "y":1},
2094- {"label":"E", "x":3.5, "y":1},
2095- {"label":"R", "x":4.5, "y":1},
2096- {"label":"T", "x":5.5, "y":1},
2097- {"label":"Y", "x":6.5, "y":1},
2098- {"label":"U", "x":7.5, "y":1},
2099- {"label":"I", "x":8.5, "y":1},
2100- {"label":"O", "x":9.5, "y":1},
2101- {"label":"P", "x":10.5, "y":1},
2102- {"label":"[", "x":11.5, "y":1},
2103- {"label":"]", "x":12.5, "y":1},
2104- {"label":"\\", "x":13.5, "y":1, "w":1.5},
2105+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
2106+ {"matrix": [1, 1], "x": 1.5, "y": 1},
2107+ {"matrix": [1, 2], "x": 2.5, "y": 1},
2108+ {"matrix": [1, 3], "x": 3.5, "y": 1},
2109+ {"matrix": [1, 4], "x": 4.5, "y": 1},
2110+ {"matrix": [1, 5], "x": 5.5, "y": 1},
2111+ {"matrix": [1, 6], "x": 6.5, "y": 1},
2112+ {"matrix": [6, 0], "x": 7.5, "y": 1},
2113+ {"matrix": [6, 1], "x": 8.5, "y": 1},
2114+ {"matrix": [6, 2], "x": 9.5, "y": 1},
2115+ {"matrix": [6, 3], "x": 10.5, "y": 1},
2116+ {"matrix": [6, 4], "x": 11.5, "y": 1},
2117+ {"matrix": [6, 5], "x": 12.5, "y": 1},
2118+ {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
2119
2120- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
2121- {"label":"A", "x":1.75, "y":2},
2122- {"label":"S", "x":2.75, "y":2},
2123- {"label":"D", "x":3.75, "y":2},
2124- {"label":"F", "x":4.75, "y":2},
2125- {"label":"G", "x":5.75, "y":2},
2126- {"label":"H", "x":6.75, "y":2},
2127- {"label":"J", "x":7.75, "y":2},
2128- {"label":"K", "x":8.75, "y":2},
2129- {"label":"L", "x":9.75, "y":2},
2130- {"label":";", "x":10.75, "y":2},
2131- {"label":"'", "x":11.75, "y":2},
2132- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
2133- {"label":"Enc", "x":15, "y":2},
2134+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
2135+ {"matrix": [2, 1], "x": 1.75, "y": 2},
2136+ {"matrix": [2, 2], "x": 2.75, "y": 2},
2137+ {"matrix": [2, 3], "x": 3.75, "y": 2},
2138+ {"matrix": [2, 4], "x": 4.75, "y": 2},
2139+ {"matrix": [2, 5], "x": 5.75, "y": 2},
2140+ {"matrix": [2, 6], "x": 6.75, "y": 2},
2141+ {"matrix": [7, 0], "x": 7.75, "y": 2},
2142+ {"matrix": [7, 1], "x": 8.75, "y": 2},
2143+ {"matrix": [7, 2], "x": 9.75, "y": 2},
2144+ {"matrix": [7, 3], "x": 10.75, "y": 2},
2145+ {"matrix": [7, 4], "x": 11.75, "y": 2},
2146+ {"matrix": [7, 5], "x": 12.75, "y": 2, "w": 2.25},
2147+ {"matrix": [7, 6], "x": 15, "y": 2},
2148
2149- {"label":"LShift", "x":0, "y":3, "w":2.25},
2150- {"label":"Z", "x":2.25, "y":3},
2151- {"label":"X", "x":3.25, "y":3},
2152- {"label":"C", "x":4.25, "y":3},
2153- {"label":"V", "x":5.25, "y":3},
2154- {"label":"B", "x":6.25, "y":3},
2155- {"label":"N", "x":7.25, "y":3},
2156- {"label":"M", "x":8.25, "y":3},
2157- {"label":",", "x":9.25, "y":3},
2158diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c
2159index 59e7d79b55f618ef1cc2237fb9109854b210d91d..0fd26d317e2fb77328a1812816605cbe046f64e5 100644
2160--- a/keyboards/adpenrose/kintsugi/kintsugi.c
2161+++ b/keyboards/adpenrose/kintsugi/kintsugi.c
2162@@ -14,7 +14,7 @@
2163 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2164 */
2165
2166-#include "kintsugi.h"
2167+#include "quantum.h"
2168
2169 #ifdef OLED_ENABLE
2170 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
2171diff --git a/keyboards/adpenrose/kintsugi/kintsugi.h b/keyboards/adpenrose/kintsugi/kintsugi.h
2172deleted file mode 100644
2173index 728ef72d0a0c4e168d139733cd2e89565f2d1fdd..0000000000000000000000000000000000000000
2174--- a/keyboards/adpenrose/kintsugi/kintsugi.h
2175+++ /dev/null
2176@@ -1,46 +0,0 @@
2177-/* Copyright 2022 adpenrose
2178- *
2179- * This program is free software: you can redistribute it and/or modify
2180- * it under the terms of the GNU General Public License as published by
2181- * the Free Software Foundation, either version 2 of the License, or
2182- * (at your option) any later version.
2183- *
2184- * This program is distributed in the hope that it will be useful,
2185- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2186- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2187- * GNU General Public License for more details.
2188- *
2189- * You should have received a copy of the GNU General Public License
2190- * along with this program. If not, see <http://www.gnu.org/licenses/>.
2191- */
2192-
2193-#pragma once
2194-
2195-#include "quantum.h"
2196-
2197-/* This is a shortcut to help you visually see your layout.
2198- *
2199- * The first section contains all of the arguments representing the physical
2200- * layout of the board and position of the keys.
2201- *
2202- * The second converts the arguments into a two-dimensional array which
2203- * represents the switch matrix.
2204- */
2205-#define LAYOUT( \
2206- K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, \
2207- K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, \
2208- K20, K21, K22, K23, K24, K25, K26, K70, K71, K72, K73, K74, K75, K76, \
2209- K30, K31, K32, K33, K34, K35, K36, K80, K81, K82, K83, K84, K85, K86, \
2210- K40, K41, K42, K46, K92, K93, K94, K95, K96 \
2211-) { \
2212- { K00, K01, K02, K03, K04, K05, K06 }, \
2213- { K10, K11, K12, K13, K14, K15, K16 }, \
2214- { K20, K21, K22, K23, K24, K25, K26 }, \
2215- { K30, K31, K32, K33, K34, K35, K36 }, \
2216- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46 }, \
2217- { K50, K51, K52, K53, K54, K55, K56 }, \
2218- { K60, K61, K62, K63, K64, K65, K66 }, \
2219- { K70, K71, K72, K73, K74, K75, K76 }, \
2220- { K80, K81, K82, K83, K84, K85, K86 }, \
2221- { KC_NO, KC_NO, K92, K93, K94, K95, K96 } \
2222-}
2223diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
2224index 5d3ebbe5cad8c56c826bb11596a568482d9adef7..0afb37957fea02e785c91d2ac066758b62decb49 100644
2225--- a/keyboards/afternoonlabs/breeze/rev0/info.json
2226+++ b/keyboards/afternoonlabs/breeze/rev0/info.json
2227@@ -24,76 +24,85 @@
2228 "layouts": {
2229 "LAYOUT": {
2230 "layout": [
2231- {"x":0, "y":0.375},
2232- {"x":1, "y":0.375},
2233- {"x":2, "y":0.125},
2234- {"x":3, "y":0},
2235- {"x":4, "y":0.125},
2236- {"x":5, "y":0.25},
2237- {"x":9.75, "y":0.25},
2238- {"x":10.75, "y":0.125},
2239- {"x":11.75, "y":0},
2240- {"x":12.75, "y":0.125},
2241- {"x":13.75, "y":0.375},
2242- {"x":14.75, "y":0.375},
2243- {"x":16, "y":0.375},
2244- {"x":17, "y":0.375},
2245- {"x":18, "y":0.375},
2246+ {"matrix": [0, 5], "x": 0, "y": 0.375},
2247+ {"matrix": [0, 4], "x": 1, "y": 0.375},
2248+ {"matrix": [0, 3], "x": 2, "y": 0.125},
2249+ {"matrix": [0, 2], "x": 3, "y": 0},
2250+ {"matrix": [0, 1], "x": 4, "y": 0.125},
2251+ {"matrix": [0, 0], "x": 5, "y": 0.25},
2252
2253- {"x":0, "y":1.375},
2254- {"x":1, "y":1.375},
2255- {"x":2, "y":1.125},
2256- {"x":3, "y":1},
2257- {"x":4, "y":1.125},
2258- {"x":5, "y":1.25},
2259- {"x":9.75, "y":1.25},
2260- {"x":10.75, "y":1.125},
2261- {"x":11.75, "y":1},
2262- {"x":12.75, "y":1.125},
2263- {"x":13.75, "y":1.375},
2264- {"x":14.75, "y":1.375},
2265- {"x":16, "y":1.375},
2266- {"x":17, "y":1.375},
2267- {"x":18, "y":1.375},
2268+ {"matrix": [5, 0], "x": 9.75, "y": 0.25},
2269+ {"matrix": [5, 1], "x": 10.75, "y": 0.125},
2270+ {"matrix": [5, 2], "x": 11.75, "y": 0},
2271+ {"matrix": [5, 3], "x": 12.75, "y": 0.125},
2272+ {"matrix": [5, 4], "x": 13.75, "y": 0.375},
2273+ {"matrix": [5, 5], "x": 14.75, "y": 0.375},
2274
2275- {"x":0, "y":2.375},
2276- {"x":1, "y":2.375},
2277- {"x":2, "y":2.125},
2278- {"x":3, "y":2},
2279- {"x":4, "y":2.125},
2280- {"x":5, "y":2.25},
2281- {"x":9.75, "y":2.25},
2282- {"x":10.75, "y":2.125},
2283- {"x":11.75, "y":2},
2284- {"x":12.75, "y":2.125},
2285- {"x":13.75, "y":2.375},
2286- {"x":14.75, "y":2.375},
2287- {"x":17, "y":2.375},
2288+ {"matrix": [5, 6], "x": 16, "y": 0.375},
2289+ {"matrix": [5, 7], "x": 17, "y": 0.375},
2290+ {"matrix": [5, 8], "x": 18, "y": 0.375},
2291
2292- {"x":0, "y":3.375},
2293- {"x":1, "y":3.375},
2294- {"x":2, "y":3.125},
2295- {"x":3, "y":3},
2296- {"x":4, "y":3.125},
2297- {"x":5, "y":3.25},
2298- {"x":9.75, "y":3.25},
2299- {"x":10.75, "y":3.125},
2300- {"x":11.75, "y":3},
2301- {"x":12.75, "y":3.125},
2302- {"x":13.75, "y":3.375},
2303- {"x":14.75, "y":3.375},
2304- {"x":16, "y":3.375},
2305- {"x":17, "y":3.375},
2306- {"x":18, "y":3.375},
2307+ {"matrix": [1, 5], "x": 0, "y": 1.375},
2308+ {"matrix": [1, 4], "x": 1, "y": 1.375},
2309+ {"matrix": [1, 3], "x": 2, "y": 1.125},
2310+ {"matrix": [1, 2], "x": 3, "y": 1},
2311+ {"matrix": [1, 1], "x": 4, "y": 1.125},
2312+ {"matrix": [1, 0], "x": 5, "y": 1.25},
2313
2314- {"x":2.5, "y":4.25},
2315- {"x":3.5, "y":4.25},
2316- {"x":4.5, "y":4.5},
2317- {"x":6.25, "y":3.75, "h":2, "r":30},
2318- {"x":8.5, "y":3.75, "h":2, "r":-30},
2319- {"x":10.25, "y":4.5},
2320- {"x":11.25, "y":4.25},
2321- {"x":12.25, "y":4.25}
2322+ {"matrix": [6, 0], "x": 9.75, "y": 1.25},
2323+ {"matrix": [6, 1], "x": 10.75, "y": 1.125},
2324+ {"matrix": [6, 2], "x": 11.75, "y": 1},
2325+ {"matrix": [6, 3], "x": 12.75, "y": 1.125},
2326+ {"matrix": [6, 4], "x": 13.75, "y": 1.375},
2327diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.h b/keyboards/afternoonlabs/breeze/rev0/rev0.h
2328deleted file mode 100644
2329index 4ef5fd32865834df63ae7436640f0bdb89b5053e..0000000000000000000000000000000000000000
2330--- a/keyboards/afternoonlabs/breeze/rev0/rev0.h
2331+++ /dev/null
2332@@ -1,39 +0,0 @@
2333-/* Copyright 2021 eithanshavit
2334- *
2335- * This program is free software: you can redistribute it and/or modify
2336- * it under the terms of the GNU General Public License as published by
2337- * the Free Software Foundation, either version 2 of the License, or
2338- * (at your option) any later version.
2339- *
2340- * This program is distributed in the hope that it will be useful,
2341- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2342- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2343- * GNU General Public License for more details.
2344- *
2345- * You should have received a copy of the GNU General Public License
2346- * along with this program. If not, see <http://www.gnu.org/licenses/>.
2347- */
2348-
2349-#pragma once
2350-
2351-#include "quantum.h"
2352-
2353-#define LAYOUT( \
2354- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \
2355- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \
2356- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \
2357- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \
2358- LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \
2359-) \
2360-{ \
2361- { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \
2362- { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \
2363- { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \
2364- { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \
2365- { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
2366- { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \
2367- { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \
2368- { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \
2369- { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \
2370- { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
2371-}
2372diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
2373index 191c3ffc63abe0a5a9c133a7db72ef25e1c88bbd..21b6a7a436496430e5b0748308d533ed15b13189 100644
2374--- a/keyboards/afternoonlabs/breeze/rev1/info.json
2375+++ b/keyboards/afternoonlabs/breeze/rev1/info.json
2376@@ -24,76 +24,85 @@
2377 "layouts": {
2378 "LAYOUT": {
2379 "layout": [
2380- {"x":0, "y":0.375},
2381- {"x":1, "y":0.375},
2382- {"x":2, "y":0.125},
2383- {"x":3, "y":0},
2384- {"x":4, "y":0.125},
2385- {"x":5, "y":0.25},
2386- {"x":9.75, "y":0.25},
2387- {"x":10.75, "y":0.125},
2388- {"x":11.75, "y":0},
2389- {"x":12.75, "y":0.125},
2390- {"x":13.75, "y":0.375},
2391- {"x":14.75, "y":0.375},
2392- {"x":16, "y":0.375},
2393- {"x":17, "y":0.375},
2394- {"x":18, "y":0.375},
2395+ {"matrix": [0, 5], "x": 0, "y": 0.375},
2396+ {"matrix": [0, 4], "x": 1, "y": 0.375},
2397+ {"matrix": [0, 3], "x": 2, "y": 0.125},
2398+ {"matrix": [0, 2], "x": 3, "y": 0},
2399+ {"matrix": [0, 1], "x": 4, "y": 0.125},
2400+ {"matrix": [0, 0], "x": 5, "y": 0.25},
2401
2402- {"x":0, "y":1.375},
2403- {"x":1, "y":1.375},
2404- {"x":2, "y":1.125},
2405- {"x":3, "y":1},
2406- {"x":4, "y":1.125},
2407- {"x":5, "y":1.25},
2408- {"x":9.75, "y":1.25},
2409- {"x":10.75, "y":1.125},
2410- {"x":11.75, "y":1},
2411- {"x":12.75, "y":1.125},
2412- {"x":13.75, "y":1.375},
2413- {"x":14.75, "y":1.375},
2414- {"x":16, "y":1.375},
2415- {"x":17, "y":1.375},
2416- {"x":18, "y":1.375},
2417+ {"matrix": [5, 0], "x": 9.75, "y": 0.25},
2418+ {"matrix": [5, 1], "x": 10.75, "y": 0.125},
2419+ {"matrix": [5, 2], "x": 11.75, "y": 0},
2420+ {"matrix": [5, 3], "x": 12.75, "y": 0.125},
2421+ {"matrix": [5, 4], "x": 13.75, "y": 0.375},
2422+ {"matrix": [5, 5], "x": 14.75, "y": 0.375},
2423
2424- {"x":0, "y":2.375},
2425- {"x":1, "y":2.375},
2426- {"x":2, "y":2.125},
2427- {"x":3, "y":2},
2428- {"x":4, "y":2.125},
2429- {"x":5, "y":2.25},
2430- {"x":9.75, "y":2.25},
2431- {"x":10.75, "y":2.125},
2432- {"x":11.75, "y":2},
2433- {"x":12.75, "y":2.125},
2434- {"x":13.75, "y":2.375},
2435- {"x":14.75, "y":2.375},
2436- {"x":17, "y":2.375},
2437+ {"matrix": [5, 6], "x": 16, "y": 0.375},
2438+ {"matrix": [5, 7], "x": 17, "y": 0.375},
2439+ {"matrix": [5, 8], "x": 18, "y": 0.375},
2440
2441- {"x":0, "y":3.375},
2442- {"x":1, "y":3.375},
2443- {"x":2, "y":3.125},
2444- {"x":3, "y":3},
2445- {"x":4, "y":3.125},
2446- {"x":5, "y":3.25},
2447- {"x":9.75, "y":3.25},
2448- {"x":10.75, "y":3.125},
2449- {"x":11.75, "y":3},
2450- {"x":12.75, "y":3.125},
2451- {"x":13.75, "y":3.375},
2452- {"x":14.75, "y":3.375},
2453- {"x":16, "y":3.375},
2454- {"x":17, "y":3.375},
2455- {"x":18, "y":3.375},
2456+ {"matrix": [1, 5], "x": 0, "y": 1.375},
2457+ {"matrix": [1, 4], "x": 1, "y": 1.375},
2458+ {"matrix": [1, 3], "x": 2, "y": 1.125},
2459+ {"matrix": [1, 2], "x": 3, "y": 1},
2460+ {"matrix": [1, 1], "x": 4, "y": 1.125},
2461+ {"matrix": [1, 0], "x": 5, "y": 1.25},
2462
2463- {"x":2.5, "y":4.25},
2464- {"x":3.5, "y":4.25},
2465- {"x":4.5, "y":4.5},
2466- {"x":6.25, "y":3.75, "h":2, "r":30},
2467- {"x":8.5, "y":3.75, "h":2, "r":-30},
2468- {"x":10.25, "y":4.5},
2469- {"x":11.25, "y":4.25},
2470- {"x":12.25, "y":4.25}
2471+ {"matrix": [6, 0], "x": 9.75, "y": 1.25},
2472+ {"matrix": [6, 1], "x": 10.75, "y": 1.125},
2473+ {"matrix": [6, 2], "x": 11.75, "y": 1},
2474+ {"matrix": [6, 3], "x": 12.75, "y": 1.125},
2475+ {"matrix": [6, 4], "x": 13.75, "y": 1.375},
2476diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.h b/keyboards/afternoonlabs/breeze/rev1/rev1.h
2477deleted file mode 100644
2478index 4ef5fd32865834df63ae7436640f0bdb89b5053e..0000000000000000000000000000000000000000
2479--- a/keyboards/afternoonlabs/breeze/rev1/rev1.h
2480+++ /dev/null
2481@@ -1,39 +0,0 @@
2482-/* Copyright 2021 eithanshavit
2483- *
2484- * This program is free software: you can redistribute it and/or modify
2485- * it under the terms of the GNU General Public License as published by
2486- * the Free Software Foundation, either version 2 of the License, or
2487- * (at your option) any later version.
2488- *
2489- * This program is distributed in the hope that it will be useful,
2490- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2491- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2492- * GNU General Public License for more details.
2493- *
2494- * You should have received a copy of the GNU General Public License
2495- * along with this program. If not, see <http://www.gnu.org/licenses/>.
2496- */
2497-
2498-#pragma once
2499-
2500-#include "quantum.h"
2501-
2502-#define LAYOUT( \
2503- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \
2504- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \
2505- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \
2506- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \
2507- LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \
2508-) \
2509-{ \
2510- { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \
2511- { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \
2512- { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \
2513- { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \
2514- { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
2515- { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \
2516- { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \
2517- { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \
2518- { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \
2519- { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
2520-}