Merge branch 'develop'

1 files changed, 125 insertions, 98 deletions

diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index cae17f2ce4..badd7d6458 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -8,115 +8,142 @@
         "pid": "0xEF61",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
+        "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "C6",
         "scroll_lock": "E2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D4,B1)", "x":0, "y":0},
-                {"label":"K01 (D4,B2)", "x":2, "y":0},
-                {"label":"K02 (D4,B3)", "x":3, "y":0},
-                {"label":"K03 (D4,B7)", "x":4, "y":0},
-                {"label":"K04 (D4,D0)", "x":5, "y":0},
-                {"label":"K05 (D4,D1)", "x":6.5, "y":0},
-                {"label":"K06 (D4,D2)", "x":7.5, "y":0},
-                {"label":"K07 (D4,D3)", "x":8.5, "y":0},
-                {"label":"K08 (D4,D5)", "x":9.5, "y":0},
-                {"label":"K09 (D4,E6)", "x":11, "y":0},
-                {"label":"K0A (D4,F0)", "x":12, "y":0},
-                {"label":"K0B (D4,F1)", "x":13, "y":0},
-                {"label":"K0C (D4,F4)", "x":14, "y":0},
-                {"label":"K0E (D4,D6)", "x":15.5, "y":0},
-                {"label":"K6D (D7,F5)", "x":16.5, "y":0},
-                {"label":"K6A (D7,F0)", "x":17.5, "y":0},
-                {"label":"K66 (D7,D2)", "x":18.5, "y":0},
-                {"label":"K10 (B6,B1)", "x":0, "y":1.5},
-                {"label":"K11 (B6,B2)", "x":1, "y":1.5},
-                {"label":"K12 (B6,B3)", "x":2, "y":1.5},
-                {"label":"K13 (B6,B7)", "x":3, "y":1.5},
-                {"label":"K14 (B6,D0)", "x":4, "y":1.5},
-                {"label":"K15 (B6,D1)", "x":5, "y":1.5},
-                {"label":"K16 (B6,D2)", "x":6, "y":1.5},
-                {"label":"K17 (B6,D3)", "x":7, "y":1.5},
-                {"label":"K18 (B6,D5)", "x":8, "y":1.5},
-                {"label":"K19 (B6,E6)", "x":9, "y":1.5},
-                {"label":"K1A (B6,F0)", "x":10, "y":1.5},
-                {"label":"K1B (B6,F1)", "x":11, "y":1.5},
-                {"label":"K1C (B6,F4)", "x":12, "y":1.5},
-                {"label":"K1D (B6,F5)", "x":13, "y":1.5, "w":2},
-                {"label":"K1E (B6,D6)", "x":15.5, "y":1.5},
-                {"label":"K6B (D7,F1)", "x":16.5, "y":1.5},
-                {"label":"K69 (D7,E6)", "x":17.5, "y":1.5},
-                {"label":"K62 (D7,B3)", "x":18.5, "y":1.5},
-                {"label":"K20 (B5,B1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B5,B2)", "x":1.5, "y":2.5},
-                {"label":"K22 (B5,B3)", "x":2.5, "y":2.5},
-                {"label":"K23 (B5,B7)", "x":3.5, "y":2.5},
-                {"label":"K24 (B5,D0)", "x":4.5, "y":2.5},
-                {"label":"K25 (B5,D1)", "x":5.5, "y":2.5},
-                {"label":"K26 (B5,D2)", "x":6.5, "y":2.5},
-                {"label":"K27 (B5,D3)", "x":7.5, "y":2.5},
-                {"label":"K28 (B5,D5)", "x":8.5, "y":2.5},
-                {"label":"K29 (B5,E6)", "x":9.5, "y":2.5},
-                {"label":"K2A (B5,F0)", "x":10.5, "y":2.5},
-                {"label":"K2B (B5,F1)", "x":11.5, "y":2.5},
-                {"label":"K2C (B5,F4)", "x":12.5, "y":2.5},
-                {"label":"K2D (B5,F5)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2E (B5,D6)", "x":15.5, "y":2.5},
-                {"label":"K63 (D7,B7)", "x":16.5, "y":2.5},
-                {"label":"K64 (D7,D0)", "x":17.5, "y":2.5},
-                {"label":"K65 (D7,D1)", "x":18.5, "y":2.5, "h":2},
-                {"label":"K30 (B4,B1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B4,B2)", "x":1.75, "y":3.5},
-                {"label":"K32 (B4,B3)", "x":2.75, "y":3.5},
-                {"label":"K33 (B4,B7)", "x":3.75, "y":3.5},
-                {"label":"K34 (B4,D0)", "x":4.75, "y":3.5},
-                {"label":"K35 (B4,D1)", "x":5.75, "y":3.5},
-                {"label":"K36 (B4,D2)", "x":6.75, "y":3.5},
-                {"label":"K37 (B4,D3)", "x":7.75, "y":3.5},
-                {"label":"K38 (B4,D5)", "x":8.75, "y":3.5},
-                {"label":"K39 (B4,E6)", "x":9.75, "y":3.5},
-                {"label":"K3A (B4,F0)", "x":10.75, "y":3.5},
-                {"label":"K3B (B4,F1)", "x":11.75, "y":3.5},
-                {"label":"K3D (B4,F5)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K3E (B4,D6)", "x":15.5, "y":3.5},
-                {"label":"K68 (D7,D5)", "x":16.5, "y":3.5},
-                {"label":"K67 (D7,D3)", "x":17.5, "y":3.5},
-                {"label":"K40 (F7,B1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (F7,B3)", "x":2.25, "y":4.5},
-                {"label":"K43 (F7,B7)", "x":3.25, "y":4.5},
-                {"label":"K44 (F7,D0)", "x":4.25, "y":4.5},
-                {"label":"K45 (F7,D1)", "x":5.25, "y":4.5},
-                {"label":"K46 (F7,D2)", "x":6.25, "y":4.5},
-                {"label":"K47 (F7,D3)", "x":7.25, "y":4.5},
-                {"label":"K48 (F7,D5)", "x":8.25, "y":4.5},
-                {"label":"K49 (F7,E6)", "x":9.25, "y":4.5},
-                {"label":"K4A (F7,F0)", "x":10.25, "y":4.5},
-                {"label":"K4B (F7,F1)", "x":11.25, "y":4.5},
-                {"label":"K4C (F7,F4)", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"K4D (F7,F5)", "x":14.25, "y":4.75},
-                {"label":"K4E (F7,D6)", "x":15.5, "y":4.5},
-                {"label":"K58 (F6,D5)", "x":16.5, "y":4.5},
-                {"label":"K57 (F6,D3)", "x":17.5, "y":4.5},
-                {"label":"K55 (F6,D1)", "x":18.5, "y":4.5, "h":2},
-                {"label":"K50 (F6,B1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (F6,B2)", "x":1.25, "y":5.5,"w":1.25},
-                {"label":"K52 (F6,B3)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (F6,D2)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K59 (F6,E6)", "x":10, "y":5.5},
-                {"label":"K5A (F6,F0)", "x":11, "y":5.5},
-                {"label":"K5B (F6,F1)", "x":12, "y":5.5},
-                {"label":"K5C (F6,F4)", "x":13.25, "y":5.75},
-                {"label":"K5D (F6,F5)", "x":14.25, "y":5.75},
-                {"label":"K5E (F6,D6)", "x":15.25, "y":5.75},
-                {"label":"K53 (F6,B7)", "x":16.5, "y":5.5},
-                {"label":"K54 (F6,D0)", "x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [6, 13], "x": 16.5, "y": 0},
+                {"matrix": [6, 10], "x": 17.5, "y": 0},
+                {"matrix": [6, 6], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [6, 11], "x": 16.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 17.5, "y": 1.5},
+                {"matrix": [6, 2], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [6, 3], "x": 16.5, "y": 2.5},
+                {"matrix": [6, 4], "x": 17.5, "y": 2.5},
+                {"matrix": [6, 5], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.5},
+                {"matrix": [6, 8], "x": 16.5, "y": 3.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 16.5, "y": 4.5},
+                {"matrix": [5, 7], "x": 17.5, "y": 4.5},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5},
+                {"matrix": [5, 10], "x": 11, "y": 5.5},
+                {"matrix": [5, 11], "x": 12, "y": 5.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 3], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 4], "x": 17.5, "y": 5.5}
             ]
         }
     }