~ruther/qmk_firmware

0a2a7641558a80aeb115c14cb99655132c30413b — James Young 3 years ago ca10e4d
Krush60 Solder Refactor (#16029)

* solder.h: add matrix diagram

* solder.h: remove unnecessary comments

* rework LAYOUT_60_iso to LAYOUT_60_isoenter_split_bs

True ISO layouts are not supported on this keyboard because the PCB lacks support for split Left Shift. Renames the `iso` to `isoenter` to specify this.

- denotes use of Split Backspace
- move Backslash keycode to home row

* info.json: remove trailing whitespace

* info.json: clean up

Sort the layout trees into the same order as `solder.h`, and remove the `LAYOUT_60_all` tree (doesn't exist in source).

* solder.h: align positional arguments

Helps me proof-read the layouts at a glance. No logic change.

* fix syntax errors in keymaps

* remove ISO layouts

As previously noted, ISO layouts are not supported due to the PCB's lack of support for split Left Shift.

* rename LAYOUT_60_ansi_tsangan_split_bs to LAYOUT_60_tsangan_hhkb

Also renames `60_tsangan_splt_bs` keymap to `60_tsangan_hhkb`.

* rename LAYOUT_60_ansi_tsangan to LAYOUT_60_ansi_tsangan_split_rshift

Also renames `60_tsangan` keymap to `60_ansi_tsangan_split_rshift`.

* rename LAYOUT_60_ansi_arrow_split_bs_7u_spc to LAYOUT_60_ansi_arrow_tsangan_split_bs

Also rename `60_ansi_arrow_splt_bs_7u` to `60_ansi_arrow_tsangan_split_bs`.

* rename LAYOUT_60_ansi_arrow_7u_spc to LAYOUT_60_ansi_arrow_tsangan

Also renames `60_ansi_arrow_7u` keymap to `60_ansi_arrow_tsangan`.

* rename keymaps based on layout macro used

Making this easier to track in my head while I work on it.

* info.json: fix syntax errors

* rename LAYOUT_60_ansi_split_bs_7u_spc to LAYOUT_60_ansi_tsangan_split_bs

- renames `60_ansi_split_bs_7u_spc` keymap to `60_ansi_tsangan_split_bs`
- removes `layout_aliases` entry from `info.json` (creates incompatible data conflict)

* rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan

- renames `60_ansi_7u_spc` keymap to `60_ansi_tsangan`

* info.json: remove LAYOUT_60_ansi_tsangan layout_aliases entry

Causes an incompatible data conflict.

* add second layer to 60_ansi keymap

* update via keymap

Now matches the behaviour of the default keymap.

* fix syntax errors in keymaps, take 2

* add RGB and Navigation keycodes

Adds RGB and Navigation keycodes to the `60_isoenter_split_bs`, `default` and `via` keymaps.
49 files changed, 568 insertions(+), 640 deletions(-)

M keyboards/sawnsprojects/krush/krush60/solder/info.json
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md
M keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
M keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_bs => 60_ansi_arrow_split_bs}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_bs_spc => 60_ansi_arrow_split_bs_spc}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_spc => 60_ansi_arrow_split_spc}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_7u => 60_ansi_arrow_tsangan}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_bs_7u => 60_ansi_arrow_tsangan_split_bs}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_splt_bs => 60_ansi_split_bs}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_splt_bs_spc => 60_ansi_split_bs_spc}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_splt_spc => 60_ansi_split_spc}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_7u => 60_ansi_tsangan}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_splt_bs_7u => 60_ansi_tsangan_split_bs}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_tsangan => 60_ansi_tsangan_split_rshift}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_all => 60_isoenter_split_bs}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md
R keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_tsangan_splt_bs => 60_tsangan_hhkb}/keymap.c
A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md
D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md
M keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
M keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md
M keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
M keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md
M keyboards/sawnsprojects/krush/krush60/solder/solder.h
M keyboards/sawnsprojects/krush/krush60/solder/info.json => keyboards/sawnsprojects/krush/krush60/solder/info.json +173 -378
@@ 2,6 2,10 @@
    "keyboard_name": "Krush60 Solder",
    "url": "",
    "maintainer": "MaiTheSan",
    "layout_aliases": {
        "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs",
        "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan"
    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [


@@ 74,7 78,7 @@
                {"x":10, "y": 4},
                {"x":11, "y": 4},
                {"x":12, "y": 4},
                {"x":13, "y": 4}, 
                {"x":13, "y": 4},
                {"x":14, "y": 4}
            ]
        },


