9 files changed, 26 insertions, 32 deletions
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index eb8bd97b59..0a8b6b948e 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN C7
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 6
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
index 18023c847e..cd86f9ddf8 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B7"},
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index e0799e65a1..56ba105e5d 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B0, B2, B1 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 8
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
index 9d70daf01f..c7e5658ec4 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
+        "rows": ["B4", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"},
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index f791a83e48..2b33220ad9 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -24,12 +24,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0.75, "matrix": [0, 4]},
-                {"x":2.5, "y":0.75, "matrix": [0, 5]},
-                {"x":0, "y":1.75, "matrix": [0, 0]},
-                {"x":1, "y":1.75, "matrix": [0, 1]},
-                {"x":2, "y":1.75, "matrix": [0, 2]},
-                {"x":3, "y":1.75, "matrix": [0, 3]}
+                {"x":0.5, "y":0, "matrix": [0, 4]},
+                {"x":2.5, "y":0, "matrix": [0, 5]},
+                {"x":0, "y":1, "matrix": [0, 0]},
+                {"x":1, "y":1, "matrix": [0, 1]},
+                {"x":2, "y":1, "matrix": [0, 2]},
+                {"x":3, "y":1, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 776f7f3138..b537056e6b 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-#define MATRIX_ROW_PINS { F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { F4, D4, C6, D7, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index fa41ed213f..5d9ec2d7d4 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -1,5 +1,10 @@
 {
   "keyboard_name": "Zinc rev.1",
+  "matrix_pins": {
+    "cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
+    "rows": ["F6", "F7", "B1", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   }
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 0a7e29a9a6..b537056e6b 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index ec98ea65a9..3bf44bfe8f 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -1,5 +1,10 @@
 {
   "keyboard_name": "Zinc rev.A",
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   }