diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-21 22:09:30 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-21 22:09:30 +0000 |
| commit | e36ae90a651df6ccad5f6d125135ee0240a01f02 (patch) | |
| tree | 834b7f0b4bdbe09730574948837d56f0aca7a111 /keyboards/massdrop | |
| parent | 51e4e91285722fd9fc93eaa4617dfa7501b5ddf0 (diff) | |
| parent | b0eda7701a372e820264c6a78afa1f8c410845f7 (diff) | |
| download | qmk_firmware-e36ae90a651df6ccad5f6d125135ee0240a01f02.tar.gz qmk_firmware-e36ae90a651df6ccad5f6d125135ee0240a01f02.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/massdrop')
| -rw-r--r-- | keyboards/massdrop/alt/config.h | 4 | ||||
| -rw-r--r-- | keyboards/massdrop/alt/info.json | 5 | ||||
| -rw-r--r-- | keyboards/massdrop/ctrl/config.h | 4 | ||||
| -rw-r--r-- | keyboards/massdrop/ctrl/info.json | 5 |
4 files changed, 10 insertions, 8 deletions
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h index 127b07d223..2a3b5b3311 100644 --- a/keyboards/massdrop/alt/config.h +++ b/keyboards/massdrop/alt/config.h @@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEED3 -#define DEVICE_VER 0x0101 - #define MANUFACTURER "Massdrop Inc." #define PRODUCT "ALT Keyboard" #define SERIAL_NUM "Unavailable" diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json index 9a820661bc..909ca8904a 100644 --- a/keyboards/massdrop/alt/info.json +++ b/keyboards/massdrop/alt/info.json @@ -2,6 +2,11 @@ "keyboard_name": "ALT", "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard", "maintainer": "Massdrop", + "usb": { + "vid": "0x04D8", + "pid": "0xEED3", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h index 27f3d935a9..8b8625e700 100644 --- a/keyboards/massdrop/ctrl/config.h +++ b/keyboards/massdrop/ctrl/config.h @@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEED2 -#define DEVICE_VER 0x0101 - #define MANUFACTURER "Massdrop Inc." #define PRODUCT "CTRL Keyboard" #define SERIAL_NUM "Unavailable" diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json index 00d74be021..7d0810c630 100644 --- a/keyboards/massdrop/ctrl/info.json +++ b/keyboards/massdrop/ctrl/info.json @@ -2,6 +2,11 @@ "keyboard_name": "CTRL", "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard", "maintainer": "Massdrop", + "usb": { + "vid": "0x04D8", + "pid": "0xEED2", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |