From b6757d2380d32b5f60f61ffc42d27c40eb219208 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 17:23:15 +1000 Subject: Move keyboard USB IDs and strings to data driven: P (#17875) --- keyboards/pinky/3/config.h | 7 ------- keyboards/pinky/3/info.json | 6 ++++++ keyboards/pinky/4/config.h | 7 ------- keyboards/pinky/4/info.json | 6 ++++++ 4 files changed, 12 insertions(+), 14 deletions(-) (limited to 'keyboards/pinky') diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h index 78192bc19e..ebb69a0119 100644 --- a/keyboards/pinky/3/config.h +++ b/keyboards/pinky/3/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544E // "TN" -#define PRODUCT_ID 0x7033 // "P3" -#define DEVICE_VER 0x0001 -#define MANUFACTURER tamanishi -#define PRODUCT Pinky3 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json index 15c6742f49..0fb7e5a6f6 100644 --- a/keyboards/pinky/3/info.json +++ b/keyboards/pinky/3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Pinky3", + "manufacturer": "tamanishi", "url": "", "maintainer": "tamanishi", + "usb": { + "vid": "0x544E", + "pid": "0x7033", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x7_4": { "layout": [ diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h index f5a9024045..c7f2ab8ef6 100644 --- a/keyboards/pinky/4/config.h +++ b/keyboards/pinky/4/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544E // "TN" -#define PRODUCT_ID 0x7034 // "P4" -#define DEVICE_VER 0x0001 -#define MANUFACTURER tamanishi -#define PRODUCT Pinky4 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json index a0781224c3..373861b138 100644 --- a/keyboards/pinky/4/info.json +++ b/keyboards/pinky/4/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Pinky4", + "manufacturer": "tamanishi", "url": "", "maintainer": "tamanishi", + "usb": { + "vid": "0x544E", + "pid": "0x7034", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_4x7_4": { "layout": [ -- cgit v1.2.1 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/pinky/3/config.h | 1 - keyboards/pinky/4/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/pinky') diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h index ebb69a0119..f6b8dc4343 100644 --- a/keyboards/pinky/3/config.h +++ b/keyboards/pinky/3/config.h @@ -36,7 +36,6 @@ // wiring of each half #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h index c7f2ab8ef6..c980f9d302 100644 --- a/keyboards/pinky/4/config.h +++ b/keyboards/pinky/4/config.h @@ -36,7 +36,6 @@ // wiring of each half #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.1