summaryrefslogtreecommitdiff
path: root/keyboards/mwstudio
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-03 07:16:28 +0000
committerQMK Bot <hello@qmk.fm>2022-08-03 07:16:28 +0000
commitd4f9eb5225feb7f2aad01d252b33401e3a80b870 (patch)
treef3b1f76a8d715e7c4f63d18f9fc3ae65141eb1fb /keyboards/mwstudio
parentbce4fb45748bacc8cb21cb61687d9bfd9faa4494 (diff)
parent3da6575e2480d46399be01c21270c57420e0f16d (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/mwstudio')
-rw-r--r--keyboards/mwstudio/mw65_black/config.h7
-rw-r--r--keyboards/mwstudio/mw65_black/info.json8
-rw-r--r--keyboards/mwstudio/mw65_rgb/config.h7
-rw-r--r--keyboards/mwstudio/mw65_rgb/info.json8
-rw-r--r--keyboards/mwstudio/mw75/config.h8
-rw-r--r--keyboards/mwstudio/mw75/info.json6
-rw-r--r--keyboards/mwstudio/mw75r2/config.h8
-rw-r--r--keyboards/mwstudio/mw75r2/info.json6
8 files changed, 26 insertions, 32 deletions
diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h
index 9cd1aade78..c7ca78706f 100644
--- a/keyboards/mwstudio/mw65_black/config.h
+++ b/keyboards/mwstudio/mw65_black/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7BA1
-#define PRODUCT_ID 0x6500
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MWStudio
-#define PRODUCT MW65
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index 1245157792..ccf09114da 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MW65_BLACK",
+ "keyboard_name": "MW65 Black",
+ "manufacturer": "MWStudio",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7BA1",
+ "pid": "0x6500",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h
index d484f7e351..2fd67e9e79 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7BA1
-#define PRODUCT_ID 0x6502
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MWStudio
-#define PRODUCT MW65
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json
index 870a848b85..9518a2b54c 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "MW65_RGB",
+ "keyboard_name": "MW65 RGB",
+ "manufacturer": "MWStudio",
"url": "",
"maintainer": "TW59420",
+ "usb": {
+ "vid": "0x7BA1",
+ "pid": "0x6502",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index 1cc00618e8..2c9e3839b8 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -18,14 +18,6 @@
#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7BA1
-#define PRODUCT_ID 0x7501
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MWStudio
-#define PRODUCT MW75
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 15
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index 2eabde1495..e861c5ea23 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "MW75",
+ "manufacturer": "MWStudio",
"url": "",
"maintainer": "TW59420",
+ "usb": {
+ "vid": "0x7BA1",
+ "pid": "0x7501",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index 4430d12a91..0886a9effb 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -18,14 +18,6 @@
#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7BA1
-#define PRODUCT_ID 0x7502
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MWStudio
-#define PRODUCT MW75R2
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index ade25ee7b9..fc6f8e4c80 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "MW75R2",
+ "manufacturer": "MWStudio",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7BA1",
+ "pid": "0x7502",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [