5 files changed, 10 insertions, 12 deletions
diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h
index 9f1a9ae244..c4105bdf5f 100644
--- a/keyboards/handwired/sono1/config.h
+++ b/keyboards/handwired/sono1/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h
index b961eaffd6..7cd783c0e9 100644
--- a/keyboards/handwired/sono1/stm32f103/config.h
+++ b/keyboards/handwired/sono1/stm32f103/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
-#define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
-
 #define LED_CTRL_XFER_PIN B6
 #define LED_KB_LOCK_PIN B12
diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json
index b25392382a..f6e874a77f 100644
--- a/keyboards/handwired/sono1/stm32f103/info.json
+++ b/keyboards/handwired/sono1/stm32f103/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A4", "A3", "B11", "B10", "B1", "B0", "A7", "A6"],
+        "rows": ["A5", "B3", "A9", "A10", "B13", "B14", "B15", "A8", "B7", "B8", "B9", "C13", "A15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B5",
         "num_lock": "B4",
diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h
index 15bea036a2..144031ea7b 100644
--- a/keyboards/handwired/sono1/t2pp/config.h
+++ b/keyboards/handwired/sono1/t2pp/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 }
-
 #define LED_CTRL_XFER_PIN B4
 #define LED_KB_LOCK_PIN B1
diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json
index 3e637c3e94..37ab6723ba 100644
--- a/keyboards/handwired/sono1/t2pp/info.json
+++ b/keyboards/handwired/sono1/t2pp/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "D7", "B7", "D0", "D1", "D2", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "B2",