From a8744b163074457253da2c63affd3b4cceefe04a Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:12:37 +1000 Subject: Move keyboard USB IDs and strings to data driven: S (#17889) --- keyboards/sawnsprojects/amber80/solder/config.h | 7 ------- keyboards/sawnsprojects/amber80/solder/info.json | 8 +++++++- keyboards/sawnsprojects/krush/krush60/solder/config.h | 7 ------- keyboards/sawnsprojects/krush/krush60/solder/info.json | 8 +++++++- keyboards/sawnsprojects/krush/krush65/hotswap/config.h | 7 ------- keyboards/sawnsprojects/krush/krush65/hotswap/info.json | 8 +++++++- keyboards/sawnsprojects/krush/krush65/solder/config.h | 7 ------- keyboards/sawnsprojects/krush/krush65/solder/info.json | 8 +++++++- keyboards/sawnsprojects/satxri6key/config.h | 7 ------- keyboards/sawnsprojects/satxri6key/info.json | 6 ++++++ keyboards/sawnsprojects/vcl65/solder/config.h | 7 ------- keyboards/sawnsprojects/vcl65/solder/info.json | 8 +++++++- 12 files changed, 41 insertions(+), 47 deletions(-) (limited to 'keyboards/sawnsprojects') diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h index 90c9bc522c..2452804ff0 100644 --- a/keyboards/sawnsprojects/amber80/solder/config.h +++ b/keyboards/sawnsprojects/amber80/solder/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0xA801 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects X Yuutsu X Zlane -#define PRODUCT Amber80 Solder - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json index 49ca20594c..a04fa2f716 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Amber80 SOLDER", + "keyboard_name": "Amber80 Solder", + "manufacturer": "SawnsProjects X Yuutsu X Zlane", "url": "", "maintainer": "SawnsProjects", + "usb": { + "vid": "0x5350", + "pid": "0xA801", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h index 4cd1a1b39c..66283bff69 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x6B32 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects -#define PRODUCT Krush60 - Solder - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index d95c475509..d3de2e9000 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Krush60 Solder", + "keyboard_name": "Krush60 - Solder", + "manufacturer": "SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x6B32", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs", "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan" diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index ebf8cbf740..c48080d59f 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x5B31 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects -#define PRODUCT Krush65 - Hotswap - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 2e54420137..b70ecd9ddd 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Krush65 Hotswap", + "keyboard_name": "Krush65 - Hotswap", + "manufacturer": "SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x5B31", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index 1afab16a0e..1638e35ac6 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x6B31 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects -#define PRODUCT Krush65 - Solder - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index b72946bf55..c7ab169977 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Krush65 Solder", + "keyboard_name": "Krush65 - Solder", + "manufacturer": "SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x6B31", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs_sp" }, diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h index 5ad3f20093..077b18d0d8 100644 --- a/keyboards/sawnsprojects/satxri6key/config.h +++ b/keyboards/sawnsprojects/satxri6key/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x0727 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MaiTheSan -#define PRODUCT Satxri6key - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index 77897e179c..a158fff7d2 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Satxri6key", + "manufacturer": "MaiTheSan", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5350", + "pid": "0x0727", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h index bf1a7cdde6..cec49e65ae 100644 --- a/keyboards/sawnsprojects/vcl65/solder/config.h +++ b/keyboards/sawnsprojects/vcl65/solder/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x1727 -#define DEVICE_VER 0x0001 -#define MANUFACTURER VCL x SawnsProjects -#define PRODUCT VCL65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json index bae3093b4f..982a09d953 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "VCL65 Solder", + "keyboard_name": "VCL65", + "manufacturer": "VCL x SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x1727", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.1