diff options
author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
---|---|---|
committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/ck60i | |
parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/ck60i')
-rw-r--r-- | keyboards/ck60i/config.h | 7 | ||||
-rw-r--r-- | keyboards/ck60i/info.json | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h index 3e09f1dfb0..49a530b1d3 100644 --- a/keyboards/ck60i/config.h +++ b/keyboards/ck60i/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x434B // CK for candykeys -#define PRODUCT_ID 0x6049 // 60i -#define DEVICE_VER 0x0001 // Revision pre-Alpha -#define MANUFACTURER CandyKeys -#define PRODUCT CK60i - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json index f0a81eb62b..dd5230e5eb 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "CK60i", + "manufacturer": "CandyKeys", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x434B", + "pid": "0x6049", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |