merge upstream master

14 files changed, 38 insertions, 29 deletions

diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 96534c80c7..3909c3e5e2 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -18,15 +18,9 @@
 
 #include "config_common.h"
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x574D // WM
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    WestM
-#define PRODUCT         WestM68
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index 58378c1b43..f7f67d45a0 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -1,7 +1,12 @@
 {
     "keyboard_name": "WestM68",
+    "manufacturer": "WestM",
     "url": "https://github.com/WestMProducts",
     "maintainer": "WestM",
+    "usb": {
+        "vid": "0x574D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
index 488d644c3e..054b47cca2 100644
--- a/keyboards/westm/westm68/rev1/config.h
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID      0x0101
-
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN A8
 #define RGBLED_NUM 16
diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json
new file mode 100644
index 0000000000..a4736b30a4
--- /dev/null
+++ b/keyboards/westm/westm68/rev1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x0101"
+    }
+}
diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h
index 94ce14d3f9..054b47cca2 100644
--- a/keyboards/westm/westm68/rev2/config.h
+++ b/keyboards/westm/westm68/rev2/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID      0x0102
-
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN A8
 #define RGBLED_NUM 16
diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json
new file mode 100644
index 0000000000..0b36e6dd58
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x0102"
+    }
+}
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 4175b5b3f8..51ccf743a0 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -18,15 +18,9 @@
 
 #include "config_common.h"
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x574D // WM
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    WestM
-#define PRODUCT         WestM9
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index 5c36e74ab4..3beb8b232f 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -1,7 +1,12 @@
 {
     "keyboard_name": "WestM9",
+    "manufacturer": "WestM",
     "url": "https://github.com/WestMProducts",
     "maintainer": "WestM",
+    "usb": {
+        "vid": "0x574D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_macropad": {
             "layout": [
diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h
index 48ed5d6869..fcc9ddb99d 100644
--- a/keyboards/westm/westm9/rev1/config.h
+++ b/keyboards/westm/westm9/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID      0x0301
-
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN F1
 #define RGBLED_NUM 14
diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json
new file mode 100644
index 0000000000..9934337227
--- /dev/null
+++ b/keyboards/westm/westm9/rev1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x0301"
+    }
+}
diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h
index 84a7589360..fcc9ddb99d 100644
--- a/keyboards/westm/westm9/rev2/config.h
+++ b/keyboards/westm/westm9/rev2/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID      0x0302
-
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN F1
 #define RGBLED_NUM 14
diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json
new file mode 100644
index 0000000000..3b2f219948
--- /dev/null
+++ b/keyboards/westm/westm9/rev2/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x0302"
+    }
+}
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index 3e775a7401..e3f06ab222 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x574D // WM
-#define PRODUCT_ID      0x0201
-#define DEVICE_VER      0x0001 // Revision prototype
-#define MANUFACTURER    WestM
-#define PRODUCT         WestMErgo
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index c31a65a2ec..316034146d 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "WestMErgo", 
+    "manufacturer": "WestM",
     "url": "https://github.com/WestMProducts", 
     "maintainer": "WestM", 
+    "usb": {
+        "vid": "0x574D",
+        "pid": "0x0201",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_alice": {
             "layout": [