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

7 files changed, 21 insertions, 22 deletions

diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 28a506cf8d..bfb3f2ba9d 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -18,10 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xD60D
-#define MANUFACTURER    Hoksi Technology
-
 #define WAIT_US_TIMER           GPTD3
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index e8108f7d11..7da032b967 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x6A1A
-#define DEVICE_VER      0x0001
-#define PRODUCT         Galaxy 84 HK gaming x DURGOD (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 6
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }
diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json
index 6fc8959d0b..221d6613aa 100644
--- a/keyboards/durgod/dgk6x/galaxy/info.json
+++ b/keyboards/durgod/dgk6x/galaxy/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Galaxy",
+  "keyboard_name": "Galaxy 84 HK gaming x DURGOD (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/Galaxy-75-Modular-Mechanical-Keyboard/dp/B08PDRD8MP",
   "maintainer": "dkjer",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x6A1A",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h
index c148ae1b1f..a2bba0a5a5 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x4AD3
-#define DEVICE_VER      0x0001
-#define PRODUCT         DURGOD Hades (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 5
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json
index b439ea4acb..345b26adcd 100644
--- a/keyboards/durgod/dgk6x/hades/info.json
+++ b/keyboards/durgod/dgk6x/hades/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Hades",
+  "keyboard_name": "DURGOD Hades (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/gp/product/B08562392T",
   "maintainer": "J-Sully",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x4AD3",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index 3bef1ea7ed..207508dead 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x7EC5
-#define DEVICE_VER      0x0001
-#define PRODUCT         DURGOD Venus (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 5
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json
index 21e93d55c2..a2d297d661 100644
--- a/keyboards/durgod/dgk6x/venus/info.json
+++ b/keyboards/durgod/dgk6x/venus/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Venus",
+  "keyboard_name": "DURGOD Venus (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/dp/B07XFP5MMZ",
   "maintainer": "J-Sully",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x7EC5",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [