summaryrefslogtreecommitdiffstats
path: root/keyboards/horrortroll
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-07-28 23:12:40 +1000
committerGitHub <noreply@github.com>2022-07-28 14:12:40 +0100
commit920f9837677749541b88b02ecb245539943140e2 (patch)
treeef2d2162ccb7302a208983956e1771e1af918ee6 /keyboards/horrortroll
parente7affd05417a48b1e5c0948a24034227384a5d13 (diff)
Move keyboard USB IDs and strings to data driven: H (#17821)
Diffstat (limited to 'keyboards/horrortroll')
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/config.h7
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/info.json8
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/config.h7
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/info.json6
-rw-r--r--keyboards/horrortroll/handwired_k552/config.h7
-rw-r--r--keyboards/horrortroll/handwired_k552/info.json8
-rw-r--r--keyboards/horrortroll/lemon40/config.h7
-rw-r--r--keyboards/horrortroll/lemon40/info.json6
-rw-r--r--keyboards/horrortroll/paws60/config.h7
-rw-r--r--keyboards/horrortroll/paws60/info.json6
10 files changed, 32 insertions, 37 deletions
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index c3b5ff75a5..f544206b81 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7516
-#define PRODUCT_ID 0x6003
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HorrorTroll
-#define PRODUCT Black E6.5
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index 6e53613d4c..f08cdf109f 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Devil68 Pro",
+ "keyboard_name": "Black E6.5",
+ "manufacturer": "HorrorTroll",
"url": "",
"maintainer": "HorrorTroll",
+ "usb": {
+ "vid": "0x7516",
+ "pid": "0x6003",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index af7affbb83..82465cf99c 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7516
-#define PRODUCT_ID 0x6001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HorrorTroll
-#define PRODUCT Devil68 Pro
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index 9e7f4524a3..ff541f7ef2 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Devil68 Pro",
+ "manufacturer": "HorrorTroll",
"url": "",
"maintainer": "HorrorTroll",
+ "usb": {
+ "vid": "0x7516",
+ "pid": "0x6001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 3caaee51e5..09e89b13c4 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7516
-#define PRODUCT_ID 0x5104
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HorrorTroll
-#define PRODUCT K552 Kumara
-
/* Key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index 2db30bb552..825493738a 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Handwired K552 Kumara",
+ "keyboard_name": "K552 Kumara",
+ "manufacturer": "HorrorTroll",
"url": "",
"maintainer": "HorrorTroll",
+ "usb": {
+ "vid": "0x7516",
+ "pid": "0x5104",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
index 8bc8f01d4c..600ef01657 100644
--- a/keyboards/horrortroll/lemon40/config.h
+++ b/keyboards/horrortroll/lemon40/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7516
-#define PRODUCT_ID 0x2434
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HorrorTroll
-#define PRODUCT Lemon40
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 7
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index 322fcc3a0c..9aa73df1fa 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Lemon40",
+ "manufacturer": "HorrorTroll",
"url": "",
"maintainer": "HorrorTroll",
+ "usb": {
+ "vid": "0x7516",
+ "pid": "0x2434",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
index d502ee985c..7bd3ac8be3 100644
--- a/keyboards/horrortroll/paws60/config.h
+++ b/keyboards/horrortroll/paws60/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7516
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HorrorTroll
-#define PRODUCT Paws 60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json
index 78cb1a7938..2a67134750 100644
--- a/keyboards/horrortroll/paws60/info.json
+++ b/keyboards/horrortroll/paws60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Paws 60",
+ "manufacturer": "HorrorTroll",
"url": "https://github.com/HorrorTroll/KeebProj/tree/default/paws60/pcb/Hotswap",
"maintainer": "HorrorTroll",
+ "usb": {
+ "vid": "0x7516",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [