Merge remote-tracking branch 'origin/master' into develop

10 files changed, 35 insertions, 40 deletions

diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h
index b5480a2b28..b8edfeee82 100644
--- a/keyboards/mode/m65ha_alpha/config.h
+++ b/keyboards/mode/m65ha_alpha/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define PRODUCT_ID      0x6566 // 65A + 1 since the pre-alpha version was 6565
-#define DEVICE_VER      0x0065 // A for release Alpha
-#define MANUFACTURER    Mode
-#define PRODUCT         SixtyFive HA
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json
index a25d22714e..c2ae3d385d 100644
--- a/keyboards/mode/m65ha_alpha/info.json
+++ b/keyboards/mode/m65ha_alpha/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Mode SixtyFive HA",
+  "keyboard_name": "SixtyFive HA",
+  "manufacturer": "Mode",
   "url": "",
   "maintainer": "Gondolindrim",
+  "usb": {
+    "vid": "0x00DE",
+    "pid": "0x6566",
+    "device_version": "0.6.5"
+  },
   "layouts": {
       "LAYOUT_all": {
           "layout": [
diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h
index 39471afe09..3886755cb3 100644
--- a/keyboards/mode/m65hi_alpha/config.h
+++ b/keyboards/mode/m65hi_alpha/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define PRODUCT_ID      0x6574 // For 65I + 1 (for alpha, since pre-alpha 6573)
-#define DEVICE_VER      0x0065 // A for A (alpha)
-#define MANUFACTURER    Mode
-#define PRODUCT         SixtyFive HI
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json
index aa5f98efc6..231299e6d1 100644
--- a/keyboards/mode/m65hi_alpha/info.json
+++ b/keyboards/mode/m65hi_alpha/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Mode SixtyFive HI",
+  "keyboard_name": "SixtyFive HI",
+  "manufacturer": "Mode",
   "url": "",
   "maintainer": "Gondolindrim",
+  "usb": {
+    "vid": "0x00DE",
+    "pid": "0x6574",
+    "device_version": "0.6.5"
+  },
   "layouts": {
       "LAYOUT_all": {
           "layout": [
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index ca628e39c3..4459e37145 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define PRODUCT_ID      0x6583 // For 65S
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mode
-#define PRODUCT         SixtyFive S
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index cb0cf8c12c..511a05bf8f 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Mode SixtyFive S",
+    "keyboard_name": "SixtyFive S",
+    "manufacturer": "Mode",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x00DE",
+        "pid": "0x6583",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h
index 315db1d515..0dff69fac9 100644
--- a/keyboards/mode/m75h/config.h
+++ b/keyboards/mode/m75h/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define PRODUCT_ID      0x7572 // For 75H
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mode
-#define PRODUCT         Mode 75H
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 16
diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json
index 91584e8863..e3b5c6d64b 100644
--- a/keyboards/mode/m75h/info.json
+++ b/keyboards/mode/m75h/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Mode 75H",
+    "keyboard_name": "75H",
+    "manufacturer": "Mode",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x00DE",
+        "pid": "0x7572",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
index 287c746ac9..5da8543e95 100644
--- a/keyboards/mode/m75s/config.h
+++ b/keyboards/mode/m75s/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define PRODUCT_ID      0x7583 // For 75S
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mode
-#define PRODUCT         Mode 75S
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 16
diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json
index d45cee20dc..2b58f194fb 100644
--- a/keyboards/mode/m75s/info.json
+++ b/keyboards/mode/m75s/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Mode 75S",
+    "keyboard_name": "75S",
+    "manufacturer": "Mode",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x00DE",
+        "pid": "0x7583",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [