9 files changed, 15 insertions, 93 deletions
diff --git a/keyboards/charue/charon/charon.c b/keyboards/charue/charon/charon.c
deleted file mode 100644
index 2c4a518a31..0000000000
--- a/keyboards/charue/charon/charon.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Charue Design
- *
- * 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 "charon.h"
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
deleted file mode 100644
index 1140991c95..0000000000
--- a/keyboards/charue/charon/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Charue Design
-
-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
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 }
-#define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json
index 406b845492..a4a8504fc8 100644
--- a/keyboards/charue/charon/info.json
+++ b/keyboards/charue/charon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4348",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4", "F1", "F0", "B5", "B6", "C6"],
+        "rows": ["B0", "B1", "B2", "B3", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "E6"
     },
diff --git a/keyboards/charue/sunsetter/config.h b/keyboards/charue/sunsetter/config.h
deleted file mode 100644
index 1219eac27c..0000000000
--- a/keyboards/charue/sunsetter/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Michael Pio "Coarse" Mayol  <mfmayol@up.edu.ph>
-
-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_COL_PINS { B13, B12, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, F0, B3, A15 }
-#define MATRIX_ROW_PINS { A8, B14, B11, B10, B2 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json
index 651561f47d..b499907a85 100644
--- a/keyboards/charue/sunsetter/info.json
+++ b/keyboards/charue/sunsetter/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5353",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B12", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "F0", "B3", "A15"],
+        "rows": ["A8", "B14", "B11", "B10", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F1",
         "on_state": 0
diff --git a/keyboards/charue/sunsetter/sunsetter.c b/keyboards/charue/sunsetter/sunsetter.c
deleted file mode 100644
index 4d1cdf4e80..0000000000
--- a/keyboards/charue/sunsetter/sunsetter.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Michael Pio "Coarse" Mayol  <mfmayol@up.edu.ph>
-
-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 "sunsetter.h"
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index b3a3ab3f9b..e720d702d4 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -3,14 +3,6 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignment s*/
-#define MATRIX_ROW_PINS { B3, B2, F4, F5, F6 }
-#define MATRIX_COL_PINS { F0, F1, F7, B1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index fcd9d0b3fe..4d37fcd819 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5335",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F7", "B1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B3", "B2", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },
diff --git a/keyboards/charue/sunsetter_r2/sunsetter_r2.c b/keyboards/charue/sunsetter_r2/sunsetter_r2.c
deleted file mode 100644
index 86b75fdd18..0000000000
--- a/keyboards/charue/sunsetter_r2/sunsetter_r2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Charue Design
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "sunsetter_r2.h"