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

keyboards/gboards/gergoplex/config.h

@@ -21,13 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6B0A
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT GergoPlex
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

keyboards/gboards/gergoplex/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "GergoPlex",
+    "manufacturer": "g Heavy Industries",
     "url": "",
     "maintainer": "germ",
+    "usb": {
+        "vid": "0x6B0A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [