diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-03 22:06:14 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-03 22:06:14 +0000 |
| commit | 237039cdcd896e7a99e58db92d193c5ff7a2dc33 (patch) | |
| tree | 35144bfd16a200e2697a6f2ae3db3513834f2ac5 /keyboards/rominronin/katana60 | |
| parent | c6a6f987c93c424fc31e090737e4c7b8af728856 (diff) | |
| parent | b40c03140e5da1edac2faa2b672a84ea28d0a7c1 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/rominronin/katana60')
| -rw-r--r-- | keyboards/rominronin/katana60/rev1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/rominronin/katana60/rev1/info.json | 6 | ||||
| -rw-r--r-- | keyboards/rominronin/katana60/rev2/config.h | 7 | ||||
| -rw-r--r-- | keyboards/rominronin/katana60/rev2/info.json | 6 |
4 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h index fea2d7d643..e7f7d92016 100644 --- a/keyboards/rominronin/katana60/rev1/config.h +++ b/keyboards/rominronin/katana60/rev1/config.h @@ -19,13 +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 0x7272 // "rr" - rominronin -#define PRODUCT_ID 0x0C2C -#define DEVICE_VER 0x0001 -#define MANUFACTURER RominRonin CandyKeys -#define PRODUCT Katana60 rev1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json index 8ac62a68e3..1b4ec3c943 100644 --- a/keyboards/rominronin/katana60/rev1/info.json +++ b/keyboards/rominronin/katana60/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Katana60 rev1", + "manufacturer": "RominRonin CandyKeys", "url": "", "maintainer": "rominronin", + "usb": { + "vid": "0x7272", + "pid": "0x0C2C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h index 24984c8179..e1441acdfc 100644 --- a/keyboards/rominronin/katana60/rev2/config.h +++ b/keyboards/rominronin/katana60/rev2/config.h @@ -19,13 +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 0x7272 // "rr" - rominronin -#define PRODUCT_ID 0xF03B -#define DEVICE_VER 0x0001 -#define MANUFACTURER RominRonin CandyKeys -#define PRODUCT Katana60 rev2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json index e2ac51024f..3b26ff635e 100644 --- a/keyboards/rominronin/katana60/rev2/info.json +++ b/keyboards/rominronin/katana60/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Katana60 rev2", + "manufacturer": "RominRonin CandyKeys", "url": "https://candykeys.com/product/katana60-pcb-V2", "maintainer": "rominronin", + "usb": { + "vid": "0x7272", + "pid": "0xF03B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_7u_a": { "layout": [ |