Merge branch 'develop'

1 files changed, 68 insertions, 54 deletions

diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 57159669a4..cf4729fdd2 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -1,69 +1,83 @@
 {
-    "keyboard_name": "Z40 Ortho", 
+    "keyboard_name": "Z40 Ortho",
       "manufacturer": "Quarkeys Stuidio",
-      "url": "www.quarkeys.com", 
-      "maintainer": "TommyZ", 
+      "url": "www.quarkeys.com",
+      "maintainer": "TommyZ",
       "usb": {
           "vid": "0x8490",
           "pid": "0x2801",
           "device_version": "0.0.1"
       },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "rgblight": {
+        "max_brightness": 130
+    },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
+      "rows": ["E6", "B3", "C7", "C6"]
+    },
+    "ws2812": {
+      "pin": "F1"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"x":0, "y":0}, 
-              {"x":1, "y":0}, 
-              {"x":2, "y":0}, 
-              {"x":3, "y":0}, 
-              {"x":4, "y":0}, 
-              {"x":5, "y":0}, 
-              {"x":6, "y":0}, 
-              {"x":7, "y":0}, 
-              {"x":8, "y":0}, 
-              {"x":9, "y":0}, 
-              {"x":10, "y":0}, 
-              {"x":11, "y":0}, 
-              
-              {"x":0, "y":1}, 
-              {"x":1, "y":1}, 
-              {"x":2, "y":1}, 
-              {"x":3, "y":1}, 
-              {"x":4, "y":1}, 
-              {"x":5, "y":1}, 
-              {"x":6, "y":1}, 
-              {"x":7, "y":1}, 
-              {"x":8, "y":1}, 
-              {"x":9, "y":1}, 
-              {"x":10, "y":1}, 
-              {"x":11, "y":1}, 
-              
-              {"x":0, "y":2}, 
-              {"x":1, "y":2}, 
-              {"x":2, "y":2}, 
-              {"x":3, "y":2}, 
-              {"x":4, "y":2}, 
-              {"x":5, "y":2}, 
-              {"x":6, "y":2}, 
-              {"x":7, "y":2}, 
-              {"x":8, "y":2}, 
-              {"x":9, "y":2}, 
-              {"x":10, "y":2}, 
-              {"x":11, "y":2}, 
-              
-              {"x":0, "y":3}, 
-              {"x":1, "y":3}, 
-              {"x":2, "y":3},
-              {"x":3, "y":3}, 
-              {"x":4, "y":3}, 
-              {"x":5, "y":3, "w":2}, 
-              {"x":7, "y":3}, 
-              {"x":8, "y":3}, 
-              {"x":9, "y":3}, 
-              {"x":10, "y":3}, 
-              {"x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
-  }
\ No newline at end of file
+}