7 files changed, 10 insertions, 57 deletions
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index de94eab9ba..de0ed1ebec 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -23,8 +23,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define ROTATIONAL_TRANSFORM_ANGLE 20
 
 // If board has a debug LED, you can enable it by defining this
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index a1f9c53284..2c30755aa1 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5043",
         "pid": "0x5442",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "bootmagic": {
         "matrix": [0, 3]
@@ -14,11 +15,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
-                {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]},
-                {"x":2, "y":0, "h":2, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "h":2, "matrix": [0, 3]},
-                {"x":4.5, "y":0, "h":2, "matrix": [0, 4]}
+                {"x": 0, "y": 0, "h": 2, "matrix": [0, 0]},
+                {"x": 1, "y": 0.25, "h": 1.5, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "h": 2, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "h": 2, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0, "h": 2, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball/rev1/rev1.h b/keyboards/ploopyco/trackball/rev1/rev1.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * 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 "trackball.h"
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index fcf51c4c1b..66a453dcb8 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -23,8 +23,6 @@
 #define UNUSABLE_PINS \
     { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
 
-// If board has a debug LED, you can enable it by defining this
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 3
 #define RGBLIGHT_LIMIT_VAL 40
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json
index b963f8842a..91574c5c4b 100644
--- a/keyboards/ploopyco/trackball/rev1_005/info.json
+++ b/keyboards/ploopyco/trackball/rev1_005/info.json
@@ -5,5 +5,8 @@
         "direct": [
             ["D4", "D2", "E6", "B6", "D7"]
         ]
+    },
+    "ws2812": {
+        "pin": "B5"
     }
 }
diff --git a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h b/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * 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 "trackball.h"
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index 4cdae526aa..f4516222e0 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -21,11 +21,6 @@
 #include "quantum.h"
 #include "analog.h"
 #include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_ploopyco_trackball_rev1_005)
-#    include "rev1_005.h"
-#endif
 
 // Sensor defs
 #define OPT_ENC1 F0