summaryrefslogtreecommitdiff
path: root/keyboards/tada68
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-04 15:20:10 +1000
committerGitHub <noreply@github.com>2023-04-04 15:20:10 +1000
commit7bfc2a367df91ad6cc701f8490b4b8346a1512b4 (patch)
tree41ed492b974467c924d94c304da7e38b54030d9b /keyboards/tada68
parent0e7acb777a75608524fe1de5e0f9359aeec88912 (diff)
Move 65% layouts to data driven (#20308)
Diffstat (limited to 'keyboards/tada68')
-rw-r--r--keyboards/tada68/info.json416
-rwxr-xr-xkeyboards/tada68/tada68.h103
2 files changed, 210 insertions, 309 deletions
diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json
index c8eae73857..1311017d36 100644
--- a/keyboards/tada68/info.json
+++ b/keyboards/tada68/info.json
@@ -25,235 +25,239 @@
25 "processor": "atmega32u4", 25 "processor": "atmega32u4",
26 "bootloader": "lufa-ms", 26 "bootloader": "lufa-ms",
27 "community_layouts": ["65_ansi", "65_iso"], 27 "community_layouts": ["65_ansi", "65_iso"],
28 "layout_aliases": {
29 "LAYOUT_ansi": "LAYOUT_65_ansi",
30 "LAYOUT_iso": "LAYOUT_65_iso"
31 },
28 "layouts": { 32 "layouts": {
29 "LAYOUT_65_ansi": { 33 "LAYOUT_65_ansi": {
30 "layout": [ 34 "layout": [
31 {"label":"Esc", "x":0, "y":0}, 35 {"matrix": [0, 0], "x": 0, "y": 0},
32 {"label":"!", "x":1, "y":0}, 36 {"matrix": [0, 1], "x": 1, "y": 0},
33 {"label":"@", "x":2, "y":0}, 37 {"matrix": [0, 2], "x": 2, "y": 0},
34 {"label":"#", "x":3, "y":0}, 38 {"matrix": [0, 3], "x": 3, "y": 0},
35 {"label":"$", "x":4, "y":0}, 39 {"matrix": [0, 4], "x": 4, "y": 0},
36 {"label":"%", "x":5, "y":0}, 40 {"matrix": [0, 5], "x": 5, "y": 0},
37 {"label":"^", "x":6, "y":0}, 41 {"matrix": [0, 6], "x": 6, "y": 0},
38 {"label":"&", "x":7, "y":0}, 42 {"matrix": [0, 7], "x": 7, "y": 0},
39 {"label":"*", "x":8, "y":0}, 43 {"matrix": [0, 8], "x": 8, "y": 0},
40 {"label":"(", "x":9, "y":0}, 44 {"matrix": [0, 9], "x": 9, "y": 0},
41 {"label":")", "x":10, "y":0}, 45 {"matrix": [0, 10], "x": 10, "y": 0},
42 {"label":"_", "x":11, "y":0}, 46 {"matrix": [0, 11], "x": 11, "y": 0},
43 {"label":"+", "x":12, "y":0}, 47 {"matrix": [0, 12], "x": 12, "y": 0},
44 {"label":"Backspace", "x":13, "y":0, "w":2}, 48 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
45 {"label":"~", "x":15, "y":0}, 49 {"matrix": [0, 14], "x": 15, "y": 0},
46 50
47 {"label":"Tab", "x":0, "y":1, "w":1.5}, 51 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
48 {"label":"Q", "x":1.5, "y":1}, 52 {"matrix": [1, 1], "x": 1.5, "y": 1},
49 {"label":"W", "x":2.5, "y":1}, 53 {"matrix": [1, 2], "x": 2.5, "y": 1},
50 {"label":"E", "x":3.5, "y":1}, 54 {"matrix": [1, 3], "x": 3.5, "y": 1},
51 {"label":"R", "x":4.5, "y":1}, 55 {"matrix": [1, 4], "x": 4.5, "y": 1},
52 {"label":"T", "x":5.5, "y":1}, 56 {"matrix": [1, 5], "x": 5.5, "y": 1},
53 {"label":"Y", "x":6.5, "y":1}, 57 {"matrix": [1, 6], "x": 6.5, "y": 1},
54 {"label":"U", "x":7.5, "y":1}, 58 {"matrix": [1, 7], "x": 7.5, "y": 1},
55 {"label":"I", "x":8.5, "y":1}, 59 {"matrix": [1, 8], "x": 8.5, "y": 1},
56 {"label":"O", "x":9.5, "y":1}, 60 {"matrix": [1, 9], "x": 9.5, "y": 1},
57 {"label":"P", "x":10.5, "y":1}, 61 {"matrix": [1, 10], "x": 10.5, "y": 1},
58 {"label":"{", "x":11.5, "y":1}, 62 {"matrix": [1, 11], "x": 11.5, "y": 1},
59 {"label":"}", "x":12.5, "y":1}, 63 {"matrix": [1, 12], "x": 12.5, "y": 1},
60 {"label":"|", "x":13.5, "y":1, "w":1.5}, 64 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
61 {"label":"Delete", "x":15, "y":1}, 65 {"matrix": [1, 14], "x": 15, "y": 1},
62 66
63 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 67 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
64 {"label":"A", "x":1.75, "y":2}, 68 {"matrix": [2, 1], "x": 1.75, "y": 2},
65 {"label":"S", "x":2.75, "y":2}, 69 {"matrix": [2, 2], "x": 2.75, "y": 2},
66 {"label":"D", "x":3.75, "y":2}, 70 {"matrix": [2, 3], "x": 3.75, "y": 2},
67 {"label":"F", "x":4.75, "y":2}, 71 {"matrix": [2, 4], "x": 4.75, "y": 2},
68 {"label":"G", "x":5.75, "y":2}, 72 {"matrix": [2, 5], "x": 5.75, "y": 2},
69 {"label":"H", "x":6.75, "y":2}, 73 {"matrix": [2, 6], "x": 6.75, "y": 2},
70 {"label":"J", "x":7.75, "y":2}, 74 {"matrix": [2, 7], "x": 7.75, "y": 2},
71 {"label":"K", "x":8.75, "y":2}, 75 {"matrix": [2, 8], "x": 8.75, "y": 2},
72 {"label":"L", "x":9.75, "y":2}, 76 {"matrix": [2, 9], "x": 9.75, "y": 2},
73 {"label":":", "x":10.75, "y":2}, 77 {"matrix": [2, 10], "x": 10.75, "y": 2},
74 {"label":"\"", "x":11.75, "y":2}, 78 {"matrix": [2, 11], "x": 11.75, "y": 2},
75 {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 79 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
76 {"label":"Page Up", "x":15, "y":2}, 80 {"matrix": [2, 14], "x": 15, "y": 2},
77 81
78 {"label":"Shift", "x":0, "y":3, "w":2.25}, 82 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
79 {"label":"Z", "x":2.25, "y":3}, 83 {"matrix": [3, 2], "x": 2.25, "y": 3},
80 {"label":"X", "x":3.25, "y":3}, 84 {"matrix": [3, 3], "x": 3.25, "y": 3},
81 {"label":"C", "x":4.25, "y":3}, 85 {"matrix": [3, 4], "x": 4.25, "y": 3},
82 {"label":"V", "x":5.25, "y":3}, 86 {"matrix": [3, 5], "x": 5.25, "y": 3},
83 {"label":"B", "x":6.25, "y":3}, 87 {"matrix": [3, 6], "x": 6.25, "y": 3},
84 {"label":"N", "x":7.25, "y":3}, 88 {"matrix": [3, 7], "x": 7.25, "y": 3},
85 {"label":"M", "x":8.25, "y":3}, 89 {"matrix": [3, 8], "x": 8.25, "y": 3},
86 {"label":"<", "x":9.25, "y":3}, 90 {"matrix": [3, 9], "x": 9.25, "y": 3},
87 {"label":">", "x":10.25, "y":3}, 91 {"matrix": [3, 10], "x": 10.25, "y": 3},
88 {"label":"?", "x":11.25, "y":3}, 92 {"matrix": [3, 11], "x": 11.25, "y": 3},
89 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 93 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
90 {"label":"Up", "x":14, "y":3}, 94 {"matrix": [3, 13], "x": 14, "y": 3},
91 {"label":"Page Down", "x":15, "y":3}, 95 {"matrix": [3, 14], "x": 15, "y": 3},
92 96
93 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 97 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
94 {"label":"Win", "x":1.25, "y":4, "w":1.25}, 98 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
95 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 99 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
96 {"label":"Space", "x":3.75, "y":4, "w":6.25}, 100 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
97 {"label":"Alt", "x":10, "y":4}, 101 {"matrix": [4, 9], "x": 10, "y": 4},
98 {"label":"Fn", "x":11, "y":4}, 102 {"matrix": [4, 10], "x": 11, "y": 4},
99 {"label":"Ctrl", "x":12, "y":4}, 103 {"matrix": [4, 11], "x": 12, "y": 4},
100 {"label":"Left", "x":13, "y":4}, 104 {"matrix": [4, 12], "x": 13, "y": 4},
101 {"label":"Down", "x":14, "y":4}, 105 {"matrix": [4, 13], "x": 14, "y": 4},
102 {"label":"Right", "x":15, "y":4} 106 {"matrix": [4, 14], "x": 15, "y": 4}
103 ] 107 ]
104 }, 108 },
105 "LAYOUT_65_iso": { 109 "LAYOUT_65_iso": {
106 "layout": [ 110 "layout": [
107 {"label":"Esc", "x":0, "y":0}, 111 {"matrix": [0, 0], "x": 0, "y": 0},
108 {"label":"!", "x":1, "y":0}, 112 {"matrix": [0, 1], "x": 1, "y": 0},
109 {"label":"@", "x":2, "y":0}, 113 {"matrix": [0, 2], "x": 2, "y": 0},
110 {"label":"#", "x":3, "y":0}, 114 {"matrix": [0, 3], "x": 3, "y": 0},
111 {"label":"$", "x":4, "y":0}, 115 {"matrix": [0, 4], "x": 4, "y": 0},
112 {"label":"%", "x":5, "y":0}, 116 {"matrix": [0, 5], "x": 5, "y": 0},
113 {"label":"^", "x":6, "y":0}, 117 {"matrix": [0, 6], "x": 6, "y": 0},
114 {"label":"&", "x":7, "y":0}, 118 {"matrix": [0, 7], "x": 7, "y": 0},
115 {"label":"*", "x":8, "y":0}, 119 {"matrix": [0, 8], "x": 8, "y": 0},
116 {"label":"(", "x":9, "y":0}, 120 {"matrix": [0, 9], "x": 9, "y": 0},
117 {"label":")", "x":10, "y":0}, 121 {"matrix": [0, 10], "x": 10, "y": 0},
118 {"label":"_", "x":11, "y":0}, 122 {"matrix": [0, 11], "x": 11, "y": 0},
119 {"label":"+", "x":12, "y":0}, 123 {"matrix": [0, 12], "x": 12, "y": 0},
120 {"label":"Backspace", "x":13, "y":0, "w":2}, 124 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
121 {"label":"~", "x":15, "y":0}, 125 {"matrix": [0, 14], "x": 15, "y": 0},
122 126
123 {"label":"Tab", "x":0, "y":1, "w":1.5}, 127 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
124 {"label":"Q", "x":1.5, "y":1}, 128 {"matrix": [1, 1], "x": 1.5, "y": 1},
125 {"label":"W", "x":2.5, "y":1}, 129 {"matrix": [1, 2], "x": 2.5, "y": 1},
126 {"label":"E", "x":3.5, "y":1}, 130 {"matrix": [1, 3], "x": 3.5, "y": 1},
127 {"label":"R", "x":4.5, "y":1}, 131 {"matrix": [1, 4], "x": 4.5, "y": 1},
128 {"label":"T", "x":5.5, "y":1}, 132 {"matrix": [1, 5], "x": 5.5, "y": 1},
129 {"label":"Y", "x":6.5, "y":1}, 133 {"matrix": [1, 6], "x": 6.5, "y": 1},
130 {"label":"U", "x":7.5, "y":1}, 134 {"matrix": [1, 7], "x": 7.5, "y": 1},
131 {"label":"I", "x":8.5, "y":1}, 135 {"matrix": [1, 8], "x": 8.5, "y": 1},
132 {"label":"O", "x":9.5, "y":1}, 136 {"matrix": [1, 9], "x": 9.5, "y": 1},
133 {"label":"P", "x":10.5, "y":1}, 137 {"matrix": [1, 10], "x": 10.5, "y": 1},
134 {"label":"{", "x":11.5, "y":1}, 138 {"matrix": [1, 11], "x": 11.5, "y": 1},
135 {"label":"}", "x":12.5, "y":1}, 139 {"matrix": [1, 12], "x": 12.5, "y": 1},
136 {"label":"Delete", "x":15, "y":1}, 140 {"matrix": [1, 14], "x": 15, "y": 1},
137 141
138 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 142 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
139 {"label":"A", "x":1.75, "y":2}, 143 {"matrix": [2, 1], "x": 1.75, "y": 2},
140 {"label":"S", "x":2.75, "y":2}, 144 {"matrix": [2, 2], "x": 2.75, "y": 2},
141 {"label":"D", "x":3.75, "y":2}, 145 {"matrix": [2, 3], "x": 3.75, "y": 2},
142 {"label":"F", "x":4.75, "y":2}, 146 {"matrix": [2, 4], "x": 4.75, "y": 2},
143 {"label":"G", "x":5.75, "y":2}, 147 {"matrix": [2, 5], "x": 5.75, "y": 2},
144 {"label":"H", "x":6.75, "y":2}, 148 {"matrix": [2, 6], "x": 6.75, "y": 2},
145 {"label":"J", "x":7.75, "y":2}, 149 {"matrix": [2, 7], "x": 7.75, "y": 2},
146 {"label":"K", "x":8.75, "y":2}, 150 {"matrix": [2, 8], "x": 8.75, "y": 2},
147 {"label":"L", "x":9.75, "y":2}, 151 {"matrix": [2, 9], "x": 9.75, "y": 2},
148 {"label":":", "x":10.75, "y":2}, 152 {"matrix": [2, 10], "x": 10.75, "y": 2},
149 {"label":"@", "x":11.75, "y":2}, 153 {"matrix": [2, 11], "x": 11.75, "y": 2},
150 {"label":"~", "x":12.75, "y":2}, 154 {"matrix": [1, 13], "x": 12.75, "y": 2},
151 {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, 155 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
152 {"label":"Page Up", "x":15, "y":2}, 156 {"matrix": [2, 14], "x": 15, "y": 2},
153 157
154 {"label":"Shift", "x":0, "y":3, "w":1.25}, 158 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
155 {"label":"|", "x":1.25, "y":3}, 159 {"matrix": [3, 1], "x": 1.25, "y": 3},
156 {"label":"Z", "x":2.25, "y":3}, 160 {"matrix": [3, 2], "x": 2.25, "y": 3},
157 {"label":"X", "x":3.25, "y":3}, 161 {"matrix": [3, 3], "x": 3.25, "y": 3},
158 {"label":"C", "x":4.25, "y":3}, 162 {"matrix": [3, 4], "x": 4.25, "y": 3},
159 {"label":"V", "x":5.25, "y":3}, 163 {"matrix": [3, 5], "x": 5.25, "y": 3},
160 {"label":"B", "x":6.25, "y":3}, 164 {"matrix": [3, 6], "x": 6.25, "y": 3},
161 {"label":"N", "x":7.25, "y":3}, 165 {"matrix": [3, 7], "x": 7.25, "y": 3},
162 {"label":"M", "x":8.25, "y":3}, 166 {"matrix": [3, 8], "x": 8.25, "y": 3},
163 {"label":"<", "x":9.25, "y":3}, 167 {"matrix": [3, 9], "x": 9.25, "y": 3},
164 {"label":">", "x":10.25, "y":3}, 168 {"matrix": [3, 10], "x": 10.25, "y": 3},
165 {"label":"?", "x":11.25, "y":3}, 169 {"matrix": [3, 11], "x": 11.25, "y": 3},
166 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 170 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
167 {"label":"Up", "x":14, "y":3}, 171 {"matrix": [3, 13], "x": 14, "y": 3},
168 {"label":"Page Down", "x":15, "y":3}, 172 {"matrix": [3, 14], "x": 15, "y": 3},
169 173
170 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 174 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
171 {"label":"Win", "x":1.25, "y":4, "w":1.25}, 175 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
172 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 176 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
173 {"label":"Space", "x":3.75, "y":4, "w":6.25}, 177 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
174 {"label":"Alt", "x":10, "y":4}, 178 {"matrix": [4, 9], "x": 10, "y": 4},
175 {"label":"Fn", "x":11, "y":4}, 179 {"matrix": [4, 10], "x": 11, "y": 4},
176 {"label":"Ctrl", "x":12, "y":4}, 180 {"matrix": [4, 11], "x": 12, "y": 4},
177 {"label":"Left", "x":13, "y":4}, 181 {"matrix": [4, 12], "x": 13, "y": 4},
178 {"label":"Down", "x":14, "y":4}, 182 {"matrix": [4, 13], "x": 14, "y": 4},
179 {"label":"Right", "x":15, "y":4} 183 {"matrix": [4, 14], "x": 15, "y": 4}
180 ] 184 ]
181 }, 185 },
182 "LAYOUT_ansi_split_enter": { 186 "LAYOUT_ansi_split_enter": {
183 "layout": [ 187 "layout": [
184 {"label":"k00", "x":0, "y":0}, 188 {"matrix": [0, 0], "x": 0, "y": 0},
185 {"label":"k01", "x":1, "y":0}, 189 {"matrix": [0, 1], "x": 1, "y": 0},
186 {"label":"k02", "x":2, "y":0}, 190 {"matrix": [0, 2], "x": 2, "y": 0},
187 {"label":"k03", "x":3, "y":0}, 191 {"matrix": [0, 3], "x": 3, "y": 0},
188 {"label":"k04", "x":4, "y":0}, 192 {"matrix": [0, 4], "x": 4, "y": 0},
189 {"label":"k05", "x":5, "y":0}, 193 {"matrix": [0, 5], "x": 5, "y": 0},
190 {"label":"k06", "x":6, "y":0}, 194 {"matrix": [0, 6], "x": 6, "y": 0},
191 {"label":"k07", "x":7, "y":0}, 195 {"matrix": [0, 7], "x": 7, "y": 0},
192 {"label":"k08", "x":8, "y":0}, 196 {"matrix": [0, 8], "x": 8, "y": 0},
193 {"label":"k09", "x":9, "y":0}, 197 {"matrix": [0, 9], "x": 9, "y": 0},
194 {"label":"k0a", "x":10, "y":0}, 198 {"matrix": [0, 10], "x": 10, "y": 0},
195 {"label":"k0b", "x":11, "y":0}, 199 {"matrix": [0, 11], "x": 11, "y": 0},
196 {"label":"k0c", "x":12, "y":0}, 200 {"matrix": [0, 12], "x": 12, "y": 0},
197 {"label":"k0d", "x":13, "y":0, "w":2}, 201 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
198 {"label":"k0e", "x":15, "y":0}, 202 {"matrix": [0, 14], "x": 15, "y": 0},
199 203
200 {"label":"k10", "x":0, "y":1, "w":1.5}, 204 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
201 {"label":"k11", "x":1.5, "y":1}, 205 {"matrix": [1, 1], "x": 1.5, "y": 1},
202 {"label":"k12", "x":2.5, "y":1}, 206 {"matrix": [1, 2], "x": 2.5, "y": 1},
203 {"label":"k13", "x":3.5, "y":1}, 207 {"matrix": [1, 3], "x": 3.5, "y": 1},
204 {"label":"k14", "x":4.5, "y":1}, 208 {"matrix": [1, 4], "x": 4.5, "y": 1},
205 {"label":"k15", "x":5.5, "y":1}, 209 {"matrix": [1, 5], "x": 5.5, "y": 1},
206 {"label":"k16", "x":6.5, "y":1}, 210 {"matrix": [1, 6], "x": 6.5, "y": 1},
207 {"label":"k17", "x":7.5, "y":1}, 211 {"matrix": [1, 7], "x": 7.5, "y": 1},
208 {"label":"k18", "x":8.5, "y":1}, 212 {"matrix": [1, 8], "x": 8.5, "y": 1},
209 {"label":"k19", "x":9.5, "y":1}, 213 {"matrix": [1, 9], "x": 9.5, "y": 1},
210 {"label":"k1a", "x":10.5, "y":1}, 214 {"matrix": [1, 10], "x": 10.5, "y": 1},
211 {"label":"k1b", "x":11.5, "y":1}, 215 {"matrix": [1, 11], "x": 11.5, "y": 1},
212 {"label":"k1c", "x":12.5, "y":1}, 216 {"matrix": [1, 12], "x": 12.5, "y": 1},
213 {"label":"k1d", "x":13.5, "y":1, "w":1.5}, 217 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
214 {"label":"k1e", "x":15, "y":1}, 218 {"matrix": [1, 14], "x": 15, "y": 1},
215 219
216 {"label":"k20", "x":0, "y":2, "w":1.75}, 220 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
217 {"label":"k21", "x":1.75, "y":2}, 221 {"matrix": [2, 1], "x": 1.75, "y": 2},
218 {"label":"k22", "x":2.75, "y":2}, 222 {"matrix": [2, 2], "x": 2.75, "y": 2},
219 {"label":"k23", "x":3.75, "y":2}, 223 {"matrix": [2, 3], "x": 3.75, "y": 2},
220 {"label":"k24", "x":4.75, "y":2}, 224 {"matrix": [2, 4], "x": 4.75, "y": 2},
221 {"label":"k25", "x":5.75, "y":2}, 225 {"matrix": [2, 5], "x": 5.75, "y": 2},
222 {"label":"k26", "x":6.75, "y":2}, 226 {"matrix": [2, 6], "x": 6.75, "y": 2},
223 {"label":"k27", "x":7.75, "y":2}, 227 {"matrix": [2, 7], "x": 7.75, "y": 2},
224 {"label":"k28", "x":8.75, "y":2}, 228 {"matrix": [2, 8], "x": 8.75, "y": 2},
225 {"label":"k29", "x":9.75, "y":2}, 229 {"matrix": [2, 9], "x": 9.75, "y": 2},
226 {"label":"k2a", "x":10.75, "y":2}, 230 {"matrix": [2, 10], "x": 10.75, "y": 2},
227 {"label":"k2b", "x":11.75, "y":2}, 231 {"matrix": [2, 11], "x": 11.75, "y": 2},
228 {"label":"k2c", "x":12.75, "y":2}, 232 {"matrix": [2, 12], "x": 12.75, "y": 2},
229 {"label":"k2d", "x":13.75, "y":2, "w":1.25}, 233 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
230 {"label":"k2e", "x":15, "y":2}, 234 {"matrix": [2, 14], "x": 15, "y": 2},
231 235
232 {"label":"k30", "x":0, "y":3, "w":2.25}, 236 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
233 {"label":"k32", "x":2.25, "y":3}, 237 {"matrix": [3, 2], "x": 2.25, "y": 3},
234 {"label":"k33", "x":3.25, "y":3}, 238 {"matrix": [3, 3], "x": 3.25, "y": 3},
235 {"label":"k34", "x":4.25, "y":3}, 239 {"matrix": [3, 4], "x": 4.25, "y": 3},
236 {"label":"k35", "x":5.25, "y":3}, 240 {"matrix": [3, 5], "x": 5.25, "y": 3},
237 {"label":"k36", "x":6.25, "y":3}, 241 {"matrix": [3, 6], "x": 6.25, "y": 3},
238 {"label":"k37", "x":7.25, "y":3}, 242 {"matrix": [3, 7], "x": 7.25, "y": 3},
239 {"label":"k38", "x":8.25, "y":3}, 243 {"matrix": [3, 8], "x": 8.25, "y": 3},
240 {"label":"k39", "x":9.25, "y":3}, 244 {"matrix": [3, 9], "x": 9.25, "y": 3},
241 {"label":"k3a", "x":10.25, "y":3}, 245 {"matrix": [3, 10], "x": 10.25, "y": 3},
242 {"label":"k3b", "x":11.25, "y":3}, 246 {"matrix": [3, 11], "x": 11.25, "y": 3},
243 {"label":"k3c", "x":12.25, "y":3, "w":1.75}, 247 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
244 {"label":"k3d", "x":14, "y":3}, 248 {"matrix": [3, 13], "x": 14, "y": 3},
245 {"label":"k3e", "x":15, "y":3}, 249 {"matrix": [3, 14], "x": 15, "y": 3},
246 250
247 {"label":"k40", "x":0, "y":4, "w":1.25}, 251 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
248 {"label":"k41", "x":1.25, "y":4, "w":1.25}, 252 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
249 {"label":"k42", "x":2.5, "y":4, "w":1.25}, 253 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
250 {"label":"k45", "x":3.75, "y":4, "w":6.25}, 254 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
251 {"label":"k49", "x":10, "y":4}, 255 {"matrix": [4, 9], "x": 10, "y": 4},
252 {"label":"k4a", "x":11, "y":4}, 256 {"matrix": [4, 10], "x": 11, "y": 4},
253 {"label":"k4b", "x":12, "y":4}, 257 {"matrix": [4, 11], "x": 12, "y": 4},
254 {"label":"k4c", "x":13, "y":4}, 258 {"matrix": [4, 12], "x": 13, "y": 4},
255 {"label":"k4d", "x":14, "y":4}, 259 {"matrix": [4, 13], "x": 14, "y": 4},
256 {"label":"k4e", "x":15, "y":4} 260 {"matrix": [4, 14], "x": 15, "y": 4}
257 ] 261 ]
258 } 262 }
259 } 263 }
diff --git a/keyboards/tada68/tada68.h b/keyboards/tada68/tada68.h
deleted file mode 100755
index 6bc3cdccf3..0000000000
--- a/keyboards/tada68/tada68.h
+++ /dev/null
@@ -1,103 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5// readability
6#define XXX KC_NO
7
8/* TADA68 ANSI layout
9 * ,----------------------------------------------------------------.
10 * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e |
11 * |----------------------------------------------------------------|
12 * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e |
13 * |----------------------------------------------------------------|
14 * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d | 2e |
15 * |----------------------------------------------------------------|
16 * | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e |
17 * |----------------------------------------------------------------|
18 * | 40 | 41 | 42 | 45 | 49| 4a| 4b| 4c| 4d| 4e |
19 * `----------------------------------------------------------------'
20 */
21// The first section contains all of the arguments
22// The second converts the arguments into a two-dimensional array
23
24#define LAYOUT_65_ansi( \
25 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
26 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
27 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, \
28 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
29 k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d, k4e \
30) \
31{ \
32 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
33 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
34 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
35 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
36 {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \
37}
38
39#define LAYOUT_ansi LAYOUT_65_ansi
40
41/* TADA68 ISO layout
42 * ,----------------------------------------------------------------.
43 * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e |
44 * |----------------------------------------------------------------|
45 * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| | 1e |
46 * |------------------------------------------------------. -----|
47 * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d| 2e |
48 * |----------------------------------------------------------------|
49 * | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e |
50 * |----------------------------------------------------------------|
51 * | 40 | 41 | 42 | 45 | 49| 4a| 4b| 4c| 4d| 4e |
52 * `----------------------------------------------------------------'
53 */
54// The first section contains all of the arguments
55// The second converts the arguments into a two-dimensional array
56
57#define LAYOUT_65_iso( \
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, k1e, \
60 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k1d, k2d, k2e, \
61 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
62 k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d, k4e \
63) \
64{ \
65 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
66 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
67 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
68 {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
69 {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \
70}
71
72#define LAYOUT_iso LAYOUT_65_iso
73
74/* TADA68 ANSI layout with Split Enter key
75 * ,----------------------------------------------------------------.
76 * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e |
77 * |----------------------------------------------------------------|
78 * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e |
79 * |----------------------------------------------------------------|
80 * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d| 2e |
81 * |----------------------------------------------------------------|
82 * | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e |
83 * |----------------------------------------------------------------|
84 * | 40 | 41 | 42 | 45 | 49| 4a| 4b| 4c| 4d| 4e |
85 * `----------------------------------------------------------------'
86 */
87// The first section contains all of the arguments
88// The second converts the arguments into a two-dimensional array
89
90#define LAYOUT_ansi_split_enter( \
91 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
92 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
93 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
94 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
95 k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d, k4e \
96) \
97{ \
98 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
99 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
100 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
101 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
102 {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \
103}