From 201f1a8f47570c83569d1b0f4851b2fddf996fe7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:48:38 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093) --- keyboards/westm/westm68/config.h | 6 ------ keyboards/westm/westm68/info.json | 5 +++++ keyboards/westm/westm68/rev1/config.h | 2 -- keyboards/westm/westm68/rev1/info.json | 5 +++++ keyboards/westm/westm68/rev2/config.h | 2 -- keyboards/westm/westm68/rev2/info.json | 5 +++++ keyboards/westm/westm9/config.h | 6 ------ keyboards/westm/westm9/info.json | 5 +++++ keyboards/westm/westm9/rev1/config.h | 2 -- keyboards/westm/westm9/rev1/info.json | 5 +++++ keyboards/westm/westm9/rev2/config.h | 2 -- keyboards/westm/westm9/rev2/info.json | 5 +++++ 12 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 keyboards/westm/westm68/rev1/info.json create mode 100644 keyboards/westm/westm68/rev2/info.json create mode 100644 keyboards/westm/westm9/rev1/info.json create mode 100644 keyboards/westm/westm9/rev2/info.json (limited to 'keyboards/westm') diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h index 96534c80c7..1d4d028e9f 100644 --- a/keyboards/westm/westm68/config.h +++ b/keyboards/westm/westm68/config.h @@ -21,12 +21,6 @@ /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x574D // WM -#define DEVICE_VER 0x0001 -#define MANUFACTURER WestM -#define PRODUCT WestM68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json index 58378c1b43..f7f67d45a0 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "WestM68", + "manufacturer": "WestM", "url": "https://github.com/WestMProducts", "maintainer": "WestM", + "usb": { + "vid": "0x574D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h index 488d644c3e..054b47cca2 100644 --- a/keyboards/westm/westm68/rev1/config.h +++ b/keyboards/westm/westm68/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0101 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN A8 #define RGBLED_NUM 16 diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json new file mode 100644 index 0000000000..a4736b30a4 --- /dev/null +++ b/keyboards/westm/westm68/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0101" + } +} diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h index 94ce14d3f9..054b47cca2 100644 --- a/keyboards/westm/westm68/rev2/config.h +++ b/keyboards/westm/westm68/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0102 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN A8 #define RGBLED_NUM 16 diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json new file mode 100644 index 0000000000..0b36e6dd58 --- /dev/null +++ b/keyboards/westm/westm68/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0102" + } +} diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h index 4175b5b3f8..6d0bf729ac 100644 --- a/keyboards/westm/westm9/config.h +++ b/keyboards/westm/westm9/config.h @@ -21,12 +21,6 @@ /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x574D // WM -#define DEVICE_VER 0x0001 -#define MANUFACTURER WestM -#define PRODUCT WestM9 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 5c36e74ab4..3beb8b232f 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "WestM9", + "manufacturer": "WestM", "url": "https://github.com/WestMProducts", "maintainer": "WestM", + "usb": { + "vid": "0x574D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_macropad": { "layout": [ diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h index 48ed5d6869..fcc9ddb99d 100644 --- a/keyboards/westm/westm9/rev1/config.h +++ b/keyboards/westm/westm9/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0301 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN F1 #define RGBLED_NUM 14 diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json new file mode 100644 index 0000000000..9934337227 --- /dev/null +++ b/keyboards/westm/westm9/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0301" + } +} diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h index 84a7589360..fcc9ddb99d 100644 --- a/keyboards/westm/westm9/rev2/config.h +++ b/keyboards/westm/westm9/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0302 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN F1 #define RGBLED_NUM 14 diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json new file mode 100644 index 0000000000..3b2f219948 --- /dev/null +++ b/keyboards/westm/westm9/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0302" + } +} -- cgit v1.2.3