Move TKL layouts to data driven (#20337)

2 files changed, 502 insertions, 487 deletions

diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json
index 9231437bd1..99096d88ba 100644
--- a/keyboards/j80/info.json
+++ b/keyboards/j80/info.json
@@ -24,392 +24,522 @@
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 2], "x": 1, "y": 0},
+        {"matrix": [0, 3], "x": 2, "y": 0},
+        {"matrix": [0, 4], "x": 3, "y": 0},
+        {"matrix": [0, 5], "x": 4, "y": 0},
+        {"matrix": [0, 7], "x": 5, "y": 0},
+        {"matrix": [0, 8], "x": 6, "y": 0},
+        {"matrix": [0, 9], "x": 7, "y": 0},
+        {"matrix": [0, 10], "x": 8, "y": 0},
+        {"matrix": [0, 11], "x": 9, "y": 0},
+        {"matrix": [0, 13], "x": 10, "y": 0},
+        {"matrix": [0, 12], "x": 11, "y": 0},
+        {"matrix": [0, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [6, 2], "x": 14, "y": 0},
+        {"matrix": [6, 13], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 16, "y": 0},
+        {"matrix": [1, 1], "x": 17, "y": 0},
+        {"matrix": [1, 2], "x": 18, "y": 0},
+        {"matrix": [1, 3], "x": 19, "y": 0},
+        {"matrix": [1, 4], "x": 20, "y": 0},
+        {"matrix": [1, 5], "x": 21, "y": 0},
+        {"matrix": [1, 6], "x": 22, "y": 0},
+        {"matrix": [1, 7], "x": 23, "y": 0},
+        {"matrix": [1, 8], "x": 24, "y": 0},
+        {"matrix": [1, 9], "x": 25, "y": 0},
+        {"matrix": [1, 10], "x": 26, "y": 0},
+        {"matrix": [1, 11], "x": 27, "y": 0},
+        {"matrix": [1, 13], "x": 28, "y": 0},
+        {"matrix": [1, 12], "x": 29, "y": 0},
+        {"matrix": [6, 6], "x": 30, "y": 0},
+        {"matrix": [6, 5], "x": 31, "y": 0},
+        {"matrix": [6, 4], "x": 32, "y": 0},
+
+        {"matrix": [2, 0], "x": 33, "y": 0},
+        {"matrix": [2, 1], "x": 34, "y": 0},
+        {"matrix": [2, 2], "x": 35, "y": 0},
+        {"matrix": [2, 3], "x": 36, "y": 0},
+        {"matrix": [2, 4], "x": 37, "y": 0},
+        {"matrix": [2, 5], "x": 38, "y": 0},
+        {"matrix": [2, 6], "x": 39, "y": 0},
+        {"matrix": [2, 7], "x": 40, "y": 0},
+        {"matrix": [2, 8], "x": 41, "y": 0},
+        {"matrix": [2, 9], "x": 42, "y": 0},
+        {"matrix": [2, 10], "x": 43, "y": 0},
+        {"matrix": [2, 11], "x": 44, "y": 0},
+        {"matrix": [2, 13], "x": 45, "y": 0},
+        {"matrix": [2, 12], "x": 46, "y": 0},
+        {"matrix": [6, 12], "x": 47, "y": 0},
+        {"matrix": [6, 8], "x": 48, "y": 0},
+        {"matrix": [6, 7], "x": 49, "y": 0},
+
+        {"matrix": [3, 0], "x": 50, "y": 0},
+        {"matrix": [3, 1], "x": 51, "y": 0},
+        {"matrix": [3, 2], "x": 52, "y": 0},
+        {"matrix": [3, 3], "x": 53, "y": 0},
+        {"matrix": [3, 4], "x": 54, "y": 0},
+        {"matrix": [3, 5], "x": 55, "y": 0},
+        {"matrix": [3, 6], "x": 56, "y": 0},
+        {"matrix": [3, 7], "x": 57, "y": 0},
+        {"matrix": [3, 8], "x": 58, "y": 0},
+        {"matrix": [3, 9], "x": 59, "y": 0},
+        {"matrix": [3, 10], "x": 60, "y": 0},
+        {"matrix": [3, 11], "x": 61, "y": 0},
+        {"matrix": [3, 13], "x": 62, "y": 0},
+
+        {"matrix": [4, 0], "x": 63, "y": 0},
+        {"matrix": [3, 12], "x": 64, "y": 0},
+        {"matrix": [4, 1], "x": 65, "y": 0},
+        {"matrix": [4, 2], "x": 66, "y": 0},
+        {"matrix": [4, 3], "x": 67, "y": 0},
+        {"matrix": [4, 4], "x": 68, "y": 0},
+        {"matrix": [4, 5], "x": 69, "y": 0},
+        {"matrix": [4, 6], "x": 70, "y": 0},
+        {"matrix": [4, 7], "x": 71, "y": 0},
+        {"matrix": [4, 8], "x": 72, "y": 0},
+        {"matrix": [4, 9], "x": 73, "y": 0},
+        {"matrix": [4, 10], "x": 74, "y": 0},
+        {"matrix": [4, 11], "x": 75, "y": 0},
+        {"matrix": [4, 13], "x": 76, "y": 0},
+        {"matrix": [4, 12], "x": 77, "y": 0},
+
+        {"matrix": [5, 0], "x": 78, "y": 0},
+        {"matrix": [5, 1], "x": 79, "y": 0},
+        {"matrix": [5, 2], "x": 80, "y": 0},
+        {"matrix": [5, 4], "x": 81, "y": 0},
+        {"matrix": [5, 8], "x": 82, "y": 0},
+        {"matrix": [5, 9], "x": 83, "y": 0},
+        {"matrix": [5, 10], "x": 84, "y": 0},
+        {"matrix": [5, 11], "x": 85, "y": 0},
+        {"matrix": [5, 13], "x": 86, "y": 0},
+        {"matrix": [5, 12], "x": 87, "y": 0},
+        {"matrix": [5, 7], "x": 88, "y": 0}
+      ]
+    },
     "LAYOUT_tkl_ansi": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":13.5, "y":2.25, "w":1.5},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25, "w":2.25},
