diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-04 01:36:14 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-04 01:36:14 +0000 |
commit | 88cfd55b8c5073155eea272965e7ae0244777ef1 (patch) | |
tree | 71529683c6ba13f233b9433c4c1772347ad8956f /keyboards/tetris | |
parent | 4e50de3a4ba8376952eb3e97bc16346a07f47a08 (diff) | |
parent | 17176daf26ae17b8ae54312217555f1bfed782c1 (diff) | |
download | qmk_firmware-88cfd55b8c5073155eea272965e7ae0244777ef1.tar.gz qmk_firmware-88cfd55b8c5073155eea272965e7ae0244777ef1.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/tetris')
-rwxr-xr-x | keyboards/tetris/config.h | 7 | ||||
-rw-r--r-- | keyboards/tetris/info.json | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h index cfea2a72dc..fe80aefa37 100755 --- a/keyboards/tetris/config.h +++ b/keyboards/tetris/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Fengz -#define PRODUCT Tetris - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json index 6b59e2b5c0..eaae708614 100644 --- a/keyboards/tetris/info.json +++ b/keyboards/tetris/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tetris", + "manufacturer": "Fengz", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_mit": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] |