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/0xcb | |
| parent | 338cf71ee9a177be71c768a7b76ef3c3c8d005ec (diff) | |
| parent | c0f417911703738b3ede14b87be5c4a39db07016 (diff) | |
| download | qmk_firmware-5eb3fc255b0484062e720525202c7ba7d56779fe.tar.gz qmk_firmware-5eb3fc255b0484062e720525202c7ba7d56779fe.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/0xcb')
| -rw-r--r-- | keyboards/0xcb/1337/config.h | 7 | ||||
| -rw-r--r-- | keyboards/0xcb/1337/info.json | 8 | ||||
| -rw-r--r-- | keyboards/0xcb/static/config.h | 6 | ||||
| -rw-r--r-- | keyboards/0xcb/static/info.json | 8 |
4 files changed, 14 insertions, 15 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index d134d1ab49..3b34af6580 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" // clang-format off -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB00 -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 0xCB -#define PRODUCT 1337 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index 25899933cb..cd5993ee0d 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "0xCB 1337", + "keyboard_name": "1337", + "manufacturer": "0xCB", "url": "https://0xCB.dev", "maintainer": "Conor-Burns", + "usb": { + "vid": "0xCB00", + "pid": "0x1337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index c30450b460..9c3a0c6649 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" // clang-format off -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB00 -#define PRODUCT_ID 0xA455 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 0xCB -#define PRODUCT Static /* key matrix size */ #define MATRIX_ROWS 8 diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index 33fa8d265e..4a6232abad 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "0xCB Static", + "keyboard_name": "Static", + "manufacturer": "0xCB", "url": "https://0xCB.dev", "maintainer": "Conor-Burns", + "usb": { + "vid": "0xCB00", + "pid": "0xA455", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, |