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

10 files changed, 28 insertions, 62 deletions

diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h
index c31a29003e..675cc3385d 100644
--- a/keyboards/mode/m80v1/config.h
+++ b/keyboards/mode/m80v1/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define MANUFACTURER    Mode
-#define PRODUCT         Eighty
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/mode/m80v1/m80h/config.h b/keyboards/mode/m80v1/m80h/config.h
deleted file mode 100644
index b119ad4fff..0000000000
--- a/keyboards/mode/m80v1/m80h/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-
-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
-
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0081
-#define DEVICE_VER      0x0072 //H for hotswap version
diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json
index 97d5881997..bb65727e62 100644
--- a/keyboards/mode/m80v1/m80h/info.json
+++ b/keyboards/mode/m80v1/m80h/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "MODE80H", 
+    "keyboard_name": "Eighty", 
+    "manufacturer": "Mode",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+    	"vid": "0x00DE",
+    	"pid": "0x0081",
+    	"device_version": "0.7.2"
+    },
     "layouts": {
         "LAYOUT_eighty_m80h": {
             "layout": [
diff --git a/keyboards/mode/m80v1/m80s/config.h b/keyboards/mode/m80v1/m80s/config.h
deleted file mode 100644
index 3e7f2ec3a8..0000000000
--- a/keyboards/mode/m80v1/m80s/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-
-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
-
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0080
-#define DEVICE_VER      0x0083 //S for solderable version
diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json
index c586614a78..7b72eb256f 100644
--- a/keyboards/mode/m80v1/m80s/info.json
+++ b/keyboards/mode/m80v1/m80s/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "MODE80S", 
+    "keyboard_name": "Eighty", 
+    "manufacturer": "Mode",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+    	"vid": "0x00DE",
+    	"pid": "0x0080",
+    	"device_version": "0.8.3"
+    },
     "layouts": {
         "LAYOUT_eighty_m80s": {
             "layout": [
diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h
index fbe5fb86df..9382def58a 100644
--- a/keyboards/mode/m80v2/config.h
+++ b/keyboards/mode/m80v2/config.h
@@ -17,11 +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 DEVICE_VER      0x0002
-#define MANUFACTURER    Mode
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
diff --git a/keyboards/mode/m80v2/m80v2h/config.h b/keyboards/mode/m80v2/m80v2h/config.h
deleted file mode 100644
index f474e28453..0000000000
--- a/keyboards/mode/m80v2/m80v2h/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PRODUCT_ID      0x0083 // 81 was used for M80H V1
-#define PRODUCT         M80H V2
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
index 251937c562..13bd6c67bc 100644
--- a/keyboards/mode/m80v2/m80v2h/info.json
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "MODE80V2H", 
+    "keyboard_name": "M80H V2", 
+    "manufacturer": "Mode",
     "url": "https://shop.modedesigns.com/collections/eighty", 
     "maintainer": "Gondolindrim", 
+    "usb": {
+    	"vid": "0x00DE",
+    	"pid": "0x0083",
+    	"device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_m80v2h": {
             "layout": [
diff --git a/keyboards/mode/m80v2/m80v2s/config.h b/keyboards/mode/m80v2/m80v2s/config.h
deleted file mode 100644
index ad1871f8ab..0000000000
--- a/keyboards/mode/m80v2/m80v2s/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PRODUCT_ID      0x0082 // 81 was used for M80H V1
-#define PRODUCT         M80S V2
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
index 6e0bd62d51..4e2a4fc6f5 100644
--- a/keyboards/mode/m80v2/m80v2s/info.json
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "MODE80V2S", 
+    "keyboard_name": "M80S V2", 
+    "manufacturer": "Mode",
     "url": "https://shop.modedesigns.com/collections/eighty", 
     "maintainer": "Gondolindrim", 
+    "usb": {
+    	"vid": "0x00DE",
+    	"pid": "0x0082",
+    	"device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_m80v2s": {
             "layout": [