Merge branch 'master' into taamas

6 files changed, 14 insertions, 22 deletions

diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index ad5fbfa1c3..a7220ab1c6 100644
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ b/keyboards/mss_studio/m63_rgb/config.h
@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D4B
-#define PRODUCT_ID      0x6063
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mss Studio
-#define PRODUCT         M63 RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
@@ -43,9 +36,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 #ifdef RGB_MATRIX_ENABLE
     #define DRIVER_LED_TOTAL 75
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json
index 651e58a100..577903c264 100644
--- a/keyboards/mss_studio/m63_rgb/info.json
+++ b/keyboards/mss_studio/m63_rgb/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "M63 RGB",
+    "manufacturer": "Mss Studio",
     "url": "",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x4D4B",
+        "pid": "0x6063",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi_arrow": {
             "layout": [
diff --git a/keyboards/mss_studio/m63_rgb/readme.md b/keyboards/mss_studio/m63_rgb/readme.md
index 942b7a60a6..33e4f58221 100644
--- a/keyboards/mss_studio/m63_rgb/readme.md
+++ b/keyboards/mss_studio/m63_rgb/readme.md
@@ -21,4 +21,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
 * **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
index 0c7f8d17e1..c9a1e3f3db 100644
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ b/keyboards/mss_studio/m64_rgb/config.h
@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D4B
-#define PRODUCT_ID      0x6064
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mss Studio
-#define PRODUCT         M64 RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
@@ -43,9 +36,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 #ifdef RGB_MATRIX_ENABLE
     #define DRIVER_LED_TOTAL 76
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json
index 264e894377..971a213cb7 100644
--- a/keyboards/mss_studio/m64_rgb/info.json
+++ b/keyboards/mss_studio/m64_rgb/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "M64 RGB",
+    "manufacturer": "Mss Studio",
     "url": "",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x4D4B",
+        "pid": "0x6064",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_64_ansi": {
             "layout": [
diff --git a/keyboards/mss_studio/m64_rgb/readme.md b/keyboards/mss_studio/m64_rgb/readme.md
index 1925622b9c..360720b584 100644
--- a/keyboards/mss_studio/m64_rgb/readme.md
+++ b/keyboards/mss_studio/m64_rgb/readme.md
@@ -21,4 +21,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
 * **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available