summaryrefslogtreecommitdiff
path: root/keyboards/canary
diff options
context:
space:
mode:
authorInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
committerInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
commit6afdd9d74da250e47ac64d6690bd19d037045e99 (patch)
tree661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/canary
parent93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff)
parent1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff)
downloadqmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz
qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/canary')
-rw-r--r--keyboards/canary/canary60rgb/info.json6
-rw-r--r--keyboards/canary/canary60rgb/v1/config.h8
2 files changed, 6 insertions, 8 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 f02b29c1b9..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
@@ -38,7 +31,6 @@
*/
#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW