diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
| commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
| tree | 1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/splitkb | |
| parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
| parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/splitkb')
| -rw-r--r-- | keyboards/splitkb/kyria/info.json | 6 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/info.json | 6 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev2/config.h | 7 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev2/info.json | 6 |
5 files changed, 17 insertions, 15 deletions
diff --git a/keyboards/splitkb/kyria/info.json b/keyboards/splitkb/kyria/info.json index d362e4ad72..2bc52803b0 100644 --- a/keyboards/splitkb/kyria/info.json +++ b/keyboards/splitkb/kyria/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Kyria", + "manufacturer": "splitkb", "url": "https://splitkb.com", "maintainer": "splitkb.com", + "usb": { + "vid": "0x8D1D", + "pid": "0x9D9D" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 87ec1021bf..f6f9a98c3e 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/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 0x8D1D -#define PRODUCT_ID 0x9D9D -#define DEVICE_VER 0x0001 -#define MANUFACTURER splitkb -#define PRODUCT Kyria rev1 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json new file mode 100644 index 0000000000..8e34af43f5 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kyria rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 15e4e7bd3b..6af99e0a7c 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/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 0x8D1D -#define PRODUCT_ID 0x9D9D -#define DEVICE_VER 0x0002 -#define MANUFACTURER splitkb -#define PRODUCT Kyria rev2 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json new file mode 100644 index 0000000000..7ff56b321a --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kyria rev2", + "usb": { + "device_version": "0.0.2" + } +} |