4 files changed, 14 insertions, 28 deletions
diff --git a/keyboards/maple_computing/6ball/6ball.c b/keyboards/maple_computing/6ball/6ball.c
deleted file mode 100644
index 1eddde9ba5..0000000000
--- a/keyboards/maple_computing/6ball/6ball.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "6ball.h"
diff --git a/keyboards/maple_computing/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h
deleted file mode 100644
index ef73a72053..0000000000
--- a/keyboards/maple_computing/6ball/6ball.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k05, k00, k01, \
-    k04, k03, k02 \
-) { \
-    { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 4eaec15ad2..59679e2753 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* pin-out */
-#define MATRIX_ROW_PINS { F5 }
-#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 }
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN F7
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,7 +29,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6    // Number of LEDs
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index 21df7d9dda..b799baa28c 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -8,18 +8,26 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "D4", "B5", "B6", "B2", "F6"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0},
-                {"x":2, "y":0.5},
+                {"matrix": [0, 5], "x": 0, "y": 0.5},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0.5},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":2},
-                {"x":2, "y":1.5}
+                {"matrix": [0, 4], "x": 0, "y": 1.5},
+                {"matrix": [0, 3], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 1.5}
             ]
         }
     }