diff options
author | QMK Bot <hello@qmk.fm> | 2022-03-13 23:55:18 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-03-13 23:55:18 +0000 |
commit | 5eb3fc255b0484062e720525202c7ba7d56779fe (patch) | |
tree | 59b092eb555eb8bda8aa49dd2783ec7386ef5812 /keyboards/25keys | |
parent | 338cf71ee9a177be71c768a7b76ef3c3c8d005ec (diff) | |
parent | c0f417911703738b3ede14b87be5c4a39db07016 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/25keys')
-rw-r--r-- | keyboards/25keys/cassette42/config.h | 8 | ||||
-rw-r--r-- | keyboards/25keys/cassette42/info.json | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h index cac03f6346..71621695f4 100644 --- a/keyboards/25keys/cassette42/config.h +++ b/keyboards/25keys/cassette42/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xCA42 -#define DEVICE_VER 0x0001 -#define MANUFACTURER monksoffunk -#define PRODUCT cassette42 - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 6 diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json index 87c67df951..4fe088f9e6 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "cassette42", - "url": "http://www.sho-k.co.uk/tech/1246.html", - "maintainer": "monksoffunk", + "keyboard_name": "cassette42", + "manufacturer": "monksoffunk", + "url": "http://www.sho-k.co.uk/tech/1246.html", + "maintainer": "monksoffunk", + "usb": { + "vid": "0xFEED", + "pid": "0xCA42", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}] |