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

keyboards/gh60/revc/config.h

@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4335 // GEEKhack
-#define PRODUCT_ID   0x0001
-#define DEVICE_VER   0x0001
-#define MANUFACTURER    geekhack
-#define PRODUCT         GH60 Rev C
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/gh60/revc/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "GH60 Rev C",
+    "manufacturer": "geekhack",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4335",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [