summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/foundation/foundation.h4
-rw-r--r--keyboards/mechlovin/foundation/info.json267
-rw-r--r--keyboards/mechlovin/foundation/keymaps/default/keymap.c4
-rw-r--r--keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c40
-rw-r--r--keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/wearhaus66/info.json297
-rw-r--r--keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h21
7 files changed, 547 insertions, 87 deletions
diff --git a/keyboards/mechlovin/foundation/foundation.h b/keyboards/mechlovin/foundation/foundation.h
index d9d317deb7..0444817bbf 100644
--- a/keyboards/mechlovin/foundation/foundation.h
+++ b/keyboards/mechlovin/foundation/foundation.h
@@ -31,7 +31,7 @@
{ K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \
}
-#define LAYOUT_tkl_nofrow_ansi( \
+#define LAYOUT_ansi( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
@@ -45,7 +45,7 @@
{ K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \
}
-#define LAYOUT_tkl_nofrow_iso( \
+#define LAYOUT_iso( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, K1G, K1H, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index aa4148a40a..584a774367 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -8,16 +8,267 @@
"pid": "0x0180",
"device_version": "0.0.2"
},
+ "layout_aliases": {
+ "LAYOUT_tkl_nofrow_ansi": "LAYOUT_ansi",
+ "LAYOUT_tkl_nofrow_iso": "LAYOUT_iso"
+ },
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"2,15", "x":16.25, "y":0}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,13", "x":15, "y":2}, {"label":"2,14", "x":16, "y":2, "w":1.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":1.25}, {"label":"3,2", "x":3.5, "y":3}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":1.75}, {"label":"3,14", "x":16.25, "y":3}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}]
- },
- "LAYOUT_tkl_nofrow_ansi": {
- "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0, "w":2}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,14", "x":15, "y":2, "w":2.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":2.25}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":2.75}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}]
+ "layout": [
+ { "label": "0,0", "x": 0, "y": 0 },
+ { "label": "0,1", "x": 1.5, "y": 0 },
+ { "label": "0,2", "x": 2.5, "y": 0 },
+ { "label": "0,3", "x": 3.5, "y": 0 },
+ { "label": "0,4", "x": 4.5, "y": 0 },
+ { "label": "0,5", "x": 5.5, "y": 0 },
+ { "label": "0,6", "x": 6.5, "y": 0 },
+ { "label": "0,7", "x": 7.5, "y": 0 },
+ { "label": "0,8", "x": 8.5, "y": 0 },
+ { "label": "0,9", "x": 9.5, "y": 0 },
+ { "label": "0,10", "x": 10.5, "y": 0 },
+ { "label": "0,11", "x": 11.5, "y": 0 },
+ { "label": "0,12", "x": 12.5, "y": 0 },
+ { "label": "0,13", "x": 13.5, "y": 0 },
+ { "label": "0,14", "x": 14.5, "y": 0 },
+ { "label": "2,15", "x": 15.5, "y": 0 },
+ { "label": "0,15", "x": 17, "y": 0 },
+ { "label": "0,16", "x": 18, "y": 0 },
+ { "label": "0,17", "x": 19, "y": 0 },
+
+ { "label": "1,0", "x": 0, "y": 1 },
+ { "label": "1,1", "x": 1.5, "y": 1, "w": 1.5 },
+ { "label": "1,2", "x": 3, "y": 1 },
+ { "label": "1,3", "x": 4, "y": 1 },
+ { "label": "1,4", "x": 5, "y": 1 },
+ { "label": "1,5", "x": 6, "y": 1 },
+ { "label": "1,6", "x": 7, "y": 1 },
+ { "label": "1,7", "x": 8, "y": 1 },
+ { "label": "1,8", "x": 9, "y": 1 },
+ { "label": "1,9", "x": 10, "y": 1 },
+ { "label": "1,10", "x": 11, "y": 1 },
+ { "label": "1,11", "x": 12, "y": 1 },
+ { "label": "1,12", "x": 13, "y": 1 },
+ { "label": "1,13", "x": 14, "y": 1 },
+ { "label": "1,14", "x": 15, "y": 1, "w": 1.5 },
+ { "label": "1,15", "x": 17, "y": 1 },
+ { "label": "1,16", "x": 18, "y": 1 },
+ { "label": "1,17", "x": 19, "y": 1 },
+
+ { "label": "2,0", "x": 0, "y": 2 },
+ { "label": "2,1", "x": 1.5, "y": 2, "w": 1.75 },
+ { "label": "2,2", "x": 3.25, "y": 2 },
+ { "label": "2,3", "x": 4.25, "y": 2 },
+ { "label": "2,4", "x": 5.25, "y": 2 },
+ { "label": "2,5", "x": 6.25, "y": 2 },
+ { "label": "2,6", "x": 7.25, "y": 2 },
+ { "label": "2,7", "x": 8.25, "y": 2 },
+ { "label": "2,8", "x": 9.25, "y": 2 },
+ { "label": "2,9", "x": 10.25, "y": 2 },
+ { "label": "2,10", "x": 11.25, "y": 2 },
+ { "label": "2,11", "x": 12.25, "y": 2 },
+ { "label": "2,12", "x": 13.25, "y": 2 },
+ { "label": "2,13", "x": 14.25, "y": 2 },
+ { "label": "2,14", "x": 15.25, "y": 2, "w": 1.25 },
+
+ { "label": "3,0", "x": 0, "y": 3 },
+ { "label": "3,1", "x": 1.5, "y": 3, "w": 1.25 },
+ { "label": "3,2", "x": 2.75, "y": 3 },
+ { "label": "3,3", "x": 3.75, "y": 3 },
+ { "label": "3,4", "x": 4.75, "y": 3 },
+ { "label": "3,5", "x": 5.75, "y": 3 },
+ { "label": "3,6", "x": 6.75, "y": 3 },
+ { "label": "3,7", "x": 7.75, "y": 3 },
+ { "label": "3,8", "x": 8.75, "y": 3 },
+ { "label": "3,9", "x": 9.75, "y": 3 },
+ { "label": "3,10", "x": 10.75, "y": 3 },
+ { "label": "3,11", "x": 11.75, "y": 3 },
+ { "label": "3,12", "x": 12.75, "y": 3 },
+ { "label": "3,13", "x": 13.75, "y": 3, "w": 1.75 },
+ { "label": "3,14", "x": 15.5, "y": 3 },
+ { "label": "3,16", "x": 18, "y": 3 },
+
+ { "label": "4,0", "x": 0, "y": 4 },
+ { "label": "4,1", "x": 1.5, "y": 4, "w": 1.25 },
+ { "label": "4,2", "x": 2.75, "y": 4, "w": 1.25 },
+ { "label": "4,3", "x": 4, "y": 4, "w": 1.25 },
+ { "label": "4,7", "x": 5.25, "y": 4, "w": 6.25 },
+ { "label": "4,11", "x": 11.5, "y": 4, "w": 1.25 },
+ { "label": "4,12", "x": 12.75, "y": 4, "w": 1.25 },
+ { "label": "4,13", "x": 14, "y": 4, "w": 1.25 },
+ { "label": "4,14", "x": 15.25, "y": 4, "w": 1.25 },
+ { "label": "4,15", "x": 17, "y": 4 },
+ { "label": "4,16", "x": 18, "y": 4 },
+ { "label": "4,17", "x": 19, "y": 4 }
+ ]
},
- "LAYOUT_tkl_nofrow_iso": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.75, "y":0}, {"label":"0,2", "x":2.75, "y":0}, {"label":"0,3", "x":3.75, "y":0}, {"label":"0,4", "x":4.75, "y":0}, {"label":"0,5", "x":5.75, "y":0}, {"label":"0,6", "x":6.75, "y":0}, {"label":"0,7", "x":7.75, "y":0}, {"label":"0,8", "x":8.75, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":13.75, "y":0}, {"label":"0,14", "x":14.75, "y":0, "w":2}, {"label":"0,15", "x":17, "y":0}, {"label":"0,16", "x":18, "y":0}, {"label":"0,17", "x":19, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.75, "y":1, "w":1.5}, {"label":"1,2", "x":3.25, "y":1}, {"label":"1,3", "x":4.25, "y":1}, {"label":"1,4", "x":5.25, "y":1}, {"label":"1,5", "x":6.25, "y":1}, {"label":"1,6", "x":7.25, "y":1}, {"label":"1,7", "x":8.25, "y":1}, {"label":"1,8", "x":9.25, "y":1}, {"label":"1,9", "x":10.25, "y":1}, {"label":"1,10", "x":11.25, "y":1}, {"label":"1,11", "x":12.25, "y":1}, {"label":"1,12", "x":13.25, "y":1}, {"label":"1,13", "x":14.25, "y":1}, {"label":"2,14", "x":15.5, "y":1, "w":1.25, "h":2}, {"label":"1,15", "x":17, "y":1}, {"label":"1,16", "x":18, "y":1}, {"label":"1,17", "x":19, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.75, "y":2, "w":1.75}, {"label":"2,2", "x":3.5, "y":2}, {"label":"2,3", "x":4.5, "y":2}, {"label":"2,4", "x":5.5, "y":2}, {"label":"2,5", "x":6.5, "y":2}, {"label":"2,6", "x":7.5, "y":2}, {"label":"2,7", "x":8.5, "y":2}, {"label":"2,8", "x":9.5, "y":2}, {"label":"2,9", "x":10.5, "y":2}, {"label":"2,10", "x":11.5, "y":2}, {"label":"2,11", "x":12.5, "y":2}, {"label":"2,12", "x":13.5, "y":2}, {"label":"2,13", "x":14.5, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.75, "y":3, "w":1.25}, {"label":"3,2", "x":3, "y":3}, {"label":"3,3", "x":4, "y":3}, {"label":"3,4", "x":5, "y":3}, {"label":"3,5", "x":6, "y":3}, {"label":"3,6", "x":7, "y":3}, {"label":"3,7", "x":8, "y":3}, {"label":"3,8", "x":9, "y":3}, {"label":"3,9", "x":10, "y":3}, {"label":"3,10", "x":11, "y":3}, {"label":"3,11", "x":12, "y":3}, {"label":"3,12", "x":13, "y":3}, {"label":"3,13", "x":14, "y":3, "w":2.75}, {"label":"3,16", "x":18, "y":3}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.75, "y":4, "w":1.25}, {"label":"4,2", "x":3, "y":4, "w":1.25}, {"label":"4,3", "x":4.25, "y":4, "w":1.25}, {"label":"4,7", "x":5.5, "y":4, "w":6.25}, {"label":"4,11", "x":11.75, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4, "w":1.25}, {"label":"4,13", "x":14.25, "y":4, "w":1.25}, {"label":"4,14", "x":15.5, "y":4, "w":1.25}, {"label":"4,15", "x":17, "y":4}, {"label":"4,16", "x":18, "y":4}, {"label":"4,17", "x":19, "y":4}]
+ "LAYOUT_ansi": {
+ "layout": [
+ { "label": "0,0", "x": 0, "y": 0 },
+ { "label": "0,1", "x": 1.5, "y": 0 },
+ { "label": "0,2", "x": 2.5, "y": 0 },
+ { "label": "0,3", "x": 3.5, "y": 0 },
+ { "label": "0,4", "x": 4.5, "y": 0 },
+ { "label": "0,5", "x": 5.5, "y": 0 },
+ { "label": "0,6", "x": 6.5, "y": 0 },
+ { "label": "0,7", "x": 7.5, "y": 0 },
+ { "label": "0,8", "x": 8.5, "y": 0 },
+ { "label": "0,9", "x": 9.5, "y": 0 },
+ { "label": "0,10", "x": 10.5, "y": 0 },
+ { "label": "0,11", "x": 11.5, "y": 0 },
+ { "label": "0,12", "x": 12.5, "y": 0 },
+ { "label": "0,13", "x": 13.5, "y": 0 },
+ { "label": "0,14", "x": 14.5, "y": 0, "w": 2 },
+ { "label": "0,15", "x": 17, "y": 0 },
+ { "label": "0,16", "x": 18, "y": 0 },
+ { "label": "0,17", "x": 19, "y": 0 },
+
+ { "label": "1,0", "x": 0, "y": 1 },
+ { "label": "1,1", "x": 1.5, "y": 1, "w": 1.5 },
+ { "label": "1,2", "x": 3, "y": 1 },
+ { "label": "1,3", "x": 4, "y": 1 },
+ { "label": "1,4", "x": 5, "y": 1 },
+ { "label": "1,5", "x": 6, "y": 1 },
+ { "label": "1,6", "x": 7, "y": 1 },
+ { "label": "1,7", "x": 8, "y": 1 },
+ { "label": "1,8", "x": 9, "y": 1 },
+ { "label": "1,9", "x": 10, "y": 1 },
+ { "label": "1,10", "x": 11, "y": 1 },
+ { "label": "1,11", "x": 12, "y": 1 },
+ { "label": "1,12", "x": 13, "y": 1 },
+ { "label": "1,13", "x": 14, "y": 1 },
+ { "label": "1,14", "x": 15, "y": 1, "w": 1.5 },
+ { "label": "1,15", "x": 17, "y": 1 },
+ { "label": "1,16", "x": 18, "y": 1 },
+ { "label": "1,17", "x": 19, "y": 1 },
+
+ { "label": "2,0", "x": 0, "y": 2 },
+ { "label": "2,1", "x": 1.5, "y": 2, "w": 1.75 },
+ { "label": "2,2", "x": 3.25, "y": 2 },
+ { "label": "2,3", "x": 4.25, "y": 2 },
+ { "label": "2,4", "x": 5.25, "y": 2 },
+ { "label": "2,5", "x": 6.25, "y": 2 },
+ { "label": "2,6", "x": 7.25, "y": 2 },
+ { "label": "2,7", "x": 8.25, "y": 2 },
+ { "label": "2,8", "x": 9.25, "y": 2 },
+ { "label": "2,9", "x": 10.25, "y": 2 },
+ { "label": "2,10", "x": 11.25, "y": 2 },
+ { "label": "2,11", "x": 12.25, "y": 2 },
+ { "label": "2,12", "x": 13.25, "y": 2 },
+ { "label": "2,14", "x": 14.25, "y": 2, "w": 2.25 },
+
+ { "label": "3,0", "x": 0, "y": 3 },
+ { "label": "3,1", "x": 1.5, "y": 3, "w": 2.25 },
+ { "label": "3,3", "x": 3.75, "y": 3 },
+ { "label": "3,4", "x": 4.75, "y": 3 },
+ { "label": "3,5", "x": 5.75, "y": 3 },
+ { "label": "3,6", "x": 6.75, "y": 3 },
+ { "label": "3,7", "x": 7.75, "y": 3 },
+ { "label": "3,8", "x": 8.75, "y": 3 },
+ { "label": "3,9", "x": 9.75, "y": 3 },
+ { "label": "3,10", "x": 10.75, "y": 3 },
+ { "label": "3,11", "x": 11.75, "y": 3 },
+ { "label": "3,12", "x": 12.75, "y": 3 },
+ { "label": "3,13", "x": 13.75, "y": 3, "w": 2.75 },
+ { "label": "3,16", "x": 18, "y": 3 },
+
+ { "label": "4,0", "x": 0, "y": 4 },
+ { "label": "4,1", "x": 1.5, "y": 4, "w": 1.25 },
+ { "label": "4,2", "x": 2.75, "y": 4, "w": 1.25 },
+ { "label": "4,3", "x": 4, "y": 4, "w": 1.25 },
+ { "label": "4,7", "x": 5.25, "y": 4, "w": 6.25 },
+ { "label": "4,11", "x": 11.5, "y": 4, "w": 1.25 },
+ { "label": "4,12", "x": 12.75, "y": 4, "w": 1.25 },
+ { "label": "4,13", "x": 14, "y": 4, "w": 1.25 },
+ { "label": "4,14", "x": 15.25, "y": 4, "w": 1.25 },
+ { "label": "4,15", "x": 17, "y": 4 },
+ { "label": "4,16", "x": 18, "y": 4 },
+ { "label": "4,17", "x": 19, "y": 4 }
+ ]
},
-
+ "LAYOUT_iso": {
+ "layout": [
+ { "label": "0,0", "x": 0, "y": 0 },
+ { "label": "0,1", "x": 1.5, "y": 0 },
+ { "label": "0,2", "x": 2.5, "y": 0 },
+ { "label": "0,3", "x": 3.5, "y": 0 },
+ { "label": "0,4", "x": 4.5, "y": 0 },
+ { "label": "0,5", "x": 5.5, "y": 0 },
+ { "label": "0,6", "x": 6.5, "y": 0 },
+ { "label": "0,7", "x": 7.5, "y": 0 },
+ { "label": "0,8", "x": 8.5, "y": 0 },
+ { "label": "0,9", "x": 9.5, "y": 0 },
+ { "label": "0,10", "x": 10.5, "y": 0 },
+ { "label": "0,11", "x": 11.5, "y": 0 },
+ { "label": "0,12", "x": 12.5, "y": 0 },
+ { "label": "0,13", "x": 13.5, "y": 0 },
+ { "label": "0,14", "x": 14.5, "y": 0, "w": 2 },
+ { "label": "0,15", "x": 17, "y": 0 },
+ { "label": "0,16", "x": 18, "y": 0 },
+ { "label": "0,17", "x": 19, "y": 0 },
+
+ { "label": "1,0", "x": 0, "y": 1 },
+ { "label": "1,1", "x": 1.5, "y": 1, "w": 1.5 },
+ { "label": "1,2", "x": 3, "y": 1 },
+ { "label": "1,3", "x": 4, "y": 1 },
+ { "label": "1,4", "x": 5, "y": 1 },
+ { "label": "1,5", "x": 6, "y": 1 },
+ { "label": "1,6", "x": 7, "y": 1 },
+ { "label": "1,7", "x": 8, "y": 1 },
+ { "label": "1,8", "x": 9, "y": 1 },
+ { "label": "1,9", "x": 10, "y": 1 },
+ { "label": "1,10", "x": 11, "y": 1 },
+ { "label": "1,11", "x": 12, "y": 1 },
+ { "label": "1,12", "x": 13, "y": 1 },
+ { "label": "1,13", "x": 14, "y": 1 },
+ { "label": "1,15", "x": 17, "y": 1 },
+ { "label": "1,16", "x": 18, "y": 1 },
+ { "label": "1,17", "x": 19, "y": 1 },
+
+ { "label": "2,0", "x": 0, "y": 2 },
+ { "label": "2,1", "x": 1.5, "y": 2, "w": 1.75 },
+ { "label": "2,2", "x": 3.25, "y": 2 },
+ { "label": "2,3", "x": 4.25, "y": 2 },
+ { "label": "2,4", "x": 5.25, "y": 2 },
+ { "label": "2,5", "x": 6.25, "y": 2 },
+ { "label": "2,6", "x": 7.25, "y": 2 },
+ { "label": "2,7", "x": 8.25, "y": 2 },
+ { "label": "2,8", "x": 9.25, "y": 2 },
+ { "label": "2,9", "x": 10.25, "y": 2 },
+ { "label": "2,10", "x": 11.25, "y": 2 },
+ { "label": "2,11", "x": 12.25, "y": 2 },
+ { "label": "2,12", "x": 13.25, "y": 2 },
+ { "label": "2,13", "x": 14.25, "y": 2 },
+ { "label": "2,14", "x": 15.25, "y": 1, "w": 1.25, "h": 2 },
+
+ { "label": "3,0", "x": 0, "y": 3 },
+ { "label": "3,1", "x": 1.5, "y": 3, "w": 1.25 },
+ { "label": "3,2", "x": 2.75, "y": 3 },
+ { "label": "3,3", "x": 3.75, "y": 3 },
+ { "label": "3,4", "x": 4.75, "y": 3 },
+ { "label": "3,5", "x": 5.75, "y": 3 },
+ { "label": "3,6", "x": 6.75, "y": 3 },
+ { "label": "3,7", "x": 7.75, "y": 3 },
+ { "label": "3,8", "x": 8.75, "y": 3 },
+ { "label": "3,9", "x": 9.75, "y": 3 },
+ { "label": "3,10", "x": 10.75, "y": 3 },
+ { "label": "3,11", "x": 11.75, "y": 3 },
+ { "label": "3,12", "x": 12.75, "y": 3 },
+ { "label": "3,13", "x": 13.75, "y": 3, "w": 2.75 },
+ { "label": "3,16", "x": 18, "y": 3 },
+
+ { "label": "4,0", "x": 0, "y": 4 },
+ { "label": "4,1", "x": 1.5, "y": 4, "w": 1.25 },
+ { "label": "4,2", "x": 2.75, "y": 4, "w": 1.25 },
+ { "label": "4,3", "x": 4, "y": 4, "w": 1.25 },
+ { "label": "4,7", "x": 5.25, "y": 4, "w": 6.25 },
+ { "label": "4,11", "x": 11.5, "y": 4, "w": 1.25 },
+ { "label": "4,12", "x": 12.75, "y": 4, "w": 1.25 },
+ { "label": "4,13", "x": 14, "y": 4, "w": 1.25 },
+ { "label": "4,14", "x": 15.25, "y": 4, "w": 1.25 },
+ { "label": "4,15", "x": 17, "y": 4 },
+ { "label": "4,16", "x": 18, "y": 4 },
+ { "label": "4,17", "x": 19, "y": 4 }
+ ]
+ }
}
-} \ No newline at end of file
+}
diff --git a/keyboards/mechlovin/foundation/keymaps/default/keymap.c b/keyboards/mechlovin/foundation/keymaps/default/keymap.c
index 4cabf521d2..11ae3282b5 100644
--- a/keyboards/mechlovin/foundation/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/foundation/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_tkl_nofrow_ansi(
+ [0] = LAYOUT_ansi(
KC_F1, KC_GRV, 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, KC_PGUP,
KC_F2, 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, KC_PGDN,
KC_F3, 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_F4, 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_F5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT_tkl_nofrow_ansi(
+ [1] = LAYOUT_ansi(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, 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/mechlovin/foundation/keymaps/default_iso/keymap.c b/keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..5b8918c9e5
--- /dev/null
+++ b/keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 Mechlovin' Studio
+ *
+ * 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_iso(
+ KC_F1, KC_GRV, 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, KC_PGUP,
+ KC_F2, 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_DEL, KC_END, KC_PGDN,
+ KC_F3, 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_F4, 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_UP,
+ KC_F5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_iso(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [1] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}
+};
+#endif
diff --git a/keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk b/keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechlovin/zed65/wearhaus66/info.json b/keyboards/mechlovin/zed65/wearhaus66/info.json
index ac672ff1f6..4d71686d33 100644
--- a/keyboards/mechlovin/zed65/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/wearhaus66/info.json
@@ -2,90 +2,241 @@
"keyboard_name": "Wearhaus66",
"manufacturer": "Mechlovin Studio",
"url": "",
- "maintainer": "Mechlovin' Studio",
+ "maintainer": "mechlovin",
"usb": {
"vid": "0x4D4C",
"pid": "0x6602",
"device_version": "0.0.1"
},
+ "layout_aliases": {
+ "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
+ "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"0,7", "x":7, "y":0},
- {"label":"0,8", "x":8, "y":0},
- {"label":"0,9", "x":9, "y":0},
- {"label":"0,10", "x":10, "y":0},
- {"label":"0,11", "x":11, "y":0},
- {"label":"0,12", "x":12, "y":0},
- {"label":"0,13", "x":13, "y":0},
- {"label":"1,13", "x":14, "y":0},
- {"label":"1,14", "x":15.25, "y":0.75},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"1,7", "x":7.5, "y":1},
- {"label":"1,8", "x":8.5, "y":1},
- {"label":"1,9", "x":9.5, "y":1},
- {"label":"1,10", "x":10.5, "y":1},
- {"label":"1,11", "x":11.5, "y":1},
- {"label":"1,12", "x":12.5, "y":1},
- {"label":"2,12", "x":13.5, "y":1, "w":1.5},
- {"label":"2,14", "x":15.25, "y":1.75},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"2,7", "x":7.75, "y":2},
- {"label":"2,8", "x":8.75, "y":2},
- {"label":"2,9", "x":9.75, "y":2},
- {"label":"2,10", "x":10.75, "y":2},
- {"label":"2,11", "x":11.75, "y":2},
- {"label":"2,13", "x":12.75, "y":2, "w":2.25},
- {"label":"3,14", "x":15.25, "y":2.75},
- {"label":"3,0", "x":0, "y":3, "w":1.25},
- {"label":"3,1", "x":1.25, "y":3},
- {"label":"3,2", "x":2.25, "y":3},
- {"label":"3,3", "x":3.25, "y":3},
- {"label":"3,4", "x":4.25, "y":3},
- {"label":"3,5", "x":5.25, "y":3},
- {"label":"3,6", "x":6.25, "y":3},
- {"label":"3,7", "x":7.25, "y":3},
- {"label":"3,8", "x":8.25, "y":3},
- {"label":"3,9", "x":9.25, "y":3},
- {"label":"3,10", "x":10.25, "y":3},
- {"label":"3,11", "x":11.25, "y":3},
- {"label":"3,12", "x":12.25, "y":3, "w":1.75},
- {"label":"3,13", "x":14, "y":3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,6", "x":3.75, "y":4, "w":6.25},
- {"label":"4,9", "x":10, "y":4, "w":1.25},
- {"label":"4,10", "x":11.25, "y":4, "w":1.25},
- {"label":"4,12", "x":13, "y":4},
- {"label":"4,13", "x":14, "y":4},
+ {"label":"0,0", "x":0, "y":0},
+ {"label":"0,1", "x":1, "y":0},
+ {"label":"0,2", "x":2, "y":0},
+ {"label":"0,3", "x":3, "y":0},
+ {"label":"0,4", "x":4, "y":0},
+ {"label":"0,5", "x":5, "y":0},
+ {"label":"0,6", "x":6, "y":0},
+ {"label":"0,7", "x":7, "y":0},
+ {"label":"0,8", "x":8, "y":0},
+ {"label":"0,9", "x":9, "y":0},
+ {"label":"0,10", "x":10, "y":0},
+ {"label":"0,11", "x":11, "y":0},
+ {"label":"0,12", "x":12, "y":0},
+ {"label":"0,13", "x":13, "y":0},
+ {"label":"1,13", "x":14, "y":0},
+
+ {"label":"1,0", "x":0, "y":1, "w":1.5},
+ {"label":"1,1", "x":1.5, "y":1},
+ {"label":"1,2", "x":2.5, "y":1},
+ {"label":"1,3", "x":3.5, "y":1},
+ {"label":"1,4", "x":4.5, "y":1},
+ {"label":"1,5", "x":5.5, "y":1},
+ {"label":"1,6", "x":6.5, "y":1},
+ {"label":"1,7", "x":7.5, "y":1},
+ {"label":"1,8", "x":8.5, "y":1},
+ {"label":"1,9", "x":9.5, "y":1},
+ {"label":"1,10", "x":10.5, "y":1},
+ {"label":"1,11", "x":11.5, "y":1},
+ {"label":"1,12", "x":12.5, "y":1},
+ {"label":"2,12", "x":13.5, "y":1, "w":1.5},
+ {"label":"1,14", "x":15.25, "y":0.75},
+
+ {"label":"2,0", "x":0, "y":2, "w":1.75},
+ {"label":"2,1", "x":1.75, "y":2},
+ {"label":"2,2", "x":2.75, "y":2},
+ {"label":"2,3", "x":3.75, "y":2},
+ {"label":"2,4", "x":4.75, "y":2},
+ {"label":"2,5", "x":5.75, "y":2},
+ {"label":"2,6", "x":6.75, "y":2},
+ {"label":"2,7", "x":7.75, "y":2},
+ {"label":"2,8", "x":8.75, "y":2},
+ {"label":"2,9", "x":9.75, "y":2},
+ {"label":"2,10", "x":10.75, "y":2},
+ {"label":"2,11", "x":11.75, "y":2},
+ {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+ {"label":"2,14", "x":15.25, "y":1.75},
+
+ {"label":"3,0", "x":0, "y":3, "w":1.25},
+ {"label":"3,1", "x":1.25, "y":3},
+ {"label":"3,2", "x":2.25, "y":3},
+ {"label":"3,3", "x":3.25, "y":3},
+ {"label":"3,4", "x":4.25, "y":3},
+ {"label":"3,5", "x":5.25, "y":3},
+ {"label":"3,6", "x":6.25, "y":3},
+ {"label":"3,7", "x":7.25, "y":3},
+ {"label":"3,8", "x":8.25, "y":3},
+ {"label":"3,9", "x":9.25, "y":3},
+ {"label":"3,10", "x":10.25, "y":3},
+ {"label":"3,11", "x":11.25, "y":3},
+ {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+ {"label":"3,13", "x":14, "y":3},
+ {"label":"3,14", "x":15.25, "y":2.75},
+
+ {"label":"4,0", "x":0, "y":4, "w":1.25},
+ {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+ {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+ {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+ {"label":"4,9", "x":10, "y":4, "w":1.25},
+ {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+ {"label":"4,12", "x":13, "y":4},
+ {"label":"4,13", "x":14, "y":4},
{"label":"4,14", "x":15, "y":4}
- ]
+ ]
},
- "LAYOUT_65_ansi_blocker": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"1,14", "x":15.25, "y":0.75}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"2,12", "x":13.5, "y":1, "w":1.5}, {"label":"2,14", "x":15.25, "y":1.75}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"3,14", "x":15.25, "y":2.75}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,9", "x":10, "y":4, "w":1.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+ "LAYOUT_ansi_blocker": {
+ "layout": [
+ {"label":"0,0", "x":0, "y":0},
+ {"label":"0,1", "x":1, "y":0},
+ {"label":"0,2", "x":2, "y":0},
+ {"label":"0,3", "x":3, "y":0},
+ {"label":"0,4", "x":4, "y":0},
+ {"label":"0,5", "x":5, "y":0},
+ {"label":"0,6", "x":6, "y":0},
+ {"label":"0,7", "x":7, "y":0},
+ {"label":"0,8", "x":8, "y":0},
+ {"label":"0,9", "x":9, "y":0},
+ {"label":"0,10", "x":10, "y":0},
+ {"label":"0,11", "x":11, "y":0},
+ {"label":"0,12", "x":12, "y":0},
+ {"label":"0,13", "x":13, "y":0, "w":2},
+
+ {"label":"1,0", "x":0, "y":1, "w":1.5},
+ {"label":"1,1", "x":1.5, "y":1},
+ {"label":"1,2", "x":2.5, "y":1},
+ {"label":"1,3", "x":3.5, "y":1},
+ {"label":"1,4", "x":4.5, "y":1},
+ {"label":"1,5", "x":5.5, "y":1},
+ {"label":"1,6", "x":6.5, "y":1},
+ {"label":"1,7", "x":7.5, "y":1},
+ {"label":"1,8", "x":8.5, "y":1},
+ {"label":"1,9", "x":9.5, "y":1},
+ {"label":"1,10", "x":10.5, "y":1},
+ {"label":"1,11", "x":11.5, "y":1},
+ {"label":"1,12", "x":12.5, "y":1},
+ {"label":"2,12", "x":13.5, "y":1, "w":1.5},
+ {"label":"1,14", "x":15.25, "y":0.75},
+
+ {"label":"2,0", "x":0, "y":2, "w":1.75},
+ {"label":"2,1", "x":1.75, "y":2},
+ {"label":"2,2", "x":2.75, "y":2},
+ {"label":"2,3", "x":3.75, "y":2},
+ {"label":"2,4", "x":4.75, "y":2},
+ {"label":"2,5", "x":5.75, "y":2},
+ {"label":"2,6", "x":6.75, "y":2},
+ {"label":"2,7", "x":7.75, "y":2},
+ {"label":"2,8", "x":8.75, "y":2},
+ {"label":"2,9", "x":9.75, "y":2},
+ {"label":"2,10", "x":10.75, "y":2},
+ {"label":"2,11", "x":11.75, "y":2},
+ {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+ {"label":"2,14", "x":15.25, "y":1.75},
+
+ {"label":"3,0", "x":0, "y":3, "w":2.25},
+ {"label":"3,2", "x":2.25, "y":3},
+ {"label":"3,3", "x":3.25, "y":3},
+ {"label":"3,4", "x":4.25, "y":3},
+ {"label":"3,5", "x":5.25, "y":3},
+ {"label":"3,6", "x":6.25, "y":3},
+ {"label":"3,7", "x":7.25, "y":3},
+ {"label":"3,8", "x":8.25, "y":3},
+ {"label":"3,9", "x":9.25, "y":3},
+ {"label":"3,10", "x":10.25, "y":3},
+ {"label":"3,11", "x":11.25, "y":3},
+ {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+ {"label":"3,13", "x":14, "y":3},
+ {"label":"3,14", "x":15.25, "y":2.75},
+
+ {"label":"4,0", "x":0, "y":4, "w":1.25},
+ {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+ {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+ {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+ {"label":"4,9", "x":10, "y":4, "w":1.25},
+ {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+ {"label":"4,12", "x":13, "y":4},
+ {"label":"4,13", "x":14, "y":4},
+ {"label":"4,14", "x":15, "y":4}
+ ]
},
- "LAYOUT_65_iso_blocker": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"1,14", "x":15.25, "y":0.75}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"2,12", "x":13.5, "y":1, "w":1.5}, {"label":"2,14", "x":15.25, "y":1.75}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"3,14", "x":15.25, "y":2.75}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,9", "x":10, "y":4, "w":1.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+ "LAYOUT_iso_blocker": {
+ "layout": [
+ {"label":"0,0", "x":0, "y":0},
+ {"label":"0,1", "x":1, "y":0},
+ {"label":"0,2", "x":2, "y":0},
+ {"label":"0,3", "x":3, "y":0},
+ {"label":"0,4", "x":4, "y":0},
+ {"label":"0,5", "x":5, "y":0},
+ {"label":"0,6", "x":6, "y":0},
+ {"label":"0,7", "x":7, "y":0},
+ {"label":"0,8", "x":8, "y":0},
+ {"label":"0,9", "x":9, "y":0},
+ {"label":"0,10", "x":10, "y":0},
+ {"label":"0,11", "x":11, "y":0},
+ {"label":"0,12", "x":12, "y":0},
+ {"label":"0,13", "x":13, "y":0, "w":2},
+
+ {"label":"1,0", "x":0, "y":1, "w":1.5},
+ {"label":"1,1", "x":1.5, "y":1},
+ {"label":"1,2", "x":2.5, "y":1},
+ {"label":"1,3", "x":3.5, "y":1},
+ {"label":"1,4", "x":4.5, "y":1},
+ {"label":"1,5", "x":5.5, "y":1},
+ {"label":"1,6", "x":6.5, "y":1},
+ {"label":"1,7", "x":7.5, "y":1},
+ {"label":"1,8", "x":8.5, "y":1},
+ {"label":"1,9", "x":9.5, "y":1},
+ {"label":"1,10", "x":10.5, "y":1},
+ {"label":"1,11", "x":11.5, "y":1},
+ {"label":"1,12", "x":12.5, "y":1},
+ {"label":"1,14", "x":15.25, "y":0.75},
+
+ {"label":"2,0", "x":0, "y":2, "w":1.75},
+ {"label":"2,1", "x":1.75, "y":2},
+ {"label":"2,2", "x":2.75, "y":2},
+ {"label":"2,3", "x":3.75, "y":2},
+ {"label":"2,4", "x":4.75, "y":2},
+ {"label":"2,5", "x":5.75, "y":2},
+ {"label":"2,6", "x":6.75, "y":2},
+ {"label":"2,7", "x":7.75, "y":2},
+ {"label":"2,8", "x":8.75, "y":2},
+ {"label":"2,9", "x":9.75, "y":2},
+ {"label":"2,10", "x":10.75, "y":2},
+ {"label":"2,11", "x":11.75, "y":2},
+ {"label":"2,12", "x":12.75, "y":2},
+ {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+ {"label":"2,14", "x":15.25, "y":1.75},
+
+ {"label":"3,0", "x":0, "y":3, "w":1.25},
+ {"label":"3,1", "x":1.25, "y":3},
+ {"label":"3,2", "x":2.25, "y":3},
+ {"label":"3,3", "x":3.25, "y":3},
+ {"label":"3,4", "x":4.25, "y":3},
+ {"label":"3,5", "x":5.25, "y":3},
+ {"label":"3,6", "x":6.25, "y":3},
+ {"label":"3,7", "x":7.25, "y":3},
+ {"label":"3,8", "x":8.25, "y":3},
+ {"label":"3,9", "x":9.25, "y":3},
+ {"label":"3,10", "x":10.25, "y":3},
+ {"label":"3,11", "x":11.25, "y":3},
+ {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+ {"label":"3,13", "x":14, "y":3},
+ {"label":"3,14", "x":15.25, "y":2.75},
+
+ {"label":"4,0", "x":0, "y":4, "w":1.25},
+ {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+ {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+ {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+ {"label":"4,9", "x":10, "y":4, "w":1.25},
+ {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+ {"label":"4,12", "x":13, "y":4},
+ {"label":"4,13", "x":14, "y":4},
+ {"label":"4,14", "x":15, "y":4}
+ ]
}
}
}
diff --git a/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h b/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h
index 8c4a0ee79a..561ceedb9a 100644
--- a/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h
+++ b/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h
@@ -19,6 +19,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │┌───┐ │0D │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤│1E │ └─┬─────┤
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C │├───┤ │ │
+ * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤│2E │ ┌──┴┐2D │ ISO Enter
+ * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │├───┤ │2C │ │
+ * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤│3E │ └───┴────┘
+ * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │└───┘
+ * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┐
+ * │40 │41 │42 │46 │49 │4A │ │4C │4D │4E │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │40 │41 │42 │46 │4A │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
@@ -33,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D, K4E }, \
}
-#define LAYOUT_65_ansi_blocker( \
+#define LAYOUT_ansi_blocker( \
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, K2C, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
@@ -47,7 +64,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D, K4E }, \
}
-#define LAYOUT_65_iso_blocker( \
+#define LAYOUT_iso_blocker( \
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, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \