From b40c03140e5da1edac2faa2b672a84ea28d0a7c1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:05:40 +1000 Subject: Move keyboard USB IDs and strings to data driven: R (#17885) --- keyboards/rate/pistachio/config.h | 7 ------- keyboards/rate/pistachio/info.json | 8 +++++++- keyboards/rate/pistachio_mp/config.h | 7 ------- keyboards/rate/pistachio_mp/info.json | 6 ++++++ keyboards/rate/pistachio_pro/config.h | 7 ------- keyboards/rate/pistachio_pro/info.json | 6 ++++++ 6 files changed, 19 insertions(+), 22 deletions(-) (limited to 'keyboards/rate') diff --git a/keyboards/rate/pistachio/config.h b/keyboards/rate/pistachio/config.h index 5ff7b3d799..8396147b11 100644 --- a/keyboards/rate/pistachio/config.h +++ b/keyboards/rate/pistachio/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5255 -#define PRODUCT_ID 0xD0C2 -#define DEVICE_VER 0x0001 -#define MANUFACTURER rate -#define PRODUCT pistachio - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json index 8cdeb51ca3..7f9e92e484 100644 --- a/keyboards/rate/pistachio/info.json +++ b/keyboards/rate/pistachio/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Pistachio", + "keyboard_name": "pistachio", + "manufacturer": "rate", "url": "", "maintainer": "rate", + "usb": { + "vid": "0x5255", + "pid": "0xD0C2", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"ESC", "x":1.25, "y":0.25}, diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index 09b067c8ee..06db2459d2 100644 --- a/keyboards/rate/pistachio_mp/config.h +++ b/keyboards/rate/pistachio_mp/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5255 -#define PRODUCT_ID 0xE212 -#define DEVICE_VER 0x0001 -#define MANUFACTURER rate -#define PRODUCT pistachio_mp - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index d4e130300c..52c754186f 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "pistachio_mp", + "manufacturer": "rate", "url": "", "maintainer": "rate", + "usb": { + "vid": "0x5255", + "pid": "0xE212", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rate/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h index d140aa5407..40325c35eb 100644 --- a/keyboards/rate/pistachio_pro/config.h +++ b/keyboards/rate/pistachio_pro/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5255 -#define PRODUCT_ID 0xF40C -#define DEVICE_VER 0x0001 -#define MANUFACTURER rate -#define PRODUCT PistachioPro - #define ENCODERS_PAD_A {D2} #define ENCODERS_PAD_B {D3} diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json index c519a69e11..e762f30b69 100644 --- a/keyboards/rate/pistachio_pro/info.json +++ b/keyboards/rate/pistachio_pro/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "PistachioPro", + "manufacturer": "rate", "url": "https://rates.booth.pm/items/2925303", "maintainer": "rate", + "usb": { + "vid": "0x5255", + "pid": "0xF40C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3