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/gmmk | |
| 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/gmmk')
| -rw-r--r-- | keyboards/gmmk/pro/config.h | 7 | ||||
| -rw-r--r-- | keyboards/gmmk/pro/rev1/ansi/info.json | 8 | ||||
| -rw-r--r-- | keyboards/gmmk/pro/rev1/iso/info.json | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index aea22c5434..9582de5265 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define VENDOR_ID 0x320F -#define PRODUCT_ID 0x5044 -#define MANUFACTURER Glorious -#define PRODUCT GMMK Pro - /* key matrix size */ #define MATRIX_ROWS 11 #define MATRIX_COLS 8 diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json index c3e76391d1..64f63e9593 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/ansi/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "GMMK Pro (ANSI)", + "keyboard_name": "GMMK Pro ANSI", + "manufacturer": "Glorious", "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation", "maintainer": "GloriousThrall", + "usb": { + "vid": "0x320F", + "pid": "0x5044", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json index 32fac89336..3638e9d684 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "GMMK Pro (ISO)", + "keyboard_name": "GMMK Pro ISO", + "manufacturer": "Glorious", "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation", "maintainer": "GloriousThrall", + "usb": { + "vid": "0x320F", + "pid": "0x5044", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |