4 files changed, 27 insertions, 71 deletions
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 1e908ea029..2a1bafaacf 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//Matrix is 3x5 instead of 3x4, as the 3 encoders are wired into the matrix
-
-#define MATRIX_ROW_PINS { F0, F1, F4 }
-#define MATRIX_COL_PINS { F5, F6, F7, C7, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-//Data pin for the 3 RGB LEDs
-#define RGB_DI_PIN D3
 //Number of RGB LEDs
 #define RGBLED_NUM 3
 
diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json
index ff5101f8ea..7fbcf0db3a 100644
--- a/keyboards/dmqdesign/spin/info.json
+++ b/keyboards/dmqdesign/spin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "C7", "C6"],
+        "rows": ["F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B5"},
@@ -15,26 +20,33 @@
             {"pin_a": "D6", "pin_b": "D4"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"x":0, "y":0},
-            {"x":1, "y":0},
-            {"x":2, "y":0},
-            {"x":3.5, "y":0},
-            {"x":0, "y":1},
-            {"x":1, "y":1}, 
-            {"x":2, "y":1},
-            {"x":3.5, "y":1.5},
-            {"x":0, "y":2},
-            {"x":1, "y":2},
-            {"x":2, "y":2},
-            {"x":3.5, "y":3},
-            {"x":0, "y":3}, 
-            {"x":1, "y":3},
-            {"x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+
+                {"matrix": [1, 4], "x": 3.5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [0, 4], "x": 3.5, "y": 3},
+                {"matrix": [0, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dmqdesign/spin/spin.c b/keyboards/dmqdesign/spin/spin.c
deleted file mode 100644
index fe3f267d1a..0000000000
--- a/keyboards/dmqdesign/spin/spin.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019-2020 DMQ 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 "spin.h"
diff --git a/keyboards/dmqdesign/spin/spin.h b/keyboards/dmqdesign/spin/spin.h
deleted file mode 100644
index d60dbe82fb..0000000000
--- a/keyboards/dmqdesign/spin/spin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2019-2020 DMQ 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
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32 \
-) { \
-    {k00, k10, k20, k30, k23}, \
-    {k01, k11, k21, k31, k13}, \
-    {k02, k12, k22, k32, k03} \
-}