From 1b92c204c10594fce6a715710c277a748a4fdc68 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 17:03:47 +1000 Subject: Move keyboard USB IDs and strings to data driven: K (#17846) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/keebio/bamfk1/config.h | 7 ------- keyboards/keebio/bamfk1/info.json | 6 ++++++ keyboards/keebio/bfo9000/config.h | 7 ------- keyboards/keebio/bfo9000/info.json | 8 +++++++- keyboards/keebio/bigswitchseat/config.h | 7 ------- keyboards/keebio/bigswitchseat/info.json | 6 ++++++ keyboards/keebio/choconum/config.h | 7 ------- keyboards/keebio/choconum/info.json | 6 ++++++ keyboards/keebio/chocopad/config.h | 7 ------- keyboards/keebio/chocopad/info.json | 6 ++++++ keyboards/keebio/dilly/config.h | 7 ------- keyboards/keebio/dilly/info.json | 6 ++++++ keyboards/keebio/ergodicity/config.h | 7 ------- keyboards/keebio/ergodicity/info.json | 6 ++++++ keyboards/keebio/fourier/config.h | 7 ------- keyboards/keebio/fourier/info.json | 6 ++++++ keyboards/keebio/laplace/config.h | 7 ------- keyboards/keebio/laplace/info.json | 6 ++++++ keyboards/keebio/quefrency/rev1/config.h | 7 ------- keyboards/keebio/quefrency/rev1/info.json | 8 +++++++- keyboards/keebio/quefrency/rev2/config.h | 7 ------- keyboards/keebio/quefrency/rev2/info.json | 8 +++++++- keyboards/keebio/quefrency/rev3/config.h | 7 ------- keyboards/keebio/quefrency/rev3/info.json | 8 +++++++- keyboards/keebio/quefrency/rev4/config.h | 7 ------- keyboards/keebio/quefrency/rev4/info.json | 8 +++++++- keyboards/keebio/quefrency/rev5/config.h | 7 ------- keyboards/keebio/quefrency/rev5/info.json | 6 ++++++ keyboards/keebio/stick/config.h | 7 ------- keyboards/keebio/stick/info.json | 6 ++++++ keyboards/keebio/tragicforce68/config.h | 7 ------- keyboards/keebio/tragicforce68/info.json | 6 ++++++ keyboards/keebio/tukey/config.h | 7 ------- keyboards/keebio/tukey/info.json | 6 ++++++ keyboards/keebio/wavelet/config.h | 7 ------- keyboards/keebio/wavelet/info.json | 6 ++++++ keyboards/keebio/wtf60/config.h | 7 ------- keyboards/keebio/wtf60/info.json | 6 ++++++ 38 files changed, 119 insertions(+), 138 deletions(-) (limited to 'keyboards/keebio') diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 5cd86a9d16..908b969da9 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1111 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keebio -#define PRODUCT BAMFK-1 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 817eb98af0..858dcfc948 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BAMFK-1", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1111", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h index 7bb150d8cf..74d8bfbc46 100644 --- a/keyboards/keebio/bfo9000/config.h +++ b/keyboards/keebio/bfo9000/config.h @@ -20,13 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1169 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT BFO-9000 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json index c492ccae18..3e455b3d6e 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keebio BFO-9000", + "keyboard_name": "BFO-9000", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10", + "pid": "0x1169", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bigswitchseat/config.h b/keyboards/keebio/bigswitchseat/config.h index dbf8311c8d..ff4896c056 100644 --- a/keyboards/keebio/bigswitchseat/config.h +++ b/keyboards/keebio/bigswitchseat/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1011 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keebio -#define PRODUCT Big Switch Seat - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json index 10328da26f..d66ef5b5ce 100644 --- a/keyboards/keebio/bigswitchseat/info.json +++ b/keyboards/keebio/bigswitchseat/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Big Switch Seat", + "manufacturer": "Keebio", "url": "https://robotcandy.company/", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1011", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}] diff --git a/keyboards/keebio/choconum/config.h b/keyboards/keebio/choconum/config.h index dcd116534a..afad80daef 100644 --- a/keyboards/keebio/choconum/config.h +++ b/keyboards/keebio/choconum/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1154 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Choconum - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index b036cf0b79..b6408f31cd 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Choconum", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10", + "pid": "0x1154", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h index e07bd5da5b..bbbc022849 100644 --- a/keyboards/keebio/chocopad/config.h +++ b/keyboards/keebio/chocopad/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1144 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Chocopad - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json index 6fbbbbd4fc..426d9d72e8 100644 --- a/keyboards/keebio/chocopad/info.json +++ b/keyboards/keebio/chocopad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Chocopad", + "manufacturer": "Keebio", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xCB10", + "pid": "0x1144", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}] diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h index 9d7b08509d..d56c572a4d 100644 --- a/keyboards/keebio/dilly/config.h +++ b/keyboards/keebio/dilly/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x113a -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Dilly - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json index fd12fce337..af8a7a8416 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dilly", + "manufacturer": "Keebio", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xCB10", + "pid": "0x113A", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ortho_3x10": { "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":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":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}] diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h index 014eb13759..975a456300 100644 --- a/keyboards/keebio/ergodicity/config.h +++ b/keyboards/keebio/ergodicity/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x125F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keebio -#define PRODUCT Ergodicity - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json index 83b5049e20..55090a01dc 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ergodicity", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10", + "pid": "0x125F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h index faa3ef4004..ca55824404 100644 --- a/keyboards/keebio/fourier/config.h +++ b/keyboards/keebio/fourier/config.h @@ -20,13 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1247 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Fourier - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 2449a399dd..598ca2af78 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Fourier", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1247", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h index 9948067668..1c7c9e4432 100644 --- a/keyboards/keebio/laplace/config.h +++ b/keyboards/keebio/laplace/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1147 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Laplace - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 7 diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json index c4df4c3a9d..364bc08c0b 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Laplace", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1147", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h index c3ddd8b1a3..872ca73ece 100644 --- a/keyboards/keebio/quefrency/rev1/config.h +++ b/keyboards/keebio/quefrency/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1257 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Quefrency Rev. 1 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json index 1e50e2e698..4483234499 100644 --- a/keyboards/keebio/quefrency/rev1/info.json +++ b/keyboards/keebio/quefrency/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Quefrency rev1", + "keyboard_name": "Quefrency Rev. 1", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1257", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h index 1fb6896775..e92be73444 100644 --- a/keyboards/keebio/quefrency/rev2/config.h +++ b/keyboards/keebio/quefrency/rev2/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2257 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT Quefrency Rev. 2 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json index 120add8eaa..e68f0ce892 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Quefrency rev2", + "keyboard_name": "Quefrency Rev. 2", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x2257", + "device_version": "2.0.0" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h index 2f1311e943..e92be73444 100644 --- a/keyboards/keebio/quefrency/rev3/config.h +++ b/keyboards/keebio/quefrency/rev3/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x3257 -#define DEVICE_VER 0x0300 -#define MANUFACTURER Keebio -#define PRODUCT Quefrency Rev. 3 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json index 5f59c90e80..8bea44183f 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Quefrency rev3", + "keyboard_name": "Quefrency Rev. 3", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x3257", + "device_version": "3.0.0" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h index f92490c8ec..d92a81de93 100644 --- a/keyboards/keebio/quefrency/rev4/config.h +++ b/keyboards/keebio/quefrency/rev4/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x4257 -#define DEVICE_VER 0x0400 -#define MANUFACTURER Keebio -#define PRODUCT Quefrency Rev. 4 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json index 314bb807f0..198e84a592 100644 --- a/keyboards/keebio/quefrency/rev4/info.json +++ b/keyboards/keebio/quefrency/rev4/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Quefrency rev4", + "keyboard_name": "Quefrency Rev. 4", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x4257", + "device_version": "4.0.0" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h index ad57a7f8c7..f047ffbdf0 100644 --- a/keyboards/keebio/quefrency/rev5/config.h +++ b/keyboards/keebio/quefrency/rev5/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x5257 -#define DEVICE_VER 0x0500 -#define MANUFACTURER Keebio -#define PRODUCT Quefrency Rev. 5 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json index 9509663c86..053551e30f 100644 --- a/keyboards/keebio/quefrency/rev5/info.json +++ b/keyboards/keebio/quefrency/rev5/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Quefrency Rev. 5", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x5257", + "device_version": "5.0.0" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h index cd641ea28b..8166510921 100644 --- a/keyboards/keebio/stick/config.h +++ b/keyboards/keebio/stick/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x111C -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT The Stick - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 12 diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json index 494dbe664b..0a45edc35f 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "The Stick", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x111C", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h index 3975175976..428a7ca1ff 100644 --- a/keyboards/keebio/tragicforce68/config.h +++ b/keyboards/keebio/tragicforce68/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x0510 -#define DEVICE_VER 0x0101 -#define MANUFACTURER Keebio -#define PRODUCT Tragicforce 68 - /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 8 diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json index cb806cc5cb..7b41614dae 100644 --- a/keyboards/keebio/tragicforce68/info.json +++ b/keyboards/keebio/tragicforce68/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tragicforce 68", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10", + "pid": "0x0510", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT_68_ansi": { "layout": [ diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h index e6ee9a8f29..aefc51d5f5 100644 --- a/keyboards/keebio/tukey/config.h +++ b/keyboards/keebio/tukey/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1112 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Tukey - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 2 diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json index a17d5afa44..4427d0cc8b 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tukey", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1112", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h index d533d29350..37937eb371 100644 --- a/keyboards/keebio/wavelet/config.h +++ b/keyboards/keebio/wavelet/config.h @@ -21,13 +21,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1046 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Wavelet - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json index a4bc57b86f..f5df12cffb 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Wavelet", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10", + "pid": "0x1046", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h index d801a929e7..1ae31980c1 100644 --- a/keyboards/keebio/wtf60/config.h +++ b/keyboards/keebio/wtf60/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keebio -#define PRODUCT WTF60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json index ad7e9c8c89..440ecfb873 100644 --- a/keyboards/keebio/wtf60/info.json +++ b/keyboards/keebio/wtf60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "WTF60", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10", + "pid": "0x1337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_full_wtf": { "layout": [{"label":"Bksp", "x":0, "y":0}, {"label":"Del", "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":"!", "x":13, "y":0}, {"label":"Esc", "x":14, "y":0}, {"label":"|", "x":0, "y":1, "w":1.5}, {"label":"}", "x":1.5, "y":1}, {"label":"{", "x":2.5, "y":1}, {"label":"P", "x":3.5, "y":1}, {"label":"O", "x":4.5, "y":1}, {"label":"I", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"T", "x":8.5, "y":1}, {"label":"R", "x":9.5, "y":1}, {"label":"E", "x":10.5, "y":1}, {"label":"W", "x":11.5, "y":1}, {"label":"Q", "x":12.5, "y":1}, {"label":"Tab", "x":13.5, "y":1, "w":1.5}, {"label":"Enter", "x":0, "y":2, "w":1.25}, {"label":"~", "x":1.25, "y":2}, {"label":"\"", "x":2.25, "y":2}, {"label":":", "x":3.25, "y":2}, {"label":"L", "x":4.25, "y":2}, {"label":"K", "x":5.25, "y":2}, {"label":"J", "x":6.25, "y":2}, {"label":"H", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"F", "x":9.25, "y":2}, {"label":"D", "x":10.25, "y":2}, {"label":"S", "x":11.25, "y":2}, {"label":"A", "x":12.25, "y":2}, {"label":"Caps Lock", "x":13.25, "y":2, "w":1.75}, {"label":"Fn", "x":0, "y":3}, {"label":"Shift", "x":1, "y":3, "w":1.75}, {"label":"?", "x":2.75, "y":3}, {"label":">", "x":3.75, "y":3}, {"label":"<", "x":4.75, "y":3}, {"label":"M", "x":5.75, "y":3}, {"label":"N", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"V", "x":8.75, "y":3}, {"label":"C", "x":9.75, "y":3}, {"label":"X", "x":10.75, "y":3}, {"label":"Z", "x":11.75, "y":3}, {"label":"|", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Menu", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":6.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"Win", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] -- cgit v1.2.3