diff options
author | Ryan <fauxpark@gmail.com> | 2022-08-03 17:03:47 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-03 17:03:47 +1000 |
commit | 1b92c204c10594fce6a715710c277a748a4fdc68 (patch) | |
tree | 0b238d2ae2b06f29ad9e0db04e698b39d259e689 /keyboards/kiwikey | |
parent | ce9bb6d39bd1a0a3622dc95b9819f1ef5b33daf7 (diff) | |
download | qmk_firmware-1b92c204c10594fce6a715710c277a748a4fdc68.tar.gz qmk_firmware-1b92c204c10594fce6a715710c277a748a4fdc68.zip |
Move keyboard USB IDs and strings to data driven: K (#17846)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'keyboards/kiwikey')
-rw-r--r-- | keyboards/kiwikey/borderland/config.h | 7 | ||||
-rw-r--r-- | keyboards/kiwikey/borderland/info.json | 6 | ||||
-rw-r--r-- | keyboards/kiwikey/kawii9/config.h | 7 | ||||
-rw-r--r-- | keyboards/kiwikey/kawii9/info.json | 6 | ||||
-rw-r--r-- | keyboards/kiwikey/wanderland/config.h | 7 | ||||
-rw-r--r-- | keyboards/kiwikey/wanderland/info.json | 6 |
6 files changed, 18 insertions, 21 deletions
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h index 648c3a88de..350245d1c3 100644 --- a/keyboards/kiwikey/borderland/config.h +++ b/keyboards/kiwikey/borderland/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B57 // KW - KiwiKey -#define PRODUCT_ID 0x424C // BL - Borderland -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKey -#define PRODUCT Borderland - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json index c92df0521d..2123268c2e 100644 --- a/keyboards/kiwikey/borderland/info.json +++ b/keyboards/kiwikey/borderland/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Borderland", + "manufacturer": "KiwiKey", "url": "https://kiwikey.vn/borderland/", "maintainer": "KiwiKey", + "usb": { + "vid": "0x4B57", + "pid": "0x424C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h index 59adcd253e..9f98ca1926 100644 --- a/keyboards/kiwikey/kawii9/config.h +++ b/keyboards/kiwikey/kawii9/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 0x4B57 // KW - KiwiKey -#define PRODUCT_ID 0x0303 // 3x3 -#define DEVICE_VER 0x0002 -#define MANUFACTURER KiwiKey -#define PRODUCT Kawii9 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json index 367f402f7b..ad8ae3679a 100644 --- a/keyboards/kiwikey/kawii9/info.json +++ b/keyboards/kiwikey/kawii9/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kawii9", + "manufacturer": "KiwiKey", "url": "http://kiwikey.vn/kawii9/", "maintainer": "KiwiKey", + "usb": { + "vid": "0x4B57", + "pid": "0x0303", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h index e0b9ba8946..4107d5717a 100644 --- a/keyboards/kiwikey/wanderland/config.h +++ b/keyboards/kiwikey/wanderland/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 0x4B57 // KW - KiwiKey -#define PRODUCT_ID 0x574C // WL - Wanderland -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKey -#define PRODUCT Wanderland - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 13 diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json index 01196c3418..92dfb2fff6 100644 --- a/keyboards/kiwikey/wanderland/info.json +++ b/keyboards/kiwikey/wanderland/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Wanderland", + "manufacturer": "KiwiKey", "url": "http://kiwikey.vn/wanderland", "maintainer": "KiwiKey", + "usb": { + "vid": "0x4B57", + "pid": "0x574C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ |