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/xelus/rs60 | |
| parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
| parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) | |
| download | qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/xelus/rs60')
| -rw-r--r-- | keyboards/xelus/rs60/info.json | 5 | ||||
| -rw-r--r-- | keyboards/xelus/rs60/rev1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/xelus/rs60/rev1/info.json | 5 | ||||
| -rw-r--r-- | keyboards/xelus/rs60/rev2/config.h | 7 | ||||
| -rw-r--r-- | keyboards/xelus/rs60/rev2/info.json | 5 |
5 files changed, 15 insertions, 14 deletions
diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json index 3a0582fc7f..241f1cbe44 100644 --- a/keyboards/xelus/rs60/info.json +++ b/keyboards/xelus/rs60/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "RS60", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5253" + }, "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h index 23372d72eb..00fbf6712b 100644 --- a/keyboards/xelus/rs60/rev1/config.h +++ b/keyboards/xelus/rs60/rev1/config.h @@ -15,13 +15,6 @@ */ #pragma once -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5253 // RS60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT RS60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/xelus/rs60/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/xelus/rs60/rev2/config.h b/keyboards/xelus/rs60/rev2/config.h index 65ac383189..71eb5fb262 100644 --- a/keyboards/xelus/rs60/rev2/config.h +++ b/keyboards/xelus/rs60/rev2/config.h @@ -15,13 +15,6 @@ */ #pragma once -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5253 // RS60 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Xelus -#define PRODUCT RS60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/rev2/info.json b/keyboards/xelus/rs60/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/xelus/rs60/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} |