From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/jadookb/jkb65/config.h | 9 - keyboards/jadookb/jkb65/info.json | 6 +- keyboards/jadookb/jkb65/r1/config.h | 20 ++ keyboards/jadookb/jkb65/r1/info.json | 6 + keyboards/jadookb/jkb65/r1/rules.mk | 0 keyboards/jadookb/jkb65/r2/config.h | 9 +- keyboards/jadookb/jkb65/r2/info.json | 6 + keyboards/jadookb/jkb65/r2/rules.mk | 0 keyboards/jadookb/jkb65/rules.mk | 2 + keyboards/jian/handwired/config.h | 7 - keyboards/jian/handwired/info.json | 6 + keyboards/jian/info.json | 6 +- keyboards/jian/nsrev2/config.h | 7 - keyboards/jian/nsrev2/info.json | 6 + keyboards/jian/rev1/config.h | 7 - keyboards/jian/rev1/info.json | 6 + keyboards/jian/rev2/config.h | 7 - keyboards/jian/rev2/info.json | 6 + keyboards/jorne/info.json | 240 -------------- keyboards/jorne/rev1/config.h | 8 - keyboards/jorne/rev1/info.json | 246 ++++++++++++++ keyboards/kakunpc/angel17/alpha/config.h | 7 - keyboards/kakunpc/angel17/info.json | 6 + keyboards/kakunpc/angel17/rev1/config.h | 7 - keyboards/kakunpc/suihankey/split/alpha/config.h | 7 - keyboards/kakunpc/suihankey/split/info.json | 8 +- keyboards/kakunpc/suihankey/split/rev1/config.h | 7 - keyboards/kapcave/paladinpad/config.h | 6 - keyboards/kapcave/paladinpad/info.json | 5 + keyboards/kapcave/paladinpad/rev1/info.json | 5 + keyboards/kapcave/paladinpad/rev2/info.json | 5 + keyboards/kapl/info.json | 85 ----- keyboards/kapl/rev1/config.h | 8 - keyboards/kapl/rev1/info.json | 91 +++++ keyboards/kbdfans/kbd67/mkiirgb/info.json | 5 +- keyboards/kbdfans/kbd67/mkiirgb/v1/config.h | 5 - keyboards/kbdfans/kbd67/mkiirgb/v1/info.json | 7 + keyboards/kbdfans/kbd67/mkiirgb/v2/config.h | 5 - keyboards/kbdfans/kbd67/mkiirgb/v2/info.json | 7 + keyboards/kbdfans/kbd67/mkiirgb/v3/config.h | 7 - keyboards/kbdfans/kbd67/mkiirgb/v3/info.json | 7 + keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 7 - keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 7 + keyboards/kbdfans/kbd75/config.h | 5 - keyboards/kbdfans/kbd75/rev1/config.h | 7 - keyboards/kbdfans/kbd75/rev1/info.json | 6 + keyboards/kbdfans/kbd75/rev2/config.h | 7 - keyboards/kbdfans/kbd75/rev2/info.json | 6 + keyboards/kbdfans/kbd75rgb/config.h | 7 - keyboards/kbdfans/kbd75rgb/info.json | 11 + keyboards/kbnordic/nordic60/info.json | 361 -------------------- keyboards/kbnordic/nordic60/rev_a/config.h | 7 - keyboards/kbnordic/nordic60/rev_a/info.json | 367 +++++++++++++++++++++ keyboards/keebio/bdn9/info.json | 5 +- keyboards/keebio/bdn9/rev1/config.h | 7 - keyboards/keebio/bdn9/rev1/info.json | 7 + keyboards/keebio/bdn9/rev2/config.h | 7 - keyboards/keebio/bdn9/rev2/info.json | 7 + keyboards/keebio/dsp40/info.json | 105 ------ keyboards/keebio/dsp40/rev1/config.h | 7 - keyboards/keebio/dsp40/rev1/info.json | 111 +++++++ keyboards/keebio/foldkb/info.json | 87 ----- keyboards/keebio/foldkb/rev1/config.h | 7 - keyboards/keebio/foldkb/rev1/info.json | 93 ++++++ keyboards/keebio/iris/info.json | 5 +- keyboards/keebio/iris/rev1/config.h | 7 - keyboards/keebio/iris/rev1/info.json | 7 + keyboards/keebio/iris/rev1_led/config.h | 7 - keyboards/keebio/iris/rev1_led/info.json | 7 + keyboards/keebio/iris/rev2/config.h | 7 - keyboards/keebio/iris/rev2/info.json | 7 + keyboards/keebio/iris/rev3/config.h | 7 - keyboards/keebio/iris/rev3/info.json | 7 + keyboards/keebio/iris/rev4/config.h | 7 - keyboards/keebio/iris/rev4/info.json | 7 + keyboards/keebio/iris/rev5/config.h | 7 - keyboards/keebio/iris/rev5/info.json | 7 + keyboards/keebio/iris/rev6/config.h | 7 - keyboards/keebio/iris/rev6/info.json | 7 + keyboards/keebio/iris/rev6a/config.h | 7 - keyboards/keebio/iris/rev6a/info.json | 7 + keyboards/keebio/iris/rev7/config.h | 7 - keyboards/keebio/iris/rev7/info.json | 7 + keyboards/keebio/kbo5000/info.json | 337 ------------------- keyboards/keebio/kbo5000/rev1/config.h | 7 - keyboards/keebio/kbo5000/rev1/info.json | 343 +++++++++++++++++++ keyboards/keebio/levinson/info.json | 4 + keyboards/keebio/levinson/rev1/config.h | 7 - keyboards/keebio/levinson/rev1/info.json | 7 + keyboards/keebio/levinson/rev2/config.h | 7 - keyboards/keebio/levinson/rev2/info.json | 7 + keyboards/keebio/levinson/rev3/config.h | 7 - keyboards/keebio/levinson/rev3/info.json | 7 + keyboards/keebio/nyquist/info.json | 5 +- keyboards/keebio/nyquist/rev1/config.h | 7 - keyboards/keebio/nyquist/rev1/info.json | 7 + keyboards/keebio/nyquist/rev2/config.h | 7 - keyboards/keebio/nyquist/rev2/info.json | 7 + keyboards/keebio/nyquist/rev3/config.h | 7 - keyboards/keebio/nyquist/rev3/info.json | 7 + keyboards/keebio/rorschach/info.json | 73 ---- keyboards/keebio/rorschach/rev1/config.h | 7 - keyboards/keebio/rorschach/rev1/info.json | 79 +++++ keyboards/keebio/sinc/info.json | 5 +- keyboards/keebio/sinc/rev1/config.h | 7 - keyboards/keebio/sinc/rev1/info.json | 7 + keyboards/keebio/sinc/rev2/config.h | 7 - keyboards/keebio/sinc/rev2/info.json | 7 + keyboards/keebio/viterbi/info.json | 5 +- keyboards/keebio/viterbi/rev1/config.h | 7 - keyboards/keebio/viterbi/rev1/info.json | 7 + keyboards/keebio/viterbi/rev2/config.h | 7 - keyboards/keebio/viterbi/rev2/info.json | 7 + keyboards/keycapsss/kimiko/info.json | 75 ----- keyboards/keycapsss/kimiko/kimiko.h | 21 -- keyboards/keycapsss/kimiko/rev1/config.h | 7 - keyboards/keycapsss/kimiko/rev1/info.json | 81 +++++ keyboards/keycapsss/plaid_pad/config.h | 5 - keyboards/keycapsss/plaid_pad/info.json | 6 +- keyboards/keycapsss/plaid_pad/rev1/config.h | 3 - keyboards/keycapsss/plaid_pad/rev1/info.json | 6 + keyboards/keycapsss/plaid_pad/rev2/config.h | 3 - keyboards/keycapsss/plaid_pad/rev2/info.json | 6 + keyboards/keycapsss/plaid_pad/rev3/config.h | 3 - keyboards/keycapsss/plaid_pad/rev3/info.json | 6 + keyboards/keychron/q1/config.h | 5 - keyboards/keychron/q1/rev_0100/config.h | 5 - keyboards/keychron/q1/rev_0100/info.json | 8 +- keyboards/keychron/q1/rev_0101/config.h | 4 - keyboards/keychron/q1/rev_0101/info.json | 8 +- keyboards/keychron/q1/rev_0102/config.h | 5 - keyboards/keychron/q1/rev_0102/info.json | 8 +- keyboards/keychron/q2/config.h | 5 - keyboards/keychron/q2/rev_0110/config.h | 4 - keyboards/keychron/q2/rev_0110/info.json | 8 +- keyboards/keychron/q2/rev_0111/config.h | 4 - keyboards/keychron/q2/rev_0111/info.json | 8 +- keyboards/keychron/q2/rev_0112/config.h | 4 - keyboards/keychron/q2/rev_0112/info.json | 8 +- keyboards/keychron/q2/rev_0113/config.h | 4 - keyboards/keychron/q2/rev_0113/info.json | 8 +- keyboards/keyhive/navi10/info.json | 5 + keyboards/keyhive/navi10/rev0/config.h | 7 - keyboards/keyhive/navi10/rev0/info.json | 5 + keyboards/keyhive/navi10/rev2/config.h | 7 - keyboards/keyhive/navi10/rev2/info.json | 5 + keyboards/keyhive/navi10/rev3/config.h | 7 - keyboards/keyhive/navi10/rev3/info.json | 5 + keyboards/keyhive/uno/info.json | 6 +- keyboards/keyhive/uno/rev1/config.h | 7 - keyboards/keyhive/uno/rev1/info.json | 6 + keyboards/keyhive/uno/rev2/config.h | 7 - keyboards/keyhive/uno/rev2/info.json | 6 + keyboards/kinesis/alvicstep/config.h | 4 - keyboards/kinesis/alvicstep/info.json | 9 + keyboards/kinesis/config.h | 5 - keyboards/kinesis/info.json | 1 - keyboards/kinesis/kint2pp/config.h | 4 - keyboards/kinesis/kint2pp/info.json | 9 + keyboards/kinesis/kint36/config.h | 12 - keyboards/kinesis/kint36/info.json | 9 + keyboards/kinesis/kint41/config.h | 12 - keyboards/kinesis/kint41/info.json | 9 + keyboards/kinesis/kintlc/config.h | 12 - keyboards/kinesis/kintlc/info.json | 9 + keyboards/kinesis/nguyenvietyen/config.h | 4 - keyboards/kinesis/nguyenvietyen/info.json | 9 + keyboards/kinesis/stapelberg/config.h | 4 - keyboards/kinesis/stapelberg/info.json | 9 + keyboards/kingly_keys/ave/config.h | 7 - keyboards/kingly_keys/ave/ortho/info.json | 8 +- keyboards/kingly_keys/ave/staggered/info.json | 8 +- keyboards/kudox_game/info.json | 7 +- keyboards/kudox_game/rev1/config.h | 7 - keyboards/kudox_game/rev1/info.json | 5 + keyboards/kudox_game/rev2/config.h | 7 - keyboards/kudox_game/rev2/info.json | 5 + keyboards/late9/config.h | 6 - keyboards/late9/rev1/config.h | 3 - keyboards/late9/rev1/info.json | 7 +- keyboards/lazydesigners/dimple/config.h | 7 - keyboards/lazydesigners/dimple/ortho/info.json | 6 + keyboards/lazydesigners/dimple/staggered/info.json | 6 + keyboards/lets_split/info.json | 1 - keyboards/lets_split/rev1/config.h | 7 - keyboards/lets_split/rev1/info.json | 9 + keyboards/lets_split/rev2/config.h | 7 - keyboards/lets_split/rev2/info.json | 9 + keyboards/lets_split/sockets/config.h | 7 - keyboards/lets_split/sockets/info.json | 9 + keyboards/lfkeyboards/smk65/info.json | 7 +- keyboards/lfkeyboards/smk65/revb/config.h | 7 - keyboards/lfkeyboards/smk65/revb/info.json | 5 + keyboards/lfkeyboards/smk65/revf/config.h | 7 - keyboards/lfkeyboards/smk65/revf/info.json | 5 + 195 files changed, 1997 insertions(+), 1961 deletions(-) create mode 100644 keyboards/jadookb/jkb65/r1/config.h create mode 100644 keyboards/jadookb/jkb65/r1/info.json create mode 100644 keyboards/jadookb/jkb65/r1/rules.mk create mode 100644 keyboards/jadookb/jkb65/r2/info.json create mode 100644 keyboards/jadookb/jkb65/r2/rules.mk create mode 100644 keyboards/jian/handwired/info.json create mode 100644 keyboards/jian/nsrev2/info.json create mode 100644 keyboards/jian/rev1/info.json create mode 100644 keyboards/jian/rev2/info.json delete mode 100644 keyboards/jorne/info.json create mode 100644 keyboards/jorne/rev1/info.json create mode 100644 keyboards/kapcave/paladinpad/rev1/info.json create mode 100644 keyboards/kapcave/paladinpad/rev2/info.json delete mode 100644 keyboards/kapl/info.json create mode 100644 keyboards/kapl/rev1/info.json create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v1/info.json create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v2/info.json create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v3/info.json create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/info.json delete mode 100644 keyboards/kbdfans/kbd75/rev1/config.h delete mode 100644 keyboards/kbdfans/kbd75/rev2/config.h create mode 100644 keyboards/kbdfans/kbd75rgb/info.json delete mode 100644 keyboards/kbnordic/nordic60/info.json create mode 100644 keyboards/kbnordic/nordic60/rev_a/info.json create mode 100644 keyboards/keebio/bdn9/rev1/info.json create mode 100644 keyboards/keebio/bdn9/rev2/info.json delete mode 100644 keyboards/keebio/dsp40/info.json create mode 100644 keyboards/keebio/dsp40/rev1/info.json delete mode 100644 keyboards/keebio/foldkb/info.json create mode 100644 keyboards/keebio/foldkb/rev1/info.json create mode 100644 keyboards/keebio/iris/rev1/info.json create mode 100644 keyboards/keebio/iris/rev1_led/info.json create mode 100644 keyboards/keebio/iris/rev2/info.json create mode 100644 keyboards/keebio/iris/rev3/info.json create mode 100644 keyboards/keebio/iris/rev4/info.json create mode 100644 keyboards/keebio/iris/rev5/info.json create mode 100644 keyboards/keebio/iris/rev6/info.json create mode 100644 keyboards/keebio/iris/rev6a/info.json create mode 100644 keyboards/keebio/iris/rev7/info.json delete mode 100644 keyboards/keebio/kbo5000/info.json create mode 100644 keyboards/keebio/kbo5000/rev1/info.json create mode 100644 keyboards/keebio/levinson/rev1/info.json create mode 100644 keyboards/keebio/levinson/rev2/info.json create mode 100644 keyboards/keebio/levinson/rev3/info.json create mode 100644 keyboards/keebio/nyquist/rev1/info.json create mode 100644 keyboards/keebio/nyquist/rev2/info.json create mode 100644 keyboards/keebio/nyquist/rev3/info.json delete mode 100644 keyboards/keebio/rorschach/info.json create mode 100644 keyboards/keebio/rorschach/rev1/info.json create mode 100644 keyboards/keebio/sinc/rev1/info.json create mode 100644 keyboards/keebio/sinc/rev2/info.json create mode 100644 keyboards/keebio/viterbi/rev1/info.json create mode 100644 keyboards/keebio/viterbi/rev2/info.json delete mode 100644 keyboards/keycapsss/kimiko/info.json create mode 100644 keyboards/keycapsss/kimiko/rev1/info.json create mode 100644 keyboards/keycapsss/plaid_pad/rev1/info.json create mode 100644 keyboards/keycapsss/plaid_pad/rev2/info.json create mode 100644 keyboards/keycapsss/plaid_pad/rev3/info.json create mode 100644 keyboards/keyhive/navi10/rev0/info.json create mode 100644 keyboards/keyhive/navi10/rev2/info.json create mode 100644 keyboards/keyhive/navi10/rev3/info.json create mode 100644 keyboards/keyhive/uno/rev1/info.json create mode 100644 keyboards/keyhive/uno/rev2/info.json create mode 100644 keyboards/kinesis/alvicstep/info.json create mode 100644 keyboards/kinesis/kint2pp/info.json create mode 100644 keyboards/kinesis/kint36/info.json create mode 100644 keyboards/kinesis/kint41/info.json create mode 100644 keyboards/kinesis/kintlc/info.json create mode 100644 keyboards/kinesis/nguyenvietyen/info.json create mode 100644 keyboards/kinesis/stapelberg/info.json create mode 100644 keyboards/kudox_game/rev1/info.json create mode 100644 keyboards/kudox_game/rev2/info.json create mode 100644 keyboards/lets_split/rev1/info.json create mode 100644 keyboards/lets_split/rev2/info.json create mode 100644 keyboards/lets_split/sockets/info.json create mode 100644 keyboards/lfkeyboards/smk65/revb/info.json create mode 100644 keyboards/lfkeyboards/smk65/revf/info.json (limited to 'keyboards') diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index dae3cea49a..f7d09267fe 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -18,18 +18,9 @@ #include "config_common.h" -#define VENDOR_ID 0x4A4B -#define PRODUCT_ID 0xEF6A -#define DEVICE_VER 0x0001 -#define MANUFACTURER JadooKB -#define PRODUCT JKB65 RGB - #define MATRIX_ROWS 5 #define MATRIX_COLS 16 -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 } - #define UNUSED_PINS #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index 8bb0ab7524..394b53027a 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "jkb65", + "manufacturer": "JadooKB", "url": "https://jadookb.com/", "maintainer": "Wizard-GG", + "usb": { + "vid": "0x4A4B", + "pid": "0xEF6A" + }, "layouts": { "LAYOUT_67_ansi": { "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "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":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"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":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/jadookb/jkb65/r1/config.h b/keyboards/jadookb/jkb65/r1/config.h new file mode 100644 index 0000000000..78f13414c9 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/config.h @@ -0,0 +1,20 @@ + /* Copyright 2022 Wizad-GG + * + * 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 + +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } +#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 } \ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/info.json new file mode 100644 index 0000000000..4bfe3aa763 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "JKB65 RGB R1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/jadookb/jkb65/r1/rules.mk b/keyboards/jadookb/jkb65/r1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h index a0039001a8..5db93f75cb 100644 --- a/keyboards/jadookb/jkb65/r2/config.h +++ b/keyboards/jadookb/jkb65/r2/config.h @@ -16,12 +16,5 @@ #pragma once -#undef DEVICE_VER -#define DEVICE_VER 0x0002 - -#undef PRODUCT -#define PRODUCT JKB65 RGB R2 - - -#undef MATRIX_COL_PINS +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } #define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 } \ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/info.json new file mode 100644 index 0000000000..8a23a21d5f --- /dev/null +++ b/keyboards/jadookb/jkb65/r2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "JKB65 RGB R2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/jadookb/jkb65/r2/rules.mk b/keyboards/jadookb/jkb65/r2/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk index 239ea39a74..f230e8ae9f 100644 --- a/keyboards/jadookb/jkb65/rules.mk +++ b/keyboards/jadookb/jkb65/rules.mk @@ -19,3 +19,5 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes + +DEFAULT_FOLDER = jadookb/jkb65/r1 diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h index ebcda62f44..055568b06c 100644 --- a/keyboards/jian/handwired/config.h +++ b/keyboards/jian/handwired/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0010 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Huma - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 4 diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json new file mode 100644 index 0000000000..120c6c4a24 --- /dev/null +++ b/keyboards/jian/handwired/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Huma", + "usb": { + "device_version": "0.1.0" + } +} diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json index e9c875e792..2e59944921 100644 --- a/keyboards/jian/info.json +++ b/keyboards/jian/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "jian", + "manufacturer": "KgOfHedgehogs", "url": "t.me/s/kgofhedgehogs", "maintainer": "KGOH", + "usb": { + "vid": "0xC0DE", + "pid": "0x1337" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 7a2cabeb4c..6b36049f94 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0210 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Huma - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json new file mode 100644 index 0000000000..06fbfeb833 --- /dev/null +++ b/keyboards/jian/nsrev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Huma", + "usb": { + "device_version": "2.1.0" + } +} diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 5758115035..988b6d5176 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/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 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0100 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Jian - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json new file mode 100644 index 0000000000..32540b3f78 --- /dev/null +++ b/keyboards/jian/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Jian", + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index ec3c206d46..52c8b6ad0e 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/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 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0200 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Jian - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json new file mode 100644 index 0000000000..db130bf467 --- /dev/null +++ b/keyboards/jian/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Jian", + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/jorne/info.json b/keyboards/jorne/info.json deleted file mode 100644 index a28af0a320..0000000000 --- a/keyboards/jorne/info.json +++ /dev/null @@ -1,240 +0,0 @@ -{ - "keyboard_name": "Jorne", - "url": "https://github.com/joric/jorne/wiki", - "maintainer": "joric", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "GUI", - "x": 0, - "y": 2.13 - }, - { - "label": "~", - "x": 1, - "y": 1.38 - }, - { - "label": "Q", - "x": 2, - "y": 1.38 - }, - { - "label": "W", - "x": 3, - "y": 1.13 - }, - { - "label": "E", - "x": 4, - "y": 1 - }, - { - "label": "R", - "x": 5, - "y": 1.13 - }, - { - "label": "T", - "x": 6, - "y": 1.25 - }, - - { - "label": "Y", - "x": 10.5, - "y": 1.25 - }, - { - "label": "U", - "x": 11.5, - "y": 1.125 - }, - { - "label": "I", - "x": 12.5, - "y": 1 - }, - { - "label": "O", - "x": 13.5, - "y": 1.125 - }, - { - "label": "P", - "x": 14.5, - "y": 1.375 - }, - { - "label": "{[", - "x": 15.5, - "y": 1.375 - }, - { - "label": "}]", - "x": 16.5, - "y": 2.13 - }, - - { - "label": "Ctrl", - "x": 1, - "y": 2.38 - }, - { - "label": "A", - "x": 2, - "y": 2.38 - }, - { - "label": "S", - "x": 3, - "y": 2.13 - }, - { - "label": "D", - "x": 4, - "y": 2 - }, - { - "label": "F", - "x": 5, - "y": 2.13 - }, - { - "label": "G", - "x": 6, - "y": 2.25 - }, - - { - "label": "H", - "x": 10.5, - "y": 2.25 - }, - { - "label": "J", - "x": 11.5, - "y": 2.13 - }, - { - "label": "K", - "x": 12.5, - "y": 2 - }, - { - "label": "L", - "x": 13.5, - "y": 2.125 - }, - { - "label": ":;", - "x": 14.5, - "y": 2.375 - }, - { - "label": "\"'", - "x": 15.5, - "y": 2.375 - }, - - { - "label": "Alt", - "x": 1, - "y": 3.38 - }, - { - "label": "Z", - "x": 2, - "y": 3.38 - }, - { - "label": "X", - "x": 3, - "y": 3.13 - }, - { - "label": "C", - "x": 4, - "y": 3 - }, - { - "label": "V", - "x": 5, - "y": 3.13 - }, - { - "label": "B", - "x": 6, - "y": 3.25 - }, - - { - "label": "N", - "x": 10.5, - "y": 3.25 - }, - { - "label": "M", - "x": 11.5, - "y": 3.13 - }, - { - "label": "<,", - "x": 12.5, - "y": 3 - }, - { - "label": ">.", - "x": 13.5, - "y": 3.13 - }, - { - "label": "?/", - "x": 14.5, - "y": 3.38 - }, - { - "label": "|\\", - "x": 15.5, - "y": 3.38 - }, - - { - "label": "Rise", - "x": 5, - "y": 5 - }, - { - "label": "Space", - "x": 6, - "y": 5 - }, - { - "label": "Lower", - "x": 7, - "y": 4.5, - "h": 1.5 - }, - - { - "label": "Lower", - "x": 9.5, - "y": 4.5, - "h": 1.5 - }, - { - "label": "Bcs", - "x": 10.5, - "y": 5 - }, - { - "label": "Rise", - "x": 11.5, - "y": 5 - } - ] - } - } -} \ No newline at end of file diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 7144d9fe0a..c4bcaf2972 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,14 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4753 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER joric -#define PRODUCT Jorne Keyboard - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json new file mode 100644 index 0000000000..9e0cf7be41 --- /dev/null +++ b/keyboards/jorne/rev1/info.json @@ -0,0 +1,246 @@ +{ + "keyboard_name": "Jorne", + "manufacturer": "joric", + "url": "https://github.com/joric/jorne/wiki", + "maintainer": "joric", + "usb": { + "vid": "0x4753", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { + "label": "GUI", + "x": 0, + "y": 2.13 + }, + { + "label": "~", + "x": 1, + "y": 1.38 + }, + { + "label": "Q", + "x": 2, + "y": 1.38 + }, + { + "label": "W", + "x": 3, + "y": 1.13 + }, + { + "label": "E", + "x": 4, + "y": 1 + }, + { + "label": "R", + "x": 5, + "y": 1.13 + }, + { + "label": "T", + "x": 6, + "y": 1.25 + }, + + { + "label": "Y", + "x": 10.5, + "y": 1.25 + }, + { + "label": "U", + "x": 11.5, + "y": 1.125 + }, + { + "label": "I", + "x": 12.5, + "y": 1 + }, + { + "label": "O", + "x": 13.5, + "y": 1.125 + }, + { + "label": "P", + "x": 14.5, + "y": 1.375 + }, + { + "label": "{[", + "x": 15.5, + "y": 1.375 + }, + { + "label": "}]", + "x": 16.5, + "y": 2.13 + }, + + { + "label": "Ctrl", + "x": 1, + "y": 2.38 + }, + { + "label": "A", + "x": 2, + "y": 2.38 + }, + { + "label": "S", + "x": 3, + "y": 2.13 + }, + { + "label": "D", + "x": 4, + "y": 2 + }, + { + "label": "F", + "x": 5, + "y": 2.13 + }, + { + "label": "G", + "x": 6, + "y": 2.25 + }, + + { + "label": "H", + "x": 10.5, + "y": 2.25 + }, + { + "label": "J", + "x": 11.5, + "y": 2.13 + }, + { + "label": "K", + "x": 12.5, + "y": 2 + }, + { + "label": "L", + "x": 13.5, + "y": 2.125 + }, + { + "label": ":;", + "x": 14.5, + "y": 2.375 + }, + { + "label": "\"'", + "x": 15.5, + "y": 2.375 + }, + + { + "label": "Alt", + "x": 1, + "y": 3.38 + }, + { + "label": "Z", + "x": 2, + "y": 3.38 + }, + { + "label": "X", + "x": 3, + "y": 3.13 + }, + { + "label": "C", + "x": 4, + "y": 3 + }, + { + "label": "V", + "x": 5, + "y": 3.13 + }, + { + "label": "B", + "x": 6, + "y": 3.25 + }, + + { + "label": "N", + "x": 10.5, + "y": 3.25 + }, + { + "label": "M", + "x": 11.5, + "y": 3.13 + }, + { + "label": "<,", + "x": 12.5, + "y": 3 + }, + { + "label": ">.", + "x": 13.5, + "y": 3.13 + }, + { + "label": "?/", + "x": 14.5, + "y": 3.38 + }, + { + "label": "|\\", + "x": 15.5, + "y": 3.38 + }, + + { + "label": "Rise", + "x": 5, + "y": 5 + }, + { + "label": "Space", + "x": 6, + "y": 5 + }, + { + "label": "Lower", + "x": 7, + "y": 4.5, + "h": 1.5 + }, + + { + "label": "Lower", + "x": 9.5, + "y": 4.5, + "h": 1.5 + }, + { + "label": "Bcs", + "x": 10.5, + "y": 5 + }, + { + "label": "Rise", + "x": 11.5, + "y": 5 + } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h index 192464c216..e913351eb0 100644 --- a/keyboards/kakunpc/angel17/alpha/config.h +++ b/keyboards/kakunpc/angel17/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 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT angel17 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json index 24a6c6be08..f3532f8fb6 100644 --- a/keyboards/kakunpc/angel17/info.json +++ b/keyboards/kakunpc/angel17/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "angel17", + "manufacturer": "kakunpc", "url": "https://kakunpc.booth.pm/", "maintainer": "kakunpc", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h index f042a089c4..107f1581d6 100644 --- a/keyboards/kakunpc/angel17/rev1/config.h +++ b/keyboards/kakunpc/angel17/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 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT angel17 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h index 4131283166..611e2f0d23 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/config.h +++ b/keyboards/kakunpc/suihankey/split/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 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT Suihankey - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 2f40949f6b..c440c905fa 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "suihankey_split", + "keyboard_name": "Suihankey", + "manufacturer": "kakunpc", "url": "https://kakunpc.booth.pm/", "maintainer": "kakunpc", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h index 83dc587e57..4e4121bf0a 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/config.h +++ b/keyboards/kakunpc/suihankey/split/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 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT Suihankey - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 4 diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h index 2b7d6e363a..5b36ee1113 100644 --- a/keyboards/kapcave/paladinpad/config.h +++ b/keyboards/kapcave/paladinpad/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B43 -#define PRODUCT_ID 0x5050 -#define MANUFACTURER KapCave -#define PRODUCT paladinpad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index 7d1afccf60..23aacf4456 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "PaladinPad", + "manufacturer": "KapCave", "url": "https://kapcave.com/products/paladinpad-pcb", "maintainer": "nachie", + "usb": { + "vid": "0x4B43", + "pid": "0x5050" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/kapcave/paladinpad/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/kapcave/paladinpad/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/kapl/info.json b/keyboards/kapl/info.json deleted file mode 100644 index 67e5470288..0000000000 --- a/keyboards/kapl/info.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "keyboard_name": "Kapl", - "url": "https://github.com/keyzog/kapl", - "maintainer": "keyzog", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"L00", "x":0, "y":0.38}, - {"label":"L01", "x":1, "y":0.38}, - {"label":"L02", "x":2, "y":0.13}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.13}, - {"label":"L05", "x":5, "y":0.25}, - {"label":"L06", "x":6, "y":0.35}, - {"label":"R00", "x":8.67, "y":0.35}, - {"label":"R01", "x":9.67, "y":0.25}, - {"label":"R02", "x":10.67, "y":0.13}, - {"label":"R03", "x":11.67, "y":0}, - {"label":"R04", "x":12.67, "y":0.13}, - {"label":"R05", "x":13.67, "y":0.38}, - {"label":"R06", "x":14.67, "y":0.38}, - - {"label":"L10", "x":0, "y":1.38}, - {"label":"L11", "x":1, "y":1.38}, - {"label":"L12", "x":2, "y":1.13}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.13}, - {"label":"L15", "x":5, "y":1.25}, - {"label":"L16", "x":6, "y":1.35}, - {"label":"R10", "x":8.67, "y":1.35}, - {"label":"R11", "x":9.67, "y":1.25}, - {"label":"R12", "x":10.67, "y":1.13}, - {"label":"R13", "x":11.67, "y":1}, - {"label":"R14", "x":12.67, "y":1.13}, - {"label":"R15", "x":13.67, "y":1.38}, - {"label":"R16", "x":14.67, "y":1.38}, - - {"label":"L20", "x":0, "y":2.38}, - {"label":"L21", "x":1, "y":2.38}, - {"label":"L22", "x":2, "y":2.13}, - {"label":"L23", "x":3, "y":2.0}, - {"label":"L24", "x":4, "y":2.13}, - {"label":"L25", "x":5, "y":2.25}, - {"label":"L26", "x":6, "y":2.35}, - {"label":"R20", "x":8.67, "y":2.35}, - {"label":"R21", "x":9.67, "y":2.25}, - {"label":"R22", "x":10.67, "y":2.13}, - {"label":"R23", "x":11.67, "y":2.0}, - {"label":"R24", "x":12.67, "y":2.13}, - {"label":"R25", "x":13.67, "y":2.38}, - {"label":"R26", "x":14.67, "y":2.38}, - - {"label":"L30", "x":0, "y":3.38}, - {"label":"L31", "x":1, "y":3.38}, - {"label":"L32", "x":2, "y":3.13}, - {"label":"L33", "x":3, "y":3.0}, - {"label":"L34", "x":4, "y":3.13}, - {"label":"L35", "x":5, "y":3.25}, - {"label":"L36", "x":6, "y":3.35}, - {"label":"R30", "x":8.67, "y":3.35}, - {"label":"R31", "x":9.67, "y":3.25}, - {"label":"R32", "x":10.67, "y":3.13}, - {"label":"R33", "x":11.67, "y":3.0}, - {"label":"R34", "x":12.67, "y":3.13}, - {"label":"R35", "x":13.67, "y":3.38}, - {"label":"R36", "x":14.67, "y":3.38}, - - {"label":"L40", "x":0, "y":4.38}, - {"label":"L41", "x":1, "y":4.38}, - {"label":"L42", "x":2, "y":4.13}, - {"label":"L43", "x":3, "y":4.0}, - {"label":"L44", "x":4, "y":4.13}, - {"label":"L45", "x":5.35, "y":4.92}, - {"label":"L46", "x":6.35, "y":4.45, "h":1.5}, - {"label":"R40", "x":8.02, "y":4.45, "h":1.5}, - {"label":"R41", "x":9.02, "y":4.92}, - {"label":"R42", "x":10.67, "y":4.13}, - {"label":"R43", "x":11.67, "y":4.0}, - {"label":"R44", "x":12.67, "y":4.13}, - {"label":"R45", "x":13.67, "y":4.38}, - {"label":"R46", "x":14.67, "y":4.38} - ] - } - } -} diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h index 4984459275..ef6e5449f6 100644 --- a/keyboards/kapl/rev1/config.h +++ b/keyboards/kapl/rev1/config.h @@ -2,14 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C41 // "LA" Lozyuk Alexander -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER keyzog -#define PRODUCT Kapl Keyboard - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 10 diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json new file mode 100644 index 0000000000..2b497b9848 --- /dev/null +++ b/keyboards/kapl/rev1/info.json @@ -0,0 +1,91 @@ +{ + "keyboard_name": "Kapl", + "manufacturer": "keyzog", + "url": "https://github.com/keyzog/kapl", + "maintainer": "keyzog", + "usb": { + "vid": "0x4C41", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"L00", "x":0, "y":0.38}, + {"label":"L01", "x":1, "y":0.38}, + {"label":"L02", "x":2, "y":0.13}, + {"label":"L03", "x":3, "y":0}, + {"label":"L04", "x":4, "y":0.13}, + {"label":"L05", "x":5, "y":0.25}, + {"label":"L06", "x":6, "y":0.35}, + {"label":"R00", "x":8.67, "y":0.35}, + {"label":"R01", "x":9.67, "y":0.25}, + {"label":"R02", "x":10.67, "y":0.13}, + {"label":"R03", "x":11.67, "y":0}, + {"label":"R04", "x":12.67, "y":0.13}, + {"label":"R05", "x":13.67, "y":0.38}, + {"label":"R06", "x":14.67, "y":0.38}, + + {"label":"L10", "x":0, "y":1.38}, + {"label":"L11", "x":1, "y":1.38}, + {"label":"L12", "x":2, "y":1.13}, + {"label":"L13", "x":3, "y":1}, + {"label":"L14", "x":4, "y":1.13}, + {"label":"L15", "x":5, "y":1.25}, + {"label":"L16", "x":6, "y":1.35}, + {"label":"R10", "x":8.67, "y":1.35}, + {"label":"R11", "x":9.67, "y":1.25}, + {"label":"R12", "x":10.67, "y":1.13}, + {"label":"R13", "x":11.67, "y":1}, + {"label":"R14", "x":12.67, "y":1.13}, + {"label":"R15", "x":13.67, "y":1.38}, + {"label":"R16", "x":14.67, "y":1.38}, + + {"label":"L20", "x":0, "y":2.38}, + {"label":"L21", "x":1, "y":2.38}, + {"label":"L22", "x":2, "y":2.13}, + {"label":"L23", "x":3, "y":2.0}, + {"label":"L24", "x":4, "y":2.13}, + {"label":"L25", "x":5, "y":2.25}, + {"label":"L26", "x":6, "y":2.35}, + {"label":"R20", "x":8.67, "y":2.35}, + {"label":"R21", "x":9.67, "y":2.25}, + {"label":"R22", "x":10.67, "y":2.13}, + {"label":"R23", "x":11.67, "y":2.0}, + {"label":"R24", "x":12.67, "y":2.13}, + {"label":"R25", "x":13.67, "y":2.38}, + {"label":"R26", "x":14.67, "y":2.38}, + + {"label":"L30", "x":0, "y":3.38}, + {"label":"L31", "x":1, "y":3.38}, + {"label":"L32", "x":2, "y":3.13}, + {"label":"L33", "x":3, "y":3.0}, + {"label":"L34", "x":4, "y":3.13}, + {"label":"L35", "x":5, "y":3.25}, + {"label":"L36", "x":6, "y":3.35}, + {"label":"R30", "x":8.67, "y":3.35}, + {"label":"R31", "x":9.67, "y":3.25}, + {"label":"R32", "x":10.67, "y":3.13}, + {"label":"R33", "x":11.67, "y":3.0}, + {"label":"R34", "x":12.67, "y":3.13}, + {"label":"R35", "x":13.67, "y":3.38}, + {"label":"R36", "x":14.67, "y":3.38}, + + {"label":"L40", "x":0, "y":4.38}, + {"label":"L41", "x":1, "y":4.38}, + {"label":"L42", "x":2, "y":4.13}, + {"label":"L43", "x":3, "y":4.0}, + {"label":"L44", "x":4, "y":4.13}, + {"label":"L45", "x":5.35, "y":4.92}, + {"label":"L46", "x":6.35, "y":4.45, "h":1.5}, + {"label":"R40", "x":8.02, "y":4.45, "h":1.5}, + {"label":"R41", "x":9.02, "y":4.92}, + {"label":"R42", "x":10.67, "y":4.13}, + {"label":"R43", "x":11.67, "y":4.0}, + {"label":"R44", "x":12.67, "y":4.13}, + {"label":"R45", "x":13.67, "y":4.38}, + {"label":"R46", "x":14.67, "y":4.38} + ] + } + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json index 7010ba59d9..34e29bca8e 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "kbd67mkiirgb", + "manufacturer": "KBDfans", "url": "", "maintainer": "moyi4681", + "usb": { + "vid": "0x4B42" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h index d88d384f98..a6a56cdced 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h @@ -1,10 +1,5 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0x4B42 // KB -#define PRODUCT_ID 0x1224 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDfans -#define PRODUCT kbd67mkiirgb v1 #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json new file mode 100644 index 0000000000..88d1bb38f4 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v1", + "usb": { + "pid": "0x1224", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h index ffdace7a5f..a5dfdae5ed 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h @@ -1,10 +1,5 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0x4B42 // KB -#define PRODUCT_ID 0x1225 -#define DEVICE_VER 0x0002 -#define MANUFACTURER KBDfans -#define PRODUCT kbd67mkiirgb v2 #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json new file mode 100644 index 0000000000..62f1bf6cbb --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v2", + "usb": { + "pid": "0x1225", + "device_version": "0.0.2" + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h index 23b0a8a30c..c03ab6da3e 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 // KB -#define PRODUCT_ID 0x1226 -#define DEVICE_VER 0x0002 -#define MANUFACTURER KBDfans -#define PRODUCT kbd67mkiirgb v3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json new file mode 100644 index 0000000000..496016ea8c --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v3", + "usb": { + "pid": "0x1226", + "device_version": "0.0.3" + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index a63a3ee61b..dc0be21b67 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 -#define PRODUCT_ID 0x1227 -#define DEVICE_VER 0x0004 -#define MANUFACTURER KBDFANS -#define PRODUCT KBD67 MKII RGB V4 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json new file mode 100644 index 0000000000..1bb937c0c2 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v4", + "usb": { + "pid": "0x1227", + "device_version": "0.0.4" + } +} diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index b54ce4d24c..40023beb03 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -5,11 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 -#define MANUFACTURER qmkbuilder -#define PRODUCT KBD75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/kbdfans/kbd75/rev1/config.h b/keyboards/kbdfans/kbd75/rev1/config.h deleted file mode 100644 index 9e036b5839..0000000000 --- a/keyboards/kbdfans/kbd75/rev1/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2020 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index 499b9e9a43..fe1541b78f 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "KBD75 rev1", + "manufacturer": "KBDfans", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4B42", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev2/config.h b/keyboards/kbdfans/kbd75/rev2/config.h deleted file mode 100644 index c65ac48677..0000000000 --- a/keyboards/kbdfans/kbd75/rev2/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2020 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define PRODUCT_ID 0x6061 -#define DEVICE_VER 0x0002 diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 8518527eed..ac07971b59 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "KBD75 rev2", + "manufacturer": "KBDfans", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4B42", + "pid": "0x6061", + "device_version": "0.0.2" + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index 2499c25933..413e33a850 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 -#define PRODUCT_ID 0x6063 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDFANS -#define PRODUCT KBD75RGB - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json new file mode 100644 index 0000000000..4c008f0310 --- /dev/null +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "KBD75RGB", + "manufacturer": "KBDfans", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4B42", + "pid": "0x6063", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kbnordic/nordic60/info.json b/keyboards/kbnordic/nordic60/info.json deleted file mode 100644 index aa5a82a002..0000000000 --- a/keyboards/kbnordic/nordic60/info.json +++ /dev/null @@ -1,361 +0,0 @@ -{ - "keyboard_name": "Nordic60 Rev A", - "url": "kbnordic.se", - "maintainer": "4pplet", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label":"`~", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, - - {"label":"Tab", "w":1.5, "x":0, "y":1}, - {"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":"\\|", "w":1.5, "x":13.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}, -