Move small macropad-ish layouts to data driven (#20341)

1 files changed, 19 insertions, 15 deletions

diff --git a/keyboards/shiro/info.json b/keyboards/shiro/info.json
index 919cce0741..a67261dfd2 100644
--- a/keyboards/shiro/info.json
+++ b/keyboards/shiro/info.json
@@ -18,21 +18,25 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x": 0, "y": 0},
-        {"x": 1, "y": 0},
-        {"x": 2, "y": 0},
-        {"x": 0, "y": 1},
-        {"x": 1, "y": 1},
-        {"x": 2, "y": 1},
-        {"x": 0, "y": 2},
-        {"x": 1, "y": 2},
-        {"x": 2, "y": 2},
-        {"x": 0, "y": 3},
-        {"x": 1, "y": 3},
-        {"x": 2, "y": 3},
-        {"x": 0, "y": 4},
-        {"x": 1, "y": 4},
-        {"x": 2, "y": 4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4}
       ]
     }
   }