diff options
author | Drashna Jael're <drashna@live.com> | 2022-07-25 10:15:47 -0700 |
---|---|---|
committer | Drashna Jael're <drashna@live.com> | 2022-07-25 10:15:47 -0700 |
commit | 99c48f1361116a749f97e039e468068948bf6bed (patch) | |
tree | 031ac477f844e43ed403e6596f076495df292d48 /keyboards/bastardkb | |
parent | 7d2260ab75e1394930ba50463b1389aed06d0725 (diff) | |
parent | 1df6322f1076280dcc5214ba84c2c367e9d91e55 (diff) | |
download | qmk_firmware-99c48f1361116a749f97e039e468068948bf6bed.tar.gz qmk_firmware-99c48f1361116a749f97e039e468068948bf6bed.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb')
-rw-r--r-- | keyboards/bastardkb/scylla/info.json | 7 | ||||
-rw-r--r-- | keyboards/bastardkb/skeletyl/info.json | 7 | ||||
-rw-r--r-- | keyboards/bastardkb/tbk/config.h | 5 | ||||
-rw-r--r-- | keyboards/bastardkb/tbk/info.json | 6 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/info.json | 7 |
5 files changed, 24 insertions, 8 deletions
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json index 026b0f742e..1d3dd39030 100644 --- a/keyboards/bastardkb/scylla/info.json +++ b/keyboards/bastardkb/scylla/info.json @@ -1,7 +1,12 @@ { - "url": "https://bastardkb.com/scylla", + "keyboard_name": "Scylla", + "manufacturer": "Bastard Keyboards", + "url": "https://bastardkb.com/", + "maintainer": "Quentin Lebastard", "usb": { + "vid": "0xA8F8", "pid": "0x1829", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_split_4x6_5": { diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index bafc97294b..c06e23ba22 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json @@ -1,7 +1,12 @@ { - "url": "https://bastardkb.com/skeletyl", + "keyboard_name": "Skeletyl", + "manufacturer": "Bastard Keyboards", + "url": "https://www.bastardkb.com", + "maintainer": "Quentin Lebastard", "usb": { + "vid": "0xA8F8", "pid": "0x1830", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h index f6e3ebef7b..9ce37939b5 100644 --- a/keyboards/bastardkb/tbk/config.h +++ b/keyboards/bastardkb/tbk/config.h @@ -17,11 +17,6 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1828 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT The Bastard Keyboard #define MATRIX_ROWS 10 #define MATRIX_COLS 6 diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 104932e471..d16014c48a 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "The Bastard Keyboard", + "manufacturer": "Bastard Keyboards", "url": "https://bastardkb.com/", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1828", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_4x6_5": { "layout": [ diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index d46ddb8dab..549879328b 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -1,7 +1,12 @@ { - "url": "https://bastardkb.com/tbk-mini", + "keyboard_name": "TBK Mini", + "manufacturer": "Bastard Keyboards", + "url": "https://www.bastardkb.com", + "maintainer": "Quentin Lebastard", "usb": { + "vid": "0xA8F8", "pid": "0x1828", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_split_3x6_3": { |