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

2 files changed, 7 insertions, 8 deletions

diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index f437840f91..5bc2e400bf 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/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       0x6532
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x3031
-#define MANUFACTURER    Gizmo Engineering
-#define PRODUCT         GK6
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12
diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
index ffd59e41b1..8dfdfbf93b 100755
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Gizmo Engineering GK6",
+    "keyboard_name": "GK6",
+    "manufacturer": "Gizmo Engineering",
     "url": "https://gizmo.engineering/",
     "maintainer": "federicoweber",
+    "usb": {
+        "vid": "0x6532",
+        "pid": "0x0001",
+        "device_version": "30.3.1"
+    },
     "layouts": {
         "LAYOUT_gk6_2x2u": {
             "layout": [