summaryrefslogtreecommitdiffstats
path: root/keyboards/pinky
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-03 07:23:52 +0000
committerQMK Bot <hello@qmk.fm>2022-08-03 07:23:52 +0000
commit61a3fe4faca40c537dc179f58317a0229ae09ce2 (patch)
tree7a2f98cd295636d188dd3a6f93b4dd9bcad4c186 /keyboards/pinky
parentd4f9eb5225feb7f2aad01d252b33401e3a80b870 (diff)
parentb6757d2380d32b5f60f61ffc42d27c40eb219208 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/pinky')
-rw-r--r--keyboards/pinky/3/config.h7
-rw-r--r--keyboards/pinky/3/info.json6
-rw-r--r--keyboards/pinky/4/config.h7
-rw-r--r--keyboards/pinky/4/info.json6
4 files changed, 12 insertions, 14 deletions
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": [