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/skeletn87/hotswap/config.h | 7 ------- keyboards/skeletn87/hotswap/info.json | 8 +++++++- keyboards/skeletn87/soldered/config.h | 7 ------- keyboards/skeletn87/soldered/info.json | 8 +++++++- 4 files changed, 14 insertions(+), 16 deletions(-) (limited to 'keyboards/skeletn87') diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 059daa0392..781eb23a7e 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF984 -#define PRODUCT_ID 0xB5E9 -#define DEVICE_VER 0x0001 -#define MANUFACTURER BredWorks -#define PRODUCT Skeletn87 Hotswap - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index 9878d6d194..a310bb260b 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "skeletn87 hotswap", + "keyboard_name": "Skeletn87 Hotswap", + "manufacturer": "BredWorks", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0xF984", + "pid": "0xB5E9", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index 7580d0a43e..3b5ce9692a 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF984 -#define PRODUCT_ID 0xB5E8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER BredWorks -#define PRODUCT Skeletn87 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index e3d8c6d999..c62f4e559e 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "skeletn87", + "keyboard_name": "Skeletn87", + "manufacturer": "BredWorks", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0xF984", + "pid": "0xB5E8", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.3 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/skeletn87/hotswap/config.h | 1 - keyboards/skeletn87/soldered/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/skeletn87') diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 781eb23a7e..de3df5afbf 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index 3b5ce9692a..db7c1ab7a4 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3