summaryrefslogtreecommitdiff
path: root/keyboards/mechwild
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/mechwild
parent1b92c204c10594fce6a715710c277a748a4fdc68 (diff)
Move keyboard USB IDs and strings to data driven: M (#17859)
Diffstat (limited to 'keyboards/mechwild')
-rw-r--r--keyboards/mechwild/bbs/config.h7
-rw-r--r--keyboards/mechwild/bbs/info.json8
-rwxr-xr-xkeyboards/mechwild/mercutio/config.h7
-rw-r--r--keyboards/mechwild/mercutio/info.json8
-rw-r--r--keyboards/mechwild/mokulua/mirrored/config.h7
-rw-r--r--keyboards/mechwild/mokulua/mirrored/info.json6
-rw-r--r--keyboards/mechwild/mokulua/standard/config.h7
-rw-r--r--keyboards/mechwild/mokulua/standard/info.json6
-rw-r--r--keyboards/mechwild/murphpad/config.h7
-rw-r--r--keyboards/mechwild/murphpad/info.json8
-rw-r--r--keyboards/mechwild/obe/config.h7
-rw-r--r--keyboards/mechwild/obe/info.json8
-rw-r--r--keyboards/mechwild/waka60/config.h7
-rw-r--r--keyboards/mechwild/waka60/info.json8
14 files changed, 47 insertions, 54 deletions
diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h
index 6fafe637e3..c7b1880fa0 100644
--- a/keyboards/mechwild/bbs/config.h
+++ b/keyboards/mechwild/bbs/config.h
@@ -5,13 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x170E
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MechWild
-#define PRODUCT BB Steno
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 6
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json
index b452c67f6f..a6b6747df6 100644
--- a/keyboards/mechwild/bbs/info.json
+++ b/keyboards/mechwild/bbs/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "BBS",
+ "keyboard_name": "BB Steno",
+ "manufacturer": "MechWild",
"maintainer": "kylemccreery",
"url": "https://mechwild.com/product/bb-steno/",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x170E",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h
index c6aa1e9025..64dee1bf31 100755
--- a/keyboards/mechwild/mercutio/config.h
+++ b/keyboards/mechwild/mercutio/config.h
@@ -19,13 +19,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x1703
-#define DEVICE_VER 0x0100
-#define MANUFACTURER MechWild
-#define PRODUCT Mercutio
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 7
diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json
index cc663f2215..f3323ac48f 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MechWild Mercutio",
+ "keyboard_name": "Mercutio",
+ "manufacturer": "MechWild",
"url": "mechwild.com",
"maintainer": "kylemccreery",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x1703",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"encoder", "x":12, "y":0}, {"label":"1.5u", "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}, {"label":"1.5u", "x":11.5, "y":1, "w":1.5}, {"label":"1.75u", "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}, {"label":"1.25u", "x":11.75, "y":2, "w":1.25}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"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}, {"label":"1.75u", "x":11.25, "y":3, "w":1.75},{"label":"1.25u", "x":0, "y":4, "w":1.25}, {"label":"1u", "x":1.25, "y":4}, {"label":"1.25u", "x":2.25, "y":4, "w":1.25}, {"label":"2.25u", "x":3.5, "y":4, "w":2.25}, {"label":"1u", "x":5.75, "y":4}, {"label":"2.75u", "x":6.75, "y":4, "w":2.75}, {"label":"1.25u", "x":9.5, "y":4, "w":1.25}, {"label":"1u", "x":10.75, "y":4}, {"label":"1.25u", "x":11.75, "y":4, "w":1.25}]
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index d63d0bdb4b..599d0543e4 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -5,13 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x170C
-#define DEVICE_VER 0x0103
-#define MANUFACTURER MechWild
-#define PRODUCT Mokulua
-
/* Key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 6
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index da9a620d35..15ed63a858 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Mokulua Mirrored",
+ "manufacturer": "MechWild",
"url": "https://mechwild.com",
"maintainer": "kylemccreery",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x170C",
+ "device_version": "1.0.3"
+ },
"layouts": {
"LAYOUT_mirrored": {
"layout": [
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index 0fb07b630c..9726f7bf99 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -5,13 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x170B
-#define DEVICE_VER 0x0103
-#define MANUFACTURER MechWild
-#define PRODUCT Mokulua
-
/* Key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 6
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index b132efe064..74bcd0b16f 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Mokulua Standard",
+ "manufacturer": "MechWild",
"url": "https://mechwild.com",
"maintainer": "kylemccreery",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x170B",
+ "device_version": "1.0.3"
+ },
"layouts": {
"LAYOUT_standard": {
"layout": [
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index 3995546e8e..428d6391d0 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/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 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x1705
-#define DEVICE_VER 0x0301
-#define MANUFACTURER MechWild
-#define PRODUCT MurphPad
-
/* Key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 5
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 42e01d2ca4..ae4f24f9fa 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MechWild MurphPad",
+ "keyboard_name": "MurphPad",
+ "manufacturer": "MechWild",
"url": "mechwild.com",
"maintainer": "Kyle McCreery",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x1705",
+ "device_version": "3.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 59702791b0..23d8c94318 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/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 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x1707
-#define DEVICE_VER 0x0201
-#define MANUFACTURER MechWild
-#define PRODUCT OrangeBoyErgo
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 10
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index c03b735df6..fbae09e15c 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MechWild OBE",
+ "keyboard_name": "OrangeBoyErgo",
+ "manufacturer": "MechWild",
"url": "mechwild.com",
"maintainer": "Kyle McCreery",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x1707",
+ "device_version": "2.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 057ca383be..cba318d575 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/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 0x6D77 // mw = "MechWild"
-#define PRODUCT_ID 0x1709
-#define DEVICE_VER 0x0101
-#define MANUFACTURER MechWild
-#define PRODUCT Waka60
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 7
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 87549849b9..8e9a2c11f1 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MechWild Waka60",
+ "keyboard_name": "Waka60",
+ "manufacturer": "MechWild",
"url": "mechwild.com",
"maintainer": "Kyle McCreery",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0x1709",
+ "device_version": "1.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [