4 files changed, 19 insertions, 48 deletions
diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h
index 91922c6d95..cabf72507f 100644
--- a/keyboards/psuieee/pluto12/config.h
+++ b/keyboards/psuieee/pluto12/config.h
@@ -3,14 +3,6 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/info.json
index 752b2ab97f..d997f60cfa 100644
--- a/keyboards/psuieee/pluto12/info.json
+++ b/keyboards/psuieee/pluto12/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B2"}
@@ -18,18 +23,20 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "M1", "x": 0, "y": 0 },
-                { "label": "M2", "x": 1, "y": 0 },
-                { "label": "M3", "x": 2, "y": 0 },
-                { "label": "M4", "x": 3, "y": 0 },
-                { "label": "M5", "x": 0, "y": 1 },
-                { "label": "M6", "x": 1, "y": 1 },
-                { "label": "M7", "x": 2, "y": 1 },
-                { "label": "M8", "x": 3, "y": 1 },
-                { "label": "M9", "x": 0, "y": 2 },
-                { "label": "M10", "x": 1, "y": 2 },
-                { "label": "M11", "x": 2, "y": 2 },
-                { "label": "M12", "x": 3, "y": 2 }
+                {"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": [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": [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}
             ]
         }
     }
diff --git a/keyboards/psuieee/pluto12/pluto12.c b/keyboards/psuieee/pluto12/pluto12.c
deleted file mode 100644
index 15d5fad99f..0000000000
--- a/keyboards/psuieee/pluto12/pluto12.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021-22 Will McGloughlin (@wymcg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "pluto12.h"
diff --git a/keyboards/psuieee/pluto12/pluto12.h b/keyboards/psuieee/pluto12/pluto12.h
deleted file mode 100644
index fc3f391156..0000000000
--- a/keyboards/psuieee/pluto12/pluto12.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2021-22 Will McGloughlin (@wymcg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23 \
-) { \
-    {K00, K01, K02, K03}, \
-    {K10, K11, K12, K13}, \
-    {K20, K21, K22, K23} \
-}