diff options
author | QMK Bot <[email protected]> | 2022-08-03 07:16:28 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2022-08-03 07:16:28 +0000 |
commit | d4f9eb5225feb7f2aad01d252b33401e3a80b870 (patch) | |
tree | f3b1f76a8d715e7c4f63d18f9fc3ae65141eb1fb /keyboards/melgeek/mj6xy | |
parent | bce4fb45748bacc8cb21cb61687d9bfd9faa4494 (diff) | |
parent | 3da6575e2480d46399be01c21270c57420e0f16d (diff) | |
download | qmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.tar.gz qmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/melgeek/mj6xy')
-rwxr-xr-x | keyboards/melgeek/mj6xy/config.h | 7 | ||||
-rwxr-xr-x | keyboards/melgeek/mj6xy/info.json | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/melgeek/mj6xy/config.h b/keyboards/melgeek/mj6xy/config.h index 4a6336c1c9..fb02fddc1f 100755 --- a/keyboards/melgeek/mj6xy/config.h +++ b/keyboards/melgeek/mj6xy/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xEDED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MelGeek -#define PRODUCT MJ6XY - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 3 diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json index 712b97295c..7bd66020b0 100755 --- a/keyboards/melgeek/mj6xy/info.json +++ b/keyboards/melgeek/mj6xy/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "MJ6XY", + "manufacturer": "MelGeek", "url": "", "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ |