Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Drashna Jael're
2022-08-14 01:54:23 -07:00
145 changed files with 789 additions and 471 deletions

View File

@@ -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": [

View File

@@ -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