diff options
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/info.json | 552 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c | 65 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c | 65 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/solder.h | 161 | 
5 files changed, 753 insertions, 94 deletions
| diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 2251813623..53c5179f42 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -2,8 +2,12 @@      "keyboard_name": "qk65",      "url": "",      "maintainer": "qwertykeys", +    "layout_aliases": { +        "LAYOUT_solder": "LAYOUT_all", +        "LAYOUT_iso": "LAYOUT_65_iso_blocker" +    },      "layouts": { -        "LAYOUT_solder": { +        "LAYOUT_all": {              "layout": [                  {"x":0, "y":0},                  {"x":1, "y":0}, @@ -21,6 +25,7 @@                  {"x":13, "y":0},                  {"x":14, "y":0},                  {"x":15, "y":0}, +                  {"x":0, "y":1, "w":1.5},                  {"x":1.5, "y":1},                  {"x":2.5, "y":1}, @@ -36,6 +41,7 @@                  {"x":12.5, "y":1},                  {"x":13.5, "y":1, "w":1.5},                  {"x":15, "y":1}, +                  {"x":0, "y":2, "w":1.75},                  {"x":1.75, "y":2},                  {"x":2.75, "y":2}, @@ -50,6 +56,7 @@                  {"x":11.75, "y":2},                  {"x":12.75, "y":2, "w":2.25},                  {"x":15, "y":2}, +                  {"x":0, "y":3, "w":1.25},                  {"x":1.25, "y":3},                  {"x":2.25, "y":3}, @@ -65,6 +72,7 @@                  {"x":12.25, "y":3, "w":1.75},                  {"x":14, "y":3},                  {"x":15, "y":3}, +                  {"x":0, "y":4, "w":1.25},                  {"x":1.25, "y":4, "w":1.25},                  {"x":2.5, "y":4, "w":1.25}, @@ -72,11 +80,11 @@                  {"x":10, "y":4, "w":1.25},                  {"x":11.25, "y":4, "w":1.25},                  {"x":13, "y":4}, -		        {"x":14, "y":4}, +                {"x":14, "y":4},                  {"x":15, "y":4}              ]          }, -	"LAYOUT_iso": { +        "LAYOUT_65_ansi_blocker": {              "layout": [                  {"x":0, "y":0},                  {"x":1, "y":0}, @@ -93,6 +101,384 @@                  {"x":12, "y":0},                  {"x":13, "y":0, "w":2},                  {"x":15, "y":0}, + +                {"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.5, "y":1, "w":1.5}, +                {"x":15, "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, "w":2.25}, +                {"x":15, "y":2}, + +                {"x":0, "y":3, "w":2.25}, +                {"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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"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":13, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_ansi_blocker_split_bs": { +            "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}, +                {"x":14, "y":0}, +                {"x":15, "y":0}, + +                {"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.5, "y":1, "w":1.5}, +                {"x":15, "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, "w":2.25}, +                {"x":15, "y":2}, + +                {"x":0, "y":3, "w":2.25}, +                {"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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"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":13, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_ansi_blocker_tsangan": { +            "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":15, "y":0}, + +                {"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.5, "y":1, "w":1.5}, +                {"x":15, "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, "w":2.25}, +                {"x":15, "y":2}, + +                {"x":0, "y":3, "w":2.25}, +                {"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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"x":0, "y":4, "w":1.5}, +                {"x":1.5, "y":4}, +                {"x":2.5, "y":4, "w":1.5}, +                {"x":4, "y":4, "w":7}, +                {"x":11, "y":4, "w":1.5}, +                {"x":13, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_ansi_blocker_tsangan_split_bs": { +            "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}, +                {"x":14, "y":0}, +                {"x":15, "y":0}, + +                {"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.5, "y":1, "w":1.5}, +                {"x":15, "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, "w":2.25}, +                {"x":15, "y":2}, + +                {"x":0, "y":3, "w":2.25}, +                {"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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"x":0, "y":4, "w":1.5}, +                {"x":1.5, "y":4}, +                {"x":2.5, "y":4, "w":1.5}, +                {"x":4, "y":4, "w":7}, +                {"x":11, "y":4, "w":1.5}, +                {"x":13, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_iso_blocker": { +            "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":15, "y":0}, + +                {"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":15, "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":15, "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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"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":13, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_iso_blocker_split_bs": { +            "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}, +                {"x":14, "y":0}, +                {"x":15, "y":0}, +                  {"x":0, "y":1, "w":1.5},                  {"x":1.5, "y":1},                  {"x":2.5, "y":1}, @@ -107,6 +493,7 @@                  {"x":11.5, "y":1},                  {"x":12.5, "y":1},                  {"x":15, "y":1}, +                  {"x":0, "y":2, "w":1.75},                  {"x":1.75, "y":2},                  {"x":2.75, "y":2}, @@ -122,6 +509,7 @@                  {"x":12.75, "y":2},                  {"x":13.75, "y":1, "w":1.25, "h":2},                  {"x":15, "y":2}, +                  {"x":0, "y":3, "w":1.25},                  {"x":1.25, "y":3},                  {"x":2.25, "y":3}, @@ -137,6 +525,7 @@                  {"x":12.25, "y":3, "w":1.75},                  {"x":14, "y":3},                  {"x":15, "y":3}, +                  {"x":0, "y":4, "w":1.25},                  {"x":1.25, "y":4, "w":1.25},                  {"x":2.5, "y":4, "w":1.25}, @@ -144,9 +533,160 @@                  {"x":10, "y":4, "w":1.25},                  {"x":11.25, "y":4, "w":1.25},                  {"x":13, "y":4}, -		        {"x":14, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_iso_blocker_tsangan": { +            "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":15, "y":0}, + +                {"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":15, "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":15, "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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"x":0, "y":4, "w":1.5}, +                {"x":1.5, "y":4}, +                {"x":2.5, "y":4, "w":1.5}, +                {"x":4, "y":4, "w":7}, +                {"x":11, "y":4, "w":1.5}, +                {"x":13, "y":4}, +                {"x":14, "y":4}, +                {"x":15, "y":4} +            ] +        }, +        "LAYOUT_65_iso_blocker_tsangan_split_bs": { +            "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}, +                {"x":14, "y":0}, +                {"x":15, "y":0}, + +                {"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":15, "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":15, "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":1.75}, +                {"x":14, "y":3}, +                {"x":15, "y":3}, + +                {"x":0, "y":4, "w":1.5}, +                {"x":1.5, "y":4}, +                {"x":2.5, "y":4, "w":1.5}, +                {"x":4, "y":4, "w":7}, +                {"x":11, "y":4, "w":1.5}, +                {"x":13, "y":4}, +                {"x":14, "y":4},                  {"x":15, "y":4}              ] -	    } +        }      } -}
\ No newline at end of file +} diff --git a/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c b/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c index 8d52b17d2a..ea9b36136f 100644 --- a/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c +++ b/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/*  +/*  Copyright 2022 qwertykeys  This program is free software: you can redistribute it and/or modify @@ -19,35 +19,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	[0] = LAYOUT_iso( -		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_DEL,  -		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_PGUP,  -		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_BSLS, KC_ENT,  KC_PGDN,  -		KC_LSFT, KC_BSLS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,   MO(1),  -		KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,                 KC_RALT, KC_RCTL,                           KC_LEFT, KC_DOWN, KC_RGHT -	), - -	[1] = LAYOUT_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_TRNS, RESET,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_HOME,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS -	), - -	[2] = 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 -	), - -	[3] = 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 -	) +    [0] = LAYOUT_65_iso_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_DEL, +        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_PGUP, +        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_BSLS, KC_ENT,  KC_PGDN, +        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   MO(1), +        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT +    ), + +    [1] = LAYOUT_65_iso_blocker( +        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_TRNS, RESET, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_HOME, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS +    ), + +    [2] = LAYOUT_65_iso_blocker( +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_65_iso_blocker( +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/qwertykeys/qk65/solder/keymaps/via/keymap.c b/keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c index 88afc5984b..c1059821b1 100644 --- a/keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c +++ b/keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/*  +/*  Copyright 2022 qwertykeys  This program is free software: you can redistribute it and/or modify @@ -19,35 +19,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	[0] = LAYOUT_solder( -		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_BSLS, KC_BSPC, KC_DEL,  -		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_PGUP,  -		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_PGDN,  -		KC_LSFT, KC_BSLS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,   MO(1),  -		KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,                 KC_RALT, KC_RCTL,                           KC_LEFT, KC_DOWN, KC_RGHT -	), - -	[1] = LAYOUT_solder( -		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_TRNS, KC_TRNS, RESET,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_END,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS -	), - -	[2] = LAYOUT_solder( -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_solder( -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS -	) +    [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_BSLS, KC_BSPC, KC_DEL, +        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_PGUP, +        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_PGDN, +        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   MO(1), +        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT +    ), + +    [1] = LAYOUT_all( +        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_TRNS, KC_TRNS, RESET, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_END, +        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS +    ), + +    [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 +    ), + +    [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 +    ) +  }; diff --git a/keyboards/qwertykeys/qk65/solder/rules.mk b/keyboards/qwertykeys/qk65/solder/rules.mk index f9417ae2bf..ac453b785b 100644 --- a/keyboards/qwertykeys/qk65/solder/rules.mk +++ b/keyboards/qwertykeys/qk65/solder/rules.mk @@ -15,4 +15,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration  NKRO_ENABLE = yes           # Enable N-Key Rollover  BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality  RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow -AUDIO_ENABLE = no           # Audio output
\ No newline at end of file +AUDIO_ENABLE = no           # Audio output + +LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker 65_iso_blocker_split_bs diff --git a/keyboards/qwertykeys/qk65/solder/solder.h b/keyboards/qwertykeys/qk65/solder/solder.h index b796ae1e91..418bf45edd 100644 --- a/keyboards/qwertykeys/qk65/solder/solder.h +++ b/keyboards/qwertykeys/qk65/solder/solder.h @@ -1,4 +1,4 @@ -/*  +/*  Copyright 2022 qwertykeys  This program is free software: you can redistribute it and/or modify @@ -16,35 +16,150 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */  #pragma once +  #include "quantum.h" -#define LAYOUT_solder( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K113, K013, K014,       \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K212, K114,             \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214,             \ -	K300, K312, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314,             \ -	K400, K401, K402,       K404,             K407, K408,                   K412, K413, K414              \ +#define ___ KC_NO + +/* + *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐ + *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │    │0D     │ 2u Backspace + *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤ + *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │      │     │ + *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter + *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │ + * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘ + * │30      │   │30  │3C │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3D │3E │ + * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + *              │40  │41  │42  │44                      │47  │48  │ │4C │4D │4E │ + *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + *              ┌─────┬───┬─────┬───────────────────────────┬─────┐ + *              │40   │41 │42   │44                         │48   │ Tsangan + *              └─────┴───┴─────┴───────────────────────────┴─────┘ + */ + +#define LAYOUT_all( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \ +    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,      \ +    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E,      \ +    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E       \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \ -	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }  \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \  } +#define LAYOUT_65_ansi_blocker( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    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, \ +    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { 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 }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} +#define LAYOUT_65_ansi_blocker_split_bs( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \ +    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, \ +    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} -#define LAYOUT_iso( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,       \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114,       \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       \ -	K300, K312, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314,       \ -	K400, K401, K402,       K404,             K407, K408,                   K412, K413, K414        \ +#define LAYOUT_65_ansi_blocker_tsangan( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    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, \ +    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },  \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114 },  \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 },  \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 },  \ -	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }   \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { 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 }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \  } +#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \ +    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, \ +    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} + +#define LAYOUT_65_iso_blocker( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    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, \ +    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { 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 }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} + +#define LAYOUT_65_iso_blocker_split_bs( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \ +    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, \ +    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} + +#define LAYOUT_65_iso_blocker_tsangan( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    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, \ +    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { 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 }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} + +#define LAYOUT_65_iso_blocker_tsangan_split_bs( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \ +    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, \ +    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ +    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \ +) { \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ +    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \ +} | 
