diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-04 01:36:14 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-04 01:36:14 +0000 |
| commit | 88cfd55b8c5073155eea272965e7ae0244777ef1 (patch) | |
| tree | 71529683c6ba13f233b9433c4c1772347ad8956f | |
| parent | 4e50de3a4ba8376952eb3e97bc16346a07f47a08 (diff) | |
| parent | 17176daf26ae17b8ae54312217555f1bfed782c1 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
146 files changed, 471 insertions, 562 deletions
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h index 2e035e08af..e6dfb6383b 100755 --- a/keyboards/tada68/config.h +++ b/keyboards/tada68/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5441 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0003 -#define MANUFACTURER TADA -#define PRODUCT TADA68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json index e84b560d76..8e7ecc0695 100644 --- a/keyboards/tada68/info.json +++ b/keyboards/tada68/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Tada68", + "keyboard_name": "TADA68", + "manufacturer": "TADA", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5441", + "pid": "0x0001", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index d6840ca682..0806c1068d 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0012 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Center x Enter - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 12 diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index cd7861f453..c9ecdb67ec 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Center x Enter", + "manufacturer": "takashicompany", "url": "", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index 1db4a7357a..3d769ab896 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0014 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Compacx - /* key matrix size */ #define MATRIX_ROWS 5 * 2 #define MATRIX_COLS 7 diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index 431579feb1..7690d3c333 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Compacx", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/compacx", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0014", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index bc4c44d24c..ebb5d696c4 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0018 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT DogTag - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 72bd5eb136..b9f82c26cb 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "DogTag", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/dogtag", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0018", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index c2c9e04200..5c8236c700 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0006 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT EndZone34 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index a70799b39b..2284f7a3b4 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "EndZone34", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/endzone34", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index 4c3138fc8e..4ca06fab2b 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0015 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Heavy Left - /* key matrix size */ #define MATRIX_ROWS 5 * 2 #define MATRIX_COLS 10 diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 878618e63d..6f04de1738 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "heavy_left", + "keyboard_name": "Heavy Left", + "manufacturer": "takashicompany", "url": "", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0015", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index 73a85e2d9f..25a74dc4d7 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0021 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT miniZone - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index 4c4969d1fc..51fb57276c 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "miniZone", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/minizone", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0021", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index 36bb330c95..24d5aa11fe 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0013 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT QooLee - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 12 diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index 56ef36b6e9..89335351ce 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "QooLee", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/qoolee", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0013", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index 7aa3c85360..49cb1f7e09 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0019 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Radialex - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 7 diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index d78e301ee9..8aff0b5ab8 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Radialex", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/radialex", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0019", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h index 165b815667..610ca4de66 100644 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ b/keyboards/takashiski/hecomi/alpha/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT hecomi_alpha - /* key matrix size */ //#define MATRIX_ROWS 5 #define MATRIX_ROWS 10 diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index a7493203f0..844736abd4 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hecomi/alpha", + "keyboard_name": "hecomi_alpha", + "manufacturer": "takashiski", "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959", "maintainer": "takashiski", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h index 5fab9ea77e..a2ad901198 100644 --- a/keyboards/takashiski/otaku_split/rev0/config.h +++ b/keyboards/takashiski/otaku_split/rev0/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT otaku_split - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index c7dc09e523..37844923fa 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Otaku split rev.0", + "keyboard_name": "otaku split rev.0", + "manufacturer": "takashiski", "url": "", - "maintainer": "takashiski", + "maintainer": "takashiski", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"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":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"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":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"x":0, "y":4, "w":2}, {"label":"Ctrl", "x":2, "y":4, "w":1.25}, {"label":"Alt", "x":3.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"Menu", "x":11.75, "y":4}, {"label":"\u5909\u63db", "x":12.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":14, "y":4, "w":1.25}, {"label":"Alt", "x":15.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":16.5, "y":4, "w":1.25}] diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h index 05979a6e04..1fc9d4f16c 100644 --- a/keyboards/takashiski/otaku_split/rev1/config.h +++ b/keyboards/takashiski/otaku_split/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT otaku_split - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 9c2121e0e1..9fa11237b6 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "otaku split rev.1", + "manufacturer": "takashiski", "url": "http", "maintainer": "takashiski", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"Insert", "x":8.75, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"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":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"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":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":3.5, "y":4}, {"label":"2", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"\u5909\u63db", "x":11.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":13, "y":4, "w":1.25}, {"label":"Alt", "x":14.25, "y":4, "w":1.25}, {"label":"Menu", "x":15.5, "y":4}, {"label":"Ctrl", "x":16.5, "y":4, "w":1.25}] diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h index 32fc1e9913..f29c1384dd 100644 --- a/keyboards/taleguers/taleguers75/config.h +++ b/keyboards/taleguers/taleguers75/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8476 -#define PRODUCT_ID 0x0075 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Taleguers -#define PRODUCT Taleguers75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json index 6f429c226a..fc335eac92 100644 --- a/keyboards/taleguers/taleguers75/info.json +++ b/keyboards/taleguers/taleguers75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Taleguers75", + "manufacturer": "Taleguers", "url": "", "maintainer": "borlopjim", + "usb": { + "vid": "0x8476", + "pid": "0x0075", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{ diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h index 3c323ba10e..164eac346f 100644 --- a/keyboards/tanuki/config.h +++ b/keyboards/tanuki/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6464 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Seth -#define PRODUCT Tanuki PCB version - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json index c3a34c38fd..d4e9140849 100644 --- a/keyboards/tanuki/info.json +++ b/keyboards/tanuki/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tanuki", + "manufacturer": "Seth", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6464", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Game", "x":11.25, "y":1}, {"label":"Shift", "x":0.25, "y":2, "w":1.5}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"\"", "x":8.75, "y":2}, {"label":"?", "x":9.75, "y":2}, {"label":"Enter", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3}, {"label":"<", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2}, {"label":">", "x":8.5, "y":3}, {"label":"GUI", "x":9.5, "y":3, "w":1.25}] diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h index f4aa79e88b..11c4c71878 100644 --- a/keyboards/team0110/p1800fl/config.h +++ b/keyboards/team0110/p1800fl/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3EAE -#define DEVICE_VER 0x0001 -#define MANUFACTURER team0110 -#define PRODUCT p1800fl - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json index c49ec2ef5c..5780cbc8cf 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "p1800fl", + "manufacturer": "team0110", "url": "http://team0110.store/", "maintainer": "team0110", + "usb": { + "vid": "0xFEED", + "pid": "0x3EAE", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h index 80d3137225..20357786eb 100644 --- a/keyboards/technika/config.h +++ b/keyboards/technika/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8484 // TT for TealTechnik -#define PRODUCT_ID 0x6049 // 60i -#define DEVICE_VER 0x0001 // Revision pre-Alpha -#define MANUFACTURER TealTechnik -#define PRODUCT Technika - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json index c78d31193f..4c509522ca 100644 --- a/keyboards/technika/info.json +++ b/keyboards/technika/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Technika", + "manufacturer": "TealTechnik", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x8484", + "pid": "0x6049", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/teleport/numpad/config.h b/keyboards/teleport/numpad/config.h index f3573483b7..e3a2f17898 100644 --- a/keyboards/teleport/numpad/config.h +++ b/keyboards/teleport/numpad/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7470 //"tp" -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER tlprt -#define PRODUCT NumPad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/info.json index a05b7440ba..8e26aa7789 100644 --- a/keyboards/teleport/numpad/info.json +++ b/keyboards/teleport/numpad/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "tlprt_NumPad", + "keyboard_name": "NumPad", + "manufacturer": "tlprt", "maintainer": "ebastler", + "usb": { + "vid": "0x7470", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/telophase/config.h b/keyboards/telophase/config.h index 6d23b98ae3..1e0c5a580d 100644 --- a/keyboards/telophase/config.h +++ b/keyboards/telophase/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER unknown -#define PRODUCT Telophase - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json index b31460fa22..b267e07e45 100644 --- a/keyboards/telophase/info.json +++ b/keyboards/telophase/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Telophase", + "manufacturer": "Unknown", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/tempo_turtle/bradpad/config.h b/keyboards/tempo_turtle/bradpad/config.h deleted file mode 100644 index c6a405b05f..0000000000 --- a/keyboards/tempo_turtle/bradpad/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2021 v3ritas <v3ritas@tempoturtle.com> -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "config_common.h" - -/*usb descriptor setup and keyboard setup (rows and cols) are located in info.json*/ diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json index e1caeeeb88..374279d9ac 100644 --- a/keyboards/tempo_turtle/bradpad/info.json +++ b/keyboards/tempo_turtle/bradpad/info.json @@ -1,5 +1,6 @@ { "keyboard_name": "bradpad", + "manufacturer": "tempo_turtle", "url": "https://tempoturtle.com", "maintainer": "wxyangf", "diode_direction": "ROW2COL", diff --git a/keyboards/tender/macrowo_pad/config.h b/keyboards/tender/macrowo_pad/config.h index 51f8fbb149..17f5597ec8 100644 --- a/keyboards/tender/macrowo_pad/config.h +++ b/keyboards/tender/macrowo_pad/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE936 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Tender -#define PRODUCT Macrowo Pad /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 10 diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index 727de47839..c9357100b3 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Macrowo_Pad", + "keyboard_name": "Macrowo Pad", + "manufacturer": "Tender", "url": "https//www.github.com/swiftrax", "maintainer": "swiftrax", + "usb": { + "vid": "0x04D8", + "pid": "0xE936", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}] diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h index 91b226e09b..7f810e7666 100644 --- a/keyboards/tenki/config.h +++ b/keyboards/tenki/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5058 // "PX" -#define PRODUCT_ID 0x5445 // "TE" -#define DEVICE_VER 0x1001 -#define MANUFACTURER Pixlup -#define PRODUCT TENKI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json index 7d87abba5a..2ffafbf1dd 100644 --- a/keyboards/tenki/info.json +++ b/keyboards/tenki/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TENKI", + "manufacturer": "Pixlup", "url": "https://tokopedia.com/pixlup", "maintainer": "eriqadams", + "usb": { + "vid": "0x5058", + "pid": "0x5445", + "device_version": "10.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Bspc", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"=", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"PrtScr", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}] diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h index 43720fa78f..911a4f3be9 100644 --- a/keyboards/terrazzo/config.h +++ b/keyboards/terrazzo/config.h @@ -17,14 +17,6 @@ #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4d4d // MM -#define PRODUCT_ID 0x545a // TZ -#define DEVICE_VER 0x0002 -#define MANUFACTURER MsMustard -#define PRODUCT Terrazzo - /* key matrix size */ // SWAP FOR PRO MICRO diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json index 7efb3d7111..1fa582f82d 100644 --- a/keyboards/terrazzo/info.json +++ b/keyboards/terrazzo/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Terrazzo", + "manufacturer": "MsMustard", "url": "", "maintainer": "MsMustard", + "usb": { + "vid": "0x4D4D", + "pid": "0x545A", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h index cfea2a72dc..fe80aefa37 100755 --- a/keyboards/tetris/config.h +++ b/keyboards/tetris/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Fengz -#define PRODUCT Tetris - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json index 6b59e2b5c0..eaae708614 100644 --- a/keyboards/tetris/info.json +++ b/keyboards/tetris/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tetris", + "manufacturer": "Fengz", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_mit": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h index 0fb0099833..918eab800c 100644 --- a/keyboards/tg4x/config.h +++ b/keyboards/tg4x/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4D // "MM" -#define PRODUCT_ID 0x0458 // 4 "X" -#define DEVICE_VER 0x0021 -#define MANUFACTURER MythosMann -#define PRODUCT TG4x - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 7 diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json index adf05c1aa4..dca51d9927 100644 --- a/keyboards/tg4x/info.json +++ b/keyboards/tg4x/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TG4x", + "manufacturer": "MythosMann", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4D4D", + "pid": "0x0458", + "device_version": "0.2.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3, "w":1.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h index f9a233c1b2..e2efccb633 100644 --- a/keyboards/tgr/910/config.h +++ b/keyboards/tgr/910/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x5447 //TG -#define PRODUCT_ID 0x9100 //910 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Quadcube -#define PRODUCT TGR-910 - #define RGBLED_NUM 19 #define MATRIX_ROWS 7 diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json index 32d09d2193..694d4be5d9 100644 --- a/keyboards/tgr/910/info.json +++ b/keyboards/tgr/910/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TGR-910", + "manufacturer": "Quadcube", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5447", + "pid": "0x9100", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h index 58b7426a1f..f69f48a121 100644 --- a/keyboards/tgr/910ce/config.h +++ b/keyboards/tgr/910ce/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x5447 // TG -#define PRODUCT_ID 0x910C -#define DEVICE_VER 0x0001 -#define MANUFACTURER TGR -#define PRODUCT 910CE - #define RGBLED_NUM 18 #define MATRIX_ROWS 6 diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json index 55ce67b283..cf86a59c12 100644 --- a/keyboards/tgr/910ce/info.json +++ b/keyboards/tgr/910ce/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TGR 910 CE", + "keyboard_name": "910CE", + "manufacturer": "TGR", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5447", + "pid": "0x910C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h index 26ed2e7973..c5824fb12b 100644 --- a/keyboards/tgr/alice/config.h +++ b/keyboards/tgr/alice/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define VENDOR_ID 0x20A0 -#define PRODUCT_ID 0x422E -#define DEVICE_VER 0x0200 -#define MANUFACTURER TGR -#define PRODUCT Alice - /* matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json index 7e92a9ceda..d49e8a0e25 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TGR Alice", + "keyboard_name": "Alice", + "manufacturer": "TGR", "url": "", "maintainer": "Felipe Coury", + "usb": { + "vid": "0x20A0", + "pid": "0x422E", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/tgr/jane/v2/config.h b/keyboards/tgr/jane/v2/config.h index 0132a716d3..4618c99ce0 100644 --- a/keyboards/tgr/jane/v2/config.h +++ b/keyboards/tgr/jane/v2/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x5447 // TG -#define PRODUCT_ID 0x4A4E // JN -#define DEVICE_VER 0x0200 -#define MANUFACTURER TGR -#define PRODUCT Jane - #define MATRIX_ROWS 8 #define MATRIX_COLS 15 diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json index 0f0955c3f9..aaf15c8234 100644 --- a/keyboards/tgr/jane/v2/info.json +++ b/keyboards/tgr/jane/v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TGR Jane v2", + "keyboard_name": "Jane v2", + "manufacturer": "TGR", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5447", + "pid": "0x4A4E", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5}, {"x":2.25, "y":5.5}, {"x":3.25, "y":5.5, "w":1.25}, {"x":4.5, "y":5.5, "w":1.25}, {"x":5.75, "y":5.5, "w":1.25}, {"x":7, "y":5.5, "w":1.25}, {"x":8.25, "y":5.5, "w":1.25}, {"x":9.5, "y":5.5, "w":1.25}, {"x":10.75, "y":5.5}, {"x":11.75, "y":5.5}, {"x":12.75, "y":5.5}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] diff --git a/keyboards/tgr/jane/v2ce/config.h b/keyboards/tgr/jane/v2ce/config.h index e6f6e99e7d..e0f8a7c861 100644 --- a/keyboards/tgr/jane/v2ce/config.h +++ b/keyboards/tgr/jane/v2ce/config.h @@ -18,12 +18,6 @@ #include "config_common.h" -#define VENDOR_ID 0x5447 // TG -#define PRODUCT_ID 0x4A43 // JC -#define DEVICE_VER 0x0200 -#define MANUFACTURER TGR -#define PRODUCT Jane - #define MATRIX_ROWS 8 #define MATRIX_COLS 15 diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json index 97e12227f2..0219caab49 100644 --- a/keyboards/tgr/jane/v2ce/info.json +++ b/keyboards/tgr/jane/v2ce/info.json @@ -1,9 +1,13 @@ { - "keyboard_name": "TGR Jane v2 CE", + "keyboard_name": "Jane v2 CE", + "manufacturer": "TGR", "url": "", "maintainer": "qmk", - "width": 18.25, - "height": 6.5, + "usb": { + "vid": "0x5447", + "pid": "0x4A43", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT_all_f13": { "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5}, {"x":2.25, "y":5.5}, {"x":3.25, "y":5.5, "w":1.25}, {"x":4.5, "y":5.5, "w":1.25}, {"x":5.75, "y":5.5, "w":1.25}, {"x":7, "y":5.5, "w":1.25}, {"x":8.25, "y":5.5, "w":1.25}, {"x":9.5, "y":5.5, "w":1.25}, {"x":10.75, "y":5.5}, {"x":11.75, "y":5.5}, {"x":12.75, "y":5.5}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h index 131add14cd..eed74f07e0 100644 --- a/keyboards/tgr/tris/config.h +++ b/keyboards/tgr/tris/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x5447 //TG -#define PRODUCT_ID 0x5452 //TR -#define DEVICE_VER 0x0001 -#define MANUFACTURER TGR -#define PRODUCT Tris - #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json index c4288ac14b..e557935785 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TGR Tris", + "keyboard_name": "Tris", + "manufacturer": "TGR", "url": "", "maintainer": "halfenergized", + "usb": { + "vid": "0x5447", + "pid": "0x5452", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}] diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h index 9e3dadce3d..f24759f4db 100644 --- a/keyboards/the_royal/liminal/config.h +++ b/keyboards/the_royal/liminal/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B4B -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TheRoyalSweatshirt -#define PRODUCT Liminal - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index b42337a740..d6f25ee6fe 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "liminal", + "keyboard_name": "Liminal", + "manufacturer": "TheRoyalSweatshirt", "url": "", "maintainer": "TheRoyalSweatshirt", + "usb": { + "vid": "0x4B4B", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_base_kit_all": { "layout": [ diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h index 955771c793..5ea20a5e00 100644 --- a/keyboards/the_royal/schwann/config.h +++ b/keyboards/the_royal/schwann/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3521 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TheRoyalSweatshirt -#define PRODUCT The Schwann PCB - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json index 96814fb1ee..a072970a38 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Schwann's PCB", + "keyboard_name": "The Schwann PCB", + "manufacturer": "TheRoyalSweatshirt", "url": "https://github.com/TheRoyalSweatshirt/The_Royal_Projects/tree/schwann/PCBs/Schwann_PCB", "maintainer": "TheRoyalSweatshirt", + "usb": { + "vid": "0xFEED", + "pid": "0x3521", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_mit": { "layout": [ diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h index 7cbba827a2..042fd276d9 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/config.h +++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1701 -#define DEVICE_VER 0x0002 -#define MANUFACTURER The Mad Noodle -#define PRODUCT NCC1701KB v2 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json index ee62dbafc9..7c919dc3bc 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/info.json +++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "NCC-1701-KB v2", + "manufacturer": "The Mad Noodle", "url": "instagram.com/the_mad_noodle", "maintainer": "The-Mad-Noodle", + "usb": { + "vid": "0xFEED", + "pid": "0x1701", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h index 3f47e3b609..042fd276d9 100644 --- a/keyboards/themadnoodle/noodlepad/config.h +++ b/keyboards/themadnoodle/noodlepad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1701 -#define DEVICE_VER 0x0001 -#define MANUFACTURER The Mad Noodle -#define PRODUCT Noodle Pad v1 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json index 5ffcc68677..c79d8ac305 100644 --- a/keyboards/themadnoodle/noodlepad/info.json +++ b/keyboards/themadnoodle/noodlepad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "NoodlePad", + "keyboard_name": "Noodle Pad v1", + "manufacturer": "The Mad Noodle", "url": "instagram.com/the_mad_noodle", "maintainer": "The-Mad-Noodle", + "usb": { + "vid": "0xFEED", + "pid": "0x1701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h index 9cb1fccebf..b0acc5b039 100644 --- a/keyboards/thevankeyboards/bananasplit/config.h +++ b/keyboards/thevankeyboards/bananasplit/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8870 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TheVan Keyboards -#define PRODUCT BananaSplit 60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json index 44ebb41b27..d4b4f00b5d 100644 --- a/keyboards/thevankeyboards/bananasplit/info.json +++ b/keyboards/thevankeyboards/bananasplit/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "bananasplit", + "keyboard_name": "BananaSplit 60", + "manufacturer": "TheVan Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEAE", + "pid": "0x8870", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_base": { "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":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] diff --git a/keyboards/thevankeyboards/caravan/config.h b/keyboards/thevankeyboards/caravan/config.h index 3a8676b537..ec35e9e48e 100644 --- a/keyboards/thevankeyboards/caravan/config.h +++ b/keyboards/thevankeyboards/caravan/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8844 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TheVan Keyboards -#define PRODUCT Caravan - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/thevankeyboards/caravan/info.json b/keyboards/thevankeyboards/caravan/info.json index 3b3ac4865d..8dbc08fcce 100644 --- a/keyboards/thevankeyboards/caravan/info.json +++ b/keyboards/thevankeyboards/caravan/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TheVanKeyboards Caravan", + "keyboard_name": "Caravan", + "manufacturer": "TheVan Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEAE", + "pid": "0x8844", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h index 72f4a6a61f..b3ba58985b 100644 --- a/keyboards/thevankeyboards/minivan/config.h +++ b/keyboards/thevankeyboards/minivan/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8844 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Evan Sailer -#define PRODUCT Minivan - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json index 3ed0e4472d..82537ef045 100644 --- a/keyboards/thevankeyboards/minivan/info.json +++ b/keyboards/thevankeyboards/minivan/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "tv44", + "keyboard_name": "Minivan", + "manufacturer": "Evan Sailer", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEAE", + "pid": "0x8844", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Win", "x":9.5, "y":3, "w":1.5}, {"label":"Menu", "x":11, "y":3, "w":1.75}] diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h index 0bbd93ad7d..15414ab797 100644 --- a/keyboards/thevankeyboards/roadkit/config.h +++ b/keyboards/thevankeyboards/roadkit/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8846 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TheVan Keyboards -#define PRODUCT Roadkit Micro - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/thevankeyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json index eefa2b3468..0b00063bec 100644 --- a/keyboards/thevankeyboards/roadkit/info.json +++ b/keyboards/thevankeyboards/roadkit/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Roadkit", + "keyboard_name": "Roadkit Micro", + "manufacturer": "TheVan Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEAE", + "pid": "0x8846", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_4x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}] diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h index 2945514787..17c7c7698b 100644 --- a/keyboards/tkc/california/config.h +++ b/keyboards/tkc/california/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0009 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKC -#define PRODUCT California - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 10 diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json index ef55e0e2e0..b673e5d30d 100644 --- a/keyboards/tkc/california/info.json +++ b/keyboards/tkc/california/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC California", + "keyboard_name": "California", + "manufacturer": "TKC", "url": "", "maintainer": "TerryMathews", + "usb": { + "vid": "0x544B", + "pid": "0x0009", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.5, "y":0}, {"label":"Home", "x":17, "y":0}, {"label":"End", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "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":"Bksp", "x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"PgUp", "x":15.5, "y":1.5}, {"label":"Num Lock", "x":17, "y":1.5}, {"label":"/", "x":18, "y":1.5}, {"label":"*", "x":19, "y":1.5}, {"label":"-", "x":20, "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":"PgDn", "x":15.5, "y":2.5}, {"label":"7", "x":17, "y":2.5}, {"label":"8", "x":18, "y":2.5}, {"label":"9", "x":19, "y":2.5}, {"label":"+", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":17, "y":3.5}, {"label":"5", "x":18, "y":3.5}, {"label":"6", "x":19, "y":3.5}, {"x":20, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":15.5, "y":4.75}, {"label":"1", "x":17, "y":4.5}, {"label":"2", "x":18, "y":4.5}, {"label":"3", "x":19, "y":4.5}, {"label":"Enter", "x":20, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":14.5, "y":5.75}, {"label":"\u2193", "x":15.5, "y":5.75}, {"label":"\u2192", "x":16.5, "y":5.75}, {"label":"0", "x":18, "y":5.5}, {"label":".", "x":19, "y":5.5}, {"x":20, "y":5.5}] diff --git a/keyboards/tkc/candybar/lefty/config.h b/keyboards/tkc/candybar/lefty/config.h index 104ead511a..8762bdf515 100644 --- a/keyboards/tkc/candybar/lefty/config.h +++ b/keyboards/tkc/candybar/lefty/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0006 -#define MANUFACTURER The Key Company -#define PRODUCT Candybar - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 17 diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json index 553ce6d021..c902c78cee 100644 --- a/keyboards/tkc/candybar/lefty/info.json +++ b/keyboards/tkc/candybar/lefty/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC Candybar", + "keyboard_name": "Candybar", + "manufacturer": "The Key Company", "url": "", "maintainer": "terrymathews", + "usb": { + "vid": "0x544B", + "pid": "0x0003", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/lefty_r3/config.h b/keyboards/tkc/candybar/lefty_r3/config.h index 9ce16dd731..ccf635a7ce 100644 --- a/keyboards/tkc/candybar/lefty_r3/config.h +++ b/keyboards/tkc/candybar/lefty_r3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0006 -#define MANUFACTURER The Key Company -#define PRODUCT Candybar - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 17 diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json index 1ef3dcd54a..c902c78cee 100644 --- a/keyboards/tkc/candybar/lefty_r3/info.json +++ b/keyboards/tkc/candybar/lefty_r3/info.json @@ -1,9 +1,13 @@ { - "keyboard_name": "TKC Candybar", + "keyboard_name": "Candybar", + "manufacturer": "The Key Company", "url": "", "maintainer": "terrymathews", - "width": 17, - "height": 4, + "usb": { + "vid": "0x544B", + "pid": "0x0003", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/righty/config.h b/keyboards/tkc/candybar/righty/config.h index dcbe840c8e..8762bdf515 100644 --- a/keyboards/tkc/candybar/righty/config.h +++ b/keyboards/tkc/candybar/righty/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0006 -#define MANUFACTURER The Key Company -#define PRODUCT Candybar - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 17 diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json index 8e54afb431..4dde92d27f 100644 --- a/keyboards/tkc/candybar/righty/info.json +++ b/keyboards/tkc/candybar/righty/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC Candybar", + "keyboard_name": "Candybar", + "manufacturer": "The Key Company", "url": "", "maintainer": "terrymathews", + "usb": { + "vid": "0x544B", + "pid": "0x0002", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/righty_r3/config.h b/keyboards/tkc/candybar/righty_r3/config.h index 0c8604a9ac..fd922f0881 100644 --- a/keyboards/tkc/candybar/righty_r3/config.h +++ b/keyboards/tkc/candybar/righty_r3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0006 -#define MANUFACTURER The Key Company -#define PRODUCT Candybar - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 17 diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json index 81dc4f8ec5..4dde92d27f 100644 --- a/keyboards/tkc/candybar/righty_r3/info.json +++ b/keyboards/tkc/candybar/righty_r3/info.json @@ -1,9 +1,13 @@ { - "keyboard_name": "TKC Candybar", + "keyboard_name": "Candybar", + "manufacturer": "The Key Company", "url": "", "maintainer": "terrymathews", - "width": 17, - "height": 4, + "usb": { + "vid": "0x544B", + "pid": "0x0002", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h index edda02ea79..f2c124b7fe 100644 --- a/keyboards/tkc/godspeed75/config.h +++ b/keyboards/tkc/godspeed75/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0006 //GodSpeed75 -#define DEVICE_VER 0x0001 -#define MANUFACTURER The Key Company -#define PRODUCT GodSpeed75 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json index 8a4415e903..6cffc225ac 100644 --- a/keyboards/tkc/godspeed75/info.json +++ b/keyboards/tkc/godspeed75/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC GodSpeed75", + "keyboard_name": "GodSpeed75", + "manufacturer": "The Key Company", "url": "", "maintainer": "terrymathews", + "usb": { + "vid": "0x544B", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Scroll Lock", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"label":"BkSp", "x":14, "y":1}, {"label":"PgUp", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"PgDn", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Insert", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"Delete", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.25}, {"x":3.5, "y":5, "w":6.25}, {"label":"MO(1)", "x":9.75, "y":5, "w":1.25}, {"label":"Ctrl", "x":11, "y":5, "w":1.25}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index 377499ba72..961c254a40 100644 --- a/keyboards/tkc/m0lly/config.h +++ b/keyboards/tkc/m0lly/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B // "TK" -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER The Key Company -#define PRODUCT M0lly - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json index fab1f500d0..4383bc04dd 100644 --- a/keyboards/tkc/m0lly/info.json +++ b/keyboards/tkc/m0lly/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC M0LLY", + "keyboard_name": "M0lly", + "manufacturer": "The Key Company", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x544B", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h index 370e7b7b5b..45269b5cc4 100644 --- a/keyboards/tkc/osav2/config.h +++ b/keyboards/tkc/osav2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0005 //Alice -#define DEVICE_VER 0x0001 -#define MANUFACTURER The Key Company -#define PRODUCT OSA v2 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json index 21c45805ce..b5fea85c99 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC OSA v2", + "keyboard_name": "OSA v2", + "manufacturer": "The Key Company", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x544B", + "pid": "0x0005", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"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":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index be042050f5..0a52f2e3af 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKC -#define PRODUCT Portico - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json index b2ff8054c7..d87ebe56b7 100644 --- a/keyboards/tkc/portico/info.json +++ b/keyboards/tkc/portico/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC Portico", + "keyboard_name": "Portico", + "manufacturer": "TKC", "url": "", "maintainer": "TerryMathews", + "usb": { + "vid": "0x544B", + "pid": "0x0008", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h index dea6180958..5cfdf43c3d 100644 --- a/keyboards/tkc/portico68v2/config.h +++ b/keyboards/tkc/portico68v2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0012 //Portico68v2 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKC -#define PRODUCT Portico68v2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json index d3ea7cb264..c75fb31679 100644 --- a/keyboards/tkc/portico68v2/info.json +++ b/keyboards/tkc/portico68v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC Portico68 v2", + "keyboard_name": "Portico68 v2", + "manufacturer": "TKC", "url": "", "maintainer": "TerryMathews", + "usb": { + "vid": "0x544B", + "pid": "0x0012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index bbafc0d309..63a9ee4958 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B // TK -#define PRODUCT_ID 0x0011 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKC -#define PRODUCT Portico75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json index 5aaf21ffcc..ba2db69969 100644 --- a/keyboards/tkc/portico75/info.json +++ b/keyboards/tkc/portico75/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC Portico75", + "keyboard_name": "Portico75", + "manufacturer": "TKC", "url": "", "maintainer": "TerryMathews", + "usb": { + "vid": "0x544B", + "pid": "0x0011", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_75_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Mute", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Fn", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15.25, "y":5.5}] diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h index 5bf93542c2..eb33e2f2ad 100644 --- a/keyboards/tkc/tkc1800/config.h +++ b/keyboards/tkc/tkc1800/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B // "TK" -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0003 -#define MANUFACTURER The Key Company -#define PRODUCT TKC1800 - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 19 diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json index deac3447f1..4d1de2e2f1 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TKC1800", + "manufacturer": "The Key Company", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x544B", + "pid": "0x0001", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h index 5ab7b94692..597839326f 100644 --- a/keyboards/tkc/tkl_ab87/config.h +++ b/keyboards/tkc/tkl_ab87/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544B //TK -#define PRODUCT_ID 0x0007 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKC -#define PRODUCT TKL A/B87 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json index 02142bd755..d7b6b8f070 100644 --- a/keyboards/tkc/tkl_ab87/info.json +++ b/keyboards/tkc/tkl_ab87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "TKC TKL A/B87", + "keyboard_name": "TKL A/B87", + "manufacturer": "TKC", "url": "", "maintainer": "TerryMathews", + "usb": { + "vid": "0x544B", + "pid": "0x0007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h index 96471e443d..69de5208c6 100644 --- a/keyboards/tkw/stoutgat/v1/config.h +++ b/keyboards/tkw/stoutgat/v1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7811 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKW -#define PRODUCT stoutgat - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json index d649a48b5b..22be9b3ae2 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "stoutgat", + "manufacturer": "TKW", "url": "https://github.com/vattern/stoutgat", "maintainer": "vattern", + "usb": { + "vid": "0xFEED", + "pid": "0x7811", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_encoder": { "layout": [ diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index 73b3eef90b..989cc1a76e 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7811 -#define DEVICE_VER 0x0002 -#define MANUFACTURER TKW -#define PRODUCT Stoutgat v2 65% - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index 6946e3e0bc..bafe4d6fc1 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "stoutgat/v2", + "keyboard_name": "Stoutgat v2 65%", + "manufacturer": "TKW", "url": "https://github.com/vattern/stoutgatv2", "maintainer": "vattern", + "usb": { + "vid": "0xFEED", + "pid": "0x7811", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_encoder": { "layout": [ diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h index f3640197ae..be448dba71 100644 --- a/keyboards/tmo50/config.h +++ b/keyboards/tmo50/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFBFB -#define PRODUCT_ID 0x0050 -#define DEVICE_VER 0x0001 -#define MANUFACTURER funderburker -#define PRODUCT TMO50 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json index c51636fb5e..04e2d5bdc1 100644 --- a/keyboards/tmo50/info.json +++ b/keyboards/tmo50/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TMO50", + "manufacturer": "funderburker", "url": "", "maintainer": "funderburker", + "usb": { + "vid": "0xFBFB", + "pid": "0x0050", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"", "x":0, "y":0}, {"label":"", "x":1.25, "y":0}, {"label":"", "x":2.25, "y":0}, {"label":"", "x":3.25, "y":0}, {"label":"", "x":4.25, "y":0}, {"label":"", "x":5.25, "y":0}, {"label":"", "x":6.25, "y":0}, {"label":"", "x":7.25, "y":0}, {"label":"", "x":8.25, "y":0}, {"label":"", "x":9.25, "y":0}, {"label":"", "x":10.25, "y":0}, {"label":"", "x":11.25, "y":0}, {"label":"", "x":12.25, "y":0}, {"label":"", "x":13.25, "y":0}, {"label":"", "x":14.25, "y":0}, {"x":0, "y":1}, {"label":"Ctrl", "x":1.25, "y":1, "w":1.25}, {"label":"", "x":2.5, "y":1}, {"label":"", "x":3.5, "y":1}, {"label":"", "x":4.5, "y":1}, {"label":"", "x":5.5, "y":1}, {"label":"", "x":6.5, "y":1}, {"label":"", "x":7.5, "y":1}, {"label":"", "x":8.5, "y":1}, {"label":"", "x":9.5, "y":1}, {"label":"", "x":10.5, "y":1}, {"label":"", "x":11.5, "y":1}, {"label":"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"", "x":3, "y":2}, {"label":"", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"", "x":6, "y":2}, {"label":"b", "x":7, "y":2}, {"label":"", "x":8, "y":2}, {"label":"m", "x":9, "y":2}, {"label":"", "x":10, "y":2}, {"label":"", "x":11, "y":2}, {"label":"", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"", "x":14.25, "y":2}, {"x":0, "y":3}, {"label":"Alt", "x":2.75, "y":3}, {"label":"Win", "x":3.75, "y":3, "w":1.5}, {"label":"", "x":5.25, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"AltGr", "x":10.25, "y":3, "w":1.5}, {"label":"L3", "x":11.75, "y":3}] diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h index 793e740fa3..c9d44db707 100644 --- a/keyboards/toad/config.h +++ b/keyboards/toad/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6776 -#define DEVICE_VER 0x0001 -#define MANUFACTURER farmakon -#define PRODUCT "TOAD" - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json index 5ef32af5c7..34b7b9d6eb 100644 --- a/keyboards/toad/info.json +++ b/keyboards/toad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Toad", + "manufacturer": "farmakon", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6776", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index f4b4e6e5ab..8f2d1b7865 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5143 // QC -#define PRODUCT_ID 0x4134 // A4 -#define DEVICE_VER 0x0001 -#define MANUFACTURER quadcube -#define PRODUCT alix40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index 66a578bef3..220e238128 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "alix40", + "manufacturer": "quadcube", "url": "https://tokyokeyboard.com/", "maintainer": "qmk", + "usb": { + "vid": "0x5143", + "pid": "0x4134", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_40_alix": { "layout": [{ diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index 03dee74e9b..60ed4d8f86 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5436 // "T6" -#define PRODUCT_ID 0x6060 // Tokyo60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Tokyo Keyboard -#define PRODUCT Tokyo60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index 3f6b120c17..b6422e68c7 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tokyo60", + "manufacturer": "Tokyo Keyboard", "url": "https://tokyokeyboard.com/", "maintainer": "qmk", + "usb": { + "vid": "0x5436", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_hhkb": { "layout": [{ diff --git a/keyboards/tominabox1/adalyn/config.h b/keyboards/tominabox1/adalyn/config.h index c34337f245..10bcb0e4d5 100644 --- a/keyboards/tominabox1/adalyn/config.h +++ b/keyboards/tominabox1/adalyn/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x6164 -#define DEVICE_VER 0x0001 -#define MANUFACTURER tominabox1 -#define PRODUCT Adalyn - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/adalyn/info.json b/keyboards/tominabox1/adalyn/info.json index b8cc6640af..4fe658d5a3 100644 --- a/keyboards/tominabox1/adalyn/info.json +++ b/keyboards/tominabox1/adalyn/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "adalyn", + "keyboard_name": "Adalyn", + "manufacturer": "tominabox1", "url": "https://github.com/MarvFPV/Adalyn", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x6164", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0, "w":1.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":10.75, "y":3}] diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h index d6cc8e7b55..27142b431c 100755 --- a/keyboards/tominabox1/bigboy/config.h +++ b/keyboards/tominabox1/bigboy/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x6262 -#define DEVICE_VER 0x0001 -#define MANUFACTURER tominabox1 -#define PRODUCT BigBoy - /* key matrix size */ #define DIRECT_PINS { \ { D0, B1, B0 }, \ diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json index 49c5b16d85..4c18c89555 100644 --- a/keyboards/tominabox1/bigboy/info.json +++ b/keyboards/tominabox1/bigboy/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BigBoy", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x6262", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}] diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/config.h b/keyboards/tominabox1/littlefoot_lx/rev1/config.h index 0f9ad3c918..2344c8d284 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/config.h +++ b/keyboards/tominabox1/littlefoot_lx/rev1/config.h @@ -20,14 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x6C78 -#define DEVICE_VER 0x0001 -#define PRODUCT Littlefoot LX -#define MANUFACTURER tominabox1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json index ee2d32e667..107b62910c 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Littlefoot LX", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x6C78", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"x":1.5, "y":4, "w":7}] diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/config.h b/keyboards/tominabox1/littlefoot_lx/rev2/config.h index db97c0f133..d498ca7ab7 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/config.h +++ b/keyboards/tominabox1/littlefoot_lx/rev2/config.h @@ -20,14 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x6C78 -#define DEVICE_VER 0x0001 -#define PRODUCT Littlefoot LX -#define MANUFACTURER tominabox1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json index ee2d32e667..107b62910c 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Littlefoot LX", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x6C78", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"x":1.5, "y":4, "w":7}] diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h index 1dbaaa0fc4..2181419594 100644 --- a/keyboards/tominabox1/qaz/config.h +++ b/keyboards/tominabox1/qaz/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER whydobearsexplod -#define PRODUCT qaz keyboard - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json index bae0c72bf1..9e524eb5c3 100644 --- a/keyboards/tominabox1/qaz/info.json +++ b/keyboards/tominabox1/qaz/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "qaz", + "manufacturer": "whydobearsexplod", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0, "w":1.25}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"Ent", "x":9.25, "y":1}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":".", "x":7.75, "y":2}, {"label":"Shift","x":8.75, "y":2, "w":1.5},{"label":"Super", "x":0, "y":3}, {"label":"Meta", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"", "x":3, "y":3, "w":2.25}, {"label":"", "x":5.25, "y":3, "w":2}, {"label":"AltGr", "x":7.25, "y":3},{"label":"Meta", "x":8.25, "y":3},{"label":"Super", "x":9.25, "y":3}] diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h index 8bdb802bde..e05b66e8a5 100644 --- a/keyboards/tominabox1/underscore33/rev1/config.h +++ b/keyboards/tominabox1/underscore33/rev1/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x3301 // _33 rev1 -#define DEVICE_VER 0x0001 -#define MANUFACTURER tominabox1 -#define PRODUCT underscore33 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json index dff483d85f..7dac151000 100644 --- a/keyboards/tominabox1/underscore33/rev1/info.json +++ b/keyboards/tominabox1/underscore33/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "underscore33", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x3301", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_33_big_space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":6.25}, {"label":"", "x":8.15, "y":3, "w":1.25}] diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h index 0e965de231..9056a25467 100644 --- a/keyboards/tominabox1/underscore33/rev2/config.h +++ b/keyboards/tominabox1/underscore33/rev2/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0x3302 // _33 rev2 -#define DEVICE_VER 0x0002 -#define MANUFACTURER tominabox1 -#define PRODUCT underscore33 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json index b2c89ba344..36f8b5d8ee 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "underscore33", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0x3302", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_33_big_space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":6.25}, {"label":"", "x":8.15, "y":3, "w":1.25}] diff --git a/keyboards/torn/config.h b/keyboards/torn/config.h index 6cd6c2808e..a7043112e7 100644 --- a/keyboards/torn/config.h +++ b/keyboards/torn/config.h @@ -19,14 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -/* VID & PID from vusb project, see tmk_core/protocol/vusb/USB-IDs-for-free.txt"*/ -#define VENDOR_ID 0x7274 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0000 -#define MANUFACTURER richard.titmuss -#define PRODUCT Torn - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json index 8c35427570..26e6ade034 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Torn / Split Through Hole", + "keyboard_name": "Torn", + "manufacturer": "richard.titmuss", "url": "https://github.com/rtitmuss/torn", "maintainer": "rtitmuss", + "usb": { + "vid": "0x7274", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h index 8b42d0fe4f..2499fca4e1 100644 --- a/keyboards/touchpad/config.h +++ b/keyboards/touchpad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16D0 -#define PRODUCT_ID 0x0DB8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER JacoBurge -#define PRODUCT TouchPad - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json index d8d0fab168..c20d14ce7e 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "touchpad", + "keyboard_name": "TouchPad", + "manufacturer": "JacoBurge", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x16D0", + "pid": "0x0DB8", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_6x6": { "layout": [ diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h index 5f029758a5..80a641c6eb 100644 --- a/keyboards/tr60w/config.h +++ b/keyboards/tr60w/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4140 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Triangle_Lab -#define PRODUCT TR60W - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json index 629fb97b94..8a8fbdff78 100644 --- a/keyboards/tr60w/info.json +++ b/keyboards/tr60w/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TR60W", + "manufacturer": "Triangle Lab", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x4140", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index 93e6479a15..20e79e5c1c 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -23,12 +23,6 @@ SOFTWARE. #pragma once #include "config_common.h" -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8947 -#define DEVICE_VER 0x0001 -#define MANUFACTURER trash man -#define PRODUCT Ketch - #define MATRIX_ROWS 6 #define MATRIX_COLS 8 #define MATRIX_ROW_PINS { F5, F1, F0, F7, B6, F6 } diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index 2fa70b05be..fbeffd539c 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ketch", + "keyboard_name": "Ketch", + "manufacturer": "trash man", "url": "https://trashman.wiki/pcbs/ketch", "maintainer": "jetpacktuxedo", + "usb": { + "vid": "0xFEAE", + "pid": "0x8947", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h index 86734a7fd8..99e0148114 100644 --- a/keyboards/treasure/type9/config.h +++ b/keyboards/treasure/type9/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Treasure -#define PRODUCT Type 9 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json index 2f8b7c82b2..4f97080c00 100644 --- a/keyboards/treasure/type9/info.json +++ b/keyboards/treasure/type9/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Type-9", + "manufacturer": "Treasure", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/treasure/type9s2/config.h b/keyboards/treasure/type9s2/config.h index a9d73f961f..ae68a415ea 100644 --- a/keyboards/treasure/type9s2/config.h +++ b/keyboards/treasure/type9s2/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5452 -#define PRODUCT_ID 0x5492 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TREASURE -#define PRODUCT TYPE-9 Series II - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json index 68b47f46ef..388b202af0 100644 --- a/keyboards/treasure/type9s2/info.json +++ b/keyboards/treasure/type9s2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Treasure TYPE-9 Series II", + "keyboard_name": "Type-9 Series II", + "manufacturer": "Treasure", "url": "http://treasuretypes.com", "maintainer": "Treasure", + "usb": { + "vid": "0x5452", + "pid": "0x5492", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h index b331cfbde9..c839cad67b 100644 --- a/keyboards/tszaboo/ortho4exent/config.h +++ b/keyboards/tszaboo/ortho4exent/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5453 // "TS" -#define PRODUCT_ID 0x7934 // "O4" -#define DEVICE_VER 0x0001 -#define MANUFACTURER tszaboo -#define PRODUCT ortho4exent - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json index 4fe1e18f51..ad2e67dc70 100644 --- a/keyboards/tszaboo/ortho4exent/info.json +++ b/keyboards/tszaboo/ortho4exent/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ortho4exent", + "manufacturer": "tszaboo", "url": "https://github.com/tszaboo/Ortho4Exent", "maintainer": "tszaboo", + "usb": { + "vid": "0x5453", + "pid": "0x7934", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h index 11a427a30e..04d50fe24a 100644 --- a/keyboards/tunks/ergo33/config.h +++ b/keyboards/tunks/ergo33/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xA0A1 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kulmajaba -#define PRODUCT Ergo33 - #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json index ccfc26e1f0..64405edae4 100644 --- a/keyboards/tunks/ergo33/info.json +++ b/keyboards/tunks/ergo33/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Ergo33", + "manufacturer": "kulmajaba", "url": "https://github.com/kulmajaba/tunks-keyboard", + "usb": { + "vid": "0xFEED", + "pid": "0xA0A1", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h index 67547b247e..57307e218c 100644 --- a/keyboards/tw40/config.h +++ b/keyboards/tw40/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x503D /* "P3D" */ -#define PRODUCT_ID 0x5457 /* "TW" */ -#define DEVICE_VER 0x0001 -#define MANUFACTURER KnoblesseOblige -#define PRODUCT TW40 - #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json index 13f45e642e..68baf1819b 100644 --- a/keyboards/tw40/info.json +++ b/keyboards/tw40/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Training Wheel 40", + "keyboard_name": "TW40", + "manufacturer": "KnoblesseOblige", "url": "https://p3dstore.com/products/tw40-gb", "maintainer": "KnoblesseOblige", + "usb": { + "vid": "0x503D", + "pid": "0x5457", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |