5 files changed, 22 insertions, 52 deletions
diff --git a/keyboards/tominabox1/bigboy/bigboy.c b/keyboards/tominabox1/bigboy/bigboy.c
index 3cb1ec442d..6871d81a62 100755
--- a/keyboards/tominabox1/bigboy/bigboy.c
+++ b/keyboards/tominabox1/bigboy/bigboy.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bigboy.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/tominabox1/bigboy/bigboy.h b/keyboards/tominabox1/bigboy/bigboy.h
deleted file mode 100755
index ef3b4a44f9..0000000000
--- a/keyboards/tominabox1/bigboy/bigboy.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 tominabox1
- *
- * 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,   \
-    K10, K11, K12    \
-) { \
-    { K00,   K01,   K02,   }, \
-    { K10,   K11,   K12    }, \
-}
-
-#define LAYOUT_2us( \
-    K00, K01, K02   \
-) { \
-    { K00,   K01,   K02    }, \
-}
diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h
index 9e95f1f5c7..70d1b76bea 100755
--- a/keyboards/tominabox1/bigboy/config.h
+++ b/keyboards/tominabox1/bigboy/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define DIRECT_PINS { \
-    { D0, B1, B0 }, \
-    { B7, B2, B3 } \
-}
-
-
 #define ENCODERS_PAD_A { C6 }
 #define ENCODERS_PAD_B { B6 }
 #define ENCODER_RESOLUTION 2
diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json
index 4c18c89555..cdddc688d1 100644
--- a/keyboards/tominabox1/bigboy/info.json
+++ b/keyboards/tominabox1/bigboy/info.json
@@ -8,12 +8,31 @@
         "pid": "0x6262",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["D0", "B1", "B0"],
+            ["B7", "B2", "B3"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}]
+            "layout": [
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]}
+            ]
         },
         "LAYOUT_2us": {
-            "layout": [{"label":"0,0", "x":0, "y":0, "h":2}, {"label":"0,1", "x":1, "y":0, "h":2}, {"label":"0,2", "x":2, "y":0, "h":2}]
+            "layout": [
+                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
+                {"x":1, "y":0, "h":2, "matrix": [0, 1]},
+                {"x":2, "y":0, "h":2, "matrix": [0, 2]}
+            ]
         }
     }
 }
diff --git a/keyboards/tominabox1/bigboy/rules.mk b/keyboards/tominabox1/bigboy/rules.mk
index a31774530d..28fb3e866d 100755
--- a/keyboards/tominabox1/bigboy/rules.mk
+++ b/keyboards/tominabox1/bigboy/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #