diff options
author | QMK Bot <hello@qmk.fm> | 2022-07-25 23:04:48 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-07-25 23:04:48 +0000 |
commit | 1e651dbdb0815013da00804257df67aab5e28167 (patch) | |
tree | a9e7fe329803a6ced4e8644615ebf5b84a47e6a7 /keyboards/chlx | |
parent | 4baed8037d18d73f3937006c9f0379c3e15d6125 (diff) | |
parent | a939293aca697cb263f4972dbb1521d273fbf499 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/chlx')
-rw-r--r-- | keyboards/chlx/merro60/config.h | 7 | ||||
-rw-r--r-- | keyboards/chlx/merro60/info.json | 6 | ||||
-rw-r--r-- | keyboards/chlx/str_merro60/config.h | 7 | ||||
-rw-r--r-- | keyboards/chlx/str_merro60/info.json | 6 |
4 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h index 526433ef8f..9cf509da86 100644 --- a/keyboards/chlx/merro60/config.h +++ b/keyboards/chlx/merro60/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 0x4358 // "CX" - chlx -#define PRODUCT_ID 0x0601 -#define DEVICE_VER 0x0100 -#define MANUFACTURER chlx -#define PRODUCT chlx merro60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json index e0a697df06..95a6e9b7c8 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "merro60", + "manufacturer": "chlx", "url": "www.github.com/gaclee3b", "maintainer": "gaclee3b", + "usb": { + "vid": "0x4358", + "pid": "0x0601", + "device_version": "1.0.0" + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index b73aaa0f73..c310396030 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/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 0x4358 // "CX" - chlx -#define PRODUCT_ID 0x0602 -#define DEVICE_VER 0x0100 -#define MANUFACTURER chlx bsmt -#define PRODUCT chlx str.merro60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json index 36660fa5b4..444d2d76e6 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "str.merro60", + "manufacturer": "chlx bsmt", "url": "www.github.com/gaclee3b", "maintainer": "gaclee3b", + "usb": { + "vid": "0x4358", + "pid": "0x0602", + "device_version": "1.0.0" + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", |