summaryrefslogtreecommitdiff
path: root/keyboards/canary
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-08-14 01:54:23 -0700
committerDrashna Jael're <drashna@live.com>2022-08-14 01:54:23 -0700
commitac31e429741a640b0d03d2ebd76554b7fe9247e0 (patch)
tree8d21aa6f2b7e0c3ee75b37e4f2edb1ae010db525 /keyboards/canary
parente948fa6f6e184a3c9a317a7aa680e33e7629b0d4 (diff)
parent4195eb8fe1de39855b622ee282950c10fdbf0988 (diff)
downloadqmk_firmware-ac31e429741a640b0d03d2ebd76554b7fe9247e0.tar.gz
qmk_firmware-ac31e429741a640b0d03d2ebd76554b7fe9247e0.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/canary')
-rw-r--r--keyboards/canary/canary60rgb/info.json6
-rw-r--r--keyboards/canary/canary60rgb/v1/config.h7
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index e8cc4c0fe5..4dd97319b3 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "CANARY60RGB",
+ "manufacturer": "CANARY",
"url": "",
"maintainer": "tuananhnguyen204",
+ "usb": {
+ "vid": "0x4341",
+ "pid": "0x0621",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 3d2dd81d88..8d3150a5d9 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -15,13 +15,6 @@
*/
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4341
-#define PRODUCT_ID 0x0621
-#define DEVICE_VER 0x0001
-#define MANUFACTURER CANARY
-#define PRODUCT CANARY60RGB
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14