Merge branch 'develop'

1 files changed, 79 insertions, 69 deletions

diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index 750645d6f4..eae71d9508 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -8,8 +8,18 @@
         "pid": "0x6060",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D3"
+        "soft_serial_pin": "D3",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
@@ -17,85 +27,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":1, "w":1.5, "matrix": [0, 0]},
-                {"x":1.5, "y":0.75, "matrix": [0, 1]},
-                {"x":2.5, "y":0.25, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "matrix": [0, 3]},
-                {"x":4.5, "y":0.25, "matrix": [0, 4]},
-                {"x":5.5, "y":0.75, "matrix": [0, 5]},
-                {"x":6.5, "y":1, "matrix": [0, 6]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+                {"x": 6.5, "y": 1, "matrix": [0, 6]},
 
-                {"x":9.5, "y":1, "matrix": [5, 0]},
-                {"x":10.5, "y":0.75, "matrix": [5, 1]},
-                {"x":11.5, "y":0.25, "matrix": [5, 2]},
-                {"x":12.5, "y":0, "matrix": [5, 3]},
-                {"x":13.5, "y":0.25, "matrix": [5, 4]},
-                {"x":14.5, "y":0.75, "matrix": [5, 5]},
-                {"x":15.5, "y":1, "w":1.5, "matrix": [5, 6]},
+                {"x": 9.5, "y": 1, "matrix": [5, 0]},
+                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+                {"x": 12.5, "y": 0, "matrix": [5, 3]},
+                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
 
-                {"x":0, "y":2, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1.75, "matrix": [1, 1]},
-                {"x":2.5, "y":1.25, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1.25, "matrix": [1, 4]},
-                {"x":5.5, "y":1.75, "matrix": [1, 5]},
-                {"x":6.5, "y":2, "h":1.5, "matrix": [1, 6]},
+                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
 
-                {"x":9.5, "y":2, "h":1.5, "matrix": [6, 0]},
-                {"x":10.5, "y":1.75, "matrix": [6, 1]},
-                {"x":11.5, "y":1.25, "matrix": [6, 2]},
-                {"x":12.5, "y":1, "matrix": [6, 3]},
-                {"x":13.5, "y":1.25, "matrix": [6, 4]},
-                {"x":14.5, "y":1.75, "matrix": [6, 5]},
-                {"x":15.5, "y":2, "w":1.5, "matrix": [6, 6]},
+                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+                {"x": 12.5, "y": 1, "matrix": [6, 3]},
+                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
 
-                {"x":0, "y":3, "w":1.5, "matrix": [2, 0]},
-                {"x":1.5, "y":2.75, "matrix": [2, 1]},
-                {"x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"x":3.5, "y":2, "matrix": [2, 3]},
-                {"x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"x":5.5, "y":2.75, "matrix": [2, 5]},
+                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
 
-                {"x":10.5, "y":2.75, "matrix": [7, 1]},
-                {"x":11.5, "y":2.25, "matrix": [7, 2]},
-                {"x":12.5, "y":2, "matrix": [7, 3]},
-                {"x":13.5, "y":2.25, "matrix": [7, 4]},
-                {"x":14.5, "y":2.75, "matrix": [7, 5]},
-                {"x":15.5, "y":3, "w":1.5, "matrix": [7, 6]},
+                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+                {"x": 12.5, "y": 2, "matrix": [7, 3]},
+                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [3, 0]},
-                {"x":1.5, "y":3.75, "matrix": [3, 1]},
-                {"x":2.5, "y":3.25, "matrix": [3, 2]},
-                {"x":3.5, "y":3, "matrix": [3, 3]},
-                {"x":4.5, "y":3.25, "matrix": [3, 4]},
-                {"x":5.5, "y":3.75, "matrix": [3, 5]},
-                {"x":6.5, "y":3.5, "h":1.5, "matrix": [3, 6]},
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
 
-                {"x":9.5, "y":3.5, "h":1.5, "matrix": [8, 0]},
-                {"x":10.5, "y":3.75, "matrix": [8, 1]},
-                {"x":11.5, "y":3.25, "matrix": [8, 2]},
-                {"x":12.5, "y":3, "matrix": [8, 3]},
-                {"x":13.5, "y":3.25, "matrix": [8, 4]},
-                {"x":14.5, "y":3.75, "matrix": [8, 5]},
-                {"x":15.5, "y":4, "w":1.5, "matrix": [8, 6]},
+                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+                {"x": 12.5, "y": 3, "matrix": [8, 3]},
+                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
 
-                {"x":0.25, "y":5, "matrix": [4, 0]},
-                {"x":1.5, "y":4.75, "matrix": [4, 1]},
-                {"x":2.5, "y":4.25, "matrix": [4, 2]},
-                {"x":3.5, "y":4, "matrix": [4, 3]},
+                {"x": 0.25, "y": 5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
 
-                {"x":5, "y":6, "matrix": [4, 4]},
-                {"x":6, "y":5.5, "h":2, "matrix": [4, 5]},
-                {"x":7, "y":5.5, "h":2, "matrix": [4, 6]},
+                {"x": 5, "y": 6, "matrix": [4, 4]},
+                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
 
-                {"x":9, "y":5.5, "h":2, "matrix": [9, 0]},
-                {"x":10, "y":5.5, "h":2, "matrix": [9, 1]},
-                {"x":11, "y":6, "matrix": [9, 2]},
+                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+                {"x": 11, "y": 6, "matrix": [9, 2]},
 
-                {"x":12.5, "y":4, "matrix": [9, 3]},
-                {"x":13.5, "y":4.25, "matrix": [9, 4]},
-                {"x":14.5, "y":4.75, "matrix": [9, 5]},
-                {"x":15.75, "y":5, "matrix": [9, 6]}
+                {"x": 12.5, "y": 4, "matrix": [9, 3]},
+                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+                {"x": 15.75, "y": 5, "matrix": [9, 6]}
             ]
         }
     }