summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-27 05:13:11 +0000
committerQMK Bot <hello@qmk.fm>2022-01-27 05:13:11 +0000
commited8ab3e32c31bf45d266997444210fe30d21df77 (patch)
treef655c9126030254c0640b15a200c30bd166e8de1
parent2df420f1f4407c6f6d8287065807bc7bde3e39d8 (diff)
parent52e12588c950e5bd19d3c0abbe6b5cc3da6d7c22 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/info.json504
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c22
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md4
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c38
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md1
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c22
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md5
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c22
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md6
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c44
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md6
-rw-r--r--keyboards/sawnsprojects/krush/krush65/solder/solder.h101
-rw-r--r--keyboards/senselessclay/ck60/ck60.h24
-rw-r--r--keyboards/senselessclay/ck60/info.json88
-rw-r--r--keyboards/senselessclay/ck60/keymaps/default/keymap.c54
-rw-r--r--keyboards/senselessclay/ck60/keymaps/via/keymap.c54
-rw-r--r--keyboards/senselessclay/ck60/rules.mk4
17 files changed, 496 insertions, 503 deletions
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index 6c10d660e2..b72946bf55 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -2,297 +2,237 @@
"keyboard_name": "Krush65 Solder",
"url": "",
"maintainer": "MaiTheSan",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs_sp"
+ },
"layouts": {
- "LAYOUT_all": {
- "layout": [
- { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
- { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
- { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
- { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
- { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
- { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
- { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
- { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
- { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
- { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
- { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
- { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
- { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
- { "label": "K26 (D1,D5)", "x": 13, "y": 0 },
- { "label": "K17 (B2,D3)", "x": 14, "y": 0 },
- { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
- { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
- { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
- { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
- { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
- { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
- { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
- { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
- { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
- { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
- { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
- { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
- { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
- { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
- { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
- { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
- { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
- { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
- { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
- { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
- { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
- { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
- { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
- { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
- { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
- { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
- { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
- { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
- { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
- { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
- { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
- { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
- { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
- { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
- { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
- { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
- { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
- { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
- { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
- { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
- { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
- { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
- { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
- { "label": "K82 (F5,B6)", "x": 3.75, "y": 4, "w": 2.25 },
- { "label": "K92 (F4,B6)", "x": 6, "y": 4, "w": 1.25 },
- { "label": "K93 (F4,B5)", "x": 7.25, "y": 4, "w": 2.75 },
- { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
- { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
- { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
- { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
- { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
- ]
- },
"LAYOUT_65_ansi_blocker_split_bs_sp": {
"layout": [
- { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
- { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
- { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
- { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
- { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
- { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
- { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
- { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
- { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
- { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
- { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
- { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
- { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
- { "label": "K26 (D1,D5)", "x": 13, "y": 0 },
- { "label": "K17 (B2,D3)", "x": 14, "y": 0 },
- { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
- { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
- { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
- { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
- { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
- { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
- { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
- { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
- { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
- { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
- { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
- { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
- { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
- { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
- { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
- { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
- { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
- { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
- { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
- { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
- { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
- { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
- { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
- { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
- { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
- { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
- { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
- { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
- { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
- { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
- { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
- { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
- { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
- { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
- { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
- { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
- { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
- { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
- { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
- { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
- { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
- { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
- { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
- { "label": "K82 (F5,B6)", "x": 3.75, "y": 4, "w": 2.25 },
- { "label": "K92 (F4,B6)", "x": 6, "y": 4, "w": 1.25 },
- { "label": "K93 (F4,B5)", "x": 7.25, "y": 4, "w": 2.75 },
- { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
- { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
- { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
- { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
- { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
+ {"label":"K00 (B1,C7)", "x":0, "y":0},
+ {"label":"K10 (B2,C7)", "x":1, "y":0},
+ {"label":"K01 (B1,C6)", "x":2, "y":0},
+ {"label":"K11 (B2,C6)", "x":3, "y":0},
+ {"label":"K02 (B1,B6)", "x":4, "y":0},
+ {"label":"K12 (B2,B6)", "x":5, "y":0},
+ {"label":"K03 (B1,B5)", "x":6, "y":0},
+ {"label":"K13 (B2,B5)", "x":7, "y":0},
+ {"label":"K04 (B1,B4)", "x":8, "y":0},
+ {"label":"K14 (B2,B4)", "x":9, "y":0},
+ {"label":"K05 (B1,D7)", "x":10, "y":0},
+ {"label":"K15 (B2,D7)", "x":11, "y":0},
+ {"label":"K06 (B1,D5)", "x":12, "y":0},
+ {"label":"K26 (D1,D5)", "x":13, "y":0},
+ {"label":"K17 (B2,D3)", "x":14, "y":0},
+ {"label":"K07 (B1,D3)", "x":15, "y":0},
+
+ {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
+ {"label":"K30 (D2,C7)", "x":1.5, "y":1},
+ {"label":"K21 (D1,C6)", "x":2.5, "y":1},
+ {"label":"K31 (D2,C6)", "x":3.5, "y":1},
+ {"label":"K22 (D1,B6)", "x":4.5, "y":1},
+ {"label":"K32 (D2,B6)", "x":5.5, "y":1},
+ {"label":"K23 (D1,B5)", "x":6.5, "y":1},
+ {"label":"K33 (D2,B5)", "x":7.5, "y":1},
+ {"label":"K24 (D1,B4)", "x":8.5, "y":1},
+ {"label":"K34 (D2,B4)", "x":9.5, "y":1},
+ {"label":"K25 (D1,D7)", "x":10.5, "y":1},
+ {"label":"K35 (D2,D7)", "x":11.5, "y":1},
+ {"label":"K36 (D2,D5)", "x":12.5, "y":1},
+ {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
+ {"label":"K37 (D2,D3)", "x":15, "y":1},
+
+ {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
+ {"label":"K50 (D6,C7)", "x":1.75, "y":2},
+ {"label":"K41 (D4,C6)", "x":2.75, "y":2},
+ {"label":"K51 (D6,C6)", "x":3.75, "y":2},
+ {"label":"K42 (D4,B6)", "x":4.75, "y":2},
+ {"label":"K52 (D6,B6)", "x":5.75, "y":2},
+ {"label":"K43 (D4,B5)", "x":6.75, "y":2},
+ {"label":"K53 (D6,B5)", "x":7.75, "y":2},
+ {"label":"K44 (D4,B4)", "x":8.75, "y":2},
+ {"label":"K54 (D6,B4)", "x":9.75, "y":2},
+ {"label":"K45 (D4,D7)", "x":10.75, "y":2},
+ {"label":"K55 (D6,D7)", "x":11.75, "y":2},
+ {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
+ {"label":"K57 (D6,D3)", "x":15, "y":2},
+
+ {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
+ {"label":"K70 (F7,C7)", "x":2.25, "y":3},
+ {"label":"K61 (F6,C6)", "x":3.25, "y":3},
+ {"label":"K71 (F7,C6)", "x":4.25, "y":3},
+ {"label":"K62 (F6,B6)", "x":5.25, "y":3},
+ {"label":"K72 (F7,B6)", "x":6.25, "y":3},
+ {"label":"K63 (F6,B5)", "x":7.25, "y":3},
+ {"label":"K73 (F7,B5)", "x":8.25, "y":3},
+ {"label":"K64 (F6,B4)", "x":9.25, "y":3},
+ {"label":"K74 (F7,B4)", "x":10.25, "y":3},
+ {"label":"K65 (F6,D7)", "x":11.25, "y":3},
+ {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
+ {"label":"K77 (F7,D3)", "x":14, "y":3},
+ {"label":"K67 (F6,D3)", "x":15, "y":3},
+
+ {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
+ {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K82 (F5,B6)", "x":3.75, "y":4, "w":2.25},
+ {"label":"K92 (F4,B6)", "x":6, "y":4, "w":1.25},
+ {"label":"K93 (F4,B5)", "x":7.25, "y":4, "w":2.75},
+ {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
+ {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K95 (F4,D7)", "x":13, "y":4},
+ {"label":"K97 (F4,D3)", "x":14, "y":4},
+ {"label":"K87 (F5,D3)", "x":15, "y":4}
]
},
-
- "LAYOUT_65_ansi_blocker": {
+ "LAYOUT_65_ansi_blocker": {
"layout": [
- { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
- { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
- { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
- { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
- { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
- { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
- { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
- { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
- { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
- { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
- { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
- { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
- { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
- { "label": "K26 (D1,D5)", "x": 13, "y": 0, "w": 2 },
- { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
- { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
- { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
- { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
- { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
- { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
- { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
- { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
- { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
- { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
- { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
- { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
- { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
- { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
- { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
- { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
- { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
- { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
- { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
- { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
- { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
- { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
- { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
- { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
- { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
- { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
- { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
- { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
- { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
- { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
- { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
- { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
- { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
- { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
- { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
- { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
- { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
- { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
- { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
- { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
- { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
- { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
- { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
- { "label": "K92 (F4,B6)", "x": 3.75, "y": 4, "w": 6.25 },
- { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
- { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
- { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
- { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
- { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
+ {"label":"K00 (B1,C7)", "x":0, "y":0},
+ {"label":"K10 (B2,C7)", "x":1, "y":0},
+ {"label":"K01 (B1,C6)", "x":2, "y":0},
+ {"label":"K11 (B2,C6)", "x":3, "y":0},
+ {"label":"K02 (B1,B6)", "x":4, "y":0},
+ {"label":"K12 (B2,B6)", "x":5, "y":0},
+ {"label":"K03 (B1,B5)", "x":6, "y":0},
+ {"label":"K13 (B2,B5)", "x":7, "y":0},
+ {"label":"K04 (B1,B4)", "x":8, "y":0},
+ {"label":"K14 (B2,B4)", "x":9, "y":0},
+ {"label":"K05 (B1,D7)", "x":10, "y":0},
+ {"label":"K15 (B2,D7)", "x":11, "y":0},
+ {"label":"K06 (B1,D5)", "x":12, "y":0},
+ {"label":"K26 (D1,D5)", "x":13, "y":0, "w":2},
+ {"label":"K07 (B1,D3)", "x":15, "y":0},
+
+ {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
+ {"label":"K30 (D2,C7)", "x":1.5, "y":1},
+ {"label":"K21 (D1,C6)", "x":2.5, "y":1},
+ {"label":"K31 (D2,C6)", "x":3.5, "y":1},
+ {"label":"K22 (D1,B6)", "x":4.5, "y":1},
+ {"label":"K32 (D2,B6)", "x":5.5, "y":1},
+ {"label":"K23 (D1,B5)", "x":6.5, "y":1},
+ {"label":"K33 (D2,B5)", "x":7.5, "y":1},
+ {"label":"K24 (D1,B4)", "x":8.5, "y":1},
+ {"label":"K34 (D2,B4)", "x":9.5, "y":1},
+ {"label":"K25 (D1,D7)", "x":10.5, "y":1},
+ {"label":"K35 (D2,D7)", "x":11.5, "y":1},
+ {"label":"K36 (D2,D5)", "x":12.5, "y":1},
+ {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
+ {"label":"K37 (D2,D3)", "x":15, "y":1},
+
+ {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
+ {"label":"K50 (D6,C7)", "x":1.75, "y":2},
+ {"label":"K41 (D4,C6)", "x":2.75, "y":2},
+ {"label":"K51 (D6,C6)", "x":3.75, "y":2},
+ {"label":"K42 (D4,B6)", "x":4.75, "y":2},
+ {"label":"K52 (D6,B6)", "x":5.75, "y":2},
+ {"label":"K43 (D4,B5)", "x":6.75, "y":2},
+ {"label":"K53 (D6,B5)", "x":7.75, "y":2},
+ {"label":"K44 (D4,B4)", "x":8.75, "y":2},
+ {"label":"K54 (D6,B4)", "x":9.75, "y":2},
+ {"label":"K45 (D4,D7)", "x":10.75, "y":2},
+ {"label":"K55 (D6,D7)", "x":11.75, "y":2},
+ {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
+ {"label":"K57 (D6,D3)", "x":15, "y":2},
+
+ {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
+ {"label":"K70 (F7,C7)", "x":2.25, "y":3},
+ {"label":"K61 (F6,C6)", "x":3.25, "y":3},
+ {"label":"K71 (F7,C6)", "x":4.25, "y":3},
+ {"label":"K62 (F6,B6)", "x":5.25, "y":3},
+ {"label":"K72 (F7,B6)", "x":6.25, "y":3},
+ {"label":"K63 (F6,B5)", "x":7.25, "y":3},
+ {"label":"K73 (F7,B5)", "x":8.25, "y":3},
+ {"label":"K64 (F6,B4)", "x":9.25, "y":3},
+ {"label":"K74 (F7,B4)", "x":10.25, "y":3},
+ {"label":"K65 (F6,D7)", "x":11.25, "y":3},
+ {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
+ {"label":"K77 (F7,D3)", "x":14, "y":3},
+ {"label":"K67 (F6,D3)", "x":15, "y":3},
+
+ {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
+ {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
+ {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K95 (F4,D7)", "x":13, "y":4},
+ {"label":"K97 (F4,D3)", "x":14, "y":4},
+ {"label":"K87 (F5,D3)", "x":15, "y":4}
]
},
- "LAYOUT_65_ansi_blocker_split_bs": {
+ "LAYOUT_65_ansi_blocker_split_bs": {
"layout": [
- { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
- { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
- { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
- { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
- { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
- { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
- { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
- { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
- { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
- { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
- { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
- { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
- { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
- { "label": "K26 (D1,D5)", "x": 13, "y": 0 },
- { "label": "K17 (B2,D3)", "x": 14, "y": 0 },
- { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
- { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
- { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
- { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
- { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
- { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
- { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
- { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
- { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
- { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
- { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
- { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
- { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
- { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
- { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
- { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
- { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
- { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
- { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
- { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
- { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
- { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
- { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
- { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
- { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
- { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
- { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
- { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
- { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
- { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
- { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
- { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
- { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
- { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
- { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
- { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
- { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
- { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
- { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
- { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
- { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
- { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
- { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
- { "label": "K92 (F4,B6)", "x": 3.75, "y": 4, "w": 6.25 },
- { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
- { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
- { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
- { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
- { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
+ {"label":"K00 (B1,C7)", "x":0, "y":0},
+ {"label":"K10 (B2,C7)", "x":1, "y":0},
+ {"label":"K01 (B1,C6)", "x":2, "y":0},
+ {"label":"K11 (B2,C6)", "x":3, "y":0},
+ {"label":"K02 (B1,B6)", "x":4, "y":0},
+ {"label":"K12 (B2,B6)", "x":5, "y":0},
+ {"label":"K03 (B1,B5)", "x":6, "y":0},
+ {"label":"K13 (B2,B5)", "x":7, "y":0},
+ {"label":"K04 (B1,B4)", "x":8, "y":0},
+ {"label":"K14 (B2,B4)", "x":9, "y":0},
+ {"label":"K05 (B1,D7)", "x":10, "y":0},
+ {"label":"K15 (B2,D7)", "x":11, "y":0},
+ {"label":"K06 (B1,D5)", "x":12, "y":0},
+ {"label":"K26 (D1,D5)", "x":13, "y":0},
+ {"label":"K17 (B2,D3)", "x":14, "y":0},
+ {"label":"K07 (B1,D3)", "x":15, "y":0},
+
+ {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
+ {"label":"K30 (D2,C7)", "x":1.5, "y":1},
+ {"label":"K21 (D1,C6)", "x":2.5, "y":1},
+ {"label":"K31 (D2,C6)", "x":3.5, "y":1},
+ {"label":"K22 (D1,B6)", "x":4.5, "y":1},
+ {"label":"K32 (D2,B6)", "x":5.5, "y":1},
+ {"label":"K23 (D1,B5)", "x":6.5, "y":1},
+ {"label":"K33 (D2,B5)", "x":7.5, "y":1},
+ {"label":"K24 (D1,B4)", "x":8.5, "y":1},
+ {"label":"K34 (D2,B4)", "x":9.5, "y":1},
+ {"label":"K25 (D1,D7)", "x":10.5, "y":1},
+ {"label":"K35 (D2,D7)", "x":11.5, "y":1},
+ {"label":"K36 (D2,D5)", "x":12.5, "y":1},
+ {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
+ {"label":"K37 (D2,D3)", "x":15, "y":1},
+
+ {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
+ {"label":"K50 (D6,C7)", "x":1.75, "y":2},
+ {"label":"K41 (D4,C6)", "x":2.75, "y":2},
+ {"label":"K51 (D6,C6)", "x":3.75, "y":2},
+ {"label":"K42 (D4,B6)", "x":4.75, "y":2},
+ {"label":"K52 (D6,B6)", "x":5.75, "y":2},
+ {"label":"K43 (D4,B5)", "x":6.75, "y":2},
+ {"label":"K53 (D6,B5)", "x":7.75, "y":2},
+ {"label":"K44 (D4,B4)", "x":8.75, "y":2},
+ {"label":"K54 (D6,B4)", "x":9.75, "y":2},
+ {"label":"K45 (D4,D7)", "x":10.75, "y":2},
+ {"label":"K55 (D6,D7)", "x":11.75, "y":2},
+ {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
+ {"label":"K57 (D6,D3)", "x":15, "y":2},
+
+ {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
+ {"label":"K70 (F7,C7)", "x":2.25, "y":3},
+ {"label":"K61 (F6,C6)", "x":3.25, "y":3},
+ {"label":"K71 (F7,C6)", "x":4.25, "y":3},
+ {"label":"K62 (F6,B6)", "x":5.25, "y":3},
+ {"label":"K72 (F7,B6)", "x":6.25, "y":3},
+ {"label":"K63 (F6,B5)", "x":7.25, "y":3},
+ {"label":"K73 (F7,B5)", "x":8.25, "y":3},
+ {"label":"K64 (F6,B4)", "x":9.25, "y":3},
+ {"label":"K74 (F7,B4)", "x":10.25, "y":3},
+ {"label":"K65 (F6,D7)", "x":11.25, "y":3},
+ {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
+ {"label":"K77 (F7,D3)", "x":14, "y":3},
+ {"label":"K67 (F6,D3)", "x":15, "y":3},
+
+ {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
+ {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
+ {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K95 (F4,D7)", "x":13, "y":4},
+ {"label":"K97 (F4,D3)", "x":14, "y":4},
+ {"label":"K87 (F5,D3)", "x":15, "y":4}
]
}
}
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c
index e318957ac8..b684282b65 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c
@@ -18,22 +18,20 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
[0] = LAYOUT_65_ansi_blocker(
- 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_GRV,
- 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_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, KC_PGUP,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SPC, KC_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ 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_GRV,
+ 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_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, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SPC, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_65_ansi_blocker(
- 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, 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, 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, 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, KC_TRNS, KC_TRNS, 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
-
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md
index 181cc9a013..d69d73d349 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md
@@ -1 +1,3 @@
-# The keymap for krush65 solder layout ansi blocker \ No newline at end of file
+# The ansi_blocker keymap for krush65 solder
+
+* 65% ANSI layout with blocker
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c
deleted file mode 100644
index e74181129a..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
- [0] = LAYOUT_65_ansi_blocker_split_bs_sp(
- 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_GRV, KC_PSCR,
- 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_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, KC_PGUP,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- [1] = LAYOUT_65_ansi_blocker_split_bs_sp(
- 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,
- 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
-};
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md
deleted file mode 100644
index b6d1da89aa..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush65 solder layout ansi blocker with split backspace and split spacebar \ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c
index 54f2975c27..c238e92a59 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c
@@ -18,22 +18,20 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
[0] = LAYOUT_65_ansi_blocker_split_bs(
- 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_GRV, KC_PSCR,
- 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_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, KC_PGUP,
- 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, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ 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_GRV, KC_PSCR,
+ 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_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, KC_PGUP,
+ 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, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_65_ansi_blocker_split_bs(
- 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,
- 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, 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, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md
index 162da7a903..fffebdf6a0 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md
@@ -1 +1,4 @@
-# The keymap for krush65 solder layout ansi blocker with split backspace \ No newline at end of file
+# The ansi_blocker_split_bs keymap for krush65 solder
+
+* 65% ANSI layout with blocker
+ * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c
index 13883d07e4..fcadaac844 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c
@@ -18,22 +18,20 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
[0] = LAYOUT_all(
- 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_GRV, KC_PSCR,
- 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_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, KC_PGUP,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ 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_GRV, KC_PSCR,
+ 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_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, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
- 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,
- 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
-
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md
index 1f98b857ce..9e7dd186d9 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md
@@ -1 +1,5 @@
-# The default keymap for krush65 solder \ No newline at end of file
+# The default keymap for krush65 solder
+
+* 65% ANSI layout with blocker
+ * split Backspace
+ * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c
index 873df5cb9f..59eebc774e 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c
@@ -18,34 +18,36 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
[0] = LAYOUT_all(
- 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_GRV, KC_PSCR,
- 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_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, KC_PGUP,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ 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_GRV, KC_PSCR,
+ 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_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, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
- 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,
- 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
+
[2] = LAYOUT_all(
- 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,
- 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
+
[3] = LAYOUT_all(
- 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,
- 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
+
};
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md
index 2c88050060..1c17d4e53b 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md
@@ -1 +1,5 @@
-# The VIA keymap for krush65 solder \ No newline at end of file
+# The VIA keymap for krush65 solder
+
+* 65% ANSI layout with blocker
+ * split Backspace
+ * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.h b/keyboards/sawnsprojects/krush/krush65/solder/solder.h
index 58f6bed57b..11140aac9c 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/solder.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/solder.h
@@ -18,76 +18,79 @@
#include "quantum.h"
-#define LAYOUT_all( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
- K80, K90, K81, K82, K92, K93, K94, K85, K95, K97, K87 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, KC_NO, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
- { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
- { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
- { K80, K81, K82, KC_NO, KC_NO, K85, KC_NO, K87 }, \
- { K90, KC_NO, K92, K93, K94, K95, KC_NO, K97 }, \
-}
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
+ * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │07 │ │26 │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤
+ * │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46 │37 │ │ │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐47 │ ISO Enter
+ * │40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47 │57 │ │46 │ │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
+ * │60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │77 │67 │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │80 │90 │81 │82 │92 │93 │94 │85 │ │95 │97 │87 │ Split Spacebar
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┐
+ * │80 │90 │81 │92 │94 │85 │ Standard
+ * └────┴────┴────┴────────────────────────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │80 │90 │81 │92 │85 │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
#define LAYOUT_65_ansi_blocker( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K07, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
- K80, K90, K81, K92, K94, K85, K95, K97, K87 \
+ K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
+ K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
+ K80, K90, K81, K92, K94, K85, K95, K97, K87 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
+ { K20, K21, K22, K23, K24, K25, K26, XXX }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
- { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
- { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
- { K80, K81, KC_NO, KC_NO, KC_NO, K85, KC_NO, K87 }, \
- { K90, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97 }, \
+ { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
+ { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
+ { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+ { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
+ { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
#define LAYOUT_65_ansi_blocker_split_bs( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
- K80, K90, K81, K92, K94, K85, K95, K97, K87 \
+ K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
+ K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
+ K80, K90, K81, K92, K94, K85, K95, K97, K87 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, KC_NO, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+ { K20, K21, K22, K23, K24, K25, K26, XXX }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
- { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
- { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
- { K80, K81, KC_NO, KC_NO, KC_NO, K85, KC_NO, K87 }, \
- { K90, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97 }, \
+ { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
+ { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
+ { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+ { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
+ { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
#define LAYOUT_65_ansi_blocker_split_bs_sp( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
- K80, K90, K81, K82, K92, K93, K94, K85, K95, K97, K87 \
+ K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
+ K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
+ K80, K90, K81, K82, K92, K93, K94, K85, K95, K97, K87 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, KC_NO, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+ { K20, K21, K22, K23, K24, K25, K26, XXX }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
- { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
- { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
- { K80, K81, K82, KC_NO, KC_NO, K85, KC_NO, K87 }, \
- { K90, KC_NO, K92, K93, K94, K95, KC_NO, K97 }, \
+ { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
+ { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
+ { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+ { K80, K81, K82, XXX, XXX, K85, XXX, K87 }, \
+ { K90, XXX, K92, K93, K94, K95, XXX, K97 }, \
}
-
diff --git a/keyboards/senselessclay/ck60/ck60.h b/keyboards/senselessclay/ck60/ck60.h
index fa83202dfa..a9408ba2ea 100644
--- a/keyboards/senselessclay/ck60/ck60.h
+++ b/keyboards/senselessclay/ck60/ck60.h
@@ -18,18 +18,18 @@
#include "quantum.h"
-#define ____ KC_NO
+#define ___ KC_NO
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K400, K401, K402, K406, K410, K411, K412, K413 \
+#define LAYOUT_60_iso( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D \
) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____ }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____ }, \
- { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413 } \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+ { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D } \
}
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index e188740c3c..55a7e95b46 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -1,10 +1,80 @@
{
- "keyboard_name": "CK60",
- "url": "https://candykeys.com",
- "maintainer": "hadi",
- "layouts": {
- "LAYOUT": {
- "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.75, "y":1, "w":1.25, "h":2}, {"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":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":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}]
- }
- }
-} \ No newline at end of file
+ "keyboard_name": "CK60",
+ "url": "https://candykeys.com",
+ "maintainer": "had-i",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_60_iso"
+ },
+ "layouts": {
+ "LAYOUT_60_iso": {
+ "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":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":1, "w":1.25, "h":2},
+
+ {"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":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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/senselessclay/ck60/keymaps/default/keymap.c b/keyboards/senselessclay/ck60/keymaps/default/keymap.c
index 2ac1e06981..d88f9e303c 100644
--- a/keyboards/senselessclay/ck60/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/ck60/keymaps/default/keymap.c
@@ -23,29 +23,33 @@ enum layers {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_0] = LAYOUT(
+ [_0] = LAYOUT_60_iso(
/*Base*/
- 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_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_ENT,
- 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_NUHS,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
- [_1] = LAYOUT(
- KC_GRV, 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_DEL,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
- KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_DOWN, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
- [_2] = LAYOUT(
- 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, 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, 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, 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),
- [_3] = LAYOUT(
- 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, 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, 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, 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)
-}; \ No newline at end of file
+ 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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+ ),
+ [_1] = LAYOUT_60_iso(
+ KC_GRV, 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_DEL,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+ KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, KC_DOWN, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_2] = LAYOUT_60_iso(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_3] = LAYOUT_60_iso(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/senselessclay/ck60/keymaps/via/keymap.c b/keyboards/senselessclay/ck60/keymaps/via/keymap.c
index 2ac1e06981..d88f9e303c 100644
--- a/keyboards/senselessclay/ck60/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/ck60/keymaps/via/keymap.c
@@ -23,29 +23,33 @@ enum layers {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_0] = LAYOUT(
+ [_0] = LAYOUT_60_iso(
/*Base*/
- 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_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_ENT,
- 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_NUHS,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
- [_1] = LAYOUT(
- KC_GRV, 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_DEL,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
- KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_DOWN, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
- [_2] = LAYOUT(
- 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, 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, 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, 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),
- [_3] = LAYOUT(
- 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, 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, 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, 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)
-}; \ No newline at end of file
+ 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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+ ),
+ [_1] = LAYOUT_60_iso(
+ KC_GRV, 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_DEL,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+ KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, KC_DOWN, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_2] = LAYOUT_60_iso(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_3] = LAYOUT_60_iso(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk
index 56aec94425..ba0eba494f 100644
--- a/keyboards/senselessclay/ck60/rules.mk
+++ b/keyboards/senselessclay/ck60/rules.mk
@@ -18,4 +18,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # RGB matrix lighting
-RGB_MATRIX_DRIVER = WS2812 \ No newline at end of file
+RGB_MATRIX_DRIVER = WS2812
+
+LAYOUTS = 60_iso