diff options
137 files changed, 422 insertions, 510 deletions
diff --git a/keyboards/0_sixty/base/info.json b/keyboards/0_sixty/base/info.json new file mode 100644 index 0000000000..f15b6505d1 --- /dev/null +++ b/keyboards/0_sixty/base/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "0-Sixty", + "usb": { + "pid": "0x0060" + }, + "indicators": { + "caps_lock": "B6" + } +} diff --git a/keyboards/0_sixty/base/rules.mk b/keyboards/0_sixty/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/0_sixty/base/rules.mk diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h index 04241b3454..2160ba623e 100644 --- a/keyboards/0_sixty/config.h +++ b/keyboards/0_sixty/config.h @@ -18,15 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0x7654 -#define PRODUCT_ID 0x0060 -#define DEVICE_VER 0x0001 - -#define MANUFACTURER ven0mtr0n -#define PRODUCT 0-Sixty - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 5 @@ -40,9 +31,6 @@ /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -/* indicator leds */ -#define LED_CAPS_LOCK_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json index b04e9accb2..7fc718c602 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "0-Sixty", + "manufacturer": "ven0mtr0n", "url": "", "maintainer": "vinamarora8", + "usb": { + "vid": "0x7654", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_1x2uC": { "layout": [ diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk index 7a09d99fdf..18f45534c8 100644 --- a/keyboards/0_sixty/rules.mk +++ b/keyboards/0_sixty/rules.mk @@ -17,3 +17,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Link-time opt + +DEFAULT_FOLDER = 0_sixty/base diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h index 1cff58d944..7b36d4a834 100644 --- a/keyboards/0_sixty/underglow/config.h +++ b/keyboards/0_sixty/underglow/config.h @@ -18,15 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#undef PRODUCT_ID -#define PRODUCT_ID 0x0061 -#undef PRODUCT -#define PRODUCT 0-Sixty-underglow - -/* no caps lock with underglow */ -#undef LED_CAPS_LOCK_PIN - /* underglow */ #define RGB_DI_PIN B6 #define RGBLED_NUM 24 diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json new file mode 100644 index 0000000000..5cbbd86e61 --- /dev/null +++ b/keyboards/0_sixty/underglow/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "0-Sixty-underglow", + "usb": { + "pid": "0x0061" + }, + "features": { + "rgblight": true + } +} diff --git a/keyboards/0_sixty/underglow/rules.mk b/keyboards/0_sixty/underglow/rules.mk index 84ef473c02..e69de29bb2 100644 --- a/keyboards/0_sixty/underglow/rules.mk +++ b/keyboards/0_sixty/underglow/rules.mk @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/0_sixty/underglow/underglow.h b/keyboards/0_sixty/underglow/underglow.h deleted file mode 100644 index 807dfa84ce..0000000000 --- a/keyboards/0_sixty/underglow/underglow.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Vinam Arora <vinam@posteo.de> - * - * 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 "0_sixty.h" diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h index f858685b8f..6463505000 100644 --- a/keyboards/1upkeyboards/sweet16/config.h +++ b/keyboards/1upkeyboards/sweet16/config.h @@ -2,11 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6F75 // OU -#define MANUFACTURER 1up Keyboards -#define PRODUCT Sweet16 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json index 7755c8efb0..320c96bac8 100644 --- a/keyboards/1upkeyboards/sweet16/info.json +++ b/keyboards/1upkeyboards/sweet16/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Sweet 16", + "keyboard_name": "Sweet16", + "manufacturer": "1up Keyboards", "url": "", "maintainer": "skullydazed", + "usb": { + "vid": "0x6F75" + }, "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/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index 97ce1ae28a..a107a1899a 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0161 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { F4, F5, F6, F7 } #define MATRIX_COL_PINS { D1, D0, D4, C6 } diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json new file mode 100644 index 0000000000..11a0d97d89 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0161", + "device_version": "0.0.1" + } +} diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h index 9bbe1bec80..8bacff2f6e 100644 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0162 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { D4, D1, E6, B5 } #define MATRIX_COL_PINS { F7, F6, D2, D3 } diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json new file mode 100644 index 0000000000..bed6579e82 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0162", + "device_version": "0.0.1" + } +} diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h index 92572523d2..e1d66894b3 100644 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0162 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { B5, B7, B2, B0 } #define MATRIX_COL_PINS { B8, A0, A10, A9 } diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json new file mode 100644 index 0000000000..bed6579e82 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0162", + "device_version": "0.0.1" + } +} diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json index 5a8b564685..7a71d2b367 100644 --- a/keyboards/25keys/aleth42/info.json +++ b/keyboards/25keys/aleth42/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "aleth42", + "keyboard_name": "ALETH42", + "manufacturer": "25KEYS", "url": "http://www.sho-k.co.uk/tech/aleth42", "maintainer": "monksoffunk", + "usb": { + "vid": "0x04D8", + "pid": "0xEAC8" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index 21071f8ca8..c177990e99 100644 --- a/keyboards/25keys/aleth42/rev0/config.h +++ b/keyboards/25keys/aleth42/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 0x04D8 -#define PRODUCT_ID 0xEAC8 -#define DEVICE_VER 0x0000 -#define MANUFACTURER 25KEYS -#define PRODUCT ALETH42 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json new file mode 100644 index 0000000000..5baab67dba --- /dev/null +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.0" + } +} diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index 0cf444bee4..14b5588ab4 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/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 0x04D8 -#define PRODUCT_ID 0xEAC8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 25KEYS -#define PRODUCT ALETH42 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json index 8064e94e2f..3d9c898841 100644 --- a/keyboards/25keys/zinc/info.json +++ b/keyboards/25keys/zinc/info.json @@ -1,8 +1,13 @@ { - "keyboard_name": "Zinc", - "url": "https://github.com/monksoffunk/", + "manufacturer": "25KEYS", + "url": "https://github.com/monksoffunk/zinc", "maintainer": "monksoffunk", - "layouts": { + "usb": { + "vid": "0x04D8", + "pid": "0xEA3B", + "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":5, "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] } diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index 43af843a0b..1b2ae25cd8 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/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 0x04D8 -#define PRODUCT_ID 0xEA3B -#define DEVICE_VER 0x0001 -#define MANUFACTURER 25KEYS -#define PRODUCT zinc rev.1 - #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json index 1ed5f9130a..5233dcb04e 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/info.json @@ -1,10 +1,3 @@ { - "keyboard_name": "Zinc rev.1", - "url": "https://github.com/monksoffunk/zinc", - "maintainer": "monksoffunk", - "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "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":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] - } - } + "keyboard_name": "Zinc rev.1" } diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index 428c704d19..f740f4d011 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/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 0x04D8 -#define PRODUCT_ID 0xEA3B -#define DEVICE_VER 0x0001 -#define MANUFACTURER 25KEYS -#define PRODUCT zinc rev.A - #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json index de1d2933ec..79c4795bb3 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/info.json @@ -1,10 +1,3 @@ { - "keyboard_name": "Zinc rev.A", - "url": "https://github.com/monksoffunk/zinc", - "maintainer": "monksoffunk", - "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "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":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] - } - } + "keyboard_name": "Zinc rev.A" } diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json index ab463bc60c..d76688bfc1 100644 --- a/keyboards/3w6/info.json +++ b/keyboards/3w6/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "3w6", + "manufacturer": "weteor", "url": "https://github.com/weteor/3W6/", "maintainer": "weteor", + "usb": { + "vid": "0xFEED", + "pid": "0x4658" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/3w6/rev1/config.h b/keyboards/3w6/rev1/config.h index 2ec430b4e2..c9b8f8b58e 100644 --- a/keyboards/3w6/rev1/config.h +++ b/keyboards/3w6/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4658 -#define DEVICE_VER 0x0001 -#define MANUFACTURER weteor -#define PRODUCT 3w6 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/3w6/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/3w6/rev2/config.h b/keyboards/3w6/rev2/config.h index df68436ff1..c9b8f8b58e 100644 --- a/keyboards/3w6/rev2/config.h +++ b/keyboards/3w6/rev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4658 -#define DEVICE_VER 0x0002 -#define MANUFACTURER weteor -#define PRODUCT 3w6 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/3w6/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 3100a20fea..ed14a11435 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT AEKISO60 Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index 7f2e2be78a..f838933c08 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AEKISO60 Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 4d3122afd2..1fb06d5bf6 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/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 0x4444 -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT bootleg Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/4pplet/bootleg/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 9719b07150..007ba9fef4 100644 --- a/keyboards/4pplet/bootleg/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "bootleg Rev A", + "manufacturer": "4pplet", "url": "https://github.com/4pplet/bootlegs", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 4edb4754e9..951c943f1d 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0007 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT Eagle Viper REP Rev A - #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/4pplet/eagle_viper_rep/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 26d3d45893..110e1cce92 100644 --- a/keyboards/4pplet/eagle_viper_rep/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Eagle/Viper Rep", + "keyboard_name": "Eagle Viper REP Rev A", + "manufacturer": "4pplet", "url": "https://github.com/4pplet/eagle_viper_rep", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index d6697ada9e..53ff93cc1c 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0009 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT Perk60 ISO Rev A - #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/4pplet/perk60_iso/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json index 41716cce80..2c61e91a96 100644 --- a/keyboards/4pplet/perk60_iso/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Perk60 ISO Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0009", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_iso": { "layout": [{"label":"\u00ac", "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":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":"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":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 8f0c0d9531..2fa229bc44 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT Steezy60 Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index cecd47559f..ba16d348b9 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Steezy60 Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/waffling60/info.json b/keyboards/4pplet/waffling60/info.json index 0ff2c1f7e8..9e4f081ddc 100644 --- a/keyboards/4pplet/waffling60/info.json +++ b/keyboards/4pplet/waffling60/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Waffling60 Rev A", + "manufacturer": "4pplet", "url": "https://github.com/4pplet/waffling60", "maintainer": "4pplet", + "usb": { + "vid": "0x4444" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 33279d67a7..5b5066859c 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT waffling60 Rev A - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 11 diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json new file mode 100644 index 0000000000..6d4bf31f32 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Waffling60 Rev A", + "usb": { + "pid": "0x0003", + "device_version": "0.0.1" + } +} diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index eb9882d738..69d9a485c5 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/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 0x4444 -#define PRODUCT_ID 0x0005 -#define DEVICE_VER 0x0002 -#define MANUFACTURER 4pplet -#define PRODUCT waffling60 Rev B - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json new file mode 100644 index 0000000000..1e0075d47b --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Waffling60 Rev B", + "usb": { + "pid": "0x0005", + "device_version": "0.0.2" + } +} diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index e1862f4c0e..6afdcced5b 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/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 0x4444 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0003 -#define MANUFACTURER 4pplet -#define PRODUCT waffling60 Rev C - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json new file mode 100644 index 0000000000..5af681f27a --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Waffling60 Rev C", + "usb": { + "pid": "0x0008", + "device_version": "0.0.3" + } +} diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index 715414b641..a5eed83a80 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/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 0x4444 -#define PRODUCT_ID 0x0006 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT waffling80 Rev A - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 diff --git a/keyboards/4pplet/waffling80/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index ca92728000..16ff5f8cef 100644 --- a/keyboards/4pplet/waffling80/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "waffling80 Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "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":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "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":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index bf16696014..4200eb10c7 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x000A -#define DEVICE_VER 0x0002 -#define MANUFACTURER 4pplet -#define PRODUCT Yakiimo Rev A - #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/4pplet/yakiimo/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json index aa3dcb429b..f4eeba747f 100644 --- a/keyboards/4pplet/yakiimo/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Yakiimo Rev A", + "manufacturer": "4pplet", "url": "https://github.com/4pplet/yakiimo-PCB", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x000A", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":2.75, "y":0}, {"label":"F1", "x":4.75, "y":0}, {"label":"F2", "x":5.75, "y":0}, {"label":"F3", "x":6.75, "y":0}, {"label":"F4", "x":7.75, "y":0}, {"label":"F5", "x":9.25, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":2.75, "y":1.5}, {"label":"!", "x":3.75, "y":1.5}, {"label":"@", "x":4.75, "y":1.5}, {"label":"#", "x":5.75, "y":1.5}, {"label":"$", "x":6.75, "y":1.5}, {"label":"%", "x":7.75, "y":1.5}, {"label":"^", "x":8.75, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"|", "x":15.75, "y":1.5}, {"label":"~", "x":16.75, "y":1.5}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":2.75, "y":2.5, "w":1.5}, {"label":"Q", "x":4.25, "y":2.5}, {"label":"W", "x":5.25, "y":2.5}, {"label":"E", "x":6.25, "y":2.5}, {"label":"R", "x":7.25, "y":2.5}, {"label":"T", "x":8.25, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":2.75, "y":3.5, "w":1.75}, {"label":"A", "x":4.5, "y":3.5}, {"label":"S", "x":5.5, "y":3.5}, {"label":"D", "x":6.5, "y":3.5}, {"label":"F", "x":7.5, "y":3.5}, {"label":"G", "x":8.5, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"~", "x":15.5, "y":3.5}, {"label":"Enter", "x":16.5, "y":3.5, "w":1.25}, {"label":"Shift", "x":2.75, "y":4.5, "w":1.25}, {"label":"|", "x":4, "y":4.5}, {"label":"Z", "x":5, "y":4.5}, {"label":"X", "x":6, "y":4.5}, {"label":"C", "x":7, "y":4.5}, {"label":"V", "x":8, "y":4.5}, {"label":"B", "x":9, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":1.75}, {"label":"Fn", "x":16.75, "y":4.5}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":2.75, "y":5.5, "w":1.5}, {"label":"Win", "x":4.25, "y":5.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"x":9.75, "y":5.5}, {"x":10.75, "y":5.5, "w":3}, {"label":"AltGr", "x":13.75, "y":5.5, "w":1.5}, {"label":"Win", "x":15.25, "y":5.5}, {"label":"Ctrl", "x":16.25, "y":5.5, "w":1.5}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}] diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h index 88bd1f351b..b9b7abebe7 100644 --- a/keyboards/8pack/config.h +++ b/keyboards/8pack/config.h @@ -2,12 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x2171 -#define MANUFACTURER Charles Garcia -#define PRODUCT 8-Pack - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index fc1bcb8ef8..f36f4c9dc3 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "8-Pack", + "manufacturer": "Charles Garcia", "url": "https://github.com/cgarcia2097/8-Pack", "maintainer": "Charles Garcia", + "usb": { + "vid": "0xFEED", + "pid": "0x2171" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/8pack/rev11/config.h b/keyboards/8pack/rev11/config.h deleted file mode 100644 index 83ad51ada3..0000000000 --- a/keyboards/8pack/rev11/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define DEVICE_VER 0x0001 diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/8pack/rev11/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/8pack/rev12/config.h b/keyboards/8pack/rev12/config.h deleted file mode 100644 index 9a527501a5..0000000000 --- a/keyboards/8pack/rev12/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define DEVICE_VER 0x0002 diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/8pack/rev12/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h index 1febf490e7..2025739210 100644 --- a/keyboards/abstract/ellipse/rev1/config.h +++ b/keyboards/abstract/ellipse/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 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AbstractKB -#define PRODUCT EllipseRev1 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/abstract/ellipse/info.json b/keyboards/abstract/ellipse/rev1/info.json index 3348b38477..0037719e12 100644 --- a/keyboards/abstract/ellipse/info.json +++ b/keyboards/abstract/ellipse/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ellipse", + "manufacturer": "AbstractKB", "url": "https://abstractkb.tk/product/ellipse-rev1", "maintainer": "AbstractKB", + "usb": { + "vid": "0xFEED", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}] diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 04a440835f..1365b81774 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/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 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x8775 // For 87H + 3 (revision Delta) -#define DEVICE_VER 0x0004 // Revision Delta -#define MANUFACTURER AcheronProject -#define PRODUCT Apollo87H - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json new file mode 100644 index 0000000000..8f501970a5 --- /dev/null +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Apollo87H", + "usb": { + "pid": "0x8775", + "device_version": "0.0.4" + } +} diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index a28e498dcc..451071f869 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/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 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x8774 // For 87H + 2 (revision Gamma) -#define DEVICE_VER 0x0003 // Revision Gamma -#define MANUFACTURER AcheronProject -#define PRODUCT Apollo87H rev. Gamma - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json new file mode 100644 index 0000000000..6a7a382eaa --- /dev/null +++ b/keyboards/acheron/apollo/87h/gamma/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Apollo87H rev. Gamma", + "usb": { + "pid": "0x8774", + "device_version": "0.0.3" + } +} diff --git a/keyboards/acheron/apollo/87h/info.json b/keyboards/acheron/apollo/87h/info.json index e5d2c0d40d..7dbd896a18 100644 --- a/keyboards/acheron/apollo/87h/info.json +++ b/keyboards/acheron/apollo/87h/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "AcheronProject Apollo87H", + "manufacturer": "AcheronProject", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 9bf3840d76..0cb3d38128 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/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 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x8776 // For 87H + 4 -#define DEVICE_VER 0x0001 // Revision Alpha -#define MANUFACTURER AcheronProject -#define PRODUCT Apollo87H-T-SC - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index bfa2229431..b2a9cf1643 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "AcheronProject Apollo87H-T-SC", + "keyboard_name": "Apollo87H-T-SC", + "manufacturer": "AcheronProject", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x8776", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 24574a9658..7df9fc3e6b 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/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 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x8873 // For 87H -#define DEVICE_VER 0x0001 // Revision Alpha -#define MANUFACTURER AcheronProject -#define PRODUCT Apollo88H-T-SC - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json index c848132b5c..4d695faf70 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "AcheronProject Apollo88H-T-SC", + "keyboard_name": "Apollo88H-T-SC", + "manufacturer": "AcheronProject", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x8873", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index 3e0316377d..fca0450cef 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/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 0xAC11 -#define PRODUCT_ID 0x6584 // AT fot Athena -#define DEVICE_VER 0x0001 -#define MANUFACTURER AcheronProject -#define PRODUCT Athena - #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json new file mode 100644 index 0000000000..03640fd01d --- /dev/null +++ b/keyboards/acheron/athena/alpha/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Athena", + "usb": { + "pid": "0x6584", + "device_version": "0.0.1" + } +} diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 559f501f95..e9f653e3c7 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/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 0xAC11 -#define PRODUCT_ID 0x6585 // AT+1 for Athena rev. Beta -#define DEVICE_VER 0x0002 // Rev. Beta -#define MANUFACTURER AcheronProject -#define PRODUCT Athena rev Beta - #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json new file mode 100644 index 0000000000..7db7665fe2 --- /dev/null +++ b/keyboards/acheron/athena/beta/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Athena rev Beta", + "usb": { + "pid": "0x6585", + "device_version": "0.0.2" + } +} diff --git a/keyboards/acheron/athena/info.json b/keyboards/acheron/athena/info.json index 2b8c4f02f3..34853a12f6 100644 --- a/keyboards/acheron/athena/info.json +++ b/keyboards/acheron/athena/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "AcheronProject Athena", + "manufacturer": "AcheronProject", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0xAC11" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index d03d886a55..042da65f8e 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/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 0x4150 //AP for AcheronProject -#define PRODUCT_ID 0x454C // EL for Elongate -#define DEVICE_VER 0x0001 -#define MANUFACTURER Acheron Project -#define PRODUCT Elongate - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index bfb9db9b3a..7eb1de3c17 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Elongate", + "manufacturer": "Acheron Project", "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x454C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 957a6e39cd..8ebc6300d7 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/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 0x4150 //AP for AcheronProject -#define PRODUCT_ID 0x454D // EL+1 for Elongate revision Delta -#define DEVICE_VER 0x0002 -#define MANUFACTURER Acheron Project -#define PRODUCT Elongate - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index d96805a66a..54e58deb92 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Elongate", + "manufacturer": "Acheron Project", "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x454D", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index e98bae4510..50e14aa258 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/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 0xAC11 -#define PRODUCT_ID 0x5368 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AcheronProject -#define PRODUCT SharkPCB - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 21f4807eeb..435ea843aa 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -2,6 +2,10 @@ "keyboard_name": "SharkPCB", "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html", "maintainer": "Gondolindrim", + "usb": { + "pid": "0x5368", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index b50762b8af..77e98b329c 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/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 0xAC11 -#define PRODUCT_ID 0x5369 // For Shark+1 -#define DEVICE_VER 0x0002 -#define MANUFACTURER AcheronProject -#define PRODUCT SharkPCB rev. Beta - #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json new file mode 100644 index 0000000000..5d0c6557e7 --- /dev/null +++ b/keyboards/acheron/shark/beta/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "SharkPCB rev. Beta", + "usb": { + "pid": "0x5369", + "device_version": "0.0.2" + } +} diff --git a/keyboards/acheron/shark/info.json b/keyboards/acheron/shark/info.json new file mode 100644 index 0000000000..6d22c842fb --- /dev/null +++ b/keyboards/acheron/shark/info.json @@ -0,0 +1,6 @@ +{ + "manufacturer": "AcheronProject", + "usb": { + "vid": "0xAC11" + } +} diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json index 609e459749..13fc7e8ccf 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "adkb96", + "keyboard_name": "ADKB96", + "manufacturer": "Bit Trade One", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00A5", + "pid": "0xAD96", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_6x16": { "layout": [ diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h index 9727e7eaf7..c9e95b7af0 100644 --- a/keyboards/adkb96/rev1/config.h +++ b/keyboards/adkb96/rev1/config.h @@ -16,13 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00a5 -#define PRODUCT_ID 0xad96 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bit Trade One -#define PRODUCT ADKB96 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h index 7843f38d4f..50e697a645 100644 --- a/keyboards/adm42/config.h +++ b/keyboards/adm42/config.h @@ -18,14 +18,6 @@ #include "config_common.h" -/* Microchip ADM42 sublicensing */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE873 - -#define DEVICE_VER 0x0001 -#define MANUFACTURER Lorenzo Leonini -#define PRODUCT ADM42 - #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json index cd8a28898b..bf57885afa 100644 --- a/keyboards/adm42/info.json +++ b/keyboards/adm42/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ADM42 rev4", + "keyboard_name": "ADM42", + "manufacturer": "Lorenzo Leonini", "url": "https://adm42.dev/", "maintainer": "lleonini", + "usb": { + "vid": "0x04D8", + "pid": "0xE873", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_adm42_3x12_6": { "layout": [ diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h index 42535abd67..bd4614f8b2 100755 --- a/keyboards/aeboards/constellation/rev1/config.h +++ b/keyboards/aeboards/constellation/rev1/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // AE -#define PRODUCT_ID 0x065C // 65 - Constellation -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Constellation Rev1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json index af09a0dfc7..7539c9bf45 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Constellation", + "keyboard_name": "Constellation Rev1", + "manufacturer": "AEBoards", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x4145", + "pid": "0x065C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h index f2f34aeeb8..e057382aee 100755 --- a/keyboards/aeboards/constellation/rev2/config.h +++ b/keyboards/aeboards/constellation/rev2/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // AE -#define PRODUCT_ID 0x065C // 65 - Constellation -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Constellation Rev2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json index af09a0dfc7..95da6851c4 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Constellation", + "keyboard_name": "Constellation Rev2", + "manufacturer": "AEBoards", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x4145", + "pid": "0x065C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/ext65/info.json b/keyboards/aeboards/ext65/info.json index bc2fe64bf4..09056ce1f4 100644 --- a/keyboards/aeboards/ext65/info.json +++ b/keyboards/aeboards/ext65/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Ext65", + "manufacturer": "AEBoards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4145", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ext65": { "layout": [ diff --git a/keyboards/aeboards/ext65/rev1/config.h b/keyboards/aeboards/ext65/rev1/config.h index 7ee340aa2d..94c932e44d 100644 --- a/keyboards/aeboards/ext65/rev1/config.h +++ b/keyboards/aeboards/ext65/rev1/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // "AE" -#define PRODUCT_ID 0xAE65 // AEboards EXT65 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Ext65 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 10 diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json new file mode 100644 index 0000000000..bb472fcf7f --- /dev/null +++ b/keyboards/aeboards/ext65/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAE65" + } +} diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h index 498e345ad7..0ccbc6353a 100644 --- a/keyboards/aeboards/ext65/rev2/config.h +++ b/keyboards/aeboards/ext65/rev2/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 0x4145 // "AE" -#define PRODUCT_ID 0xA652 // AEboards EXT65 Rev2 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Ext65 Rev2 - /* key matrix size */ /* key matrix size */ #define MATRIX_ROWS 10 diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json new file mode 100644 index 0000000000..cacde3b019 --- /dev/null +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xA652" + } +} diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h index 7dc9a68f7d..a4f03a7c4e 100644 --- a/keyboards/afternoonlabs/breeze/rev0/config.h +++ b/keyboards/afternoonlabs/breeze/rev0/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x616C -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0000 -#define MANUFACTURER AfternoonLabs -#define PRODUCT Breeze - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json index ccf44f5e3a..b53227a50d 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "Breeze", + "manufacturer": "AfternoonLabs", "url": "afternoonlabs.com/breeze", - "productId": "0x0001", "maintainer": "eithanshavit", + "usb": { + "vid": "0x616C", + "pid": "0x0001", + "device_version": "0.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h index 383a16d455..0e2a0af980 100644 --- a/keyboards/afternoonlabs/breeze/rev1/config.h +++ b/keyboards/afternoonlabs/breeze/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x616C -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AfternoonLabs -#define PRODUCT Breeze - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json index ccf44f5e3a..e69c88510a 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "Breeze", + "manufacturer": "AfternoonLabs", "url": "afternoonlabs.com/breeze", - "productId": "0x0001", "maintainer": "eithanshavit", + "usb": { + "vid": "0x616C", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h index 650b98c1b8..c2f4290a0b 100644 --- a/keyboards/afternoonlabs/gust/rev1/config.h +++ b/keyboards/afternoonlabs/gust/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x616C -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AfternoonLabs -#define PRODUCT Gust - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 3 diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json index 6a9406d399..643e9fbf25 100644 --- a/keyboards/afternoonlabs/gust/rev1/info.json +++ b/keyboards/afternoonlabs/gust/rev1/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "Gust", + "manufacturer": "AfternoonLabs", "url": "afternoonlabs.com/breeze", - "productId": "0x0002", "maintainer": "eithanshavit", + "usb": { + "vid": "0x616C", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h index 6afe6b54e8..41a7c78113 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x616C -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AfternoonLabs -#define PRODUCT OceanBreeze - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json index 0d0db367a4..166548d154 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "OceanBreeze", + "manufacturer": "AfternoonLabs", "url": "afternoonlabs.com", - "productId": "0x0003", "maintainer": "afternoonlabs", + "usb": { + "vid": "0x616C", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h index e1533a6fa0..0e2a0af980 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h +++ b/keyboards/afternoonlabs/southern_breeze/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x616C -#define PRODUCT_ID 0x0005 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AfternoonLabs -#define PRODUCT Southern Breeze - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json index b7f541ffb7..cb86c899ae 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "Southern Breeze", + "manufacturer": "AfternoonLabs", "url": "afternoonlabs.com/breeze", - "productId": "0x0005", "maintainer": "eithanshavit", + "usb": { + "vid": "0x616C", + "pid": "0x0005", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h index 86c40389aa..0e2a0af980 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h +++ b/keyboards/afternoonlabs/summer_breeze/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x616C -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AfternoonLabs -#define PRODUCT Summer Breeze - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json index 7e5da9b8cb..5d555fadcf 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "Summer Breeze", + "manufacturer": "AfternoonLabs", "url": "afternoonlabs.com/breeze", - "productId": "0x0004", "maintainer": "eithanshavit", + "usb": { + "vid": "0x616C", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index 5717260e29..b6dd990e5f 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/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 0xA103 -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT Equinox - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json index 18aa1fe8d6..f5c8ecbfba 100644 --- a/keyboards/ai03/equinox/info.json +++ b/keyboards/ai03/equinox/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Equinox", + "manufacturer": "ai03 Design Studio", "url": "", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/alt34/config.h b/keyboards/alt34/config.h deleted file mode 100644 index 44ee245fe4..0000000000 --- a/keyboards/alt34/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2022 Tommy Alatalo <@altosys> - -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" diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h index 7ea63954b0..7027d449ec 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/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 0x1ABC -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER altosys -#define PRODUCT alt34 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/alt34/info.json b/keyboards/alt34/rev1/info.json index 647c853136..0d22194885 100644 --- a/keyboards/alt34/info.json +++ b/keyboards/alt34/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "alt34", + "manufacturer": "altosys", "url": "https://gitlab.com/altosys/alt34", "maintainer": "@altosys", + "usb": { + "vid": "0x1ABC", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h index 2ebb962efb..ea38f4dce3 100644 --- a/keyboards/annepro2/c15/config.h +++ b/keyboards/annepro2/c15/config.h @@ -20,12 +20,6 @@ #include "pin_defs.h" #include "config_led.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xfeed -#define PRODUCT_ID 0xac15 -#define DEVICE_VER 0x1337 -#define MANUFACTURER Obins -#define PRODUCT Anne Pro 2 QMK // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json new file mode 100644 index 0000000000..c8c637ccfb --- /dev/null +++ b/keyboards/annepro2/c15/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Anne Pro 2 C15 (QMK)", + "usb": { + "pid": "0xAC15" + } +} diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h index 5e4978048b..6b6307c3d0 100644 --- a/keyboards/annepro2/c18/config.h +++ b/keyboards/annepro2/c18/config.h @@ -20,12 +20,6 @@ #include "pin_defs.h" #include "config_led.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xfeed -#define PRODUCT_ID 0xac18 -#define DEVICE_VER 0x1337 -#define MANUFACTURER Obins -#define PRODUCT Anne Pro 2(c18)QMK // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json new file mode 100644 index 0000000000..94b96a2c44 --- /dev/null +++ b/keyboards/annepro2/c18/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Anne Pro 2 C18 (QMK)", + "usb": { + "pid": "0xAC18" + } +} diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json index 95786329b2..d2ddae4053 100644 --- a/keyboards/annepro2/info.json +++ b/keyboards/annepro2/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Anne Pro 2", + "manufacturer": "Obins", "url": "https://openannepro.github.io/", "maintainer": "bwisn", + "usb": { + "vid": "0xFEED", + "device_version": "13.3.7" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json index 2df8d9fb3a..0bd317c1a4 100644 --- a/keyboards/aplyard/aplx6/info.json +++ b/keyboards/aplyard/aplx6/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "Aplx6", + "manufacturer": "Aplyard", "url": "", "maintainer": "Aplyard", + "usb": { + "vid": "0xE0E0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h index 94e9717efa..6aadc3efb2 100644 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ b/keyboards/aplyard/aplx6/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 0xE0E0 -#define PRODUCT_ID 0x0030 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Aplyard -#define PRODUCT Aplx6 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json new file mode 100644 index 0000000000..3eb12dda15 --- /dev/null +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0030", + "device_version": "0.0.1" + } +} diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index a190083da5..922ab5f44a 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xE0E0 -#define PRODUCT_ID 0x0040 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Aplyard -#define PRODUCT Aplx6 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json new file mode 100644 index 0000000000..06fc50187a --- /dev/null +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0040", + "device_version": "0.0.2" + } +} diff --git a/keyboards/arabica37/config.h b/keyboards/arabica37/config.h deleted file mode 100644 index cfb6bf4ffc..0000000000 --- a/keyboards/arabica37/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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" diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h index c0339a1a09..b3a9fd3f89 100644 --- a/keyboards/arabica37/rev1/config.h +++ b/keyboards/arabica37/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER CalciumNitride -#define PRODUCT Arabica3/7 - #define USE_SERIAL #define SOFT_SERIAL_PIN D2 diff --git a/keyboards/arabica37/info.json b/keyboards/arabica37/rev1/info.json index 4aae9a6444..00d29b54a0 100644 --- a/keyboards/arabica37/info.json +++ b/keyboards/arabica37/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "arabica37 rev. 1", + "keyboard_name": "Arabica3/7", + "manufacturer": "CalciumNitride", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atreus/config.h b/keyboards/atreus/config.h index ae3eb4f232..b7bc5e385a 100644 --- a/keyboards/atreus/config.h +++ b/keyboards/atreus/config.h @@ -18,14 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0xA1E5 -#define DEVICE_VER 0x0008 -#define MANUFACTURER Technomancy -#define PRODUCT Atreus - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/atreus/info.json b/keyboards/atreus/info.json index a20cfda051..724fcca78d 100644 --- a/keyboards/atreus/info.json +++ b/keyboards/atreus/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Atreus", + "manufacturer": "Technomancy", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x1209", + "pid": "0xA1E5", + "device_version": "0.0.8" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.35}, {"x":2, "y":0}, {"x":3, "y":0.35}, {"x":4, "y":0.7}, {"x":8, "y":0.7}, {"x":9, "y":0.35}, {"x":10, "y":0}, {"x":11, "y":0.35}, {"x":12, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.35}, {"x":2, "y":1}, {"x":3, "y":1.35}, {"x":4, "y":1.7}, {"x":8, "y":1.7}, {"x":9, "y":1.35}, {"x":10, "y":1}, {"x":11, "y":1.35}, {"x":12, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.35}, {"x":2, "y":2}, {"x":3, "y":2.35}, {"x":4, "y":2.7}, {"x":8, "y":2.7}, {"x":9, "y":2.35}, {"x":10, "y":2}, {"x":11, "y":2.35}, {"x":12, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.35}, {"x":2, "y":3}, {"x":3, "y":3.35}, {"x":4, "y":3.7}, {"x":5, "y":2.95, "h":1.5}, {"x":7, "y":2.95, "h":1.5}, {"x":8, "y":3.7}, {"x":9, "y":3.35}, {"x":10, "y":3}, {"x":11, "y":3.35}, {"x":12, "y":3.6}] diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h index 32533c5cc9..e641a20f93 100644 --- a/keyboards/avalanche/v1/config.h +++ b/keyboards/avalanche/v1/config.h @@ -3,12 +3,6 @@ #pragma once -#define VENDOR_ID 0xCEE2 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER vitvlkv -#define PRODUCT Avalanche - #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index 907face922..d753cce4bc 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Avalanche v1", + "keyboard_name": "Avalanche", + "manufacturer": "vitvlkv", "url": "https://github.com/vlkv/avalanche", "maintainer": "vlkv", + "usb": { + "vid": "0xCEE2", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 55cbd30b1c..16b26d8ffc 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -3,12 +3,6 @@ #pragma once -#define VENDOR_ID 0xCEE2 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0002 -#define MANUFACTURER vitvlkv -#define PRODUCT Avalanche - #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index 6809c99b4e..52c03b57a3 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Avalanche v2", + "keyboard_name": "Avalanche", + "manufacturer": "vitvlkv", "url": "https://github.com/vlkv/avalanche", "maintainer": "vlkv", + "usb": { + "vid": "0xCEE2", + "pid": "0x0002", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h index 3dc537170d..4c4e05ecf4 100644 --- a/keyboards/avalanche/v3/config.h +++ b/keyboards/avalanche/v3/config.h @@ -3,12 +3,6 @@ #pragma once -#define VENDOR_ID 0xCEE2 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0003 -#define MANUFACTURER vitvlkv -#define PRODUCT Avalanche - #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 39b8b51b38..1869c0165f 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Avalanche v3", + "keyboard_name": "Avalanche", + "manufacturer": "vitvlkv", "url": "https://github.com/vlkv/avalanche", "maintainer": "vlkv", + "usb": { + "vid": "0xCEE2", + "pid": "0x0003", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h index d2082635d8..c83c90c0ba 100644 --- a/keyboards/avalanche/v4/config.h +++ b/keyboards/avalanche/v4/config.h @@ -3,12 +3,6 @@ #pragma once -#define VENDOR_ID 0xCEE2 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0004 -#define MANUFACTURER vitvlkv -#define PRODUCT Avalanche - #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index 53e227bcf1..b96cdc5ea7 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Avalanche v4", + "keyboard_name": "Avalanche", + "manufacturer": "vitvlkv", "url": "https://github.com/vlkv/avalanche", "maintainer": "vlkv", + "usb": { + "vid": "0xCEE2", + "pid": "0x0004", + "device_version": "0.0.4" + }, "layouts": { "LAYOUT": { "layout": [ |