Merge remote-tracking branch 'upstream/develop'

3 files changed, 10 insertions, 22 deletions

diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index d3d5818b1c..55b8bc4bee 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -13,11 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
 
 /*
  * Keyboard Matrix Assignments
@@ -35,17 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
-#define BACKLIGHT_PIN B6
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 3
-#endif
-
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 6cb3f5fbe3..45aea95248 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -8,6 +8,16 @@
         "pid": "0x8788",
         "device_version": "0.0.1"
     },
+    "backlight": {
+        "pin": "B6"
+    },
+    "indicators": {
+        "caps_lock": "F0",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/cherrybstudio/cb87v2/rules.mk b/keyboards/cherrybstudio/cb87v2/rules.mk
index 3bd45154f4..cdde6d344b 100644
--- a/keyboards/cherrybstudio/cb87v2/rules.mk
+++ b/keyboards/cherrybstudio/cb87v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #