From 30796913913c0f6dc0cce317ad8249de2b602294 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 10:47:05 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A (#17941) --- keyboards/0_sixty/base/info.json | 9 ++++++++ keyboards/0_sixty/base/rules.mk | 0 keyboards/0_sixty/config.h | 12 ----------- keyboards/0_sixty/info.json | 6 +++++- keyboards/0_sixty/rules.mk | 2 ++ keyboards/0_sixty/underglow/config.h | 9 -------- keyboards/0_sixty/underglow/info.json | 9 ++++++++ keyboards/0_sixty/underglow/rules.mk | 1 - keyboards/0_sixty/underglow/underglow.h | 19 ----------------- keyboards/1upkeyboards/sweet16/config.h | 5 ----- keyboards/1upkeyboards/sweet16/info.json | 6 +++++- keyboards/1upkeyboards/sweet16/v1/config.h | 4 ---- keyboards/1upkeyboards/sweet16/v1/info.json | 6 ++++++ .../1upkeyboards/sweet16/v2/promicro/config.h | 4 ---- .../sweet16/v2/promicro/info.json | 6 ++++++ .../1upkeyboards/sweet16/v2/proton_c/config.h | 4 ---- .../sweet16/v2/proton_c/info.json | 6 ++++++ keyboards/25keys/aleth42/info.json | 7 ++++++- keyboards/25keys/aleth42/rev0/config.h | 7 ------- keyboards/25keys/aleth42/rev0/info.json | 5 +++++ keyboards/25keys/aleth42/rev1/config.h | 7 ------- keyboards/25keys/aleth42/rev1/info.json | 5 +++++ keyboards/25keys/zinc/info.json | 11 +++++++--- keyboards/25keys/zinc/rev1/config.h | 7 ------- keyboards/25keys/zinc/rev1/info.json | 9 +------- keyboards/25keys/zinc/reva/config.h | 7 ------- keyboards/25keys/zinc/reva/info.json | 9 +------- keyboards/3w6/info.json | 5 +++++ keyboards/3w6/rev1/config.h | 8 ------- keyboards/3w6/rev1/info.json | 5 +++++ keyboards/3w6/rev2/config.h | 8 ------- keyboards/3w6/rev2/info.json | 5 +++++ keyboards/4pplet/aekiso60/rev_a/config.h | 7 ------- keyboards/4pplet/aekiso60/rev_a/info.json | 6 ++++++ keyboards/4pplet/bootleg/rev_a/config.h | 7 ------- .../4pplet/bootleg/{ => rev_a}/info.json | 6 ++++++ .../4pplet/eagle_viper_rep/rev_a/config.h | 7 ------- .../eagle_viper_rep/{ => rev_a}/info.json | 8 ++++++- keyboards/4pplet/perk60_iso/rev_a/config.h | 7 ------- .../4pplet/perk60_iso/{ => rev_a}/info.json | 6 ++++++ keyboards/4pplet/steezy60/rev_a/config.h | 7 ------- keyboards/4pplet/steezy60/rev_a/info.json | 6 ++++++ keyboards/4pplet/waffling60/info.json | 5 ++++- keyboards/4pplet/waffling60/rev_a/config.h | 7 ------- keyboards/4pplet/waffling60/rev_a/info.json | 7 +++++++ keyboards/4pplet/waffling60/rev_b/config.h | 7 ------- keyboards/4pplet/waffling60/rev_b/info.json | 7 +++++++ keyboards/4pplet/waffling60/rev_c/config.h | 7 ------- keyboards/4pplet/waffling60/rev_c/info.json | 7 +++++++ keyboards/4pplet/waffling80/rev_a/config.h | 7 ------- .../4pplet/waffling80/{ => rev_a}/info.json | 6 ++++++ keyboards/4pplet/yakiimo/rev_a/config.h | 7 ------- .../4pplet/yakiimo/{ => rev_a}/info.json | 6 ++++++ keyboards/8pack/config.h | 6 ------ keyboards/8pack/info.json | 5 +++++ keyboards/8pack/rev11/config.h | 3 --- keyboards/8pack/rev11/info.json | 5 +++++ keyboards/8pack/rev12/config.h | 3 --- keyboards/8pack/rev12/info.json | 5 +++++ keyboards/abstract/ellipse/rev1/config.h | 7 ------- .../abstract/ellipse/{ => rev1}/info.json | 6 ++++++ keyboards/acheron/apollo/87h/delta/config.h | 7 ------- keyboards/acheron/apollo/87h/delta/info.json | 7 +++++++ keyboards/acheron/apollo/87h/gamma/config.h | 7 ------- keyboards/acheron/apollo/87h/gamma/info.json | 7 +++++++ keyboards/acheron/apollo/87h/info.json | 5 ++++- keyboards/acheron/apollo/87htsc/config.h | 7 ------- keyboards/acheron/apollo/87htsc/info.json | 8 ++++++- keyboards/acheron/apollo/88htsc/config.h | 7 ------- keyboards/acheron/apollo/88htsc/info.json | 8 ++++++- keyboards/acheron/athena/alpha/config.h | 7 ------- keyboards/acheron/athena/alpha/info.json | 7 +++++++ keyboards/acheron/athena/beta/config.h | 7 ------- keyboards/acheron/athena/beta/info.json | 7 +++++++ keyboards/acheron/athena/info.json | 5 ++++- keyboards/acheron/elongate/beta/config.h | 7 ------- keyboards/acheron/elongate/beta/info.json | 6 ++++++ keyboards/acheron/elongate/delta/config.h | 7 ------- keyboards/acheron/elongate/delta/info.json | 6 ++++++ keyboards/acheron/shark/alpha/config.h | 7 ------- keyboards/acheron/shark/alpha/info.json | 4 ++++ keyboards/acheron/shark/beta/config.h | 7 ------- keyboards/acheron/shark/beta/info.json | 7 +++++++ keyboards/acheron/shark/info.json | 6 ++++++ keyboards/adkb96/info.json | 8 ++++++- keyboards/adkb96/rev1/config.h | 7 ------- keyboards/adm42/config.h | 8 ------- keyboards/adm42/info.json | 8 ++++++- .../aeboards/constellation/rev1/config.h | 7 ------- .../aeboards/constellation/rev1/info.json | 8 ++++++- .../aeboards/constellation/rev2/config.h | 7 ------- .../aeboards/constellation/rev2/info.json | 8 ++++++- keyboards/aeboards/ext65/info.json | 5 +++++ keyboards/aeboards/ext65/rev1/config.h | 7 ------- keyboards/aeboards/ext65/rev1/info.json | 5 +++++ keyboards/aeboards/ext65/rev2/config.h | 7 ------- keyboards/aeboards/ext65/rev2/info.json | 5 +++++ keyboards/afternoonlabs/breeze/rev0/config.h | 7 ------- keyboards/afternoonlabs/breeze/rev0/info.json | 7 ++++++- keyboards/afternoonlabs/breeze/rev1/config.h | 7 ------- keyboards/afternoonlabs/breeze/rev1/info.json | 7 ++++++- keyboards/afternoonlabs/gust/rev1/config.h | 7 ------- keyboards/afternoonlabs/gust/rev1/info.json | 7 ++++++- .../afternoonlabs/oceanbreeze/rev1/config.h | 7 ------- .../afternoonlabs/oceanbreeze/rev1/info.json | 7 ++++++- .../southern_breeze/rev1/config.h | 7 ------- .../southern_breeze/rev1/info.json | 7 ++++++- .../afternoonlabs/summer_breeze/rev1/config.h | 7 ------- .../summer_breeze/rev1/info.json | 7 ++++++- keyboards/ai03/equinox/config.h | 7 ------- keyboards/ai03/equinox/info.json | 6 ++++++ keyboards/alt34/config.h | 20 ------------------ keyboards/alt34/rev1/config.h | 7 ------- keyboards/alt34/{ => rev1}/info.json | 6 ++++++ keyboards/annepro2/c15/config.h | 6 ------ keyboards/annepro2/c15/info.json | 6 ++++++ keyboards/annepro2/c18/config.h | 6 ------ keyboards/annepro2/c18/info.json | 6 ++++++ keyboards/annepro2/info.json | 6 +++++- keyboards/aplyard/aplx6/info.json | 4 ++++ keyboards/aplyard/aplx6/rev1/config.h | 7 ------- keyboards/aplyard/aplx6/rev1/info.json | 6 ++++++ keyboards/aplyard/aplx6/rev2/config.h | 7 ------- keyboards/aplyard/aplx6/rev2/info.json | 6 ++++++ keyboards/arabica37/config.h | 21 ------------------- keyboards/arabica37/rev1/config.h | 7 ------- keyboards/arabica37/{ => rev1}/info.json | 8 ++++++- keyboards/atreus/config.h | 8 ------- keyboards/atreus/info.json | 6 ++++++ keyboards/avalanche/v1/config.h | 6 ------ keyboards/avalanche/v1/info.json | 8 ++++++- keyboards/avalanche/v2/config.h | 6 ------ keyboards/avalanche/v2/info.json | 8 ++++++- keyboards/avalanche/v3/config.h | 6 ------ keyboards/avalanche/v3/info.json | 8 ++++++- keyboards/avalanche/v4/config.h | 6 ------ keyboards/avalanche/v4/info.json | 8 ++++++- 137 files changed, 422 insertions(+), 510 deletions(-) create mode 100644 keyboards/0_sixty/base/info.json create mode 100644 keyboards/0_sixty/base/rules.mk create mode 100644 keyboards/0_sixty/underglow/info.json delete mode 100644 keyboards/0_sixty/underglow/underglow.h create mode 100644 keyboards/1upkeyboards/sweet16/v1/info.json create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/info.json create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/info.json create mode 100644 keyboards/25keys/aleth42/rev0/info.json create mode 100644 keyboards/25keys/aleth42/rev1/info.json create mode 100644 keyboards/3w6/rev1/info.json create mode 100644 keyboards/3w6/rev2/info.json rename keyboards/4pplet/bootleg/{ => rev_a}/info.json (96%) rename keyboards/4pplet/eagle_viper_rep/{ => rev_a}/info.json (95%) rename keyboards/4pplet/perk60_iso/{ => rev_a}/info.json (94%) create mode 100644 keyboards/4pplet/waffling60/rev_a/info.json create mode 100644 keyboards/4pplet/waffling60/rev_b/info.json create mode 100644 keyboards/4pplet/waffling60/rev_c/info.json rename keyboards/4pplet/waffling80/{ => rev_a}/info.json (96%) rename keyboards/4pplet/yakiimo/{ => rev_a}/info.json (96%) delete mode 100644 keyboards/8pack/rev11/config.h create mode 100644 keyboards/8pack/rev11/info.json delete mode 100644 keyboards/8pack/rev12/config.h create mode 100644 keyboards/8pack/rev12/info.json rename keyboards/abstract/ellipse/{ => rev1}/info.json (69%) create mode 100644 keyboards/acheron/apollo/87h/delta/info.json create mode 100644 keyboards/acheron/apollo/87h/gamma/info.json create mode 100644 keyboards/acheron/athena/alpha/info.json create mode 100644 keyboards/acheron/athena/beta/info.json create mode 100644 keyboards/acheron/shark/beta/info.json create mode 100644 keyboards/acheron/shark/info.json create mode 100644 keyboards/aeboards/ext65/rev1/info.json create mode 100644 keyboards/aeboards/ext65/rev2/info.json delete mode 100644 keyboards/alt34/config.h rename keyboards/alt34/{ => rev1}/info.json (91%) create mode 100644 keyboards/annepro2/c15/info.json create mode 100644 keyboards/annepro2/c18/info.json create mode 100644 keyboards/aplyard/aplx6/rev1/info.json create mode 100644 keyboards/aplyard/aplx6/rev2/info.json delete mode 100644 keyboards/arabica37/config.h rename keyboards/arabica37/{ => rev1}/info.json (93%) diff --git a/keyboards/0_sixty/base/info.json b/keyboards/0_sixty/base/info.json new file mode 100644 index 0000000000000000000000000000000000000000..f15b6505d1389b9d5450c11e4a3af3b987d4021f --- /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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h index 9d9394c14fdb850c35a4ebbb18d4931fc019383d..58f00fb6a27e8c2bae030c0c581bc2e755197152 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 @@ -41,9 +32,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 b04e9accb2e6341bbb849ee19526380a8b3df3ab..7fc718c6027531231e4b813b03043ca19f1ec1e5 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 7a09d99fdf476566d2679c02f2ff1046d7c23a1c..18f45534c83496e6825401bfa13b07466351d2c0 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 1cff58d944d86a99978617a71505da69e252d8d8..7b36d4a834d0ebbf8c559b55476e8487d39bea74 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 0000000000000000000000000000000000000000..5cbbd86e61f4005fe8251e56bdcd96af212fbb37 --- /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 84ef473c02e2381c7ac24474163679d7703024a5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 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 807dfa84cee11dd5600d94bb5f08af1a327dbbb9..0000000000000000000000000000000000000000 --- a/keyboards/0_sixty/underglow/underglow.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Vinam Arora - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "0_sixty.h" diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h index f858685b8f8e8224b7ab44b091ef4d19c24d260f..64635050007e7a46daa9cd3a7ea9da78d8deb666 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 7755c8efb0aca99e5544c040acc36af620b1bfdf..320c96bac859c0cfe61bf4714a07aacee10f1264 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 4020f4fdc0c0ad7fec0db9fd98080d2dd68b26f2..41ebf0f8b5cbe3874f60ed3c96427058b4723410 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 0000000000000000000000000000000000000000..11a0d97d8966bcbc96d6aba9895f7c549577b57a --- /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 d344b0750df6c7c981aa1843716e9e47e24608d2..99cb5388d26d3a58ab285a901d9dfe05ae18b84b 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 0000000000000000000000000000000000000000..bed6579e824d2579ff168b6ac352b96d0432a302 --- /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 286af1857f68aa447a5f2d9016ab59c6c2a451d6..ba25c0fa0d5726cf895eb833fe2ab35c1c7fa2c3 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 0000000000000000000000000000000000000000..bed6579e824d2579ff168b6ac352b96d0432a302 --- /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 5a8b56468535a93d77e3ed61b524df26fe7f6fee..7a71d2b3670352fee127a91606c0f7c990369c59 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 8424b2edc34ede911e4e2c2f2e20af999e12d0b5..e0769e423861617bf5da18076bf2f141b48a3908 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 . #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 0000000000000000000000000000000000000000..5baab67dbad40946d14ffabcb73460903acf93db --- /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 38c74c6bf109af4ff5ce293b505a6686645a8069..db9fd8af6f7bf7a8f846142c139a287c2942a152 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 . #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 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /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 8064e94e2fe3d47064bdac182ebef1e839c0a424..3d9c898841eda2189958c32bd3b852f3b848c15c 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 43af843a0bd011656155d689573ac2c986fc3826..1b2ae25cd821caa3749c99726307759987920c26 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 . #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 1ed5f9130ad88ca4a3f990e6a838170b4aa7d6ce..5233dcb04ecaebd02c4cc0af0e62967ce3c9f9d6 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 428c704d1928e8d953f6c05568c923e2d5393804..f740f4d0119394a8f3290f44428d789e4c6cd6f5 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 . #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 de1d2933ec24ed2f60d611782c228b44dacfd370..79c4795bb3a79086c5f19ba46060328c98f662c4 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 ab463bc60cdd60b76320bbd12de9d9089563a9a9..d76688bfc13debfe5dbb16fed40bd83733705bea 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 0c14dc72d355657d496d06a6ac49c6f2a41c302c..50c7ad68a568702650ce3d0c9fd9b28d8ff1a521 100644 --- a/keyboards/3w6/rev1/config.h +++ b/keyboards/3w6/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 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 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /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 4101aa76cdc46fbf66c0e1ddc4fb04beef387f7f..50c7ad68a568702650ce3d0c9fd9b28d8ff1a521 100644 --- a/keyboards/3w6/rev2/config.h +++ b/keyboards/3w6/rev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 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 0000000000000000000000000000000000000000..e557e4d307635abfc959a8678b5a8cb1121f59a2 --- /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 3100a20feaef53b0701221622f479d8a4d210983..ed14a1143576b51fd651f046c80e225749d14466 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 7f2e2be78a5c061d06b8635f2ec7fcccb7398b12..f838933c08e3a60e2f2647d1c23887ea9e051cc1 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 4d3122afd2cbd2c5d8c7fd84667251738b27d016..1fb06d5bf67be160c8e9b25ec460d791070a59b0 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 . #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 similarity index 96% rename from keyboards/4pplet/bootleg/info.json rename to keyboards/4pplet/bootleg/rev_a/info.json index 9719b07150b3f92bfa315c036ea0fbc136c2152a..007ba9fef4e10d5791b81aa25dfa9cb6c92e66d0 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 4edb4754e91db3f430555e4c00bd421adb7866a8..951c943f1dc8b71865f8d9af13429f5c23dd1701 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 . */ #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 similarity index 95% rename from keyboards/4pplet/eagle_viper_rep/info.json rename to keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 26d3d45893dd871ba4a23119230907d2062531a9..110e1cce92c41e52af10cd2ba744e26c362b2f05 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 d6697ada9ed1259fd94a17918c7cde0dd44daaf2..53ff93cc1c5c05670da4740a7bc32ad7655abf0f 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 . */ #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 similarity index 94% rename from keyboards/4pplet/perk60_iso/info.json rename to keyboards/4pplet/perk60_iso/rev_a/info.json index 41716cce800e4ecc7d61a9500df146384e334ec2..2c61e91a9641c3b6bc9d7709eac96d3dc3d4236f 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 8f0c0d953121506ad4bc2933b24a913fa5a5e292..2fa229bc445de67566138555c244510c866ec014 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 cecd47559f76cc0980d97a9c6dda984a3b025d7d..ba16d348b935144eb0e512b076425510662fc0a6 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 0ff2c1f7e87cd18984bd18d595ebcdee6be1d7e5..9e4f081ddc7bc4f763c09ca2b4213ab9b48b63ad 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 33279d67a7832b560bf2056d630acc3b06026b54..5b5066859c43ad53e02ced78efdfca078afc3bdc 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 0000000000000000000000000000000000000000..6d4bf31f320ae39217d900d96231cd31b1026964 --- /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 eb9882d73816daf220bb1489b6a93e6809b505f4..69d9a485c5abfce350d92bf049abf1fe9daef13b 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 . #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 0000000000000000000000000000000000000000..1e0075d47bf5fba6211365143b673c9a6b79edae --- /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 e1862f4c0eb1e705136e519ec0a8dedbcbea6565..6afdcced5bfe676abded8f1fac3a1d275b56a908 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 . #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 0000000000000000000000000000000000000000..5af681f27a8e841f1854a1da379a9b7961ab7e50 --- /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 715414b64179ac0f1a3b6b5933d1a2e4f581afc3..a5eed83a8050ff07f2361f47c1a8382b131118fb 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 . #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 similarity index 96% rename from keyboards/4pplet/waffling80/info.json rename to keyboards/4pplet/waffling80/rev_a/info.json index ca927280000408e30cb0100c105a113e7d00df42..16ff5f8cefb02362bc0ef67f6aa489cb459645f7 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 bf16696014bd456b328953e2675eb5f1ab07d7d6..4200eb10c74492f6a00b6181c68593f3446b1c43 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 . */ #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 similarity index 96% rename from keyboards/4pplet/yakiimo/info.json rename to keyboards/4pplet/yakiimo/rev_a/info.json index aa3dcb429b3d9a02c66b6e82e09cd0e6961c86ef..f4eeba747f643091a81a1ebebc8c98e453c9caf1 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 88bd1f351bc5cd675a02e8216582c7e2b604c397..b9b7abebe7148678193de66480f085894d90df0f 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 fc1bcb8ef8cf6331a7cfbddeab5e62836b647cf6..f36f4c9dc33a453c66d3cd111b6e40713e45dac6 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 83ad51ada3b2cbda2d66ebba73370d767df81e32..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /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 9a527501a5ead0590e9e82e3ceafdfbca28206bc..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..e557e4d307635abfc959a8678b5a8cb1121f59a2 --- /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 060229abb2d1f2521cf9a7fe1958f59ca21d5027..0525c7a95d87a405ffcd5f8785470a92372ef2f9 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 . #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 similarity index 69% rename from keyboards/abstract/ellipse/info.json rename to keyboards/abstract/ellipse/rev1/info.json index 3348b38477c9403bbcc19f931ab353e06d04af94..0037719e12092b7be22cb2799378237c15614c30 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 04a440835fe642b93ee861ca034ec6cf09a73185..1365b81774326495d6a8541a4bcb0cefcec3438e 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 . #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 0000000000000000000000000000000000000000..8f501970a5a3b72697cd975816182df3d1492208 --- /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 a28e498dcc75d460649ecefc9799d474c2ecc7f6..451071f8695446806b3126a03cd35721180699d1 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 . #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 0000000000000000000000000000000000000000..6a7a382eaaed23b1f28914366eb5a574a4cb69a8 --- /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 e5d2c0d40d334d1513d45c2df8eb99af56520609..7dbd896a18e3eab3fcc95882f677602b789f03fc 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 9bf3840d7615ded100091fa3d57c1e5600d24c02..0cb3d381280514c6b851c68e1182171690a19ffb 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 . #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 bfa2229431e0b9be0ac55f149502860a64f2475a..b2a9cf16433ed8c48b632b5d5b64eb199d0f9634 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 24574a9658ef7a5aabac4616271e551ec1c24768..7df9fc3e6b6ea237fa51f9aff474abf8fc284594 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 . #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 c848132b5ce17da2c96fe38e4c6b5a48e785b5ac..4d695faf70dc313a0a3228f950fa31481c1b62b8 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 3e0316377de383598d29b284de19d2cb1dae8dc5..fca0450cefb6a792112002a9e0d978f9a83a41c3 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 . #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 0000000000000000000000000000000000000000..03640fd01d54a636b689a441efb027292308a4ed --- /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 559f501f95cb3298617ad1bdc59663f81b4b6ead..e9f653e3c71828a833740dacbb9c669da565771e 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 . #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 0000000000000000000000000000000000000000..7db7665fe201ca2fae563e129d1b3402a6e1b450 --- /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 2b8c4f02f33f10129812135452288a7b6e34ed7d..34853a12f638fc9ea53ffb0158615133d2e437bf 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 874183362c029fd99c0b12da0a57a05d79d203a5..9cc7246af2a12dc8c5d193844622870eec0d6c0d 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 . #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 bfb9db9b3acd0164cc38b03989b6442ff81d5d71..7eb1de3c170a4c27e20385051efa7f01fb195929 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 957a6e39cd150078a96f9792e0a093cded517ed5..8ebc6300d7c394cbbcf9f572e8f3fc17da9cbc15 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 . #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 d96805a66aa04912c1b317f68a1051ec83759876..54e58deb92a0155374af230d8f78ba13ac64a79c 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 493d267b517226204bcb6ed41f058b32748fe381..8af5dc0a1f440dc01b659e4a9fd70783281775a1 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 . #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 21f4807eeb78507cb31ed4fcb74b4f753fbec394..435ea843aa96f751400c06377c0276c708500b0f 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 b50762b8af65686ecc4faeda4fb3c69b0a410367..77e98b329c3463e27c18a9e9602384b6fba8a9f4 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 . #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 0000000000000000000000000000000000000000..5d0c6557e768e943824d0a80b3531f8505aac399 --- /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 0000000000000000000000000000000000000000..6d22c842fb4a89a99773480a3429eac72183d7d6 --- /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 609e459749c827ef9e4aa5865f659e6cb9c500f7..13fc7e8ccf3b8eb562f505077cf4d41eaf661e6c 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 9727e7eaf7a24311de97a4c1528e7d7f38a02aab..c9e95b7af0fbe10c6c6aba26742633418f3873d3 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 . */ -/* 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 7843f38d4fe53b69353b96df429108c67aa71e00..50e697a6457272d6c7f1799c7f217c97182aa625 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 cd8a28898b2784dc9c337c9d63f542b02960009f..bf57885afaa82161adc51c5181c91c04c266da64 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 22dd96f663cd48e3ba184b1efe78ea69efa3a253..eaf1c08bfd86f76e59b1453a834e14889ba5be71 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 af09a0dfc7fe063fd5f20e7d996cf76b56a5ba10..7539c9bf45e0acc5f313f9aeadf90513e46c9246 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 de42885b4701262c8acb416bc41b7ce474821f9f..77977f4a82e487895839e46bbea9e736e94f543f 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 af09a0dfc7fe063fd5f20e7d996cf76b56a5ba10..95da6851c4b9b202864a0e09c6663fae02118359 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 bc2fe64bf4d8bb1e2400123c98ec0ab63b2c893c..09056ce1f4f907421ae1891356476c2cae37fe84 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 cd9c240069635c7eb33454f87e4dfc36620ce05f..8226dcb954dbdc5886bbe2c14c00abc52505e13c 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 0000000000000000000000000000000000000000..bb472fcf7fd439125e8e56e894e8d53d2746c651 --- /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 498e345ad74e747d287a0fcd7b988a9bde91630e..0ccbc6353afd0264ffac758b087e16219c21d308 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 . #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 0000000000000000000000000000000000000000..cacde3b019c0ba29f3227b0b8d572ac65643890a --- /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 7dc9a68f7d5924c45e3f3cb989256facdd8d3aec..a4f03a7c4e9789eb8f2f753e2601d4360753af00 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 ccf44f5e3a3c426fa40b768546bd95eb63d92830..b53227a50d0faeec03f69ee95ba6c90d785ae17e 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 383a16d4554f3dc0ff2c260a1b7c2c40e9129057..0e2a0af980c9859d49427c1a9e010cf133016023 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 ccf44f5e3a3c426fa40b768546bd95eb63d92830..e69c88510a217bbe8db0f8661c145658a8b48b03 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 650b98c1b801950a43c197af24a935be8a86830b..c2f4290a0baa9b0583d5c4e4c6b8b6c96cee30f8 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 6a9406d399fa97e11b5ef2811a1bf940435eb4c2..643e9fbf25700fffb2e0b1cf4c81778b9b33baee 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 6afe6b54e8722853498d5d96dc8a14a83005ea53..41a7c781138a13e457982869288eb1095ca95ff6 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 0d0db367a4a3d94d5080f467e89ef1f1e031e00c..166548d154b0afabf174c7968e3b1b2c2b1e86b0 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 e1533a6fa0d2d0221a359f51d770bafc87d1a397..0e2a0af980c9859d49427c1a9e010cf133016023 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 b7f541ffb748703691fb9a742c8fd9d1b0d74ffb..cb86c899ae1bb287bcaeac3f13eea8c907a6cc6a 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 86c40389aa8c582bb75c03922ab28933194fddc1..0e2a0af980c9859d49427c1a9e010cf133016023 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 7e5da9b8cb2c988f251470af0bc4d49936dfff44..5d555fadcf1f3b52d34ff735324df9628e70ef82 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 4a6b841b60b321942ae61ffb3c77e83987016280..c5a6d01c112bec1a7a631697f5c2d7e5a5a0f60b 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #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 18aa1fe8d6ccf0fc763a96e76e9238b4ed75e870..f5c8ecbfbab0e3d71502a172b644465972f4dcf2 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 44ee245fe4375ab9a07ff70e9a1ccf1314a72ca4..0000000000000000000000000000000000000000 --- 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 . -*/ - -#pragma once - -#include "config_common.h" diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h index 7ea63954b0b65137cd8e5a8171928527feea5660..7027d449ecef36e1dccb01425a17755409fd4a46 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #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 similarity index 91% rename from keyboards/alt34/info.json rename to keyboards/alt34/rev1/info.json index 647c853136a9353bbf0a3766f948c213d1385962..0d22194885355d3bcbbe8a11eb82ecc876a7d9f5 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 ff92aeea8e618deeae8ad2e50ae54dbfccfa1abe..0869ad177318b8781e442c112c958741df3b7e7b 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 0000000000000000000000000000000000000000..c8c637ccfb48c4dc14db35fdda8a947f6e9db8d2 --- /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 82a406a157c0c6d7b736ed1b216c7c5a9931c8e6..eec7bbf1f0fa4c6880088526d1afff8f2e4fc0dc 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 0000000000000000000000000000000000000000..94b96a2c44e944e08430d69f9c26ce3a1816870b --- /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 95786329b2ea7036119e8b0d2f092db7b7d341b3..d2ddae4053740b996f679f9ddec51937117ee919 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 2df8d9fb3a7e281d426c655d116ccee3d5c0834e..0bd317c1a43adc891bf5d54954a166379f986b09 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 98a7381cc7484ee224f8179d55c960e99e808c89..3e77e71e906722008657c4ada657b9810bed667f 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 . #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 0000000000000000000000000000000000000000..3eb12dda153f7ca317f222b7b19f6366db75795a --- /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 2b30e67e099f00b38d065a20fbc5fb8fce7a63cf..b2373c6ec803d4b93cc4e86f39e1e37f25d2863b 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 . #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 0000000000000000000000000000000000000000..06fc50187a4d89c0aba43c4fe26bae0ec09cf2e6 --- /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 cfb6bf4ffccde389145dd8891aff0b6ff8720faa..0000000000000000000000000000000000000000 --- a/keyboards/arabica37/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2012 Jun Wako -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 . -*/ - -#pragma once - -#include "config_common.h" diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h index c0339a1a09ca5340a5bde40080e39f6c539048a1..b3a9fd3f89e8bb978ff42e0df530f3a87627f07e 100644 --- a/keyboards/arabica37/rev1/config.h +++ b/keyboards/arabica37/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #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 similarity index 93% rename from keyboards/arabica37/info.json rename to keyboards/arabica37/rev1/info.json index 4aae9a644404bdeaddb27501cf4b8cf5644438a7..00d29b54a010ac27d9e20a3110dc8a241a604084 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 ae3eb4f2325003e6065d962c16d8bc048310a7cf..b7bc5e385a2e0431e2c7bc5ae88c3662ffbca4d5 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 a20cfda0519808951fe71177558823cdb15b8374..724fcca78da7a2cf28bc7d1bc49deefd63ea25c3 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 32533c5cc917c325a5aa50a264abfaee928d001b..e641a20f9367c140794ecce92732e6050e8ab1c7 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 907face92285e5390ae60511aea827e354f024ba..d753cce4bc735a03d2f0e61a96285578e2cab765 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 55cbd30b1c4cc5283b6a9db75e84aa302132ba5b..16b26d8ffc9777d74ee51d5538a6a8e262bc9062 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 6809c99b4e246ed79b6b41f455538be9374cf1a2..52c03b57a35ea1edb1759f6cf6eaa9bf3c06cf46 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 3dc537170d9f1b9bbe786126eb108c5963fde4bc..4c4e05ecf421fdf7023fa6f544f585e706c52d5c 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 39b8b51b3865f5ac43856f282d3c8385a3b9e8ea..1869c0165f0b92ee513ab18fc2ed419aa65d131d 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 d2082635d81aab2af62e26596ed90ce91c43409f..c83c90c0bafe368ef4154b38100472335bbf07e0 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 53e227bcf17649090a28142a5baa78ff996c5fc0..b96cdc5ea785d6251130fafcb58edc4bfe41aa4b 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": [