diff options
author | fauxpark <fauxpark@gmail.com> | 2022-08-15 17:54:07 +1000 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2022-08-15 17:54:07 +1000 |
commit | c202602938e1b065e6bac394771b310fea2a3edb (patch) | |
tree | 444978b63e48d68f004b1c0730929bfbcfb221e8 /keyboards/dztech/dz65rgb | |
parent | 8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff) | |
parent | 51d5aad25b92a34bc051849616fcd93e3ae407fc (diff) | |
download | qmk_firmware-c202602938e1b065e6bac394771b310fea2a3edb.tar.gz qmk_firmware-c202602938e1b065e6bac394771b310fea2a3edb.zip |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/dztech/dz65rgb')
-rw-r--r-- | keyboards/dztech/dz65rgb/info.json | 6 | ||||
-rw-r--r-- | keyboards/dztech/dz65rgb/v1/config.h | 7 | ||||
-rw-r--r-- | keyboards/dztech/dz65rgb/v1/info.json | 6 | ||||
-rw-r--r-- | keyboards/dztech/dz65rgb/v2/config.h | 7 | ||||
-rw-r--r-- | keyboards/dztech/dz65rgb/v2/info.json | 6 | ||||
-rwxr-xr-x | keyboards/dztech/dz65rgb/v3/config.h | 7 | ||||
-rw-r--r-- | keyboards/dztech/dz65rgb/v3/info.json | 6 |
7 files changed, 23 insertions, 22 deletions
diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json index 4a97f4fd82..32171cd74a 100644 --- a/keyboards/dztech/dz65rgb/info.json +++ b/keyboards/dztech/dz65rgb/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz65rgb", + "keyboard_name": "DZ65RGB", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h index d281eaa51e..0ae5173051 100644 --- a/keyboards/dztech/dz65rgb/v1/config.h +++ b/keyboards/dztech/dz65rgb/v1/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1420 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json new file mode 100644 index 0000000000..752d361728 --- /dev/null +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1420", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h index 5267f42aa2..d2dec023ef 100644 --- a/keyboards/dztech/dz65rgb/v2/config.h +++ b/keyboards/dztech/dz65rgb/v2/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1421 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json new file mode 100644 index 0000000000..1cfb5abdbb --- /dev/null +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1421", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h index 27c99f91f6..ed7775a74b 100755 --- a/keyboards/dztech/dz65rgb/v3/config.h +++ b/keyboards/dztech/dz65rgb/v3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1424 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGBV3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json new file mode 100644 index 0000000000..f2c2236031 --- /dev/null +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1424", + "device_version": "3.0.0" + } +} |