Add more layouts for the ergodash (#6336)

2 files changed, 487 insertions, 49 deletions

diff --git a/keyboards/ergodash/rev1/info.json b/keyboards/ergodash/rev1/info.json
index bcfbda6d3..de8b0c070 100644
--- a/keyboards/ergodash/rev1/info.json
+++ b/keyboards/ergodash/rev1/info.json
@@ -1,13 +1,366 @@
 {
-  "keyboard_name": "ErgoDash rev2",
-  "url": "",
-  "maintainer": "qmk",
-  "width": 18,
-  "height": 6.25,
-  "layouts": {
-    "LAYOUT": {
-      "key_count": 70,
-      "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.375}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.75}, {"label":"R00", "x":11, "y":0.75}, {"label":"R01", "x":12, "y":0.25}, {"label":"R02", "x":13, "y":0.125}, {"label":"R03", "x":14, "y":0}, {"label":"R04", "x":15, "y":0.125}, {"label":"R05", "x":16, "y":0.375}, {"label":"R06", "x":17, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.375}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.75}, {"label":"R10", "x":11, "y":1.75}, {"label":"R11", "x":12, "y":1.25}, {"label":"R12", "x":13, "y":1.125}, {"label":"R13", "x":14, "y":1}, {"label":"R14", "x":15, "y":1.125}, {"label":"R15", "x":16, "y":1.375}, {"label":"R16", "x":17, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.375}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6, "y":2.75}, {"label":"R20", "x":11, "y":2.75}, {"label":"R21", "x":12, "y":2.25}, {"label":"R22", "x":13, "y":2.125}, {"label":"R23", "x":14, "y":2}, {"label":"R24", "x":15, "y":2.125}, {"label":"R25", "x":16, "y":2.375}, {"label":"R26", "x":17, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.375}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3.125}, {"label":"L35", "x":5, "y":3.25}, {"label":"L36", "x":6.5, "y":4.25}, {"label":"R30", "x":10.5, "y":4.25}, {"label":"R31", "x":12, "y":3.25}, {"label":"R32", "x":13, "y":3.125}, {"label":"R33", "x":14, "y":3}, {"label":"R34", "x":15, "y":3.125}, {"label":"R35", "x":16, "y":3.375}, {"label":"R36", "x":17, "y":3.375}, {"label":"L40", "x":0, "y":4.375}, {"label":"L41", "x":1, "y":4.375}, {"label":"L42", "x":2, "y":4.125}, {"label":"L43", "x":3, "y":4}, {"label":"L44", "x":5.5, "y":5.25}, {"label":"L45", "x":6.5, "y":5.25}, {"label":"L46", "x":7.5, "y":4.25, "h":2}, {"label":"R40", "x":9.5, "y":4.25, "h":2}, {"label":"R41", "x":10.5, "y":5.25}, {"label":"R42", "x":11.5, "y":5.25}, {"label":"R43", "x":14, "y":4}, {"label":"R44", "x":15, "y":4.125}, {"label":"R45", "x":16, "y":4.375}, {"label":"R46", "x":17, "y":4.375}]
+    "keyboard_name": "ErgoDash rev1.2",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 19,
+    "height": 8.375,
+    "layouts": {
+        "LAYOUT_4key": {
+            "layout": [
+                {"y": 0.375, "x": 0.5, "label": "L00"},
+                {"y": 0.375, "x": 1.5, "label": "L01"},
+                {"y": 0.125, "x": 2.5, "label": "L02"},
+                {"y": 0, "x": 3.5, "label": "L03"},
+                {"y": 0.125, "x": 4.5, "label": "L04"},
+                {"y": 0.25, "x": 5.5, "label": "L05"},
+                {"y": 0.75, "x": 6.5, "label": "L06"},
+                {"y": 0.75, "x": 12, "label": "R00"},
+                {"y": 0.25, "x": 13, "label": "R01"},
+                {"y": 0.125, "x": 14, "label": "R02"},
+                {"y": 0, "x": 15, "label": "R03"},
+                {"y": 0.125, "x": 16, "label": "R04"},
+                {"y": 0.375, "x": 17, "label": "R05"},
+                {"y": 0.375, "x": 18, "label": "R06"},
+                {"y": 1.375, "x": 0.5, "label": "L10"},
+                {"y": 1.375, "x": 1.5, "label": "L11"},
+                {"y": 1.125, "x": 2.5, "label": "L12"},
+                {"y": 1, "x": 3.5, "label": "L13"},
+                {"y": 1.125, "x": 4.5, "label": "L14"},
+                {"y": 1.25, "x": 5.5, "label": "L15"},
+                {"y": 1.75, "x": 6.5, "label": "L16"},
+                {"y": 1.75, "x": 12, "label": "R10"},
+                {"y": 1.25, "x": 13, "label": "R11"},
+                {"y": 1.125, "x": 14, "label": "R12"},
+                {"y": 1, "x": 15, "label": "R13"},
+                {"y": 1.125, "x": 16, "label": "R14"},
+                {"y": 1.375, "x": 17, "label": "R15"},
+                {"y": 1.375, "x": 18, "label": "R16"},
+                {"y": 2.375, "x": 0.5, "label": "L20"},
+                {"y": 2.375, "x": 1.5, "label": "L21"},
+                {"y": 2.125, "x": 2.5, "label": "L22"},
+                {"y": 2, "x": 3.5, "label": "L23"},
+                {"y": 2.125, "x": 4.5, "label": "L24"},
+                {"y": 2.25, "x": 5.5, "label": "L25"},
+                {"y": 2.75, "x": 6.5, "label": "L26"},
+                {"y": 2.75, "x": 12, "label": "R20"},
+                {"y": 2.25, "x": 13, "label": "R21"},
+                {"y": 2.125, "x": 14, "label": "R22"},
+                {"y": 2, "x": 15, "label": "R23"},
+                {"y": 2.125, "x": 16, "label": "R24"},
+                {"y": 2.375, "x": 17, "label": "R25"},
+                {"y": 2.375, "x": 18, "label": "R26"},
+                {"y": 3.375, "x": 0.5, "label": "L30"},
+                {"y": 3.375, "x": 1.5, "label": "L31"},
+                {"y": 3.125, "x": 2.5, "label": "L32"},
+                {"y": 3, "x": 3.5, "label": "L33"},
+                {"y": 3.125, "x": 4.5, "label": "L34"},
+                {"y": 3.25, "x": 5.5, "label": "L35"},
+                {"y": 4, "x": 6.5, "label": "L36"},
+                {"y": 4, "x": 12, "label": "R30"},
+                {"y": 3.25, "x": 13, "label": "R31"},
+                {"y": 3.125, "x": 14, "label": "R32"},
+                {"y": 3, "x": 15, "label": "R33"},
+                {"y": 3.125, "x": 16, "label": "R34"},
+                {"y": 3.375, "x": 17, "label": "R35"},
+                {"y": 3.375, "x": 18, "label": "R36"},
+                {"y": 4.375, "x": 0.5, "label": "L40"},
+                {"y": 4.375, "x": 1.5, "label": "L41"},
+                {"y": 4.125, "x": 2.5, "label": "L42"},
+                {"y": 4, "x": 3.5, "label": "L43"},
+                {"y": 5, "x": 5.5, "label": "L44"},
+                {"y": 5, "x": 6.5, "label": "L45"},
+                {"h": 2, "y": 4, "x": 7.5, "label": "L46"},
+                {"h": 2, "y": 4, "x": 11, "label": "R40"},
+                {"y": 5, "x": 12, "label": "R41"},
+                {"y": 5, "x": 13, "label": "R42"},
+                {"y": 4, "x": 15, "label": "R43"},
+                {"y": 4.125, "x": 16, "label": "R44"},
+                {"y": 4.375, "x": 17, "label": "R45"},
+                {"y": 4.375, "x": 18, "label": "R46"}]
+        },
+        "LAYOUT_4key_2u_inner": {
+            "layout": [
+                {"y": 0.375, "x": 0.5, "label": "L00"},
+                {"y": 0.375, "x": 1.5, "label": "L01"},
+                {"y": 0.125, "x": 2.5, "label": "L02"},
+                {"y": 0, "x": 3.5, "label": "L03"},
+                {"y": 0.125, "x": 4.5, "label": "L04"},
+                {"y": 0.25, "x": 5.5, "label": "L05"},
+                {"y": 0.75, "x": 6.5, "label": "L06"},
+                {"y": 0.75, "x": 12, "label": "R00"},
+                {"y": 0.25, "x": 13, "label": "R01"},
+                {"y": 0.125, "x": 14, "label": "R02"},
+                {"y": 0, "x": 15, "label": "R03"},
+                {"y": 0.125, "x": 16, "label": "R04"},
+                {"y": 0.375, "x": 17, "label": "R05"},
+                {"y": 0.375, "x": 18, "label": "R06"},
+                {"y": 1.375, "x": 0.5, "label": "L10"},
+                {"y": 1.375, "x": 1.5, "label": "L11"},
+                {"y": 1.125, "x": 2.5, "label": "L12"},
+                {"y": 1, "x": 3.5, "label": "L13"},
+                {"y": 1.125, "x": 4.5, "label": "L14"},
+                {"y": 1.25, "x": 5.5, "label": "L15"},
+                {"y": 1.75, "x": 6.5, "label": "L16"},
+                {"y": 1.75, "x": 12, "label": "R10"},
+                {"y": 1.25, "x": 13, "label": "R11"},
+                {"y": 1.125, "x": 14, "label": "R12"},
+                {"y": 1, "x": 15, "label": "R13"},
+                {"y": 1.125, "x": 16, "label": "R14"},
+                {"y": 1.375, "x": 17, "label": "R15"},
+                {"y": 1.375, "x": 18, "label": "R16"},
+                {"y": 2.375, "x": 0.5, "label": "L20"},
+                {"y": 2.375, "x": 1.5, "label": "L21"},
+                {"y": 2.125, "x": 2.5, "label": "L22"},
+                {"y": 2, "x": 3.5, "label": "L23"},
+                {"y": 2.125, "x": 4.5, "label": "L24"},
+                {"y": 2.25, "x": 5.5, "label": "L25"},
+                {"y": 2.75, "x": 6.5, "label": "L26"},
+                {"y": 2.75, "x": 12, "label": "R20"},
+                {"y": 2.25, "x": 13, "label": "R21"},
+                {"y": 2.125, "x": 14, "label": "R22"},
+                {"y": 2, "x": 15, "label": "R23"},
+                {"y": 2.125, "x": 16, "label": "R24"},
+                {"y": 2.375, "x": 17, "label": "R25"},
+                {"y": 2.375, "x": 18, "label": "R26"},
+                {"y": 3.375, "x": 0.5, "label": "L30"},
+                {"y": 3.375, "x": 1.5, "label": "L31"},
+                {"y": 3.125, "x": 2.5, "label": "L32"},
+                {"y": 3, "x": 3.5, "label": "L33"},
+                {"y": 3.125, "x": 4.5, "label": "L34"},
+                {"y": 3.25, "x": 5.5, "label": "L35"},
+                {"y": 4, "x": 7.5, "label": "L36"},
+                {"y": 4, "x": 11, "label": "R30"},
+                {"y": 3.25, "x": 13, "label": "R31"},
+                {"y": 3.125, "x": 14, "label": "R32"},
+                {"y": 3, "x": 15, "label": "R33"},
+                {"y": 3.125, "x": 16, "label": "R34"},
+                {"y": 3.375, "x": 17, "label": "R35"},
+                {"y": 3.375, "x": 18, "label": "R36"},
+                {"y": 4.375, "x": 0.5, "label": "L40"},
+                {"y": 4.375, "x": 1.5, "label": "L41"},
+                {"y": 4.125, "x": 2.5, "label": "L42"},
+                {"y": 4, "x": 3.5, "label": "L43"},
+                {"y": 5, "x": 5.5, "label": "L44"},
+                {"h": 2, "y": 4, "x": 6.5, "label": "L45"},
+                {"y": 5, "x": 7.5, "label": "L46"},
+                {"y": 5, "x": 11, "label": "R40"},
+                {"h": 2, "y": 4, "x": 12, "label": "R41"},
+                {"y": 5, "x": 13, "label": "R42"},
+                {"y": 4, "x": 15, "label": "R43"},
+                {"y": 4.125, "x": 16, "label": "R44"},
+                {"y": 4.375, "x": 17, "label": "R45"},
+                {"y": 4.375, "x": 18, "label": "R46"}]
+        },
+        "LAYOUT_3key_2us": {
+            "layout": [
+                {"y": 0.375, "x": 0.5, "label": "L00"},
+                {"y": 0.375, "x": 1.5, "label": "L01"},
+                {"y": 0.125, "x": 2.5, "label": "L02"},
+                {"y": 0, "x": 3.5, "label": "L03"},
+                {"y": 0.125, "x": 4.5, "label": "L04"},
+                {"y": 0.25, "x": 5.5, "label": "L05"},
+                {"y": 0.75, "x": 6.5, "label": "L06"},
+                {"y": 0.75, "x": 12, "label": "R00"},
+                {"y": 0.25, "x": 13, "label": "R01"},
+                {"y": 0.125, "x": 14, "label": "R02"},
+                {"y": 0, "x": 15, "label": "R03"},
+                {"y": 0.125, "x": 16, "label": "R04"},
+                {"y": 0.375, "x": 17, "label": "R05"},
+                {"y": 0.375, "x": 18, "label": "R06"},
+                {"y": 1.375, "x": 0.5, "label": "L10"},
+                {"y": 1.375, "x": 1.5, "label": "L11"},
+                {"y": 1.125, "x": 2.5, "label": "L12"},
+                {"y": 1, "x": 3.5, "label": "L13"},
+                {"y": 1.125, "x": 4.5, "label": "L14"},
+                {"y": 1.25, "x": 5.5, "label": "L15"},
+                {"y": 1.75, "x": 6.5, "label": "L16"},
+                {"y": 1.75, "x": 12, "label": "R10"},
+                {"y": 1.25, "x": 13, "label": "R11"},
+                {"y": 1.125, "x": 14, "label": "R12"},
+                {"y": 1, "x": 15, "label": "R13"},
+                {"y": 1.125, "x": 16, "label": "R14"},
+                {"y": 1.375, "x": 17, "label": "R15"},
+                {"y": 1.375, "x": 18, "label": "R16"},
+                {"y": 2.375, "x": 0.5, "label": "L20"},
+                {"y": 2.375, "x": 1.5, "label": "L21"},
+                {"y": 2.125, "x": 2.5, "label": "L22"},
+                {"y": 2, "x": 3.5, "label": "L23"},
+                {"y": 2.125, "x": 4.5, "label": "L24"},
+                {"y": 2.25, "x": 5.5, "label": "L25"},
+                {"y": 2.75, "x": 6.5, "label": "L26"},
+                {"y": 2.75, "x": 12, "label": "R20"},
+                {"y": 2.25, "x": 13, "label": "R21"},
+                {"y": 2.125, "x": 14, "label": "R22"},
+                {"y": 2, "x": 15, "label": "R23"},
+                {"y": 2.125, "x": 16, "label": "R24"},
+                {"y": 2.375, "x": 17, "label": "R25"},
+                {"y": 2.375, "x": 18, "label": "R26"},
+                {"y": 3.375, "x": 0.5, "label": "L30"},
+                {"y": 3.375, "x": 1.5, "label": "L31"},
+                {"y": 3.125, "x": 2.5, "label": "L32"},
+                {"y": 3, "x": 3.5, "label": "L33"},
+                {"y": 3.125, "x": 4.5, "label": "L34"},
+                {"y": 3.25, "x": 5.5, "label": "L35"},
+                {"y": 3.25, "x": 13, "label": "R31"},
+                {"y": 3.125, "x": 14, "label": "R32"},
+                {"y": 3, "x": 15, "label": "R33"},
+                {"y": 3.125, "x": 16, "label": "R34"},
+                {"y": 3.375, "x": 17, "label": "R35"},
+                {"y": 3.375, "x": 18, "label": "R36"},
+                {"y": 4.375, "x": 0.5, "label": "L40"},
+                {"y": 4.375, "x": 1.5, "label": "L41"},
+                {"y": 4.125, "x": 2.5, "label": "L42"},
+                {"y": 4, "x": 3.5, "label": "L43"},
+                {"y": 5, "x": 5.5, "label": "L44"},
+                {"h": 2, "y": 4, "x": 6.5, "label": "L45"},
+                {"h": 2, "y": 4, "x": 7.5, "label": "L46"},
+                {"h": 2, "y": 4, "x": 11, "label": "R40"},
+                {"h": 2, "y": 4, "x": 12, "label": "R41"},
+                {"y": 5, "x": 13, "label": "R42"},
+                {"y": 4, "x": 15, "label": "R43"},
+                {"y": 4.125, "x": 16, "label": "R44"},
+                {"y": 4.375, "x": 17, "label": "R45"},
+                {"y": 4.375, "x": 18, "label": "R46"}]
+        },
+        "LAYOUT_3key_1us": {
+            "layout": [
+                {"y": 0.375, "x": 0.5, "label": "L00"},
+                {"y": 0.375, "x": 1.5, "label": "L01"},
+                {"y": 0.125, "x": 2.5, "label": "L02"},
+                {"y": 0, "x": 3.5, "label": "L03"},
+                {"y": 0.125, "x": 4.5, "label": "L04"},
+                {"y": 0.25, "x": 5.5, "label": "L05"},
+                {"y": 0.75, "x": 6.5, "label": "L06"},
+                {"y": 0.75, "x": 12, "label": "R00"},
+                {"y": 0.25, "x": 13, "label": "R01"},
+                {"y": 0.125, "x": 14, "label": "R02"},
+                {"y": 0, "x": 15, "label": "R03"},
+                {"y": 0.125, "x": 16, "label": "R04"},
+                {"y": 0.375, "x": 17, "label": "R05"},
+                {"y": 0.375, "x": 18, "label": "R06"},
+                {"y": 1.375, "x": 0.5, "label": "L10"},
+                {"y": 1.375, "x": 1.5, "label": "L11"},
+                {"y": 1.125, "x": 2.5, "label": "L12"},
+                {"y": 1, "x": 3.5, "label": "L13"},
+                {"y": 1.125, "x": 4.5, "label": "L14"},
+                {"y": 1.25, "x": 5.5, "label": "L15"},
+                {"y": 1.75, "x": 6.5, "label": "L16"},
+                {"y": 1.75, "x": 12, "label": "R10"},
+                {"y": 1.25, "x": 13, "label": "R11"},
+                {"y": 1.125, "x": 14, "label": "R12"},
+                {"y": 1, "x": 15, "label": "R13"},
+                {"y": 1.125, "x": 16, "label": "R14"},
+                {"y": 1.375, "x": 17, "label": "R15"},
+                {"y": 1.375, "x": 18, "label": "R16"},
+                {"y": 2.375, "x": 0.5, "label": "L20"},
+                {"y": 2.375, "x": 1.5, "label": "L21"},
+                {"y": 2.125, "x": 2.5, "label": "L22"},
+                {"y": 2, "x": 3.5, "label": "L23"},
+                {"y": 2.125, "x": 4.5, "label": "L24"},
+                {"y": 2.25, "x": 5.5, "label": "L25"},
+                {"y": 2.75, "x": 6.5, "label": "L26"},
+                {"y": 2.75, "x": 12, "label": "R20"},
+                {"y": 2.25, "x": 13, "label": "R21"},
+                {"y": 2.125, "x": 14, "label": "R22"},
+                {"y": 2, "x": 15, "label": "R23"},
+                {"y": 2.125, "x": 16, "label": "R24"},
+                {"y": 2.375, "x": 17, "label": "R25"},
+                {"y": 2.375, "x": 18, "label": "R26"},
+                {"y": 3.375, "x": 0.5, "label": "L30"},
+                {"y": 3.375, "x": 1.5, "label": "L31"},
+                {"y": 3.125, "x": 2.5, "label": "L32"},
+                {"y": 3, "x": 3.5, "label": "L33"},
+                {"y": 3.125, "x": 4.5, "label": "L34"},
+                {"y": 3.25, "x": 5.5, "label": "L35"},
+                {"y": 4, "x": 6.5, "label": "L36"},
+                {"y": 4, "x": 12, "label": "R30"},
+                {"y": 3.25, "x": 13, "label": "R31"},
+                {"y": 3.125, "x": 14, "label": "R32"},
+                {"y": 3, "x": 15, "label": "R33"},
+                {"y": 3.125, "x": 16, "label": "R34"},
+                {"y": 3.375, "x": 17, "label": "R35"},
+                {"y": 3.375, "x": 18, "label": "R36"},
+                {"y": 4.375, "x": 0.5, "label": "L40"},
+                {"y": 4.375, "x": 1.5, "label": "L41"},
+                {"y": 4.125, "x": 2.5, "label": "L42"},
+                {"y": 4, "x": 3.5, "label": "L43"},
+                {"y": 5, "x": 5.5, "label": "L44"},
+                {"y": 5, "x": 6.5, "label": "L45"},
+                {"y": 5, "x": 12, "label": "R41"},
+                {"y": 5, "x": 13, "label": "R42"},
+                {"y": 4, "x": 15, "label": "R43"},
+                {"y": 4.125, "x": 16, "label": "R44"},
+                {"y": 4.375, "x": 17, "label": "R45"},
+                {"y": 4.375, "x": 18, "label": "R46"}]
+        },
+        "LAYOUT_2key": {
+            "layout": [
+                {"y": 0.375, "x": 0.5, "label": "L00"},
+                {"y": 0.375, "x": 1.5, "label": "L01"},
+                {"y": 0.125, "x": 2.5, "label": "L02"},
+                {"y": 0, "x": 3.5, "label": "L03"},
+                {"y": 0.125, "x": 4.5, "label": "L04"},
+                {"y": 0.25, "x": 5.5, "label": "L05"},
+                {"y": 0.75, "x": 6.5, "label": "L06"},
+                {"y": 0.75, "x": 12, "label": "R00"},
+                {"y": 0.25, "x": 13, "label": "R01"},
+                {"y": 0.125, "x": 14, "label": "R02"},
+                {"y": 0, "x": 15, "label": "R03"},
+                {"y": 0.125, "x": 16, "label": "R04"},
+                {"y": 0.375, "x": 17, "label": "R05"},
+                {"y": 0.375, "x": 18, "label": "R06"},
+                {"y": 1.375, "x": 0.5, "label": "L10"},
+                {"y": 1.375, "x": 1.5, "label": "L11"},
+                {"y": 1.125, "x": 2.5, "label": "L12"},
+                {"y": 1, "x": 3.5, "label": "L13"},
+                {"y": 1.125, "x": 4.5, "label": "L14"},
+                {"y": 1.25, "x": 5.5, "label": "L15"},
+                {"y": 1.75, "x": 6.5, "label": "L16"},
+                {"y": 1.75, "x": 12, "label": "R10"},
+                {"y": 1.25, "x": 13, "label": "R11"},
+                {"y": 1.125, "x": 14, "label": "R12"},
+                {"y": 1, "x": 15, "label": "R13"},
+                {"y": 1.125, "x": 16, "label": "R14"},
+                {"y": 1.375, "x": 17, "label": "R15"},
+                {"y": 1.375, "x": 18, "label": "R16"},
+                {"y": 2.375, "x": 0.5, "label": "L20"},
+                {"y": 2.375, "x": 1.5, "label": "L21"},
+                {"y": 2.125, "x": 2.5, "label": "L22"},
+                {"y": 2, "x": 3.5, "label": "L23"},
+                {"y": 2.125, "x": 4.5, "label": "L24"},
+                {"y": 2.25, "x": 5.5, "label": "L25"},
+                {"y": 2.75, "x": 6.5, "label": "L26"},
+                {"y": 2.75, "x": 12, "label": "R20"},
+                {"y": 2.25, "x": 13, "label": "R21"},
+                {"y": 2.125, "x": 14, "label": "R22"},
+                {"y": 2, "x": 15, "label": "R23"},
+                {"y": 2.125, "x": 16, "label": "R24"},
+                {"y": 2.375, "x": 17, "label": "R25"},
+                {"y": 2.375, "x": 18, "label": "R26"},
+                {"y": 3.375, "x": 0.5, "label": "L30"},
+                {"y": 3.375, "x": 1.5, "label": "L31"},
+                {"y": 3.125, "x": 2.5, "label": "L32"},
+                {"y": 3, "x": 3.5, "label": "L33"},
+                {"y": 3.125, "x": 4.5, "label": "L34"},
+                {"y": 3.25, "x": 5.5, "label": "L35"},
+                {"y": 3.25, "x": 13, "label": "R31"},
+                {"y": 3.125, "x": 14, "label": "R32"},
+                {"y": 3, "x": 15, "label": "R33"},
+                {"y": 3.125, "x": 16, "label": "R34"},
+                {"y": 3.375, "x": 17, "label": "R35"},
+                {"y": 3.375, "x": 18, "label": "R36"},
+                {"y": 4.375, "x": 0.5, "label": "L40"},
+                {"y": 4.375, "x": 1.5, "label": "L41"},
+                {"y": 4.125, "x": 2.5, "label": "L42"},
+                {"y": 4, "x": 3.5, "label": "L43"},
+                {"y": 5, "x": 5.5, "label": "L44"},
+                {"h": 2, "y": 4, "x": 6.5, "label": "L45"},
+                {"h": 2, "y": 4, "x": 12, "label": "R41"},
+                {"y": 5, "x": 13, "label": "R42"},
+                {"y": 4, "x": 15, "label": "R43"},
+                {"y": 4.125, "x": 16, "label": "R44"},
+                {"y": 4.375, "x": 17, "label": "R45"},
+                {"y": 4.375, "x": 18, "label": "R46"}]
+        }
     }
-  }
 }
diff --git a/keyboards/ergodash/rev1/rev1.h b/keyboards/ergodash/rev1/rev1.h
index 55135adca..f494a3558 100644
--- a/keyboards/ergodash/rev1/rev1.h
+++ b/keyboards/ergodash/rev1/rev1.h
@@ -10,8 +10,8 @@
 #ifdef USE_I2C
 #include <stddef.h>
 #ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
+    #include <avr/io.h>
+    #include <avr/interrupt.h>
 #endif
 #endif
 
@@ -20,47 +20,132 @@
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-	L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R06, R05, R04, R03, R02, R01, R00 }, \
-		{ R16, R15, R14, R13, R12, R11, R10 }, \
-		{ R26, R25, R24, R23, R22, R21, R20 }, \
-		{ R36, R35, R34, R33, R32, R31, R30 }, \
-		{ R46, R45, R44, R43, R42, R41, R40 }  \
-	}
+#define LAYOUT_4key( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, R30 }, \
+        { R46, R45, R44, R43, R42, R41, R40 }  \
+    }
+
+// Just defined for configurator support, the matrix is identical to LAYOUT_4key
+#define LAYOUT_4key_2u_inner( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35,      L36, R30,      R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, R30 }, \
+        { R46, R45, R44, R43, R42, R41, R40 }  \
+    }
+
+#define LAYOUT_3key_2us( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35,                     R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, KC_NO }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, KC_NO }, \
+        { R46, R45, R44, R43, R42, R41, R40 }  \
+    }
+
+
+#define LAYOUT_3key_1us( \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, KC_NO }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, R30 }, \
+        { R46, R45, R44, R43, R42, R41, KC_NO }  \
+    }
+
+#define LAYOUT_2key( \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35,           R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, KC_NO }, \
+        { L40, L41, L42, L43, L44, L45, KC_NO }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, KC_NO }, \
+        { R46, R45, R44, R43, R42, R41, KC_NO }  \
+    }
+
+#define LAYOUT LAYOUT_4key
+
 #else
 // Keymap with right side flipped
 // (TRRS jack on both halves are to the right)
 #define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-	L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R00, R01, R02, R03, R04, R05, R06 }, \
-		{ R10, R11, R12, R13, R14, R15, R16 }, \
-		{ R20, R21, R22, R23, R24, R25, R26 }, \
-		{ R30, R31, R32, R33, R34, R35, R36 }, \
-		{ R40, R41, R42, R43, R44, R45, R46 }  \
-	}
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R00, R01, R02, R03, R04, R05, R06 }, \
+        { R10, R11, R12, R13, R14, R15, R16 }, \
+        { R20, R21, R22, R23, R24, R25, R26 }, \
+        { R30, R31, R32, R33, R34, R35, R36 }, \
+        { R40, R41, R42, R43, R44, R45, R46 }  \
+    }
 #endif
 
 #endif