4 files changed, 15 insertions, 77 deletions
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index cdc031b93b..9c55906c31 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -16,30 +16,11 @@ 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 { D7, F0, F6 }
-#define MATRIX_COL_PINS { F5, F7, F4 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -57,4 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
 #define RGBLIGHT_LIMIT_VAL 50
-#endif
diff --git a/keyboards/capsunlocked/cu7/cu7.c b/keyboards/capsunlocked/cu7/cu7.c
deleted file mode 100644
index 815ac53c94..0000000000
--- a/keyboards/capsunlocked/cu7/cu7.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-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 "cu7.h"
diff --git a/keyboards/capsunlocked/cu7/cu7.h b/keyboards/capsunlocked/cu7/cu7.h
deleted file mode 100644
index 2f30dbb2d5..0000000000
--- a/keyboards/capsunlocked/cu7/cu7.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-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
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-	         K01,       \
-	  K10,   K11,  K12, \
-      K20,   K21,  K22  \
-) { \
-	{ KC_NO, K01,  KC_NO }, \
-	{ K10,   K11,  K12 },   \
-    { K20,   K21,  K22 }    \
-}
-
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index ebd7b6d491..94eb2aea0c 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/keyboards/capsunlocked/cu7/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F7", "F4"],
+        "rows": ["D7", "F0", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D6", "pin_b": "D4", "resolution": 2}
@@ -18,15 +26,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0, "w":2, "h":2},
+                {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 2, "h": 2},
 
-                {"x":0, "y":2.5},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.5},
+                {"matrix": [1, 2], "x": 2, "y": 2.5},
 
-                {"x":0, "y":3.5},
-                {"x":1, "y":3.5},
-                {"x":2, "y":3.5}
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.5},
+                {"matrix": [2, 2], "x": 2, "y": 3.5}
             ]
         }
     }