-
-        {"x":0, "y":4.25, "w":2.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":2.75},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_ansi_split_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":13.5, "y":2.25, "w":1.5},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25, "w":2.25},
-
-        {"x":0, "y":4.25, "w":2.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":1.75},
-        {"x":14, "y":4.25},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_iso": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25},
-        {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-        {"x":0, "y":4.25, "w":1.25},
-        {"x":1.25, "y":4.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":2.75},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [3, 12], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_iso_split_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25},
-        {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-        {"x":0, "y":4.25, "w":1.25},
-        {"x":1.25, "y":4.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":1.75},
-        {"x":14, "y":4.25},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [3, 12], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/j80/j80.h b/keyboards/j80/j80.h
deleted file mode 100644
index a528c70c7d..0000000000
--- a/keyboards/j80/j80.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2019 JER
- *
- * 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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
- #define LAYOUT_all( \
-   k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
-   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
-   k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
-   k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57 \
- ){ \
-   { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D }, \
-   { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D }, \
-   { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D }, \
-   { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D }, \
-   { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, k4D }, \
-   { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D }, \
-   { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D }, \
- }
-
- #define LAYOUT_tkl_iso( \
-   k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k6C, k68, k67, \
-   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, k3D, \
-   k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, \
-   k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
- ){ \
-   { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D  }, \
-   { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D  }, \
-   { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D  }, \
-   { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D  }, \
-   { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, ____ }, \
-   { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D  }, \
-   { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D  }, \
- }
-
-#define LAYOUT_tkl_iso_split_rshift( \
-  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k6C, k68, k67, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, k3D, \
-  k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
-  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
-){ \
-  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D }, \
-  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D }, \
-  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D }, \
-  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D }, \
-  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, k4D }, \
-  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D }, \
-  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, \
-  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
-){ \
-  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C,  k0D  }, \
-  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C,  k1D  }, \
-  { k20,  k21, 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  }, \
-  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C,  ____ }, \
-  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C,  k5D  }, \
-  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C,  k6D  }, \
-}
-
-#define LAYOUT_tkl_ansi_split_rshift( \
-  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
-  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
-){ \
-  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C,  k0D }, \
-  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C,  k1D }, \
-  { k20,  k21, 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 }, \
-  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C,  k4D }, \
-  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C,  k5D }, \
-  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C,  k6D }, \
-}