diff options
| author | Ryan <fauxpark@gmail.com> | 2022-08-20 10:45:28 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-20 01:45:28 +0100 |
| commit | f4dcce7e5975276ef41d882a15e6a459b6b3689d (patch) | |
| tree | 6c095afb488454a352a7d4cc9a23ecb1d44f6ecd /keyboards | |
| parent | 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a (diff) | |
Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)
Diffstat (limited to 'keyboards')
146 files changed, 418 insertions, 452 deletions
diff --git a/keyboards/maple_computing/christmas_tree/V2017/config.h b/keyboards/maple_computing/christmas_tree/V2017/config.h deleted file mode 100644 index abc94749a8..0000000000 --- a/keyboards/maple_computing/christmas_tree/V2017/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "config_common.h" - -#define DEVICE_VER 0x2017 diff --git a/keyboards/maple_computing/christmas_tree/V2017/info.json b/keyboards/maple_computing/christmas_tree/V2017/info.json new file mode 100644 index 0000000000..6d00c2519f --- /dev/null +++ b/keyboards/maple_computing/christmas_tree/V2017/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "20.1.7" + } +} diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h index 531c5996d2..c8070c2487 100644 --- a/keyboards/maple_computing/christmas_tree/config.h +++ b/keyboards/maple_computing/christmas_tree/config.h @@ -19,12 +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 0x3070 -#define MANUFACTURER Maple Computing -#define PRODUCT Christmas Tree - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 1 diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index 5d24218c70..2f5dfef702 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Christmas Tree", + "manufacturer": "Maple Computing", "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", "maintainer": "That-Canadian", + "usb": { + "vid": "0xFEED", + "pid": "0x3070" + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h index 130f2e0b61..96fb23736c 100644 --- a/keyboards/maple_computing/ivy/config.h +++ b/keyboards/maple_computing/ivy/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1337 -#define PRODUCT_ID 0x6012 -#define MANUFACTURER Maple Computing -#define PRODUCT Ivy - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h index 9b88b89e5e..00d6b36d0f 100644 --- a/keyboards/maple_computing/ivy/rev1/config.h +++ b/keyboards/maple_computing/ivy/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { F1, B2, D3 } #define MATRIX_COL_PINS { F5, B3, D5 } diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index c5045bd80f..4bacbdb9b9 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IVY", + "keyboard_name": "Ivy", + "manufacturer": "Maple Computing", "url": "", "maintainer": "That-Canadian", + "usb": { + "vid": "0x1337", + "pid": "0x6012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index 901c63c93b..92d597508a 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h @@ -19,12 +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 0x1337 -#define PRODUCT_ID 0x6007 -#define MANUFACTURER Maple Computing -#define PRODUCT Launch Pad - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 2 diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index debc28fab3..54a67caaed 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "../config.h" -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { C6, B1, B3, D7 } #define MATRIX_COL_PINS { D2, F7 } diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index c8ba35c966..4931670cb4 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Launch Pad rev1", + "keyboard_name": "Launch Pad", + "manufacturer": "Maple Computing", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x1337", + "pid": "0x6007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/lets_split_eh/config.h b/keyboards/maple_computing/lets_split_eh/config.h index 787b9783b8..671cd4d34a 100644 --- a/keyboards/maple_computing/lets_split_eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/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 0xE401 -#define DEVICE_VER 0x0100 -#define MANUFACTURER That-Canadian -#define PRODUCT Lets Split Eh? - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index c241fa3813..352461ae50 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Let's Split", + "keyboard_name": "Lets Split Eh?", + "manufacturer": "That-Canadian", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0xE401", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h index 613e45977c..9b3adc2602 100644 --- a/keyboards/maple_computing/minidox/config.h +++ b/keyboards/maple_computing/minidox/config.h @@ -19,12 +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 0x3060 -#define MANUFACTURER That-Canadian -#define PRODUCT MiniDox - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h index 734ca562fd..6867fee4b5 100644 --- a/keyboards/maple_computing/minidox/rev1/config.h +++ b/keyboards/maple_computing/minidox/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 - // wiring of each half #define MATRIX_ROW_PINS { B2, B6, B4, B5 } #define MATRIX_COL_PINS { F4, D3, D2, D1, D4 } diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 47ed14dab0..6a253e14a6 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "MiniDox", + "manufacturer": "That-Canadian", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}] diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index 4448e51268..8dfeba8201 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/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 0xDFA1 -#define DEVICE_VER 0x0020 -#define MANUFACTURER marksard -#define PRODUCT Rhymestone - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/marksard/rhymestone/info.json b/keyboards/marksard/rhymestone/rev1/info.json index c10a45aa4b..ddce4923a4 100644 --- a/keyboards/marksard/rhymestone/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Rhymestone", + "manufacturer": "marksard", "url": "https://github.com/marksard/Keyboards", "maintainer": "marksard", + "usb": { + "vid": "0xFEED", + "pid": "0xDFA1", + "device_version": "0.2.0" + }, "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/marksard/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json index d9c1069b38..81728e0957 100644 --- a/keyboards/marksard/treadstone32/info.json +++ b/keyboards/marksard/treadstone32/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Treadstone32", + "manufacturer": "marksard", "url": "https://github.com/marksard/Keyboards", "maintainer": "marksard", + "usb": { + "vid": "0xFEED", + "pid": "0xDFA5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index 90db1a7895..59397c6ad6 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/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 0xDFA5 -#define DEVICE_VER 0x0015 -#define MANUFACTURER marksard -#define PRODUCT treadstone32 lite - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json new file mode 100644 index 0000000000..2d66455900 --- /dev/null +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "treadstone32 lite", + "usb": { + "device_version": "0.1.5" + } +} diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index 3f21ad59c5..c4ad276bf3 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/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 0xDFA5 -#define DEVICE_VER 0x0010 -#define MANUFACTURER marksard -#define PRODUCT treadstone32 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json new file mode 100644 index 0000000000..9a2ae10a50 --- /dev/null +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "treadstone32", + "usb": { + "device_version": "0.1.0" + } +} diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h index 0821b1dfce..275423a271 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/config.h +++ b/keyboards/masterworks/classy_tkl/rev_a/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 0x4D57 // "MW" = Masterworks -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Masterworks -#define PRODUCT Classy TKL - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json index 7baf2c41ab..38c4a2331b 100644 --- a/keyboards/masterworks/classy_tkl/info.json +++ b/keyboards/masterworks/classy_tkl/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Classy TKL", + "manufacturer": "Masterworks", "url": "https://geekhack.org/index.php?topic=105933", "maintainer": "qmk", + "usb": { + "vid": "0x4D57", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h index 9602bbd39b..3b5b7ea0e7 100644 --- a/keyboards/mechllama/g35/config.h +++ b/keyboards/mechllama/g35/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xCEEB -#define PRODUCT_ID 0x0035 -#define MANUFACTURER kaylynb -#define PRODUCT MechLlama G35 - #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index c22c124fc8..465e145a97 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "G35", + "keyboard_name": "MechLlama G35", + "manufacturer": "kaylynb", "url": "https://github.com/kaylynb/MechLlama-G35", "maintainer": "kaylynb", + "usb": { + "vid": "0xCEEB", + "pid": "0x0035" + }, "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}] diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h index 9e7be98ea1..fbda4b7db2 100644 --- a/keyboards/mechllama/g35/v1/config.h +++ b/keyboards/mechllama/g35/v1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 } #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 } diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/mechllama/g35/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h index 09d5f607d2..cd4d6e991c 100644 --- a/keyboards/mechllama/g35/v2/config.h +++ b/keyboards/mechllama/g35/v2/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0002 - #define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 } #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 } diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/mechllama/g35/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h index 035ffa8032..08df109685 100644 --- a/keyboards/mechlovin/adelais/config.h +++ b/keyboards/mechlovin/adelais/config.h @@ -19,11 +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 0x4D4C // "ML" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team.Mechlovin - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15
\ No newline at end of file diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index 7a858277e7..a583373c13 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Adelais", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs" }, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index c0cae1600b..ab38809514 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAEC1 -#define PRODUCT Adelais En Ciel - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } #define UNUSED_PINS diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json new file mode 100644 index 0000000000..92ee67be74 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel", + "usb": { + "pid": "0xAEC1" + } +} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index cd290cdcd1..dbeb73cda2 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAEC2 -#define PRODUCT Adelais En Ciel Rev2 - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json new file mode 100644 index 0000000000..8af90a2c55 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel Rev2", + "usb": { + "pid": "0xAEC2" + } +} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index 6efac57ee2..e16d5f2ce5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0xAEC3 -#define PRODUCT Adelais En Ciel Rev3 - #define MATRIX_ROW_PINS { A4, A3, C13, A1, A2} #define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json new file mode 100644 index 0000000000..2f963ec895 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel Rev3", + "usb": { + "pid": "0xAEC3" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index 4377405fc6..22b7999c06 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT Adelais - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } #define UNUSED_PINS diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json new file mode 100644 index 0000000000..68e7b3d144 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Adelais" +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h deleted file mode 100644 index 7c2c63ea21..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAD01
\ No newline at end of file diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json new file mode 100644 index 0000000000..ce04dbb068 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD01" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h index 4d56fedf05..69af2941a6 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h @@ -1,7 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAD02 - #define ENCODERS_PAD_A { A6, A4, B7 } #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json new file mode 100644 index 0000000000..f3b66e9eb2 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD02" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h index ca793f1fec..70fa00220b 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h @@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define PRODUCT_ID 0xAD03 - #define ENCODERS_PAD_A { A6, A4, B7 } #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json new file mode 100644 index 0000000000..f4c096143b --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD03" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index 9093d262e4..fecdf4d110 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define PRODUCT_ID 0xAD04 -#define PRODUCT Adelais AVR /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json new file mode 100644 index 0000000000..d827607b81 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais AVR", + "usb": { + "pid": "0xAD04" + } +} diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h index a642f37f9b..7d50bb4615 100644 --- a/keyboards/mechlovin/delphine/config.h +++ b/keyboards/mechlovin/delphine/config.h @@ -19,11 +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 0x4D4C -#define MANUFACTURER Mechlovin -#define PRODUCT Mechlovin Delphine - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 38ae0a3beb..a3fe9fb200 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "Delphine", + "manufacturer": "Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [ diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h index ead627937c..36923bb968 100644 --- a/keyboards/mechlovin/delphine/mono_led/config.h +++ b/keyboards/mechlovin/delphine/mono_led/config.h @@ -1,10 +1,6 @@ #pragma once -#define PRODUCT_ID 0xDEF1 -#define DEVICE_VER 0x0001 - - #ifdef BACKLIGHT_ENABLE #define BACKLIGHT_PIN B6 // #define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json new file mode 100644 index 0000000000..2665906b80 --- /dev/null +++ b/keyboards/mechlovin/delphine/mono_led/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0xDEF1", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h index 0ed8721d23..0d5bfb57f9 100644 --- a/keyboards/mechlovin/delphine/rgb_led/config.h +++ b/keyboards/mechlovin/delphine/rgb_led/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xDEF2 -#define DEVICE_VER 0x0001 - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 13 diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json new file mode 100644 index 0000000000..0a8f1ab220 --- /dev/null +++ b/keyboards/mechlovin/delphine/rgb_led/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0xDEF2", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index e1e97ca873..35145c440b 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0180 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Mechlovin Studio -#define PRODUCT Foundation FRL #define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3} diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 03b6cf6ff2..aa4148a40a 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Foundation", + "keyboard_name": "Foundation FRL", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Protozoa", + "usb": { + "vid": "0x4D4C", + "pid": "0x0180", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"2,15", "x":16.25, "y":0}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,13", "x":15, "y":2}, {"label":"2,14", "x":16, "y":2, "w":1.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":1.25}, {"label":"3,2", "x":3.5, "y":3}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":1.75}, {"label":"3,14", "x":16.25, "y":3}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}] diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h index 6acfa5d401..3a0aaa0eb9 100644 --- a/keyboards/mechlovin/hannah60rgb/config.h +++ b/keyboards/mechlovin/hannah60rgb/config.h @@ -19,10 +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 0x4D4C // ML-Mechlovin -#define MANUFACTURER Team.Mechlovin - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h index 0f0c923fd0..9a84e78588 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h @@ -1,9 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6001 -#define DEVICE_VER 0x0001 -#define PRODUCT Hannah60 RGB - #define RGB_DI_PIN A15 #ifdef RGB_MATRIX_ENABLE # define DRIVER_LED_TOTAL 72 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 48c878edb1..1e30b49c01 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah60rgb rev1", + "keyboard_name": "Hannah60 RGB", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h index e96ca0002a..3a25680a20 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h @@ -1,9 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6002 -#define DEVICE_VER 0x0001 -#define PRODUCT Hannah60 RGB Rev.2 - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A15 # define RGBLED_NUM 18 diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 74490e03e3..4047982477 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah60rgb rev2", + "keyboard_name": "Hannah60 RGB Rev.2", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index f0aa801396..c43d228cf4 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -19,10 +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 0x4D4C -#define MANUFACTURER Team Mechlovin - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hannah65/rev1/haus/config.h b/keyboards/mechlovin/hannah65/rev1/haus/config.h deleted file mode 100644 index 204bf356e7..0000000000 --- a/keyboards/mechlovin/hannah65/rev1/haus/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Mechlovin' Studio - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define PRODUCT_ID 0x6500 -#define DEVICE_VER 0x0001 -#define PRODUCT Haus Rev. 1
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json index 329c4040c8..55ddde0a58 100644 --- a/keyboards/mechlovin/hannah65/rev1/info.json +++ b/keyboards/mechlovin/hannah65/rev1/haus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah65-rev1", + "keyboard_name": "Haus Rev. 1", + "manufacturer": "Team Mechlovin", "url": "", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6500", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index cc2ac81bc5..f42451577b 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/config.h @@ -19,11 +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 0x4D4C // ML-MechLovin' -#define MANUFACTURER Mechlovin -#define PRODUCT Mechlovin Hannah910 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hannah910/rev1/config.h b/keyboards/mechlovin/hannah910/rev1/config.h index 906e0c8846..7b793c75b9 100644 --- a/keyboards/mechlovin/hannah910/rev1/config.h +++ b/keyboards/mechlovin/hannah910/rev1/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9101 -#define DEVICE_VER 0x0001 - #define RGBLED_NUM 9
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index 1f130c6992..bbfdddf1ad 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9101", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"INS", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"HOME", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Shift", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"END", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":2.75}, {"label":"Space", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/mechlovin/hannah910/rev2/config.h b/keyboards/mechlovin/hannah910/rev2/config.h index 3ae3cb65bc..c37c581ae6 100644 --- a/keyboards/mechlovin/hannah910/rev2/config.h +++ b/keyboards/mechlovin/hannah910/rev2/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9102 -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 28
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index c2e5dd1a3e..d0eb8b208f 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Hannah910 Rev.2", + "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9102", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/rev3/config.h b/keyboards/mechlovin/hannah910/rev3/config.h index 5e377f4d79..fbb878ab6a 100644 --- a/keyboards/mechlovin/hannah910/rev3/config.h +++ b/keyboards/mechlovin/hannah910/rev3/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9103 -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 28 diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index bb762dd589..44c797323b 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah910-rev3", + "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9103", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h index c8176d76b5..4126b720b7 100644 --- a/keyboards/mechlovin/hex4b/config.h +++ b/keyboards/mechlovin/hex4b/config.h @@ -19,11 +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 0x4D4C -#define PRODUCT_ID 0x0675 //Hex-75 -#define MANUFACTURER Mechlovin Studio - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json index 686d79cc0e..2edd39b3e2 100644 --- a/keyboards/mechlovin/hex4b/info.json +++ b/keyboards/mechlovin/hex4b/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Hex4B", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Hex-Keyboard&Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x0675" + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_bs", "LAYOUT_all": "LAYOUT_split_bs" diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h index 014209cefd..7dcdb6b3a4 100644 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ b/keyboards/mechlovin/hex4b/rev1/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define PRODUCT Hex-4B Rev.1 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json new file mode 100644 index 0000000000..b2dfdec696 --- /dev/null +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Hex-4B Rev.1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index af956f3ec0..70207ed481 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 -#define PRODUCT Hex-4B Rev.2 - - - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json new file mode 100644 index 0000000000..da18a2ce4b --- /dev/null +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Hex-4B Rev.2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h index a344c98b8f..6692b78292 100644 --- a/keyboards/mechlovin/infinity87/config.h +++ b/keyboards/mechlovin/infinity87/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML - -#define MANUFACTURER Mechlovin.Studio - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h b/keyboards/mechlovin/infinity87/rev1/rogue87/config.h deleted file mode 100644 index 3415f3add9..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define PRODUCT_ID 0x8704 -#define DEVICE_VER 0x0001 -#define PRODUCT Rogue87 Rev.1
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json index 3ffa181666..b9906b410b 100644 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rogue87", + "keyboard_name": "Rogue87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8704", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h b/keyboards/mechlovin/infinity87/rev1/rouge87/config.h deleted file mode 100644 index 786da387bc..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define PRODUCT_ID 0x8703 -#define DEVICE_VER 0x0001 -#define PRODUCT Rouge87 Rev.1 diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json index 8faaa83fd1..2957247ad4 100644 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rouge87", + "keyboard_name": "Rouge87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8703", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h index b3ae5a7717..c7e4f601e1 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/config.h +++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8701 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity 87 rev1 - #define RGB_DI_PIN A15 #define RGBLED_NUM 26 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json index da67c40c39..e19d4dbe7d 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/info.json +++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87", + "keyboard_name": "infinity87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h index 575e826a9b..412816a0d4 100644 --- a/keyboards/mechlovin/infinity87/rev2/config.h +++ b/keyboards/mechlovin/infinity87/rev2/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8702 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity87 rev.2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index fa6073912c..609f6b1700 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87 Rev.2", + "keyboard_name": "Infinity87 Rev.2", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8702", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h index 5b1a68308b..3c2ffd4b9f 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h +++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8710 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity 87 RGB rev1 - #define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 } #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 } diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index da67c40c39..0589e3f712 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87", + "keyboard_name": "Infinity87 RGB Rev1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8710", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h index 669d79ac91..6795046f8b 100644 --- a/keyboards/mechlovin/mechlovin9/config.h +++ b/keyboards/mechlovin/mechlovin9/config.h @@ -19,10 +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 0x4D4C -#define MANUFACTURER Mechlovin Studio - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index 6fea78aecc..c0a64b984a 100644 --- a/keyboards/mechlovin/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "mechlovin9", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h index 2a9c335d73..236529e243 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/config.h +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0001 -#define PRODUCT Mechlovin9 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json new file mode 100644 index 0000000000..2153f0ad17 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Mechlovin9", + "usb": { + "pid": "0x6509", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h index ed11fafa83..c06295dfde 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/config.h +++ b/keyboards/mechlovin/mechlovin9/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0002 -#define PRODUCT Mechlovin9 Rev2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json new file mode 100644 index 0000000000..2c92773e6d --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Mechlovin9 Rev2", + "usb": { + "pid": "0x6509", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json index 2189f6bd1c..682038c681 100644 --- a/keyboards/mechwild/bde/info.json +++ b/keyboards/mechwild/bde/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "MechWild BDE Rev2", + "manufacturer": "MechWild", "url": "mechwild.com", "maintainer": "kylemccreery", + "usb": { + "vid": "0x6D77" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/lefty/config.h b/keyboards/mechwild/bde/lefty/config.h index 082295ef7c..12ce331877 100644 --- a/keyboards/mechwild/bde/lefty/config.h +++ b/keyboards/mechwild/bde/lefty/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x1701 -#define DEVICE_VER 0x0203 -#define MANUFACTURER MechWild -#define PRODUCT BDE Lefty - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 14 diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json new file mode 100644 index 0000000000..293df18387 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDE Lefty", + "usb": { + "pid": "0x1701", + "device_version": "2.0.3" + } +} diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h index 0f290ecc33..4c3f2b06ce 100644 --- a/keyboards/mechwild/bde/rev2/config.h +++ b/keyboards/mechwild/bde/rev2/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 0x170A -#define DEVICE_VER 0x0101 -#define MANUFACTURER MechWild -#define PRODUCT BDE Rev2 - /* Key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json new file mode 100644 index 0000000000..9c9aa3e2c2 --- /dev/null +++ b/keyboards/mechwild/bde/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDE Rev2", + "usb": { + "pid": "0x170A", + "device_version": "1.0.1" + } +} diff --git a/keyboards/mechwild/bde/righty/config.h b/keyboards/mechwild/bde/righty/config.h index 1764520b13..12220ca9d4 100644 --- a/keyboards/mechwild/bde/righty/config.h +++ b/keyboards/mechwild/bde/righty/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x1702 -#define DEVICE_VER 0x0203 -#define MANUFACTURER MechWild -#define PRODUCT BDE Righty - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 14 diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json new file mode 100644 index 0000000000..93161bfcec --- /dev/null +++ b/keyboards/mechwild/bde/righty/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDE Righty", + "usb": { + "pid": "0x1702", + "device_version": "2.0.3" + } +} diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index 879108d238..29bc9f07e7 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m48 - #define MATRIX_ROWS 4 // Rows are doubled-up #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json index d22cfc54fd..c67c06fb76 100644 --- a/keyboards/mlego/m48/info.json +++ b/keyboards/mlego/m48/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m48", + "keyboard_name": "48", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m48", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index dcca34c95e..06aea015e9 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6261 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { A6, A7, B0, B10 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json new file mode 100644 index 0000000000..68c73096c4 --- /dev/null +++ b/keyboards/mlego/m48/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6261", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index abce0cb5f8..6cf70e5c41 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m60 - #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json index 12924b5ea6..fc1a46cc23 100644 --- a/keyboards/mlego/m60/info.json +++ b/keyboards/mlego/m60/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m60", + "keyboard_name": "m60", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m60", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 437e605149..47d10a7078 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6161 -#define DEVICE_VER 0x0001 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json new file mode 100644 index 0000000000..865399a460 --- /dev/null +++ b/keyboards/mlego/m60/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6161", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 7282886b0b..241ea77a22 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m60_split - #define MATRIX_ROWS 10 // Rows are doubled-up #define MATRIX_COLS 6 diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json index c6c5ee480d..3212b0c613 100644 --- a/keyboards/mlego/m60_split/info.json +++ b/keyboards/mlego/m60_split/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m60_split", + "keyboard_name": "m60_split", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m65", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 0bbb56aee0..6798ee2377 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6361 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json new file mode 100644 index 0000000000..90303c33c5 --- /dev/null +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6361", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index c5b011c437..ae3af649df 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6362 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json new file mode 100644 index 0000000000..bee03f611f --- /dev/null +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6362", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index 25d69d8b7a..7ac1f7271c 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xBABA -#define MANUFACTURER Alin Elena -#define PRODUCT m65 - #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json index 175c6638c5..3c7d816d62 100644 --- a/keyboards/mlego/m65/info.json +++ b/keyboards/mlego/m65/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "M65", + "keyboard_name": "m65", + "manufacturer": "Alin Elena", "url": "https://gitlab.com/m-lego/m65", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x13": { "layout": [ diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index 0e40ae2e3d..2d55ed86a0 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x6061 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json new file mode 100644 index 0000000000..e495c94992 --- /dev/null +++ b/keyboards/mlego/m65/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6061", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index db13bbb2ad..11335a5d69 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x6061 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN B2 diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json new file mode 100644 index 0000000000..470262ed85 --- /dev/null +++ b/keyboards/mlego/m65/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6061", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index a4b1ba3343..84a0c8a19f 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x6062 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json new file mode 100644 index 0000000000..e42ab50857 --- /dev/null +++ b/keyboards/mlego/m65/rev3/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6062", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index 07dd0fefaa..b3187fbdb7 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x6062 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json new file mode 100644 index 0000000000..c94ea38e22 --- /dev/null +++ b/keyboards/mlego/m65/rev4/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6062", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index a0d39774e6..ab5238da07 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -16,11 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00DE -#define MANUFACTURER Mode -#define PRODUCT Eighty - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/mode/m80v1/m80h/config.h b/keyboards/mode/m80v1/m80h/config.h deleted file mode 100644 index b119ad4fff..0000000000 --- a/keyboards/mode/m80v1/m80h/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0081 -#define DEVICE_VER 0x0072 //H for hotswap version diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index 97d5881997..bb65727e62 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80H", + "keyboard_name": "Eighty", + "manufacturer": "Mode", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00DE", + "pid": "0x0081", + "device_version": "0.7.2" + }, "layouts": { "LAYOUT_eighty_m80h": { "layout": [ diff --git a/keyboards/mode/m80v1/m80s/config.h b/keyboards/mode/m80v1/m80s/config.h deleted file mode 100644 index 3e7f2ec3a8..0000000000 --- a/keyboards/mode/m80v1/m80s/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0080 -#define DEVICE_VER 0x0083 //S for solderable version diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index c586614a78..7b72eb256f 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80S", + "keyboard_name": "Eighty", + "manufacturer": "Mode", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00DE", + "pid": "0x0080", + "device_version": "0.8.3" + }, "layouts": { "LAYOUT_eighty_m80s": { "layout": [ diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index fbe5fb86df..9382def58a 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00DE -#define DEVICE_VER 0x0002 -#define MANUFACTURER Mode - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mode/m80v2/m80v2h/config.h b/keyboards/mode/m80v2/m80v2h/config.h deleted file mode 100644 index f474e28453..0000000000 --- a/keyboards/mode/m80v2/m80v2h/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PRODUCT_ID 0x0083 // 81 was used for M80H V1 -#define PRODUCT M80H V2 diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 251937c562..13bd6c67bc 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80V2H", + "keyboard_name": "M80H V2", + "manufacturer": "Mode", "url": "https://shop.modedesigns.com/collections/eighty", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x0083", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_m80v2h": { "layout": [ diff --git a/keyboards/mode/m80v2/m80v2s/config.h b/keyboards/mode/m80v2/m80v2s/config.h deleted file mode 100644 index ad1871f8ab..0000000000 --- a/keyboards/mode/m80v2/m80v2s/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PRODUCT_ID 0x0082 // 81 was used for M80H V1 -#define PRODUCT M80S V2 diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 6e0bd62d51..4e2a4fc6f5 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80V2S", + "keyboard_name": "M80S V2", + "manufacturer": "Mode", "url": "https://shop.modedesigns.com/collections/eighty", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x0082", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_m80v2s": { "layout": [ diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index 2c98d5a78c..3fd078898b 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Murciélago", + "manufacturer": "elagil", "url": "", "maintainer": "elagil", + "usb": { + "vid": "0x6166", + "pid": "0x0001", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h index 2851ae884b..5043f4766d 100644 --- a/keyboards/murcielago/rev1/config.h +++ b/keyboards/murcielago/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6166 // af -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0002 -#define MANUFACTURER elagil -#define PRODUCT Murciélago - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 6 diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index 0c5a34fdf5..7c0f4e087b 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7BA1 -#define PRODUCT_ID 0x3201 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MWStudio -#define PRODUCT AlickKK - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json new file mode 100644 index 0000000000..7a2f830273 --- /dev/null +++ b/keyboards/mwstudio/alicekk/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "AliceKK", + "manufacturer": "MWStudio", + "usb": { + "vid": "0x7BA1", + "pid": "0x3201", + "device_version": "0.0.1" + } +} diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h index 79798b1d66..e352a1ab92 100755 --- a/keyboards/neopad/config.h +++ b/keyboards/neopad/config.h @@ -18,12 +18,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 0x0913 -#define MANUFACTURER rookiebwoy -#define PRODUCT neopad - /* Column/Row IO definitions */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h index 92d3392715..f515a3ed5e 100755 --- a/keyboards/neopad/rev1/config.h +++ b/keyboards/neopad/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json index b5868084d1..ef84eef161 100755 --- a/keyboards/neopad/rev1/info.json +++ b/keyboards/neopad/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "neopad", + "manufacturer": "rookiebwoy", "url": "https://github.com/rookiebwoy/neopad)", "maintainer": "rookiebwoy", + "usb": { + "vid": "0xFEED", + "pid": "0x0913", + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index f1f26cdbc1..bd17360076 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -20,13 +20,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4E65 //'Ne' -#define PRODUCT_ID 0x700E // -#define DEVICE_VER 0x0001 -#define MANUFACTURER Neson Design -#define PRODUCT 700E Keyboard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index 270f1ed53c..4d4d427097 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "700E", + "manufacturer": "Neson Design", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4E65", + "pid": "0x700E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": diff --git a/keyboards/opendeck/32/info.json b/keyboards/opendeck/32/info.json index ad354e7506..8e22d925b1 100644 --- a/keyboards/opendeck/32/info.json +++ b/keyboards/opendeck/32/info.json @@ -1,5 +1,11 @@ { - "keyboard_name": "OpenDeck 32", + "keyboard_name": "OpenDeck32", + "manufacturer": "OpenDeck", + "usb": { + "vid": "0x4345", + "pid": "0x2EC0", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x8": { "layout": [ diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h index 73967671d0..6a87ad86b4 100644 --- a/keyboards/opendeck/32/rev1/config.h +++ b/keyboards/opendeck/32/rev1/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0x4345 -#define PRODUCT_ID 0x2EC0 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OpenDeck -#define PRODUCT OpenDeck32 - // Key matrix (TtB, LtR) #define MATRIX_ROWS 4 #define MATRIX_COLS 8 |