4 files changed, 26 insertions, 73 deletions
diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c
deleted file mode 100644
index bbae5d6f4e..0000000000
--- a/keyboards/percent/booster/booster.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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 "booster.h"
diff --git a/keyboards/percent/booster/booster.h b/keyboards/percent/booster/booster.h
deleted file mode 100644
index be2d2cb12b..0000000000
--- a/keyboards/percent/booster/booster.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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_numpad_5x4( \
-    K00, K01, K02, K03,    \
-    K10, K11, K12,         \
-    K20, K21, K22, K23,    \
-    K30, K31, K32,         \
-    K40,      K42, K33     \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23   }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   KC_NO, K42,   KC_NO }, \
-}
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index b452a0dcb6..2978c96efd 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -17,14 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D1, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { C7, D4, D2, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -41,4 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json
index f92476c9f6..79b9cb8026 100644
--- a/keyboards/percent/booster/info.json
+++ b/keyboards/percent/booster/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4253",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "D4", "D2", "D0"],
+        "rows": ["D1", "D6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -17,23 +22,27 @@
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"label":"K00 (D1,C7)", "x":0, "y":0},
-                {"label":"K01 (D1,D4)", "x":1, "y":0},
-                {"label":"K02 (D1,D2)", "x":2, "y":0},
-                {"label":"K03 (D1,D0)", "x":3, "y":0},
-                {"label":"K10 (D6,C7)", "x":0, "y":1},
-                {"label":"K11 (D6,D4)", "x":1, "y":1},
-                {"label":"K12 (D6,D2)", "x":2, "y":1},
-                {"label":"K20 (D7,C7)", "x":0, "y":2},
-                {"label":"K21 (D7,D4)", "x":1, "y":2},
-                {"label":"K22 (D7,D2)", "x":2, "y":2},
-                {"label":"K23 (D7,D0)", "x":3, "y":1, "h":2},
-                {"label":"K30 (B4,C7)", "x":0, "y":3},
-                {"label":"K31 (B4,D4)", "x":1, "y":3},
-                {"label":"K32 (B4,D2)", "x":2, "y":3},
-                {"label":"K40 (B5,C7)", "x":0, "y":4, "w":2},
-                {"label":"K42 (B5,D2)", "x":2, "y":4},
-                {"label":"K33 (B4,D0)", "x":3, "y":3, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }