summaryrefslogtreecommitdiff
path: root/keyboards/mechkeys
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-03 17:15:43 +1000
committerGitHub <noreply@github.com>2022-08-03 17:15:43 +1000
commit3da6575e2480d46399be01c21270c57420e0f16d (patch)
treef3438c1402e56256dd0c2bdd0775711edae56043 /keyboards/mechkeys
parent1b92c204c10594fce6a715710c277a748a4fdc68 (diff)
Move keyboard USB IDs and strings to data driven: M (#17859)
Diffstat (limited to 'keyboards/mechkeys')
-rw-r--r--keyboards/mechkeys/acr60/config.h7
-rw-r--r--keyboards/mechkeys/acr60/info.json6
-rwxr-xr-xkeyboards/mechkeys/alu84/config.h7
-rw-r--r--keyboards/mechkeys/alu84/info.json6
-rwxr-xr-xkeyboards/mechkeys/espectro/config.h7
-rw-r--r--keyboards/mechkeys/espectro/info.json6
-rw-r--r--keyboards/mechkeys/mechmini/v1/config.h6
-rw-r--r--keyboards/mechkeys/mechmini/v1/info.json8
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/config.h8
-rw-r--r--keyboards/mechkeys/mechmini/v2/info.json6
-rw-r--r--keyboards/mechkeys/mk60/config.h7
-rw-r--r--keyboards/mechkeys/mk60/info.json6
12 files changed, 37 insertions, 43 deletions
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 7fb907153a..a27841231a 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCA60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MECHKEYS
-#define PRODUCT ACR60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 0e42e5162e..79fcfba429 100644
--- a/keyboards/mechkeys/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "ACR60",
+ "manufacturer": "MechKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xCA60",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_2_shifts": "LAYOUT_all"
},
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index 3700ced8cf..a6435fa4f5 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCA75
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MECHKEYS
-#define PRODUCT ALU84
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json
index 55d01489dc..e67ab405d9 100644
--- a/keyboards/mechkeys/alu84/info.json
+++ b/keyboards/mechkeys/alu84/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "ALU84",
+ "manufacturer": "MechKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xCA75",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_75_ansi"
},
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index e328f276eb..2d7fec72e2 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCA96
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MECHKEYS
-#define PRODUCT Espectro
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 13
diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index cb34f6938c..d293c96978 100644
--- a/keyboards/mechkeys/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Espectro",
+ "manufacturer": "MechKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xCA96",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
index a64127f597..c4d1ecc528 100644
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCA40
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MECHKEYS
-#define PRODUCT Mechmini
-
/* matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index f48fddd066..6a17171154 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MechMini v1",
+ "keyboard_name": "MechMini",
+ "manufacturer": "MechKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xCA40",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index 7936caef00..507c89a520 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -17,14 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xAF99
-#define PRODUCT_ID 0xCA40
-#define DEVICE_VER 0x0002
-#define MANUFACTURER MECHKEYS
-#undef PRODUCT
-#define PRODUCT Mechmini 2
-
/* key matrix size */
#undef MATRIX_COLS
#undef MATRIX_ROWS
diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
index 1d0d727a3e..0dfe5877a5 100644
--- a/keyboards/mechkeys/mechmini/v2/info.json
+++ b/keyboards/mechkeys/mechmini/v2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "MechMini 2",
+ "manufacturer": "MechKeys",
"url": "https://mechkeys.ca/pages/mechmini-2-guide",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xAF99",
+ "pid": "0xCA40",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT_ortho": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Caps", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"GUI", "x":3, "y":3}, {"label":"MO(1)", "x":4, "y":3}, {"label":"Space", "x":5, "y":3}, {"label":"Space", "x":6, "y":3}, {"label":"MO(2)", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":3}]
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 680c498ef4..03fc30bc2d 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Mechkeys
-#define PRODUCT mechkeys mk60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index cb50412378..b322a589ab 100644
--- a/keyboards/mechkeys/mk60/info.json
+++ b/keyboards/mechkeys/mk60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "MK60",
+ "manufacturer": "MechKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [