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/tokyokeyboard/tokyo60 | |
| 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/tokyokeyboard/tokyo60')
| -rw-r--r-- | keyboards/tokyokeyboard/tokyo60/config.h | 8 | ||||
| -rw-r--r-- | keyboards/tokyokeyboard/tokyo60/info.json | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index 03dee74e9b..ab36ab7354 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5436 // "T6" -#define PRODUCT_ID 0x6060 // Tokyo60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Tokyo Keyboard -#define PRODUCT Tokyo60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 @@ -31,7 +24,6 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3 } -#define UNUSED_PINS /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index 3f6b120c17..b6422e68c7 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tokyo60", + "manufacturer": "Tokyo Keyboard", "url": "https://tokyokeyboard.com/", "maintainer": "qmk", + "usb": { + "vid": "0x5436", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_hhkb": { "layout": [{ |