9 files changed, 22 insertions, 62 deletions
diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h
deleted file mode 100644
index 6692b78292..0000000000
--- a/keyboards/mechlovin/infinity87/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * 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 "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
- 
diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h
index 467d47c6f4..7de2a2cc79 100644
--- a/keyboards/mechlovin/infinity87/rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/config.h
@@ -24,8 +24,4 @@
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 
-
-#define LED_CAPS_LOCK_PIN A4
-#define LED_SCROLL_LOCK_PIN A8
-
 #define DIODE_DIRECTION COL2ROW
 \ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
new file mode 100644
index 0000000000..0bcf668f11
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -0,0 +1,9 @@
+{
+    "indicators": {
+        "caps_lock": "A4",
+        "scroll_lock": "A8"
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C"
+}
diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk
index 82b0f2e482..53a9137b2f 100644
--- a/keyboards/mechlovin/infinity87/rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev1/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 BACKLIGHT_ENABLE  = yes     # Enable keyboard backlight functionality
 
 DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index 65eaa9a7fa..0fa79ae14d 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -16,6 +16,9 @@
 
 #pragma once
 
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
 /*
  * Keyboard Matrix Assignments
  *
@@ -31,11 +34,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 1
-
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
@@ -58,13 +56,4 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index 62aa3cfeb0..548e55f563 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -8,6 +8,13 @@
         "pid": "0x8702",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index 92823adea9..ea7804f158 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index fc308175cf..604fa512ed 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x8710",
         "device_version": "0.0.1"
     },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
index 27de40424a..5a28c2e1c2 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
@@ -1,9 +1,2 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
 RGB_MATRIX_DRIVER = IS31FL3741