summaryrefslogtreecommitdiff
path: root/keyboards/ingrained
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-01 13:09:53 +1100
committerGitHub <noreply@github.com>2023-04-01 13:09:53 +1100
commite40b6ca3b05e50253c3f6bbc08673e1720ddd9be (patch)
tree28ff78699bb1ff96997be7d097eaad2ec4843785 /keyboards/ingrained
parent297779385fd53e93c33861e2d3107cb88efbde81 (diff)
Move split layouts to data driven (#20290)
Diffstat (limited to 'keyboards/ingrained')
-rw-r--r--keyboards/ingrained/info.json337
-rw-r--r--keyboards/ingrained/ingrained.h47
2 files changed, 87 insertions, 297 deletions
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
index 7030086a5c..d9259d5f32 100644
--- a/keyboards/ingrained/info.json
+++ b/keyboards/ingrained/info.json
@@ -14,266 +14,103 @@
14 "layouts": { 14 "layouts": {
15 "LAYOUT_split_3x6_3": { 15 "LAYOUT_split_3x6_3": {
16 "layout": [ 16 "layout": [
17 { 17 {"matrix": [0, 0], "x": 0, "y": 0.3},
18 "label": "Esc", 18 {"matrix": [0, 1], "x": 1, "y": 0.3},
19 "x": 0, 19 {"matrix": [0, 2], "x": 2, "y": 0.1},
20 "y": 0.3 20 {"matrix": [0, 3], "x": 3, "y": 0},
21 }, 21 {"matrix": [0, 4], "x": 4, "y": 0.1},
22 { 22 {"matrix": [0, 5], "x": 5, "y": 0.2},
23 "label": "Q", 23
24 "x": 1, 24 {"matrix": [4, 5], "x": 9, "y": 0.2},
25 "y": 0.3 25 {"matrix": [4, 4], "x": 10, "y": 0.1},
26 }, 26 {"matrix": [4, 3], "x": 11, "y": 0},
27 { 27 {"matrix": [4, 2], "x": 12, "y": 0.1},
28 "label": "W", 28 {"matrix": [4, 1], "x": 13, "y": 0.3},
29 "x": 2, 29 {"matrix": [4, 0], "x": 14, "y": 0.3},
30 "y": 0.1 30
31 }, 31 {"matrix": [1, 0], "x": 0, "y": 1.3},
32 { 32 {"matrix": [1, 1], "x": 1, "y": 1.3},
33 "label": "E", 33 {"matrix": [1, 2], "x": 2, "y": 1.1},
34 "x": 3, 34 {"matrix": [1, 3], "x": 3, "y": 1},
35 "y": 0 35 {"matrix": [1, 4], "x": 4, "y": 1.1},
36 }, 36 {"matrix": [1, 5], "x": 5, "y": 1.2},
37 { 37
38 "label": "R", 38 {"matrix": [5, 5], "x": 9, "y": 1.2},
39 "x": 4, 39 {"matrix": [5, 4], "x": 10, "y": 1.1},
40 "y": 0.1 40 {"matrix": [5, 3], "x": 11, "y": 1},
41 }, 41 {"matrix": [5, 2], "x": 12, "y": 1.1},
42 { 42 {"matrix": [5, 1], "x": 13, "y": 1.3},
43 "label": "T", 43 {"matrix": [5, 0], "x": 14, "y": 1.3},
44 "x": 5, 44
45 "y": 0.2 45 {"matrix": [2, 0], "x": 0, "y": 2.3},
46 }, 46 {"matrix": [2, 1], "x": 1, "y": 2.3},
47 { 47 {"matrix": [2, 2], "x": 2, "y": 2.1},
48 "label": "Y", 48 {"matrix": [2, 3], "x": 3, "y": 2},
49 "x": 9, 49 {"matrix": [2, 4], "x": 4, "y": 2.1},
50 "y": 0.2 50 {"matrix": [2, 5], "x": 5, "y": 2.2},
51 }, 51
52 { 52 {"matrix": [6, 5], "x": 9, "y": 2.2},
53 "label": "U", 53 {"matrix": [6, 4], "x": 10, "y": 2.1},
54 "x": 10, 54 {"matrix": [6, 3], "x": 11, "y": 2},
55 "y": 0.1 55 {"matrix": [6, 2], "x": 12, "y": 2.1},
56 }, 56 {"matrix": [6, 1], "x": 13, "y": 2.3},
57 { 57 {"matrix": [6, 0], "x": 14, "y": 2.3},
58 "label": "I", 58
59 "x": 11, 59 {"matrix": [3, 3], "x": 4, "y": 3.7},
60 "y": 0 60 {"matrix": [3, 4], "x": 5, "y": 3.7},
61 }, 61 {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
62 { 62
63 "label": "O", 63 {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
64 "x": 12, 64 {"matrix": [7, 4], "x": 9, "y": 3.7},
65 "y": 0.1 65 {"matrix": [7, 3], "x": 10, "y": 3.7}
66 },
67 {
68 "label": "P",
69 "x": 13,
70 "y": 0.3
71 },
72 {
73 "label": "Back Space",
74 "x": 14,
75 "y": 0.3
76 },
77 {
78 "label": "Tab",
79 "x": 0,
80 "y": 1.3
81 },
82 {
83 "label": "A",
84 "x": 1,
85 "y": 1.3
86 },
87 {
88 "label": "S",
89 "x": 2,
90 "y": 1.1
91 },
92 {
93 "label": "D",
94 "x": 3,
95 "y": 1
96 },
97 {
98 "label": "F",
99 "x": 4,
100 "y": 1.1
101 },
102 {
103 "label": "G",
104 "x": 5,
105 "y": 1.2
106 },
107 {
108 "label": "H",
109 "x": 9,
110 "y": 1.2
111 },
112 {
113 "label": "J",
114 "x": 10,
115 "y": 1.1
116 },
117 {
118 "label": "K",
119 "x": 11,
120 "y": 1
121 },
122 {
123 "label": "L",
124 "x": 12,
125 "y": 1.1
126 },
127 {
128 "label": ";",
129 "x": 13,
130 "y": 1.3
131 },
132 {
133 "label": "'",
134 "x": 14,
135 "y": 1.3
136 },
137 {
138 "label": "Shift",
139 "x": 0,
140 "y": 2.3
141 },
142 {
143 "label": "Z",
144 "x": 1,
145 "y": 2.3
146 },
147 {
148 "label": "X",
149 "x": 2,
150 "y": 2.1
151 },
152 {
153 "label": "C",
154 "x": 3,
155 "y": 2
156 },
157 {
158 "label": "V",
159 "x": 4,
160 "y": 2.1
161 },
162 {
163 "label": "B",
164 "x": 5,
165 "y": 2.2
166 },
167 {
168 "label": "N",
169 "x": 9,
170 "y": 2.2
171 },
172 {
173 "label": "M",
174 "x": 10,
175 "y": 2.1
176 },
177 {
178 "label": ",",
179 "x": 11,
180 "y": 2
181 },
182 {
183 "label": ".",
184 "x": 12,
185 "y": 2.1
186 },
187 {
188 "label": "/",
189 "x": 13,
190 "y": 2.3
191 },
192 {
193 "label": "Shift",
194 "x": 14,
195 "y": 2.3
196 },
197 {
198 "label": "GUI",
199 "x": 4,
200 "y": 3.7
201 },
202 {
203 "label": "Lower",
204 "x": 5,
205 "y": 3.7
206 },
207 {
208 "label": "Space",
209 "x": 6,
210 "y": 3.2,
211 "h": 1.5
212 },
213 {
214 "label": "Enter",
215 "x": 8,
216 "y": 3.2,
217 "h": 1.5
218 },
219 {
220 "label": "Raise",
221 "x": 9,
222 "y": 3.7
223 },
224 {
225 "label": "Alt",
226 "x": 10,
227 "y": 3.7
228 }
229 ] 66 ]
230 }, 67 },
231 "LAYOUT_split_3x5_3": { 68 "LAYOUT_split_3x5_3": {
232 "layout": [ 69 "layout": [
233 {"label":"Q", "x":0, "y":0.3}, 70 {"matrix": [0, 1], "x": 0, "y": 0.3},
234 {"label":"W", "x":1, "y":0.1}, 71 {"matrix": [0, 2], "x": 1, "y": 0.1},
235 {"label":"E", "x":2, "y":0}, 72 {"matrix": [0, 3], "x": 2, "y": 0},
236 {"label":"R", "x":3, "y":0.1}, 73 {"matrix": [0, 4], "x": 3, "y": 0.1},
237 {"label":"T", "x":4, "y":0.2}, 74 {"matrix": [0, 5], "x": 4, "y": 0.2},
238 75
239 {"label":"Y", "x":8, "y":0.2}, 76 {"matrix": [4, 5], "x": 8, "y": 0.2},
240 {"label":"U", "x":9, "y":0.1}, 77 {"matrix": [4, 4], "x": 9, "y": 0.1},
241 {"label":"I", "x":10, "y":0}, 78 {"matrix": [4, 3], "x": 10, "y": 0},
242 {"label":"O", "x":11, "y":0.1}, 79 {"matrix": [4, 2], "x": 11, "y": 0.1},
243 {"label":"P", "x":12, "y":0.3}, 80 {"matrix": [4, 1], "x": 12, "y": 0.3},
244 81
245 {"label":"A", "x":0, "y":1.3}, 82 {"matrix": [1, 1], "x": 0, "y": 1.3},
246 {"label":"S", "x":1, "y":1.1}, 83 {"matrix": [1, 2], "x": 1, "y": 1.1},
247 {"label":"D", "x":2, "y":1}, 84 {"matrix": [1, 3], "x": 2, "y": 1},
248 {"label":"F", "x":3, "y":1.1}, 85 {"matrix": [1, 4], "x": 3, "y": 1.1},
249 {"label":"G", "x":4, "y":1.2}, 86 {"matrix": [1, 5], "x": 4, "y": 1.2},
250 87
251 {"label":"H", "x":8, "y":1.2}, 88 {"matrix": [5, 5], "x": 8, "y": 1.2},
252 {"label":"J", "x":9, "y":1.1}, 89 {"matrix": [5, 4], "x": 9, "y": 1.1},
253 {"label":"K", "x":10, "y":1}, 90 {"matrix": [5, 3], "x": 10, "y": 1},
254 {"label":"L", "x":11, "y":1.1}, 91 {"matrix": [5, 2], "x": 11, "y": 1.1},
255 {"label":";", "x":12, "y":1.3}, 92 {"matrix": [5, 1], "x": 12, "y": 1.3},
256 93
257 {"label":"Z", "x":0, "y":2.3}, 94 {"matrix": [2, 1], "x": 0, "y": 2.3},
258 {"label":"X", "x":1, "y":2.1}, 95 {"matrix": [2, 2], "x": 1, "y": 2.1},
259 {"label":"C", "x":2, "y":2}, 96 {"matrix": [2, 3], "x": 2, "y": 2},
260 {"label":"V", "x":3, "y":2.1}, 97 {"matrix": [2, 4], "x": 3, "y": 2.1},
261 {"label":"B", "x":4, "y":2.2}, 98 {"matrix": [2, 5], "x": 4, "y": 2.2},
262 99
263 {"label":"N", "x":8, "y":2.2}, 100 {"matrix": [6, 5], "x": 8, "y": 2.2},
264 {"label":"M", "x":9, "y":2.1}, 101 {"matrix": [6, 4], "x": 9, "y": 2.1},
265 {"label":",", "x":10, "y":2}, 102 {"matrix": [6, 3], "x": 10, "y": 2},
266 {"label":".", "x":11, "y":2.1}, 103 {"matrix": [6, 2], "x": 11, "y": 2.1},
267 {"label":"/", "x":12, "y":2.3}, 104 {"matrix": [6, 1], "x": 12, "y": 2.3},
268 105
269 {"label":"GUI", "x":3, "y":3.7}, 106 {"matrix": [3, 3], "x": 3, "y": 3.7},
270 {"label":"Lower", "x":4, "y":3.7}, 107 {"matrix": [3, 4], "x": 4, "y": 3.7},
271 {"label":"Space", "x":5, "y":3.2, "h":1.5}, 108 {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
272 109
273 {"label":"Enter", "x":7, "y":3.2, "h":1.5}, 110 {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
274 {"label":"Raise", "x":8, "y":3.7}, 111 {"matrix": [7, 4], "x": 8, "y": 3.7},
275 {"label":"Alt", "x":9, "y":3.7} 112 {"matrix": [7, 3], "x": 9, "y": 3.7}
276 ] 113 ]
277 } 114 }
278 } 115 }
279} 116}
diff --git a/keyboards/ingrained/ingrained.h b/keyboards/ingrained/ingrained.h
deleted file mode 100644
index d2e3055951..0000000000
--- a/keyboards/ingrained/ingrained.h
+++ /dev/null
@@ -1,47 +0,0 @@
1// Copyright 2021 s8erdude (@jpuerto96)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8/* This is a shortcut to help you visually see your layout.
9 *
10 * The first section contains all of the arguments representing the physical
11 * layout of the board and position of the keys.
12 *
13 * The second converts the arguments into a two-dimensional array which
14 * represents the switch matrix.
15 */
16#define XXX KC_NO
17
18#define LAYOUT_split_3x6_3( \
19 k00, k01, k02, k03, k04, k05, k011, k010, k09, k08, k07, k06,\
20 k10, k11, k12, k13, k14, k15, k111, k110, k19, k18, k17, k16,\
21 k20, k21, k22, k23, k24, k25, k211, k210, k29, k28, k27, k26,\
22 k33, k34, k35, k311, k310, k39\
23) { \
24 { k00, k01, k02, k03, k04, k05 },\
25 { k10, k11, k12, k13, k14, k15 },\
26 { k20, k21, k22, k23, k24, k25 },\
27 { XXX, XXX, XXX, k33, k34, k35 },\
28 { k06, k07, k08, k09, k010, k011 },\
29 { k16, k17, k18, k19, k110, k111 },\
30 { k26, k27, k28, k29, k210, k211 },\
31 { XXX, XXX, XXX, k39, k310, k311 }\
32}
33#define LAYOUT_split_3x5_3( \
34 k01, k02, k03, k04, k05, k011, k010, k09, k08, k07,\
35 k11, k12, k13, k14, k15, k111, k110, k19, k18, k17,\
36 k21, k22, k23, k24, k25, k211, k210, k29, k28, k27,\
37 k33, k34, k35, k311, k310, k39\
38) { \
39 { XXX, k01, k02, k03, k04, k05 },\
40 { XXX, k11, k12, k13, k14, k15 },\
41 { XXX, k21, k22, k23, k24, k25 },\
42 { XXX, XXX, XXX, k33, k34, k35 },\
43 { XXX, k07, k08, k09, k010, k011 },\
44 { XXX, k17, k18, k19, k110, k111 },\
45 { XXX, k27, k28, k29, k210, k211 },\
46 { XXX, XXX, XXX, k39, k310, k311 }\
47}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:34:16 +0000