aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kbdfans
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-09-19 23:37:31 -0700
committerGitHub <noreply@github.com>2020-09-19 23:37:31 -0700
commitfb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32 (patch)
tree9a8a53fd38474e21a774f5e51f25f453f0fab6c3 /keyboards/kbdfans
parenta2ff3c4d145a528d6b6aaf309b46228f184f0bd5 (diff)
downloadqmk_firmware-fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32.tar.gz
qmk_firmware-fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32.zip
KBD67 MkII Soldered: ISO layout patches (#10367)
* KBD67 MkII Soldered: Fix ISO blocker layout Matrix data was wrong; KC_NUHS key did not work. * KBD67 MkII Soldered: Add ISO blocker with Split Backspace layout
Diffstat (limited to 'keyboards/kbdfans')
-rw-r--r--keyboards/kbdfans/kbd67/mkii_soldered/info.json72
-rw-r--r--keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h21
2 files changed, 90 insertions, 3 deletions
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/info.json
index 72c851e35..cb012517a 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/info.json
@@ -290,6 +290,78 @@
290 {"label":"\u2193", "x":14, "y":4}, 290 {"label":"\u2193", "x":14, "y":4},
291 {"label":"\u2192", "x":15, "y":4} 291 {"label":"\u2192", "x":15, "y":4}
292 ] 292 ]
293 },
294 "LAYOUT_65_iso_blocker_split_bs": {
295 "layout": [{"label":"Esc", "x":0, "y":0},
296 {"label":"!", "x":1, "y":0},
297 {"label":"@", "x":2, "y":0},
298 {"label":"#", "x":3, "y":0},
299 {"label":"$", "x":4, "y":0},
300 {"label":"%", "x":5, "y":0},
301 {"label":"^", "x":6, "y":0},
302 {"label":"&", "x":7, "y":0},
303 {"label":"*", "x":8, "y":0},
304 {"label":"(", "x":9, "y":0},
305 {"label":")", "x":10, "y":0},
306 {"label":"_", "x":11, "y":0},
307 {"label":"+", "x":12, "y":0},
308 {"label":"|", "x":13, "y":0},
309 {"label":"Del", "x":14, "y":0},
310 {"label":"Home", "x":15, "y":0},
311 {"label":"Tab", "x":0, "y":1, "w":1.5},
312 {"label":"Q", "x":1.5, "y":1},
313 {"label":"W", "x":2.5, "y":1},
314 {"label":"E", "x":3.5, "y":1},
315 {"label":"R", "x":4.5, "y":1},
316 {"label":"T", "x":5.5, "y":1},
317 {"label":"Y", "x":6.5, "y":1},
318 {"label":"U", "x":7.5, "y":1},
319 {"label":"I", "x":8.5, "y":1},
320 {"label":"O", "x":9.5, "y":1},
321 {"label":"P", "x":10.5, "y":1},
322 {"label":"{", "x":11.5, "y":1},
323 {"label":"}", "x":12.5, "y":1},
324 {"label":"End", "x":15, "y":1},
325 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
326 {"label":"A", "x":1.75, "y":2},
327 {"label":"S", "x":2.75, "y":2},
328 {"label":"D", "x":3.75, "y":2},
329 {"label":"F", "x":4.75, "y":2},
330 {"label":"G", "x":5.75, "y":2},
331 {"label":"H", "x":6.75, "y":2},
332 {"label":"J", "x":7.75, "y":2},
333 {"label":"K", "x":8.75, "y":2},
334 {"label":"L", "x":9.75, "y":2},
335 {"label":":", "x":10.75, "y":2},
336 {"label":"\"", "x":11.75, "y":2},
337 {"label":"~", "x":12.75, "y":2},
338 {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
339 {"label":"PgUp", "x":15, "y":2},
340 {"label":"Shift", "x":0, "y":3, "w":1.25},
341 {"label":"|", "x":1.25, "y":3},
342 {"label":"Z", "x":2.25, "y":3},
343 {"label":"X", "x":3.25, "y":3},
344 {"label":"C", "x":4.25, "y":3},
345 {"label":"V", "x":5.25, "y":3},
346 {"label":"B", "x":6.25, "y":3},
347 {"label":"N", "x":7.25, "y":3},
348 {"label":"M", "x":8.25, "y":3},
349 {"label":"<", "x":9.25, "y":3},
350 {"label":">", "x":10.25, "y":3},
351 {"label":"?", "x":11.25, "y":3},
352 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
353 {"label":"\u2191", "x":14, "y":3},
354 {"label":"PgDn", "x":15, "y":3},
355 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
356 {"label":"Win", "x":1.25, "y":4, "w":1.25},
357 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
358 {"x":3.75, "y":4, "w":6.25},
359 {"label":"Alt", "x":10, "y":4, "w":1.25},
360 {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
361 {"label":"\u2190", "x":13, "y":4},
362 {"label":"\u2193", "x":14, "y":4},
363 {"label":"\u2192", "x":15, "y":4}
364 ]
293 } 365 }
294 } 366 }
295} 367}
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h
index 6b80aa20b..48268d0be 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h
@@ -74,14 +74,29 @@
74#define LAYOUT_65_iso_blocker( \ 74#define LAYOUT_65_iso_blocker( \
75 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ 75 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
76 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \ 76 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \
77 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ 77 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, K214, \
78 K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ 78 K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
79 K400, K401, K402, K405, K409, K410, K411, K413, K414 \ 79 K400, K401, K402, K405, K409, K410, K411, K413, K414 \
80) \ 80) \
81{ \ 81{ \
82 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ 82 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
83 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114 }, \ 83 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
84 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ 84 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \
85 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ 85 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \
86 { K400, K401, K402, KC_NO, K404, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ 86 { K400, K401, K402, KC_NO, K404, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \
87} 87}
88
89#define LAYOUT_65_iso_blocker_split_bs( \
90 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \
91 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \
92 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, K214, \
93 K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
94 K400, K401, K402, K405, K409, K410, K411, K413, K414 \
95) \
96{ \
97 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
98 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
99 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
100 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \
101 { K400, K401, K402, KC_NO, K404, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \
102}