@@ 147,78 151,7 @@
                {"x":13.75, "y":4, "w":1.25}
            ]
        },
        "LAYOUT_60_ansi_arrow": {
            "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.5, "y":1, "w":1.5},

                {"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":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, "w":1.75},
                {"x":13, "y":3},
                {"x":14, "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},
                {"x":11, "y": 4},
                {"x":12, "y": 4},
                {"x":13, "y": 4}, 
                {"x":14, "y": 4}
            ]
        },
        "LAYOUT_60_ansi_arrow_split_bs_7u_spc": {
        "LAYOUT_60_isoenter_split_bs": {
            "layout": [
                {"x":0, "y":0},
                {"x":1, "y":0},


@@ 249,7 182,6 @@
                {"x":10.5, "y":1},
                {"x":11.5, "y":1},
                {"x":12.5, "y":1},
                {"x":13.5, "y":1, "w":1.5},

                {"x":0, "y":2, "w":1.75},
                {"x":1.75, "y":2},


@@ 263,9 195,10 @@
                {"x":9.75, "y":2},
                {"x":10.75, "y":2},
                {"x":11.75, "y":2},
                {"x":12.75, "y":2, "w":2.25},
                {"x":12.75, "y":2},
                {"x":13.75, "y":1, "w":1.25, "h":2},

                {"x":0, "y":3, "w":2.25},
                {"x": 0, "y": 3, "w": 2.25},
                {"x":2.25, "y":3},
                {"x":3.25, "y":3},
                {"x":4.25, "y":3},


@@ 275,18 208,17 @@
                {"x":8.25, "y":3},
                {"x":9.25, "y":3},
                {"x":10.25, "y":3},
                {"x":11.25, "y":3, "w":1.75},
                {"x":13, "y":3},
                {"x":14, "y":3},
                {"x":11.25, "y":3},
                {"x":12.25, "y":3, "w":2.75},

                {"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},
                {"x":12, "y": 4},
                {"x":13, "y": 4},
                {"x":14, "y": 4}
                {"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}
            ]
        },
        "LAYOUT_60_ansi_split_bs": {


@@ 502,7 434,7 @@
                {"x":13.75, "y":4, "w":1.25}
            ]
        },
        "LAYOUT_60_ansi_7u_spc": {
        "LAYOUT_60_ansi_tsangan": {
            "layout": [
                {"x":0, "y":0},
                {"x":1, "y":0},


@@ 567,10 499,10 @@
                {"x":4, "y": 4, "w": 7},
                {"x":11, "y": 4, "w": 1.5},
                {"x":12.5, "y": 4},
                {"x":13.5, "y": 4, "w": 1.5},
                {"x":13.5, "y": 4, "w": 1.5}
            ]
        },
        "LAYOUT_60_ansi_split_bs_7u_spc": {
        "LAYOUT_60_ansi_tsangan_split_bs": {
            "layout": [
                {"x":0, "y":0},
                {"x":1, "y":0},


@@ 636,7 568,7 @@
                {"x": 4, "y": 4, "w": 7},
                {"x": 11, "y": 4, "w": 1.5},
                {"x": 12.5, "y": 4},
                {"x": 13.5, "y": 4, "w": 1.5},
                {"x": 13.5, "y": 4, "w": 1.5}
            ]
        },
        "LAYOUT_60_ansi_arrow_split_bs": {


@@ 707,7 639,7 @@
                {"x":10, "y": 4},
                {"x":11, "y": 4},
                {"x":12, "y": 4},
                {"x":13, "y": 4}, 
                {"x":13, "y": 4},
                {"x":14, "y": 4}
            ]
        },


@@ 780,7 712,7 @@
                {"x":10, "y": 4},
                {"x":11, "y": 4},
                {"x":12, "y": 4},
                {"x":13, "y": 4}, 
                {"x":13, "y": 4},
                {"x":14, "y": 4}
            ]
        },


@@ 854,11 786,11 @@
                {"x":10, "y": 4},
                {"x":11, "y": 4},
                {"x":12, "y": 4},
                {"x":13, "y": 4}, 
                {"x":13, "y": 4},
                {"x":14, "y": 4}
            ]
        },
        "LAYOUT_60_ansi_arrow_7u_spc": {
        "LAYOUT_60_ansi_arrow_tsangan": {
            "layout": [
                {"x": 0, "y": 0},
                {"x": 1, "y": 0},


@@ 928,7 860,149 @@
                {"x":14, "y": 4}
            ]
        },
        "LAYOUT_60_ansi_tsangan": {
        "LAYOUT_60_ansi_arrow": {
            "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.5, "y":1, "w":1.5},

                {"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":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, "w":1.75},
                {"x":13, "y":3},
                {"x":14, "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},
                {"x":11, "y": 4},
                {"x":12, "y": 4},
                {"x":13, "y": 4},
                {"x":14, "y": 4}
            ]
        },
        "LAYOUT_60_ansi_arrow_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":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":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":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, "w":1.75},
                {"x":13, "y":3},
                {"x":14, "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},
                {"x":12, "y": 4},
                {"x":13, "y": 4},
                {"x":14, "y": 4}
            ]
        },
        "LAYOUT_60_ansi_tsangan_split_rshift": {
            "layout": [
                {"x": 0, "y": 0},
                {"x": 1, "y": 0},


@@ 994,10 1068,10 @@
                {"x": 4, "y": 4, "w": 7},
                {"x": 11, "y": 4, "w": 1.5},
                {"x": 12.5, "y": 4},
                {"x": 13.5, "y": 4, "w": 1.5},
                {"x": 13.5, "y": 4, "w": 1.5}
            ]
        },
        "LAYOUT_60_ansi_tsangan_split_bs": {
        "LAYOUT_60_tsangan_hhkb": {
            "layout": [
                {"x": 0, "y": 0},
                {"x": 1, "y": 0},


@@ 1064,286 1138,7 @@
                {"x": 4, "y": 4, "w": 7},
                {"x": 11, "y": 4, "w": 1.5},
                {"x": 12.5, "y": 4},
                {"x": 13.5, "y": 4, "w": 1.5},
            ]
        },
        "LAYOUT_60_iso_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":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": 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":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":12.5, "y": 4},
                {"x":13.5, "y": 4, "w": 1.5},
            ]
        },
        "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},
                {"x":14, "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":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": 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":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}
            ]
        },
        "LAYOUT_60_iso_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},
                {"x":14, "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":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": 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":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":12.5, "y": 4},
                {"x":13.5, "y": 4, "w": 1.5},
            ]
        },
        "LAYOUT_60_all": {
            "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":2},
                {"x":2, "y":3},
                {"x":3, "y":3},
                {"x":4, "y":3},
                {"x":5, "y":3},
                {"x":6, "y":3},
                {"x":7, "y":3},
                {"x":8, "y":3},
                {"x":9, "y":3},
                {"x":10, "y":3},
                {"x":11, "y":3},
                {"x":12, "y":3},
                {"x":13, "y":3},
                {"x":14, "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":12.5, "y": 4},
                {"x":13.5, "y": 4, "w": 1.5},
                {"x": 13.5, "y": 4, "w": 1.5}
            ]
        }
    }

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder full layout
\ No newline at end of file

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c +37 -0
@@ 0,0 1,37 @@
/* Copyright 2021 REPLACE_WITH_YOUR_NAME
 *
 * 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_60_ansi(
        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_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_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_LSFT,          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_ansi(
        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,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md +3 -0
@@ 0,0 1,3 @@
# The 60_ansi keymap for krush60 solder

* Standard 60% ANSI layout

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout ansi 7U
\ No newline at end of file

M keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c +9 -7
@@ 24,12 24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    )
    ),

    [1] = LAYOUT_60_ansi_arrow(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, 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
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
    ),

};

M keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md +3 -1
@@ 1,1 1,3 @@
# The keymap for krush60 solder layout ansi arrow
\ No newline at end of file
# The 60_ansi_arrow keymap for krush60 solder

* 60% ANSI with Arrows layout

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout ansi 7U arrow
\ No newline at end of file

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c +9 -7
@@ 24,12 24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    )
    ),

    [1] = LAYOUT_60_ansi_arrow_split_bs(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    )
        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,  _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md +4 -0
@@ 0,0 1,4 @@
# The 60_ansi_arrow_split_bs keymap for krush60 solder

* 60% ANSI with Arrows layout
  * split Backspace

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c +10 -8
@@ 23,13 23,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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_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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    )
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    ),

    [1] = LAYOUT_60_ansi_arrow_split_bs_spc(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    )
        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,  _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md +5 -0
@@ 0,0 1,5 @@
# The 60_ansi_arrow_split_bs_spc keymap for krush60 solder

* 60% ANSI with Arrows layout
  * split Backspace
  * split Spacebar

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c +9 -9
@@ 23,15 23,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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_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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    )
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    ),

    [1] = LAYOUT_60_ansi_arrow_split_spc(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    )
};

        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md +4 -0
@@ 0,0 1,4 @@
# The 60_ansi_arrow_split_spc keymap for krush60 solder

* 60% ANSI with Arrows layout
  * split Spacebar

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout ansi arrow split backspace
\ No newline at end of file

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout ansi arrow, 7u spacebar & split backspace
\ No newline at end of file

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout ansi arrow, split spacebar & split backspace
\ No newline at end of file

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout ansi arrow & split spacebar
\ No newline at end of file

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c +11 -9
@@ 18,18 18,20 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_arrow_7u_spc(
    [0] = LAYOUT_60_ansi_arrow_tsangan(
        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_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_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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    )
    [1] = LAYOUT_60_ansi_arrow_7u_spc(
    ),

    [1] = LAYOUT_60_ansi_arrow_tsangan(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, 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
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md +4 -0
@@ 0,0 1,4 @@
# The 60_ansi_arrow_tsangan keymap for krush60 solder

* 60% ANSI with Arrows layout
  * 7u Spacebar

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c +12 -10
@@ 18,18 18,20 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
    [0] = LAYOUT_60_ansi_arrow_tsangan_split_bs(
        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_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_BSLS,
        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
    )
    [1] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, 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
    ),

    [1] = LAYOUT_60_ansi_arrow_tsangan_split_bs(
        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,  _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md +5 -0
@@ 0,0 1,5 @@
# The 60_ansi_arrow_tsangan_split_bs keymap for krush60 solder

* 60% ANSI with Arrows layout
  * 7u Spacebar
  * split Backspace

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c +12 -10
@@ 20,16 20,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_split_bs(
        KC_GESC, 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_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_BSLS,
        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_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_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_LSFT,          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),
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
    ),

    [0] = LAYOUT_60_ansi_split_bs(
        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,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, 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_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
};
    [1] = LAYOUT_60_ansi_split_bs(
        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,  _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md +4 -0
@@ 0,0 1,4 @@
# The 60_ansi_split_bs keymap for krush60 solder

* 60% ANSI layout
  * split Backspace

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c +5 -5
@@ 26,10 26,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI,          MO(1),   KC_RCTL),

    [1] = LAYOUT_60_ansi_split_bs_spc(
        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,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, 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_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
        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,  _______,
        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______)
};


A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md +5 -0
@@ 0,0 1,5 @@
# The 60_ansi_split_bs_spc keymap for krush60 solder

* 60% ANSI layout
  * split Backspace
  * split Spacebar

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c +4 -4
@@ 27,9 27,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [1] = LAYOUT_60_ansi_split_spc(
        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,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, 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_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______)
};


A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md +4 -0
@@ 0,0 1,4 @@
# The 60_ansi_split_spc keymap for krush60 solder

* 60% ANSI layout
  * split Spacebar

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout split backspace
\ No newline at end of file

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout 7u spacebar & split backspace
\ No newline at end of file

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout split spacebar & split backspace
\ No newline at end of file

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder layout split backspace
\ No newline at end of file

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c +10 -10
@@ 18,20 18,20 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_7u_spc(
    [0] = LAYOUT_60_ansi_tsangan(
        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_BSLS,
        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_LSFT,          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, MO(1),   KC_RCTL
    )
    [1] = LAYOUT_60_ansi_7u_spc(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
    )
};
    ),

    [1] = LAYOUT_60_ansi_tsangan(
        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,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                            _______,                                     _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md +4 -0
@@ 0,0 1,4 @@
# The 60_ansi_tsangan keymap for krush60 solder

* 60% ANSI layout
  * Tsangan bottom row

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c +13 -11
@@ 18,18 18,20 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_split_bs_7u_spc(
    [0] = LAYOUT_60_ansi_tsangan_split_bs(
        KC_GESC, 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_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_BSLS,
        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_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_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_LSFT,          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, MO(1),   KC_RCTL),
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL
    ),

    [0] = LAYOUT_60_ansi_split_bs_7u_spc(
        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,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, 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_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS)
};
    [1] = LAYOUT_60_ansi_tsangan_split_bs(
        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,  _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______,_______,  _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                            _______,                                     _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md +5 -0
@@ 0,0 1,5 @@
# The 60_ansi_tsangan_split_bs keymap for krush60 solder

* 60% ANSI layout
  * Tsangan bottom row
  * split Backspace

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c +11 -10
@@ 18,19 18,20 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_tsangan(
    [0] = LAYOUT_60_ansi_tsangan_split_rshift(
        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_BSLS,
        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL
    )
    [1] = LAYOUT_60_ansi_tsangan(
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
    ),

    [1] = LAYOUT_60_ansi_tsangan_split_rshift(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
    )
};
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                            _______,                                     _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md +5 -0
@@ 0,0 1,5 @@
# The 60_ansi_tsangan_split_rshift keymap for krush60 solder

* 60% ANSI layout
  * Tsangan bottom row
  * split Right Shift

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c +16 -13
@@ 1,5 1,6 @@
/* Copyright 2021 SawnsProjects
 *
 *           2022 QMK / James Young (@noroadsleft)
*
 * 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


@@ 18,18 19,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_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_BSLS, 
        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_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_SLSH, 
        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT  
    [0] = LAYOUT_60_isoenter_split_bs(
        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_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_BSLS, KC_ENT,
        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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
    ),
    [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,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,  
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  

    [1] = LAYOUT_60_isoenter_split_bs(
        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,  _______, _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md +5 -0
@@ 0,0 1,5 @@
# The 60_isoenter_split_bs keymap for krush60

* 60% ANSI layout
  * ISO Enter with 2.25u Left Shift
  * split Backspace

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder Tsangan
\ No newline at end of file

R keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c +12 -10
@@ 18,18 18,20 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_60_ansi_tsangan_split_bs(
    [0] = LAYOUT_60_tsangan_hhkb(
        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_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_BSLS,
        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL
    )
    [1] = LAYOUT_60_ansi_tsangan_split_bs(
        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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
    )
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
    ),

    [1] = LAYOUT_60_tsangan_hhkb(
        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, _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
        _______, _______, _______,                            _______,                                     _______, _______, _______
    ),

};

A keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md +6 -0
@@ 0,0 1,6 @@
# The 60_tsangan_hhkb keymap for krush60 solder

* 60% ANSI layout
  * Tsangan bottom row
  * split Backspace
  * split Right Shift

D keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md +0 -1
@@ 1,1 0,0 @@
# The keymap for krush60 solder Tsangan & split backspace
\ No newline at end of file

M keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c +18 -21
@@ 1,4 1,4 @@
/* Copyright 2021 REPLACE_WITH_YOUR_NAME
/* 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


@@ 17,24 17,21 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /*
     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│
     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│
     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
     */
    [0] = LAYOUT_60_ansi(
        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_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_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_LSFT,          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, KC_APP,  KC_RCTL
    )

    [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_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_BSLS,
        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_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_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, MO(1),   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,  _______, _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
    ),

};

M keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md +3 -1
@@ 1,1 1,3 @@
# The keymap default for krush60
\ No newline at end of file
# The default keymap for krush60 solder

Assigns a keycode to every possible switch location.

M keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c => keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c +25 -21
@@ 19,31 19,35 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [0] = LAYOUT_all(
        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_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_BSLS, 
        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,   KC_SLSH, 
        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(0),   KC_LEFT, KC_RALT, KC_RCTL  
        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_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_BSLS,
        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_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_SLSH,
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, MO(1),   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,  _______, _______,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
    ),

    [2] = LAYOUT_all(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
    ),

    [3] = LAYOUT_all(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  
    ),    
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
    ),

};

M keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md => keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md +1 -1
@@ 1,1 1,1 @@
# The keymap VIA for krush60
\ No newline at end of file
# The VIA keymap for krush60 solder

M keyboards/sawnsprojects/krush/krush60/solder/solder.h => keyboards/sawnsprojects/krush/krush60/solder/solder.h +102 -81
@@ 17,14 17,44 @@
#pragma once

#include "quantum.h"

#define XXX KC_NO
//x

/*
 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
 * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │      │26     │ 2u Backspace
 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
 * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46   │        │     │
 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐47  │ ISO Enter
 * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │     │46 │    │
 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤                ┌──────┬───┬───┐
 * │60      │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │66    │77 │   │66        │ 2.75u RShift   │75    │66 │77 │ 1.75/1/1u RShift
 * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤   └──────────┘                └──────┴───┴───┘
 * │80  │90  │81  │82      │92  │84        │94 │85 │86 │95 │97 │ Split Space Arrow
 * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
 * ┌────┬────┬────┬────────┬────┬──────────┬────┬────┬────┬────┐
 * │80  │90  │81  │82      │92  │84        │94  │85  │95  │97  │ Split Space
 * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
 * ┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┐
 * │80  │90  │81  │92                      │94 │85 │86 │95 │97 │ 6.25u Arrow
 * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
 * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
 * │80  │90  │81  │92                      │94  │85  │95  │97  │ Standard
 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
 * ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
 * │80   │90 │81   │92                         │85 │86 │95 │97 │ 7u Arrow
 * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
 * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
 * │80   │90 │81   │92                         │85   │95 │97   │ 7u Tsangan/WKL/HHKB
 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 */

