4 files changed, 16 insertions, 27 deletions
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 16d91b69a2..b6fc3a66a2 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -15,20 +15,11 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS { B0, A7, A3, A5, A4, A2 }
-#define MATRIX_ROW_PINS { B12, A6, B13, B9, B8 }
-#define MATRIX_COL_PINS_RIGHT { B0, A7, A3, A5, A4, A2 }
-#define MATRIX_ROW_PINS_RIGHT  { B12, A6, B13, B9, B8 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define MATRIX_IO_DELAY 5
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 16
 #define RGBLED_SPLIT { 8,8 }
 #define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/tkw/grandiceps/grandiceps.c b/keyboards/tkw/grandiceps/grandiceps.c
deleted file mode 100644
index bfb67dfc2c..0000000000
--- a/keyboards/tkw/grandiceps/grandiceps.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * 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 "grandiceps.h"
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 4d91a00c84..c6d658e00a 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -6,13 +6,28 @@
         "vid": "0xFEED",
         "pid": "0x7812"
     },
+    "ws2812": {
+        "pin": "B1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
+        "rows": ["B12", "A6", "B13", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B14", "pin_b": "B15"}
         ]
     },
     "split": {
-        "soft_serial_pin": "A15"
+        "soft_serial_pin": "A15",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
+                "rows": ["B12", "A6", "B13", "B9", "B8"]
+            }
+        }
     },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 1b481a9e1e..2565f116a1 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -17,7 +17,6 @@ SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
-WS2812_DRIVER = pwm
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/grandiceps/rev1