summaryrefslogtreecommitdiff
path: root/keyboards/waldo
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-27 07:45:43 +1000
committerGitHub <noreply@github.com>2023-04-27 07:45:43 +1000
commit4871f651c5328cc8c16d1ec991f3e865094b24c8 (patch)
treecdcda3f68ab91319bc482f69c008396d66492c8b /keyboards/waldo
parent67e18c0d6bea880b989104b0a0250c85902b1a75 (diff)
Move remaining `LAYOUT_all`s to data driven (#20463)
Diffstat (limited to 'keyboards/waldo')
-rw-r--r--keyboards/waldo/info.json282
-rw-r--r--keyboards/waldo/waldo.h63
2 files changed, 275 insertions, 70 deletions
diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
index c371f051b1..a2e54a757f 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -23,19 +23,287 @@
23 "bootloader": "atmel-dfu", 23 "bootloader": "atmel-dfu",
24 "layouts": { 24 "layouts": {
25 "LAYOUT_all": { 25 "LAYOUT_all": {
26 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] 26 "layout": [
27 }, 27 {"matrix": [0, 0], "x": 0, "y": 0},
28 {"matrix": [0, 1], "x": 1, "y": 0},
29 {"matrix": [0, 2], "x": 2, "y": 0},
30 {"matrix": [0, 3], "x": 3, "y": 0},
31 {"matrix": [0, 4], "x": 4, "y": 0},
32 {"matrix": [0, 5], "x": 5, "y": 0},
33 {"matrix": [0, 6], "x": 6, "y": 0},
34 {"matrix": [0, 7], "x": 7, "y": 0},
35 {"matrix": [0, 8], "x": 8, "y": 0},
36 {"matrix": [0, 9], "x": 9, "y": 0},
37 {"matrix": [0, 10], "x": 10, "y": 0},
38 {"matrix": [0, 11], "x": 11, "y": 0},
39 {"matrix": [0, 12], "x": 12, "y": 0},
40 {"matrix": [0, 13], "x": 13, "y": 0},
41 {"matrix": [0, 14], "x": 14, "y": 0},
28 42
29 "LAYOUT_60_ansi": { 43 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
30 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] 44 {"matrix": [1, 1], "x": 1.5, "y": 1},
45 {"matrix": [1, 2], "x": 2.5, "y": 1},
46 {"matrix": [1, 3], "x": 3.5, "y": 1},
47 {"matrix": [1, 4], "x": 4.5, "y": 1},
48 {"matrix": [1, 5], "x": 5.5, "y": 1},
49 {"matrix": [1, 6], "x": 6.5, "y": 1},
50 {"matrix": [1, 7], "x": 7.5, "y": 1},
51 {"matrix": [1, 8], "x": 8.5, "y": 1},
52 {"matrix": [1, 9], "x": 9.5, "y": 1},
53 {"matrix": [1, 10], "x": 10.5, "y": 1},
54 {"matrix": [1, 11], "x": 11.5, "y": 1},
55 {"matrix": [1, 12], "x": 12.5, "y": 1},
56 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
57
58 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
59 {"matrix": [2, 1], "x": 1.75, "y": 2},
60 {"matrix": [2, 2], "x": 2.75, "y": 2},
61 {"matrix": [2, 3], "x": 3.75, "y": 2},
62 {"matrix": [2, 4], "x": 4.75, "y": 2},
63 {"matrix": [2, 5], "x": 5.75, "y": 2},
64 {"matrix": [2, 6], "x": 6.75, "y": 2},
65 {"matrix": [2, 7], "x": 7.75, "y": 2},
66 {"matrix": [2, 8], "x": 8.75, "y": 2},
67 {"matrix": [2, 9], "x": 9.75, "y": 2},
68 {"matrix": [2, 10], "x": 10.75, "y": 2},
69 {"matrix": [2, 11], "x": 11.75, "y": 2},
70 {"matrix": [2, 12], "x": 12.75, "y": 2},
71 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
72
73 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
74 {"matrix": [3, 1], "x": 1.25, "y": 3},
75 {"matrix": [3, 2], "x": 2.25, "y": 3},
76 {"matrix": [3, 3], "x": 3.25, "y": 3},
77 {"matrix": [3, 4], "x": 4.25, "y": 3},
78 {"matrix": [3, 5], "x": 5.25, "y": 3},
79 {"matrix": [3, 6], "x": 6.25, "y": 3},
80 {"matrix": [3, 7], "x": 7.25, "y": 3},
81 {"matrix": [3, 8], "x": 8.25, "y": 3},
82 {"matrix": [3, 9], "x": 9.25, "y": 3},
83 {"matrix": [3, 10], "x": 10.25, "y": 3},
84 {"matrix": [3, 11], "x": 11.25, "y": 3},
85 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
86 {"matrix": [3, 13], "x": 14, "y": 3},
87
88 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
89 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
90 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
91 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
92 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
93 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
94 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
95 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
96 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
97 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
98 ]
31 }, 99 },
100 "LAYOUT_60_ansi": {
101 "layout": [
102 {"matrix": [0, 0], "x": 0, "y": 0},
103 {"matrix": [0, 1], "x": 1, "y": 0},
104 {"matrix": [0, 2], "x": 2, "y": 0},
105 {"matrix": [0, 3], "x": 3, "y": 0},
106 {"matrix": [0, 4], "x": 4, "y": 0},
107 {"matrix": [0, 5], "x": 5, "y": 0},
108 {"matrix": [0, 6], "x": 6, "y": 0},
109 {"matrix": [0, 7], "x": 7, "y": 0},
110 {"matrix": [0, 8], "x": 8, "y": 0},
111 {"matrix": [0, 9], "x": 9, "y": 0},
112 {"matrix": [0, 10], "x": 10, "y": 0},
113 {"matrix": [0, 11], "x": 11, "y": 0},
114 {"matrix": [0, 12], "x": 12, "y": 0},
115 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
32 116
33 "LAYOUT_60_hhkb": { 117 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
34 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}] 118 {"matrix": [1, 1], "x": 1.5, "y": 1},
119 {"matrix": [1, 2], "x": 2.5, "y": 1},
120 {"matrix": [1, 3], "x": 3.5, "y": 1},
121 {"matrix": [1, 4], "x": 4.5, "y": 1},
122 {"matrix": [1, 5], "x": 5.5, "y": 1},
123 {"matrix": [1, 6], "x": 6.5, "y": 1},
124 {"matrix": [1, 7], "x": 7.5, "y": 1},
125 {"matrix": [1, 8], "x": 8.5, "y": 1},
126 {"matrix": [1, 9], "x": 9.5, "y": 1},
127 {"matrix": [1, 10], "x": 10.5, "y": 1},
128 {"matrix": [1, 11], "x": 11.5, "y": 1},
129 {"matrix": [1, 12], "x": 12.5, "y": 1},
130 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
131
132 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
133 {"matrix": [2, 1], "x": 1.75, "y": 2},
134 {"matrix": [2, 2], "x": 2.75, "y": 2},
135 {"matrix": [2, 3], "x": 3.75, "y": 2},
136 {"matrix": [2, 4], "x": 4.75, "y": 2},
137 {"matrix": [2, 5], "x": 5.75, "y": 2},
138 {"matrix": [2, 6], "x": 6.75, "y": 2},
139 {"matrix": [2, 7], "x": 7.75, "y": 2},
140 {"matrix": [2, 8], "x": 8.75, "y": 2},
141 {"matrix": [2, 9], "x": 9.75, "y": 2},
142 {"matrix": [2, 10], "x": 10.75, "y": 2},
143 {"matrix": [2, 11], "x": 11.75, "y": 2},
144 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
145
146 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
147 {"matrix": [3, 2], "x": 2.25, "y": 3},
148 {"matrix": [3, 3], "x": 3.25, "y": 3},
149 {"matrix": [3, 4], "x": 4.25, "y": 3},
150 {"matrix": [3, 5], "x": 5.25, "y": 3},
151 {"matrix": [3, 6], "x": 6.25, "y": 3},
152 {"matrix": [3, 7], "x": 7.25, "y": 3},
153 {"matrix": [3, 8], "x": 8.25, "y": 3},
154 {"matrix": [3, 9], "x": 9.25, "y": 3},
155 {"matrix": [3, 10], "x": 10.25, "y": 3},
156 {"matrix": [3, 11], "x": 11.25, "y": 3},
157 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
158
159 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
160 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
161 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
162 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
163 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
164 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
165 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
166 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
167 ]
35 }, 168 },
169 "LAYOUT_60_hhkb": {
170 "layout": [
171 {"matrix": [0, 0], "x": 0, "y": 0},
172 {"matrix": [0, 1], "x": 1, "y": 0},
173 {"matrix": [0, 2], "x": 2, "y": 0},
174 {"matrix": [0, 3], "x": 3, "y": 0},
175 {"matrix": [0, 4], "x": 4, "y": 0},
176 {"matrix": [0, 5], "x": 5, "y": 0},
177 {"matrix": [0, 6], "x": 6, "y": 0},
178 {"matrix": [0, 7], "x": 7, "y": 0},
179 {"matrix": [0, 8], "x": 8, "y": 0},
180 {"matrix": [0, 9], "x": 9, "y": 0},
181 {"matrix": [0, 10], "x": 10, "y": 0},
182 {"matrix": [0, 11], "x": 11, "y": 0},
183 {"matrix": [0, 12], "x": 12, "y": 0},
184 {"matrix": [0, 13], "x": 13, "y": 0},
185 {"matrix": [0, 14], "x": 14, "y": 0},
186
187 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
188 {"matrix": [1, 1], "x": 1.5, "y": 1},
189 {"matrix": [1, 2], "x": 2.5, "y": 1},
190 {"matrix": [1, 3], "x": 3.5, "y": 1},
191 {"matrix": [1, 4], "x": 4.5, "y": 1},
192 {"matrix": [1, 5], "x": 5.5, "y": 1},
193 {"matrix": [1, 6], "x": 6.5, "y": 1},
194 {"matrix": [1, 7], "x": 7.5, "y": 1},
195 {"matrix": [1, 8], "x": 8.5, "y": 1},
196 {"matrix": [1, 9], "x": 9.5, "y": 1},
197 {"matrix": [1, 10], "x": 10.5, "y": 1},
198 {"matrix": [1, 11], "x": 11.5, "y": 1},
199 {"matrix": [1, 12], "x": 12.5, "y": 1},
200 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
201
202 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
203 {"matrix": [2, 1], "x": 1.75, "y": 2},
204 {"matrix": [2, 2], "x": 2.75, "y": 2},
205 {"matrix": [2, 3], "x": 3.75, "y": 2},
206 {"matrix": [2, 4], "x": 4.75, "y": 2},
207 {"matrix": [2, 5], "x": 5.75, "y": 2},
208 {"matrix": [2, 6], "x": 6.75, "y": 2},
209 {"matrix": [2, 7], "x": 7.75, "y": 2},
210 {"matrix": [2, 8], "x": 8.75, "y": 2},
211 {"matrix": [2, 9], "x": 9.75, "y": 2},
212 {"matrix": [2, 10], "x": 10.75, "y": 2},
213 {"matrix": [2, 11], "x": 11.75, "y": 2},
214 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
36 215
216 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
217 {"matrix": [3, 2], "x": 2.25, "y": 3},
218 {"matrix": [3, 3], "x": 3.25, "y": 3},
219 {"matrix": [3, 4], "x": 4.25, "y": 3},
220 {"matrix": [3, 5], "x": 5.25, "y": 3},
221 {"matrix": [3, 6], "x": 6.25, "y": 3},
222 {"matrix": [3, 7], "x": 7.25, "y": 3},
223 {"matrix": [3, 8], "x": 8.25, "y": 3},
224 {"matrix": [3, 9], "x": 9.25, "y": 3},
225 {"matrix": [3, 10], "x": 10.25, "y": 3},
226 {"matrix": [3, 11], "x": 11.25, "y": 3},
227 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
228 {"matrix": [3, 13], "x": 14, "y": 3},
229
230 {"matrix": [4, 1], "x": 1.5, "y": 4},
231 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
232 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
233 {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
234 {"matrix": [4, 10], "x": 12.5, "y": 4}
235 ]
236 },
37 "LAYOUT_60_ansi_split_bs_rshift": { 237 "LAYOUT_60_ansi_split_bs_rshift": {
38 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] 238 "layout": [
239 {"matrix": [0, 0], "x": 0, "y": 0},
240 {"matrix": [0, 1], "x": 1, "y": 0},
241 {"matrix": [0, 2], "x": 2, "y": 0},
242 {"matrix": [0, 3], "x": 3, "y": 0},
243 {"matrix": [0, 4], "x": 4, "y": 0},
244 {"matrix": [0, 5], "x": 5, "y": 0},
245 {"matrix": [0, 6], "x": 6, "y": 0},
246 {"matrix": [0, 7], "x": 7, "y": 0},
247 {"matrix": [0, 8], "x": 8, "y": 0},
248 {"matrix": [0, 9], "x": 9, "y": 0},
249 {"matrix": [0, 10], "x": 10, "y": 0},
250 {"matrix": [0, 11], "x": 11, "y": 0},
251 {"matrix": [0, 12], "x": 12, "y": 0},
252 {"matrix": [0, 13], "x": 13, "y": 0},
253 {"matrix": [0, 14], "x": 14, "y": 0},
254
255 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
256 {"matrix": [1, 1], "x": 1.5, "y": 1},
257 {"matrix": [1, 2], "x": 2.5, "y": 1},
258 {"matrix": [1, 3], "x": 3.5, "y": 1},
259 {"matrix": [1, 4], "x": 4.5, "y": 1},
260 {"matrix": [1, 5], "x": 5.5, "y": 1},
261 {"matrix": [1, 6], "x": 6.5, "y": 1},
262 {"matrix": [1, 7], "x": 7.5, "y": 1},
263 {"matrix": [1, 8], "x": 8.5, "y": 1},
264 {"matrix": [1, 9], "x": 9.5, "y": 1},
265 {"matrix": [1, 10], "x": 10.5, "y": 1},
266 {"matrix": [1, 11], "x": 11.5, "y": 1},
267 {"matrix": [1, 12], "x": 12.5, "y": 1},
268 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
269
270 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
271 {"matrix": [2, 1], "x": 1.75, "y": 2},
272 {"matrix": [2, 2], "x": 2.75, "y": 2},
273 {"matrix": [2, 3], "x": 3.75, "y": 2},
274 {"matrix": [2, 4], "x": 4.75, "y": 2},
275 {"matrix": [2, 5], "x": 5.75, "y": 2},
276 {"matrix": [2, 6], "x": 6.75, "y": 2},
277 {"matrix": [2, 7], "x": 7.75, "y": 2},
278 {"matrix": [2, 8], "x": 8.75, "y": 2},
279 {"matrix": [2, 9], "x": 9.75, "y": 2},
280 {"matrix": [2, 10], "x": 10.75, "y": 2},
281 {"matrix": [2, 11], "x": 11.75, "y": 2},
282 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
283
284 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
285 {"matrix": [3, 2], "x": 2.25, "y": 3},
286 {"matrix": [3, 3], "x": 3.25, "y": 3},
287 {"matrix": [3, 4], "x": 4.25, "y": 3},
288 {"matrix": [3, 5], "x": 5.25, "y": 3},
289 {"matrix": [3, 6], "x": 6.25, "y": 3},
290 {"matrix": [3, 7], "x": 7.25, "y": 3},
291 {"matrix": [3, 8], "x": 8.25, "y": 3},
292 {"matrix": [3, 9], "x": 9.25, "y": 3},
293 {"matrix": [3, 10], "x": 10.25, "y": 3},
294 {"matrix": [3, 11], "x": 11.25, "y": 3},
295 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
296 {"matrix": [3, 13], "x": 14, "y": 3},
297
298 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
299 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
300 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
301 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
302 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
303 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
304 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
305 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
306 ]
39 } 307 }
40 } 308 }
41} 309}
diff --git a/keyboards/waldo/waldo.h b/keyboards/waldo/waldo.h
deleted file mode 100644
index 1e300f9425..0000000000
--- a/keyboards/waldo/waldo.h
+++ /dev/null
@@ -1,63 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT_60_ansi( \
6 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
7 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
8 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
9 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
10 k40, k41, k42, k46, k49, k4a, k4c, k4d \
11) \
12{ \
13 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, KC_NO }, \
14 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
15 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
16 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO }, \
17 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
18}
19
20#define LAYOUT_60_hhkb( \
21 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
22 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
23 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
24 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
25 k41, k42, k46, k49, k4a \
26) \
27{ \
28 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
29 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
30 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
31 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
32 { KC_NO, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, KC_NO, KC_NO, KC_NO } \
33}
34
35#define LAYOUT_60_ansi_split_bs_rshift( \
36 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
37 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
38 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
39 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
40 k40, k41, k42, k46, k49, k4a, k4c, k4d \
41) \
42{ \
43 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
44 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
45 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
46 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
47 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
48}
49
50#define LAYOUT_all( \
51 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
52 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
53 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
54 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
55 k40, k41, k42, k44, k46, k48, k49, k4a, k4c, k4d \
56) \
57{ \
58 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
59 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
60 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
61 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
62 { k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, k49, k4a, KC_NO, k4c, k4d } \
63}