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

2022-08-15 17:54:07 +10:00
parent 8e9ee29fe3 51d5aad25b
commit c202602938
170 changed files with 508 additions and 750 deletions
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -1,12 +1,5 @@
 #pragma once

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1120
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1120",
+        "device_version": "1.0.0"
+    }
+}