5 files changed, 14 insertions, 50 deletions
diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.c b/keyboards/takashiski/namecard2x4/namecard2x4.c
deleted file mode 100644
index 091b55c10d..0000000000
--- a/keyboards/takashiski/namecard2x4/namecard2x4.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "namecard2x4.h"
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index 39b488c42a..3505ff3cc1 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B4,B5 }
-#define MATRIX_COL_PINS { E6,D7,C6,D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 4
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json
new file mode 100644
index 0000000000..e5c68e101d
--- /dev/null
+++ b/keyboards/takashiski/namecard2x4/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["E6", "D7", "C6", "D4"],
+        "rows": ["B4", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index e6897e7311..99560988d8 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2,B6 }
-#define MATRIX_COL_PINS { D7,E6,B4,B5 }
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D4
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json
new file mode 100644
index 0000000000..24ae3ff5f0
--- /dev/null
+++ b/keyboards/takashiski/namecard2x4/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "ROW2COL"
+}