summaryrefslogtreecommitdiff
path: root/keyboards/kbdfans
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-20 10:39:35 +1000
committerGitHub <noreply@github.com>2022-08-20 10:39:35 +1000
commit835c971f78b5d995bb58f0889fac00aac348de52 (patch)
tree0997888e5fe5dec82133a1eec10ce425b09a0545 /keyboards/kbdfans
parent48792b030b754c8b3983a97071db1b09ae6353d4 (diff)
Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080)
Diffstat (limited to 'keyboards/kbdfans')
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/info.json5
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/config.h5
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/info.json7
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v2/config.h5
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v2/info.json7
-rwxr-xr-xkeyboards/kbdfans/kbd67/mkiirgb/v3/config.h7
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v3/info.json7
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v4/config.h7
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v4/info.json7
-rw-r--r--keyboards/kbdfans/kbd75/config.h5
-rw-r--r--keyboards/kbdfans/kbd75/rev1/config.h7
-rw-r--r--keyboards/kbdfans/kbd75/rev1/info.json6
-rw-r--r--keyboards/kbdfans/kbd75/rev2/config.h7
-rw-r--r--keyboards/kbdfans/kbd75/rev2/info.json6
-rw-r--r--keyboards/kbdfans/kbd75rgb/config.h7
-rw-r--r--keyboards/kbdfans/kbd75rgb/info.json11
16 files changed, 55 insertions, 51 deletions
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json
index 7010ba59d9..34e29bca8e 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json
@@ -1,7 +1,10 @@
{
- "keyboard_name": "kbd67mkiirgb",
+ "manufacturer": "KBDfans",
"url": "",
"maintainer": "moyi4681",
+ "usb": {
+ "vid": "0x4B42"
+ },
"layouts": {
"LAYOUT_65_ansi_blocker": {
"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, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index d88d384f98..a6a56cdced 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -1,10 +1,5 @@
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0x4B42 // KB
-#define PRODUCT_ID 0x1224
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KBDfans
-#define PRODUCT kbd67mkiirgb v1
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
new file mode 100644
index 0000000000..88d1bb38f4
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "kbd67mkiirgb v1",
+ "usb": {
+ "pid": "0x1224",
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index ffdace7a5f..a5dfdae5ed 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -1,10 +1,5 @@
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0x4B42 // KB
-#define PRODUCT_ID 0x1225
-#define DEVICE_VER 0x0002
-#define MANUFACTURER KBDfans
-#define PRODUCT kbd67mkiirgb v2
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
new file mode 100644
index 0000000000..62f1bf6cbb
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "kbd67mkiirgb v2",
+ "usb": {
+ "pid": "0x1225",
+ "device_version": "0.0.2"
+ }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 23b0a8a30c..c03ab6da3e 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B42 // KB
-#define PRODUCT_ID 0x1226
-#define DEVICE_VER 0x0002
-#define MANUFACTURER KBDfans
-#define PRODUCT kbd67mkiirgb v3
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
new file mode 100644
index 0000000000..496016ea8c
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "kbd67mkiirgb v3",
+ "usb": {
+ "pid": "0x1226",
+ "device_version": "0.0.3"
+ }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index a63a3ee61b..dc0be21b67 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B42
-#define PRODUCT_ID 0x1227
-#define DEVICE_VER 0x0004
-#define MANUFACTURER KBDFANS
-#define PRODUCT KBD67 MKII RGB V4
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
new file mode 100644
index 0000000000..1bb937c0c2
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "kbd67mkiirgb v4",
+ "usb": {
+ "pid": "0x1227",
+ "device_version": "0.0.4"
+ }
+}
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index b54ce4d24c..40023beb03 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -5,11 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B42
-#define MANUFACTURER qmkbuilder
-#define PRODUCT KBD75
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
diff --git a/keyboards/kbdfans/kbd75/rev1/config.h b/keyboards/kbdfans/kbd75/rev1/config.h
deleted file mode 100644
index 9e036b5839..0000000000
--- a/keyboards/kbdfans/kbd75/rev1/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index 499b9e9a43..fe1541b78f 100644
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "KBD75 rev1",
+ "manufacturer": "KBDfans",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4B42",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_ansi_1u": "LAYOUT_75_ansi"
},
diff --git a/keyboards/kbdfans/kbd75/rev2/config.h b/keyboards/kbdfans/kbd75/rev2/config.h
deleted file mode 100644
index c65ac48677..0000000000
--- a/keyboards/kbdfans/kbd75/rev2/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define PRODUCT_ID 0x6061
-#define DEVICE_VER 0x0002
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index 8518527eed..ac07971b59 100644
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "KBD75 rev2",
+ "manufacturer": "KBDfans",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4B42",
+ "pid": "0x6061",
+ "device_version": "0.0.2"
+ },
"layout_aliases": {
"LAYOUT_ansi_1u": "LAYOUT_75_ansi"
},
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index 2499c25933..413e33a850 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B42
-#define PRODUCT_ID 0x6063
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KBDFANS
-#define PRODUCT KBD75RGB
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
new file mode 100644
index 0000000000..4c008f0310
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -0,0 +1,11 @@
+{
+ "keyboard_name": "KBD75RGB",
+ "manufacturer": "KBDfans",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4B42",
+ "pid": "0x6063",
+ "device_version": "0.0.1"
+ }
+}