Merge branch 'develop'

1 files changed, 59 insertions, 44 deletions

diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index 7e5eaca944..399dae6c33 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -8,55 +8,70 @@
         "pid": "0x6146",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C4"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"],
+        "rows": ["D4", "D5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D4,B6)", "x":0.5, "y":1.375},
-                {"label":"K01 (D4,B5)", "x":1.5, "y":1.375},
-                {"label":"K02 (D4,B4)", "x":2.5, "y":1.125},
-                {"label":"K03 (D4,D2)", "x":3.5, "y":1},
-                {"label":"K04 (D4,C0)", "x":4.5, "y":1.125},
-                {"label":"K05 (D4,C1)", "x":5.5, "y":1.25},
-                {"label":"K06 (D4,F5)", "x":13, "y":1.25},
-                {"label":"K07 (D4,F4)", "x":14, "y":1.125},
-                {"label":"K08 (D4,F3)", "x":15, "y":1},
-                {"label":"K09 (D4,F2)", "x":16, "y":1.125},
-                {"label":"K0A (D4,F1)", "x":17, "y":1.375},
-                {"label":"K0B (D4,F0)", "x":18, "y":1.375},
-                {"label":"K10 (D5,B6)", "x":0.5, "y":2.375},
-                {"label":"K11 (D5,B5)", "x":1.5, "y":2.375},
-                {"label":"K12 (D5,B4)", "x":2.5, "y":2.125},
-                {"label":"K13 (D5,D2)", "x":3.5, "y":2},
-                {"label":"K14 (D5,C0)", "x":4.5, "y":2.125},
-                {"label":"K15 (D5,C1)", "x":5.5, "y":2.25},
-                {"label":"K16 (D5,F5)", "x":13, "y":2.25},
-                {"label":"K17 (D5,F4)", "x":14, "y":2.125},
-                {"label":"K18 (D5,F3)", "x":15, "y":2},
-                {"label":"K19 (D5,F2)", "x":16, "y":2.125},
-                {"label":"K1A (D5,F1)", "x":17, "y":2.375},
-                {"label":"K1B (D5,F0)", "x":18, "y":2.375},
-                {"label":"K20 (D6,B6)", "x":0.5, "y":3.375},
-                {"label":"K21 (D6,B5)", "x":1.5, "y":3.375},
-                {"label":"K22 (D6,B4)", "x":2.5, "y":3.125},
-                {"label":"K23 (D6,D2)", "x":3.5, "y":3},
-                {"label":"K24 (D6,C0)", "x":4.5, "y":3.125},
-                {"label":"K25 (D6,C1)", "x":5.5, "y":3.25},
-                {"label":"K26 (D6,F5)", "x":13, "y":3.25},
-                {"label":"K27 (D6,F4)", "x":14, "y":3.125},
-                {"label":"K28 (D6,F3)", "x":15, "y":3},
-                {"label":"K29 (D6,F2)", "x":16, "y":3.125},
-                {"label":"K2A (D6,F1)", "x":17, "y":3.375},
-                {"label":"K2B (D6,F0)", "x":18, "y":3.375},
-                {"label":"K32 (D7,B4)", "x":2.5, "y":4.125},
-                {"label":"K33 (D7,D2)", "x":3.5, "y":4},
-                {"label":"K34 (D7,C0)", "x":4.5, "y":4.5},
-                {"label":"K35 (D7,C1)", "x":5.5, "y":4.75},
-                {"label":"K36 (D7,F5)", "x":12.75, "y":4.75},
-                {"label":"K37 (D7,F4)", "x":13.8, "y":4.375},
-                {"label":"K38 (D7,F3)", "x":15, "y":4},
-                {"label":"K39 (D7,F2)", "x":16, "y":4.125}
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 7, "y": 0.25},
+                {"matrix": [0, 7], "x": 8, "y": 0.125},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0.125},
+                {"matrix": [0, 10], "x": 11, "y": 0.375},
+                {"matrix": [0, 11], "x": 12, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 7, "y": 1.25},
+                {"matrix": [1, 7], "x": 8, "y": 1.125},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1.125},
+                {"matrix": [1, 10], "x": 11, "y": 1.375},
+                {"matrix": [1, 11], "x": 12, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 7, "y": 2.25},
+                {"matrix": [2, 7], "x": 8, "y": 2.125},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2.125},
+                {"matrix": [2, 10], "x": 11, "y": 2.375},
+                {"matrix": [2, 11], "x": 12, "y": 2.375},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.5},
+                {"matrix": [3, 5], "x": 5, "y": 3.75},
+
+                {"matrix": [3, 6], "x": 7, "y": 3.75},
+                {"matrix": [3, 7], "x": 8, "y": 3.5},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3.125}
             ]
         }
     }