summaryrefslogtreecommitdiff
path: root/keyboards/input_club
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2022-07-29 17:30:33 +0100
committerzvecr <git@zvecr.com>2022-07-29 17:30:33 +0100
commitade2eb1e751be2918b901bfe4352a71f1d54e2a2 (patch)
tree4a2c409651420d4c99296aebeaaf0514d2cb4a71 /keyboards/input_club
parent1050cf24536378d534c6163fd1ae5ae3fe46ccc4 (diff)
parent394cf7c41e24f966d38b9c8cc9bbc2faca905e2a (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/input_club')
-rw-r--r--keyboards/input_club/ergodox_infinity/config.h7
-rw-r--r--keyboards/input_club/ergodox_infinity/info.json8
-rw-r--r--keyboards/input_club/infinity60/config.h7
-rw-r--r--keyboards/input_club/infinity60/info.json8
-rw-r--r--keyboards/input_club/k_type/config.h7
-rw-r--r--keyboards/input_club/k_type/info.json8
-rw-r--r--keyboards/input_club/whitefox/config.h7
-rw-r--r--keyboards/input_club/whitefox/info.json8
8 files changed, 28 insertions, 32 deletions
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index debf9a62b9..458b2d1042 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1c11
-#define PRODUCT_ID 0xb04d
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input Club
-#define PRODUCT Infinity_Ergodox/QMK
-
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
#define MOUSEKEY_TIME_TO_MAX 60
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index 22b20eec39..dd6b3ac9aa 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -1,5 +1,11 @@
{
- "keyboard_name": "Infinity Ergodox",
+ "keyboard_name": "Infinity Ergodox (QMK)",
+ "manufacturer": "Input:Club",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ergodox": {
"layout": [
diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h
index 18fedcb219..a9901ce1e8 100644
--- a/keyboards/input_club/infinity60/config.h
+++ b/keyboards/input_club/infinity60/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1C11
-#define PRODUCT_ID 0xB04D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input Club
-#define PRODUCT Infinity 60% (QMK)
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 9
diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json
index 3fbd8b1b25..8ec3f7dc68 100644
--- a/keyboards/input_club/infinity60/info.json
+++ b/keyboards/input_club/infinity60/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Infinity 60%",
+ "keyboard_name": "Infinity 60% (QMK)",
+ "manufacturer": "Input:Club",
"url": "https://input.club/devices/infinity-keyboard/",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index 8502ba7046..d55bf89236 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1C11
-#define PRODUCT_ID 0xB04D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input:Club
-#define PRODUCT K-Type (QMK)
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index cf0c9253bd..6c9e1ebc16 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "K-Type",
+ "keyboard_name": "K-Type (QMK)",
+ "manufacturer": "Input:Club",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 4ea7e7806f..fde568ddae 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1C11
-#define PRODUCT_ID 0xB04D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input:Club
-#define PRODUCT WhiteFox (QMK)
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 9
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index a920d7c129..ed46ce1702 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -1,6 +1,12 @@
{
- "keyboard_name": "Whitefox",
+ "keyboard_name": "Whitefox (QMK)",
+ "manufacturer": "Input:Club",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [