5 files changed, 16 insertions, 47 deletions
diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
deleted file mode 100644
index 5e7c4babbd..0000000000
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 RGBKB
-
-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/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
-#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-#define RGB_DI_PIN B3
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json
index 1f7ece37eb..e4ac3eeecb 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["D7", "D1", "D5", "D6", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "encoder": {
@@ -6,5 +11,8 @@
             {"pin_a": "B0", "pin_b": "B1"},
             {"pin_a": "D0", "pin_b": "B2"}
         ]
+    },
+    "ws2812": {
+        "pin": "B3"
     }
 }
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
deleted file mode 100644
index f25713b2be..0000000000
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 RGBKB
-
-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/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
-#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
-
-#define RGB_DI_PIN A3
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json
index 5fd7124b9c..ff81cd1092 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A8", "A6", "B0", "B1", "B2", "B4", "B5", "A1", "A2", "B3", "B9", "A10", "A9"],
+        "rows": ["A15", "B10", "A14", "A13", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -7,5 +12,8 @@
             {"pin_a": "B14", "pin_b": "B15"},
             {"pin_a": "B11", "pin_b": "B12"}
         ]
+    },
+    "ws2812": {
+        "pin": "A3"
     }
 }
diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk
index 667c290059..4d3c0f6679 100644
--- a/keyboards/rgbkb/pan/rev1/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/rules.mk
@@ -1,5 +1,2 @@
 # The default configuration is a atmega32a
 DEFAULT_FOLDER = rgbkb/pan/rev1/32a
-
-RGB_MATRIX_DRIVER = custom
-WS2812_DRIVER_REQUIRED := yes