commit f4dcce7e5975276ef41d882a15e6a459b6b3689d parent 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a Author: Ryan <fauxpark@gmail.com> Date: Sat, 20 Aug 2022 10:45:28 +1000 Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090) Diffstat:
149 files changed, 1128 insertions(+), 1165 deletions(-)
diff --git a/keyboards/maple_computing/christmas_tree/V2017/config.h b/keyboards/maple_computing/christmas_tree/V2017/config.h @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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/info.json b/keyboards/marksard/rhymestone/info.json @@ -1,211 +0,0 @@ -{ - "keyboard_name": "Rhymestone", - "url": "https://github.com/marksard/Keyboards", - "maintainer": "marksard", - "layouts": { - "LAYOUT_ortho_4x10": { - "layout": [ - { - "label": "Q", - "x": 0, - "y": 0 - }, - { - "label": "W", - "x": 1, - "y": 0 - }, - { - "label": "E", - "x": 2, - "y": 0 - }, - { - "label": "R", - "x": 3, - "y": 0 - }, - { - "label": "T", - "x": 4, - "y": 0 - }, - { - "label": "Y", - "x": 6, - "y": 0 - }, - { - "label": "U", - "x": 7, - "y": 0 - }, - { - "label": "I", - "x": 8, - "y": 0 - }, - { - "label": "O", - "x": 9, - "y": 0 - }, - { - "label": "P", - "x": 10, - "y": 0 - }, - { - "label": "A", - "x": 0, - "y": 1 - }, - { - "label": "S", - "x": 1, - "y": 1 - }, - { - "label": "D", - "x": 2, - "y": 1 - }, - { - "label": "F", - "x": 3, - "y": 1 - }, - { - "label": "G", - "x": 4, - "y": 1 - }, - { - "label": "H", - "x": 6, - "y": 1 - }, - { - "label": "J", - "x": 7, - "y": 1 - }, - { - "label": "K", - "x": 8, - "y": 1 - }, - { - "label": "L", - "x": 9, - "y": 1 - }, - { - "label": "Enter", - "x": 10, - "y": 1 - }, - { - "label": "Z", - "x": 0, - "y": 2 - }, - { - "label": "X", - "x": 1, - "y": 2 - }, - { - "label": "C", - "x": 2, - "y": 2 - }, - { - "label": "V", - "x": 3, - "y": 2 - }, - { - "label": "B", - "x": 4, - "y": 2 - }, - { - "label": "N", - "x": 6, - "y": 2 - }, - { - "label": "M", - "x": 7, - "y": 2 - }, - { - "label": ",", - "x": 8, - "y": 2 - }, - { - "label": ".", - "x": 9, - "y": 2 - }, - { - "label": "/", - "x": 10, - "y": 2 - }, - { - "label": "Ctrl", - "x": 0, - "y": 3 - }, - { - "label": "Win", - "x": 1, - "y": 3 - }, - { - "label": "Alt", - "x": 2, - "y": 3 - }, - { - "label": "Lower", - "x": 3, - "y": 3 - }, - { - "label": "backspace", - "x": 4, - "y": 3 - }, - { - "label": "space", - "x": 6, - "y": 3 - }, - { - "label": "Upper", - "x": 7, - "y": 3 - }, - { - "label": "Alt", - "x": 8, - "y": 3 - }, - { - "label": "App", - "x": 9, - "y": 3 - }, - { - "label": "Ctrl", - "x": 10, - "y": 3 - } - ] - } - } -} diff --git 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/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json @@ -0,0 +1,217 @@ +{ + "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": [ + { + "label": "Q", + "x": 0, + "y": 0 + }, + { + "label": "W", + "x": 1, + "y": 0 + }, + { + "label": "E", + "x": 2, + "y": 0 + }, + { + "label": "R", + "x": 3, + "y": 0 + }, + { + "label": "T", + "x": 4, + "y": 0 + }, + { + "label": "Y", + "x": 6, + "y": 0 + }, + { + "label": "U", + "x": 7, + "y": 0 + }, + { + "label": "I", + "x": 8, + "y": 0 + }, + { + "label": "O", + "x": 9, + "y": 0 + }, + { + "label": "P", + "x": 10, + "y": 0 + }, + { + "label": "A", + "x": 0, + "y": 1 + }, + { + "label": "S", + "x": 1, + "y": 1 + }, + { + "label": "D", + "x": 2, + "y": 1 + }, + { + "label": "F", + "x": 3, + "y": 1 + }, + { + "label": "G", + "x": 4, + "y": 1 + }, + { + "label": "H", + "x": 6, + "y": 1 + }, + { + "label": "J", + "x": 7, + "y": 1 + }, + { + "label": "K", + "x": 8, + "y": 1 + }, + { + "label": "L", + "x": 9, + "y": 1 + }, + { + "label": "Enter", + "x": 10, + "y": 1 + }, + { + "label": "Z", + "x": 0, + "y": 2 + }, + { + "label": "X", + "x": 1, + "y": 2 + }, + { + "label": "C", + "x": 2, + "y": 2 + }, + { + "label": "V", + "x": 3, + "y": 2 + }, + { + "label": "B", + "x": 4, + "y": 2 + }, + { + "label": "N", + "x": 6, + "y": 2 + }, + { + "label": "M", + "x": 7, + "y": 2 + }, + { + "label": ",", + "x": 8, + "y": 2 + }, + { + "label": ".", + "x": 9, + "y": 2 + }, + { + "label": "/", + "x": 10, + "y": 2 + }, + { + "label": "Ctrl", + "x": 0, + "y": 3 + }, + { + "label": "Win", + "x": 1, + "y": 3 + }, + { + "label": "Alt", + "x": 2, + "y": 3 + }, + { + "label": "Lower", + "x": 3, + "y": 3 + }, + { + "label": "backspace", + "x": 4, + "y": 3 + }, + { + "label": "space", + "x": 6, + "y": 3 + }, + { + "label": "Upper", + "x": 7, + "y": 3 + }, + { + "label": "Alt", + "x": 8, + "y": 3 + }, + { + "label": "App", + "x": 9, + "y": 3 + }, + { + "label": "Ctrl", + "x": 10, + "y": 3 + } + ] + } + } +} diff --git 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 @@ -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 @@ -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 @@ -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 @@ -0,0 +1,6 @@ +{ + "keyboard_name": "treadstone32", + "usb": { + "device_version": "0.1.0" + } +} diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/info.json @@ -1,277 +0,0 @@ -{ - "keyboard_name": "Classy TKL", - "url": "https://geekhack.org/index.php?topic=105933", - "maintainer": "qmk", - "layouts": { - "LAYOUT_all": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 2, "y": 0 }, - { "label": "F2", "x": 3, "y": 0 }, - { "label": "F3", "x": 4, "y": 0 }, - { "label": "F4", "x": 5, "y": 0 }, - { "label": "F5", "x": 6.5, "y": 0 }, - { "label": "F6", "x": 7.5, "y": 0 }, - { "label": "F7", "x": 8.5, "y": 0 }, - { "label": "F8", "x": 9.5, "y": 0 }, - { "label": "F9", "x": 11, "y": 0 }, - { "label": "F10", "x": 12, "y": 0 }, - { "label": "F11", "x": 13, "y": 0 }, - { "label": "F12", "x": 14, "y": 0 }, - { "label": "PrtSc", "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "x": 16.25, "y": 0 }, - { "label": "Pause", "x": 17.25, "y": 0 }, - { "label": "~", "x": 0, "y": 1.5 }, - { "label": "!", "x": 1, "y": 1.5 }, - { "label": "@", "x": 2, "y": 1.5 }, - { "label": "#", "x": 3, "y": 1.5 }, - { "label": "$", "x": 4, "y": 1.5 }, - { "label": "%", "x": 5, "y": 1.5 }, - { "label": "^", "x": 6, "y": 1.5 }, - { "label": "&", "x": 7, "y": 1.5 }, - { "label": "*", "x": 8, "y": 1.5 }, - { "label": "(", "x": 9, "y": 1.5 }, - { "label": ")", "x": 10, "y": 1.5 }, - { "label": "_", "x": 11, "y": 1.5 }, - { "label": "+", "x": 12, "y": 1.5 }, - { "label": "Backspace", "x": 13, "y": 1.5 }, - { "label": "Backspace2", "x": 14, "y": 1.5 }, - { "label": "Insert", "x": 15.25, "y": 1.5 }, - { "label": "Home", "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "x": 17.25, "y": 1.5 }, - { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.5 }, - { "label": "W", "x": 2.5, "y": 2.5 }, - { "label": "E", "x": 3.5, "y": 2.5 }, - { "label": "R", "x": 4.5, "y": 2.5 }, - { "label": "T", "x": 5.5, "y": 2.5 }, - { "label": "Y", "x": 6.5, "y": 2.5 }, - { "label": "U", "x": 7.5, "y": 2.5 }, - { "label": "I", "x": 8.5, "y": 2.5 }, - { "label": "O", "x": 9.5, "y": 2.5 }, - { "label": "P", "x": 10.5, "y": 2.5 }, - { "label": "{", "x": 11.5, "y": 2.5 }, - { "label": "}", "x": 12.5, "y": 2.5 }, - { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "Delete", "x": 15.25, "y": 2.5 }, - { "label": "End", "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "x": 17.25, "y": 2.5 }, - { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.5 }, - { "label": "S", "x": 2.75, "y": 3.5 }, - { "label": "D", "x": 3.75, "y": 3.5 }, - { "label": "F", "x": 4.75, "y": 3.5 }, - { "label": "G", "x": 5.75, "y": 3.5 }, - { "label": "H", "x": 6.75, "y": 3.5 }, - { "label": "J", "x": 7.75, "y": 3.5 }, - { "label": "K", "x": 8.75, "y": 3.5 }, - { "label": "L", "x": 9.75, "y": 3.5 }, - { "label": ":", "x": 10.75, "y": 3.5 }, - { "label": "\"", "x": 11.75, "y": 3.5 }, - { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, - { "label": "|", "x": 1.25, "y": 4.5 }, - { "label": "Z", "x": 2.25, "y": 4.5 }, - { "label": "X", "x": 3.25, "y": 4.5 }, - { "label": "C", "x": 4.25, "y": 4.5 }, - { "label": "V", "x": 5.25, "y": 4.5 }, - { "label": "B", "x": 6.25, "y": 4.5 }, - { "label": "N", "x": 7.25, "y": 4.5 }, - { "label": "M", "x": 8.25, "y": 4.5 }, - { "label": "<", "x": 9.25, "y": 4.5 }, - { "label": ">", "x": 10.25, "y": 4.5 }, - { "label": "?", "x": 11.25, "y": 4.5 }, - { "label": "Shift", "x": 12.25, "y": 4.5, "w": 1.75 }, - { "label": "Shift2", "x": 14, "y": 4.5, "w": 1 }, - { "label": "Up", "x": 16.25, "y": 4.5 }, - { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.5, "w": 1 }, - { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, - { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, - { "label": "Win", "x": 12.5, "y": 5.5, "w": 1 }, - { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, - { "label": "Left", "x": 15.25, "y": 5.5 }, - { "label": "Down", "x": 16.25, "y": 5.5 }, - { "label": "Right", "x": 17.25, "y": 5.5 } - ] - }, - "LAYOUT_tkl_ansi_wkl": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 2, "y": 0 }, - { "label": "F2", "x": 3, "y": 0 }, - { "label": "F3", "x": 4, "y": 0 }, - { "label": "F4", "x": 5, "y": 0 }, - { "label": "F5", "x": 6.5, "y": 0 }, - { "label": "F6", "x": 7.5, "y": 0 }, - { "label": "F7", "x": 8.5, "y": 0 }, - { "label": "F8", "x": 9.5, "y": 0 }, - { "label": "F9", "x": 11, "y": 0 }, - { "label": "F10", "x": 12, "y": 0 }, - { "label": "F11", "x": 13, "y": 0 }, - { "label": "F12", "x": 14, "y": 0 }, - { "label": "PrtSc", "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "x": 16.25, "y": 0 }, - { "label": "Pause", "x": 17.25, "y": 0 }, - { "label": "~", "x": 0, "y": 1.5 }, - { "label": "!", "x": 1, "y": 1.5 }, - { "label": "@", "x": 2, "y": 1.5 }, - { "label": "#", "x": 3, "y": 1.5 }, - { "label": "$", "x": 4, "y": 1.5 }, - { "label": "%", "x": 5, "y": 1.5 }, - { "label": "^", "x": 6, "y": 1.5 }, - { "label": "&", "x": 7, "y": 1.5 }, - { "label": "*", "x": 8, "y": 1.5 }, - { "label": "(", "x": 9, "y": 1.5 }, - { "label": ")", "x": 10, "y": 1.5 }, - { "label": "_", "x": 11, "y": 1.5 }, - { "label": "+", "x": 12, "y": 1.5 }, - { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, - { "label": "Insert", "x": 15.25, "y": 1.5 }, - { "label": "Home", "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "x": 17.25, "y": 1.5 }, - { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.5 }, - { "label": "W", "x": 2.5, "y": 2.5 }, - { "label": "E", "x": 3.5, "y": 2.5 }, - { "label": "R", "x": 4.5, "y": 2.5 }, - { "label": "T", "x": 5.5, "y": 2.5 }, - { "label": "Y", "x": 6.5, "y": 2.5 }, - { "label": "U", "x": 7.5, "y": 2.5 }, - { "label": "I", "x": 8.5, "y": 2.5 }, - { "label": "O", "x": 9.5, "y": 2.5 }, - { "label": "P", "x": 10.5, "y": 2.5 }, - { "label": "{", "x": 11.5, "y": 2.5 }, - { "label": "}", "x": 12.5, "y": 2.5 }, - { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "Delete", "x": 15.25, "y": 2.5 }, - { "label": "End", "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "x": 17.25, "y": 2.5 }, - { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.5 }, - { "label": "S", "x": 2.75, "y": 3.5 }, - { "label": "D", "x": 3.75, "y": 3.5 }, - { "label": "F", "x": 4.75, "y": 3.5 }, - { "label": "G", "x": 5.75, "y": 3.5 }, - { "label": "H", "x": 6.75, "y": 3.5 }, - { "label": "J", "x": 7.75, "y": 3.5 }, - { "label": "K", "x": 8.75, "y": 3.5 }, - { "label": "L", "x": 9.75, "y": 3.5 }, - { "label": ":", "x": 10.75, "y": 3.5 }, - { "label": "\"", "x": 11.75, "y": 3.5 }, - { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 4.5 }, - { "label": "X", "x": 3.25, "y": 4.5 }, - { "label": "C", "x": 4.25, "y": 4.5 }, - { "label": "V", "x": 5.25, "y": 4.5 }, - { "label": "B", "x": 6.25, "y": 4.5 }, - { "label": "N", "x": 7.25, "y": 4.5 }, - { "label": "M", "x": 8.25, "y": 4.5 }, - { "label": "<", "x": 9.25, "y": 4.5 }, - { "label": ">", "x": 10.25, "y": 4.5 }, - { "label": "?", "x": 11.25, "y": 4.5 }, - { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, - { "label": "Up", "x": 16.25, "y": 4.5 }, - { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, - { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, - { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, - { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, - { "label": "Left", "x": 15.25, "y": 5.5 }, - { "label": "Down", "x": 16.25, "y": 5.5 }, - { "label": "Right", "x": 17.25, "y": 5.5 } - ] - }, - "LAYOUT_tkl_iso_wkl": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 2, "y": 0 }, - { "label": "F2", "x": 3, "y": 0 }, - { "label": "F3", "x": 4, "y": 0 }, - { "label": "F4", "x": 5, "y": 0 }, - { "label": "F5", "x": 6.5, "y": 0 }, - { "label": "F6", "x": 7.5, "y": 0 }, - { "label": "F7", "x": 8.5, "y": 0 }, - { "label": "F8", "x": 9.5, "y": 0 }, - { "label": "F9", "x": 11, "y": 0 }, - { "label": "F10", "x": 12, "y": 0 }, - { "label": "F11", "x": 13, "y": 0 }, - { "label": "F12", "x": 14, "y": 0 }, - { "label": "PrtSc", "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "x": 16.25, "y": 0 }, - { "label": "Pause", "x": 17.25, "y": 0 }, - { "label": "\u00ac", "x": 0, "y": 1.5 }, - { "label": "!", "x": 1, "y": 1.5 }, - { "label": "\"", "x": 2, "y": 1.5 }, - { "label": "\u00a3", "x": 3, "y": 1.5 }, - { "label": "$", "x": 4, "y": 1.5 }, - { "label": "%", "x": 5, "y": 1.5 }, - { "label": "^", "x": 6, "y": 1.5 }, - { "label": "&", "x": 7, "y": 1.5 }, - { "label": "*", "x": 8, "y": 1.5 }, - { "label": "(", "x": 9, "y": 1.5 }, - { "label": ")", "x": 10, "y": 1.5 }, - { "label": "_", "x": 11, "y": 1.5 }, - { "label": "+", "x": 12, "y": 1.5 }, - { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, - { "label": "Insert", "x": 15.25, "y": 1.5 }, - { "label": "Home", "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "x": 17.25, "y": 1.5 }, - { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.5 }, - { "label": "W", "x": 2.5, "y": 2.5 }, - { "label": "E", "x": 3.5, "y": 2.5 }, - { "label": "R", "x": 4.5, "y": 2.5 }, - { "label": "T", "x": 5.5, "y": 2.5 }, - { "label": "Y", "x": 6.5, "y": 2.5 }, - { "label": "U", "x": 7.5, "y": 2.5 }, - { "label": "I", "x": 8.5, "y": 2.5 }, - { "label": "O", "x": 9.5, "y": 2.5 }, - { "label": "P", "x": 10.5, "y": 2.5 }, - { "label": "{", "x": 11.5, "y": 2.5 }, - { "label": "}", "x": 12.5, "y": 2.5 }, - { "label": "Delete", "x": 15.25, "y": 2.5 }, - { "label": "End", "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "x": 17.25, "y": 2.5 }, - { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.5 }, - { "label": "S", "x": 2.75, "y": 3.5 }, - { "label": "D", "x": 3.75, "y": 3.5 }, - { "label": "F", "x": 4.75, "y": 3.5 }, - { "label": "G", "x": 5.75, "y": 3.5 }, - { "label": "H", "x": 6.75, "y": 3.5 }, - { "label": "J", "x": 7.75, "y": 3.5 }, - { "label": "K", "x": 8.75, "y": 3.5 }, - { "label": "L", "x": 9.75, "y": 3.5 }, - { "label": ":", "x": 10.75, "y": 3.5 }, - { "label": "@", "x": 11.75, "y": 3.5 }, - { "label": "~", "x": 12.75, "y": 3.5 }, - { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 }, - { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, - { "label": "|", "x": 1.25, "y": 4.5 }, - { "label": "Z", "x": 2.25, "y": 4.5 }, - { "label": "X", "x": 3.25, "y": 4.5 }, - { "label": "C", "x": 4.25, "y": 4.5 }, - { "label": "V", "x": 5.25, "y": 4.5 }, - { "label": "B", "x": 6.25, "y": 4.5 }, - { "label": "N", "x": 7.25, "y": 4.5 }, - { "label": "M", "x": 8.25, "y": 4.5 }, - { "label": "<", "x": 9.25, "y": 4.5 }, - { "label": ">", "x": 10.25, "y": 4.5 }, - { "label": "?", "x": 11.25, "y": 4.5 }, - { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, - { "label": "Up", "x": 16.25, "y": 4.5 }, - { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, - { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, - { "label": "AltGr", "x": 11, "y": 5.5, "w": 1.5 }, - { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, - { "label": "Left", "x": 15.25, "y": 5.5 }, - { "label": "Down", "x": 16.25, "y": 5.5 }, - { "label": "Right", "x": 17.25, "y": 5.5 } - ] - } - } -} diff --git 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/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json @@ -0,0 +1,283 @@ +{ + "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": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 2, "y": 0 }, + { "label": "F2", "x": 3, "y": 0 }, + { "label": "F3", "x": 4, "y": 0 }, + { "label": "F4", "x": 5, "y": 0 }, + { "label": "F5", "x": 6.5, "y": 0 }, + { "label": "F6", "x": 7.5, "y": 0 }, + { "label": "F7", "x": 8.5, "y": 0 }, + { "label": "F8", "x": 9.5, "y": 0 }, + { "label": "F9", "x": 11, "y": 0 }, + { "label": "F10", "x": 12, "y": 0 }, + { "label": "F11", "x": 13, "y": 0 }, + { "label": "F12", "x": 14, "y": 0 }, + { "label": "PrtSc", "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "label": "Pause", "x": 17.25, "y": 0 }, + { "label": "~", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "@", "x": 2, "y": 1.5 }, + { "label": "#", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 7, "y": 1.5 }, + { "label": "*", "x": 8, "y": 1.5 }, + { "label": "(", "x": 9, "y": 1.5 }, + { "label": ")", "x": 10, "y": 1.5 }, + { "label": "_", "x": 11, "y": 1.5 }, + { "label": "+", "x": 12, "y": 1.5 }, + { "label": "Backspace", "x": 13, "y": 1.5 }, + { "label": "Backspace2", "x": 14, "y": 1.5 }, + { "label": "Insert", "x": 15.25, "y": 1.5 }, + { "label": "Home", "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "x": 17.25, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 6.5, "y": 2.5 }, + { "label": "U", "x": 7.5, "y": 2.5 }, + { "label": "I", "x": 8.5, "y": 2.5 }, + { "label": "O", "x": 9.5, "y": 2.5 }, + { "label": "P", "x": 10.5, "y": 2.5 }, + { "label": "{", "x": 11.5, "y": 2.5 }, + { "label": "}", "x": 12.5, "y": 2.5 }, + { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "Delete", "x": 15.25, "y": 2.5 }, + { "label": "End", "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 6.75, "y": 3.5 }, + { "label": "J", "x": 7.75, "y": 3.5 }, + { "label": "K", "x": 8.75, "y": 3.5 }, + { "label": "L", "x": 9.75, "y": 3.5 }, + { "label": ":", "x": 10.75, "y": 3.5 }, + { "label": "\"", "x": 11.75, "y": 3.5 }, + { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 4.5 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "N", "x": 7.25, "y": 4.5 }, + { "label": "M", "x": 8.25, "y": 4.5 }, + { "label": "<", "x": 9.25, "y": 4.5 }, + { "label": ">", "x": 10.25, "y": 4.5 }, + { "label": "?", "x": 11.25, "y": 4.5 }, + { "label": "Shift", "x": 12.25, "y": 4.5, "w": 1.75 }, + { "label": "Shift2", "x": 14, "y": 4.5, "w": 1 }, + { "label": "Up", "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "Win", "x": 1.5, "y": 5.5, "w": 1 }, + { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, + { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "Win", "x": 12.5, "y": 5.5, "w": 1 }, + { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, + { "label": "Left", "x": 15.25, "y": 5.5 }, + { "label": "Down", "x": 16.25, "y": 5.5 }, + { "label": "Right", "x": 17.25, "y": 5.5 } + ] + }, + "LAYOUT_tkl_ansi_wkl": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 2, "y": 0 }, + { "label": "F2", "x": 3, "y": 0 }, + { "label": "F3", "x": 4, "y": 0 }, + { "label": "F4", "x": 5, "y": 0 }, + { "label": "F5", "x": 6.5, "y": 0 }, + { "label": "F6", "x": 7.5, "y": 0 }, + { "label": "F7", "x": 8.5, "y": 0 }, + { "label": "F8", "x": 9.5, "y": 0 }, + { "label": "F9", "x": 11, "y": 0 }, + { "label": "F10", "x": 12, "y": 0 }, + { "label": "F11", "x": 13, "y": 0 }, + { "label": "F12", "x": 14, "y": 0 }, + { "label": "PrtSc", "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "label": "Pause", "x": 17.25, "y": 0 }, + { "label": "~", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "@", "x": 2, "y": 1.5 }, + { "label": "#", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 7, "y": 1.5 }, + { "label": "*", "x": 8, "y": 1.5 }, + { "label": "(", "x": 9, "y": 1.5 }, + { "label": ")", "x": 10, "y": 1.5 }, + { "label": "_", "x": 11, "y": 1.5 }, + { "label": "+", "x": 12, "y": 1.5 }, + { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, + { "label": "Insert", "x": 15.25, "y": 1.5 }, + { "label": "Home", "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "x": 17.25, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 6.5, "y": 2.5 }, + { "label": "U", "x": 7.5, "y": 2.5 }, + { "label": "I", "x": 8.5, "y": 2.5 }, + { "label": "O", "x": 9.5, "y": 2.5 }, + { "label": "P", "x": 10.5, "y": 2.5 }, + { "label": "{", "x": 11.5, "y": 2.5 }, + { "label": "}", "x": 12.5, "y": 2.5 }, + { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "Delete", "x": 15.25, "y": 2.5 }, + { "label": "End", "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 6.75, "y": 3.5 }, + { "label": "J", "x": 7.75, "y": 3.5 }, + { "label": "K", "x": 8.75, "y": 3.5 }, + { "label": "L", "x": 9.75, "y": 3.5 }, + { "label": ":", "x": 10.75, "y": 3.5 }, + { "label": "\"", "x": 11.75, "y": 3.5 }, + { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "N", "x": 7.25, "y": 4.5 }, + { "label": "M", "x": 8.25, "y": 4.5 }, + { "label": "<", "x": 9.25, "y": 4.5 }, + { "label": ">", "x": 10.25, "y": 4.5 }, + { "label": "?", "x": 11.25, "y": 4.5 }, + { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, + { "label": "Up", "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, + { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, + { "label": "Left", "x": 15.25, "y": 5.5 }, + { "label": "Down", "x": 16.25, "y": 5.5 }, + { "label": "Right", "x": 17.25, "y": 5.5 } + ] + }, + "LAYOUT_tkl_iso_wkl": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 2, "y": 0 }, + { "label": "F2", "x": 3, "y": 0 }, + { "label": "F3", "x": 4, "y": 0 }, + { "label": "F4", "x": 5, "y": 0 }, + { "label": "F5", "x": 6.5, "y": 0 }, + { "label": "F6", "x": 7.5, "y": 0 }, + { "label": "F7", "x": 8.5, "y": 0 }, + { "label": "F8", "x": 9.5, "y": 0 }, + { "label": "F9", "x": 11, "y": 0 }, + { "label": "F10", "x": 12, "y": 0 }, + { "label": "F11", "x": 13, "y": 0 }, + { "label": "F12", "x": 14, "y": 0 }, + { "label": "PrtSc", "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "label": "Pause", "x": 17.25, "y": 0 }, + { "label": "\u00ac", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "\"", "x": 2, "y": 1.5 }, + { "label": "\u00a3", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 7, "y": 1.5 }, + { "label": "*", "x": 8, "y": 1.5 }, + { "label": "(", "x": 9, "y": 1.5 }, + { "label": ")", "x": 10, "y": 1.5 }, + { "label": "_", "x": 11, "y": 1.5 }, + { "label": "+", "x": 12, "y": 1.5 }, + { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, + { "label": "Insert", "x": 15.25, "y": 1.5 }, + { "label": "Home", "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "x": 17.25, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 6.5, "y": 2.5 }, + { "label": "U", "x": 7.5, "y": 2.5 }, + { "label": "I", "x": 8.5, "y": 2.5 }, + { "label": "O", "x": 9.5, "y": 2.5 }, + { "label": "P", "x": 10.5, "y": 2.5 }, + { "label": "{", "x": 11.5, "y": 2.5 }, + { "label": "}", "x": 12.5, "y": 2.5 }, + { "label": "Delete", "x": 15.25, "y": 2.5 }, + { "label": "End", "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 6.75, "y": 3.5 }, + { "label": "J", "x": 7.75, "y": 3.5 }, + { "label": "K", "x": 8.75, "y": 3.5 }, + { "label": "L", "x": 9.75, "y": 3.5 }, + { "label": ":", "x": 10.75, "y": 3.5 }, + { "label": "@", "x": 11.75, "y": 3.5 }, + { "label": "~", "x": 12.75, "y": 3.5 }, + { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 4.5 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "N", "x": 7.25, "y": 4.5 }, + { "label": "M", "x": 8.25, "y": 4.5 }, + { "label": "<", "x": 9.25, "y": 4.5 }, + { "label": ">", "x": 10.25, "y": 4.5 }, + { "label": "?", "x": 11.25, "y": 4.5 }, + { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, + { "label": "Up", "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, + { "label": "AltGr", "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, + { "label": "Left", "x": 15.25, "y": 5.5 }, + { "label": "Down", "x": 16.25, "y": 5.5 }, + { "label": "Right", "x": 17.25, "y": 5.5 } + ] + } + } +} diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json @@ -0,0 +1,229 @@ +{ + "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": [ + {"label":"K00 (B0,B5)", "x":0, "y":0}, + {"label":"K01 (B0,B6)", "x":1, "y":0}, + {"label":"K02 (B0,B7)", "x":2, "y":0}, + {"label":"K03 (B0,C0)", "x":3, "y":0}, + {"label":"K04 (B0,C1)", "x":4, "y":0}, + {"label":"K05 (B0,C2)", "x":5, "y":0}, + {"label":"K06 (B0,C3)", "x":6, "y":0}, + {"label":"K07 (B0,C4)", "x":7, "y":0}, + {"label":"K08 (B0,C5)", "x":8, "y":0}, + {"label":"K09 (B0,C6)", "x":9, "y":0}, + {"label":"K0A (B0,C7)", "x":10, "y":0}, + {"label":"K0B (B0,D0)", "x":11, "y":0}, + {"label":"K0C (B0,D1)", "x":12, "y":0}, + {"label":"K0D (B0,D2)", "x":13, "y":0}, + {"label":"K1D (B1,D2)", "x":14, "y":0}, + {"label":"K0E (B0,D3)", "x":15, "y":0}, + {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, + {"label":"K11 (B1,B6)", "x":1.5, "y":1}, + {"label":"K12 (B1,B7)", "x":2.5, "y":1}, + {"label":"K13 (B1,C0)", "x":3.5, "y":1}, + {"label":"K14 (B1,C1)", "x":4.5, "y":1}, + {"label":"K15 (B1,C2)", "x":5.5, "y":1}, + {"label":"K16 (B1,C3)", "x":6.5, "y":1}, + {"label":"K17 (B1,C4)", "x":7.5, "y":1}, + {"label":"K18 (B1,C5)", "x":8.5, "y":1}, + {"label":"K19 (B1,C6)", "x":9.5, "y":1}, + {"label":"K1A (B1,C7)", "x":10.5, "y":1}, + {"label":"K1B (B1,D0)", "x":11.5, "y":1}, + {"label":"K1C (B1,D1)", "x":12.5, "y":1}, + {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5}, + {"label":"K1E (B1,D3)", "x":15, "y":1}, + {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, + {"label":"K21 (B2,B6)", "x":1.75, "y":2}, + {"label":"K22 (B2,B7)", "x":2.75, "y":2}, + {"label":"K23 (B2,C0)", "x":3.75, "y":2}, + {"label":"K24 (B2,C1)", "x":4.75, "y":2}, + {"label":"K25 (B2,C2)", "x":5.75, "y":2}, + {"label":"K26 (B2,C3)", "x":6.75, "y":2}, + {"label":"K27 (B2,C4)", "x":7.75, "y":2}, + {"label":"K28 (B2,C5)", "x":8.75, "y":2}, + {"label":"K29 (B2,C6)", "x":9.75, "y":2}, + {"label":"K2A (B2,C7)", "x":10.75, "y":2}, + {"label":"K2B (B2,D0)", "x":11.75, "y":2}, + {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, + {"label":"K2E (B2,D3)", "x":15, "y":2}, + {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25}, + {"label":"K31 (B3,B6)", "x":1.25, "y":3}, + {"label":"K32 (B3,B7)", "x":2.25, "y":3}, + {"label":"K33 (B3,C0)", "x":3.25, "y":3}, + {"label":"K34 (B3,C1)", "x":4.25, "y":3}, + {"label":"K35 (B3,C2)", "x":5.25, "y":3}, + {"label":"K36 (B3,C3)", "x":6.25, "y":3}, + {"label":"K37 (B3,C4)", "x":7.25, "y":3}, + {"label":"K38 (B3,C5)", "x":8.25, "y":3}, + {"label":"K39 (B3,C6)", "x":9.25, "y":3}, + {"label":"K3A (B3,C7)", "x":10.25, "y":3}, + {"label":"K3B (B3,D0)", "x":11.25, "y":3}, + {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, + {"label":"K3D (B3,D2)", "x":14, "y":3}, + {"label":"K3E (B3,D3)", "x":15, "y":3}, + {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25}, + {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25}, + {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25}, + {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25}, + {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25}, + {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25}, + {"label":"K4C (B4,D1)", "x":13, "y":4}, + {"label":"K4D (B4,D2)", "x":14, "y":4}, + {"label":"K4E (B4,D3)", "x":15, "y":4} + ] + }, + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label":"K00 (B0,B5)", "x":0, "y":0}, + {"label":"K01 (B0,B6)", "x":1, "y":0}, + {"label":"K02 (B0,B7)", "x":2, "y":0}, + {"label":"K03 (B0,C0)", "x":3, "y":0}, + {"label":"K04 (B0,C1)", "x":4, "y":0}, + {"label":"K05 (B0,C2)", "x":5, "y":0}, + {"label":"K06 (B0,C3)", "x":6, "y":0}, + {"label":"K07 (B0,C4)", "x":7, "y":0}, + {"label":"K08 (B0,C5)", "x":8, "y":0}, + {"label":"K09 (B0,C6)", "x":9, "y":0}, + {"label":"K0A (B0,C7)", "x":10, "y":0}, + {"label":"K0B (B0,D0)", "x":11, "y":0}, + {"label":"K0C (B0,D1)", "x":12, "y":0}, + {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2}, + {"label":"K0E (B0,D3)", "x":15, "y":0}, + {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, + {"label":"K11 (B1,B6)", "x":1.5, "y":1}, + {"label":"K12 (B1,B7)", "x":2.5, "y":1}, + {"label":"K13 (B1,C0)", "x":3.5, "y":1}, + {"label":"K14 (B1,C1)", "x":4.5, "y":1}, + {"label":"K15 (B1,C2)", "x":5.5, "y":1}, + {"label":"K16 (B1,C3)", "x":6.5, "y":1}, + {"label":"K17 (B1,C4)", "x":7.5, "y":1}, + {"label":"K18 (B1,C5)", "x":8.5, "y":1}, + {"label":"K19 (B1,C6)", "x":9.5, "y":1}, + {"label":"K1A (B1,C7)", "x":10.5, "y":1}, + {"label":"K1B (B1,D0)", "x":11.5, "y":1}, + {"label":"K1C (B1,D1)", "x":12.5, "y":1}, + {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5}, + {"label":"K1E (B1,D3)", "x":15, "y":1}, + {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, + {"label":"K21 (B2,B6)", "x":1.75, "y":2}, + {"label":"K22 (B2,B7)", "x":2.75, "y":2}, + {"label":"K23 (B2,C0)", "x":3.75, "y":2}, + {"label":"K24 (B2,C1)", "x":4.75, "y":2}, + {"label":"K25 (B2,C2)", "x":5.75, "y":2}, + {"label":"K26 (B2,C3)", "x":6.75, "y":2}, + {"label":"K27 (B2,C4)", "x":7.75, "y":2}, + {"label":"K28 (B2,C5)", "x":8.75, "y":2}, + {"label":"K29 (B2,C6)", "x":9.75, "y":2}, + {"label":"K2A (B2,C7)", "x":10.75, "y":2}, + {"label":"K2B (B2,D0)", "x":11.75, "y":2}, + {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, + {"label":"K2E (B2,D3)", "x":15, "y":2}, + {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25}, + {"label":"K32 (B3,B7)", "x":2.25, "y":3}, + {"label":"K33 (B3,C0)", "x":3.25, "y":3}, + {"label":"K34 (B3,C1)", "x":4.25, "y":3}, + {"label":"K35 (B3,C2)", "x":5.25, "y":3}, + {"label":"K36 (B3,C3)", "x":6.25, "y":3}, + {"label":"K37 (B3,C4)", "x":7.25, "y":3}, + {"label":"K38 (B3,C5)", "x":8.25, "y":3}, + {"label":"K39 (B3,C6)", "x":9.25, "y":3}, + {"label":"K3A (B3,C7)", "x":10.25, "y":3}, + {"label":"K3B (B3,D0)", "x":11.25, "y":3}, + {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, + {"label":"K3D (B3,D2)", "x":14, "y":3}, + {"label":"K3E (B3,D3)", "x":15, "y":3}, + {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25}, + {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25}, + {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25}, + {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25}, + {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25}, + {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25}, + {"label":"K4C (B4,D1)", "x":13, "y":4}, + {"label":"K4D (B4,D2)", "x":14, "y":4}, + {"label":"K4E (B4,D3)", "x":15, "y":4} + ] + }, + "LAYOUT_65_iso_blocker": { + "layout": [ + {"label":"K00 (B0,B5)", "x":0, "y":0}, + {"label":"K01 (B0,B6)", "x":1, "y":0}, + {"label":"K02 (B0,B7)", "x":2, "y":0}, + {"label":"K03 (B0,C0)", "x":3, "y":0}, + {"label":"K04 (B0,C1)", "x":4, "y":0}, + {"label":"K05 (B0,C2)", "x":5, "y":0}, + {"label":"K06 (B0,C3)", "x":6, "y":0}, + {"label":"K07 (B0,C4)", "x":7, "y":0}, + {"label":"K08 (B0,C5)", "x":8, "y":0}, + {"label":"K09 (B0,C6)", "x":9, "y":0}, + {"label":"K0A (B0,C7)", "x":10, "y":0}, + {"label":"K0B (B0,D0)", "x":11, "y":0}, + {"label":"K0C (B0,D1)", "x":12, "y":0}, + {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2}, + {"label":"K0E (B0,D3)", "x":15, "y":0}, + {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, + {"label":"K11 (B1,B6)", "x":1.5, "y":1}, + {"label":"K12 (B1,B7)", "x":2.5, "y":1}, + {"label":"K13 (B1,C0)", "x":3.5, "y":1}, + {"label":"K14 (B1,C1)", "x":4.5, "y":1}, + {"label":"K15 (B1,C2)", "x":5.5, "y":1}, + {"label":"K16 (B1,C3)", "x":6.5, "y":1}, + {"label":"K17 (B1,C4)", "x":7.5, "y":1}, + {"label":"K18 (B1,C5)", "x":8.5, "y":1}, + {"label":"K19 (B1,C6)", "x":9.5, "y":1}, + {"label":"K1A (B1,C7)", "x":10.5, "y":1}, + {"label":"K1B (B1,D0)", "x":11.5, "y":1}, + {"label":"K1C (B1,D1)", "x":12.5, "y":1}, + {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2}, + {"label":"K1E (B1,D3)", "x":15, "y":1}, + {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, + {"label":"K21 (B2,B6)", "x":1.75, "y":2}, + {"label":"K22 (B2,B7)", "x":2.75, "y":2}, + {"label":"K23 (B2,C0)", "x":3.75, "y":2}, + {"label":"K24 (B2,C1)", "x":4.75, "y":2}, + {"label":"K25 (B2,C2)", "x":5.75, "y":2}, + {"label":"K26 (B2,C3)", "x":6.75, "y":2}, + {"label":"K27 (B2,C4)", "x":7.75, "y":2}, + {"label":"K28 (B2,C5)", "x":8.75, "y":2}, + {"label":"K29 (B2,C6)", "x":9.75, "y":2}, + {"label":"K2A (B2,C7)", "x":10.75, "y":2}, + {"label":"K2B (B2,D0)", "x":11.75, "y":2}, + {"label":"K2C (B2,D1)", "x":12.75, "y":2}, + {"label":"K2E (B2,D3)", "x":15, "y":2}, + {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25}, + {"label":"K31 (B3,B6)", "x":1.25, "y":3}, + {"label":"K32 (B3,B7)", "x":2.25, "y":3}, + {"label":"K33 (B3,C0)", "x":3.25, "y":3}, + {"label":"K34 (B3,C1)", "x":4.25, "y":3}, + {"label":"K35 (B3,C2)", "x":5.25, "y":3}, + {"label":"K36 (B3,C3)", "x":6.25, "y":3}, + {"label":"K37 (B3,C4)", "x":7.25, "y":3}, + {"label":"K38 (B3,C5)", "x":8.25, "y":3}, + {"label":"K39 (B3,C6)", "x":9.25, "y":3}, + {"label":"K3A (B3,C7)", "x":10.25, "y":3}, + {"label":"K3B (B3,D0)", "x":11.25, "y":3}, + {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, + {"label":"K3D (B3,D2)", "x":14, "y":3}, + {"label":"K3E (B3,D3)", "x":15, "y":3}, + {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25}, + {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25}, + {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25}, + {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25}, + {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25}, + {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25}, + {"label":"K4C (B4,D1)", "x":13, "y":4}, + {"label":"K4D (B4,D2)", "x":14, "y":4}, + {"label":"K4E (B4,D3)", "x":15, "y":4} + ] + } + } +} diff --git a/keyboards/mechlovin/hannah65/rev1/info.json b/keyboards/mechlovin/hannah65/rev1/info.json @@ -1,223 +0,0 @@ -{ - "keyboard_name": "hannah65-rev1", - "url": "", - "maintainer": "Team Mechlovin", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label":"K00 (B0,B5)", "x":0, "y":0}, - {"label":"K01 (B0,B6)", "x":1, "y":0}, - {"label":"K02 (B0,B7)", "x":2, "y":0}, - {"label":"K03 (B0,C0)", "x":3, "y":0}, - {"label":"K04 (B0,C1)", "x":4, "y":0}, - {"label":"K05 (B0,C2)", "x":5, "y":0}, - {"label":"K06 (B0,C3)", "x":6, "y":0}, - {"label":"K07 (B0,C4)", "x":7, "y":0}, - {"label":"K08 (B0,C5)", "x":8, "y":0}, - {"label":"K09 (B0,C6)", "x":9, "y":0}, - {"label":"K0A (B0,C7)", "x":10, "y":0}, - {"label":"K0B (B0,D0)", "x":11, "y":0}, - {"label":"K0C (B0,D1)", "x":12, "y":0}, - {"label":"K0D (B0,D2)", "x":13, "y":0}, - {"label":"K1D (B1,D2)", "x":14, "y":0}, - {"label":"K0E (B0,D3)", "x":15, "y":0}, - {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":1.5, "y":1}, - {"label":"K12 (B1,B7)", "x":2.5, "y":1}, - {"label":"K13 (B1,C0)", "x":3.5, "y":1}, - {"label":"K14 (B1,C1)", "x":4.5, "y":1}, - {"label":"K15 (B1,C2)", "x":5.5, "y":1}, - {"label":"K16 (B1,C3)", "x":6.5, "y":1}, - {"label":"K17 (B1,C4)", "x":7.5, "y":1}, - {"label":"K18 (B1,C5)", "x":8.5, "y":1}, - {"label":"K19 (B1,C6)", "x":9.5, "y":1}, - {"label":"K1A (B1,C7)", "x":10.5, "y":1}, - {"label":"K1B (B1,D0)", "x":11.5, "y":1}, - {"label":"K1C (B1,D1)", "x":12.5, "y":1}, - {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B1,D3)", "x":15, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B2,B6)", "x":1.75, "y":2}, - {"label":"K22 (B2,B7)", "x":2.75, "y":2}, - {"label":"K23 (B2,C0)", "x":3.75, "y":2}, - {"label":"K24 (B2,C1)", "x":4.75, "y":2}, - {"label":"K25 (B2,C2)", "x":5.75, "y":2}, - {"label":"K26 (B2,C3)", "x":6.75, "y":2}, - {"label":"K27 (B2,C4)", "x":7.75, "y":2}, - {"label":"K28 (B2,C5)", "x":8.75, "y":2}, - {"label":"K29 (B2,C6)", "x":9.75, "y":2}, - {"label":"K2A (B2,C7)", "x":10.75, "y":2}, - {"label":"K2B (B2,D0)", "x":11.75, "y":2}, - {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B2,D3)", "x":15, "y":2}, - {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (B3,B6)", "x":1.25, "y":3}, - {"label":"K32 (B3,B7)", "x":2.25, "y":3}, - {"label":"K33 (B3,C0)", "x":3.25, "y":3}, - {"label":"K34 (B3,C1)", "x":4.25, "y":3}, - {"label":"K35 (B3,C2)", "x":5.25, "y":3}, - {"label":"K36 (B3,C3)", "x":6.25, "y":3}, - {"label":"K37 (B3,C4)", "x":7.25, "y":3}, - {"label":"K38 (B3,C5)", "x":8.25, "y":3}, - {"label":"K39 (B3,C6)", "x":9.25, "y":3}, - {"label":"K3A (B3,C7)", "x":10.25, "y":3}, - {"label":"K3B (B3,D0)", "x":11.25, "y":3}, - {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (B3,D2)", "x":14, "y":3}, - {"label":"K3E (B3,D3)", "x":15, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (B4,D1)", "x":13, "y":4}, - {"label":"K4D (B4,D2)", "x":14, "y":4}, - {"label":"K4E (B4,D3)", "x":15, "y":4} - ] - }, - "LAYOUT_65_ansi_blocker": { - "layout": [ - {"label":"K00 (B0,B5)", "x":0, "y":0}, - {"label":"K01 (B0,B6)", "x":1, "y":0}, - {"label":"K02 (B0,B7)", "x":2, "y":0}, - {"label":"K03 (B0,C0)", "x":3, "y":0}, - {"label":"K04 (B0,C1)", "x":4, "y":0}, - {"label":"K05 (B0,C2)", "x":5, "y":0}, - {"label":"K06 (B0,C3)", "x":6, "y":0}, - {"label":"K07 (B0,C4)", "x":7, "y":0}, - {"label":"K08 (B0,C5)", "x":8, "y":0}, - {"label":"K09 (B0,C6)", "x":9, "y":0}, - {"label":"K0A (B0,C7)", "x":10, "y":0}, - {"label":"K0B (B0,D0)", "x":11, "y":0}, - {"label":"K0C (B0,D1)", "x":12, "y":0}, - {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2}, - {"label":"K0E (B0,D3)", "x":15, "y":0}, - {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":1.5, "y":1}, - {"label":"K12 (B1,B7)", "x":2.5, "y":1}, - {"label":"K13 (B1,C0)", "x":3.5, "y":1}, - {"label":"K14 (B1,C1)", "x":4.5, "y":1}, - {"label":"K15 (B1,C2)", "x":5.5, "y":1}, - {"label":"K16 (B1,C3)", "x":6.5, "y":1}, - {"label":"K17 (B1,C4)", "x":7.5, "y":1}, - {"label":"K18 (B1,C5)", "x":8.5, "y":1}, - {"label":"K19 (B1,C6)", "x":9.5, "y":1}, - {"label":"K1A (B1,C7)", "x":10.5, "y":1}, - {"label":"K1B (B1,D0)", "x":11.5, "y":1}, - {"label":"K1C (B1,D1)", "x":12.5, "y":1}, - {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B1,D3)", "x":15, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B2,B6)", "x":1.75, "y":2}, - {"label":"K22 (B2,B7)", "x":2.75, "y":2}, - {"label":"K23 (B2,C0)", "x":3.75, "y":2}, - {"label":"K24 (B2,C1)", "x":4.75, "y":2}, - {"label":"K25 (B2,C2)", "x":5.75, "y":2}, - {"label":"K26 (B2,C3)", "x":6.75, "y":2}, - {"label":"K27 (B2,C4)", "x":7.75, "y":2}, - {"label":"K28 (B2,C5)", "x":8.75, "y":2}, - {"label":"K29 (B2,C6)", "x":9.75, "y":2}, - {"label":"K2A (B2,C7)", "x":10.75, "y":2}, - {"label":"K2B (B2,D0)", "x":11.75, "y":2}, - {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B2,D3)", "x":15, "y":2}, - {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (B3,B7)", "x":2.25, "y":3}, - {"label":"K33 (B3,C0)", "x":3.25, "y":3}, - {"label":"K34 (B3,C1)", "x":4.25, "y":3}, - {"label":"K35 (B3,C2)", "x":5.25, "y":3}, - {"label":"K36 (B3,C3)", "x":6.25, "y":3}, - {"label":"K37 (B3,C4)", "x":7.25, "y":3}, - {"label":"K38 (B3,C5)", "x":8.25, "y":3}, - {"label":"K39 (B3,C6)", "x":9.25, "y":3}, - {"label":"K3A (B3,C7)", "x":10.25, "y":3}, - {"label":"K3B (B3,D0)", "x":11.25, "y":3}, - {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (B3,D2)", "x":14, "y":3}, - {"label":"K3E (B3,D3)", "x":15, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (B4,D1)", "x":13, "y":4}, - {"label":"K4D (B4,D2)", "x":14, "y":4}, - {"label":"K4E (B4,D3)", "x":15, "y":4} - ] - }, - "LAYOUT_65_iso_blocker": { - "layout": [ - {"label":"K00 (B0,B5)", "x":0, "y":0}, - {"label":"K01 (B0,B6)", "x":1, "y":0}, - {"label":"K02 (B0,B7)", "x":2, "y":0}, - {"label":"K03 (B0,C0)", "x":3, "y":0}, - {"label":"K04 (B0,C1)", "x":4, "y":0}, - {"label":"K05 (B0,C2)", "x":5, "y":0}, - {"label":"K06 (B0,C3)", "x":6, "y":0}, - {"label":"K07 (B0,C4)", "x":7, "y":0}, - {"label":"K08 (B0,C5)", "x":8, "y":0}, - {"label":"K09 (B0,C6)", "x":9, "y":0}, - {"label":"K0A (B0,C7)", "x":10, "y":0}, - {"label":"K0B (B0,D0)", "x":11, "y":0}, - {"label":"K0C (B0,D1)", "x":12, "y":0}, - {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2}, - {"label":"K0E (B0,D3)", "x":15, "y":0}, - {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":1.5, "y":1}, - {"label":"K12 (B1,B7)", "x":2.5, "y":1}, - {"label":"K13 (B1,C0)", "x":3.5, "y":1}, - {"label":"K14 (B1,C1)", "x":4.5, "y":1}, - {"label":"K15 (B1,C2)", "x":5.5, "y":1}, - {"label":"K16 (B1,C3)", "x":6.5, "y":1}, - {"label":"K17 (B1,C4)", "x":7.5, "y":1}, - {"label":"K18 (B1,C5)", "x":8.5, "y":1}, - {"label":"K19 (B1,C6)", "x":9.5, "y":1}, - {"label":"K1A (B1,C7)", "x":10.5, "y":1}, - {"label":"K1B (B1,D0)", "x":11.5, "y":1}, - {"label":"K1C (B1,D1)", "x":12.5, "y":1}, - {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"K1E (B1,D3)", "x":15, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B2,B6)", "x":1.75, "y":2}, - {"label":"K22 (B2,B7)", "x":2.75, "y":2}, - {"label":"K23 (B2,C0)", "x":3.75, "y":2}, - {"label":"K24 (B2,C1)", "x":4.75, "y":2}, - {"label":"K25 (B2,C2)", "x":5.75, "y":2}, - {"label":"K26 (B2,C3)", "x":6.75, "y":2}, - {"label":"K27 (B2,C4)", "x":7.75, "y":2}, - {"label":"K28 (B2,C5)", "x":8.75, "y":2}, - {"label":"K29 (B2,C6)", "x":9.75, "y":2}, - {"label":"K2A (B2,C7)", "x":10.75, "y":2}, - {"label":"K2B (B2,D0)", "x":11.75, "y":2}, - {"label":"K2C (B2,D1)", "x":12.75, "y":2}, - {"label":"K2E (B2,D3)", "x":15, "y":2}, - {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (B3,B6)", "x":1.25, "y":3}, - {"label":"K32 (B3,B7)", "x":2.25, "y":3}, - {"label":"K33 (B3,C0)", "x":3.25, "y":3}, - {"label":"K34 (B3,C1)", "x":4.25, "y":3}, - {"label":"K35 (B3,C2)", "x":5.25, "y":3}, - {"label":"K36 (B3,C3)", "x":6.25, "y":3}, - {"label":"K37 (B3,C4)", "x":7.25, "y":3}, - {"label":"K38 (B3,C5)", "x":8.25, "y":3}, - {"label":"K39 (B3,C6)", "x":9.25, "y":3}, - {"label":"K3A (B3,C7)", "x":10.25, "y":3}, - {"label":"K3B (B3,D0)", "x":11.25, "y":3}, - {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (B3,D2)", "x":14, "y":3}, - {"label":"K3E (B3,D3)", "x":15, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (B4,D1)", "x":13, "y":4}, - {"label":"K4D (B4,D2)", "x":14, "y":4}, - {"label":"K4E (B4,D3)", "x":15, "y":4} - ] - } - } -} diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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