From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/keycapsss/kimiko/info.json | 75 -------------------------- keyboards/keycapsss/kimiko/kimiko.h | 21 -------- keyboards/keycapsss/kimiko/rev1/config.h | 7 --- keyboards/keycapsss/kimiko/rev1/info.json | 81 ++++++++++++++++++++++++++++ keyboards/keycapsss/plaid_pad/config.h | 5 -- keyboards/keycapsss/plaid_pad/info.json | 6 ++- keyboards/keycapsss/plaid_pad/rev1/config.h | 3 -- keyboards/keycapsss/plaid_pad/rev1/info.json | 6 +++ keyboards/keycapsss/plaid_pad/rev2/config.h | 3 -- keyboards/keycapsss/plaid_pad/rev2/info.json | 6 +++ keyboards/keycapsss/plaid_pad/rev3/config.h | 3 -- keyboards/keycapsss/plaid_pad/rev3/info.json | 6 +++ 12 files changed, 104 insertions(+), 118 deletions(-) delete mode 100644 keyboards/keycapsss/kimiko/info.json create mode 100644 keyboards/keycapsss/kimiko/rev1/info.json create mode 100644 keyboards/keycapsss/plaid_pad/rev1/info.json create mode 100644 keyboards/keycapsss/plaid_pad/rev2/info.json create mode 100644 keyboards/keycapsss/plaid_pad/rev3/info.json (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/info.json b/keyboards/keycapsss/kimiko/info.json deleted file mode 100644 index 7b3749f503..0000000000 --- a/keyboards/keycapsss/kimiko/info.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "keyboard_name": "Kimiko", - "url": "https://keycapsss.com", - "maintainer": "@ben_roe Keycapsss", - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0.8}, - {"x":1, "y":0.8}, - {"x":2, "y":0.15}, - {"x":3, "y":0}, - {"x":4, "y":0.15}, - {"x":5, "y":0.3}, - {"x":9, "y":0.3}, - {"x":10, "y":0.15}, - {"x":11, "y":0}, - {"x":12, "y":0.15}, - {"x":13, "y":0.8}, - {"x":14, "y":0.8}, - - {"x":0, "y":1.8}, - {"x":1, "y":1.8}, - {"x":2, "y":1.15}, - {"x":3, "y":1}, - {"x":4, "y":1.15}, - {"x":5, "y":1.3}, - {"x":9, "y":1.3}, - {"x":10, "y":1.15}, - {"x":11, "y":1}, - {"x":12, "y":1.15}, - {"x":13, "y":1.8}, - {"x":14, "y":1.8}, - - {"x":0, "y":2.8}, - {"x":1, "y":2.8}, - {"x":2, "y":2.15}, - {"x":3, "y":2}, - {"x":4, "y":2.15}, - {"x":5, "y":2.3}, - {"x":9, "y":2.3}, - {"x":10, "y":2.15}, - {"x":11, "y":2}, - {"x":12, "y":2.15}, - {"x":13, "y":2.8}, - {"x":14, "y":2.8}, - - {"x":0, "y":3.8}, - {"x":1, "y":3.8}, - {"x":2, "y":3.15}, - {"x":3, "y":3}, - {"x":4, "y":3.15}, - {"x":5, "y":3.3}, - {"x":6.25, "y":3.3}, - {"x":7.75, "y":3.3}, - {"x":9, "y":3.3}, - {"x":10, "y":3.15}, - {"x":11, "y":3}, - {"x":12, "y":3.15}, - {"x":13, "y":3.8}, - {"x":14, "y":3.8}, - - {"x":2, "y":4.15}, - {"x":3, "y":4}, - {"x":4, "y":4.15}, - {"x":5.25, "y":4.3}, - {"x":6.25, "y":4.25, "h":1.5}, - {"x":7.75, "y":4.25, "h":1.5}, - {"x":8.75, "y":4.3}, - {"x":10, "y":4.15}, - {"x":11, "y":4}, - {"x":12, "y":4.15} - ] - } - } -} diff --git a/keyboards/keycapsss/kimiko/kimiko.h b/keyboards/keycapsss/kimiko/kimiko.h index a67496eb50..513922373e 100644 --- a/keyboards/keycapsss/kimiko/kimiko.h +++ b/keyboards/keycapsss/kimiko/kimiko.h @@ -16,24 +16,3 @@ #pragma once #include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L40, R40, R30, R31, R32, R33, R34, R35, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L41, L42, L43, L44, L45, L40 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } - diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 502eaa1e4a..5ba2fd4abf 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7983 -#define PRODUCT_ID 0x4B69 //Ki -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keycapsss -#define PRODUCT Kimiko - /* key matrix size */ // rows are doubled-up for split-keyboard #define MATRIX_ROWS 10 diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json new file mode 100644 index 0000000000..2aef1306ec --- /dev/null +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -0,0 +1,81 @@ +{ + "keyboard_name": "Kimiko", + "manufacturer": "Keycapsss", + "url": "https://keycapsss.com", + "maintainer": "@ben_roe Keycapsss", + "usb": { + "vid": "0x7983", + "pid": "0x4B69", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0.8}, + {"x":1, "y":0.8}, + {"x":2, "y":0.15}, + {"x":3, "y":0}, + {"x":4, "y":0.15}, + {"x":5, "y":0.3}, + {"x":9, "y":0.3}, + {"x":10, "y":0.15}, + {"x":11, "y":0}, + {"x":12, "y":0.15}, + {"x":13, "y":0.8}, + {"x":14, "y":0.8}, + + {"x":0, "y":1.8}, + {"x":1, "y":1.8}, + {"x":2, "y":1.15}, + {"x":3, "y":1}, + {"x":4, "y":1.15}, + {"x":5, "y":1.3}, + {"x":9, "y":1.3}, + {"x":10, "y":1.15}, + {"x":11, "y":1}, + {"x":12, "y":1.15}, + {"x":13, "y":1.8}, + {"x":14, "y":1.8}, + + {"x":0, "y":2.8}, + {"x":1, "y":2.8}, + {"x":2, "y":2.15}, + {"x":3, "y":2}, + {"x":4, "y":2.15}, + {"x":5, "y":2.3}, + {"x":9, "y":2.3}, + {"x":10, "y":2.15}, + {"x":11, "y":2}, + {"x":12, "y":2.15}, + {"x":13, "y":2.8}, + {"x":14, "y":2.8}, + + {"x":0, "y":3.8}, + {"x":1, "y":3.8}, + {"x":2, "y":3.15}, + {"x":3, "y":3}, + {"x":4, "y":3.15}, + {"x":5, "y":3.3}, + {"x":6.25, "y":3.3}, + {"x":7.75, "y":3.3}, + {"x":9, "y":3.3}, + {"x":10, "y":3.15}, + {"x":11, "y":3}, + {"x":12, "y":3.15}, + {"x":13, "y":3.8}, + {"x":14, "y":3.8}, + + {"x":2, "y":4.15}, + {"x":3, "y":4}, + {"x":4, "y":4.15}, + {"x":5.25, "y":4.3}, + {"x":6.25, "y":4.25, "h":1.5}, + {"x":7.75, "y":4.25, "h":1.5}, + {"x":8.75, "y":4.3}, + {"x":10, "y":4.15}, + {"x":11, "y":4}, + {"x":12, "y":4.15} + ] + } + } +} diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h index 373d3de14f..fd9c63f339 100644 --- a/keyboards/keycapsss/plaid_pad/config.h +++ b/keyboards/keycapsss/plaid_pad/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7983 -#define PRODUCT_ID 0x5050 // "PP" -#define MANUFACTURER Keycapsss - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 1ccac5d2cc..c223b88065 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Plaid-Pad", + "manufacturer": "Keycapsss", "url": "https://keycapsss.com/diy-kits/104/plaid-pad-4x4-numpad", "maintainer": "BenRoe", + "usb": { + "vid": "0x7983", + "pid": "0x5050" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/keycapsss/plaid_pad/rev1/config.h b/keyboards/keycapsss/plaid_pad/rev1/config.h index fee25316dd..8d0a6a2b9d 100644 --- a/keyboards/keycapsss/plaid_pad/rev1/config.h +++ b/keyboards/keycapsss/plaid_pad/rev1/config.h @@ -16,9 +16,6 @@ #pragma once -#define PRODUCT Plaid-Pad Rev1 -#define DEVICE_VER 0x0001 - #define UNUSED_PINS { B3, B4, B5, D4} #define ENCODERS_PAD_A { D1, B2 } diff --git a/keyboards/keycapsss/plaid_pad/rev1/info.json b/keyboards/keycapsss/plaid_pad/rev1/info.json new file mode 100644 index 0000000000..3d98c4cb57 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Plaid-Pad Rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/keycapsss/plaid_pad/rev2/config.h b/keyboards/keycapsss/plaid_pad/rev2/config.h index f3646dd575..a28e747d68 100644 --- a/keyboards/keycapsss/plaid_pad/rev2/config.h +++ b/keyboards/keycapsss/plaid_pad/rev2/config.h @@ -16,9 +16,6 @@ #pragma once -#define PRODUCT Plaid-Pad Rev2 -#define DEVICE_VER 0x0002 - #define UNUSED_PINS { } #define ENCODERS_PAD_A { D1, B2, B4, D4 } diff --git a/keyboards/keycapsss/plaid_pad/rev2/info.json b/keyboards/keycapsss/plaid_pad/rev2/info.json new file mode 100644 index 0000000000..0a1da66f73 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Plaid-Pad Rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/keycapsss/plaid_pad/rev3/config.h b/keyboards/keycapsss/plaid_pad/rev3/config.h index 40f96cd5c8..435f0b1ebb 100644 --- a/keyboards/keycapsss/plaid_pad/rev3/config.h +++ b/keyboards/keycapsss/plaid_pad/rev3/config.h @@ -16,9 +16,6 @@ #pragma once -#define PRODUCT Plaid-Pad Rev3 -#define DEVICE_VER 0x0003 - #define UNUSED_PINS { } #define ENCODERS_PAD_A { D1, B2, B4, D4 } diff --git a/keyboards/keycapsss/plaid_pad/rev3/info.json b/keyboards/keycapsss/plaid_pad/rev3/info.json new file mode 100644 index 0000000000..2f5b474c4d --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Plaid-Pad Rev3", + "usb": { + "device_version": "0.0.3" + } +} -- cgit v1.2.1