Merge branch 'develop'

1 files changed, 282 insertions, 130 deletions

diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 7f48b11c76..081dd8ddd5 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
@@ -17,143 +22,290 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"q", "x":0, "y":0.9},
-                {"label":"w", "x":1, "y":0.2},
-                {"label":"e", "x":2, "y":0},
-                {"label":"r", "x":3, "y":0.1},
-                {"label":"t", "x":4, "y":0.15},
-
-                {"label":"y", "x":5, "y":0.15},
-                {"label":"u", "x":6, "y":0.1},
-                {"label":"i", "x":7, "y":0},
-                {"label":"o", "x":8, "y":0.2},
-                {"label":"p", "x":9, "y":0.9},
-
-                {"label":"a", "x":0, "y":1.9},
-                {"label":"s", "x":1, "y":1.2},
-                {"label":"d", "x":2, "y":1},
-                {"label":"f", "x":3, "y":1.1},
-                {"label":"g", "x":4, "y":1.15},
-
-                {"label":"h", "x":5, "y":1.15},
-                {"label":"j", "x":6, "y":1.1},
-                {"label":"k", "x":7, "y":1},
-                {"label":"l", "x":8, "y":1.2},
-                {"label":"'", "x":9, "y":1.9},
-
-                {"label":"z", "x":0, "y":2.9},
-                {"label":"x", "x":1, "y":2.2},
-                {"label":"c", "x":2, "y":2},
-                {"label":"v", "x":3, "y":2.1},
-                {"label":"b", "x":4, "y":2.15},
-
-                {"label":"n", "x":5, "y":2.15},
-                {"label":"m", "x":6, "y":2.1},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2.2},
-                {"label":"/", "x":9, "y":2.9},
-
-                {"label":"bspc/lwr", "x":3, "y":3.6, "h":2},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":2},
-
-                {"label":"ent/alt", "x":5, "y":3.65, "h":2},
-                {"label":"spc/ris", "x":6, "y":3.6, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
+            ]
+        },
+        "LAYOUT_complicated": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
+            ]
+        },
+        "LAYOUT_full": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.9},
+                {"matrix": [3, 1], "x": 1, "y": 3.2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3.15},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.15},
+                {"matrix": [7, 3], "x": 6, "y": 3.1},
+                {"matrix": [7, 2], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3.2},
+                {"matrix": [7, 0], "x": 9, "y": 3.9}
+            ]
+        },
+        "LAYOUT_reversed": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0.9},
+                {"matrix": [4, 1], "x": 1, "y": 0.2},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0.1},
+                {"matrix": [4, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [0, 4], "x": 5, "y": 0.15},
+                {"matrix": [0, 3], "x": 6, "y": 0.1},
+                {"matrix": [0, 2], "x": 7, "y": 0},
+                {"matrix": [0, 1], "x": 8, "y": 0.2},
+                {"matrix": [0, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [5, 0], "x": 0, "y": 1.9},
+                {"matrix": [5, 1], "x": 1, "y": 1.2},
+                {"matrix": [5, 2], "x": 2, "y": 1},
+                {"matrix": [5, 3], "x": 3, "y": 1.1},
+                {"matrix": [5, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [1, 4], "x": 5, "y": 1.15},
+                {"matrix": [1, 3], "x": 6, "y": 1.1},
+                {"matrix": [1, 2], "x": 7, "y": 1},
+                {"matrix": [1, 1], "x": 8, "y": 1.2},
+                {"matrix": [1, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [6, 0], "x": 0, "y": 2.9},
+                {"matrix": [6, 1], "x": 1, "y": 2.2},
+                {"matrix": [6, 2], "x": 2, "y": 2},
+                {"matrix": [6, 3], "x": 3, "y": 2.1},
+                {"matrix": [6, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [2, 4], "x": 5, "y": 2.15},
+                {"matrix": [2, 3], "x": 6, "y": 2.1},
+                {"matrix": [2, 2], "x": 7, "y": 2},
+                {"matrix": [2, 1], "x": 8, "y": 2.2},
+                {"matrix": [2, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2}
             ]
         },
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"label":"q", "x":0, "y":0.9},
-                {"label":"w", "x":1, "y":0.2},
-                {"label":"e", "x":2, "y":0},
-                {"label":"r", "x":3, "y":0.1},
-                {"label":"t", "x":4, "y":0.15},
-
-                {"label":"y", "x":5, "y":0.15},
-                {"label":"u", "x":6, "y":0.1},
-                {"label":"i", "x":7, "y":0},
-                {"label":"o", "x":8, "y":0.2},
-                {"label":"p", "x":9, "y":0.9},
-
-                {"label":"a", "x":0, "y":1.9},
-                {"label":"s", "x":1, "y":1.2},
-                {"label":"d", "x":2, "y":1},
-                {"label":"f", "x":3, "y":1.1},
-                {"label":"g", "x":4, "y":1.15},
-
-                {"label":"h", "x":5, "y":1.15},
-                {"label":"j", "x":6, "y":1.1},
-                {"label":"k", "x":7, "y":1},
-                {"label":"l", "x":8, "y":1.2},
-                {"label":"'", "x":9, "y":1.9},
-
-                {"label":"z", "x":0, "y":2.9},
-                {"label":"x", "x":1, "y":2.2},
-                {"label":"c", "x":2, "y":2},
-                {"label":"v", "x":3, "y":2.1},
-                {"label":"b", "x":4, "y":2.15},
-
-                {"label":"n", "x":5, "y":2.15},
-                {"label":"m", "x":6, "y":2.1},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2.2},
-                {"label":"/", "x":9, "y":2.9},
-
-                {"label":"lower", "x":2, "y":3.6, "h":1.25},
-                {"label":"bspc", "x":3, "y":3.6, "h":2},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":2},
-
-                {"label":"ent/alt", "x":5, "y":3.65, "h":2},
-                {"label":"spc", "x":6, "y":3.6, "h":2},
-                {"label":"raise", "x":7, "y":3.6, "h":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
+                {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
             ]
         },
-        "LAYOUT_complicated": {
+        "LAYOUT_thumbrow": {
             "layout": [
-                {"label":"q", "x":0, "y":0.9},
-                {"label":"w", "x":1, "y":0.2},
-                {"label":"e", "x":2, "y":0},
-                {"label":"r", "x":3, "y":0.1},
-                {"label":"t", "x":4, "y":0.15},
-
-                {"label":"y", "x":5, "y":0.15},
-                {"label":"u", "x":6, "y":0.1},
-                {"label":"i", "x":7, "y":0},
-                {"label":"o", "x":8, "y":0.2},
-                {"label":"p", "x":9, "y":0.9},
-
-                {"label":"a", "x":0, "y":1.9},
-                {"label":"s", "x":1, "y":1.2},
-                {"label":"d", "x":2, "y":1},
-                {"label":"f", "x":3, "y":1.1},
-                {"label":"g", "x":4, "y":1.15},
-
-                {"label":"h", "x":5, "y":1.15},
-                {"label":"j", "x":6, "y":1.1},
-                {"label":"k", "x":7, "y":1},
-                {"label":"l", "x":8, "y":1.2},
-                {"label":"'", "x":9, "y":1.9},
-
-                {"label":"z", "x":0, "y":2.9},
-                {"label":"x", "x":1, "y":2.2},
-                {"label":"c", "x":2, "y":2},
-                {"label":"v", "x":3, "y":2.1},
-                {"label":"b", "x":4, "y":2.15},
-
-                {"label":"n", "x":5, "y":2.15},
-                {"label":"m", "x":6, "y":2.1},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2.2},
-                {"label":"/", "x":9, "y":2.9},
-
-                {"label":"bspc", "x":3, "y":3.6, "h":1},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":1},
-                {"label":"ent/alt", "x":5, "y":3.65, "h":1},
-                {"label":"spc", "x":6, "y":3.6, "h":1},
-
-                {"label":"lower", "x":3, "y":4.6, "h":1},
-                {"label":"gui", "x":4, "y":4.65, "h":1},
-                {"label":"tab", "x":5, "y":4.65, "h":1},
-                {"label":"raise", "x":6, "y":4.6, "h":1}
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
             ]
         }
     }