From 3da6575e2480d46399be01c21270c57420e0f16d Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 17:15:43 +1000 Subject: Move keyboard USB IDs and strings to data driven: M (#17859) --- keyboards/mechlovin/hex6c/config.h | 7 ------- keyboards/mechlovin/hex6c/info.json | 8 +++++++- keyboards/mechlovin/infinity875/config.h | 5 ----- keyboards/mechlovin/infinity875/info.json | 6 ++++++ keyboards/mechlovin/infinity88/config.h | 7 ------- keyboards/mechlovin/infinity88/info.json | 8 +++++++- keyboards/mechlovin/infinityce/config.h | 6 ------ keyboards/mechlovin/infinityce/info.json | 6 ++++++ keyboards/mechlovin/jay60/config.h | 7 ------- keyboards/mechlovin/jay60/info.json | 6 ++++++ keyboards/mechlovin/kanu/config.h | 7 ------- keyboards/mechlovin/kanu/info.json | 6 ++++++ keyboards/mechlovin/kay60/config.h | 7 ------- keyboards/mechlovin/kay60/info.json | 8 +++++++- keyboards/mechlovin/kay65/config.h | 7 ------- keyboards/mechlovin/kay65/info.json | 8 +++++++- keyboards/mechlovin/olly/bb/config.h | 7 ------- keyboards/mechlovin/olly/bb/info.json | 8 +++++++- keyboards/mechlovin/olly/jf/config.h | 7 ------- keyboards/mechlovin/olly/jf/info.json | 8 +++++++- keyboards/mechlovin/pisces/config.h | 7 ------- keyboards/mechlovin/pisces/info.json | 8 +++++++- keyboards/mechlovin/serratus/config.h | 5 ----- keyboards/mechlovin/serratus/info.json | 8 +++++++- keyboards/mechlovin/th1800/config.h | 7 ------- keyboards/mechlovin/th1800/info.json | 6 ++++++ keyboards/mechlovin/tmkl/config.h | 7 ------- keyboards/mechlovin/tmkl/info.json | 8 +++++++- keyboards/mechlovin/zed60/config.h | 7 ------- keyboards/mechlovin/zed60/info.json | 6 ++++++ 30 files changed, 99 insertions(+), 109 deletions(-) (limited to 'keyboards/mechlovin') diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h index b79b5211c2..d76d271047 100644 --- a/keyboards/mechlovin/hex6c/config.h +++ b/keyboards/mechlovin/hex6c/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x6C01 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin Studio and Hex Keyboard -#define PRODUCT Hex6C - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 21 diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json index 0d8a6529db..5c01225cd7 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hex-6C", + "keyboard_name": "Hex6C", + "manufacturer": "Mechlovin Studio and Hex Keyboard", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x6C01", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h index 6b6a8147f6..0f81a71f96 100644 --- a/keyboards/mechlovin/infinity875/config.h +++ b/keyboards/mechlovin/infinity875/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML -#define PRODUCT_ID 0x0875 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity87.5 /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index e24c0d1cc2..9c9fe10a10 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Infinity87.5", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x0875", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}] diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h index edbb628e7b..c6eeb108f9 100644 --- a/keyboards/mechlovin/infinity88/config.h +++ b/keyboards/mechlovin/infinity88/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML -#define PRODUCT_ID 0x8802 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team.Mechlovin -#define PRODUCT Infinity 88 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index edf91c4687..126e463917 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity88", + "keyboard_name": "Infinity 88", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x8802", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h index 838fc1da7f..1fbb5690d4 100644 --- a/keyboards/mechlovin/infinityce/config.h +++ b/keyboards/mechlovin/infinityce/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML-Mechlovin -#define PRODUCT_ID 0x8801 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team.Mechlovin -#define PRODUCT Infinity CE /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json index 6b3b2f8adf..f85aa21278 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Infinity CE", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8801", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h index 521b8ae0db..b0e3d3bd4b 100644 --- a/keyboards/mechlovin/jay60/config.h +++ b/keyboards/mechlovin/jay60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0600 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin Studio -#define PRODUCT Jay60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json index d4c0f57dd6..69e336fa31 100644 --- a/keyboards/mechlovin/jay60/info.json +++ b/keyboards/mechlovin/jay60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Jay60", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x0600", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h index 3e5c0ee676..880d87a4ac 100644 --- a/keyboards/mechlovin/kanu/config.h +++ b/keyboards/mechlovin/kanu/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML-MechLovin' -#define PRODUCT_ID 0x4B4E // KN-Kanu -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin -#define PRODUCT Kanu - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json index 1049ba7d1d..7e4f902bfb 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kanu", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x4B4E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h index 4b8b653889..7896a6edf4 100644 --- a/keyboards/mechlovin/kay60/config.h +++ b/keyboards/mechlovin/kay60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0601 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin Studio -#define PRODUCT Kay60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json index adcbc594d4..86298b5582 100644 --- a/keyboards/mechlovin/kay60/info.json +++ b/keyboards/mechlovin/kay60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "kay60", + "keyboard_name": "Kay60", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x0601", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h index cc1b991672..09e841804e 100644 --- a/keyboards/mechlovin/kay65/config.h +++ b/keyboards/mechlovin/kay65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x6502 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team Mechlovin -#define PRODUCTION Kay65 Rev. 1 - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json index 7afccc81c0..ec96aba032 100644 --- a/keyboards/mechlovin/kay65/info.json +++ b/keyboards/mechlovin/kay65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Kay65", + "keyboard_name": "Kay65 Rev. 1", + "manufacturer": "Team Mechlovin", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x6502", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h index 3110a9589c..52b1e77f6a 100644 --- a/keyboards/mechlovin/olly/bb/config.h +++ b/keyboards/mechlovin/olly/bb/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0xD181 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin.Studio -#define PRODUCT Olly BB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index fbc9bae3eb..c37f167bdb 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mechlovin Olly", + "keyboard_name": "Olly BB", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0xD181", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h index f1c40cb365..d9d839b3b8 100644 --- a/keyboards/mechlovin/olly/jf/config.h +++ b/keyboards/mechlovin/olly/jf/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0xD180 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin.Studio -#define PRODUCT Olly JF - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 19 diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index ab57d31787..96ea429cb9 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mechlovin Olly", + "keyboard_name": "Olly JF", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0xD180", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index 48a94eb262..217c63f7e4 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML-Mechlovin -#define PRODUCT_ID 0x6501 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team.Mechlovin -#define PRODUCT Pisces65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index 57da5b4a0e..20b521636f 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "pisces", + "keyboard_name": "Pisces65", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6501", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h index 0bb9ccbea9..965c34bbd0 100644 --- a/keyboards/mechlovin/serratus/config.h +++ b/keyboards/mechlovin/serratus/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML -#define PRODUCT_ID 0x0870 -#define DEVICE_VER 0x0001 -#define PRODUCT Serratus Rev.1 /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json index 209ee4a330..fe891d5987 100644 --- a/keyboards/mechlovin/serratus/info.json +++ b/keyboards/mechlovin/serratus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Serratus", + "keyboard_name": "Serratus Rev.1", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x0870", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h index f8c4567825..423af0bc14 100644 --- a/keyboards/mechlovin/th1800/config.h +++ b/keyboards/mechlovin/th1800/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML-Mechlovin -#define PRODUCT_ID 0x1800 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team Mechlovin -#define PRODUCT th1800 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json index 8efddf61a1..535903586c 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "th-1800", + "manufacturer": "Team Mechlovin", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4D4C", + "pid": "0x1800", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h index 9a1d865e29..ad5cd60338 100644 --- a/keyboards/mechlovin/tmkl/config.h +++ b/keyboards/mechlovin/tmkl/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML -#define PRODUCT_ID 0xC601 // Commissions 60v1 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team Mechlovin -#define PRODUCT TMKL - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json index b57ea89fa7..80922903ce 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "tmkl", + "keyboard_name": "TMKL", + "manufacturer": "Team Mechlovin", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0xC601", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h index 87965b58ff..7d096d3e96 100644 --- a/keyboards/mechlovin/zed60/config.h +++ b/keyboards/mechlovin/zed60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0602 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin Studio -#define PRODUCT Zed60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json index 1eae9b3144..11c3e87247 100644 --- a/keyboards/mechlovin/zed60/info.json +++ b/keyboards/mechlovin/zed60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Zed60", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x0602", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, -- cgit v1.2.3