From 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:42:49 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) --- keyboards/primekb/prime_e/config.h | 4 ---- keyboards/primekb/prime_e/info.json | 5 ++++- keyboards/primekb/prime_e/rgb/config.h | 5 ----- keyboards/primekb/prime_e/rgb/info.json | 7 +++++++ keyboards/primekb/prime_e/std/config.h | 5 ----- keyboards/primekb/prime_e/std/info.json | 7 +++++++ keyboards/primekb/prime_l/config.h | 4 ---- keyboards/primekb/prime_l/info.json | 5 ++++- keyboards/primekb/prime_l/v1/config.h | 5 ----- keyboards/primekb/prime_l/v1/info.json | 6 +++++- keyboards/primekb/prime_l/v2/config.h | 5 ----- keyboards/primekb/prime_l/v2/info.json | 4 ++++ 12 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 keyboards/primekb/prime_e/rgb/info.json create mode 100644 keyboards/primekb/prime_e/std/info.json (limited to 'keyboards/primekb') diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h index 343a9dc0bf..f1bd0090c7 100644 --- a/keyboards/primekb/prime_e/config.h +++ b/keyboards/primekb/prime_e/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5052 -#define MANUFACTURER PrimeKB - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index ee83f1bcbc..25f14ee9ce 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Prime_E", + "manufacturer": "PrimeKB", "url": "https://www.primekb.com", "maintainer": "holtenc", + "usb": { + "vid": "0x5052" + }, "layouts": { "LAYOUT": { "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1}, diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h index a562ffba81..89cf43902c 100644 --- a/keyboards/primekb/prime_e/rgb/config.h +++ b/keyboards/primekb/prime_e/rgb/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0052 -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_E RGB - #define RGB_DI_PIN B7 #define RGBLED_NUM 8 #define RGBLIGHT_ANIMATIONS diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json new file mode 100644 index 0000000000..1d40389e87 --- /dev/null +++ b/keyboards/primekb/prime_e/rgb/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Prime_E RGB", + "usb": { + "pid": "0x0052", + "device_version": "0.0.1" + } +} diff --git a/keyboards/primekb/prime_e/std/config.h b/keyboards/primekb/prime_e/std/config.h index a711e35b21..d6b242e08e 100644 --- a/keyboards/primekb/prime_e/std/config.h +++ b/keyboards/primekb/prime_e/std/config.h @@ -19,10 +19,5 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0051 -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_E - #define BACKLIGHT_PIN B7 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/info.json new file mode 100644 index 0000000000..04f8842546 --- /dev/null +++ b/keyboards/primekb/prime_e/std/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Prime_E", + "usb": { + "pid": "0x0051", + "device_version": "0.0.1" + } +} diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h index 92cbe3f664..f6084f3280 100644 --- a/keyboards/primekb/prime_l/config.h +++ b/keyboards/primekb/prime_l/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5052 -#define MANUFACTURER PrimeKB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json index ac537202f3..88a2cdb065 100644 --- a/keyboards/primekb/prime_l/info.json +++ b/keyboards/primekb/prime_l/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Prime_L", + "manufacturer": "PrimeKB", "url": "https://www.primekb.com", "maintainer": "MxBlu", + "usb": { + "vid": "0x5052" + }, "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/primekb/prime_l/v1/config.h b/keyboards/primekb/prime_l/v1/config.h index afa8c62460..6c691a58ad 100644 --- a/keyboards/primekb/prime_l/v1/config.h +++ b/keyboards/primekb/prime_l/v1/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x504C -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_L V1 - /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 } #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json index ac537202f3..628aa67c10 100644 --- a/keyboards/primekb/prime_l/v1/info.json +++ b/keyboards/primekb/prime_l/v1/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Prime_L", + "keyboard_name": "Prime_L V1", "url": "https://www.primekb.com", "maintainer": "MxBlu", + "usb": { + "pid": "0x504C", + "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/primekb/prime_l/v2/config.h b/keyboards/primekb/prime_l/v2/config.h index 1386a127fe..4aef7b076c 100644 --- a/keyboards/primekb/prime_l/v2/config.h +++ b/keyboards/primekb/prime_l/v2/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x5042 -#define DEVICE_VER 0x0002 -#define PRODUCT Prime_L V2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/info.json index b8033eae30..7199de33f6 100644 --- a/keyboards/primekb/prime_l/v2/info.json +++ b/keyboards/primekb/prime_l/v2/info.json @@ -2,6 +2,10 @@ "keyboard_name": "Prime_L V2", "url": "https://www.primekb.com", "maintainer": "HoltenC", + "usb": { + "pid": "0x5042", + "device_version": "0.0.2" + }, "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}, -- cgit v1.2.3