summaryrefslogtreecommitdiff
path: root/keyboards/massdrop
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-03 07:16:28 +0000
committerQMK Bot <hello@qmk.fm>2022-08-03 07:16:28 +0000
commitd4f9eb5225feb7f2aad01d252b33401e3a80b870 (patch)
treef3b1f76a8d715e7c4f63d18f9fc3ae65141eb1fb /keyboards/massdrop
parentbce4fb45748bacc8cb21cb61687d9bfd9faa4494 (diff)
parent3da6575e2480d46399be01c21270c57420e0f16d (diff)
downloadqmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.tar.gz
qmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/massdrop')
-rw-r--r--keyboards/massdrop/thekey/config.h7
-rw-r--r--keyboards/massdrop/thekey/info.json6
-rw-r--r--keyboards/massdrop/thekey_v2/config.h7
-rw-r--r--keyboards/massdrop/thekey_v2/info.json6
4 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h
index a195628203..c9608fab7a 100644
--- a/keyboards/massdrop/thekey/config.h
+++ b/keyboards/massdrop/thekey/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Drop
-#define PRODUCT The Key
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 3
diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json
index ac4c17e8c8..437b5d7409 100644
--- a/keyboards/massdrop/thekey/info.json
+++ b/keyboards/massdrop/thekey/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "The Key",
+ "manufacturer": "Drop",
"url": "https://drop.com/buy/stack-overflow-the-key-macropad",
"maintainer": "massdrop",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h
index 9b6235998b..f7abf7bc82 100644
--- a/keyboards/massdrop/thekey_v2/config.h
+++ b/keyboards/massdrop/thekey_v2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Drop
-#define PRODUCT The Key V2
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 3
diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json
index 7167d5cf6d..a808f37637 100644
--- a/keyboards/massdrop/thekey_v2/info.json
+++ b/keyboards/massdrop/thekey_v2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "The Key V2",
+ "manufacturer": "Drop",
"url": "https://drop.com/buy/stack-overflow-the-key-v2-macropad",
"maintainer": "massdrop",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [