From 3a7dbc89817950709717d6dcec18a6eccbcc2d28 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 12:16:16 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) --- keyboards/converter/a1200/info.json | 1 - keyboards/converter/a1200/miss1200/config.h | 7 ------- keyboards/converter/a1200/miss1200/info.json | 9 +++++++++ keyboards/converter/a1200/mistress1200/config.h | 7 ------- keyboards/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 +++++++- keyboards/converter/modelm101_teensy2/config.h | 7 ------- keyboards/converter/modelm101_teensy2/info.json | 8 +++++++- keyboards/converter/modelm_ssk/config.h | 7 ------- keyboards/converter/modelm_ssk/info.json | 6 ++++++ keyboards/converter/numeric_keypad_IIe/config.h | 7 ------- keyboards/converter/numeric_keypad_IIe/info.json | 6 ++++++ keyboards/converter/palm_usb/config.h | 6 ------ keyboards/converter/palm_usb/info.json | 11 +++++++++++ keyboards/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 -------- keyboards/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 +++++++- 39 files changed, 129 insertions(+), 136 deletions(-) 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 (limited to 'keyboards/converter') diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index 41f328668e..1b46444ba8 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 7347f1948c..1eda769310 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 0000000000..3c97119dbd --- /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 123d6165d6..6908eff4d1 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 0000000000..1cdecf736e --- /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 84a81c297c..f6ec158abe 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 0000000000..243b586c9f --- /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 92ce05f3d2..b6eb105bbd 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 45ae5e4f34..f64616e212 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 91350bcb4f..e189b7d79a 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 01e9f4d25f..aa49bf11df 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 2cd36c5fb0..9e7d140809 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 2c1a605ad9..9854d2759e 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 c612327ecf..0260bc6fb4 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 278b98781a..f1db7083de 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 33c6303036..cc5f1a6afe 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 ffc679dbbb..b769ec2539 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 eb443856cd..8ae007c2aa 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 1da0a88738..617f893242 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 ff7aa12000..78f1a3391f 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 78d75c8d17..22d2981943 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 be21814f80..137e8e81b6 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 97e40bbad3..77b3c38227 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 35032835cd..f6e933ad2c 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 0000000000..ed4895ecfd --- /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 c3c520f260..34b1e1f83f 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 e2fdc74358..b93af8c954 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 7c178418c8..eea7c6598a 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 86fe59fbd5..93fca2962a 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 7c4ebe769b..2e537b78d4 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 0a4aa019f7..9d948b4cbd 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 0000000000..691d0d1953 --- /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 9a60b09607..383d7d65e5 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 9613d46e50..23d80c4121 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 675183f082..b4ee0992fe 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 5f791eaa34..145a9e595f 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 8df3bb3e76..1bacf928a3 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 5f93fbfc6d..8aaf920578 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 4dbe14b6fa..c6ea00cc09 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": [ -- cgit v1.2.3