From 548a463fe9e60410e5798b6fd10a9e18ba2f28bb Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 18 Feb 2022 03:43:03 +1100 Subject: [PATCH] `mokey/xox70`: clean up layouts (#16375) --- keyboards/mokey/xox70/info.json | 643 +++++++++++------- .../mokey/xox70/keymaps/default/keymap.c | 19 +- keyboards/mokey/xox70/keymaps/via/keymap.c | 44 +- keyboards/mokey/xox70/rules.mk | 2 + keyboards/mokey/xox70/xox70.h | 129 ++-- 5 files changed, 529 insertions(+), 308 deletions(-) diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json index 95089f6fc3..5baa620bc6 100644 --- a/keyboards/mokey/xox70/info.json +++ b/keyboards/mokey/xox70/info.json @@ -3,245 +3,428 @@ "url": "", "maintainer": "Mokey", "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0}, - {"label":"k0c", "x":12, "y":0}, - {"label":"k0e", "x":13, "y":0, "w":2}, - {"label":"k0f", "x":15.25, "y":0}, - {"label":"k0g", "x":16.25, "y":0}, - {"label":"k0h", "x":17.25, "y":0}, - - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1}, - {"label":"k13", "x":2.5, "y":1}, - {"label":"k14", "x":3.5, "y":1}, - {"label":"k15", "x":4.5, "y":1}, - {"label":"k16", "x":5.5, "y":1}, - {"label":"k17", "x":6.5, "y":1}, - {"label":"k18", "x":7.5, "y":1}, - {"label":"k19", "x":8.5, "y":1}, - {"label":"k1a", "x":9.5, "y":1}, - {"label":"k1b", "x":10.5, "y":1}, - {"label":"k1c", "x":11.5, "y":1}, - {"label":"k1d", "x":12.5, "y":1}, - {"label":"k1e", "x":13.5, "y":1, "w":1.5}, - {"label":"k1f", "x":15.25, "y":1}, - {"label":"k1g", "x":16.25, "y":1}, - {"label":"k1h", "x":17.25, "y":1}, - - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k22", "x":1.75, "y":2}, - {"label":"k23", "x":2.75, "y":2}, - {"label":"k24", "x":3.75, "y":2}, - {"label":"k25", "x":4.75, "y":2}, - {"label":"k26", "x":5.75, "y":2}, - {"label":"k27", "x":6.75, "y":2}, - {"label":"k28", "x":7.75, "y":2}, - {"label":"k29", "x":8.75, "y":2}, - {"label":"k2a", "x":9.75, "y":2}, - {"label":"k2b", "x":10.75, "y":2}, - {"label":"k2c", "x":11.75, "y":2}, - {"label":"k2d", "x":12.75, "y":2, "w":2.25}, - - {"label":"k30", "x":0, "y":3, "w":2.25}, - {"label":"k32", "x":2.25, "y":3}, - {"label":"k33", "x":3.25, "y":3}, - {"label":"k34", "x":4.25, "y":3}, - {"label":"k35", "x":5.25, "y":3}, - {"label":"k36", "x":6.25, "y":3}, - {"label":"k37", "x":7.25, "y":3}, - {"label":"k38", "x":8.25, "y":3}, - {"label":"k39", "x":9.25, "y":3}, - {"label":"k3a", "x":10.25, "y":3}, - {"label":"k3b", "x":11.25, "y":3}, - {"label":"k3d", "x":12.25, "y":3, "w":2.75}, - {"label":"k3g", "x":16.25, "y":3}, + {"label":"k00", "x": 0, "y": 0}, + {"label":"k01", "x": 1, "y": 0}, + {"label":"k02", "x": 2, "y": 0}, + {"label":"k03", "x": 3, "y": 0}, + {"label":"k04", "x": 4, "y": 0}, + {"label":"k05", "x": 5, "y": 0}, + {"label":"k06", "x": 6, "y": 0}, + {"label":"k07", "x": 7, "y": 0}, + {"label":"k08", "x": 8, "y": 0}, + {"label":"k09", "x": 9, "y": 0}, + {"label":"k0A", "x": 10, "y": 0}, + {"label":"k0B", "x": 11, "y": 0}, + {"label":"k0C", "x": 12, "y": 0}, + {"label":"k0D", "x": 13, "y": 0}, + {"label":"k0E", "x": 14, "y": 0}, - {"label":"k40", "x":0, "y":4, "w":1.25}, - {"label":"k41", "x":1.25, "y":4, "w":1.25}, - {"label":"k43", "x":2.5, "y":4, "w":1.25}, - {"label":"k46", "x":3.75, "y":4, "w":6.25}, - {"label":"k4a", "x":10, "y":4, "w":1.25}, - {"label":"k4b", "x":11.25, "y":4, "w":1.25}, - {"label":"k4d", "x":12.5, "y":4, "w":1.25}, - {"label":"k4e", "x":13.75, "y":4, "w":1.25}, - {"label":"k4f", "x":15.25, "y":4}, - {"label":"k4g", "x":16.25, "y":4}, - {"label":"k4h", "x":17.25, "y":4} + {"label":"k0F", "x": 15.25, "y": 0}, + {"label":"k0G", "x": 16.25, "y": 0}, + {"label":"k0H", "x": 17.25, "y": 0}, + + {"label":"k10", "x": 0, "y": 1, "w": 1.5}, + {"label":"k12", "x": 1.5, "y": 1}, + {"label":"k13", "x": 2.5, "y": 1}, + {"label":"k14", "x": 3.5, "y": 1}, + {"label":"k15", "x": 4.5, "y": 1}, + {"label":"k16", "x": 5.5, "y": 1}, + {"label":"k17", "x": 6.5, "y": 1}, + {"label":"k18", "x": 7.5, "y": 1}, + {"label":"k19", "x": 8.5, "y": 1}, + {"label":"k1A", "x": 9.5, "y": 1}, + {"label":"k1B", "x": 10.5, "y": 1}, + {"label":"k1C", "x": 11.5, "y": 1}, + {"label":"k1D", "x": 12.5, "y": 1}, + {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5}, + + {"label":"k1F", "x": 15.25, "y": 1}, + {"label":"k1G", "x": 16.25, "y": 1}, + {"label":"k1H", "x": 17.25, "y": 1}, + + {"label":"k20", "x": 0, "y": 2, "w": 1.75}, + {"label":"k22", "x": 1.75, "y": 2}, + {"label":"k23", "x": 2.75, "y": 2}, + {"label":"k24", "x": 3.75, "y": 2}, + {"label":"k25", "x": 4.75, "y": 2}, + {"label":"k26", "x": 5.75, "y": 2}, + {"label":"k27", "x": 6.75, "y": 2}, + {"label":"k28", "x": 7.75, "y": 2}, + {"label":"k29", "x": 8.75, "y": 2}, + {"label":"k2A", "x": 9.75, "y": 2}, + {"label":"k2B", "x": 10.75, "y": 2}, + {"label":"k2C", "x": 11.75, "y": 2}, + {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25}, + + {"label":"k30", "x": 0, "y": 3, "w": 1.25}, + {"label":"k31", "x": 1.25, "y": 3}, + {"label":"k32", "x": 2.25, "y": 3}, + {"label":"k33", "x": 3.25, "y": 3}, + {"label":"k34", "x": 4.25, "y": 3}, + {"label":"k35", "x": 5.25, "y": 3}, + {"label":"k36", "x": 6.25, "y": 3}, + {"label":"k37", "x": 7.25, "y": 3}, + {"label":"k38", "x": 8.25, "y": 3}, + {"label":"k39", "x": 9.25, "y": 3}, + {"label":"k3A", "x": 10.25, "y": 3}, + {"label":"k3B", "x": 11.25, "y": 3}, + {"label":"k3D", "x": 12.25, "y": 3, "w": 1.75}, + {"label":"k3E", "x": 14, "y": 3}, + + {"label":"k3G", "x": 16.25, "y": 3}, + + {"label":"k40", "x": 0, "y": 4, "w": 1.5}, + {"label":"k41", "x": 1.5, "y": 4}, + {"label":"k43", "x": 2.5, "y": 4, "w": 1.5}, + {"label":"k44", "x": 4, "y": 4, "w": 2.5}, + {"label":"k46", "x": 6.5, "y": 4}, + {"label":"k48", "x": 7.5, "y": 4, "w": 2.5}, + {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, + {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, + {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, + {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, + + {"label":"k4F", "x": 15.25, "y": 4}, + {"label":"k4G", "x": 16.25, "y": 4}, + {"label":"k4H", "x": 17.25, "y": 4} ] }, - "LAYOUT_division_backspace":{ + "LAYOUT_tkl_nofrow_ansi": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0}, - {"label":"k0c", "x":12, "y":0}, - {"label":"k0d", "x":13, "y":0}, - {"label":"k0e", "x":14, "y":0}, - {"label":"k0f", "x":15.25, "y":0}, - {"label":"k0g", "x":16.25, "y":0}, - {"label":"k0h", "x":17.25, "y":0}, - - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1}, - {"label":"k13", "x":2.5, "y":1}, - {"label":"k14", "x":3.5, "y":1}, - {"label":"k15", "x":4.5, "y":1}, - {"label":"k16", "x":5.5, "y":1}, - {"label":"k17", "x":6.5, "y":1}, - {"label":"k18", "x":7.5, "y":1}, - {"label":"k19", "x":8.5, "y":1}, - {"label":"k1a", "x":9.5, "y":1}, - {"label":"k1b", "x":10.5, "y":1}, - {"label":"k1c", "x":11.5, "y":1}, - {"label":"k1d", "x":12.5, "y":1}, - {"label":"k1f", "x":15.25, "y":1}, - {"label":"k1g", "x":16.25, "y":1}, - {"label":"k1h", "x":17.25, "y":1}, - - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k22", "x":1.75, "y":2}, - {"label":"k23", "x":2.75, "y":2}, - {"label":"k24", "x":3.75, "y":2}, - {"label":"k25", "x":4.75, "y":2}, - {"label":"k26", "x":5.75, "y":2}, - {"label":"k27", "x":6.75, "y":2}, - {"label":"k28", "x":7.75, "y":2}, - {"label":"k29", "x":8.75, "y":2}, - {"label":"k2a", "x":9.75, "y":2}, - {"label":"k2b", "x":10.75, "y":2}, - {"label":"k2c", "x":11.75, "y":2}, - {"label":"k1e", "x":12.75, "y":2}, - {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 2}, - - {"label":"k30", "x":0, "y":3, "w":1.25}, - {"label":"k31", "x":1.25, "y":3}, - {"label":"k32", "x":2.25, "y":3}, - {"label":"k33", "x":3.25, "y":3}, - {"label":"k34", "x":4.25, "y":3}, - {"label":"k35", "x":5.25, "y":3}, - {"label":"k36", "x":6.25, "y":3}, - {"label":"k37", "x":7.25, "y":3}, - {"label":"k38", "x":8.25, "y":3}, - {"label":"k39", "x":9.25, "y":3}, - {"label":"k3a", "x":10.25, "y":3}, - {"label":"k3b", "x":11.25, "y":3}, - {"label":"k3d", "x":12.25, "y":3, "w":1.75}, - {"label":"k3e", "x":14, "y":3}, - {"label":"k3g", "x":16.25, "y":3}, + {"label":"k00", "x": 0, "y": 0}, + {"label":"k01", "x": 1, "y": 0}, + {"label":"k02", "x": 2, "y": 0}, + {"label":"k03", "x": 3, "y": 0}, + {"label":"k04", "x": 4, "y": 0}, + {"label":"k05", "x": 5, "y": 0}, + {"label":"k06", "x": 6, "y": 0}, + {"label":"k07", "x": 7, "y": 0}, + {"label":"k08", "x": 8, "y": 0}, + {"label":"k09", "x": 9, "y": 0}, + {"label":"k0A", "x": 10, "y": 0}, + {"label":"k0B", "x": 11, "y": 0}, + {"label":"k0C", "x": 12, "y": 0}, + {"label":"k0E", "x": 13, "y": 0, "w": 2}, - {"label":"k40", "x":0, "y":4, "w":1.5}, - {"label":"k41", "x":1.25, "y":4}, - {"label":"k43", "x":2.5, "y":4, "w":1.5}, - {"label":"k46", "x":4, "y":4, "w":7}, - {"label":"k4b", "x":11, "y":4, "w":1.5}, - {"label":"k4d", "x":12.5, "y":4}, - {"label":"k4e", "x":13.75, "y":4, "w":1.5}, - {"label":"k4f", "x":15.25, "y":4}, - {"label":"k4g", "x":16.25, "y":4}, - {"label":"k4h", "x":17.25, "y":4} + {"label":"k0F", "x": 15.25, "y": 0}, + {"label":"k0G", "x": 16.25, "y": 0}, + {"label":"k0H", "x": 17.25, "y": 0}, + + {"label":"k10", "x": 0, "y": 1, "w": 1.5}, + {"label":"k12", "x": 1.5, "y": 1}, + {"label":"k13", "x": 2.5, "y": 1}, + {"label":"k14", "x": 3.5, "y": 1}, + {"label":"k15", "x": 4.5, "y": 1}, + {"label":"k16", "x": 5.5, "y": 1}, + {"label":"k17", "x": 6.5, "y": 1}, + {"label":"k18", "x": 7.5, "y": 1}, + {"label":"k19", "x": 8.5, "y": 1}, + {"label":"k1A", "x": 9.5, "y": 1}, + {"label":"k1B", "x": 10.5, "y": 1}, + {"label":"k1C", "x": 11.5, "y": 1}, + {"label":"k1D", "x": 12.5, "y": 1}, + {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5}, + + {"label":"k1F", "x": 15.25, "y": 1}, + {"label":"k1G", "x": 16.25, "y": 1}, + {"label":"k1H", "x": 17.25, "y": 1}, + + {"label":"k20", "x": 0, "y": 2, "w": 1.75}, + {"label":"k22", "x": 1.75, "y": 2}, + {"label":"k23", "x": 2.75, "y": 2}, + {"label":"k24", "x": 3.75, "y": 2}, + {"label":"k25", "x": 4.75, "y": 2}, + {"label":"k26", "x": 5.75, "y": 2}, + {"label":"k27", "x": 6.75, "y": 2}, + {"label":"k28", "x": 7.75, "y": 2}, + {"label":"k29", "x": 8.75, "y": 2}, + {"label":"k2A", "x": 9.75, "y": 2}, + {"label":"k2B", "x": 10.75, "y": 2}, + {"label":"k2C", "x": 11.75, "y": 2}, + {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25}, + + {"label":"k30", "x": 0, "y": 3, "w": 2.25}, + {"label":"k32", "x": 2.25, "y": 3}, + {"label":"k33", "x": 3.25, "y": 3}, + {"label":"k34", "x": 4.25, "y": 3}, + {"label":"k35", "x": 5.25, "y": 3}, + {"label":"k36", "x": 6.25, "y": 3}, + {"label":"k37", "x": 7.25, "y": 3}, + {"label":"k38", "x": 8.25, "y": 3}, + {"label":"k39", "x": 9.25, "y": 3}, + {"label":"k3A", "x": 10.25, "y": 3}, + {"label":"k3B", "x": 11.25, "y": 3}, + {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, + + {"label":"k3G", "x": 16.25, "y": 3}, + + {"label":"k40", "x": 0, "y": 4, "w": 1.25}, + {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, + {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, + {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, + {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, + {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, + {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, + {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, + + {"label":"k4F", "x": 15.25, "y": 4}, + {"label":"k4G", "x": 16.25, "y": 4}, + {"label":"k4H", "x": 17.25, "y": 4} ] }, - "LAYOUT_iso":{ + "LAYOUT_tkl_nofrow_iso": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0}, - {"label":"k0c", "x":12, "y":0}, - {"label":"k0d", "x":13, "y":0}, - {"label":"k0e", "x":14, "y":0}, - {"label":"k0f", "x":15.25, "y":0}, - {"label":"k0g", "x":16.25, "y":0}, - {"label":"k0h", "x":17.25, "y":0}, - - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1}, - {"label":"k13", "x":2.5, "y":1}, - {"label":"k14", "x":3.5, "y":1}, - {"label":"k15", "x":4.5, "y":1}, - {"label":"k16", "x":5.5, "y":1}, - {"label":"k17", "x":6.5, "y":1}, - {"label":"k18", "x":7.5, "y":1}, - {"label":"k19", "x":8.5, "y":1}, - {"label":"k1a", "x":9.5, "y":1}, - {"label":"k1b", "x":10.5, "y":1}, - {"label":"k1c", "x":11.5, "y":1}, - {"label":"k1d", "x":12.5, "y":1}, - {"label":"k1f", "x":15.25, "y":1}, - {"label":"k1g", "x":16.25, "y":1}, - {"label":"k1h", "x":17.25, "y":1}, - - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k22", "x":1.75, "y":2}, - {"label":"k23", "x":2.75, "y":2}, - {"label":"k24", "x":3.75, "y":2}, - {"label":"k25", "x":4.75, "y":2}, - {"label":"k26", "x":5.75, "y":2}, - {"label":"k27", "x":6.75, "y":2}, - {"label":"k28", "x":7.75, "y":2}, - {"label":"k29", "x":8.75, "y":2}, - {"label":"k2a", "x":9.75, "y":2}, - {"label":"k2b", "x":10.75, "y":2}, - {"label":"k2c", "x":11.75, "y":2}, - {"label":"k1e", "x":12.75, "y":2}, - {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 2}, - - {"label":"k30", "x":0, "y":3, "w":1.25}, - {"label":"k31", "x":1.25, "y":3}, - {"label":"k32", "x":2.25, "y":3}, - {"label":"k33", "x":3.25, "y":3}, - {"label":"k34", "x":4.25, "y":3}, - {"label":"k35", "x":5.25, "y":3}, - {"label":"k36", "x":6.25, "y":3}, - {"label":"k37", "x":7.25, "y":3}, - {"label":"k38", "x":8.25, "y":3}, - {"label":"k39", "x":9.25, "y":3}, - {"label":"k3a", "x":10.25, "y":3}, - {"label":"k3b", "x":11.25, "y":3}, - {"label":"k3d", "x":12.25, "y":3, "w":1.75}, - {"label":"k3e", "x":14, "y":3}, - {"label":"k3g", "x":16.25, "y":3}, - - {"label":"k40", "x":0, "y":4, "w":1.5}, - {"label":"k43", "x":2.5, "y":4, "w":1.5}, - {"label":"k44", "x":4, "y":4, "w":3}, - {"label":"k46", "x":7, "y":4}, - {"label":"k48", "x":8, "y":4, "w":3}, - {"label":"k4b", "x":11, "y":4, "w":1.5}, - {"label":"k4e", "x":13.5, "y":4, "w":1.5}, - {"label":"k4f", "x":15.25, "y":4}, - {"label":"k4g", "x":16.25, "y":4}, - {"label":"k4h", "x":17.25, "y":4} + {"label":"k00", "x": 0, "y": 0}, + {"label":"k01", "x": 1, "y": 0}, + {"label":"k02", "x": 2, "y": 0}, + {"label":"k03", "x": 3, "y": 0}, + {"label":"k04", "x": 4, "y": 0}, + {"label":"k05", "x": 5, "y": 0}, + {"label":"k06", "x": 6, "y": 0}, + {"label":"k07", "x": 7, "y": 0}, + {"label":"k08", "x": 8, "y": 0}, + {"label":"k09", "x": 9, "y": 0}, + {"label":"k0A", "x": 10, "y": 0}, + {"label":"k0B", "x": 11, "y": 0}, + {"label":"k0C", "x": 12, "y": 0}, + {"label":"k0E", "x": 13, "y": 0, "w": 2}, + + {"label":"k0F", "x": 15.25, "y": 0}, + {"label":"k0G", "x": 16.25, "y": 0}, + {"label":"k0H", "x": 17.25, "y": 0}, + + {"label":"k10", "x": 0, "y": 1, "w": 1.5}, + {"label":"k12", "x": 1.5, "y": 1}, + {"label":"k13", "x": 2.5, "y": 1}, + {"label":"k14", "x": 3.5, "y": 1}, + {"label":"k15", "x": 4.5, "y": 1}, + {"label":"k16", "x": 5.5, "y": 1}, + {"label":"k17", "x": 6.5, "y": 1}, + {"label":"k18", "x": 7.5, "y": 1}, + {"label":"k19", "x": 8.5, "y": 1}, + {"label":"k1A", "x": 9.5, "y": 1}, + {"label":"k1B", "x": 10.5, "y": 1}, + {"label":"k1C", "x": 11.5, "y": 1}, + {"label":"k1D", "x": 12.5, "y": 1}, + + {"label":"k1F", "x": 15.25, "y": 1}, + {"label":"k1G", "x": 16.25, "y": 1}, + {"label":"k1H", "x": 17.25, "y": 1}, + + {"label":"k20", "x": 0, "y": 2, "w": 1.75}, + {"label":"k22", "x": 1.75, "y": 2}, + {"label":"k23", "x": 2.75, "y": 2}, + {"label":"k24", "x": 3.75, "y": 2}, + {"label":"k25", "x": 4.75, "y": 2}, + {"label":"k26", "x": 5.75, "y": 2}, + {"label":"k27", "x": 6.75, "y": 2}, + {"label":"k28", "x": 7.75, "y": 2}, + {"label":"k29", "x": 8.75, "y": 2}, + {"label":"k2A", "x": 9.75, "y": 2}, + {"label":"k2B", "x": 10.75, "y": 2}, + {"label":"k2C", "x": 11.75, "y": 2}, + {"label":"k1E", "x": 12.75, "y": 2}, + {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"label":"k30", "x": 0, "y": 3, "w": 1.25}, + {"label":"k31", "x": 1.25, "y": 3}, + {"label":"k32", "x": 2.25, "y": 3}, + {"label":"k33", "x": 3.25, "y": 3}, + {"label":"k34", "x": 4.25, "y": 3}, + {"label":"k35", "x": 5.25, "y": 3}, + {"label":"k36", "x": 6.25, "y": 3}, + {"label":"k37", "x": 7.25, "y": 3}, + {"label":"k38", "x": 8.25, "y": 3}, + {"label":"k39", "x": 9.25, "y": 3}, + {"label":"k3A", "x": 10.25, "y": 3}, + {"label":"k3B", "x": 11.25, "y": 3}, + {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, + + {"label":"k3G", "x": 16.25, "y": 3}, + + {"label":"k40", "x": 0, "y": 4, "w": 1.25}, + {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, + {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, + {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, + {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, + {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, + {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, + {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, + + {"label":"k4F", "x": 15.25, "y": 4}, + {"label":"k4G", "x": 16.25, "y": 4}, + {"label":"k4H", "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_ansi_split_bs": { + "layout": [ + {"label":"k00", "x": 0, "y": 0}, + {"label":"k01", "x": 1, "y": 0}, + {"label":"k02", "x": 2, "y": 0}, + {"label":"k03", "x": 3, "y": 0}, + {"label":"k04", "x": 4, "y": 0}, + {"label":"k05", "x": 5, "y": 0}, + {"label":"k06", "x": 6, "y": 0}, + {"label":"k07", "x": 7, "y": 0}, + {"label":"k08", "x": 8, "y": 0}, + {"label":"k09", "x": 9, "y": 0}, + {"label":"k0A", "x": 10, "y": 0}, + {"label":"k0B", "x": 11, "y": 0}, + {"label":"k0C", "x": 12, "y": 0}, + {"label":"k0D", "x": 13, "y": 0}, + {"label":"k0E", "x": 14, "y": 0}, + + {"label":"k0F", "x": 15.25, "y": 0}, + {"label":"k0G", "x": 16.25, "y": 0}, + {"label":"k0H", "x": 17.25, "y": 0}, + + {"label":"k10", "x": 0, "y": 1, "w": 1.5}, + {"label":"k12", "x": 1.5, "y": 1}, + {"label":"k13", "x": 2.5, "y": 1}, + {"label":"k14", "x": 3.5, "y": 1}, + {"label":"k15", "x": 4.5, "y": 1}, + {"label":"k16", "x": 5.5, "y": 1}, + {"label":"k17", "x": 6.5, "y": 1}, + {"label":"k18", "x": 7.5, "y": 1}, + {"label":"k19", "x": 8.5, "y": 1}, + {"label":"k1A", "x": 9.5, "y": 1}, + {"label":"k1B", "x": 10.5, "y": 1}, + {"label":"k1C", "x": 11.5, "y": 1}, + {"label":"k1D", "x": 12.5, "y": 1}, + {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5}, + + {"label":"k1F", "x": 15.25, "y": 1}, + {"label":"k1G", "x": 16.25, "y": 1}, + {"label":"k1H", "x": 17.25, "y": 1}, + + {"label":"k20", "x": 0, "y": 2, "w": 1.75}, + {"label":"k22", "x": 1.75, "y": 2}, + {"label":"k23", "x": 2.75, "y": 2}, + {"label":"k24", "x": 3.75, "y": 2}, + {"label":"k25", "x": 4.75, "y": 2}, + {"label":"k26", "x": 5.75, "y": 2}, + {"label":"k27", "x": 6.75, "y": 2}, + {"label":"k28", "x": 7.75, "y": 2}, + {"label":"k29", "x": 8.75, "y": 2}, + {"label":"k2A", "x": 9.75, "y": 2}, + {"label":"k2B", "x": 10.75, "y": 2}, + {"label":"k2C", "x": 11.75, "y": 2}, + {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25}, + + {"label":"k30", "x": 0, "y": 3, "w": 2.25}, + {"label":"k32", "x": 2.25, "y": 3}, + {"label":"k33", "x": 3.25, "y": 3}, + {"label":"k34", "x": 4.25, "y": 3}, + {"label":"k35", "x": 5.25, "y": 3}, + {"label":"k36", "x": 6.25, "y": 3}, + {"label":"k37", "x": 7.25, "y": 3}, + {"label":"k38", "x": 8.25, "y": 3}, + {"label":"k39", "x": 9.25, "y": 3}, + {"label":"k3A", "x": 10.25, "y": 3}, + {"label":"k3B", "x": 11.25, "y": 3}, + {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, + + {"label":"k3G", "x": 16.25, "y": 3}, + + {"label":"k40", "x": 0, "y": 4, "w": 1.25}, + {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, + {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, + {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, + {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, + {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, + {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, + {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, + + {"label":"k4F", "x": 15.25, "y": 4}, + {"label":"k4G", "x": 16.25, "y": 4}, + {"label":"k4H", "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_iso_split_bs": { + "layout": [ + {"label":"k00", "x": 0, "y": 0}, + {"label":"k01", "x": 1, "y": 0}, + {"label":"k02", "x": 2, "y": 0}, + {"label":"k03", "x": 3, "y": 0}, + {"label":"k04", "x": 4, "y": 0}, + {"label":"k05", "x": 5, "y": 0}, + {"label":"k06", "x": 6, "y": 0}, + {"label":"k07", "x": 7, "y": 0}, + {"label":"k08", "x": 8, "y": 0}, + {"label":"k09", "x": 9, "y": 0}, + {"label":"k0A", "x": 10, "y": 0}, + {"label":"k0B", "x": 11, "y": 0}, + {"label":"k0C", "x": 12, "y": 0}, + {"label":"k0D", "x": 13, "y": 0}, + {"label":"k0E", "x": 14, "y": 0}, + + {"label":"k0F", "x": 15.25, "y": 0}, + {"label":"k0G", "x": 16.25, "y": 0}, + {"label":"k0H", "x": 17.25, "y": 0}, + + {"label":"k10", "x": 0, "y": 1, "w": 1.5}, + {"label":"k12", "x": 1.5, "y": 1}, + {"label":"k13", "x": 2.5, "y": 1}, + {"label":"k14", "x": 3.5, "y": 1}, + {"label":"k15", "x": 4.5, "y": 1}, + {"label":"k16", "x": 5.5, "y": 1}, + {"label":"k17", "x": 6.5, "y": 1}, + {"label":"k18", "x": 7.5, "y": 1}, + {"label":"k19", "x": 8.5, "y": 1}, + {"label":"k1A", "x": 9.5, "y": 1}, + {"label":"k1B", "x": 10.5, "y": 1}, + {"label":"k1C", "x": 11.5, "y": 1}, + {"label":"k1D", "x": 12.5, "y": 1}, + + {"label":"k1F", "x": 15.25, "y": 1}, + {"label":"k1G", "x": 16.25, "y": 1}, + {"label":"k1H", "x": 17.25, "y": 1}, + + {"label":"k20", "x": 0, "y": 2, "w": 1.75}, + {"label":"k22", "x": 1.75, "y": 2}, + {"label":"k23", "x": 2.75, "y": 2}, + {"label":"k24", "x": 3.75, "y": 2}, + {"label":"k25", "x": 4.75, "y": 2}, + {"label":"k26", "x": 5.75, "y": 2}, + {"label":"k27", "x": 6.75, "y": 2}, + {"label":"k28", "x": 7.75, "y": 2}, + {"label":"k29", "x": 8.75, "y": 2}, + {"label":"k2A", "x": 9.75, "y": 2}, + {"label":"k2B", "x": 10.75, "y": 2}, + {"label":"k2C", "x": 11.75, "y": 2}, + {"label":"k1E", "x": 12.75, "y": 2}, + {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"label":"k30", "x": 0, "y": 3, "w": 1.25}, + {"label":"k31", "x": 1.25, "y": 3}, + {"label":"k32", "x": 2.25, "y": 3}, + {"label":"k33", "x": 3.25, "y": 3}, + {"label":"k34", "x": 4.25, "y": 3}, + {"label":"k35", "x": 5.25, "y": 3}, + {"label":"k36", "x": 6.25, "y": 3}, + {"label":"k37", "x": 7.25, "y": 3}, + {"label":"k38", "x": 8.25, "y": 3}, + {"label":"k39", "x": 9.25, "y": 3}, + {"label":"k3A", "x": 10.25, "y": 3}, + {"label":"k3B", "x": 11.25, "y": 3}, + {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, + + {"label":"k3G", "x": 16.25, "y": 3}, + + {"label":"k40", "x": 0, "y": 4, "w": 1.25}, + {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, + {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, + {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, + {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, + {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, + {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, + {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, + + {"label":"k4F", "x": 15.25, "y": 4}, + {"label":"k4G", "x": 16.25, "y": 4}, + {"label":"k4H", "x": 17.25, "y": 4} ] } } diff --git a/keyboards/mokey/xox70/keymaps/default/keymap.c b/keyboards/mokey/xox70/keymaps/default/keymap.c index 710acc04cb..b19174948b 100644 --- a/keyboards/mokey/xox70/keymaps/default/keymap.c +++ b/keyboards/mokey/xox70/keymaps/default/keymap.c @@ -15,21 +15,12 @@ #include QMK_KEYBOARD_H - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( - 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_INSERT, KC_HOME, KC_PGUP, - 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_DELETE, KC_END, KC_PGDOWN, + LAYOUT_tkl_nofrow_ansi( + 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_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) }; diff --git a/keyboards/mokey/xox70/keymaps/via/keymap.c b/keyboards/mokey/xox70/keymaps/via/keymap.c index 66e227e333..304fe3968c 100644 --- a/keyboards/mokey/xox70/keymaps/via/keymap.c +++ b/keyboards/mokey/xox70/keymaps/via/keymap.c @@ -16,36 +16,32 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - LAYOUT( - 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_INSERT, KC_HOME, KC_PGUP, - 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_DELETE, KC_END, KC_PGDOWN, + LAYOUT_all( + 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_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - - LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/mokey/xox70/rules.mk b/keyboards/mokey/xox70/rules.mk index 7b507a4165..aa86669dc3 100644 --- a/keyboards/mokey/xox70/rules.mk +++ b/keyboards/mokey/xox70/rules.mk @@ -16,3 +16,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output + +LAYOUTS = tkl_nofrow_ansi tkl_nofrow_iso diff --git a/keyboards/mokey/xox70/xox70.h b/keyboards/mokey/xox70/xox70.h index 8c54e630c5..3c0f15d2f7 100644 --- a/keyboards/mokey/xox70/xox70.h +++ b/keyboards/mokey/xox70/xox70.h @@ -13,53 +13,102 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #pragma once #include "quantum.h" -#define xxx KC_NO +#define XXX KC_NO -#define LAYOUT(\ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3g, \ - k40, k41, k43, k46, k4a, k4b, k4d, k4e, k4f, k4g, k4h \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, k0f, k0g, k0h }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO, KC_NO, KC_NO,KC_NO }, \ - { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO, KC_NO, k3g, KC_NO }, \ - { k40, k41, KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, KC_NO, k4d, k4e, k4f, k4g, k4h } \ +/* + * ┌───────┐ + * │0E │ 2u Backspace + * └───────┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │0G │0H │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ┌─────┐ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │1G │1H │ │2D │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐ │ ISO Enter + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │1E │ │ + * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ├───┴────┴─┐ + * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │ │3G │ │3D │ + * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘ + * │40 │41 │43 │46 │4A │4B │4D │4E │ │4F │4G │4H │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ + * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ + * │40 │41 │43 │46 │4B │4D │4E │ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ + * ┌─────┐ ┌─────┬───────────┬───┬───────────┬─────┐ ┌─────┐ + * │40 │ │43 │44 │46 │48 │4B │ │4E │ + * └─────┘ └─────┴───────────┴───┴───────────┴─────┘ └─────┘ + */ + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3G, \ + k40, k41, k43, k44, k46, k48, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ + { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, XXX, k3G, XXX }, \ + { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ } -#define LAYOUT_division_backspace(\ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, k3g, \ - k40, k41, k43, k46, k4b, k4d, k4e, k4f, k4g, k4h \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, KC_NO }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, KC_NO, KC_NO, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e, KC_NO, k3g, KC_NO }, \ - { k40, k41, KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO,k4b, KC_NO, k4d, k4e, k4f, k4g, k4h } \ +#define LAYOUT_tkl_nofrow_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ + k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \ + { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ + { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ } -#define LAYOUT_iso(\ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, k3g, \ - k40, k43, k44, k46, k48, k4b, k4e, k4f, k4g, k4h \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, KC_NO }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, KC_NO, KC_NO, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e, KC_NO, k3g, KC_NO }, \ - { k40, KC_NO, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4a, KC_NO, k4d, k4e, k4f, k4g, k4h } \ +#define LAYOUT_tkl_nofrow_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ + k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \ + { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ + { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ +} + +#define LAYOUT_tkl_nofrow_ansi_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ + k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ + { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ + { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ +} + +#define LAYOUT_tkl_nofrow_iso_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ + k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ + { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ + { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ }