aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-09-25 19:25:43 +0000
committerGitHub <noreply@github.com>2021-09-25 12:25:43 -0700
commit3296c26c9829ec261261a273130197235b05b05e (patch)
treeece2a33e559a37c5385e3fc83bfbba9e2e4ac6db
parent5c2d15573d32b839f0cf7915ef141812ab03bfdf (diff)
downloadqmk_firmware-3296c26c9829ec261261a273130197235b05b05e.tar.gz
qmk_firmware-3296c26c9829ec261261a273130197235b05b05e.zip
Saka68 Solder Refactor (#14596)
* rename LAYOUT to LAYOUT_68_ansi * tidy-up keymaps Adjusts indenting for readability/aesthetics. * add LAYOUT_68_iso macro * enable Community Layout support * add Split Backspace layout variants * remove KBFirmware Parser references * correct keyboard metadata
-rw-r--r--keyboards/cmm_studio/saka68/solder/config.h2
-rw-r--r--keyboards/cmm_studio/saka68/solder/info.json246
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c16
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c40
-rw-r--r--keyboards/cmm_studio/saka68/solder/rules.mk2
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.c3
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.h45
7 files changed, 315 insertions, 39 deletions
diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h
index a886f01a4..3dd09922c 100644
--- a/keyboards/cmm_studio/saka68/solder/config.h
+++ b/keyboards/cmm_studio/saka68/solder/config.h
@@ -23,7 +23,7 @@
23#define PRODUCT_ID 0x534B 23#define PRODUCT_ID 0x534B
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER CMM.Studio 25#define MANUFACTURER CMM.Studio
26#define PRODUCT Saka68 26#define PRODUCT Saka68 Solder
27 27
28/* key matrix size */ 28/* key matrix size */
29#define MATRIX_ROWS 5 29#define MATRIX_ROWS 5
diff --git a/keyboards/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/info.json
index 2719d4ee2..685629447 100644
--- a/keyboards/cmm_studio/saka68/solder/info.json
+++ b/keyboards/cmm_studio/saka68/solder/info.json
@@ -1,9 +1,12 @@
1{ 1{
2 "keyboard_name": "CMM.Studio Saka68", 2 "keyboard_name": "CMM.Studio Saka68 Solder",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "CMMS-Freather",
5 "layout_aliases": {
6 "LAYOUT": "LAYOUT_68_ansi"
7 },
5 "layouts": { 8 "layouts": {
6 "LAYOUT": { 9 "LAYOUT_68_ansi": {
7 "layout": [ 10 "layout": [
8 {"label":"K00 (D1,D4)", "x":0, "y":0}, 11 {"label":"K00 (D1,D4)", "x":0, "y":0},
9 {"label":"K01 (D1,D6)", "x":1, "y":0}, 12 {"label":"K01 (D1,D6)", "x":1, "y":0},
@@ -21,6 +24,7 @@
21 {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2}, 24 {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
22 {"label":"K0F (D1,D3)", "x":15.25, "y":0}, 25 {"label":"K0F (D1,D3)", "x":15.25, "y":0},
23 {"label":"K0G (D1,D5)", "x":16.25, "y":0}, 26 {"label":"K0G (D1,D5)", "x":16.25, "y":0},
27
24 {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5}, 28 {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
25 {"label":"K11 (D0,D6)", "x":1.5, "y":1}, 29 {"label":"K11 (D0,D6)", "x":1.5, "y":1},
26 {"label":"K12 (D0,D7)", "x":2.5, "y":1}, 30 {"label":"K12 (D0,D7)", "x":2.5, "y":1},
@@ -37,6 +41,7 @@
37 {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5}, 41 {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
38 {"label":"K1E (D0,D2)", "x":15.25, "y":1}, 42 {"label":"K1E (D0,D2)", "x":15.25, "y":1},
39 {"label":"K1F (D0,D3)", "x":16.25, "y":1}, 43 {"label":"K1F (D0,D3)", "x":16.25, "y":1},
44
40 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75}, 45 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
41 {"label":"K21 (B0,D6)", "x":1.75, "y":2}, 46 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
42 {"label":"K22 (B0,D7)", "x":2.75, "y":2}, 47 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
@@ -50,6 +55,7 @@
50 {"label":"K2A (B0,F0)", "x":10.75, "y":2}, 55 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
51 {"label":"K2B (B0,B1)", "x":11.75, "y":2}, 56 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
52 {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25}, 57 {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
58
53 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25}, 59 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
54 {"label":"K32 (F6,D7)", "x":2.25, "y":3}, 60 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
55 {"label":"K33 (F6,B4)", "x":3.25, "y":3}, 61 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
@@ -63,6 +69,239 @@
63 {"label":"K3B (F6,B1)", "x":11.25, "y":3}, 69 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
64 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75}, 70 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
65 {"label":"K3E (F6,D2)", "x":15.25, "y":3}, 71 {"label":"K3E (F6,D2)", "x":15.25, "y":3},
72
73 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
74 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
75 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
76 {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
77 {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
78 {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
79 {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
80 {"label":"K4D (F7,B3)", "x":14.25, "y":4},
81 {"label":"K4E (F7,D2)", "x":15.25, "y":4},
82 {"label":"K4F (F7,D3)", "x":16.25, "y":4}
83 ]
84 },
85 "LAYOUT_68_ansi_split_bs": {
86 "layout": [
87 {"label":"K00 (D1,D4)", "x":0, "y":0},
88 {"label":"K01 (D1,D6)", "x":1, "y":0},
89 {"label":"K02 (D1,D7)", "x":2, "y":0},
90 {"label":"K03 (D1,B4)", "x":3, "y":0},
91 {"label":"K04 (D1,B5)", "x":4, "y":0},
92 {"label":"K05 (D1,B6)", "x":5, "y":0},
93 {"label":"K06 (D1,C6)", "x":6, "y":0},
94 {"label":"K07 (D1,F5)", "x":7, "y":0},
95 {"label":"K08 (D1,F4)", "x":8, "y":0},
96 {"label":"K09 (D1,F1)", "x":9, "y":0},
97 {"label":"K0A (D1,F0)", "x":10, "y":0},
98 {"label":"K0B (D1,B1)", "x":11, "y":0},
99 {"label":"K0C (D1,B2)", "x":12, "y":0},
100 {"label":"K0D (D1,B3)", "x":13, "y":0},
101 {"label":"K0E (D1,D2)", "x":14, "y":0},
102 {"label":"K0F (D1,D3)", "x":15.25, "y":0},
103 {"label":"K0G (D1,D5)", "x":16.25, "y":0},
104
105 {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
106 {"label":"K11 (D0,D6)", "x":1.5, "y":1},
107 {"label":"K12 (D0,D7)", "x":2.5, "y":1},
108 {"label":"K13 (D0,B4)", "x":3.5, "y":1},
109 {"label":"K14 (D0,B5)", "x":4.5, "y":1},
110 {"label":"K15 (D0,B6)", "x":5.5, "y":1},
111 {"label":"K16 (D0,C6)", "x":6.5, "y":1},
112 {"label":"K17 (D0,F5)", "x":7.5, "y":1},
113 {"label":"K18 (D0,F4)", "x":8.5, "y":1},
114 {"label":"K19 (D0,F1)", "x":9.5, "y":1},
115 {"label":"K1A (D0,F0)", "x":10.5, "y":1},
116 {"label":"K1B (D0,B1)", "x":11.5, "y":1},
117 {"label":"K1C (D0,B2)", "x":12.5, "y":1},
118 {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
119 {"label":"K1E (D0,D2)", "x":15.25, "y":1},
120 {"label":"K1F (D0,D3)", "x":16.25, "y":1},
121
122 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
123 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
124 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
125 {"label":"K23 (B0,B4)", "x":3.75, "y":2},
126 {"label":"K24 (B0,B5)", "x":4.75, "y":2},
127 {"label":"K25 (B0,B6)", "x":5.75, "y":2},
128 {"label":"K26 (B0,C6)", "x":6.75, "y":2},
129 {"label":"K27 (B0,F5)", "x":7.75, "y":2},
130 {"label":"K28 (B0,F4)", "x":8.75, "y":2},
131 {"label":"K29 (B0,F1)", "x":9.75, "y":2},
132 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
133 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
134 {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
135
136 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
137 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
138 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
139 {"label":"K34 (F6,B5)", "x":4.25, "y":3},
140 {"label":"K35 (F6,B6)", "x":5.25, "y":3},
141 {"label":"K36 (F6,C6)", "x":6.25, "y":3},
142 {"label":"K37 (F6,F5)", "x":7.25, "y":3},
143 {"label":"K38 (F6,F4)", "x":8.25, "y":3},
144 {"label":"K39 (F6,F1)", "x":9.25, "y":3},
145 {"label":"K3A (F6,F0)", "x":10.25, "y":3},
146 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
147 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
148 {"label":"K3E (F6,D2)", "x":15.25, "y":3},
149
150 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
151 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
152 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
153 {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
154 {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
155 {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
156 {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
157 {"label":"K4D (F7,B3)", "x":14.25, "y":4},
158 {"label":"K4E (F7,D2)", "x":15.25, "y":4},
159 {"label":"K4F (F7,D3)", "x":16.25, "y":4}
160 ]
161 },
162 "LAYOUT_68_iso": {
163 "layout": [
164 {"label":"K00 (D1,D4)", "x":0, "y":0},
165 {"label":"K01 (D1,D6)", "x":1, "y":0},
166 {"label":"K02 (D1,D7)", "x":2, "y":0},
167 {"label":"K03 (D1,B4)", "x":3, "y":0},
168 {"label":"K04 (D1,B5)", "x":4, "y":0},
169 {"label":"K05 (D1,B6)", "x":5, "y":0},
170 {"label":"K06 (D1,C6)", "x":6, "y":0},
171 {"label":"K07 (D1,F5)", "x":7, "y":0},
172 {"label":"K08 (D1,F4)", "x":8, "y":0},
173 {"label":"K09 (D1,F1)", "x":9, "y":0},
174 {"label":"K0A (D1,F0)", "x":10, "y":0},
175 {"label":"K0B (D1,B1)", "x":11, "y":0},
176 {"label":"K0C (D1,B2)", "x":12, "y":0},
177 {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
178 {"label":"K0F (D1,D3)", "x":15.25, "y":0},
179 {"label":"K0G (D1,D5)", "x":16.25, "y":0},
180
181 {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
182 {"label":"K11 (D0,D6)", "x":1.5, "y":1},
183 {"label":"K12 (D0,D7)", "x":2.5, "y":1},
184 {"label":"K13 (D0,B4)", "x":3.5, "y":1},
185 {"label":"K14 (D0,B5)", "x":4.5, "y":1},
186 {"label":"K15 (D0,B6)", "x":5.5, "y":1},
187 {"label":"K16 (D0,C6)", "x":6.5, "y":1},
188 {"label":"K17 (D0,F5)", "x":7.5, "y":1},
189 {"label":"K18 (D0,F4)", "x":8.5, "y":1},
190 {"label":"K19 (D0,F1)", "x":9.5, "y":1},
191 {"label":"K1A (D0,F0)", "x":10.5, "y":1},
192 {"label":"K1B (D0,B1)", "x":11.5, "y":1},
193 {"label":"K1C (D0,B2)", "x":12.5, "y":1},
194 {"label":"K1E (D0,D2)", "x":15.25, "y":1},
195 {"label":"K1F (D0,D3)", "x":16.25, "y":1},
196
197 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
198 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
199 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
200 {"label":"K23 (B0,B4)", "x":3.75, "y":2},
201 {"label":"K24 (B0,B5)", "x":4.75, "y":2},
202 {"label":"K25 (B0,B6)", "x":5.75, "y":2},
203 {"label":"K26 (B0,C6)", "x":6.75, "y":2},
204 {"label":"K27 (B0,F5)", "x":7.75, "y":2},
205 {"label":"K28 (B0,F4)", "x":8.75, "y":2},
206 {"label":"K29 (B0,F1)", "x":9.75, "y":2},
207 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
208 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
209 {"label":"K2C (B0,B2)", "x":12.75, "y":2},
210 {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
211
212 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
213 {"label":"K31 (F6,D6)", "x":1.25, "y":3},
214 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
215 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
216 {"label":"K34 (F6,B5)", "x":4.25, "y":3},
217 {"label":"K35 (F6,B6)", "x":5.25, "y":3},
218 {"label":"K36 (F6,C6)", "x":6.25, "y":3},
219 {"label":"K37 (F6,F5)", "x":7.25, "y":3},
220 {"label":"K38 (F6,F4)", "x":8.25, "y":3},
221 {"label":"K39 (F6,F1)", "x":9.25, "y":3},
222 {"label":"K3A (F6,F0)", "x":10.25, "y":3},
223 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
224 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
225 {"label":"K3E (F6,D2)", "x":15.25, "y":3},
226
227 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
228 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
229 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
230 {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
231 {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
232 {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
233 {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
234 {"label":"K4D (F7,B3)", "x":14.25, "y":4},
235 {"label":"K4E (F7,D2)", "x":15.25, "y":4},
236 {"label":"K4F (F7,D3)", "x":16.25, "y":4}
237 ]
238 },
239 "LAYOUT_68_iso_split_bs": {
240 "layout": [
241 {"label":"K00 (D1,D4)", "x":0, "y":0},
242 {"label":"K01 (D1,D6)", "x":1, "y":0},
243 {"label":"K02 (D1,D7)", "x":2, "y":0},
244 {"label":"K03 (D1,B4)", "x":3, "y":0},
245 {"label":"K04 (D1,B5)", "x":4, "y":0},
246 {"label":"K05 (D1,B6)", "x":5, "y":0},
247 {"label":"K06 (D1,C6)", "x":6, "y":0},
248 {"label":"K07 (D1,F5)", "x":7, "y":0},
249 {"label":"K08 (D1,F4)", "x":8, "y":0},
250 {"label":"K09 (D1,F1)", "x":9, "y":0},
251 {"label":"K0A (D1,F0)", "x":10, "y":0},
252 {"label":"K0B (D1,B1)", "x":11, "y":0},
253 {"label":"K0C (D1,B2)", "x":12, "y":0},
254 {"label":"K0D (D1,B3)", "x":13, "y":0},
255 {"label":"K0E (D1,D2)", "x":14, "y":0},
256 {"label":"K0F (D1,D3)", "x":15.25, "y":0},
257 {"label":"K0G (D1,D5)", "x":16.25, "y":0},
258
259 {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
260 {"label":"K11 (D0,D6)", "x":1.5, "y":1},
261 {"label":"K12 (D0,D7)", "x":2.5, "y":1},
262 {"label":"K13 (D0,B4)", "x":3.5, "y":1},
263 {"label":"K14 (D0,B5)", "x":4.5, "y":1},
264 {"label":"K15 (D0,B6)", "x":5.5, "y":1},
265 {"label":"K16 (D0,C6)", "x":6.5, "y":1},
266 {"label":"K17 (D0,F5)", "x":7.5, "y":1},
267 {"label":"K18 (D0,F4)", "x":8.5, "y":1},
268 {"label":"K19 (D0,F1)", "x":9.5, "y":1},
269 {"label":"K1A (D0,F0)", "x":10.5, "y":1},
270 {"label":"K1B (D0,B1)", "x":11.5, "y":1},
271 {"label":"K1C (D0,B2)", "x":12.5, "y":1},
272 {"label":"K1E (D0,D2)", "x":15.25, "y":1},
273 {"label":"K1F (D0,D3)", "x":16.25, "y":1},
274
275 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
276 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
277 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
278 {"label":"K23 (B0,B4)", "x":3.75, "y":2},
279 {"label":"K24 (B0,B5)", "x":4.75, "y":2},
280 {"label":"K25 (B0,B6)", "x":5.75, "y":2},
281 {"label":"K26 (B0,C6)", "x":6.75, "y":2},
282 {"label":"K27 (B0,F5)", "x":7.75, "y":2},
283 {"label":"K28 (B0,F4)", "x":8.75, "y":2},
284 {"label":"K29 (B0,F1)", "x":9.75, "y":2},
285 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
286 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
287 {"label":"K2C (B0,B2)", "x":12.75, "y":2},
288 {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
289
290 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
291 {"label":"K31 (F6,D6)", "x":1.25, "y":3},
292 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
293 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
294 {"label":"K34 (F6,B5)", "x":4.25, "y":3},
295 {"label":"K35 (F6,B6)", "x":5.25, "y":3},
296 {"label":"K36 (F6,C6)", "x":6.25, "y":3},
297 {"label":"K37 (F6,F5)", "x":7.25, "y":3},
298 {"label":"K38 (F6,F4)", "x":8.25, "y":3},
299 {"label":"K39 (F6,F1)", "x":9.25, "y":3},
300 {"label":"K3A (F6,F0)", "x":10.25, "y":3},
301 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
302 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
303 {"label":"K3E (F6,D2)", "x":15.25, "y":3},
304
66 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25}, 305 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
67 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25}, 306 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
68 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25}, 307 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
@@ -76,5 +315,4 @@
76 ] 315 ]
77 } 316 }
78 } 317 }
79 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
80} 318}
diff --git a/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c b/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
index 88f6db4ed..0c9983584 100644
--- a/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
@@ -17,20 +17,20 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_68_ansi(
21 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, 21 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,
22 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, 22 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END,
23 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 23 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 27
28 [1] = LAYOUT( 28 [1] = LAYOUT_68_ansi(
29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, 29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ), 34 ),
35 35
36}; 36};
diff --git a/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c b/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
index bd55f0d85..12334284a 100644
--- a/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
@@ -17,35 +17,35 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_68_ansi(
21 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, 21 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,
22 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, 22 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END,
23 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 23 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 27
28 [1] = LAYOUT( 28 [1] = LAYOUT_68_ansi(
29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, 29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ), 34 ),
35 35
36 [2] = LAYOUT( 36 [2] = LAYOUT_68_ansi(
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
42 ), 42 ),
43 43
44 [3] = LAYOUT( 44 [3] = LAYOUT_68_ansi(
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
50 ), 50 ),
51}; 51};
diff --git a/keyboards/cmm_studio/saka68/solder/rules.mk b/keyboards/cmm_studio/saka68/solder/rules.mk
index f2e5379ac..077b060ee 100644
--- a/keyboards/cmm_studio/saka68/solder/rules.mk
+++ b/keyboards/cmm_studio/saka68/solder/rules.mk
@@ -19,3 +19,5 @@ NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22
23LAYOUTS = 68_ansi 68_iso
diff --git a/keyboards/cmm_studio/saka68/solder/solder.c b/keyboards/cmm_studio/saka68/solder/solder.c
index 5ff4cf0b9..195c14023 100644
--- a/keyboards/cmm_studio/saka68/solder/solder.c
+++ b/keyboards/cmm_studio/saka68/solder/solder.c
@@ -15,6 +15,3 @@
15 */ 15 */
16 16
17#include "solder.h" 17#include "solder.h"
18
19// generated by KBFirmware JSON to QMK Parser
20// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/solder/solder.h b/keyboards/cmm_studio/saka68/solder/solder.h
index 4d1d02163..e1945eab4 100644
--- a/keyboards/cmm_studio/saka68/solder/solder.h
+++ b/keyboards/cmm_studio/saka68/solder/solder.h
@@ -18,7 +18,7 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT( \ 21#define LAYOUT_68_ansi( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \ 22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ 23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ 24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
@@ -32,5 +32,44 @@
32 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \ 32 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
33} 33}
34 34
35// generated by KBFirmware JSON to QMK Parser 35#define LAYOUT_68_ansi_split_bs( \
36// https://noroadsleft.github.io/kbf_qmk_converter/ 36 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
37 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
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, K3E, \
40 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
41) { \
42 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
43 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO }, \
44 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO, KC_NO }, \
45 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
46 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
47}
48
49#define LAYOUT_68_iso( \
50 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \
51 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
52 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
53 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
54 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
55) { \
56 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F, K0G }, \
57 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
58 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
59 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
60 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
61}
62
63#define LAYOUT_68_iso_split_bs( \
64 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
65 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
66 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
67 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
68 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
69) { \
70 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
71 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
72 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
73 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
74 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
75}