From 205197be82d09740925a4c72adc7c6dd2e899632 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 12:16:16 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) --- keyboards/basekeys/slice/rev1/config.h | 7 - keyboards/basekeys/slice/rev1/info.json | 8 +- keyboards/basekeys/slice/rev1_rgb/config.h | 7 - keyboards/basekeys/slice/rev1_rgb/info.json | 8 +- keyboards/bastardkb/charybdis/3x5/config.h | 2 - keyboards/bastardkb/charybdis/3x5/info.json | 7 +- keyboards/bastardkb/charybdis/4x6/config.h | 2 - keyboards/bastardkb/charybdis/4x6/info.json | 7 +- keyboards/bear_face/config.h | 6 - keyboards/bear_face/info.json | 10 ++ keyboards/bear_face/v1/config.h | 19 --- keyboards/bear_face/v1/info.json | 6 +- keyboards/bear_face/v2/config.h | 19 --- keyboards/bear_face/v2/info.json | 6 +- keyboards/bemeier/bmek/config.h | 6 - keyboards/bemeier/bmek/info.json | 7 +- keyboards/bemeier/bmek/rev1/config.h | 2 - keyboards/bemeier/bmek/rev1/info.json | 5 + keyboards/bemeier/bmek/rev2/config.h | 2 - keyboards/bemeier/bmek/rev2/info.json | 5 + keyboards/bemeier/bmek/rev3/config.h | 2 - keyboards/bemeier/bmek/rev3/info.json | 5 + keyboards/biacco42/ergo42/rev1/config.h | 7 - .../biacco42/ergo42/{ => rev1}/info.json | 6 + keyboards/boardsource/microdox/config.h | 77 +++++++++++ keyboards/boardsource/microdox/info.json | 123 ++++++++---------- keyboards/boston_meetup/2019/config.h | 3 - keyboards/boston_meetup/2019/info.json | 10 +- keyboards/boston_meetup/config.h | 6 - keyboards/boston_meetup/info.json | 14 ++ keyboards/bpiphany/frosty_flake/config.h | 7 - keyboards/bpiphany/frosty_flake/info.json | 6 + keyboards/bpiphany/pegasushoof/2013/config.h | 8 -- keyboards/bpiphany/pegasushoof/2013/info.json | 3 + keyboards/bpiphany/pegasushoof/2015/config.h | 8 -- keyboards/bpiphany/pegasushoof/2015/info.json | 3 + keyboards/bpiphany/pegasushoof/info.json | 7 +- keyboards/buzzard/rev1/config.h | 7 - keyboards/buzzard/{ => rev1}/info.json | 6 + keyboards/canary/canary60rgb/info.json | 6 + keyboards/canary/canary60rgb/v1/config.h | 7 - keyboards/cannonkeys/db60/config.h | 6 - keyboards/cannonkeys/db60/hotswap/config.h | 21 --- keyboards/cannonkeys/db60/hotswap/info.json | 6 + keyboards/cannonkeys/db60/info.json | 6 +- keyboards/cannonkeys/db60/j02/config.h | 21 --- keyboards/cannonkeys/db60/j02/info.json | 6 + keyboards/cannonkeys/db60/rev2/config.h | 21 --- keyboards/cannonkeys/db60/rev2/info.json | 6 + keyboards/cannonkeys/satisfaction75/config.h | 7 - keyboards/cannonkeys/satisfaction75/info.json | 11 ++ .../satisfaction75/prototype/info.json | 3 - .../cannonkeys/satisfaction75/rev1/info.json | 3 - .../capsunlocked/cu80/v2_ansi/base/info.json | 6 + .../capsunlocked/cu80/v2_ansi/base/rules.mk | 0 keyboards/capsunlocked/cu80/v2_ansi/info.json | 2 - .../capsunlocked/cu80/v2_ansi/rgb/config.h | 4 - .../capsunlocked/cu80/v2_ansi/rgb/info.json | 1 + keyboards/capsunlocked/cu80/v2_ansi/rules.mk | 11 +- .../capsunlocked/cu80/v2_iso/base/info.json | 6 + .../capsunlocked/cu80/v2_iso/base/rules.mk | 0 keyboards/capsunlocked/cu80/v2_iso/info.json | 2 - .../capsunlocked/cu80/v2_iso/rgb/config.h | 4 - .../capsunlocked/cu80/v2_iso/rgb/info.json | 1 + keyboards/capsunlocked/cu80/v2_iso/rules.mk | 11 +- keyboards/chavdai40/info.json | 6 +- keyboards/chavdai40/rev1/config.h | 7 - keyboards/chavdai40/rev1/info.json | 6 + keyboards/chavdai40/rev2/config.h | 7 - keyboards/chavdai40/rev2/info.json | 6 + keyboards/chocofly/v1/config.h | 6 - keyboards/chocofly/v1/info.json | 8 +- keyboards/clickety_split/leeloo/info.json | 6 + keyboards/clickety_split/leeloo/rev1/config.h | 7 - keyboards/converter/a1200/info.json | 1 - keyboards/converter/a1200/miss1200/config.h | 7 - keyboards/converter/a1200/miss1200/info.json | 9 ++ .../converter/a1200/mistress1200/config.h | 7 - .../converter/a1200/mistress1200/info.json | 9 ++ keyboards/converter/a1200/teensy2pp/config.h | 7 - keyboards/converter/a1200/teensy2pp/info.json | 9 ++ keyboards/converter/adb_usb/config.h | 6 - keyboards/converter/adb_usb/info.json | 6 + keyboards/converter/hp_46010a/config.h | 6 - keyboards/converter/hp_46010a/info.json | 8 +- keyboards/converter/ibm_terminal/config.h | 7 - keyboards/converter/ibm_terminal/info.json | 8 +- keyboards/converter/m0110_usb/config.h | 6 - keyboards/converter/m0110_usb/info.json | 8 +- keyboards/converter/modelm101/config.h | 7 - keyboards/converter/modelm101/info.json | 8 +- .../converter/modelm101_teensy2/config.h | 7 - .../converter/modelm101_teensy2/info.json | 8 +- keyboards/converter/modelm_ssk/config.h | 7 - keyboards/converter/modelm_ssk/info.json | 6 + .../converter/numeric_keypad_IIe/config.h | 7 - .../converter/numeric_keypad_IIe/info.json | 6 + keyboards/converter/palm_usb/config.h | 6 - keyboards/converter/palm_usb/info.json | 11 ++ .../converter/palm_usb/stowaway/info.json | 3 - keyboards/converter/periboard_512/config.h | 7 - keyboards/converter/periboard_512/info.json | 8 +- keyboards/converter/siemens_tastatur/config.h | 8 -- .../converter/siemens_tastatur/info.json | 6 + keyboards/converter/sun_usb/config.h | 6 - keyboards/converter/sun_usb/info.json | 11 ++ keyboards/converter/sun_usb/type3/info.json | 3 - keyboards/converter/sun_usb/type5/info.json | 3 - keyboards/converter/usb_usb/ble/config.h | 3 - keyboards/converter/usb_usb/config.h | 7 - keyboards/converter/usb_usb/info.json | 8 +- keyboards/converter/xt_usb/config.h | 7 - keyboards/converter/xt_usb/info.json | 8 +- keyboards/cozykeys/bloomer/config.h | 6 - keyboards/cozykeys/bloomer/info.json | 10 ++ keyboards/cozykeys/bloomer/v2/config.h | 3 - keyboards/cozykeys/bloomer/v2/info.json | 6 +- keyboards/cozykeys/bloomer/v3/config.h | 3 - keyboards/cozykeys/bloomer/v3/info.json | 6 +- keyboards/cozykeys/speedo/v2/config.h | 7 - keyboards/cozykeys/speedo/v2/info.json | 6 + keyboards/cozykeys/speedo/v3/config.h | 7 - keyboards/cozykeys/speedo/v3/info.json | 6 + keyboards/crkbd/config.h | 7 - keyboards/crkbd/info.json | 8 +- 125 files changed, 496 insertions(+), 530 deletions(-) create mode 100644 keyboards/bear_face/info.json delete mode 100644 keyboards/bear_face/v1/config.h delete mode 100644 keyboards/bear_face/v2/config.h create mode 100644 keyboards/bemeier/bmek/rev1/info.json create mode 100644 keyboards/bemeier/bmek/rev2/info.json create mode 100644 keyboards/bemeier/bmek/rev3/info.json rename keyboards/biacco42/ergo42/{ => rev1}/info.json (94%) create mode 100644 keyboards/boardsource/microdox/config.h create mode 100644 keyboards/boston_meetup/info.json create mode 100644 keyboards/bpiphany/pegasushoof/2013/info.json create mode 100644 keyboards/bpiphany/pegasushoof/2015/info.json rename keyboards/buzzard/{ => rev1}/info.json (86%) delete mode 100644 keyboards/cannonkeys/db60/hotswap/config.h create mode 100644 keyboards/cannonkeys/db60/hotswap/info.json delete mode 100644 keyboards/cannonkeys/db60/j02/config.h create mode 100644 keyboards/cannonkeys/db60/j02/info.json delete mode 100644 keyboards/cannonkeys/db60/rev2/config.h create mode 100644 keyboards/cannonkeys/db60/rev2/info.json create mode 100644 keyboards/cannonkeys/satisfaction75/info.json create mode 100644 keyboards/capsunlocked/cu80/v2_ansi/base/info.json create mode 100644 keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk create mode 100644 keyboards/capsunlocked/cu80/v2_iso/base/info.json create mode 100644 keyboards/capsunlocked/cu80/v2_iso/base/rules.mk create mode 100644 keyboards/chavdai40/rev1/info.json create mode 100644 keyboards/chavdai40/rev2/info.json create mode 100644 keyboards/converter/a1200/miss1200/info.json create mode 100644 keyboards/converter/a1200/mistress1200/info.json create mode 100644 keyboards/converter/a1200/teensy2pp/info.json create mode 100644 keyboards/converter/palm_usb/info.json create mode 100644 keyboards/converter/sun_usb/info.json create mode 100644 keyboards/cozykeys/bloomer/info.json diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h index 08c929b7b5c2..6239da2c826c 100644 --- a/keyboards/basekeys/slice/rev1/config.h +++ b/keyboards/basekeys/slice/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEC17 -#define DEVICE_VER 0x0002 -#define MANUFACTURER 2Moons -#define PRODUCT Slice - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json index f4e0d4505ef6..614b8ecac71a 100644 --- a/keyboards/basekeys/slice/rev1/info.json +++ b/keyboards/basekeys/slice/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "slice", + "keyboard_name": "Slice", + "manufacturer": "2Moons", "url": "https://www.basekeys.com", "maintainer": "2Moons", + "usb": { + "vid": "0x04D8", + "pid": "0xEC17", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h index 9f503a58268f..f839bfa5b3ab 100644 --- a/keyboards/basekeys/slice/rev1_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEC15 -#define DEVICE_VER 0x0002 -#define MANUFACTURER 2Moons -#define PRODUCT Slice RGB - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json index 6344dc8aa047..ece3b7256189 100644 --- a/keyboards/basekeys/slice/rev1_rgb/info.json +++ b/keyboards/basekeys/slice/rev1_rgb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "slice", + "keyboard_name": "Slice RGB", + "manufacturer": "2Moons", "url": "https://www.basekeys.com", "maintainer": "2Moons", + "usb": { + "vid": "0x04D8", + "pid": "0xEC15", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index 57634258bebe..6e3b8a7124b5 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -18,8 +18,6 @@ #pragma once -#include "config_common.h" - /* Key matrix configuration. */ #define MATRIX_ROWS 8 // Rows are doubled-up. #define MATRIX_COLS 5 diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index ece533944e15..935b1f72497a 100644 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ b/keyboards/bastardkb/charybdis/3x5/info.json @@ -1,7 +1,12 @@ { - "url": "https://bastardkb.com/charybdis-nano", + "keyboard_name": "Charybdis Nano", + "manufacturer": "Bastard Keyboards", + "url": "https://www.bastardkb.com", + "maintainer": "Quentin Lebastard", "usb": { + "vid": "0xA8F8", "pid": "0x1832", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_charybdis_3x5": { diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index f0c1f48cdf21..f557089073d2 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -18,8 +18,6 @@ #pragma once -#include "config_common.h" - /* Key matrix configuration. */ #define MATRIX_ROWS 10 // Rows are doubled-up. #define MATRIX_COLS 6 diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json index 4bd098370917..3e588db9be43 100644 --- a/keyboards/bastardkb/charybdis/4x6/info.json +++ b/keyboards/bastardkb/charybdis/4x6/info.json @@ -1,7 +1,12 @@ { - "url": "https://bastardkb.com/charybdis", + "keyboard_name": "Charybdis", + "manufacturer": "Bastard Keyboards", + "url": "https://www.bastardkb.com", + "maintainer": "Quentin Lebastard", "usb": { + "vid": "0xA8F8", "pid": "0x1833", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_charybdis_4x6": { diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h index c11f27db10fe..589ea350c157 100644 --- a/keyboards/bear_face/config.h +++ b/keyboards/bear_face/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x09f5 -#define MANUFACTURER chemicalwill -#define PRODUCT bear_face - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json new file mode 100644 index 000000000000..e2589d91af37 --- /dev/null +++ b/keyboards/bear_face/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "bear_face", + "manufacturer": "chemicalwill", + "url": "https://github.com/chemicalwill/bear_face_pcb", + "maintainer": "chemicalwill", + "usb": { + "vid": "0xFEED", + "pid": "0x09F5" + } +} diff --git a/keyboards/bear_face/v1/config.h b/keyboards/bear_face/v1/config.h deleted file mode 100644 index cf1de932c1e6..000000000000 --- a/keyboards/bear_face/v1/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 chemicalwill - -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 . -*/ - -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0100 diff --git a/keyboards/bear_face/v1/info.json b/keyboards/bear_face/v1/info.json index 0435c5c2295e..8d3f685e919e 100644 --- a/keyboards/bear_face/v1/info.json +++ b/keyboards/bear_face/v1/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "bear_face", - "url": "https://github.com/chemicalwill/bear_face_pcb", - "maintainer": "chemicalwill", + "usb": { + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_83_ansi": { "layout": [ diff --git a/keyboards/bear_face/v2/config.h b/keyboards/bear_face/v2/config.h deleted file mode 100644 index 6a7c8c6fb008..000000000000 --- a/keyboards/bear_face/v2/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 chemicalwill - -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 . -*/ - -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0200 diff --git a/keyboards/bear_face/v2/info.json b/keyboards/bear_face/v2/info.json index 6d12f04d42f0..978ee59e4951 100644 --- a/keyboards/bear_face/v2/info.json +++ b/keyboards/bear_face/v2/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "bear_face", - "url": "https://github.com/chemicalwill/bear_face_pcb", - "maintainer": "chemicalwill", + "usb": { + "device_version": "2.0.0" + }, "layouts": { "LAYOUT_83_ansi": { "layout": [ diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h index 1bd996d07af6..b7cab6d1fe90 100755 --- a/keyboards/bemeier/bmek/config.h +++ b/keyboards/bemeier/bmek/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x626D // BeMeier -#define PRODUCT_ID 0x656B // ErgonomicKeyboard -#define MANUFACTURER Bemeier -#define PRODUCT BMEK - #define DYNAMIC_KEYMAP_LAYER_COUNT 5 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20 diff --git a/keyboards/bemeier/bmek/info.json b/keyboards/bemeier/bmek/info.json index 80e06d91fb9e..f547a7c2bbf3 100755 --- a/keyboards/bemeier/bmek/info.json +++ b/keyboards/bemeier/bmek/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "bmek", + "keyboard_name": "BMEK", + "manufacturer": "Bemeier", "url": "https://github.com/Bemeier/bmek", "maintainer": "Bemeier", + "usb": { + "vid": "0x626D", + "pid": "0x656B" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bemeier/bmek/rev1/config.h b/keyboards/bemeier/bmek/rev1/config.h index 37f4025c2268..e80742d6f2c9 100755 --- a/keyboards/bemeier/bmek/rev1/config.h +++ b/keyboards/bemeier/bmek/rev1/config.h @@ -17,8 +17,6 @@ #include "config_common.h" -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { D4, D7, B6, B4, B7 } #define MATRIX_COL_PINS \ diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json new file mode 100644 index 000000000000..90ac25f360b6 --- /dev/null +++ b/keyboards/bemeier/bmek/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/bemeier/bmek/rev2/config.h b/keyboards/bemeier/bmek/rev2/config.h index a478cfa951fd..ba1633f3c5ca 100755 --- a/keyboards/bemeier/bmek/rev2/config.h +++ b/keyboards/bemeier/bmek/rev2/config.h @@ -17,8 +17,6 @@ #include "config_common.h" -#define DEVICE_VER 0x0002 - #define MATRIX_ROW_PINS \ { F4, F5, D7, B5, B4 } #define MATRIX_COL_PINS \ diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json new file mode 100644 index 000000000000..e557e4d30763 --- /dev/null +++ b/keyboards/bemeier/bmek/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/bemeier/bmek/rev3/config.h b/keyboards/bemeier/bmek/rev3/config.h index 6171efc8c26f..d5af11782dc0 100755 --- a/keyboards/bemeier/bmek/rev3/config.h +++ b/keyboards/bemeier/bmek/rev3/config.h @@ -17,8 +17,6 @@ #include "config_common.h" -#define DEVICE_VER 0x0003 - #define MATRIX_ROW_PINS \ { F1, B4, B5, D6, D7 } #define MATRIX_COL_PINS \ diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json new file mode 100644 index 000000000000..b377cdff008e --- /dev/null +++ b/keyboards/bemeier/bmek/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h index c8bfe1170f29..9d1b7387b3ed 100644 --- a/keyboards/biacco42/ergo42/rev1/config.h +++ b/keyboards/biacco42/ergo42/rev1/config.h @@ -21,13 +21,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBC42 -#define PRODUCT_ID 0x0042 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Biacco42 -#define PRODUCT Ergo42 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/biacco42/ergo42/info.json b/keyboards/biacco42/ergo42/rev1/info.json similarity index 94% rename from keyboards/biacco42/ergo42/info.json rename to keyboards/biacco42/ergo42/rev1/info.json index a4c4f7fd189d..3c21ef1b4635 100644 --- a/keyboards/biacco42/ergo42/info.json +++ b/keyboards/biacco42/ergo42/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ergo42", + "manufacturer": "Biacco42", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xBC42", + "pid": "0x0042", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ortho_4x14": { "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"L06", "x":6, "y":0}, {"label":"R00", "x":8, "y":0}, {"label":"R01", "x":9, "y":0}, {"label":"R02", "x":10, "y":0}, {"label":"R03", "x":11, "y":0}, {"label":"R04", "x":12, "y":0}, {"label":"R05", "x":13, "y":0}, {"label":"R06", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"L16", "x":6, "y":1}, {"label":"R10", "x":8, "y":1}, {"label":"R11", "x":9, "y":1}, {"label":"R12", "x":10, "y":1}, {"label":"R13", "x":11, "y":1}, {"label":"R14", "x":12, "y":1}, {"label":"R15", "x":13, "y":1}, {"label":"R16", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"L26", "x":6, "y":2}, {"label":"R20", "x":8, "y":2}, {"label":"R21", "x":9, "y":2}, {"label":"R22", "x":10, "y":2}, {"label":"R23", "x":11, "y":2}, {"label":"R24", "x":12, "y":2}, {"label":"R25", "x":13, "y":2}, {"label":"R26", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"L36", "x":6, "y":3}, {"label":"R30", "x":8, "y":3}, {"label":"R31", "x":9, "y":3}, {"label":"R32", "x":10, "y":3}, {"label":"R33", "x":11, "y":3}, {"label":"R34", "x":12, "y":3}, {"label":"R35", "x":13, "y":3}, {"label":"R36", "x":14, "y":3}] diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h new file mode 100644 index 000000000000..517e0e7376c0 --- /dev/null +++ b/keyboards/boardsource/microdox/config.h @@ -0,0 +1,77 @@ +/* +Copyright 2020 Cole Smith + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 5 +#define MATRIX_ROW_PINS \ + { B2, B6, B4, B5 } + +// wiring of each half +#define MATRIX_COL_PINS \ + { F4, F5, F6, F7, B1 } +#define USE_SERIAL +#define SOFT_SERIAL_PIN D2 +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +// #define BACKLIGHT_LEVELS 3 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +//#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +//#define LOCKING_RESYNC_ENABLE + +/* ws2812 RGB LED */ +#define RGB_DI_PIN D3 +#ifdef RGBLIGHT_ENABLE +# define RGBLED_NUM 12 // Number of LEDs +# define RGBLED_SPLIT \ + { 6, 6 } +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_STATIC_GRADIENT + +#endif + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +// #define NO_DEBUG + +/* disable print */ +// #define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/boardsource/microdox/info.json b/keyboards/boardsource/microdox/info.json index 37f190d42d55..5c2fc9e6feb4 100644 --- a/keyboards/boardsource/microdox/info.json +++ b/keyboards/boardsource/microdox/info.json @@ -1,70 +1,61 @@ { - "manufacturer": "Boardsource", - "keyboard_name": "microdox", - "maintainer": "waffle87", - "development_board": "promicro", - "diode_direction": "COL2ROW", - "build": { - "lto": true - }, - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "oled": true - }, - "url": "https://boardsource.xyz/store/5f2e7e4a2902de7151494f92", - "usb": { - "pid": "0x0412", - "vid": "0xF7E0" - }, - "split": { - "enabled": true - }, - "community_layouts": [ - "split_3x5_3" - ], - "layouts": { - "LAYOUT_split_3x5_3": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - { "matrix": [4, 4], "x": 5, "y": 0 }, - { "matrix": [4, 3], "x": 6, "y": 0 }, - { "matrix": [4, 2], "x": 7, "y": 0 }, - { "matrix": [4, 1], "x": 8, "y": 0 }, - { "matrix": [4, 0], "x": 9, "y": 0 }, - { "matrix": [1, 0], "x": 10, "y": 0 }, - { "matrix": [1, 1], "x": 11, "y": 0 }, - { "matrix": [1, 2], "x": 12, "y": 0 }, - { "matrix": [1, 3], "x": 13, "y": 0 }, - { "matrix": [1, 4], "x": 14, "y": 0 }, - { "matrix": [5, 4], "x": 15, "y": 0 }, - { "matrix": [5, 3], "x": 16, "y": 0 }, - { "matrix": [5, 2], "x": 17, "y": 0 }, - { "matrix": [5, 1], "x": 18, "y": 0 }, - { "matrix": [5, 0], "x": 19, "y": 0 }, - { "matrix": [2, 0], "x": 20, "y": 0 }, - { "matrix": [2, 1], "x": 21, "y": 0 }, - { "matrix": [2, 2], "x": 22, "y": 0 }, - { "matrix": [2, 3], "x": 23, "y": 0 }, - { "matrix": [2, 4], "x": 24, "y": 0 }, - { "matrix": [6, 4], "x": 25, "y": 0 }, - { "matrix": [6, 3], "x": 26, "y": 0 }, - { "matrix": [6, 2], "x": 27, "y": 0 }, - { "matrix": [6, 1], "x": 28, "y": 0 }, - { "matrix": [6, 0], "x": 29, "y": 0 }, - { "matrix": [3, 2], "x": 30, "y": 0 }, - { "matrix": [3, 3], "x": 31, "y": 0 }, - { "matrix": [3, 4], "x": 32, "y": 0 }, - { "matrix": [7, 4], "x": 33, "y": 0 }, - { "matrix": [7, 3], "x": 34, "y": 0 }, - { "matrix": [7, 2], "x": 35, "y": 0 } - ] + "keyboard_name": "microdox", + "manufacturer": "Boardsource", + "url": "https://boardsource.xyz/store/5f2e7e4a2902de7151494f92", + "maintainer": "boardsource", + "usb": { + "vid": "0xF7E0", + "pid": "0x0412", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + { "label": "Q", "x": 0, "y": 0.3 }, + { "label": "W", "x": 1, "y": 0.1 }, + { "label": "E", "x": 2, "y": 0 }, + { "label": "R", "x": 3, "y": 0.1 }, + { "label": "T", "x": 4, "y": 0.2 }, + + { "label": "Y", "x": 8, "y": 0.2 }, + { "label": "U", "x": 9, "y": 0.1 }, + { "label": "I", "x": 10, "y": 0 }, + { "label": "O", "x": 11, "y": 0.1 }, + { "label": "P", "x": 12, "y": 0.3 }, + + { "label": "A", "x": 0, "y": 1.3 }, + { "label": "S", "x": 1, "y": 1.1 }, + { "label": "D", "x": 2, "y": 1 }, + { "label": "F", "x": 3, "y": 1.1 }, + { "label": "G", "x": 4, "y": 1.2 }, + + { "label": "H", "x": 8, "y": 1.2 }, + { "label": "J", "x": 9, "y": 1.1 }, + { "label": "K", "x": 10, "y": 1 }, + { "label": "L", "x": 11, "y": 1.1 }, + { "label": ";", "x": 12, "y": 1.3 }, + + { "label": "Z", "x": 0, "y": 2.3 }, + { "label": "X", "x": 1, "y": 2.1 }, + { "label": "C", "x": 2, "y": 2 }, + { "label": "V", "x": 3, "y": 2.1 }, + { "label": "B", "x": 4, "y": 2.2 }, + + { "label": "N", "x": 8, "y": 2.2 }, + { "label": "M", "x": 9, "y": 2.1 }, + { "label": ",", "x": 10, "y": 2 }, + { "label": ".", "x": 11, "y": 2.1 }, + { "label": "/", "x": 12, "y": 2.3 }, + + { "label": "GUI / KC_HANJ", "x": 3, "y": 3.7 }, + { "label": "Lower", "x": 4, "y": 3.7 }, + { "label": "Space", "x": 5, "y": 3.2 }, + + { "label": "Enter", "x": 7, "y": 3.2 }, + { "label": "Raise", "x": 8, "y": 3.7 }, + { "label": "Alt / KC_HAEN", "x": 9, "y": 3.7 } + ] + } } } } diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h index 99ce9e85db2b..7429845958ee 100644 --- a/keyboards/boston_meetup/2019/config.h +++ b/keyboards/boston_meetup/2019/config.h @@ -1,8 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x2019 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json index 53beef5a8454..5f8f8c95f7de 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/info.json @@ -1,9 +1,5 @@ { - "keyboard_name": "Boston Meetup 2019", - "url": "", - "maintainer": "qmk", - "layouts": { - "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}] } - } + "usb": { + "device_version": "20.1.9" + } } diff --git a/keyboards/boston_meetup/config.h b/keyboards/boston_meetup/config.h index 60e490435f51..8e9919c23a4d 100644 --- a/keyboards/boston_meetup/config.h +++ b/keyboards/boston_meetup/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFB30 -#define PRODUCT_ID 0x26BE -#define MANUFACTURER ishtob -#define PRODUCT Boston Meetup Board - //#define AUDIO_VOICES //#define BACKLIGHT_PIN B7 diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json new file mode 100644 index 000000000000..2c25d4ff0685 --- /dev/null +++ b/keyboards/boston_meetup/info.json @@ -0,0 +1,14 @@ +{ + "keyboard_name": "Boston Meetup Board", + "manufacturer": "ishtob", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFB30", + "pid": "0x26BE" + }, + "layouts": { + "LAYOUT": { + "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}] } + } +} diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h index a0f088802ad3..039152ac49af 100644 --- a/keyboards/bpiphany/frosty_flake/config.h +++ b/keyboards/bpiphany/frosty_flake/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bathroom Epiphanies -#define PRODUCT frosty_flake - /* * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies * Ported from the Bathroom Epiphanies TMK Firmware: diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json index 9d5d6aace082..266c45c39412 100644 --- a/keyboards/bpiphany/frosty_flake/info.json +++ b/keyboards/bpiphany/frosty_flake/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Frosty Flake", + "manufacturer": "Bathroom Epiphanies", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bpiphany/pegasushoof/2013/config.h b/keyboards/bpiphany/pegasushoof/2013/config.h index 2573cecfcaf3..33762f020df1 100644 --- a/keyboards/bpiphany/pegasushoof/2013/config.h +++ b/keyboards/bpiphany/pegasushoof/2013/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Filco -#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2013 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json new file mode 100644 index 000000000000..c96b6ba06ceb --- /dev/null +++ b/keyboards/bpiphany/pegasushoof/2013/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013" +} diff --git a/keyboards/bpiphany/pegasushoof/2015/config.h b/keyboards/bpiphany/pegasushoof/2015/config.h index 479175c477dc..d1d52d309809 100644 --- a/keyboards/bpiphany/pegasushoof/2015/config.h +++ b/keyboards/bpiphany/pegasushoof/2015/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Filco -#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2015 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json new file mode 100644 index 000000000000..8af38d9501fa --- /dev/null +++ b/keyboards/bpiphany/pegasushoof/2015/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2015" +} diff --git a/keyboards/bpiphany/pegasushoof/info.json b/keyboards/bpiphany/pegasushoof/info.json index fb4d2479a5d1..2869e9f76349 100644 --- a/keyboards/bpiphany/pegasushoof/info.json +++ b/keyboards/bpiphany/pegasushoof/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "Pegasus Hoof", + "manufacturer": "Filco", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6050", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h index 7e4628c6ec10..66c1a9a42ef8 100644 --- a/keyboards/buzzard/rev1/config.h +++ b/keyboards/buzzard/rev1/config.h @@ -3,13 +3,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xB077 -#define DEVICE_VER 0x0001 -#define MANUFACTURER crehmann -#define PRODUCT Buzzard - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/buzzard/info.json b/keyboards/buzzard/rev1/info.json similarity index 86% rename from keyboards/buzzard/info.json rename to keyboards/buzzard/rev1/info.json index a958ffdc94d1..6ee2226758f0 100644 --- a/keyboards/buzzard/info.json +++ b/keyboards/buzzard/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Buzzard", + "manufacturer": "crehmann", "url": "https://github.com/crehmann/buzzard", "maintainer": "crehmann", + "usb": { + "vid": "0xFEED", + "pid": "0xB077", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "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":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "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":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index e8cc4c0fe592..4dd97319b34f 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "CANARY60RGB", + "manufacturer": "CANARY", "url": "", "maintainer": "tuananhnguyen204", + "usb": { + "vid": "0x4341", + "pid": "0x0621", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index 3d2dd81d88f4..8d3150a5d9ff 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4341 -#define PRODUCT_ID 0x0621 -#define DEVICE_VER 0x0001 -#define MANUFACTURER CANARY -#define PRODUCT CANARY60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h index 6dd0d0d7f8a0..873ec2469777 100644 --- a/keyboards/cannonkeys/db60/config.h +++ b/keyboards/cannonkeys/db60/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCA04 -#define DEVICE_VER 0x0001 - -#define MANUFACTURER CannonKeys - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/cannonkeys/db60/hotswap/config.h b/keyboards/cannonkeys/db60/hotswap/config.h deleted file mode 100644 index 3ea9693404a6..000000000000 --- a/keyboards/cannonkeys/db60/hotswap/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -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 . -*/ - -#pragma once - -#define PRODUCT_ID 0xDB62 -#define PRODUCT DB60 Hotswap diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/info.json new file mode 100644 index 000000000000..e0ced428b258 --- /dev/null +++ b/keyboards/cannonkeys/db60/hotswap/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "DB60 Hotswap", + "usb": { + "pid": "0xDB62" + } +} diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 9c6461d9e2dd..bba9427caf39 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "DB60", + "manufacturer": "CannonKeys", "url": "https://cannonkeys.com", "maintainer": "awkannan", + "usb": { + "vid": "0xCA04", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"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}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":2.75}, {"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}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/cannonkeys/db60/j02/config.h b/keyboards/cannonkeys/db60/j02/config.h deleted file mode 100644 index 392cec3a5593..000000000000 --- a/keyboards/cannonkeys/db60/j02/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -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 . -*/ - -#pragma once - -#define PRODUCT_ID 0xDB60 -#define PRODUCT DB60 diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/info.json new file mode 100644 index 000000000000..9f5c81711281 --- /dev/null +++ b/keyboards/cannonkeys/db60/j02/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "DB60", + "usb": { + "pid": "0xDB60" + } +} diff --git a/keyboards/cannonkeys/db60/rev2/config.h b/keyboards/cannonkeys/db60/rev2/config.h deleted file mode 100644 index df3527b70518..000000000000 --- a/keyboards/cannonkeys/db60/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -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 . -*/ - -#pragma once - -#define PRODUCT_ID 0xDB61 -#define PRODUCT DB60v2 diff --git a/keyboards/cannonkeys/db60/rev2/info.json b/keyboards/cannonkeys/db60/rev2/info.json new file mode 100644 index 000000000000..f5f3c8530d9b --- /dev/null +++ b/keyboards/cannonkeys/db60/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "DB60v2", + "usb": { + "pid": "0xDB61" + } +} diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h index 2a0ac91b2db4..ef4123770d14 100644 --- a/keyboards/cannonkeys/satisfaction75/config.h +++ b/keyboards/cannonkeys/satisfaction75/config.h @@ -23,13 +23,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCA04 -#define PRODUCT_ID 0x57F5 -#define DEVICE_VER 0x0001 -#define MANUFACTURER CannonKeys -#define PRODUCT Satisfaction75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json new file mode 100644 index 000000000000..692715124d32 --- /dev/null +++ b/keyboards/cannonkeys/satisfaction75/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Satisfaction75", + "manufacturer": "CannonKeys", + "url": "", + "maintainer": "Cannon Keys", + "usb": { + "vid": "0xCA04", + "pid": "0x57F5", + "device_version": "0.0.1" + } +} diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/info.json index 29e727835a54..9fad4142aa26 100644 --- a/keyboards/cannonkeys/satisfaction75/prototype/info.json +++ b/keyboards/cannonkeys/satisfaction75/prototype/info.json @@ -1,7 +1,4 @@ { - "keyboard_name": "Satisfaction75 prototype", - "url": "", - "maintainer": "Cannon Keys", "layouts": { "LAYOUT_default": { "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}] diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/info.json index b0e171660288..15986435c515 100644 --- a/keyboards/cannonkeys/satisfaction75/rev1/info.json +++ b/keyboards/cannonkeys/satisfaction75/rev1/info.json @@ -1,7 +1,4 @@ { - "keyboard_name": "Satisfaction75 rev1", - "url": "", - "maintainer": "Cannon Keys", "layouts": { "LAYOUT_default": { "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}] diff --git a/keyboards/capsunlocked/cu80/v2_ansi/base/info.json b/keyboards/capsunlocked/cu80/v2_ansi/base/info.json new file mode 100644 index 000000000000..9dc24b5e40ad --- /dev/null +++ b/keyboards/capsunlocked/cu80/v2_ansi/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "CU80 v2 ANSI", + "usb": { + "pid": "0x0081" + } +} diff --git a/keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json index 7615d9f02969..96234185f6bc 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json @@ -1,6 +1,5 @@ { "manufacturer": "CapsUnlocked", - "keyboard_name": "CapsUnlocked CU80 v2 ANSI", "maintainer": "rys / maz0r", "bootloader": "atmel-dfu", "debounce": 5, @@ -38,7 +37,6 @@ "url": "https://caps-unlocked.com/cu80-round-2/", "usb": { "device_version": "0.0.1", - "pid": "0x0081", "vid": "0x4355" }, "community_layouts": ["tkl_ansi"], diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h index 00a05ad7da01..578926639734 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h +++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . /* enable RGB matrix */ #define CU80_RGB -/* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */ -#undef PRODUCT -#define PRODUCT CU80 v2 ANSI RGB - /* moved to RGB specific */ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json index f97e2036450c..52676aa04176 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json @@ -1,4 +1,5 @@ { + "keyboard_name": "CU80 v2 ANSI RGB", "features": { "rgblight": false }, diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/rules.mk index 7c5554a087cf..e96dd72928ac 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/rules.mk +++ b/keyboards/capsunlocked/cu80/v2_ansi/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# NO_USB_STARTUP_CHECK = yes # resolve possible sleep issue + +DEFAULT_FOLDER = capsunlocked/cu80/v2_ansi/base diff --git a/keyboards/capsunlocked/cu80/v2_iso/base/info.json b/keyboards/capsunlocked/cu80/v2_iso/base/info.json new file mode 100644 index 000000000000..636e6e227619 --- /dev/null +++ b/keyboards/capsunlocked/cu80/v2_iso/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "CU80 v2 ISO", + "usb": { + "pid": "0x0080" + } +} diff --git a/keyboards/capsunlocked/cu80/v2_iso/base/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/base/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json index 43f074f170d4..61e033c59fd9 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/info.json @@ -1,6 +1,5 @@ { "manufacturer": "CapsUnlocked", - "keyboard_name": "CapsUnlocked CU80 v2 ISO", "maintainer": "rys / maz0r", "bootloader": "atmel-dfu", "debounce": 5, @@ -38,7 +37,6 @@ "url": "https://caps-unlocked.com/cu80-round-2/", "usb": { "device_version": "0.0.1", - "pid": "0x0080", "vid": "0x4355" }, "community_layouts": ["tkl_iso"], diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h index dbe9143b8bcc..41dbede76796 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h +++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . /* enable RGB matrix */ #define CU80_RGB -/* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */ -#undef PRODUCT -#define PRODUCT CU80 v2 ISO RGB - /* moved to RGB specific */ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json index 36748237c5d0..e04971c21ac6 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json @@ -1,4 +1,5 @@ { + "keyboard_name": "CU80 v2 ISO RGB", "features": { "rgblight": false }, diff --git a/keyboards/capsunlocked/cu80/v2_iso/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rules.mk index 7c5554a087cf..c0feb353070f 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/rules.mk +++ b/keyboards/capsunlocked/cu80/v2_iso/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# NO_USB_STARTUP_CHECK = yes # resolve possible sleep issue + +DEFAULT_FOLDER = capsunlocked/cu80/v2_iso/base diff --git a/keyboards/chavdai40/info.json b/keyboards/chavdai40/info.json index 9c95d21239f5..36b8511bf1b1 100644 --- a/keyboards/chavdai40/info.json +++ b/keyboards/chavdai40/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "chavdai40", + "manufacturer": "t-miyajima", "url": "https://github.com/dvorak55/chavdai40", "maintainer": "t-miyajima", + "usb": { + "vid": "0x16D0", + "pid": "0x0F95" + }, "layouts": { "LAYOUT_44key": { "layout": [ diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h index 47ec1ca1ffa9..c03bab0b5703 100644 --- a/keyboards/chavdai40/rev1/config.h +++ b/keyboards/chavdai40/rev1/config.h @@ -21,13 +21,6 @@ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16D0 -#define PRODUCT_ID 0x0F95 -#define DEVICE_VER 0x0001 -#define MANUFACTURER t-miyajima -#define PRODUCT Chavdai40 - /* usb power settings */ #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json new file mode 100644 index 000000000000..c69c0e346001 --- /dev/null +++ b/keyboards/chavdai40/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Chavdai40", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h index 5f277415fa7b..1d72c5dc798c 100644 --- a/keyboards/chavdai40/rev2/config.h +++ b/keyboards/chavdai40/rev2/config.h @@ -21,13 +21,6 @@ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16D0 -#define PRODUCT_ID 0x0F95 -#define DEVICE_VER 0x0002 -#define MANUFACTURER t-miyajima -#define PRODUCT Chavdai40 rev2 - /* usb power settings */ #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json new file mode 100644 index 000000000000..458bcacf380e --- /dev/null +++ b/keyboards/chavdai40/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Chavdai40 rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/chocofly/v1/config.h b/keyboards/chocofly/v1/config.h index e5bedf80c6ff..053ca6136226 100644 --- a/keyboards/chocofly/v1/config.h +++ b/keyboards/chocofly/v1/config.h @@ -3,12 +3,6 @@ #pragma once -#define VENDOR_ID 0xCEE2 -#define PRODUCT_ID 0x1001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER vitvlkv -#define PRODUCT Chocofly - #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/chocofly/v1/info.json b/keyboards/chocofly/v1/info.json index c56f7ae17099..1372ce62f967 100644 --- a/keyboards/chocofly/v1/info.json +++ b/keyboards/chocofly/v1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Chocofly V1", + "keyboard_name": "Chocofly", + "manufacturer": "vitvlkv", "url": "https://github.com/vlkv/chocofly", "maintainer": "vlkv", + "usb": { + "vid": "0xCEE2", + "pid": "0x1001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json index 5473292d14e5..b91686638837 100644 --- a/keyboards/clickety_split/leeloo/info.json +++ b/keyboards/clickety_split/leeloo/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Leeloo", + "manufacturer": "Clickety Split Ltd", "url": "https://clicketysplit.ca/pages/leeloo", "maintainer": "ClicketySplit", + "usb": { + "vid": "0x4013", + "pid": "0x2022", + "device_version": "0.1.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clickety_split/leeloo/rev1/config.h b/keyboards/clickety_split/leeloo/rev1/config.h index cf9c563f8fad..88bab4ca98db 100644 --- a/keyboards/clickety_split/leeloo/rev1/config.h +++ b/keyboards/clickety_split/leeloo/rev1/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4013 -#define PRODUCT_ID 0x2022 -#define DEVICE_VER 0x0013 -#define MANUFACTURER Clickety Split Ltd -#define PRODUCT Leeloo - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index 41f328668e7c..1b46444ba877 100644 --- a/keyboards/converter/a1200/info.json +++ b/keyboards/converter/a1200/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Amiga 1200 Keyboard", "maintainer": "8bits4ever", "layouts": { "LAYOUT": { diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h index 80053df0dba1..5faee6f45cf1 100644 --- a/keyboards/converter/a1200/miss1200/config.h +++ b/keyboards/converter/a1200/miss1200/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFFFF -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 8bits4ever -#define PRODUCT MiSS-1200 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json new file mode 100644 index 000000000000..3c97119dbd11 --- /dev/null +++ b/keyboards/converter/a1200/miss1200/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "MiSS-1200", + "manufacturer": "8bits4ever", + "usb": { + "vid": "0xFFFF", + "pid": "0x0000", + "device_version": "0.0.1" + } +} diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h index 6e869e1db5d8..67a312d7958c 100644 --- a/keyboards/converter/a1200/mistress1200/config.h +++ b/keyboards/converter/a1200/mistress1200/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFFFF -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 8bits4ever -#define PRODUCT MiSTress1200 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json new file mode 100644 index 000000000000..1cdecf736eea --- /dev/null +++ b/keyboards/converter/a1200/mistress1200/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "MiSTress1200", + "manufacturer": "8bits4ever", + "usb": { + "vid": "0xFFFF", + "pid": "0x0000", + "device_version": "0.0.1" + } +} diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h index 9342bd344c6b..e9e961433f8b 100644 --- a/keyboards/converter/a1200/teensy2pp/config.h +++ b/keyboards/converter/a1200/teensy2pp/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 8bits4ever -#define PRODUCT Amiga-1200 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json new file mode 100644 index 000000000000..243b586c9f20 --- /dev/null +++ b/keyboards/converter/a1200/teensy2pp/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Amiga-1200", + "manufacturer": "8bits4ever", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + } +} diff --git a/keyboards/converter/adb_usb/config.h b/keyboards/converter/adb_usb/config.h index 92ce05f3d2ba..b6eb105bbd5a 100644 --- a/keyboards/converter/adb_usb/config.h +++ b/keyboards/converter/adb_usb/config.h @@ -19,12 +19,6 @@ Ported to QMK by Peter Roe #pragma once -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0ADB -#define DEVICE_VER 0x0101 -#define MANUFACTURER QMK -#define PRODUCT ADB keyboard converter - /* matrix size */ #define MATRIX_ROWS 16 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json index 45ae5e4f34bc..f64616e212dc 100644 --- a/keyboards/converter/adb_usb/info.json +++ b/keyboards/converter/adb_usb/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ADB to USB Keyboard Converter", + "manufacturer": "QMK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0ADB", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT_ext_ansi": { "layout": [ diff --git a/keyboards/converter/hp_46010a/config.h b/keyboards/converter/hp_46010a/config.h index 91350bcb4f6c..e189b7d79a66 100644 --- a/keyboards/converter/hp_46010a/config.h +++ b/keyboards/converter/hp_46010a/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER QMK -#define PRODUCT 46010A keyboard converter - #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index 01e9f4d25fd3..aa49bf11df3f 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "HP_46010A", + "keyboard_name": "HP 46010A to USB Keyboard Converter", + "manufacturer": "QMK", "url": "https://deskthority.net/wiki/HP_46010A", "maintainer": "listofoptions", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h index 2cd36c5fb0ae..9e7d140809ed 100644 --- a/keyboards/converter/ibm_terminal/config.h +++ b/keyboards/converter/ibm_terminal/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6535 -#define DEVICE_VER 0x0100 -#define MANUFACTURER QMK -#define PRODUCT IBM Terminal Keyboard - - /* matrix size */ #define MATRIX_ROWS 17 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json index 2c1a605ad995..9854d2759e79 100644 --- a/keyboards/converter/ibm_terminal/info.json +++ b/keyboards/converter/ibm_terminal/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keyboard converter for IBM terminal keyboard", + "keyboard_name": "IBM Terminal to USB Keyboard Converter", + "manufacturer": "QMK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6535", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/m0110_usb/config.h b/keyboards/converter/m0110_usb/config.h index c612327ecfac..0260bc6fb4b2 100644 --- a/keyboards/converter/m0110_usb/config.h +++ b/keyboards/converter/m0110_usb/config.h @@ -21,12 +21,6 @@ Ported to QMK by Techsock #pragma once -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0110 -#define DEVICE_VER 0x0101 -#define MANUFACTURER Apple -#define PRODUCT M0110(A) - /* matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json index 278b98781a4c..f1db7083ded7 100644 --- a/keyboards/converter/m0110_usb/info.json +++ b/keyboards/converter/m0110_usb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "M0110(A) keyboard converter", + "keyboard_name": "Apple M0110(A) to USB Keyboard Converter", + "manufacturer": "QMK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0110", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h index b3f03979bc93..2102d2d48955 100644 --- a/keyboards/converter/modelm101/config.h +++ b/keyboards/converter/modelm101/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER iw0rm3r -#define PRODUCT IBM Model M 101/102 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index ffc679dbbb5a..b769ec25394a 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IBM Model M 101 ANSI/102 ISO", + "keyboard_name": "IBM Model M 101/102", + "manufacturer": "iw0rm3r", "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", "maintainer": "iw0rm3r", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "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":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"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":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"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":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"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":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h index 99eae26e01fd..8bdf1be97557 100644 --- a/keyboards/converter/modelm101_teensy2/config.h +++ b/keyboards/converter/modelm101_teensy2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER wangfuco -#define PRODUCT IBM Model M 101/102 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index 1da0a88738ec..617f8932423d 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IBM Model M 101 ANSI/102 ISO", + "keyboard_name": "IBM Model M 101/102", + "manufacturer": "wangfuco", "url": "https://github.com/wangfuco/qmk_firmware/tree/modelm101_teensy2/keyboards/converter/modelm101_teensy2", "maintainer": "wangfuco", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "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":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"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":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"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":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"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":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h index aed3761091b7..6623eef16770 100644 --- a/keyboards/converter/modelm_ssk/config.h +++ b/keyboards/converter/modelm_ssk/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER tiltowait -#define PRODUCT IBM Model M Space-Saving Keyboard - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json index 78d75c8d17a3..22d298194395 100644 --- a/keyboards/converter/modelm_ssk/info.json +++ b/keyboards/converter/modelm_ssk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "IBM Model M Space-Saving Keyboard", + "manufacturer": "tiltowait", "url": "https://github.com/tiltowait/qmk_firmware/tree/modelm_ssk/keyboards/converter/modelm_ssk", "maintainer": "tiltowait", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": diff --git a/keyboards/converter/numeric_keypad_IIe/config.h b/keyboards/converter/numeric_keypad_IIe/config.h index 27ad0610b51d..f9fd26163d1a 100644 --- a/keyboards/converter/numeric_keypad_IIe/config.h +++ b/keyboards/converter/numeric_keypad_IIe/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Apple Inc. -#define PRODUCT Numeric Keypad IIe - /* Pin Mappings diff --git a/keyboards/converter/numeric_keypad_IIe/info.json b/keyboards/converter/numeric_keypad_IIe/info.json index 97e40bbad324..77b3c3822707 100644 --- a/keyboards/converter/numeric_keypad_IIe/info.json +++ b/keyboards/converter/numeric_keypad_IIe/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Numeric Keypad IIe", + "manufacturer": "Apple Inc.", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}] diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/config.h index 35032835cd47..f6e933ad2c53 100644 --- a/keyboards/converter/palm_usb/config.h +++ b/keyboards/converter/palm_usb/config.h @@ -23,12 +23,6 @@ along with this program. If not, see . #pragma once -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0100 -#define MANUFACTURER QMK -#define PRODUCT Stowaway converter - // IO pins to serial // https://deskthority.net/wiki/Arduino_Pro_Micro for pin lookup #define VCC_PIN D1 // pro micro 2 diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json new file mode 100644 index 000000000000..ed4895ecfd38 --- /dev/null +++ b/keyboards/converter/palm_usb/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Stowaway Converter", + "manufacturer": "QMK", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0001", + "device_version": "1.0.0" + } +} diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/info.json index c3c520f260f8..34b1e1f83fb2 100644 --- a/keyboards/converter/palm_usb/stowaway/info.json +++ b/keyboards/converter/palm_usb/stowaway/info.json @@ -1,7 +1,4 @@ { - "keyboard_name": "Palm Stowaway Serial", - "url": "", - "maintainer": "qmk", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/periboard_512/config.h b/keyboards/converter/periboard_512/config.h index e2fdc7435891..b93af8c9547b 100644 --- a/keyboards/converter/periboard_512/config.h +++ b/keyboards/converter/periboard_512/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sife -#define PRODUCT Periboard 512 - /* matrix properties */ #define MATRIX_COLS 19 #define MATRIX_ROWS 8 diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/info.json index 7c178418c811..eea7c6598a33 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Perixx Periboard-512", + "keyboard_name": "Periboard 512", + "manufacturer": "Sife", "url": "https://github.com/Sife-ops/qmk_firmware/tree/periboard_512/keyboards/converter/periboard_512", "maintainer": "Sife-ops", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "diode_direction": "ROW2COL", "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h index 86fe59fbd514..93fca2962afe 100644 --- a/keyboards/converter/siemens_tastatur/config.h +++ b/keyboards/converter/siemens_tastatur/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8968 -#define PRODUCT_ID 0x4353 -#define DEVICE_VER 0x0001 - -#define MANUFACTURER Yiancar-Designs -#define PRODUCT Siemens Tastatur - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json index 7c4ebe769ba6..2e537b78d400 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Siemens Tastatur", + "manufacturer": "Yiancar-Designs", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x8968", + "pid": "0x4353", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/sun_usb/config.h b/keyboards/converter/sun_usb/config.h index 0a4aa019f781..9d948b4cbdd8 100644 --- a/keyboards/converter/sun_usb/config.h +++ b/keyboards/converter/sun_usb/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3333 -#define DEVICE_VER 0x0100 -#define MANUFACTURER QMK -#define PRODUCT Sun keyboard converter - /* matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json new file mode 100644 index 000000000000..691d0d1953e0 --- /dev/null +++ b/keyboards/converter/sun_usb/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Sun Keyboard Converter", + "manufacturer": "QMK", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3333", + "device_version": "1.0.0" + } +} diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/info.json index 9a60b09607a9..383d7d65e5df 100644 --- a/keyboards/converter/sun_usb/type3/info.json +++ b/keyboards/converter/sun_usb/type3/info.json @@ -1,7 +1,4 @@ { - "keyboard_name": "Sun Type 3", - "url": "", - "maintainer": "qmk", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/info.json index 9613d46e5029..23d80c4121ce 100644 --- a/keyboards/converter/sun_usb/type5/info.json +++ b/keyboards/converter/sun_usb/type5/info.json @@ -1,7 +1,4 @@ { - "keyboard_name": "Sun Type 5", - "url": "", - "maintainer": "qmk", "layouts": { "LAYOUT_jp_unix": { "layout": [ diff --git a/keyboards/converter/usb_usb/ble/config.h b/keyboards/converter/usb_usb/ble/config.h index 675183f08203..b4ee0992fe61 100644 --- a/keyboards/converter/usb_usb/ble/config.h +++ b/keyboards/converter/usb_usb/ble/config.h @@ -1,6 +1,3 @@ #pragma once -#undef PRODUCT -#define PRODUCT QMK BLE Adapter - #define NO_ACTION_ONESHOT diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h index 5f791eaa34cb..145a9e595fe8 100644 --- a/keyboards/converter/usb_usb/config.h +++ b/keyboards/converter/usb_usb/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x005B -#define DEVICE_VER 0x0001 -#define MANUFACTURER QMK -#define PRODUCT QMK USB-USB Converter - /* size of virtual matrix */ #define MATRIX_ROWS 16 #define MATRIX_COLS 16 diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 8df3bb3e7621..1bacf928a35f 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "converter/usb_usb", + "keyboard_name": "USB to USB Converter", + "manufacturer": "QMK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x005B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/converter/xt_usb/config.h b/keyboards/converter/xt_usb/config.h index 5f93fbfc6d39..8aaf92057850 100644 --- a/keyboards/converter/xt_usb/config.h +++ b/keyboards/converter/xt_usb/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6512 -#define DEVICE_VER 0x0001 -#define MANUFACTURER QMK -#define PRODUCT XT keyboard converter - /* key matrix size */ #define MATRIX_ROWS 16 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json index 4dbe14b6fa67..c6ea00cc0998 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IBM PC XT", + "keyboard_name": "IBM PC XT Keyboard Converter", + "manufacturer": "QMK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6512", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_xt": { "layout": [ diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h index 0f285b4d0ed1..461f28991888 100644 --- a/keyboards/cozykeys/bloomer/config.h +++ b/keyboards/cozykeys/bloomer/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1191 -#define MANUFACTURER CozyKeys -#define PRODUCT Bloomer - // Key matrix size #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json new file mode 100644 index 000000000000..ed0bb78867a3 --- /dev/null +++ b/keyboards/cozykeys/bloomer/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "Bloomer", + "manufacturer": "CozyKeys", + "url": "https://github.com/cozykeys/bloomer", + "maintainer": "pcewing", + "usb": { + "vid": "0xFEED", + "pid": "0x1191" + } +} diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h index 4cbe7025dba3..8eb3ab52c992 100644 --- a/keyboards/cozykeys/bloomer/v2/config.h +++ b/keyboards/cozykeys/bloomer/v2/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -// USB Device descriptor parameter -#define DEVICE_VER 0x0002 - // Keyboard Matrix Assignments #define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 } #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 } diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json index 7e268a4640e8..9cd8e532cf46 100644 --- a/keyboards/cozykeys/bloomer/v2/info.json +++ b/keyboards/cozykeys/bloomer/v2/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Bloomer", - "url": "https://github.com/cozykeys/bloomer", - "maintainer": "pcewing", + "usb": { + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h index 222afaf7dc07..8eb3ab52c992 100644 --- a/keyboards/cozykeys/bloomer/v3/config.h +++ b/keyboards/cozykeys/bloomer/v3/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -// USB Device descriptor parameter -#define DEVICE_VER 0x0003 - // Keyboard Matrix Assignments #define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 } #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 } diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json index 47d74269d23d..6b782663d8f0 100644 --- a/keyboards/cozykeys/bloomer/v3/info.json +++ b/keyboards/cozykeys/bloomer/v3/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Bloomer", - "url": "https://github.com/cozykeys/bloomer", - "maintainer": "pcewing", + "usb": { + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h index 52ef4bed87c2..e5e7597f7210 100644 --- a/keyboards/cozykeys/speedo/v2/config.h +++ b/keyboards/cozykeys/speedo/v2/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1192 -#define DEVICE_VER 0x0002 -#define MANUFACTURER CozyKeys -#define PRODUCT Speedo - // Key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json index 775511dda1df..8de425ede120 100644 --- a/keyboards/cozykeys/speedo/v2/info.json +++ b/keyboards/cozykeys/speedo/v2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Speedo", + "manufacturer": "CozyKeys", "url": "https://github.com/cozykeys/speedo", "maintainer": "pcewing", + "usb": { + "vid": "0xFEED", + "pid": "0x1192", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h index 39aa73adc84a..8590a45efc87 100644 --- a/keyboards/cozykeys/speedo/v3/config.h +++ b/keyboards/cozykeys/speedo/v3/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1192 -#define DEVICE_VER 0x0003 -#define MANUFACTURER CozyKeys -#define PRODUCT Speedo - // Key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index 8f2e2674bf90..49a5b94f066a 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Speedo", + "manufacturer": "CozyKeys", "url": "https://github.com/cozykeys/speedo", "maintainer": "pcewing", + "usb": { + "vid": "0xFEED", + "pid": "0x1192", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h index 02732819f9b4..21f3aa0ab44f 100644 --- a/keyboards/crkbd/config.h +++ b/keyboards/crkbd/config.h @@ -20,13 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4653 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER foostan -#define PRODUCT Corne - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json index 9a73ec68e9bd..354d33618cca 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "crkbd rev. 1", + "keyboard_name": "Corne", + "manufacturer": "foostan", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4653", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x6_3": { "layout": [