diff options
| author | QMK Bot <hello@qmk.fm> | 2022-07-27 19:19:51 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-07-27 19:19:51 +0000 |
| commit | ed5351d75e767cdbe53c0d21d589e29b3a3ba4ad (patch) | |
| tree | 556dd4e9f3f73062ff8e8a2f821355cec784002b /keyboards/gon | |
| parent | 602fde61e22501c839ec55da54974edad6457e68 (diff) | |
| parent | 4a0eb733acf2efb66473046f174ad695f746ab24 (diff) | |
| download | qmk_firmware-ed5351d75e767cdbe53c0d21d589e29b3a3ba4ad.tar.gz qmk_firmware-ed5351d75e767cdbe53c0d21d589e29b3a3ba4ad.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/gon')
| -rw-r--r-- | keyboards/gon/nerd60/config.h | 7 | ||||
| -rw-r--r-- | keyboards/gon/nerd60/info.json | 8 | ||||
| -rw-r--r-- | keyboards/gon/nerdtkl/config.h | 7 | ||||
| -rw-r--r-- | keyboards/gon/nerdtkl/info.json | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index 5e2fe57327..85dfe0a339 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4E45 // NE -#define PRODUCT_ID 0x3630 // 60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER GON -#define PRODUCT NerD 60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 66db3f1185..baf67fe528 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "GON NerD 60", + "keyboard_name": "NerD 60", + "manufacturer": "GON", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4E45", + "pid": "0x3630", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h index 74d67f30d4..ec2cbc8a32 100644 --- a/keyboards/gon/nerdtkl/config.h +++ b/keyboards/gon/nerdtkl/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4E45 // NE -#define PRODUCT_ID 0x5244 // RD -#define DEVICE_VER 0x0001 -#define MANUFACTURER GON -#define PRODUCT NerD TKL - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index 45155fd737..1af13bf237 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "GON NerD TKL", + "keyboard_name": "NerD TKL", + "manufacturer": "GON", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4E45", + "pid": "0x5244", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl": { "layout": [ |