From 30796913913c0f6dc0cce317ad8249de2b602294 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 10:47:05 +1000 Subject: 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 -- .../1upkeyboards/sweet16/v2/promicro/info.json | 6 ++ .../1upkeyboards/sweet16/v2/proton_c/config.h | 4 -- .../1upkeyboards/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/info.json | 77 -------------------- keyboards/4pplet/bootleg/rev_a/config.h | 7 -- keyboards/4pplet/bootleg/rev_a/info.json | 83 ++++++++++++++++++++++ keyboards/4pplet/eagle_viper_rep/info.json | 76 -------------------- keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 7 -- keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 82 +++++++++++++++++++++ keyboards/4pplet/perk60_iso/info.json | 10 --- keyboards/4pplet/perk60_iso/rev_a/config.h | 7 -- keyboards/4pplet/perk60_iso/rev_a/info.json | 16 +++++ 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/info.json | 10 --- keyboards/4pplet/waffling80/rev_a/config.h | 7 -- keyboards/4pplet/waffling80/rev_a/info.json | 16 +++++ keyboards/4pplet/yakiimo/info.json | 10 --- keyboards/4pplet/yakiimo/rev_a/config.h | 7 -- keyboards/4pplet/yakiimo/rev_a/info.json | 16 +++++ 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/info.json | 10 --- keyboards/abstract/ellipse/rev1/config.h | 7 -- keyboards/abstract/ellipse/rev1/info.json | 16 +++++ 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 ++- keyboards/aeboards/constellation/rev1/config.h | 7 -- keyboards/aeboards/constellation/rev1/info.json | 8 ++- keyboards/aeboards/constellation/rev2/config.h | 7 -- keyboards/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 +- keyboards/afternoonlabs/oceanbreeze/rev1/config.h | 7 -- keyboards/afternoonlabs/oceanbreeze/rev1/info.json | 7 +- .../afternoonlabs/southern_breeze/rev1/config.h | 7 -- .../afternoonlabs/southern_breeze/rev1/info.json | 7 +- .../afternoonlabs/summer_breeze/rev1/config.h | 7 -- .../afternoonlabs/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/info.json | 52 -------------- keyboards/alt34/rev1/config.h | 7 -- keyboards/alt34/rev1/info.json | 58 +++++++++++++++ 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/info.json | 63 ---------------- keyboards/arabica37/rev1/config.h | 7 -- keyboards/arabica37/rev1/info.json | 69 ++++++++++++++++++ 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 ++- 145 files changed, 728 insertions(+), 816 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 delete mode 100644 keyboards/4pplet/bootleg/info.json create mode 100644 keyboards/4pplet/bootleg/rev_a/info.json delete mode 100644 keyboards/4pplet/eagle_viper_rep/info.json create mode 100644 keyboards/4pplet/eagle_viper_rep/rev_a/info.json delete mode 100644 keyboards/4pplet/perk60_iso/info.json create mode 100644 keyboards/4pplet/perk60_iso/rev_a/info.json 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 delete mode 100644 keyboards/4pplet/waffling80/info.json create mode 100644 keyboards/4pplet/waffling80/rev_a/info.json delete mode 100644 keyboards/4pplet/yakiimo/info.json create mode 100644 keyboards/4pplet/yakiimo/rev_a/info.json 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 delete mode 100644 keyboards/abstract/ellipse/info.json create mode 100644 keyboards/abstract/ellipse/rev1/info.json 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 delete mode 100644 keyboards/alt34/info.json create mode 100644 keyboards/alt34/rev1/info.json 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 delete mode 100644 keyboards/arabica37/info.json create mode 100644 keyboards/arabica37/rev1/info.json (limited to 'keyboards') diff --git a/keyboards/0_sixty/base/info.json b/keyboards/0_sixty/base/info.json new file mode 100644 index 0000000000..f15b6505d1 --- /dev/null +++ b/keyboards/0_sixty/base/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "0-Sixty", + "usb": { + "pid": "0x0060" + }, + "indicators": { + "caps_lock": "B6" + } +} diff --git a/keyboards/0_sixty/base/rules.mk b/keyboards/0_sixty/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h index 9d9394c14f..58f00fb6a2 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 b04e9accb2..7fc718c602 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "0-Sixty", + "manufacturer": "ven0mtr0n", "url": "", "maintainer": "vinamarora8", + "usb": { + "vid": "0x7654", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_1x2uC": { "layout": [ diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk index 7a09d99fdf..18f45534c8 100644 --- a/keyboards/0_sixty/rules.mk +++ b/keyboards/0_sixty/rules.mk @@ -17,3 +17,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Link-time opt + +DEFAULT_FOLDER = 0_sixty/base diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h index 1cff58d944..7b36d4a834 100644 --- a/keyboards/0_sixty/underglow/config.h +++ b/keyboards/0_sixty/underglow/config.h @@ -18,15 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#undef PRODUCT_ID -#define PRODUCT_ID 0x0061 -#undef PRODUCT -#define PRODUCT 0-Sixty-underglow - -/* no caps lock with underglow */ -#undef LED_CAPS_LOCK_PIN - /* underglow */ #define RGB_DI_PIN B6 #define RGBLED_NUM 24 diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json new file mode 100644 index 0000000000..5cbbd86e61 --- /dev/null +++ b/keyboards/0_sixty/underglow/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "0-Sixty-underglow", + "usb": { + "pid": "0x0061" + }, + "features": { + "rgblight": true + } +} diff --git a/keyboards/0_sixty/underglow/rules.mk b/keyboards/0_sixty/underglow/rules.mk index 84ef473c02..e69de29bb2 100644 --- a/keyboards/0_sixty/underglow/rules.mk +++ b/keyboards/0_sixty/underglow/rules.mk @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/0_sixty/underglow/underglow.h b/keyboards/0_sixty/underglow/underglow.h deleted file mode 100644 index 807dfa84ce..0000000000 --- a/keyboards/0_sixty/underglow/underglow.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Vinam Arora - * - * 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 f858685b8f..6463505000 100644 --- a/keyboards/1upkeyboards/sweet16/config.h +++ b/keyboards/1upkeyboards/sweet16/config.h @@ -2,11 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6F75 // OU -#define MANUFACTURER 1up Keyboards -#define PRODUCT Sweet16 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json index 7755c8efb0..320c96bac8 100644 --- a/keyboards/1upkeyboards/sweet16/info.json +++ b/keyboards/1upkeyboards/sweet16/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Sweet 16", + "keyboard_name": "Sweet16", + "manufacturer": "1up Keyboards", "url": "", "maintainer": "skullydazed", + "usb": { + "vid": "0x6F75" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}] diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index 4020f4fdc0..41ebf0f8b5 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0161 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { F4, F5, F6, F7 } #define MATRIX_COL_PINS { D1, D0, D4, C6 } diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json new file mode 100644 index 0000000000..11a0d97d89 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0161", + "device_version": "0.0.1" + } +} diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h index d344b0750d..99cb5388d2 100644 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0162 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { D4, D1, E6, B5 } #define MATRIX_COL_PINS { F7, F6, D2, D3 } diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json new file mode 100644 index 0000000000..bed6579e82 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0162", + "device_version": "0.0.1" + } +} diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h index 286af1857f..ba25c0fa0d 100644 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0162 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { B5, B7, B2, B0 } #define MATRIX_COL_PINS { B8, A0, A10, A9 } diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json new file mode 100644 index 0000000000..bed6579e82 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0162", + "device_version": "0.0.1" + } +} diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json index 5a8b564685..7a71d2b367 100644 --- a/keyboards/25keys/aleth42/info.json +++ b/keyboards/25keys/aleth42/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "aleth42", + "keyboard_name": "ALETH42", + "manufacturer": "25KEYS", "url": "http://www.sho-k.co.uk/tech/aleth42", "maintainer": "monksoffunk", + "usb": { + "vid": "0x04D8", + "pid": "0xEAC8" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index 8424b2edc3..e0769e4238 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 0000000000..5baab67dba --- /dev/null +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.0" + } +} diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index 38c74c6bf1..db9fd8af6f 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 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json index 8064e94e2f..3d9c898841 100644 --- a/keyboards/25keys/zinc/info.json +++ b/keyboards/25keys/zinc/info.json @@ -1,8 +1,13 @@ { - "keyboard_name": "Zinc", - "url": "https://github.com/monksoffunk/", + "manufacturer": "25KEYS", + "url": "https://github.com/monksoffunk/zinc", "maintainer": "monksoffunk", - "layouts": { + "usb": { + "vid": "0x04D8", + "pid": "0xEA3B", + "device_version": "0.0.1" + }, + "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] } diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index 43af843a0b..1b2ae25cd8 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEA3B -#define DEVICE_VER 0x0001 -#define MANUFACTURER 25KEYS -#define PRODUCT zinc rev.1 - #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json index 1ed5f9130a..5233dcb04e 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/info.json @@ -1,10 +1,3 @@ { - "keyboard_name": "Zinc rev.1", - "url": "https://github.com/monksoffunk/zinc", - "maintainer": "monksoffunk", - "layouts": { - "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] - } - } + "keyboard_name": "Zinc rev.1" } diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index 428c704d19..f740f4d011 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEA3B -#define DEVICE_VER 0x0001 -#define MANUFACTURER 25KEYS -#define PRODUCT zinc rev.A - #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json index de1d2933ec..79c4795bb3 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/info.json @@ -1,10 +1,3 @@ { - "keyboard_name": "Zinc rev.A", - "url": "https://github.com/monksoffunk/zinc", - "maintainer": "monksoffunk", - "layouts": { - "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] - } - } + "keyboard_name": "Zinc rev.A" } diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json index ab463bc60c..d76688bfc1 100644 --- a/keyboards/3w6/info.json +++ b/keyboards/3w6/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "3w6", + "manufacturer": "weteor", "url": "https://github.com/weteor/3W6/", "maintainer": "weteor", + "usb": { + "vid": "0xFEED", + "pid": "0x4658" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/3w6/rev1/config.h b/keyboards/3w6/rev1/config.h index 0c14dc72d3..50c7ad68a5 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 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/3w6/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/3w6/rev2/config.h b/keyboards/3w6/rev2/config.h index 4101aa76cd..50c7ad68a5 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 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/3w6/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 3100a20fea..ed14a11435 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT AEKISO60 Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index 7f2e2be78a..f838933c08 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AEKISO60 Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/bootleg/info.json b/keyboards/4pplet/bootleg/info.json deleted file mode 100644 index 9719b07150..0000000000 --- a/keyboards/4pplet/bootleg/info.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "keyboard_name": "bootleg Rev A", - "url": "https://github.com/4pplet/bootlegs", - "maintainer": "4pplet", - "layouts": { - "LAYOUT_all": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "@", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "|", "x": 13, "y": 0 }, - { "label": "~", "x": 14, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "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": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "\"", "x": 11.75, "y": 2 }, - { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 3, "w": 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": 1.75 }, - { "label": "Fn", "x": 14, "y": 3, "w": 1 }, - { "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 }, - { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 }, - { "label": "Space2", "x": 6, "y": 4, "w": 1.25 }, - { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 }, - { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, - { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 } - ] - } - } -} diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 4d3122afd2..1fb06d5bf6 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #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/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json new file mode 100644 index 0000000000..007ba9fef4 --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -0,0 +1,83 @@ +{ + "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": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "!", "x": 1, "y": 0 }, + { "label": "@", "x": 2, "y": 0 }, + { "label": "#", "x": 3, "y": 0 }, + { "label": "$", "x": 4, "y": 0 }, + { "label": "%", "x": 5, "y": 0 }, + { "label": "^", "x": 6, "y": 0 }, + { "label": "&", "x": 7, "y": 0 }, + { "label": "*", "x": 8, "y": 0 }, + { "label": "(", "x": 9, "y": 0 }, + { "label": ")", "x": 10, "y": 0 }, + { "label": "_", "x": 11, "y": 0 }, + { "label": "+", "x": 12, "y": 0 }, + { "label": "|", "x": 13, "y": 0 }, + { "label": "~", "x": 14, "y": 0 }, + { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 1 }, + { "label": "W", "x": 2.5, "y": 1 }, + { "label": "E", "x": 3.5, "y": 1 }, + { "label": "R", "x": 4.5, "y": 1 }, + { "label": "T", "x": 5.5, "y": 1 }, + { "label": "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": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 }, + { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 2 }, + { "label": "S", "x": 2.75, "y": 2 }, + { "label": "D", "x": 3.75, "y": 2 }, + { "label": "F", "x": 4.75, "y": 2 }, + { "label": "G", "x": 5.75, "y": 2 }, + { "label": "H", "x": 6.75, "y": 2 }, + { "label": "J", "x": 7.75, "y": 2 }, + { "label": "K", "x": 8.75, "y": 2 }, + { "label": "L", "x": 9.75, "y": 2 }, + { "label": ":", "x": 10.75, "y": 2 }, + { "label": "\"", "x": 11.75, "y": 2 }, + { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 3, "w": 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": 1.75 }, + { "label": "Fn", "x": 14, "y": 3, "w": 1 }, + { "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 }, + { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 }, + { "label": "Space2", "x": 6, "y": 4, "w": 1.25 }, + { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 }, + { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, + { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 }, + { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 }, + { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 } + ] + } + } +} diff --git a/keyboards/4pplet/eagle_viper_rep/info.json b/keyboards/4pplet/eagle_viper_rep/info.json deleted file mode 100644 index 26d3d45893..0000000000 --- a/keyboards/4pplet/eagle_viper_rep/info.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "keyboard_name": "Eagle/Viper Rep", - "url": "https://github.com/4pplet/eagle_viper_rep", - "maintainer": "4pplet", - "layouts": { - "LAYOUT_all": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "@", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "|", "x": 13, "y": 0 }, - { "label": "~", "x": 14, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "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": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "\"", "x": 11.75, "y": 2 }, - { "label": "~", "x": 12.75, "y": 2}, - { "label": "Enter", "x": 13.75, "y": 2, "w": 1.25 }, - { "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": 1.75 }, - { "label": "Fn", "x": 14, "y": 3, "w": 1 }, - { "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 }, - { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, - { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 } - ] - } - } -} diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 4edb4754e9..951c943f1d 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . */ #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/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json new file mode 100644 index 0000000000..110e1cce92 --- /dev/null +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -0,0 +1,82 @@ +{ + "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": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "!", "x": 1, "y": 0 }, + { "label": "@", "x": 2, "y": 0 }, + { "label": "#", "x": 3, "y": 0 }, + { "label": "$", "x": 4, "y": 0 }, + { "label": "%", "x": 5, "y": 0 }, + { "label": "^", "x": 6, "y": 0 }, + { "label": "&", "x": 7, "y": 0 }, + { "label": "*", "x": 8, "y": 0 }, + { "label": "(", "x": 9, "y": 0 }, + { "label": ")", "x": 10, "y": 0 }, + { "label": "_", "x": 11, "y": 0 }, + { "label": "+", "x": 12, "y": 0 }, + { "label": "|", "x": 13, "y": 0 }, + { "label": "~", "x": 14, "y": 0 }, + { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 1 }, + { "label": "W", "x": 2.5, "y": 1 }, + { "label": "E", "x": 3.5, "y": 1 }, + { "label": "R", "x": 4.5, "y": 1 }, + { "label": "T", "x": 5.5, "y": 1 }, + { "label": "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": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 }, + { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 2 }, + { "label": "S", "x": 2.75, "y": 2 }, + { "label": "D", "x": 3.75, "y": 2 }, + { "label": "F", "x": 4.75, "y": 2 }, + { "label": "G", "x": 5.75, "y": 2 }, + { "label": "H", "x": 6.75, "y": 2 }, + { "label": "J", "x": 7.75, "y": 2 }, + { "label": "K", "x": 8.75, "y": 2 }, + { "label": "L", "x": 9.75, "y": 2 }, + { "label": ":", "x": 10.75, "y": 2 }, + { "label": "\"", "x": 11.75, "y": 2 }, + { "label": "~", "x": 12.75, "y": 2}, + { "label": "Enter", "x": 13.75, "y": 2, "w": 1.25 }, + { "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": 1.75 }, + { "label": "Fn", "x": 14, "y": 3, "w": 1 }, + { "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 }, + { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 }, + { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, + { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 }, + { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 }, + { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 } + ] + } + } +} diff --git a/keyboards/4pplet/perk60_iso/info.json b/keyboards/4pplet/perk60_iso/info.json deleted file mode 100644 index 41716cce80..0000000000 --- a/keyboards/4pplet/perk60_iso/info.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "keyboard_name": "Perk60 ISO Rev A", - "url": "", - "maintainer": "4pplet", - "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/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index d6697ada9e..53ff93cc1c 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . */ #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/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json new file mode 100644 index 0000000000..2c61e91a96 --- /dev/null +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -0,0 +1,16 @@ +{ + "keyboard_name": "Perk60 ISO Rev A", + "manufacturer": "4pplet", + "url": "", + "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0009", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_60_iso": { + "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + } + } +} diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 8f0c0d9531..2fa229bc44 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT Steezy60 Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index cecd47559f..ba16d348b9 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Steezy60 Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4444", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/waffling60/info.json b/keyboards/4pplet/waffling60/info.json index 0ff2c1f7e8..9e4f081ddc 100644 --- a/keyboards/4pplet/waffling60/info.json +++ b/keyboards/4pplet/waffling60/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Waffling60 Rev A", + "manufacturer": "4pplet", "url": "https://github.com/4pplet/waffling60", "maintainer": "4pplet", + "usb": { + "vid": "0x4444" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 33279d67a7..5b5066859c 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT waffling60 Rev A - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 11 diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json new file mode 100644 index 0000000000..6d4bf31f32 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Waffling60 Rev A", + "usb": { + "pid": "0x0003", + "device_version": "0.0.1" + } +} diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index eb9882d738..69d9a485c5 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0005 -#define DEVICE_VER 0x0002 -#define MANUFACTURER 4pplet -#define PRODUCT waffling60 Rev B - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json new file mode 100644 index 0000000000..1e0075d47b --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Waffling60 Rev B", + "usb": { + "pid": "0x0005", + "device_version": "0.0.2" + } +} diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index e1862f4c0e..6afdcced5b 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4444 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0003 -#define MANUFACTURER 4pplet -#define PRODUCT waffling60 Rev C - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json new file mode 100644 index 0000000000..5af681f27a --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Waffling60 Rev C", + "usb": { + "pid": "0x0008", + "device_version": "0.0.3" + } +} diff --git a/keyboards/4pplet/waffling80/info.json b/keyboards/4pplet/waffling80/info.json deleted file mode 100644 index ca92728000..0000000000 --- a/keyboards/4pplet/waffling80/info.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "keyboard_name": "waffling80 Rev A", - "url": "", - "maintainer": "4pplet", - "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/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index 715414b641..a5eed83a80 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #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/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json new file mode 100644 index 0000000000..16ff5f8cef --- /dev/null +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -0,0 +1,16 @@ +{ + "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",