Merge branch 'develop'

1 files changed, 74 insertions, 25 deletions

diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 9b5a8d6ef6..fb70fb00a4 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -7,6 +7,17 @@
         "pid": "0x0004",
         "vid": "0x4450"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "F5", "F6", "B2"],
+        "rows": ["D4", "D7", "E6", "B6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B3"}
@@ -17,31 +28,69 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "Num Lock", "x": 1.25, "y": 1.25 },
-                { "label": "/", "x": 2.25, "y": 1.25 },
-                { "label": "*", "x": 3.25, "y": 1.25 },
-                { "label": "-", "x": 4.25, "y": 1.25 },
-                { "label": "7", "x": 1.25, "y": 2.25 },
-                { "label": "8", "x": 2.25, "y": 2.25 },
-                { "label": "9", "x": 3.25, "y": 2.25 },
-                { "x": 4.25, "y": 2.25 },
-                { "label": "4", "x": 1.25, "y": 3.25 },
-                { "label": "5", "x": 2.25, "y": 3.25 },
-                { "label": "6", "x": 3.25, "y": 3.25 },
-                { "x": 4.25, "y": 3.25 },
-                { "label": "1", "x": 1.25, "y": 4.25 },
-                { "label": "2", "x": 2.25, "y": 4.25 },
-                { "label": "3", "x": 3.25, "y": 4.25 },
-                { "x": 4.25, "y": 4.25 },
-                { "label": "Enc", "x": 0, "y": 5.25 },
-                { "x": 1.25, "y": 5.25 },
-                { "x": 2.25, "y": 5.25 },
-                { "label": ".", "x": 3.25, "y": 5.25 },
-                { "x": 4.25, "y": 5.25 }
+                {"label": "Fn", "matrix": [0, 0], "x": 1.25, "y": 0},
+                {"label": "Fn2", "matrix": [0, 1], "x": 2.25, "y": 0},
+                {"label": "Fn3", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "Delete", "matrix": [0, 3], "x": 4.25, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 1.25, "y": 1.25},
+                {"label": "/", "matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"label": "*", "matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"label": "-", "matrix": [1, 3], "x": 4.25, "y": 1.25},
+
+                {"label": "7", "matrix": [2, 0], "x": 1.25, "y": 2.25},
+                {"label": "8", "matrix": [2, 1], "x": 2.25, "y": 2.25},
+                {"label": "9", "matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"label": "+", "matrix": [2, 3], "x": 4.25, "y": 2.25},
+
+                {"label": "4", "matrix": [3, 0], "x": 1.25, "y": 3.25},
+                {"label": "5", "matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"label": "6", "matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"label": "+", "matrix": [3, 3], "x": 4.25, "y": 3.25},
+
+                {"label": "1", "matrix": [4, 0], "x": 1.25, "y": 4.25},
+                {"label": "2", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "3", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+
+                {"label": "Mute", "matrix": [5, 4], "x": 0, "y": 5.25},
+
+                {"label": "0", "matrix": [5, 0], "x": 1.25, "y": 5.25},
+                {"label": "0", "matrix": [5, 1], "x": 2.25, "y": 5.25},
+                {"label": ".", "matrix": [5, 2], "x": 3.25, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 3], "x": 4.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_numpad": {
+            "layout": [
+                {"label": "Fn", "matrix": [0, 0], "x": 1.25, "y": 0},
+                {"label": "Fn2", "matrix": [0, 1], "x": 2.25, "y": 0},
+                {"label": "Fn3", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "Delete", "matrix": [0, 3], "x": 4.25, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 1.25, "y": 1.25},
+                {"label": "/", "matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"label": "*", "matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"label": "-", "matrix": [1, 3], "x": 4.25, "y": 1.25},
+
+                {"label": "7", "matrix": [2, 0], "x": 1.25, "y": 2.25},
+                {"label": "8", "matrix": [2, 1], "x": 2.25, "y": 2.25},
+                {"label": "9", "matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"label": "+", "matrix": [2, 3], "x": 4.25, "y": 2.25, "h": 2},
+
+                {"label": "4", "matrix": [3, 0], "x": 1.25, "y": 3.25},
+                {"label": "5", "matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"label": "6", "matrix": [3, 2], "x": 3.25, "y": 3.25},
+
+                {"label": "1", "matrix": [4, 0], "x": 1.25, "y": 4.25},
+                {"label": "2", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "3", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 3], "x": 4.25, "y": 4.25, "h": 2},
+
+                {"label": "Mute", "matrix": [5, 4], "x": 0, "y": 5.25},
+
+                {"label": "0", "matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 2},
+                {"label": ".", "matrix": [5, 2], "x": 3.25, "y": 5.25}
             ]
         }
     }