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/senselessclay/ck60/config.h | 7 ------- keyboards/senselessclay/ck60/info.json | 6 ++++++ keyboards/senselessclay/ck65/config.h | 7 ------- keyboards/senselessclay/ck65/info.json | 6 ++++++ keyboards/senselessclay/gos65/config.h | 7 ------- keyboards/senselessclay/gos65/info.json | 6 ++++++ keyboards/senselessclay/had60/config.h | 7 ------- keyboards/senselessclay/had60/info.json | 6 ++++++ 8 files changed, 24 insertions(+), 28 deletions(-) (limited to 'keyboards/senselessclay') diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h index dc2cb68c79..ea48db4e15 100644 --- a/keyboards/senselessclay/ck60/config.h +++ b/keyboards/senselessclay/ck60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x0601 // 60rgb (1) -#define DEVICE_VER 0x0000 // rev0 -#define MANUFACTURER senselessclay -#define PRODUCT ck60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json index 55a7e95b46..27088f2785 100644 --- a/keyboards/senselessclay/ck60/info.json +++ b/keyboards/senselessclay/ck60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "CK60", + "manufacturer": "senselessclay", "url": "https://candykeys.com", "maintainer": "had-i", + "usb": { + "vid": "0x4849", + "pid": "0x0601", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60_iso" }, diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h index f23560f164..2038c58f44 100644 --- a/keyboards/senselessclay/ck65/config.h +++ b/keyboards/senselessclay/ck65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x0651 // 65rgb (1) -#define DEVICE_VER 0x0000 // rev0 -#define MANUFACTURER senselessclay -#define PRODUCT ck65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json index c1dcf3cebd..54e43ccc94 100644 --- a/keyboards/senselessclay/ck65/info.json +++ b/keyboards/senselessclay/ck65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "CK65", + "manufacturer": "senselessclay", "url": "https://candykeys.com", "maintainer": "had-i", + "usb": { + "vid": "0x4849", + "pid": "0x0651", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_iso" }, diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h index 5656d77ea5..972befc147 100644 --- a/keyboards/senselessclay/gos65/config.h +++ b/keyboards/senselessclay/gos65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x0650 // 65rgb (0) -#define DEVICE_VER 0x0001 // rev1 -#define MANUFACTURER senselessclay -#define PRODUCT gos65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index 95f0960a47..6bad2ae556 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "gos65", + "manufacturer": "senselessclay", "url": "https://senselessclay.com/", "maintainer": "hadi", + "usb": { + "vid": "0x4849", + "pid": "0x0650", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h index 60a4b23d02..ba4619b956 100644 --- a/keyboards/senselessclay/had60/config.h +++ b/keyboards/senselessclay/had60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x060F // 60flex -#define DEVICE_VER 0x0001 // rev1 -#define MANUFACTURER senselessclay -#define PRODUCT had60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json index a14c171d69..5dbcf2f68c 100644 --- a/keyboards/senselessclay/had60/info.json +++ b/keyboards/senselessclay/had60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "had60", + "manufacturer": "senselessclay", "url": "https://senselessclay.com/", "maintainer": "hadi", + "usb": { + "vid": "0x4849", + "pid": "0x060F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.3