#define LAYOUT_all( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, \
    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36,      K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,           K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, \
    K80, K90, K81,           K82, K92, K84,           K94, K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 38,14 68,12 @@
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}

//LAYOUT_60_ansi
//x
#define LAYOUT_60_ansi( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K92, K94, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,                K92,                K94, K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 58,14 86,13 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_iso
//x
#define LAYOUT_60_iso(\

#define LAYOUT_60_isoenter_split_bs(\
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K92, K94, K85, K95, K97  \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36,      \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,                K92,                K94, K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 78,13 105,13 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_split_bs

#define LAYOUT_60_ansi_split_bs( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K92, K94, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,                K92,                K94, K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 97,13 124,13 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_split_spc

#define LAYOUT_60_ansi_split_spc( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K82, K92, K84, K94, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,           K82, K92, K84,           K94, K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 116,13 143,13 @@
    { K80, K81, K82, XXX, K84, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_split_bs_spc

#define LAYOUT_60_ansi_split_bs_spc( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K82, K92, K84, K94, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,           K82, K92, K84,           K94, K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 135,13 162,13 @@
    { K80, K81, K82, XXX, K84, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_7u_spc
#define LAYOUT_60_ansi_7u_spc( \

#define LAYOUT_60_ansi_tsangan( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K92, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,                K92,                     K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 154,13 181,13 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_split_7u_spc
#define LAYOUT_60_ansi_split_bs_7u_spc( \

#define LAYOUT_60_ansi_tsangan_split_bs( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
    K80, K90, K81, K92, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
    K80, K90, K81,                K92,                     K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 173,13 200,13 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_arrow_split_bs

#define LAYOUT_60_ansi_arrow_split_bs( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81, K92, K94, K85, K86, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81,                K92,           K94, K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 192,13 219,13 @@
    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_arrow_split_spc

#define LAYOUT_60_ansi_arrow_split_spc( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81,           K82, K92, K84,      K94, K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 211,13 238,13 @@
    { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_arrow_split_bs_spc

#define LAYOUT_60_ansi_arrow_split_bs_spc( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81,           K82, K92, K84,      K94, K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 230,13 257,13 @@
    { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_arrow_7u_spc
#define LAYOUT_60_ansi_arrow_7u_spc( \

#define LAYOUT_60_ansi_arrow_tsangan( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81, K92, K85, K86, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81,                K92,                K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 249,14 276,13 @@
    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_arrow
//x

#define LAYOUT_60_ansi_arrow( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81, K92, K94, K85, K86, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81,                K92,           K94, K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 269,14 295,13 @@
    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
}
//x
//LAYOUT_60_ansi_arrow_split_bs_7u_spc
#define LAYOUT_60_ansi_arrow_split_bs_7u_spc( \

#define LAYOUT_60_ansi_arrow_tsangan_split_bs( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81, K92, K85, K86, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
    K80, K90, K81,                K92,                K85, K86, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 289,13 314,13 @@
    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_tsangan
#define LAYOUT_60_ansi_tsangan( \

#define LAYOUT_60_ansi_tsangan_split_rshift( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
    K80, K90, K81, K92, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
    K80, K90, K81,                K92,                     K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \


@@ 308,13 333,13 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
}
//LAYOUT_60_ansi_tsangan_split_bs
#define LAYOUT_60_ansi_tsangan_split_bs( \

#define LAYOUT_60_tsangan_hhkb( \
    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
    K80, K90, K81, K92, K85, K95, K97  \
    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
    K80, K90, K81,                K92,                     K85, K95, K97  \
) { \
    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \


@@ 327,7 352,3 @@
    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
}
//LAYOUT_60_iso_tsangan
#define LAYOUT_60_iso_tsangan  LAYOUT_60_ansi_tsangan
//LAYOUT_60_iso_tsangan_split_bs
#define LAYOUT_60_iso_tsangan_split_bs  LAYOUT_60_ansi_tsangan_split_bs