From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: [PATCH] Move matrix config to info.json, part 4 (#20001) --- keyboards/b_sides/rev41lp/config.h | 24 --------- keyboards/b_sides/rev41lp/info.json | 5 ++ keyboards/bacca70/config.h | 6 --- keyboards/bacca70/info.json | 5 ++ keyboards/baguette/config.h | 17 ------ keyboards/baguette/info.json | 5 ++ keyboards/baion_808/config.h | 6 --- keyboards/baion_808/info.json | 5 ++ keyboards/bandominedoni/config.h | 17 ------ keyboards/bandominedoni/info.json | 5 ++ keyboards/bantam44/config.h | 10 ---- keyboards/bantam44/info.json | 5 ++ keyboards/barracuda/config.h | 17 ------ keyboards/barracuda/info.json | 5 ++ keyboards/basekeys/slice/rev1/config.h | 6 --- keyboards/basekeys/slice/rev1/info.json | 5 ++ keyboards/basekeys/slice/rev1_rgb/config.h | 6 --- keyboards/basekeys/slice/rev1_rgb/info.json | 5 ++ keyboards/basekeys/trifecta/config.h | 10 ---- keyboards/basekeys/trifecta/info.json | 5 ++ keyboards/basketweave/config.h | 7 --- keyboards/basketweave/info.json | 5 ++ .../charybdis/3x5/blackpill/config.h | 6 --- .../charybdis/3x5/blackpill/info.json | 5 ++ keyboards/bastardkb/charybdis/3x5/config.h | 2 - .../charybdis/3x5/v1/elitec/config.h | 11 ---- .../charybdis/3x5/v1/elitec/info.json | 13 ++++- .../charybdis/3x5/v2/elitec/config.h | 6 --- .../charybdis/3x5/v2/elitec/info.json | 5 ++ .../charybdis/3x5/v2/splinky_2/config.h | 6 --- .../charybdis/3x5/v2/splinky_2/info.json | 5 ++ .../charybdis/3x5/v2/splinky_3/config.h | 6 --- .../charybdis/3x5/v2/splinky_3/info.json | 5 ++ .../charybdis/3x5/v2/stemcell/config.h | 6 --- .../charybdis/3x5/v2/stemcell/info.json | 5 ++ .../charybdis/3x6/blackpill/config.h | 6 --- .../charybdis/3x6/blackpill/info.json | 5 ++ keyboards/bastardkb/charybdis/3x6/config.h | 2 - .../charybdis/3x6/v1/elitec/config.h | 11 ---- .../charybdis/3x6/v1/elitec/info.json | 13 ++++- .../charybdis/3x6/v2/elitec/config.h | 6 --- .../charybdis/3x6/v2/elitec/info.json | 5 ++ .../charybdis/3x6/v2/splinky_2/config.h | 6 --- .../charybdis/3x6/v2/splinky_2/info.json | 5 ++ .../charybdis/3x6/v2/splinky_3/config.h | 6 --- .../charybdis/3x6/v2/splinky_3/info.json | 5 ++ .../charybdis/3x6/v2/stemcell/config.h | 6 --- .../charybdis/3x6/v2/stemcell/info.json | 5 ++ .../charybdis/4x6/blackpill/config.h | 6 --- .../charybdis/4x6/blackpill/info.json | 5 ++ keyboards/bastardkb/charybdis/4x6/config.h | 2 - .../charybdis/4x6/v1/elitec/config.h | 11 ---- .../charybdis/4x6/v1/elitec/info.json | 13 ++++- .../charybdis/4x6/v2/elitec/config.h | 6 --- .../charybdis/4x6/v2/elitec/info.json | 5 ++ .../charybdis/4x6/v2/splinky_2/config.h | 6 --- .../charybdis/4x6/v2/splinky_2/info.json | 5 ++ .../charybdis/4x6/v2/splinky_3/config.h | 6 --- .../charybdis/4x6/v2/splinky_3/info.json | 5 ++ .../charybdis/4x6/v2/stemcell/config.h | 6 --- .../charybdis/4x6/v2/stemcell/info.json | 5 ++ .../dilemma/3x5_2/assembled/config.h | 6 --- .../dilemma/3x5_2/assembled/info.json | 5 ++ .../bastardkb/dilemma/3x5_2/splinky/config.h | 6 --- .../bastardkb/dilemma/3x5_2/splinky/info.json | 5 ++ keyboards/bastardkb/dilemma/3x5_3/config.h | 6 --- keyboards/bastardkb/dilemma/3x5_3/info.json | 5 ++ keyboards/bastardkb/dilemma/config.h | 3 -- keyboards/bastardkb/scylla/blackpill/config.h | 6 --- .../bastardkb/scylla/blackpill/info.json | 5 ++ keyboards/bastardkb/scylla/config.h | 3 -- keyboards/bastardkb/scylla/v1/elitec/config.h | 6 --- .../bastardkb/scylla/v1/elitec/info.json | 5 ++ keyboards/bastardkb/scylla/v2/elitec/config.h | 6 --- .../bastardkb/scylla/v2/elitec/info.json | 5 ++ .../bastardkb/scylla/v2/splinky_2/config.h | 6 --- .../bastardkb/scylla/v2/splinky_2/info.json | 5 ++ .../bastardkb/scylla/v2/splinky_3/config.h | 6 --- .../bastardkb/scylla/v2/splinky_3/info.json | 5 ++ .../bastardkb/scylla/v2/stemcell/config.h | 6 --- .../bastardkb/scylla/v2/stemcell/info.json | 5 ++ .../bastardkb/skeletyl/blackpill/config.h | 6 --- .../bastardkb/skeletyl/blackpill/info.json | 5 ++ keyboards/bastardkb/skeletyl/config.h | 3 -- .../bastardkb/skeletyl/v1/elitec/config.h | 6 --- .../bastardkb/skeletyl/v1/elitec/info.json | 5 ++ .../bastardkb/skeletyl/v2/elitec/config.h | 6 --- .../bastardkb/skeletyl/v2/elitec/info.json | 5 ++ .../bastardkb/skeletyl/v2/splinky_2/config.h | 6 --- .../bastardkb/skeletyl/v2/splinky_2/info.json | 5 ++ .../bastardkb/skeletyl/v2/splinky_3/config.h | 6 --- .../bastardkb/skeletyl/v2/splinky_3/info.json | 5 ++ .../bastardkb/skeletyl/v2/stemcell/config.h | 6 --- .../bastardkb/skeletyl/v2/stemcell/info.json | 5 ++ keyboards/bastardkb/tbk/config.h | 4 -- keyboards/bastardkb/tbk/info.json | 5 ++ .../bastardkb/tbkmini/blackpill/config.h | 6 --- .../bastardkb/tbkmini/blackpill/info.json | 5 ++ keyboards/bastardkb/tbkmini/config.h | 3 -- .../bastardkb/tbkmini/v1/elitec/config.h | 6 --- .../bastardkb/tbkmini/v1/elitec/info.json | 5 ++ .../bastardkb/tbkmini/v2/elitec/config.h | 6 --- .../bastardkb/tbkmini/v2/elitec/info.json | 5 ++ .../bastardkb/tbkmini/v2/splinky_2/config.h | 6 --- .../bastardkb/tbkmini/v2/splinky_2/info.json | 5 ++ .../bastardkb/tbkmini/v2/splinky_3/config.h | 6 --- .../bastardkb/tbkmini/v2/splinky_3/info.json | 5 ++ .../bastardkb/tbkmini/v2/stemcell/config.h | 6 --- .../bastardkb/tbkmini/v2/stemcell/info.json | 5 ++ keyboards/bbrfkr/dynamis/config.h | 7 --- keyboards/bbrfkr/dynamis/info.json | 5 ++ keyboards/bear_face/config.h | 8 --- keyboards/bear_face/info.json | 5 ++ keyboards/beatervan/config.h | 17 ------ keyboards/beatervan/info.json | 5 ++ keyboards/bemeier/bmek/config.h | 2 - keyboards/bemeier/bmek/rev1/config.h | 5 -- keyboards/bemeier/bmek/rev1/info.json | 5 ++ keyboards/bemeier/bmek/rev2/config.h | 6 --- keyboards/bemeier/bmek/rev2/info.json | 5 ++ keyboards/bemeier/bmek/rev3/config.h | 6 --- keyboards/bemeier/bmek/rev3/info.json | 5 ++ keyboards/bfake/config.h | 5 -- keyboards/bfake/info.json | 5 ++ keyboards/biacco42/ergo42/rev1/config.h | 9 ---- keyboards/biacco42/ergo42/rev1/info.json | 5 ++ keyboards/biacco42/meishi/config.h | 17 ------ keyboards/biacco42/meishi/info.json | 5 ++ keyboards/biacco42/meishi2/config.h | 17 ------ keyboards/biacco42/meishi2/info.json | 5 ++ keyboards/binepad/bn003/config.h | 7 --- keyboards/binepad/bn003/info.json | 5 ++ keyboards/binepad/bn009/config.h | 7 --- keyboards/binepad/bn009/info.json | 5 ++ keyboards/bioi/f60/config.h | 8 --- keyboards/bioi/f60/info.json | 5 ++ keyboards/bioi/g60/config.h | 18 ------- keyboards/bioi/g60/info.json | 5 ++ keyboards/bioi/g60ble/config.h | 10 ---- keyboards/bioi/g60ble/info.json | 5 ++ keyboards/bioi/morgan65/config.h | 18 ------- keyboards/bioi/morgan65/info.json | 5 ++ keyboards/bioi/s65/config.h | 18 ------- keyboards/bioi/s65/info.json | 5 ++ keyboards/blackplum/config.h | 7 --- keyboards/blackplum/info.json | 5 ++ keyboards/blank/blank01/config.h | 17 ------ keyboards/blank/blank01/info.json | 5 ++ keyboards/blank_tehnologii/manibus/config.h | 9 ---- keyboards/blank_tehnologii/manibus/info.json | 13 ++++- keyboards/blaster75/config.h | 27 ---------- keyboards/blaster75/info.json | 5 ++ keyboards/blockey/config.h | 17 ------ keyboards/blockey/info.json | 5 ++ keyboards/bluebell/swoop/config.h | 5 -- keyboards/bluebell/swoop/info.json | 5 ++ keyboards/boardrun/bizarre/config.h | 17 ------ keyboards/boardrun/bizarre/info.json | 5 ++ keyboards/boardrun/classic/config.h | 17 ------ keyboards/boardrun/classic/info.json | 5 ++ keyboards/boardwalk/config.h | 17 ------ keyboards/boardwalk/info.json | 5 ++ keyboards/bobpad/config.h | 33 ------------ keyboards/bobpad/info.json | 5 ++ keyboards/bolsa/bolsalice/config.h | 6 --- keyboards/bolsa/bolsalice/info.json | 5 ++ keyboards/bolsa/damapad/config.h | 38 -------------- keyboards/bolsa/damapad/info.json | 5 ++ keyboards/bop/config.h | 10 ---- keyboards/bop/info.json | 5 ++ keyboards/boston/config.h | 6 --- keyboards/boston/info.json | 5 ++ keyboards/boston_meetup/2019/config.h | 28 ---------- keyboards/boston_meetup/2019/info.json | 5 ++ keyboards/boston_meetup/config.h | 40 -------------- keyboards/box75/config.h | 4 -- keyboards/box75/info.json | 5 ++ keyboards/bpiphany/four_banger/config.h | 8 --- keyboards/bpiphany/four_banger/info.json | 5 ++ keyboards/bpiphany/kitten_paw/config.h | 16 ------ keyboards/bt66tech/bt66tech60/config.h | 4 -- keyboards/bt66tech/bt66tech60/info.json | 5 ++ keyboards/bthlabs/geekpad/config.h | 51 ------------------ keyboards/bthlabs/geekpad/info.json | 5 ++ keyboards/bubble75/hotswap/config.h | 6 --- keyboards/bubble75/hotswap/info.json | 5 ++ keyboards/buildakb/potato65/config.h | 17 ------ keyboards/buildakb/potato65/info.json | 5 ++ keyboards/buildakb/potato65hs/config.h | 8 --- keyboards/buildakb/potato65hs/info.json | 5 ++ keyboards/buildakb/potato65s/config.h | 8 --- keyboards/buildakb/potato65s/info.json | 5 ++ keyboards/buzzard/rev1/config.h | 9 ---- keyboards/buzzard/rev1/info.json | 5 ++ keyboards/dailycraft/bat43/config.h | 51 ------------------ keyboards/dailycraft/bat43/info.json | 5 ++ keyboards/dailycraft/claw44/rev1/config.h | 39 -------------- keyboards/dailycraft/claw44/rev1/info.json | 5 ++ keyboards/dailycraft/sandbox/rev1/config.h | 17 ------ keyboards/dailycraft/sandbox/rev1/info.json | 5 ++ keyboards/dailycraft/sandbox/rev2/config.h | 17 ------ keyboards/dailycraft/sandbox/rev2/info.json | 5 ++ keyboards/dailycraft/wings42/rev1/config.h | 17 ------ keyboards/dailycraft/wings42/rev1/info.json | 5 ++ .../dailycraft/wings42/rev1_extkeys/config.h | 17 ------ .../dailycraft/wings42/rev1_extkeys/info.json | 5 ++ keyboards/dailycraft/wings42/rev2/config.h | 17 ------ keyboards/dailycraft/wings42/rev2/info.json | 5 ++ keyboards/daji/seis_cinco/config.h | 10 ---- keyboards/daji/seis_cinco/info.json | 5 ++ keyboards/db/db63/config.h | 5 -- keyboards/db/db63/info.json | 5 ++ keyboards/delikeeb/flatbread60/config.h | 17 ------ keyboards/delikeeb/flatbread60/info.json | 5 ++ keyboards/delikeeb/vaguettelite/config.h | 17 ------ keyboards/delikeeb/vaguettelite/info.json | 5 ++ keyboards/delikeeb/vanana/rev1/config.h | 16 ------ keyboards/delikeeb/vanana/rev1/info.json | 5 ++ keyboards/delikeeb/vanana/rev2/config.h | 16 ------ keyboards/delikeeb/vanana/rev2/info.json | 5 ++ keyboards/delikeeb/vaneela/config.h | 17 ------ keyboards/delikeeb/vaneela/info.json | 5 ++ keyboards/delikeeb/vaneelaex/config.h | 17 ------ keyboards/delikeeb/vaneelaex/info.json | 5 ++ keyboards/delikeeb/waaffle/rev3/config.h | 16 ------ keyboards/delikeeb/waaffle/rev3/info.json | 5 ++ keyboards/deltapad/config.h | 17 ------ keyboards/deltapad/info.json | 5 ++ keyboards/deltasplit75/v2/config.h | 8 --- keyboards/deltasplit75/v2/info.json | 5 ++ keyboards/demiurge/config.h | 8 --- keyboards/demiurge/info.json | 5 ++ keyboards/deng/djam/config.h | 5 -- keyboards/deng/djam/info.json | 5 ++ keyboards/deng/thirty/config.h | 6 --- keyboards/deng/thirty/info.json | 5 ++ keyboards/dinofizz/fnrow/v1/config.h | 24 --------- keyboards/dinofizz/fnrow/v1/info.json | 5 ++ keyboards/dk60/config.h | 17 ------ keyboards/dk60/info.json | 5 ++ keyboards/dm9records/ergoinu/config.h | 8 --- keyboards/dm9records/ergoinu/info.json | 5 ++ keyboards/dm9records/lain/config.h | 12 ----- keyboards/dm9records/lain/info.json | 5 ++ keyboards/dm9records/plaid/config.h | 17 ------ keyboards/dm9records/plaid/info.json | 5 ++ keyboards/dm9records/tartan/config.h | 17 ------ keyboards/dm9records/tartan/info.json | 5 ++ keyboards/dmqdesign/spin/config.h | 9 ---- keyboards/dmqdesign/spin/info.json | 5 ++ keyboards/do60/config.h | 17 ------ keyboards/do60/info.json | 5 ++ keyboards/doio/kb16/rev1/config.h | 8 --- keyboards/doio/kb16/rev1/info.json | 5 ++ keyboards/doio/kb16/rev2/config.h | 8 --- keyboards/doio/kb16/rev2/info.json | 5 ++ keyboards/doio/kb30/config.h | 5 -- keyboards/doio/kb30/info.json | 5 ++ keyboards/donutcables/budget96/config.h | 5 -- keyboards/donutcables/budget96/info.json | 5 ++ keyboards/donutcables/scrabblepad/config.h | 17 ------ keyboards/donutcables/scrabblepad/info.json | 5 ++ keyboards/doodboard/duckboard/config.h | 8 --- keyboards/doodboard/duckboard/info.json | 5 ++ keyboards/doodboard/duckboard_r2/config.h | 8 --- keyboards/doodboard/duckboard_r2/info.json | 5 ++ keyboards/doppelganger/config.h | 20 ------- keyboards/doppelganger/info.json | 13 ++++- keyboards/doro67/multi/config.h | 17 ------ keyboards/doro67/multi/info.json | 5 ++ keyboards/doro67/regular/config.h | 17 ------ keyboards/doro67/regular/info.json | 5 ++ keyboards/doro67/rgb/config.h | 17 ------ keyboards/doro67/rgb/info.json | 5 ++ keyboards/draculad/config.h | 6 --- keyboards/draculad/info.json | 5 ++ keyboards/draytronics/daisy/config.h | 17 ------ keyboards/draytronics/daisy/info.json | 5 ++ keyboards/draytronics/elise/config.h | 17 ------ keyboards/draytronics/elise/info.json | 5 ++ keyboards/draytronics/elise_v2/config.h | 17 ------ keyboards/draytronics/elise_v2/info.json | 5 ++ keyboards/draytronics/scarlet/config.h | 18 ------- keyboards/draytronics/scarlet/info.json | 5 ++ keyboards/drewkeys/iskar/config.h | 8 --- keyboards/drewkeys/iskar/info.json | 5 ++ keyboards/drhigsby/bkf/config.h | 19 ------- keyboards/drhigsby/bkf/info.json | 5 ++ keyboards/drhigsby/dubba175/config.h | 19 ------- keyboards/drhigsby/dubba175/info.json | 5 ++ keyboards/drhigsby/ogurec/config.h | 19 ------- keyboards/drhigsby/ogurec/info.json | 5 ++ keyboards/drhigsby/packrat/config.h | 19 ------- keyboards/drhigsby/packrat/info.json | 5 ++ keyboards/dtisaac/cg108/config.h | 18 ------- keyboards/dtisaac/cg108/info.json | 5 ++ keyboards/dtisaac/dosa40rgb/config.h | 17 ------ keyboards/dtisaac/dosa40rgb/info.json | 5 ++ keyboards/dtisaac/dtisaac01/config.h | 35 ------------- keyboards/dtisaac/dtisaac01/info.json | 5 ++ keyboards/ducky/one2mini/1861st/config.h | 16 ------ keyboards/ducky/one2mini/1861st/info.json | 5 ++ keyboards/ducky/one2sf/1967st/config.h | 16 ------ keyboards/ducky/one2sf/1967st/info.json | 5 ++ keyboards/dumbo/config.h | 8 --- keyboards/dumbo/info.json | 5 ++ keyboards/dumbpad/config.h | 4 -- keyboards/dumbpad/v0x/config.h | 5 -- keyboards/dumbpad/v0x/info.json | 5 ++ keyboards/dumbpad/v0x_dualencoder/config.h | 5 -- keyboards/dumbpad/v0x_dualencoder/info.json | 5 ++ keyboards/dumbpad/v0x_right/config.h | 4 -- keyboards/dumbpad/v0x_right/info.json | 5 ++ keyboards/dumbpad/v1x/config.h | 5 -- keyboards/dumbpad/v1x/info.json | 5 ++ keyboards/dumbpad/v1x_dualencoder/config.h | 5 -- keyboards/dumbpad/v1x_dualencoder/info.json | 5 ++ keyboards/dumbpad/v1x_oled/config.h | 8 --- keyboards/dumbpad/v1x_oled/info.json | 5 ++ keyboards/dumbpad/v1x_right/config.h | 5 -- keyboards/dumbpad/v1x_right/info.json | 5 ++ keyboards/dumbpad/v3x/config.h | 4 -- keyboards/dumbpad/v3x/info.json | 5 ++ keyboards/durgod/dgk6x/config.h | 3 -- keyboards/durgod/dgk6x/galaxy/config.h | 7 --- keyboards/durgod/dgk6x/galaxy/info.json | 5 ++ keyboards/durgod/dgk6x/hades/config.h | 7 --- keyboards/durgod/dgk6x/hades/info.json | 5 ++ keyboards/durgod/dgk6x/venus/config.h | 7 --- keyboards/durgod/dgk6x/venus/info.json | 5 ++ keyboards/durgod/k310/base/config.h | 6 --- keyboards/durgod/k310/base/info.json | 5 ++ keyboards/durgod/k320/base/config.h | 6 --- keyboards/durgod/k320/base/info.json | 5 ++ keyboards/dz60/config.h | 17 ------ keyboards/dz60/info.json | 5 ++ keyboards/dztech/bocc/config.h | 17 ------ keyboards/dztech/bocc/info.json | 5 ++ keyboards/dztech/duo_s/config.h | 6 --- keyboards/dztech/duo_s/info.json | 5 ++ keyboards/dztech/dz60rgb/v1/config.h | 16 ------ keyboards/dztech/dz60rgb/v1/info.json | 5 ++ keyboards/dztech/dz60rgb/v2/config.h | 16 ------ keyboards/dztech/dz60rgb/v2/info.json | 5 ++ keyboards/dztech/dz60rgb/v2_1/config.h | 16 ------ keyboards/dztech/dz60rgb/v2_1/info.json | 5 ++ keyboards/dztech/dz60rgb_ansi/v1/config.h | 16 ------ keyboards/dztech/dz60rgb_ansi/v1/info.json | 5 ++ keyboards/dztech/dz60rgb_ansi/v2/config.h | 16 ------ keyboards/dztech/dz60rgb_ansi/v2/info.json | 5 ++ keyboards/dztech/dz60rgb_ansi/v2_1/config.h | 16 ------ keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 5 ++ keyboards/dztech/dz60rgb_wkl/v1/config.h | 16 ------ keyboards/dztech/dz60rgb_wkl/v1/info.json | 5 ++ keyboards/dztech/dz60rgb_wkl/v2/config.h | 16 ------ keyboards/dztech/dz60rgb_wkl/v2/info.json | 5 ++ keyboards/dztech/dz60rgb_wkl/v2_1/config.h | 16 ------ keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 5 ++ keyboards/dztech/dz64rgb/config.h | 5 -- keyboards/dztech/dz64rgb/info.json | 5 ++ keyboards/dztech/dz65rgb/v1/config.h | 16 ------ keyboards/dztech/dz65rgb/v1/info.json | 5 ++ keyboards/dztech/dz65rgb/v2/config.h | 16 ------ keyboards/dztech/dz65rgb/v2/info.json | 5 ++ keyboards/dztech/dz65rgb/v3/config.h | 7 --- keyboards/dztech/dz65rgb/v3/info.json | 5 ++ keyboards/dztech/dz96/config.h | 25 --------- keyboards/dztech/dz96/info.json | 5 ++ keyboards/dztech/endless80/config.h | 4 -- keyboards/dztech/endless80/info.json | 5 ++ keyboards/p3d/glitch/config.h | 19 ------- keyboards/p3d/glitch/info.json | 5 ++ keyboards/pabile/p18/config.h | 27 ---------- keyboards/pabile/p18/info.json | 5 ++ keyboards/pabile/p20/ver1/config.h | 26 ---------- keyboards/pabile/p20/ver1/info.json | 5 ++ keyboards/pabile/p20/ver2/config.h | 26 ---------- keyboards/pabile/p20/ver2/info.json | 5 ++ keyboards/pabile/p40/config.h | 32 ------------ keyboards/pabile/p40/info.json | 5 ++ keyboards/pabile/p40_ortho/config.h | 27 ---------- keyboards/pabile/p40_ortho/info.json | 5 ++ keyboards/pabile/p42/config.h | 32 ------------ keyboards/pabile/p42/info.json | 5 ++ keyboards/palette1202/config.h | 7 --- keyboards/palette1202/info.json | 5 ++ keyboards/panc40/config.h | 8 --- keyboards/panc40/info.json | 5 ++ keyboards/panc60/config.h | 5 -- keyboards/panc60/info.json | 5 ++ .../papercranekeyboards/gerald65/config.h | 17 ------ .../papercranekeyboards/gerald65/info.json | 5 ++ keyboards/paprikman/albacore/config.h | 17 ------ keyboards/paprikman/albacore/info.json | 5 ++ .../parallel/parallel_65/hotswap/config.h | 17 ------ .../parallel/parallel_65/hotswap/info.json | 5 ++ .../parallel/parallel_65/soldered/config.h | 17 ------ .../parallel/parallel_65/soldered/info.json | 5 ++ keyboards/pdxkbc/config.h | 17 ------ keyboards/pdxkbc/info.json | 5 ++ keyboards/pearl/config.h | 5 -- keyboards/pearl/info.json | 5 ++ keyboards/pearlboards/atlas/config.h | 17 ------ keyboards/pearlboards/atlas/info.json | 5 ++ keyboards/pearlboards/pandora/config.h | 17 ------ keyboards/pearlboards/pandora/info.json | 5 ++ keyboards/pearlboards/pearl/config.h | 17 ------ keyboards/pearlboards/pearl/info.json | 5 ++ keyboards/pearlboards/zeus/config.h | 17 ------ keyboards/pearlboards/zeus/info.json | 5 ++ keyboards/pearlboards/zeuspad/config.h | 17 ------ keyboards/pearlboards/zeuspad/info.json | 5 ++ keyboards/peej/lumberjack/config.h | 7 --- keyboards/peej/lumberjack/info.json | 5 ++ keyboards/peej/rosaline/config.h | 7 --- keyboards/peej/rosaline/ortho/info.json | 5 ++ keyboards/peej/rosaline/staggered/info.json | 5 ++ keyboards/peej/tripel/config.h | 23 -------- keyboards/peej/tripel/info.json | 5 ++ keyboards/pegasus/config.h | 18 ------- keyboards/pegasus/info.json | 5 ++ keyboards/percent/booster/config.h | 6 --- keyboards/percent/booster/info.json | 5 ++ keyboards/percent/canoe/config.h | 5 -- keyboards/percent/canoe/info.json | 5 ++ keyboards/percent/canoe_gen2/config.h | 9 ---- keyboards/percent/canoe_gen2/info.json | 5 ++ keyboards/percent/skog/config.h | 4 -- keyboards/percent/skog/info.json | 5 ++ keyboards/percent/skog_lite/config.h | 6 --- keyboards/percent/skog_lite/info.json | 5 ++ keyboards/phage_studio/pila87/config.h | 8 --- keyboards/phage_studio/pila87/info.json | 5 ++ keyboards/phantom/config.h | 17 ------ keyboards/phantom/info.json | 5 ++ .../phase_studio/titan65/hotswap/config.h | 16 ------ .../phase_studio/titan65/hotswap/info.json | 5 ++ .../phase_studio/titan65/soldered/config.h | 33 ------------ .../phase_studio/titan65/soldered/info.json | 5 ++ keyboards/phoenix/config.h | 5 -- keyboards/phoenix/info.json | 5 ++ keyboards/phrygian/ph100/config.h | 24 --------- keyboards/phrygian/ph100/info.json | 5 ++ keyboards/pico/65keys/config.h | 9 ---- keyboards/pico/65keys/info.json | 5 ++ keyboards/pico/70keys/config.h | 9 ---- keyboards/pico/70keys/info.json | 5 ++ keyboards/picolab/frusta_fundamental/config.h | 11 ---- .../picolab/frusta_fundamental/info.json | 5 ++ keyboards/pimentoso/paddino02/rev1/config.h | 8 --- keyboards/pimentoso/paddino02/rev1/info.json | 5 ++ .../pimentoso/paddino02/rev2/left/config.h | 8 --- .../pimentoso/paddino02/rev2/left/info.json | 5 ++ .../pimentoso/paddino02/rev2/right/config.h | 8 --- .../pimentoso/paddino02/rev2/right/info.json | 5 ++ keyboards/pimentoso/touhoupad/config.h | 6 --- keyboards/pimentoso/touhoupad/info.json | 5 ++ keyboards/pinky/3/config.h | 52 ------------------- keyboards/pinky/3/info.json | 5 ++ keyboards/pinky/4/config.h | 52 ------------------- keyboards/pinky/4/info.json | 5 ++ keyboards/pisces/config.h | 16 ------ keyboards/pisces/info.json | 5 ++ keyboards/pixelspace/capsule65i/config.h | 16 ------ keyboards/pixelspace/capsule65i/info.json | 5 ++ keyboards/pizzakeyboards/pizza65/config.h | 5 -- keyboards/pizzakeyboards/pizza65/info.json | 5 ++ keyboards/pjb/eros/config.h | 23 -------- keyboards/pjb/eros/info.json | 5 ++ keyboards/pkb65/config.h | 8 --- keyboards/pkb65/info.json | 5 ++ keyboards/planck/config.h | 8 --- keyboards/planck/ez/config.h | 17 ------ keyboards/planck/ez/info.json | 5 ++ keyboards/planck/light/config.h | 9 ---- keyboards/planck/light/info.json | 5 ++ keyboards/planck/rev1/info.json | 5 ++ keyboards/planck/rev2/info.json | 5 ++ keyboards/planck/rev3/info.json | 5 ++ keyboards/planck/rev4/info.json | 5 ++ keyboards/planck/rev5/info.json | 5 ++ keyboards/planck/rev6/config.h | 17 ------ keyboards/planck/rev6/info.json | 5 ++ keyboards/planck/rev6_drop/config.h | 19 ------- keyboards/planck/rev6_drop/info.json | 5 ++ keyboards/planck/thk/config.h | 8 --- keyboards/planck/thk/info.json | 5 ++ keyboards/playkbtw/ca66/config.h | 8 --- keyboards/playkbtw/ca66/info.json | 5 ++ keyboards/playkbtw/helen80/config.h | 16 ------ keyboards/playkbtw/helen80/info.json | 5 ++ keyboards/playkbtw/pk60/config.h | 8 --- keyboards/playkbtw/pk60/info.json | 5 ++ keyboards/playkbtw/pk64rgb/config.h | 17 ------ keyboards/playkbtw/pk64rgb/info.json | 5 ++ keyboards/pluckey/config.h | 14 ----- keyboards/pluckey/info.json | 5 ++ keyboards/plume/plume65/config.h | 17 ------ keyboards/plume/plume65/info.json | 5 ++ keyboards/plut0nium/0x3e/config.h | 10 ---- keyboards/plut0nium/0x3e/info.json | 5 ++ keyboards/plx/config.h | 27 ---------- keyboards/plx/info.json | 5 ++ keyboards/plywrks/ahgase/config.h | 17 ------ keyboards/plywrks/ahgase/info.json | 5 ++ keyboards/plywrks/lune/config.h | 17 ------ keyboards/plywrks/lune/info.json | 5 ++ keyboards/pohjolaworks/louhi/config.h | 17 ------ keyboards/pohjolaworks/louhi/info.json | 5 ++ keyboards/poker87c/config.h | 16 ------ keyboards/poker87c/info.json | 5 ++ keyboards/poker87d/config.h | 16 ------ keyboards/poker87d/info.json | 5 ++ keyboards/polilla/info.json | 5 ++ keyboards/polilla/rev1/config.h | 17 ------ keyboards/polycarbdiet/s20/config.h | 8 --- keyboards/polycarbdiet/s20/info.json | 5 ++ keyboards/pom_keyboards/tnln95/config.h | 17 ------ keyboards/pom_keyboards/tnln95/info.json | 5 ++ keyboards/portal_66/hotswap/config.h | 17 ------ keyboards/portal_66/hotswap/info.json | 5 ++ keyboards/portal_66/soldered/config.h | 17 ------ keyboards/portal_66/soldered/info.json | 5 ++ keyboards/pos78/config.h | 16 ------ keyboards/pos78/info.json | 5 ++ keyboards/preonic/config.h | 8 --- keyboards/preonic/rev1/info.json | 5 ++ keyboards/preonic/rev2/info.json | 5 ++ keyboards/preonic/rev3/config.h | 5 -- keyboards/preonic/rev3/info.json | 5 ++ keyboards/preonic/rev3_drop/config.h | 5 -- keyboards/preonic/rev3_drop/info.json | 5 ++ keyboards/primekb/meridian/config.h | 4 -- keyboards/primekb/meridian/info.json | 5 ++ keyboards/primekb/meridian_rgb/config.h | 6 --- keyboards/primekb/meridian_rgb/info.json | 5 ++ keyboards/primekb/prime_e/config.h | 8 --- keyboards/primekb/prime_e/info.json | 5 ++ keyboards/primekb/prime_l/config.h | 4 -- keyboards/primekb/prime_l/v1/config.h | 24 --------- keyboards/primekb/prime_l/v1/info.json | 5 ++ keyboards/primekb/prime_l/v2/config.h | 23 -------- keyboards/primekb/prime_l/v2/info.json | 5 ++ keyboards/primekb/prime_m/config.h | 8 --- keyboards/primekb/prime_m/info.json | 5 ++ keyboards/primekb/prime_o/config.h | 8 --- keyboards/primekb/prime_o/info.json | 5 ++ keyboards/primekb/prime_r/config.h | 8 --- keyboards/primekb/prime_r/info.json | 5 ++ keyboards/program_yoink/config.h | 17 ------ keyboards/program_yoink/ortho/info.json | 5 ++ keyboards/program_yoink/staggered/info.json | 5 ++ keyboards/projectcain/relic/config.h | 16 ------ keyboards/projectcain/relic/info.json | 5 ++ keyboards/projectcain/vault35/config.h | 17 ------ keyboards/projectcain/vault35/info.json | 5 ++ keyboards/projectcain/vault45/config.h | 17 ------ keyboards/projectcain/vault45/info.json | 5 ++ keyboards/projectkb/alice/rev1/config.h | 4 -- keyboards/projectkb/alice/rev1/info.json | 7 +++ keyboards/projectkb/alice/rev2/config.h | 4 -- keyboards/projectkb/alice/rev2/info.json | 7 +++ keyboards/projectkb/signature65/config.h | 6 --- keyboards/projectkb/signature65/info.json | 5 ++ keyboards/projectkb/signature87/config.h | 5 -- keyboards/projectkb/signature87/info.json | 5 ++ keyboards/prototypist/allison/config.h | 17 ------ keyboards/prototypist/allison/info.json | 5 ++ keyboards/prototypist/allison_numpad/config.h | 17 ------ .../prototypist/allison_numpad/info.json | 5 ++ keyboards/prototypist/j01/config.h | 17 ------ keyboards/prototypist/j01/info.json | 5 ++ keyboards/protozoa/cassini/config.h | 7 --- keyboards/protozoa/cassini/info.json | 5 ++ keyboards/protozoa/p01/config.h | 7 --- keyboards/protozoa/p01/info.json | 5 ++ keyboards/psuieee/pluto12/config.h | 8 --- keyboards/psuieee/pluto12/info.json | 5 ++ keyboards/pteron36/config.h | 17 ------ keyboards/pteron36/info.json | 5 ++ keyboards/puck/config.h | 7 --- keyboards/puck/info.json | 5 ++ keyboards/punk75/config.h | 16 ------ keyboards/punk75/info.json | 5 ++ 584 files changed, 1484 insertions(+), 3703 deletions(-) delete mode 100644 keyboards/b_sides/rev41lp/config.h delete mode 100644 keyboards/blaster75/config.h delete mode 100644 keyboards/bobpad/config.h delete mode 100644 keyboards/bolsa/damapad/config.h delete mode 100644 keyboards/boston_meetup/config.h delete mode 100644 keyboards/bthlabs/geekpad/config.h delete mode 100644 keyboards/dailycraft/bat43/config.h delete mode 100644 keyboards/dailycraft/claw44/rev1/config.h delete mode 100644 keyboards/dinofizz/fnrow/v1/config.h delete mode 100644 keyboards/doro67/multi/config.h delete mode 100644 keyboards/doro67/regular/config.h delete mode 100644 keyboards/dtisaac/dtisaac01/config.h delete mode 100644 keyboards/dztech/dz96/config.h delete mode 100644 keyboards/pabile/p18/config.h delete mode 100644 keyboards/pabile/p20/ver1/config.h delete mode 100644 keyboards/pabile/p20/ver2/config.h delete mode 100644 keyboards/pabile/p40/config.h delete mode 100644 keyboards/pabile/p40_ortho/config.h delete mode 100644 keyboards/pabile/p42/config.h delete mode 100644 keyboards/peej/tripel/config.h delete mode 100644 keyboards/phase_studio/titan65/soldered/config.h delete mode 100644 keyboards/phrygian/ph100/config.h delete mode 100644 keyboards/pinky/3/config.h delete mode 100644 keyboards/pinky/4/config.h delete mode 100644 keyboards/pjb/eros/config.h delete mode 100644 keyboards/plx/config.h delete mode 100644 keyboards/primekb/prime_l/v1/config.h delete mode 100644 keyboards/primekb/prime_l/v2/config.h create mode 100644 keyboards/projectkb/alice/rev1/info.json create mode 100644 keyboards/projectkb/alice/rev2/info.json diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/config.h deleted file mode 100644 index 0b644bec4a1..00000000000 --- a/keyboards/b_sides/rev41lp/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 @cyril279 - -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 { F4, B2, F5, B3, F6, B1, F7 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json index c0a5fd3365d..3b5807f621c 100644 --- a/keyboards/b_sides/rev41lp/info.json +++ b/keyboards/b_sides/rev41lp/info.json @@ -8,6 +8,11 @@ "pid": "0x5F10", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "B2", "F5", "B3", "F6", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7, diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h index a093c267a90..0c56f57b207 100644 --- a/keyboards/bacca70/config.h +++ b/keyboards/bacca70/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -// 0 1 2 3 4 5 6 7 8 9 A B -#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 } -#define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 } -#define DIODE_DIRECTION COL2ROW - /* 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/bacca70/info.json b/keyboards/bacca70/info.json index 8cff2b90605..737ea0b4fd1 100644 --- a/keyboards/bacca70/info.json +++ b/keyboards/bacca70/info.json @@ -8,6 +8,11 @@ "pid": "0x6970", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"], + "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h index c4bc59fe7c1..3005d1bcfbb 100644 --- a/keyboards/baguette/config.h +++ b/keyboards/baguette/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B2, B1, E6, D6 } -#define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, B0, D0, D1, D2, D3, D5, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/baguette/info.json b/keyboards/baguette/info.json index 2714366c0e3..c691bb4ffef 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/info.json @@ -8,6 +8,11 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"], + "rows": ["B3", "B2", "B1", "E6", "D6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/baion_808/config.h b/keyboards/baion_808/config.h index 92efc6d1e5d..6f884a14281 100755 --- a/keyboards/baion_808/config.h +++ b/keyboards/baion_808/config.h @@ -17,11 +17,5 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 } -#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json index 982bb670561..088f0737bf3 100755 --- a/keyboards/baion_808/info.json +++ b/keyboards/baion_808/info.json @@ -8,6 +8,11 @@ "pid": "0x4238", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], + "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "scroll_lock": "B7", diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index 7a25216afdd..df9c7cf5fc7 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h @@ -15,29 +15,12 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4, D7, F6, C6, D4 } -#define MATRIX_COL_PINS { D1, E6, F7, B1, B3, B2, D0 } - #define MASTER_RIGHT #ifndef MASTER_RIGHT // SPLIT_HAND_MATRIX_GRID was initially designed to use with left hand side diode D35 mounted and not pressing K7 on the right hand side during boot. However when a USB cable is reconnected immediately, it fails. Decided to use "MASTER_RIGHT" to make it more reliable. # define SPLIT_HAND_MATRIX_GRID B5, D0 #endif -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define RGB_DI_PIN D3 diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index d0d470a4e47..f176e18d228 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -8,6 +8,11 @@ "pid": "0xF4B5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"], + "rows": ["B5", "B4", "D7", "F6", "C6", "D4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2", "encoder": { diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h index f979b1b4ba4..b9449c4714b 100644 --- a/keyboards/bantam44/config.h +++ b/keyboards/bantam44/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -// Planck PCB default pin-out -// Change this to how you wired your keyboard -// COLS: Left to right, ROWS: Top to bottom -#define MATRIX_ROW_PINS { F0, D6, D4, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, B6, F7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/bantam44/info.json b/keyboards/bantam44/info.json index aadd885f6ad..2f7eef9ba28 100644 --- a/keyboards/bantam44/info.json +++ b/keyboards/bantam44/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"], + "rows": ["F0", "D6", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h index 5e8a798be60..5dd1c8d063a 100644 --- a/keyboards/barracuda/config.h +++ b/keyboards/barracuda/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C4, C5, C6, D1, D2, D3 } -#define MATRIX_COL_PINS { D4, D5, D6, B0, B1, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/barracuda/info.json b/keyboards/barracuda/info.json index d0909322c98..7f50d959f59 100644 --- a/keyboards/barracuda/info.json +++ b/keyboards/barracuda/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D5", "D6", "B0", "B1", "B2"], + "rows": ["C4", "C5", "C6", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h index 6e0065c0623..c1008da9b86 100644 --- a/keyboards/basekeys/slice/rev1/config.h +++ b/keyboards/basekeys/slice/rev1/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 } - -#define DIODE_DIRECTION COL2ROW - /* Select hand configuration */ //#define EE_HANDS #define MASTER_LEFT diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json index fac0bf36827..d2dbd00a3da 100644 --- a/keyboards/basekeys/slice/rev1/info.json +++ b/keyboards/basekeys/slice/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xEC17", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h index a19d676b29f..783d097ad09 100644 --- a/keyboards/basekeys/slice/rev1_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/config.h @@ -16,12 +16,6 @@ along with this program. If not, see . */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 } - -#define DIODE_DIRECTION COL2ROW - /* Select hand configuration */ //#define EE_HANDS #define MASTER_LEFT diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json index fb6a19bc2fd..dfbdde65d65 100644 --- a/keyboards/basekeys/slice/rev1_rgb/info.json +++ b/keyboards/basekeys/slice/rev1_rgb/info.json @@ -8,6 +8,11 @@ "pid": "0xEC15", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h index c06395545d5..36f691da430 100644 --- a/keyboards/basekeys/trifecta/config.h +++ b/keyboards/basekeys/trifecta/config.h @@ -16,16 +16,6 @@ #pragma once - -/* key matrix pins */ - -#define MATRIX_ROW_PINS { B0, B7, F7, B1, B6, C6, C7, B5, F6, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, D1, B2, D0, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 80 diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index 8743e3aad1f..dfe5b680c9c 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -8,6 +8,11 @@ "pid": "0xEAF3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"], + "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "B4"}, diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h index 2c3f6f97f24..87864e2bf4b 100644 --- a/keyboards/basketweave/config.h +++ b/keyboards/basketweave/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json index 3ef505854e8..f635d80fff9 100644 --- a/keyboards/basketweave/info.json +++ b/keyboards/basketweave/info.json @@ -8,6 +8,11 @@ "pid": "0x8989", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"], + "rows": ["A6", "C6", "C7", "A7", "A5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D7", "pin_b": "C0"} diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h index ef99f3b6313..69e269a963b 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h @@ -19,12 +19,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index cbe8ac12e72..c9d7b1bf7fd 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B1", "B10", "B3", "B4", "B5"], + "rows": ["A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index a74239f706c..e373627d51c 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -18,8 +18,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h index 909cd059786..484ccc523f6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h @@ -18,17 +18,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { C7, F0, D7, E6, B4 } - -#define MATRIX_ROW_PINS_RIGHT \ - { F0, C6, D4, B5 } -#define MATRIX_COL_PINS_RIGHT \ - { C7, B7, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index 11cc51ad468..8cbe3d419fd 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -3,8 +3,19 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C7", "F0", "D7", "E6", "B4"], + "rows": ["B7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["C7", "B7", "D7", "E6", "B4"], + "rows": ["F0", "C6", "D4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h index 510a55be41d..20b610172df 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 5c56d685543..daa5bfacad4 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h index 304e89ce21b..f09dc72c013 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 4b914a775f3..34ef6d6e74c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h index d4972614180..bb85468a86c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 4b914a775f3..daee96bb360 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 0138b9656f9..e01419b97ad 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index 9e1c778cc36..1153761ca0c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h index 93d897a4feb..1070dbd0662 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 9fa70f3ca14..8287b3112d4 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], + "rows": ["A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h index 19a2fb56f5a..ba729aee3ec 100644 --- a/keyboards/bastardkb/charybdis/3x6/config.h +++ b/keyboards/bastardkb/charybdis/3x6/config.h @@ -18,8 +18,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h index 0fea2772d24..a1d78859436 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h @@ -17,17 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { D5, C7, F0, D7, E6, B4 } - -#define MATRIX_ROW_PINS_RIGHT \ - { F0, C6, D4, B5 } -#define MATRIX_COL_PINS_RIGHT \ - { F1, C7, B7, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 5a8b815e953..9dd366e1dd0 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -3,8 +3,19 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D5", "C7", "F0", "D7", "E6", "B4"], + "rows": ["B7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F1", "C7", "B7", "D7", "E6", "B4"], + "rows": ["F0", "C6", "D4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h index ba2bd4ac369..20b610172df 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index d84a7f314c8..d575fdb216c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h index 053d7801616..f09dc72c013 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 4e1c96298d8..e6a3a2318d9 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h index e4afc5a866f..bb85468a86c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 4e1c96298d8..d06e3729382 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 658819f9366..e01419b97ad 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index b667f6d76af..99d33fd668c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index e37df487fd8..69e269a963b 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -19,12 +19,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B15, A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index ec2b0cbad0a..c27515d0fba 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], + "rows": ["B15", "A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index 21887dca071..64b5158698b 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -18,8 +18,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h index 44e81807ee8..484ccc523f6 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h @@ -18,17 +18,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F1, B7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { D5, C7, F0, D7, E6, B4 } - -#define MATRIX_ROW_PINS_RIGHT \ - { D5, F0, C6, D4, B5 } -#define MATRIX_COL_PINS_RIGHT \ - { F1, C7, B7, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index c9921cd341e..5dda4a73a5d 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -3,8 +3,19 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D5", "C7", "F0", "D7", "E6", "B4"], + "rows": ["F1", "B7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F1", "C7", "B7", "D7", "E6", "B4"], + "rows": ["D5", "F0", "C6", "D4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h index 8e586b89b2e..20b610172df 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F4, F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index 9349712a41d..cf70250a152 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h index 3e7e3529c84..f09dc72c013 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 6931f9e8760..1815ea2b0a3 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h index 827267d2cfb..bb85468a86c 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 6931f9e8760..94f0db83532 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index fc4e3efadfd..e01419b97ad 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F4, F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 0b7ea215608..5f0fd50578a 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h index 3a5898c546b..4366a8a3e98 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP4, GP5, GP28, GP26 } -#define MATRIX_COL_PINS \ - { GP8, GP9, GP7, GP6, GP27 } - /* Handedness. */ #define SPLIT_HAND_PIN GP29 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json index e4f48e6c7e5..796d22dc713 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Dilemma (3x5+2) Assembled", + "matrix_pins": { + "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"], + "rows": ["GP4", "GP5", "GP28", "GP26"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h index 67e9646845f..fd7bb0f1078 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP4, GP5, GP28, GP26 } -#define MATRIX_COL_PINS \ - { GP8, GP9, GP7, GP6, GP27 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json index aec0957ed69..7796a7c3111 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Dilemma (3x5+2) Splinky", + "matrix_pins": { + "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"], + "rows": ["GP4", "GP5", "GP28", "GP26"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index a30b98a10ae..250732dc7a3 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP4, GP5, GP27, GP26 } -#define MATRIX_COL_PINS \ - { GP8, GP9, GP7, GP6, GP28 } - /* Handedness. */ #define SPLIT_HAND_PIN GP29 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index a4fe5925875..a6e0d16a65b 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -4,6 +4,11 @@ "device_version": "2.0.0", "pid": "0x1835" }, + "matrix_pins": { + "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"], + "rows": ["GP4", "GP5", "GP27", "GP26"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h index 3ea785525cf..d282c635eab 100644 --- a/keyboards/bastardkb/dilemma/config.h +++ b/keyboards/bastardkb/dilemma/config.h @@ -18,9 +18,6 @@ #pragma once - -#define DIODE_DIRECTION ROW2COL - /* Pointing device configuration. */ // Enable use of pointing device on slave split. diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h index 773ee947d74..b5166aed2af 100644 --- a/keyboards/bastardkb/scylla/blackpill/config.h +++ b/keyboards/bastardkb/scylla/blackpill/config.h @@ -19,12 +19,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B15, A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index a701797dc06..7e31dc1674e 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], + "rows": ["B15", "A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h index 0f41dca37ee..0ad3ecd17bc 100644 --- a/keyboards/bastardkb/scylla/config.h +++ b/keyboards/bastardkb/scylla/config.h @@ -18,9 +18,6 @@ #pragma once - -#define DIODE_DIRECTION ROW2COL - /* RGB settings. */ #define RGBLED_NUM 58 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h index 967a8c6c539..384e19c3d23 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/config.h +++ b/keyboards/bastardkb/scylla/v1/elitec/config.h @@ -18,12 +18,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { D7, B5, F7, F6, B6 } -#define MATRIX_COL_PINS \ - { B4, E6, C6, B1, B3, B2 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json index 1ed2cee71dd..b6a9eac7a12 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], + "rows": ["D7", "B5", "F7", "F6", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h index e9691010ed3..178bafa5cc9 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/config.h +++ b/keyboards/bastardkb/scylla/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F4, F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json index 4674e238a66..f1db245dd04 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h index f65dcfb0b3a..00f0dbf1f3c 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h +++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json index 6d3edbd0ee3..698342ad2dc 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h index 09d5af43c8e..ff5d7db4ff4 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h +++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json index 6d3edbd0ee3..733b214195a 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h index 5528531b91b..4e5b142aa30 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/config.h +++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F4, F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index eccfea99f47..d0624dd9090 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h index cbff281ddcd..b5166aed2af 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/config.h +++ b/keyboards/bastardkb/skeletyl/blackpill/config.h @@ -19,12 +19,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index b058d2424a8..3a066df3538 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B1", "B10", "B3", "B4", "B5"], + "rows": ["A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h index c1e0e0aa198..3e282f0f15e 100644 --- a/keyboards/bastardkb/skeletyl/config.h +++ b/keyboards/bastardkb/skeletyl/config.h @@ -18,9 +18,6 @@ #pragma once - -#define DIODE_DIRECTION ROW2COL - /* RGB settings. */ #define RGBLED_NUM 36 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h index f98185755f3..384e19c3d23 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h +++ b/keyboards/bastardkb/skeletyl/v1/elitec/config.h @@ -18,12 +18,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B5, F7, F6, B6 } -#define MATRIX_COL_PINS \ - { E6, C6, B1, B3, B2 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json index 392e3168ff7..7d5ea2600d6 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["E6", "C6", "B1", "B3", "B2"], + "rows": ["B5", "F7", "F6", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h index 6f001c5e248..178bafa5cc9 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h +++ b/keyboards/bastardkb/skeletyl/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json index ae98ff793a6..5c40b6ae424 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h index 7fef28b05e8..00f0dbf1f3c 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json index a39c13a0ae7..69b741769da 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h index eda378df844..ff5d7db4ff4 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json index a39c13a0ae7..321dd7229d1 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h index 86bbdd199b3..4e5b142aa30 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index 257eb6f62e8..47cc622d8ae 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h index 7a273050c04..1801b700539 100644 --- a/keyboards/bastardkb/tbk/config.h +++ b/keyboards/bastardkb/tbk/config.h @@ -17,10 +17,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL -#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 } -#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 } - #define RGB_DI_PIN D2 #define RGBLED_NUM 38 #define RGBLED_SPLIT { 19, 19 } diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 22f10cee96c..247e86160f5 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -5,6 +5,11 @@ "device_version": "0.0.1", "pid": "0x1828" }, + "matrix_pins": { + "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], + "rows": ["D7", "B5", "F7", "F6", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h index ba0c93ff937..b5166aed2af 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/config.h +++ b/keyboards/bastardkb/tbkmini/blackpill/config.h @@ -19,12 +19,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 025b4424682..98ec607fb0e 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], + "rows": ["A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h index 9c2e0f83275..06c6e3ada40 100644 --- a/keyboards/bastardkb/tbkmini/config.h +++ b/keyboards/bastardkb/tbkmini/config.h @@ -18,9 +18,6 @@ #pragma once - -#define DIODE_DIRECTION ROW2COL - /* RGB settings. */ #define RGBLED_NUM 42 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h index c17e20b3d71..384e19c3d23 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h @@ -18,12 +18,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B5, F7, F6, B6 } -#define MATRIX_COL_PINS \ - { B4, E6, C6, B1, B3, B2 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index 4fee4036043..bc311eb8159 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], + "rows": ["B5", "F7", "F6", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h index 01ce7edc7cf..178bafa5cc9 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index d91729481fe..4e9bafbaf5a 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h index d5da5febdfd..00f0dbf1f3c 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index 870f9db26e8..5d0212960c7 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h index 8d60f74a6f3..ff5d7db4ff4 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index 870f9db26e8..87fac0c46c3 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h index e40513cae88..4e5b142aa30 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index f8901144af3..71c5633a789 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h index 28c21cb9f55..d449b25d865 100644 --- a/keyboards/bbrfkr/dynamis/config.h +++ b/keyboards/bbrfkr/dynamis/config.h @@ -16,10 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 } - /* rgb num */ #define RGBLED_NUM 10 #define RGB_DI_PIN D3 @@ -34,8 +30,5 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define PMW33XX_CS_PIN SPI_SS_PIN #define POINTING_DEVICE_INVERT_Y diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json index 4f256e8ac57..377b50f882d 100644 --- a/keyboards/bbrfkr/dynamis/info.json +++ b/keyboards/bbrfkr/dynamis/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B7", "pin_b": "E6"} diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h index 82349297dd9..2f3742c5d0c 100644 --- a/keyboards/bear_face/config.h +++ b/keyboards/bear_face/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* bear_face matrix pinout */ -#define MATRIX_ROW_PINS { F5, F6, F4, F1, B0, B6 } -#define MATRIX_COL_PINS { B5, C7, C6, F0, E6, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/bear_face/info.json b/keyboards/bear_face/info.json index f6f666d77ff..357847f4187 100644 --- a/keyboards/bear_face/info.json +++ b/keyboards/bear_face/info.json @@ -8,6 +8,11 @@ "vid": "0xFEED", "pid": "0x09F5" }, + "matrix_pins": { + "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["F5", "F6", "F4", "F1", "B0", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "F7" }, diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h index 0040b35e072..f482b43c10b 100644 --- a/keyboards/beatervan/config.h +++ b/keyboards/beatervan/config.h @@ -16,23 +16,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, F4, F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/beatervan/info.json b/keyboards/beatervan/info.json index 8218fa78fcc..c86466e44f5 100644 --- a/keyboards/beatervan/info.json +++ b/keyboards/beatervan/info.json @@ -8,6 +8,11 @@ "pid": "0x6276", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h index 564d5f24a23..861203cf2f2 100755 --- a/keyboards/bemeier/bmek/config.h +++ b/keyboards/bemeier/bmek/config.h @@ -19,8 +19,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 5 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20 -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_MODE_STATIC_GRADIENT diff --git a/keyboards/bemeier/bmek/rev1/config.h b/keyboards/bemeier/bmek/rev1/config.h index bfd93fb77dd..2776ce75827 100755 --- a/keyboards/bemeier/bmek/rev1/config.h +++ b/keyboards/bemeier/bmek/rev1/config.h @@ -15,10 +15,5 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { D4, D7, B6, B4, B7 } -#define MATRIX_COL_PINS \ - { F1, B0, B1, B2, B3, D0, D1, D2, C6, C7, F7, F6, F5, F4, B5 } #define RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json index dab37baf045..e11b7355cee 100644 --- a/keyboards/bemeier/bmek/rev1/info.json +++ b/keyboards/bemeier/bmek/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"], + "rows": ["D4", "D7", "B6", "B4", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev2/config.h b/keyboards/bemeier/bmek/rev2/config.h index d2ef3e23c26..281c50703cc 100755 --- a/keyboards/bemeier/bmek/rev2/config.h +++ b/keyboards/bemeier/bmek/rev2/config.h @@ -15,10 +15,4 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { F4, F5, D7, B5, B4 } -#define MATRIX_COL_PINS \ - { F6, B0, B1, F7, C7, C6, B6, F1, B2, B3, D6, D3, D2, D1, D0 } - #define RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json index 65be217368d..005c444cdc2 100644 --- a/keyboards/bemeier/bmek/rev2/info.json +++ b/keyboards/bemeier/bmek/rev2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"], + "rows": ["F4", "F5", "D7", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev3/config.h b/keyboards/bemeier/bmek/rev3/config.h index a8a1575b782..281c50703cc 100755 --- a/keyboards/bemeier/bmek/rev3/config.h +++ b/keyboards/bemeier/bmek/rev3/config.h @@ -15,10 +15,4 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { F1, B4, B5, D6, D7 } -#define MATRIX_COL_PINS \ - { B6, C6, C7, F7, F6, F5, F4, F0, B7, D0, D1, D2, D3, D5, D4 } - #define RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json index 14c0e6d7cb3..114b6034062 100644 --- a/keyboards/bemeier/bmek/rev3/info.json +++ b/keyboards/bemeier/bmek/rev3/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"], + "rows": ["F1", "B4", "B5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h index 768b1b3551c..ddc21dae308 100644 --- a/keyboards/bfake/config.h +++ b/keyboards/bfake/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 16 -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json index fe457cb6d14..069eed9093a 100644 --- a/keyboards/bfake/info.json +++ b/keyboards/bfake/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h index 2ce8ad24dce..ae477fb0f3f 100644 --- a/keyboards/biacco42/ergo42/rev1/config.h +++ b/keyboards/biacco42/ergo42/rev1/config.h @@ -19,15 +19,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json index a519cb23d66..98b4703714e 100644 --- a/keyboards/biacco42/ergo42/rev1/info.json +++ b/keyboards/biacco42/ergo42/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0042", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h index d01a9f389a2..df5455b3c22 100644 --- a/keyboards/biacco42/meishi/config.h +++ b/keyboards/biacco42/meishi/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B5 } -#define MATRIX_COL_PINS { B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json index 629bbd139e6..73b8a74f2a3 100644 --- a/keyboards/biacco42/meishi/info.json +++ b/keyboards/biacco42/meishi/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h index c7614c0dbd3..df5455b3c22 100644 --- a/keyboards/biacco42/meishi2/config.h +++ b/keyboards/biacco42/meishi2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D7, E6 } -#define MATRIX_COL_PINS { F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json index ebdfc390281..ae5c28ddfc7 100644 --- a/keyboards/biacco42/meishi2/info.json +++ b/keyboards/biacco42/meishi2/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6"], + "rows": ["D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h index 997b75a4af8..77f51ecf5a2 100644 --- a/keyboards/binepad/bn003/config.h +++ b/keyboards/binepad/bn003/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { C6 } -#define MATRIX_COL_PINS { B4, B5, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/binepad/bn003/info.json b/keyboards/binepad/bn003/info.json index 222d125281e..408e670b957 100644 --- a/keyboards/binepad/bn003/info.json +++ b/keyboards/binepad/bn003/info.json @@ -8,6 +8,11 @@ "pid": "0x4287", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6"], + "rows": ["C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/binepad/bn009/config.h b/keyboards/binepad/bn009/config.h index 3f233e1488c..77f51ecf5a2 100644 --- a/keyboards/binepad/bn009/config.h +++ b/keyboards/binepad/bn009/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D2, D1, D0 } -#define MATRIX_COL_PINS { B6, B5, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json index 8e4221f49fd..3304476f618 100644 --- a/keyboards/binepad/bn009/info.json +++ b/keyboards/binepad/bn009/info.json @@ -8,6 +8,11 @@ "pid": "0x4295", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4"], + "rows": ["D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 32e179e918d..1df5ab51040 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, E6, F1, F5, F4 } -#define MATRIX_COL_PINS { F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B1 #ifdef RGB_DI_PIN # define RGBLED_NUM 5 diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 65c59db2b4d..35d18ea6784 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,11 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D0", "D1"], + "rows": ["B0", "E6", "F1", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 8, diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index d3172d1812e..d723d4d2bd0 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { E6, B0, F1, F5, F4 } -#define MATRIX_COL_PINS { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index 16b09ca00c7..e466fb0c28f 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -8,6 +8,11 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"], + "rows": ["E6", "B0", "F1", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 12 diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index eb20ed75157..431f73e2e6a 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -1,15 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { E6, B0, F1, F5, F4 } -#define MATRIX_COL_PINS \ - { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index cca5ed456f0..275bb03c194 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,11 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"], + "rows": ["E6", "B0", "F1", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 8 diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 6d609e01859..df0daa52fbe 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { E6, C6, F4, B2, D4 } -#define MATRIX_COL_PINS { F5, F6, F7, C7, B0, B7, B5, D5, B4, D7, D6, D1, D0, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 1a822b21137..9251d4cad75 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -8,6 +8,11 @@ "pid": "0x6581", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"], + "rows": ["E6", "C6", "F4", "B2", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 12 diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 6556560112c..e9a0f89ab24 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { D2, D0, D1, F7, D6 } -#define MATRIX_COL_PINS { F1, B3, F4, F5, F6, E6, C7, B2, B1, C6, B6, B5, B4, D7, D4, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index b80b37b2eae..75359db964d 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -8,6 +8,11 @@ "pid": "0x5365", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"], + "rows": ["D2", "D0", "D1", "F7", "D6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 12 diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h index aedf2b55448..781f5a9bff0 100644 --- a/keyboards/blackplum/config.h +++ b/keyboards/blackplum/config.h @@ -1,12 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, B6, B4, B5, D6, D7, D5, D3, D4 } -#define MATRIX_COL_PINS { D0, D1, D2, F7, F6, F5, F4, F1 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json index c869fcbef52..ec9ca2f763d 100644 --- a/keyboards/blackplum/info.json +++ b/keyboards/blackplum/info.json @@ -8,6 +8,11 @@ "pid": "0x4250", "device_version": "10.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"], + "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["68_ansi"], diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h index d5c752d7f55..aea945a035d 100644 --- a/keyboards/blank/blank01/config.h +++ b/keyboards/blank/blank01/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, B3 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B5, B4, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/blank/blank01/info.json b/keyboards/blank/blank01/info.json index 13709813448..77f0dfe12f5 100644 --- a/keyboards/blank/blank01/info.json +++ b/keyboards/blank/blank01/info.json @@ -8,6 +8,11 @@ "pid": "0x4B01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D0", "D1", "D2", "D3", "B3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/blank_tehnologii/manibus/config.h b/keyboards/blank_tehnologii/manibus/config.h index afe48b150c6..a5b93107dde 100644 --- a/keyboards/blank_tehnologii/manibus/config.h +++ b/keyboards/blank_tehnologii/manibus/config.h @@ -18,12 +18,3 @@ #define EE_HANDS - -/* define pins */ -#define MATRIX_ROW_PINS { F6, F5, F4, B6, D3 } -#define MATRIX_COL_PINS { B5, B4, D7, D6, F0, F1, C6 } -#define MATRIX_ROW_PINS_RIGHT { D6, D7, B4, F7, E6 } -#define MATRIX_COL_PINS_RIGHT { B1, B2, B3, F1, F4, F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json index 4044a561c1d..ac2ac42b330 100644 --- a/keyboards/blank_tehnologii/manibus/info.json +++ b/keyboards/blank_tehnologii/manibus/info.json @@ -9,8 +9,19 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B5", "B4", "D7", "D6", "F0", "F1", "C6"], + "rows": ["F6", "F5", "F4", "B6", "D3"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B1", "B2", "B3", "F1", "F4", "F5", "F6"], + "rows": ["D6", "D7", "B4", "F7", "E6"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h deleted file mode 100644 index f6d8d07de8e..00000000000 --- a/keyboards/blaster75/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Altain - -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 - - -/* Matrix Pinouts */ -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B0, B4, B5, B6, B7, C6, C7, D0, D1, D2, D3, D4, D5, D6, D7 } - -/* Diode Direction */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 47561bc286a..e357422b62f 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -8,6 +8,11 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B4", "B5", "B6", "B7", "C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h index ecc29f6399d..0c254d0dba9 100644 --- a/keyboards/blockey/config.h +++ b/keyboards/blockey/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D3, D1, D4, E6, B5, D2, F6, B3, B2, B6 } -#define MATRIX_COL_PINS { D0, B4, C6, D7, F4, F5, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN B1 diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json index 404614fd99b..0089490f692 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"], + "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h index de47d3a071d..f46df6af822 100644 --- a/keyboards/bluebell/swoop/config.h +++ b/keyboards/bluebell/swoop/config.h @@ -15,11 +15,6 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B1, F7, F6, F5, F4 } -#define DIODE_DIRECTION COL2ROW - #define EE_HANDS // OLED driver diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index 49dcc857e93..7a0adea3133 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json @@ -8,6 +8,11 @@ "pid": "0x3046", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h index 0d8bdde6dc6..1245d9ae588 100644 --- a/keyboards/boardrun/bizarre/config.h +++ b/keyboards/boardrun/bizarre/config.h @@ -15,23 +15,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json index 49d67451cb6..5605fec1b74 100644 --- a/keyboards/boardrun/bizarre/info.json +++ b/keyboards/boardrun/bizarre/info.json @@ -9,6 +9,11 @@ "pid": "0x5339", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h index b2cd5ab73c5..d4766283fca 100644 --- a/keyboards/boardrun/classic/config.h +++ b/keyboards/boardrun/classic/config.h @@ -15,23 +15,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json index 60839d5ef08..c65db694951 100644 --- a/keyboards/boardrun/classic/info.json +++ b/keyboards/boardrun/classic/info.json @@ -9,6 +9,11 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h index 38cdc18fce7..d4766283fca 100644 --- a/keyboards/boardwalk/config.h +++ b/keyboards/boardwalk/config.h @@ -15,23 +15,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/boardwalk/info.json b/keyboards/boardwalk/info.json index 76fea555e4c..9960a7760f4 100644 --- a/keyboards/boardwalk/info.json +++ b/keyboards/boardwalk/info.json @@ -8,6 +8,11 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], diff --git a/keyboards/bobpad/config.h b/keyboards/bobpad/config.h deleted file mode 100644 index 1b4ca326d9f..00000000000 --- a/keyboards/bobpad/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Ananya Kirti - * - * 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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F7, B1 } -#define MATRIX_COL_PINS { F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json index 43e614dbad5..b813424f650 100644 --- a/keyboards/bobpad/info.json +++ b/keyboards/bobpad/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4"], + "rows": ["F7", "B1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2"} diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h index 8d95b371bd0..ce64cbe57fb 100644 --- a/keyboards/bolsa/bolsalice/config.h +++ b/keyboards/bolsa/bolsalice/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B2, B3, C7, C6, B5 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B4, D7, D6, D4, D5, D3, D2, D1 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B1 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json index 7e32e74a56e..09ee356a7e5 100644 --- a/keyboards/bolsa/bolsalice/info.json +++ b/keyboards/bolsa/bolsalice/info.json @@ -6,6 +6,11 @@ "vid": "0x4253", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], + "rows": ["B2", "B3", "C7", "C6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "url": "", diff --git a/keyboards/bolsa/damapad/config.h b/keyboards/bolsa/damapad/config.h deleted file mode 100644 index 9342bd02839..00000000000 --- a/keyboards/bolsa/damapad/config.h +++ /dev/null @@ -1,38 +0,0 @@ - -/* -Copyright 2021 Matthew Dias - -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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, F7, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json index 72e432c8717..22d4ba3d39e 100644 --- a/keyboards/bolsa/damapad/info.json +++ b/keyboards/bolsa/damapad/info.json @@ -8,6 +8,11 @@ "pid": "0x6470", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "B7"], + "rows": ["E6", "F7", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3", "resolution": 2} diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h index 211e7f4f768..7d7310ec0ec 100644 --- a/keyboards/bop/config.h +++ b/keyboards/bop/config.h @@ -16,16 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 } -#define MATRIX_COL_PINS { D5, C5, B0, B1, B2, B3, B4, B5, B6, E7, E6, F0, F7, F6, F5, F4, F3, F2, F1, C6 } -// If your board is spamming the end column, change C7 to C6 in the line above and short those pins on the controller - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bop/info.json b/keyboards/bop/info.json index a10de48d68f..d892612a7f6 100644 --- a/keyboards/bop/info.json +++ b/keyboards/bop/info.json @@ -8,6 +8,11 @@ "pid": "0x626F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"], + "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h index 1c175166eeb..62a12b77e98 100644 --- a/keyboards/boston/config.h +++ b/keyboards/boston/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_COL_PINS \ - { B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B7, B8, B9, C14, C15, F0, A3 } -#define MATRIX_ROW_PINS \ - { B5, B6, A7, B0, B1, B2, A4 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json index 1d8e39f29df..4e9e209ff69 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/info.json @@ -8,6 +8,11 @@ "pid": "0x4176", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3", "B4", "B7", "B8", "B9", "C14", "C15", "F0", "A3"], + "rows": ["B5", "B6", "A7", "B0", "B1", "B2", "A4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C13", "pin_b": "F1", "resolution": 2} diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h index 00e8648df86..3469e28bb97 100644 --- a/keyboards/boston_meetup/2019/config.h +++ b/keyboards/boston_meetup/2019/config.h @@ -1,22 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS { A3, B8, B9, B1 } -#define MATRIX_COL_PINS { A7, A8, B2, B10 } - //Audio #undef AUDIO_VOICES #undef AUDIO_PIN @@ -37,17 +20,6 @@ // configure oled driver for the 128x32 oled #define OLED_UPDATE_INTERVAL 33 // ~30fps -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json index 22f54c3472e..125914db3b1 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "20.1.9" }, + "matrix_pins": { + "cols": ["A7", "A8", "B2", "B10"], + "rows": ["A3", "B8", "B9", "B1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B13", "pin_b": "B14"} diff --git a/keyboards/boston_meetup/config.h b/keyboards/boston_meetup/config.h deleted file mode 100644 index 80379fab184..00000000000 --- a/keyboards/boston_meetup/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 AUDIO_VOICES - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h index d7b265f4e3d..f608132b5af 100644 --- a/keyboards/box75/config.h +++ b/keyboards/box75/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2 , B1, B0, A7 , A6, A5, A4, A3, A8, B15, B14, B13, A15 } -#define MATRIX_ROW_PINS { A10, A9 , B12, A2, A1, A0 } -#define DIODE_DIRECTION COL2ROW - /* 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/box75/info.json b/keyboards/box75/info.json index fabf306730d..097366637eb 100644 --- a/keyboards/box75/info.json +++ b/keyboards/box75/info.json @@ -8,6 +8,11 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"], + "rows": ["A10", "A9", "B12", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h index 63a1f977268..6bacff31f01 100644 --- a/keyboards/bpiphany/four_banger/config.h +++ b/keyboards/bpiphany/four_banger/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B2, B6 } -#define MATRIX_COL_PINS { B5, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json index cb9b7d148d2..57e8b04dc7b 100644 --- a/keyboards/bpiphany/four_banger/info.json +++ b/keyboards/bpiphany/four_banger/info.json @@ -8,6 +8,11 @@ "pid": "0x2004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4"], + "rows": ["B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h index 21ed9d44c72..0d23223dc93 100644 --- a/keyboards/bpiphany/kitten_paw/config.h +++ b/keyboards/bpiphany/kitten_paw/config.h @@ -22,22 +22,6 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 18 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -//#define MATRIX_ROW_PINS { D0, D5 } -//#define MATRIX_COL_PINS { F1, F0, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h index c5007ffbbb4..7bf04c9b767 100644 --- a/keyboards/bt66tech/bt66tech60/config.h +++ b/keyboards/bt66tech/bt66tech60/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12 } -#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json index 91b824b6a49..e474a8d691b 100644 --- a/keyboards/bt66tech/bt66tech60/info.json +++ b/keyboards/bt66tech/bt66tech60/info.json @@ -8,6 +8,11 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"], + "rows": ["B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h deleted file mode 100644 index e610685f991..00000000000 --- a/keyboards/bthlabs/geekpad/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2019-present Tomek Wójcik - -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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F4, F5, F6 } -#define MATRIX_COL_PINS { D4, D0, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json index d68530dadf4..8200e7d0365 100644 --- a/keyboards/bthlabs/geekpad/info.json +++ b/keyboards/bthlabs/geekpad/info.json @@ -8,6 +8,11 @@ "pid": "0x4257", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D0", "D1"], + "rows": ["F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h index e59cba6a500..fdee023e7d6 100644 --- a/keyboards/bubble75/hotswap/config.h +++ b/keyboards/bubble75/hotswap/config.h @@ -16,12 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, C7, F1 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, E6, F0, D0, D1, D4, D6, D7, B4, B5, B6, C6 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json index b9519f15f18..5de7cffae70 100644 --- a/keyboards/bubble75/hotswap/info.json +++ b/keyboards/bubble75/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5A4C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], + "rows": ["F4", "F5", "F6", "F7", "C7", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h index 3d1926093c2..7ed15ef362b 100644 --- a/keyboards/buildakb/potato65/config.h +++ b/keyboards/buildakb/potato65/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#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 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json index 505eb72b114..7673e12dc54 100644 --- a/keyboards/buildakb/potato65/info.json +++ b/keyboards/buildakb/potato65/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h index cfd82ac3b6d..dba700af6cd 100644 --- a/keyboards/buildakb/potato65hs/config.h +++ b/keyboards/buildakb/potato65hs/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 } -#define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json index 8d41e422e42..3fe24a3b059 100644 --- a/keyboards/buildakb/potato65hs/info.json +++ b/keyboards/buildakb/potato65hs/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], + "rows": ["F5", "F4", "F6", "F0", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h index 629fa34c2bd..53ad1077bb5 100644 --- a/keyboards/buildakb/potato65s/config.h +++ b/keyboards/buildakb/potato65s/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 } -#define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json index 47e6690389a..46d8461d2ac 100644 --- a/keyboards/buildakb/potato65s/info.json +++ b/keyboards/buildakb/potato65s/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], + "rows": ["F5", "F4", "F6", "F0", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h index fb028e0f645..f29441fac80 100644 --- a/keyboards/buzzard/rev1/config.h +++ b/keyboards/buzzard/rev1/config.h @@ -3,15 +3,6 @@ #pragma once -// wiring -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7 } -#define MATRIX_COL_PINS \ - { B1, B3, B2, B6, B5, B4} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json index 173eb49e72a..3cd9d387ca0 100644 --- a/keyboards/buzzard/rev1/info.json +++ b/keyboards/buzzard/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xB077", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6", "B5", "B4"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h deleted file mode 100644 index 55fc373ea81..00000000000 --- a/keyboards/dailycraft/bat43/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2020 yfuku - -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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, D7, C6, D4, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, B5, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json index e60001252db..93d7ca1423f 100644 --- a/keyboards/dailycraft/bat43/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "B5", "B4"], + "rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h deleted file mode 100644 index 13e3177b0e3..00000000000 --- a/keyboards/dailycraft/claw44/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 1168d21fa69..d4b4e36b418 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h index 11c2825ca94..7da6e3f1bf2 100644 --- a/keyboards/dailycraft/sandbox/rev1/config.h +++ b/keyboards/dailycraft/sandbox/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json index 9dcf9889976..032023388d3 100644 --- a/keyboards/dailycraft/sandbox/rev1/info.json +++ b/keyboards/dailycraft/sandbox/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h index 11c2825ca94..7da6e3f1bf2 100644 --- a/keyboards/dailycraft/sandbox/rev2/config.h +++ b/keyboards/dailycraft/sandbox/rev2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index c0fd7745d01..e20a1a2692d 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h index b4ec32ba1da..7da6e3f1bf2 100644 --- a/keyboards/dailycraft/wings42/rev1/config.h +++ b/keyboards/dailycraft/wings42/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index 6a5e5040d53..04bb07c0bc3 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h index d2067fbb520..7da6e3f1bf2 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h +++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2, B4 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B6, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json index 51184b3ebdf..164e7701720 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h index bd115ee1406..7da6e3f1bf2 100644 --- a/keyboards/dailycraft/wings42/rev2/config.h +++ b/keyboards/dailycraft/wings42/rev2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, NO_PIN } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index bd8e97916ab..f80dcd0dfed 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", null] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h index 02f3863e4d3..d212094077a 100644 --- a/keyboards/daji/seis_cinco/config.h +++ b/keyboards/daji/seis_cinco/config.h @@ -17,16 +17,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments -*/ -#define MATRIX_ROW_PINS { B2, B10, B11, A9, A6 } -#define MATRIX_COL_PINS { B1, B0, A7, B14, A8, B15, A0, C15, C14, C13, B5, B4, B3, A15, A10, A14 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW - /* 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/daji/seis_cinco/info.json b/keyboards/daji/seis_cinco/info.json index 686415247e3..61304e85fab 100644 --- a/keyboards/daji/seis_cinco/info.json +++ b/keyboards/daji/seis_cinco/info.json @@ -8,6 +8,11 @@ "pid": "0xBF22", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B0", "A7", "B14", "A8", "B15", "A0", "C15", "C14", "C13", "B5", "B4", "B3", "A15", "A10", "A14"], + "rows": ["B2", "B10", "B11", "A9", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h index dcf7368b383..7a7d3584de7 100644 --- a/keyboards/db/db63/config.h +++ b/keyboards/db/db63/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json index 9518ef5a423..6aa87efd5b4 100644 --- a/keyboards/db/db63/info.json +++ b/keyboards/db/db63/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h index 5de4b653887..5a33d5d9812 100644 --- a/keyboards/delikeeb/flatbread60/config.h +++ b/keyboards/delikeeb/flatbread60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F6, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLED_NUM 19 diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json index 09f1bcd78fb..e409060f74a 100644 --- a/keyboards/delikeeb/flatbread60/info.json +++ b/keyboards/delikeeb/flatbread60/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["F6", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h index 3708284700b..4bf4e669c10 100644 --- a/keyboards/delikeeb/vaguettelite/config.h +++ b/keyboards/delikeeb/vaguettelite/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, B3, D1, D2, D3, F5 } -#define MATRIX_COL_PINS { F6, F7, B1, B2, B6, B5, B4, E6, D7, C6, D0, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN # define RGBLED_NUM 9 diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json index e976a6a1554..aa7a1fd7279 100644 --- a/keyboards/delikeeb/vaguettelite/info.json +++ b/keyboards/delikeeb/vaguettelite/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D0", "D4"], + "rows": ["F4", "B3", "D1", "D2", "D3", "F5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "B7"}, diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index d8a6d95c9b3..fe6ada22ec6 100644 --- a/keyboards/delikeeb/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D7, B4, B5, B6 } -#define MATRIX_COL_PINS { B2, B3, B1, F7, F5, F6, D3, D1, D0, D4, C6, E6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define B7_AUDIO #define RGB_DI_PIN F0 diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json index 4434ba95d74..7b5df84f673 100644 --- a/keyboards/delikeeb/vanana/rev1/info.json +++ b/keyboards/delikeeb/vanana/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"], + "rows": ["D2", "D7", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "D5"}, diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index e28d974b78f..2f93c2a7993 100644 --- a/keyboards/delikeeb/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, C6, E6, B4, B5, F5} -#define MATRIX_COL_PINS { B3, B1, F7, F6, F4, D2, D3, D0, D4, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define B7_AUDIO #define RGB_DI_PIN C7 diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json index 589c8c5089f..6b9c051a94d 100644 --- a/keyboards/delikeeb/vanana/rev2/info.json +++ b/keyboards/delikeeb/vanana/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"], + "rows": ["D1", "C6", "E6", "B4", "B5", "F5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B2"}, diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h index 510a13bb6bb..93fec1ee2da 100644 --- a/keyboards/delikeeb/vaneela/config.h +++ b/keyboards/delikeeb/vaneela/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F6, F7, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json index 42265876503..218fcaefdcd 100644 --- a/keyboards/delikeeb/vaneela/info.json +++ b/keyboards/delikeeb/vaneela/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["F6", "F7", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h index aa3f9f338c2..93fec1ee2da 100644 --- a/keyboards/delikeeb/vaneelaex/config.h +++ b/keyboards/delikeeb/vaneelaex/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json index fb0b1a87c24..0095254388c 100644 --- a/keyboards/delikeeb/vaneelaex/info.json +++ b/keyboards/delikeeb/vaneelaex/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["D3", "D2", "D1", "D0", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 4d5aa33be97..2bdd2a4f2c2 100644 --- a/keyboards/delikeeb/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, B6, B2, B3, B1, F5, F6, F7 } -#define MATRIX_COL_PINS { D3, D2, B5, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN # define RGBLED_NUM 10 diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 8301a03813e..794647015fb 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B7", "pin_b": "D5"}, diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h index d6d4224cf08..a62147158e1 100644 --- a/keyboards/deltapad/config.h +++ b/keyboards/deltapad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D3, D1, D0 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/deltapad/info.json b/keyboards/deltapad/info.json index bef25e63504..608c8712c9b 100644 --- a/keyboards/deltapad/info.json +++ b/keyboards/deltapad/info.json @@ -8,6 +8,11 @@ "pid": "0x0123", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["D2", "D3", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h index 785d125b366..26b7101a1d0 100644 --- a/keyboards/deltasplit75/v2/config.h +++ b/keyboards/deltasplit75/v2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 } -#define MATRIX_COL_PINS { B6, B5, B4, E6, D7, C6, D4, D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json index 055ad1e00f2..40c7135717c 100644 --- a/keyboards/deltasplit75/v2/info.json +++ b/keyboards/deltasplit75/v2/info.json @@ -7,6 +7,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "E6", "D7", "C6", "D4", "D1"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h index 6b0a73b3c27..ab19a9a57ec 100755 --- a/keyboards/demiurge/config.h +++ b/keyboards/demiurge/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F4, F6, F7, C7 } -#define MATRIX_COL_PINS { E6, F5, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 21 diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json index 92b0c7243ca..cc7e1fbbeae 100644 --- a/keyboards/demiurge/info.json +++ b/keyboards/demiurge/info.json @@ -8,6 +8,11 @@ "pid": "0x6475", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F5", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2"], + "rows": ["F0", "F4", "F6", "F7", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index 8193eae02fb..5896f3cd70b 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -15,11 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 31 diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index abf18685b26..cdba6219d40 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,11 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index e80b0d97a4f..e96dee185b4 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -15,12 +15,6 @@ */ #pragma once - -/* Matrix */ -#define MATRIX_ROW_PINS { B15, A5, A3, A15, B7, B8 } -#define MATRIX_COL_PINS { B13, B14, B3, A4, A6 } -#define DIODE_DIRECTION COL2ROW - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN B12 diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 0fda78c76d3..454577c1eb8 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -8,6 +8,11 @@ "pid": "0x7342", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B13", "B14", "B3", "A4", "A6"], + "rows": ["B15", "A5", "A3", "A15", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "B11", diff --git a/keyboards/dinofizz/fnrow/v1/config.h b/keyboards/dinofizz/fnrow/v1/config.h deleted file mode 100644 index 0763c887c81..00000000000 --- a/keyboards/dinofizz/fnrow/v1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Dino Fizzotti - -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 { A0, A1 } -#define MATRIX_COL_PINS {B0, B1, B3, B4, B5, B6, B7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dinofizz/fnrow/v1/info.json b/keyboards/dinofizz/fnrow/v1/info.json index c031e4c1631..a52e887df85 100644 --- a/keyboards/dinofizz/fnrow/v1/info.json +++ b/keyboards/dinofizz/fnrow/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0100", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B3", "B4", "B5", "B6", "B7"], + "rows": ["A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h index aad4dce5353..cfa9c05154c 100644 --- a/keyboards/dk60/config.h +++ b/keyboards/dk60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dk60/info.json b/keyboards/dk60/info.json index 5e37593039e..c16fb1ad584 100644 --- a/keyboards/dk60/info.json +++ b/keyboards/dk60/info.json @@ -8,6 +8,11 @@ "pid": "0x56C2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B3", "B2", "B1", "D3", "D5", "B5", "B7", "C6", "C7", "D0", "D1", "D2"], + "rows": ["B6", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index 43e53608e91..cbe8f13cdf1 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -24,14 +24,6 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 } - -// wiring of each half -#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN B6 diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index 38f18f0cc1f..4214de3415b 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -8,6 +8,11 @@ "pid": "0xEE60", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"], + "rows": ["F6", "F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h index bf9fce0889e..e34b4d34ab1 100644 --- a/keyboards/dm9records/lain/config.h +++ b/keyboards/dm9records/lain/config.h @@ -3,18 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS \ - { C6, D7, D6, D4 } -#define MATRIX_COL_PINS \ - { C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* LED Settings */ #define LED_NUM 3 #define LED_PINS \ diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json index 6ef0d21391b..ce4499442d6 100644 --- a/keyboards/dm9records/lain/info.json +++ b/keyboards/dm9records/lain/info.json @@ -8,6 +8,11 @@ "pid": "0xE8F4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"], + "rows": ["C6", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index e8089460061..b4b541dbfc6 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, B5, B3, D4 } -#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index 2854ea1481d..d495b693651 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"], + "rows": ["B4", "B5", "B3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 53f1566252c..71400c3cf88 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, B5, B3, B0, C0 } -#define MATRIX_COL_PINS { D7, D6, D5, D4, B1, B2, C1, C2, C3, C5, D1, D0, C4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index d8eca7dd4ad..e6425edb3d7 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"], + "rows": ["B4", "B5", "B3", "B0", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h index 1e908ea0291..e64609c8fb8 100644 --- a/keyboards/dmqdesign/spin/config.h +++ b/keyboards/dmqdesign/spin/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -//Matrix is 3x5 instead of 3x4, as the 3 encoders are wired into the matrix - -#define MATRIX_ROW_PINS { F0, F1, F4 } -#define MATRIX_COL_PINS { F5, F6, F7, C7, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - //Data pin for the 3 RGB LEDs #define RGB_DI_PIN D3 //Number of RGB LEDs diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json index ff5101f8ea8..47804ea5421 100644 --- a/keyboards/dmqdesign/spin/info.json +++ b/keyboards/dmqdesign/spin/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "C7", "C6"], + "rows": ["F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B5"}, diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h index 969d620d936..946ad61026e 100644 --- a/keyboards/do60/config.h +++ b/keyboards/do60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, F4, B4, D7, D6, B3, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow * F5 PIN for DO60's pre-soldered WS2812 LEDs */ diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json index 86d02df61e0..0f55b0bdb86 100644 --- a/keyboards/do60/info.json +++ b/keyboards/do60/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "F4", "B4", "D7", "D6", "B3", "B0"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "levels": 6 diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h index aa066fe3933..c01191e869f 100644 --- a/keyboards/doio/kb16/rev1/config.h +++ b/keyboards/doio/kb16/rev1/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D5, D4, D3, D2 } -#define MATRIX_COL_PINS { F5, F4, F1, F0, B7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index d0acdedfb9b..03deae0cbc4 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x1601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "F1", "F0", "B7"], + "rows": ["D5", "D4", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "E6"}, diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h index e7e2791ac8d..a11f7c8d3af 100644 --- a/keyboards/doio/kb16/rev2/config.h +++ b/keyboards/doio/kb16/rev2/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B4, B9, B8 } -#define MATRIX_COL_PINS { B14, B13, B12, B0, A7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index 8b5eeb45c29..c208bec1bfa 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x1601", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B0", "A7"], + "rows": ["B3", "B4", "B9", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"}, diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h index 866bd3e1d92..c2fe07026c4 100644 --- a/keyboards/doio/kb30/config.h +++ b/keyboards/doio/kb30/config.h @@ -17,11 +17,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B4, B9, B8, A5, A6 } -#define MATRIX_COL_PINS { B14, B13, B12, B0, A7, A9, A8 } -#define DIODE_DIRECTION COL2ROW // COL2ROW or ROW2COL - /* 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/doio/kb30/info.json b/keyboards/doio/kb30/info.json index 9fe8e831859..f4e43522d5c 100644 --- a/keyboards/doio/kb30/info.json +++ b/keyboards/doio/kb30/info.json @@ -8,6 +8,11 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"], + "rows": ["B3", "B4", "B9", "B8", "A5", "A6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"}, diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h index d5bf7a17cb8..398b0be3c84 100644 --- a/keyboards/donutcables/budget96/config.h +++ b/keyboards/donutcables/budget96/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 18 -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json index a8dd3fc32a8..20ae2de10fd 100644 --- a/keyboards/donutcables/budget96/info.json +++ b/keyboards/donutcables/budget96/info.json @@ -8,6 +8,11 @@ "pid": "0xB960", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h index dc6d1fc84a2..76f004028fa 100644 --- a/keyboards/donutcables/scrabblepad/config.h +++ b/keyboards/donutcables/scrabblepad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, F1, C7, F2, C6, F3, C5, F4, C4, F5, C3, F6, C2, F7, C1 } -#define MATRIX_COL_PINS { D6, D7, E0, E1, B7, D2, D3, D4, C0, B4, B5, B6, F0, E6, E7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/info.json index 0f805c70577..ea0659607c1 100644 --- a/keyboards/donutcables/scrabblepad/info.json +++ b/keyboards/donutcables/scrabblepad/info.json @@ -8,6 +8,11 @@ "pid": "0x21D7", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D6", "D7", "E0", "E1", "B7", "D2", "D3", "D4", "C0", "B4", "B5", "B6", "F0", "E6", "E7"], + "rows": ["D5", "F1", "C7", "F2", "C6", "F3", "C5", "F4", "C4", "F5", "C3", "F6", "C2", "F7", "C1"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h index d4617a87861..40327dbc9a1 100644 --- a/keyboards/doodboard/duckboard/config.h +++ b/keyboards/doodboard/duckboard/config.h @@ -16,17 +16,9 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - /* media key slowdown for windows */ #define TAP_CODE_DELAY 20 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json index f2ee7bb80a3..b79348d03c4 100644 --- a/keyboards/doodboard/duckboard/info.json +++ b/keyboards/doodboard/duckboard/info.json @@ -8,6 +8,11 @@ "pid": "0xFF44", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6", "resolution": 2} diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h index d4617a87861..40327dbc9a1 100644 --- a/keyboards/doodboard/duckboard_r2/config.h +++ b/keyboards/doodboard/duckboard_r2/config.h @@ -16,17 +16,9 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - /* media key slowdown for windows */ #define TAP_CODE_DELAY 20 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json index b2de93f477c..bc3c8661f24 100644 --- a/keyboards/doodboard/duckboard_r2/info.json +++ b/keyboards/doodboard/duckboard_r2/info.json @@ -8,6 +8,11 @@ "pid": "0x6462", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5", "resolution": 2} diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h index 7fb78172d40..21b4c6f146a 100644 --- a/keyboards/doppelganger/config.h +++ b/keyboards/doppelganger/config.h @@ -17,28 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ #define SPLIT_HAND_PIN D4 -#define MATRIX_ROW_PINS { E6, F1, C7, F7, F6 } -#define MATRIX_COL_PINS { F4, F0, B7, B3, B2, B1, D5, D3, D2 } - -#define MATRIX_ROW_PINS_RIGHT { D7, D6, D4, E6, B5 } -#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, F7, C7, C6, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // #define USE_I2C #define RGB_DI_PIN B4 diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index d576f73d695..5c489fe44ec 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -8,8 +8,19 @@ "pid": "0x4447", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"], + "rows": ["E6", "F1", "C7", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D1" + "soft_serial_pin": "D1", + "matrix_pins": { + "right": { + "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], + "rows": ["D7", "D6", "D4", "E6", "B5"] + } + } }, "bootmagic": { "matrix": [0, 2] diff --git a/keyboards/doro67/multi/config.h b/keyboards/doro67/multi/config.h deleted file mode 100644 index b91f26f0441..00000000000 --- a/keyboards/doro67/multi/config.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json index b92267d5d9b..40d56dfad35 100644 --- a/keyboards/doro67/multi/info.json +++ b/keyboards/doro67/multi/info.json @@ -8,6 +8,11 @@ "pid": "0x4D4C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 7 diff --git a/keyboards/doro67/regular/config.h b/keyboards/doro67/regular/config.h deleted file mode 100644 index b91f26f0441..00000000000 --- a/keyboards/doro67/regular/config.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json index 096e8e30e7d..1b042b720fb 100644 --- a/keyboards/doro67/regular/info.json +++ b/keyboards/doro67/regular/info.json @@ -7,6 +7,11 @@ "pid": "0x5245", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h index 471415402a5..f9860ae4ed6 100644 --- a/keyboards/doro67/rgb/config.h +++ b/keyboards/doro67/rgb/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN B7 // The number of LEDs connected diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json index cf46ac87399..61b515b76f2 100644 --- a/keyboards/doro67/rgb/info.json +++ b/keyboards/doro67/rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x5247", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h index 63c16c1c710..13bc6fedfe7 100644 --- a/keyboards/draculad/config.h +++ b/keyboards/draculad/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS {D4, C6, D7, E6} -#define MATRIX_COL_PINS {F4, F5,F6, F7, B1} - -#define DIODE_DIRECTION COL2ROW - #ifdef OLED_ENABLE #define OLED_DISPLAY_128X64 #define OLED_TIMEOUT 30000 diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json index 83b071e98bc..926b755b0c9 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/info.json @@ -8,6 +8,11 @@ "pid": "0x1B1E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B6"}, diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h index e701420bee7..6be876da3d5 100644 --- a/keyboards/draytronics/daisy/config.h +++ b/keyboards/draytronics/daisy/config.h @@ -18,23 +18,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B0, C0, C1} -#define MATRIX_COL_PINS { C2, C3, C4, C5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json index c847a456501..c149e3e7de8 100644 --- a/keyboards/draytronics/daisy/info.json +++ b/keyboards/draytronics/daisy/info.json @@ -8,6 +8,11 @@ "pid": "0x4441", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C2", "C3", "C4", "C5"], + "rows": ["B0", "C0", "C1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"}, diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h index 63619e7148e..601a3befa87 100644 --- a/keyboards/draytronics/elise/config.h +++ b/keyboards/draytronics/elise/config.h @@ -18,23 +18,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B2,B3, B1, F0, F1} -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3, D5} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json index 9772e6d8722..0a059ae386f 100644 --- a/keyboards/draytronics/elise/info.json +++ b/keyboards/draytronics/elise/info.json @@ -8,6 +8,11 @@ "pid": "0x454C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], + "rows": ["B2", "B3", "B1", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h index f352f96b395..2c590e67c62 100644 --- a/keyboards/draytronics/elise_v2/config.h +++ b/keyboards/draytronics/elise_v2/config.h @@ -18,23 +18,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B2,B3, B1, F0, F1} -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3, D5} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json index d04e1374ed8..a2194a657a9 100644 --- a/keyboards/draytronics/elise_v2/info.json +++ b/keyboards/draytronics/elise_v2/info.json @@ -8,6 +8,11 @@ "pid": "0x454C", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], + "rows": ["B2", "B3", "B1", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h index c10d9fe3570..4ae200c6a66 100644 --- a/keyboards/draytronics/scarlet/config.h +++ b/keyboards/draytronics/scarlet/config.h @@ -18,24 +18,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } -#define MATRIX_COL_PINS { A5, A6, A7, C7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json index af0894ce3dc..e929c7656dc 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/info.json @@ -8,6 +8,11 @@ "pid": "0x5343", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A5", "A6", "A7", "C7"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h index a7b3056d985..fb8fbcaac5b 100644 --- a/keyboards/drewkeys/iskar/config.h +++ b/keyboards/drewkeys/iskar/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 } -#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json index f3c3896969c..562c231c267 100644 --- a/keyboards/drewkeys/iskar/info.json +++ b/keyboards/drewkeys/iskar/info.json @@ -8,6 +8,11 @@ "pid": "0x1284", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "F6", "F5", "F4", "F7", "F1", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["D6", "D7", "B4", "B5", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h index e13ed8af9db..44c01661259 100644 --- a/keyboards/drhigsby/bkf/config.h +++ b/keyboards/drhigsby/bkf/config.h @@ -15,25 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, F7, B1, B3 } -#define MATRIX_COL_PINS { B6, B2, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/info.json index 49a56a27862..d2a22b3d204 100644 --- a/keyboards/drhigsby/bkf/info.json +++ b/keyboards/drhigsby/bkf/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h index 5de87b2fa10..7cfb519fe9e 100644 --- a/keyboards/drhigsby/dubba175/config.h +++ b/keyboards/drhigsby/dubba175/config.h @@ -15,25 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B3, B2, B5 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json index e9ea824c5f5..6e24721cf95 100644 --- a/keyboards/drhigsby/dubba175/info.json +++ b/keyboards/drhigsby/dubba175/info.json @@ -8,6 +8,11 @@ "pid": "0x0420", "device_version": "4.2.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B6"], + "rows": ["B1", "B3", "B2", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h index b59942ed247..44c01661259 100644 --- a/keyboards/drhigsby/ogurec/config.h +++ b/keyboards/drhigsby/ogurec/config.h @@ -15,25 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, B6, B2 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, F4, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index 31e8816a460..965ef6d8155 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], + "rows": ["F6", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h index 5700fad7d23..44c01661259 100644 --- a/keyboards/drhigsby/packrat/config.h +++ b/keyboards/drhigsby/packrat/config.h @@ -15,25 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B6, B2 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/drhigsby/packrat/info.json b/keyboards/drhigsby/packrat/info.json index b9f92467012..0525824da31 100644 --- a/keyboards/drhigsby/packrat/info.json +++ b/keyboards/drhigsby/packrat/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3"], + "rows": ["F7", "B1", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h index fb60cba3450..d39c818a739 100644 --- a/keyboards/dtisaac/cg108/config.h +++ b/keyboards/dtisaac/cg108/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 } -#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json index d386e9148a8..4da08a7a743 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/info.json @@ -8,6 +8,11 @@ "pid": "0x4973", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], + "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "num_lock": "B5", diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h index 12402c7d3f2..5723fc1e778 100644 --- a/keyboards/dtisaac/dosa40rgb/config.h +++ b/keyboards/dtisaac/dosa40rgb/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B7, D7, F1, F0 } -#define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN D0 #define RGB_MATRIX_LED_COUNT 42 diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index c308aa77f9f..c1a730dda85 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x4973", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], + "rows": ["B7", "D7", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-dfu", "layouts": { diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h deleted file mode 100644 index aa0f99f104d..00000000000 --- a/keyboards/dtisaac/dtisaac01/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 DTIsaac - -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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, B4, D2, B2, B1, B3, D4, D6 } -#define MATRIX_COL_PINS { C7, C6, D0, B5, F0, D7, B0, B7, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index bbbc5ede5df..1d762fd1dbf 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -8,6 +8,11 @@ "pid": "0x4973", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "D0", "B5", "F0", "D7", "B0", "B7", "D1"], + "rows": ["F7", "F6", "F5", "F4", "F1", "B4", "D2", "B2", "B1", "B3", "D4", "D6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h index a50ce96ac34..123779a7ab3 100644 --- a/keyboards/ducky/one2mini/1861st/config.h +++ b/keyboards/ducky/one2mini/1861st/config.h @@ -17,24 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D11, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2, B8 } #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L) diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json index 04138d2dc24..151eee80c14 100644 --- a/keyboards/ducky/one2mini/1861st/info.json +++ b/keyboards/ducky/one2mini/1861st/info.json @@ -6,6 +6,11 @@ "pid": "0x0123", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"], + "rows": ["D11", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "layout_aliases": { "LAYOUT_iso": "LAYOUT_60_iso" }, diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h index 8b29e8c3d44..123779a7ab3 100644 --- a/keyboards/ducky/one2sf/1967st/config.h +++ b/keyboards/ducky/one2sf/1967st/config.h @@ -17,24 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D11, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2,B15,B8 } #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L) diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 2b085cf8da2..81ce8eb2d57 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -7,6 +7,11 @@ "pid": "0x07AF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"], + "rows": ["D11", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dumbo/config.h b/keyboards/dumbo/config.h index da4fb5b4108..5a4dcfdd8f1 100644 --- a/keyboards/dumbo/config.h +++ b/keyboards/dumbo/config.h @@ -14,14 +14,6 @@ along with this program. If not, see . #pragma once - -// wiring -#define MATRIX_ROW_PINS { D4, D7, E6, B4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/dumbo/info.json b/keyboards/dumbo/info.json index 3fe1a8b4f83..5b4a7bb23a7 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/info.json @@ -8,6 +8,11 @@ "pid": "0x25E3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D4", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"}, diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h index c0fa5ec24a3..879046ea07a 100644 --- a/keyboards/dumbpad/config.h +++ b/keyboards/dumbpad/config.h @@ -16,9 +16,5 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions */ -#define DIODE_DIRECTION COL2ROW - /* Reduce tapdance required taps from 5 to 2 */ #define TAPPING_TOGGLE 2 diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h index 2e605318d12..787ff90f352 100644 --- a/keyboards/dumbpad/v0x/config.h +++ b/keyboards/dumbpad/v0x/config.h @@ -16,11 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - /* Onboard LEDs */ #define LED_00 B3 #define LED_01 B1 diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json index cf6adb38016..a3846ef5e58 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.7" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D4"} diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h index 92dd62ea17a..787ff90f352 100644 --- a/keyboards/dumbpad/v0x_dualencoder/config.h +++ b/keyboards/dumbpad/v0x_dualencoder/config.h @@ -16,11 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions - dualencoder version is true 4x4 */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - /* Onboard LEDs */ #define LED_00 B3 #define LED_01 B1 diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json index 8b6294af5f9..6555d4ac7a1 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.6" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "D4"}, diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h index cdc8d665dcf..bb8b6df9e57 100644 --- a/keyboards/dumbpad/v0x_right/config.h +++ b/keyboards/dumbpad/v0x_right/config.h @@ -16,10 +16,6 @@ along with this program. If not, see . */ #pragma once -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - /* Onboard LEDs */ #define LED_00 B1 #define LED_01 B3 diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json index 437d009dc86..1b5e9e87798 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.7" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "D0"} diff --git a/keyboards/dumbpad/v1x/config.h b/keyboards/dumbpad/v1x/config.h index 09adca69e5c..3f65e748ab4 100644 --- a/keyboards/dumbpad/v1x/config.h +++ b/keyboards/dumbpad/v1x/config.h @@ -16,11 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - /* Onboard LEDs */ #define LED_00 B6 #define LED_01 B1 diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json index 8a3d2734151..989abb6dc68 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "D4"} diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h index dce94fd8d4c..8ce24667ae6 100644 --- a/keyboards/dumbpad/v1x_dualencoder/config.h +++ b/keyboards/dumbpad/v1x_dualencoder/config.h @@ -16,11 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - /* Onboard LEDs */ #define LED_00 B6 #define LED_01 B1 diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json index e51452897ac..742eaabd91a 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "D4"}, diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h index 57fac8225fa..1293e859792 100644 --- a/keyboards/dumbpad/v1x_oled/config.h +++ b/keyboards/dumbpad/v1x_oled/config.h @@ -13,13 +13,5 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, B1, B3, B2, B6 } - -/* Column/Row IO definitions */ -#define DIODE_DIRECTION COL2ROW - /* Reduce tapdance required taps from 5 to 2 */ #define TAPPING_TOGGLE 2 diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json index 7576fe2aa50..d0362f05616 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B1", "B3", "B2", "B6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"}, diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h index 82f308f6513..200ce056a7e 100644 --- a/keyboards/dumbpad/v1x_right/config.h +++ b/keyboards/dumbpad/v1x_right/config.h @@ -16,11 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - /* Onboard LEDs - reversed */ #define LED_00 B3 #define LED_01 B1 diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json index 6cef09807bf..ff07570f9e1 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "B2"} diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h index 2c00ba8eef2..7050460d345 100644 --- a/keyboards/dumbpad/v3x/config.h +++ b/keyboards/dumbpad/v3x/config.h @@ -16,10 +16,6 @@ along with this program. If not, see . */ #pragma once -/* Column/Row IO definitions */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - /* Onboard LEDs */ #define LED_00 B1 #define LED_01 B3 diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json index acdbe2c590b..8e613d3f380 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/info.json @@ -5,6 +5,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "D4"} diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h index 98b7bf0dbdf..beb580a5881 100644 --- a/keyboards/durgod/dgk6x/config.h +++ b/keyboards/durgod/dgk6x/config.h @@ -19,9 +19,6 @@ #define WAIT_US_TIMER GPTD3 -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - // Dynamic EEPROM // Something sensible or else VIA may crash // Users may enable more if they wish diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h index 9c2d38d6d91..b60b78ea813 100644 --- a/keyboards/durgod/dgk6x/galaxy/config.h +++ b/keyboards/durgod/dgk6x/galaxy/config.h @@ -16,13 +16,6 @@ #pragma once - -/* key matrix rows */ -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 } - -/* key matrix columns */ -#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11, C12 } - #ifdef RGB_MATRIX_ENABLE #define DRIVER_1_LED_TOTAL 58 #define DRIVER_2_LED_TOTAL 26 diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json index e7b843f107a..c9aa18024e3 100644 --- a/keyboards/durgod/dgk6x/galaxy/info.json +++ b/keyboards/durgod/dgk6x/galaxy/info.json @@ -8,6 +8,11 @@ "pid": "0x6A1A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11", "C12"], + "rows": ["A0", "A1", "A2", "A3", "A4", "A5"] + }, + "diode_direction": "ROW2COL", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h index ff390f5b2e3..b1b29b182af 100644 --- a/keyboards/durgod/dgk6x/hades/config.h +++ b/keyboards/durgod/dgk6x/hades/config.h @@ -16,13 +16,6 @@ #pragma once - -/* key matrix rows */ -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } - -/* key matrix columns */ -#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11 } - #ifdef RGB_MATRIX_ENABLE #define DRIVER_1_LED_TOTAL 58 #define DRIVER_2_LED_TOTAL 10 diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json index 2ebd9c8a415..f553a06c9b3 100644 --- a/keyboards/durgod/dgk6x/hades/info.json +++ b/keyboards/durgod/dgk6x/hades/info.json @@ -8,6 +8,11 @@ "pid": "0x4AD3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "ROW2COL", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h index bb3c168f81e..0709407c889 100644 --- a/keyboards/durgod/dgk6x/venus/config.h +++ b/keyboards/durgod/dgk6x/venus/config.h @@ -16,13 +16,6 @@ #pragma once - -/* key matrix rows */ -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } - -/* key matrix columns */ -#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10 } - #ifdef RGB_MATRIX_ENABLE #define DRIVER_1_LED_TOTAL 53 #define DRIVER_2_LED_TOTAL 8 diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json index c7d020bfdfd..b7ee00bc8d9 100644 --- a/keyboards/durgod/dgk6x/venus/info.json +++ b/keyboards/durgod/dgk6x/venus/info.json @@ -8,6 +8,11 @@ "pid": "0x7EC5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "ROW2COL", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h index 20885ecb295..9d84d391569 100644 --- a/keyboards/durgod/k310/base/config.h +++ b/keyboards/durgod/k310/base/config.h @@ -20,12 +20,6 @@ #define WAIT_US_TIMER GPTD3 -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 } -#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - // Dynamic EEPROM // Something sensible or else VIA may crash // Users may enable more if they wish diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json index 7e5f9aa8d35..6047c40fc05 100644 --- a/keyboards/durgod/k310/base/info.json +++ b/keyboards/durgod/k310/base/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"], + "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C9", "num_lock": "C8", diff --git a/keyboards/durgod/k320/base/config.h b/keyboards/durgod/k320/base/config.h index 3616ab53af2..9d84d391569 100644 --- a/keyboards/durgod/k320/base/config.h +++ b/keyboards/durgod/k320/base/config.h @@ -20,12 +20,6 @@ #define WAIT_US_TIMER GPTD3 -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6 } -#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - // Dynamic EEPROM // Something sensible or else VIA may crash // Users may enable more if they wish diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/info.json index 2fe54b17010..134dcdbd63c 100644 --- a/keyboards/durgod/k320/base/info.json +++ b/keyboards/durgod/k320/base/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"], + "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C9", "scroll_lock": "A8", diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h index fdac282e3b8..02029670029 100644 --- a/keyboards/dz60/config.h +++ b/keyboards/dz60/config.h @@ -1,22 +1,5 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json index 37ba71fcdfb..520605c0d66 100644 --- a/keyboards/dz60/info.json +++ b/keyboards/dz60/info.json @@ -8,6 +8,11 @@ "pid": "0x2260", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index e93336086c6..b6b02cd5ec3 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F0 } -#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 87073419abc..eaed62fef54 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -8,6 +8,11 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index e74f584c91c..419464662b1 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A15, B3, B4, B5, B11 } -#define MATRIX_COL_PINS { B12, B13, B14, A8, B9, C13, C14, C15, A1, A2, A3, A4, A5, A6, A7 } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 54672e21ae2..36dc05b3c90 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -8,6 +8,11 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"], + "rows": ["A15", "B3", "B4", "B5", "B11"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h index dded682184d..82d7b6d1e1d 100644 --- a/keyboards/dztech/dz60rgb/v1/config.h +++ b/keyboards/dztech/dz60rgb/v1/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json index d693e44ecb5..68b332c9cd9 100644 --- a/keyboards/dztech/dz60rgb/v1/info.json +++ b/keyboards/dztech/dz60rgb/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1120", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h index 9cba4b023ce..094478f34d8 100644 --- a/keyboards/dztech/dz60rgb/v2/config.h +++ b/keyboards/dztech/dz60rgb/v2/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json index ddd9fadd3ab..3553fab9b23 100644 --- a/keyboards/dztech/dz60rgb/v2/info.json +++ b/keyboards/dztech/dz60rgb/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1121", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h index 1f3dc86b62f..a753832ed1d 100644 --- a/keyboards/dztech/dz60rgb/v2_1/config.h +++ b/keyboards/dztech/dz60rgb/v2_1/config.h @@ -16,22 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json index 88618d3745c..89e4532160b 100644 --- a/keyboards/dztech/dz60rgb/v2_1/info.json +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -3,6 +3,11 @@ "pid": "0x1121", "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h index 2f7c1cad191..5405d671a52 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json index 5dcb042f965..377c8cd036a 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1220", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h index 5b08f5994c9..545aa64eeaf 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json index 42d21e89314..52070e8996f 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1221", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h index 8d4766eb812..09e76f52d5d 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h @@ -16,22 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended // # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json index 4bdb295eca5..d18a84790d4 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -3,6 +3,11 @@ "pid": "0x1221", "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h index 0381423ee77..cfe82a7323d 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json index 511a797a5c7..278c2458713 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1320", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h index e5f3d86e238..38a1aa2c76d 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json index 3bd3a96b8e6..1265608dbc5 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1321", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h index bbc52f701aa..5bcfb21cf73 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h @@ -16,22 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json index 4eb2b1eca08..bd9e24e8809 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -3,6 +3,11 @@ "pid": "0x1321", "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "debounce": 3 diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h index c212f41c91e..43e1b1c609a 100644 --- a/keyboards/dztech/dz64rgb/config.h +++ b/keyboards/dztech/dz64rgb/config.h @@ -16,11 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -#define DIODE_DIRECTION COL2ROW - #define USB_SUSPEND_WAKEUP_DELAY 5000 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json index efae138c1e0..14d9c0122be 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x1013", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "layouts": { diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h index 005b8096eaa..4a844989752 100644 --- a/keyboards/dztech/dz65rgb/v1/config.h +++ b/keyboards/dztech/dz65rgb/v1/config.h @@ -15,22 +15,6 @@ */ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_PROCESS_LIMIT 4 # define RGB_MATRIX_LED_FLUSH_LIMIT 26 diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json index 9e88a65fe4f..761d31ffb7c 100644 --- a/keyboards/dztech/dz65rgb/v1/info.json +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1420", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h index dd993ae7a9b..04700c84ed5 100644 --- a/keyboards/dztech/dz65rgb/v2/config.h +++ b/keyboards/dztech/dz65rgb/v2/config.h @@ -15,22 +15,6 @@ */ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 } -#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_PROCESS_LIMIT 4 # define RGB_MATRIX_LED_FLUSH_LIMIT 26 diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json index 502b498e926..332acae14d8 100644 --- a/keyboards/dztech/dz65rgb/v2/info.json +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1421", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["F0", "F1", "F4", "E6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h index 69a6f5c50ff..421ae8277c2 100755 --- a/keyboards/dztech/dz65rgb/v3/config.h +++ b/keyboards/dztech/dz65rgb/v3/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 } -#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define USB_SUSPEND_WAKEUP_DELAY 5000 diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index 4d46faea482..d40193459de 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -3,6 +3,11 @@ "pid": "0x1424", "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["F0", "F1", "F4", "E6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms" } diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h deleted file mode 100644 index b22fdf50133..00000000000 --- a/keyboards/dztech/dz96/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 } -#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json index 1119a8f2abd..a7229ce1317 100644 --- a/keyboards/dztech/dz96/info.json +++ b/keyboards/dztech/dz96/info.json @@ -8,6 +8,11 @@ "pid": "0xDB96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], + "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index c07c913bb9c..2200253ff11 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B5 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, C6, C7, F5, F4, F1, F0 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index eb809438374..00ac43a1713 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -8,6 +8,11 @@ "pid": "0x1015", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C6", "C7", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h index 961897c4d65..a8026b4d17c 100644 --- a/keyboards/p3d/glitch/config.h +++ b/keyboards/p3d/glitch/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */ -#define MATRIX_ROW_PINS { D5, D6, B6, D7, C7, B4, B5, D3, D4, C6 } -#define MATRIX_COL_PINS { B2, D2, B3, B7, F5, F4, F1, F0 } - #define RGB_DI_PIN B1 #define RGBLED_NUM 25 #define RGBLIGHT_EFFECT_BREATHING @@ -46,9 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 400 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json index 9aee029a07a..d4e3df24a71 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -8,6 +8,11 @@ "pid": "0x3568", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"], + "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7", "resolution": 2} diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h deleted file mode 100644 index 2b450e8fff3..00000000000 --- a/keyboards/pabile/p18/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 Pabile - -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 - - -/* pin-out for PROMICRO */ -#define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D2, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json index 3859d7852f7..97cca23a296 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/info.json @@ -8,6 +8,11 @@ "pid": "0x6668", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D7", "E6", "B4", "B5"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "F4"}, diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h deleted file mode 100644 index 4505e2718e7..00000000000 --- a/keyboards/pabile/p20/ver1/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 Pabile - -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 - - -/* pin-out */ -#define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 } -#define MATRIX_COL_PINS { D0, B2, D4, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json index 1c5781995f6..afe3fb4853a 100644 --- a/keyboards/pabile/p20/ver1/info.json +++ b/keyboards/pabile/p20/ver1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "B2", "D4", "B6"], + "rows": ["B3", "B4", "B5", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"}, diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h deleted file mode 100644 index ff82e3e1ad5..00000000000 --- a/keyboards/pabile/p20/ver2/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 Pabile - -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 - - -/* pin-out */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { D1, D0, D4, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/info.json index d3c8d8aafc7..7d9951f4de8 100644 --- a/keyboards/pabile/p20/ver2/info.json +++ b/keyboards/pabile/p20/ver2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "B2"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h deleted file mode 100644 index b8bc06ce43a..00000000000 --- a/keyboards/pabile/p40/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 Pabile - -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 - - -/* pin-out -for PCB ver0.01 452019 */ -#define MATRIX_ROW_PINS { F6, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1 } -/* -for pro micro facing back of pcb -#define MATRIX_ROW_PINS { D4, E6, B4, B5 } -#define MATRIX_COL_PINS { D1, D0, B6, B2, B3, B1, F7, F6, F5, F4 } -*/ - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index 088b7ce3248..e630b3f33f3 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -8,6 +8,11 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["F6", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x10"], diff --git a/keyboards/pabile/p40_ortho/config.h b/keyboards/pabile/p40_ortho/config.h deleted file mode 100644 index 6759ee13fd5..00000000000 --- a/keyboards/pabile/p40_ortho/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 Pabile - -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 - - -/* pin-out */ -#define MATRIX_ROW_PINS { D1, D0, F4, F5 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B2, B3, B1, F7, F6 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json index 72cfe178b1b..3ece278ba97 100644 --- a/keyboards/pabile/p40_ortho/info.json +++ b/keyboards/pabile/p40_ortho/info.json @@ -7,6 +7,11 @@ "pid": "0x6669", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D1", "D0", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pabile/p42/config.h b/keyboards/pabile/p42/config.h deleted file mode 100644 index f4a236a0c0d..00000000000 --- a/keyboards/pabile/p42/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 Pabile - -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 - - -/* pin-out for PROMICRO */ -#define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, D2, D3, F7, B1, B3, B2, B6 } - -/* pin-out for BLUEFRUIT -#define MATRIX_ROW_PINS { F7, F6, F5, F4 } -#define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2, C7, D6, B7, B6, B5 } -*/ - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json index f1ef5eda34d..464b10b4ddd 100644 --- a/keyboards/pabile/p42/info.json +++ b/keyboards/pabile/p42/info.json @@ -8,6 +8,11 @@ "pid": "0x6670", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "D2", "D3", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/palette1202/config.h b/keyboards/palette1202/config.h index d3c5f5edc07..6c2ebfdc393 100644 --- a/keyboards/palette1202/config.h +++ b/keyboards/palette1202/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B6, B2, B3 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Register custom font file */ #ifdef OLED_ENABLE #define OLED_FONT_H "lib/glcdfont.c" diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json index 6698af203be..f8587610df4 100644 --- a/keyboards/palette1202/info.json +++ b/keyboards/palette1202/info.json @@ -8,6 +8,11 @@ "pid": "0x1202", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B6", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5", "resolution": 2}, diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h index 422b15b864e..89d5a52301d 100644 --- a/keyboards/panc40/config.h +++ b/keyboards/panc40/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5 } -#define MATRIX_COL_PINS { F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D0, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json index db7a1ead868..60618f67942 100644 --- a/keyboards/panc40/info.json +++ b/keyboards/panc40/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1"], + "rows": ["F0", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h index 32e6c4bd38e..d324ea3f813 100644 --- a/keyboards/panc60/config.h +++ b/keyboards/panc60/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 12 -#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json index 4daeffe7639..80357af0915 100644 --- a/keyboards/panc60/info.json +++ b/keyboards/panc60/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h index 33501650400..7848476216d 100644 --- a/keyboards/papercranekeyboards/gerald65/config.h +++ b/keyboards/papercranekeyboards/gerald65/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B7, D6, E6, B4, B5 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D7, D4, D3, D2, D1, D0, B6, C6, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* 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/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json index 63b5e325f33..80b8f115b20 100644 --- a/keyboards/papercranekeyboards/gerald65/info.json +++ b/keyboards/papercranekeyboards/gerald65/info.json @@ -8,6 +8,11 @@ "pid": "0x1501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D4", "D3", "D2", "D1", "D0", "B6", "C6", "C7"], + "rows": ["B7", "D6", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h index 91c434bba49..cfd4fba9073 100644 --- a/keyboards/paprikman/albacore/config.h +++ b/keyboards/paprikman/albacore/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, C7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json index 8e36e83b94f..e415a587ca3 100644 --- a/keyboards/paprikman/albacore/info.json +++ b/keyboards/paprikman/albacore/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4"], + "rows": ["D5", "C7"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 0] }, diff --git a/keyboards/parallel/parallel_65/hotswap/config.h b/keyboards/parallel/parallel_65/hotswap/config.h index 049325aeab8..4dfd5e1d021 100644 --- a/keyboards/parallel/parallel_65/hotswap/config.h +++ b/keyboards/parallel/parallel_65/hotswap/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#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 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/parallel/parallel_65/hotswap/info.json b/keyboards/parallel/parallel_65/hotswap/info.json index 91b32a6c91b..6d45c27faa1 100644 --- a/keyboards/parallel/parallel_65/hotswap/info.json +++ b/keyboards/parallel/parallel_65/hotswap/info.json @@ -7,6 +7,11 @@ "pid": "0x5069", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/parallel/parallel_65/soldered/config.h b/keyboards/parallel/parallel_65/soldered/config.h index 049325aeab8..4dfd5e1d021 100644 --- a/keyboards/parallel/parallel_65/soldered/config.h +++ b/keyboards/parallel/parallel_65/soldered/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#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 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/parallel/parallel_65/soldered/info.json b/keyboards/parallel/parallel_65/soldered/info.json index 5ae3d5443b8..79df81ddcbe 100644 --- a/keyboards/parallel/parallel_65/soldered/info.json +++ b/keyboards/parallel/parallel_65/soldered/info.json @@ -7,6 +7,11 @@ "pid": "0x5068", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/pdxkbc/config.h b/keyboards/pdxkbc/config.h index f471e135d58..2f8b6d1f5b3 100644 --- a/keyboards/pdxkbc/config.h +++ b/keyboards/pdxkbc/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F7, B6, F4 } -#define MATRIX_COL_PINS { D1, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/pdxkbc/info.json b/keyboards/pdxkbc/info.json index e86295207c3..522d7959b05 100644 --- a/keyboards/pdxkbc/info.json +++ b/keyboards/pdxkbc/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "E6"], + "rows": ["F7", "B6", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h index 51e4b85e749..2a51abdab27 100644 --- a/keyboards/pearl/config.h +++ b/keyboards/pearl/config.h @@ -28,8 +28,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 12 - -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3} - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json index 96357ad3463..a2648599ada 100644 --- a/keyboards/pearl/info.json +++ b/keyboards/pearl/info.json @@ -7,6 +7,11 @@ "pid": "0x0348", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h index 92cef2fde0d..8725d8ab07d 100644 --- a/keyboards/pearlboards/atlas/config.h +++ b/keyboards/pearlboards/atlas/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D6, E1, C0, C4, E3 } -#define MATRIX_COL_PINS { D5, D4, C1, C2, C3, C5, C7, A7, A6, A5, A4, A3, A2, A1, A0, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Audio Function */ #define AUDIO_CLICKY #define AUDIO_PIN C6 diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json index 77c129e79fe..f5e1be9ac36 100644 --- a/keyboards/pearlboards/atlas/info.json +++ b/keyboards/pearlboards/atlas/info.json @@ -8,6 +8,11 @@ "pid": "0x6964", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"], + "rows": ["D6", "E1", "C0", "C4", "E3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E0", "pin_b": "D7", "resolution": 1} diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h index c039db9a159..984541d1d6b 100644 --- a/keyboards/pearlboards/pandora/config.h +++ b/keyboards/pearlboards/pandora/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, D7, D6, B3, B0 } -#define MATRIX_COL_PINS { D2, D1, D0, D3, D5, B5, B6, B7, D4, C6, C7, F0, F1, F4, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define DIP_SWITCH_PINS { B2, B5 } /*== all animations enabled ==*/ diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json index 0114fb8e78b..d482167bc0e 100644 --- a/keyboards/pearlboards/pandora/info.json +++ b/keyboards/pearlboards/pandora/info.json @@ -8,6 +8,11 @@ "pid": "0x6963", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "B6", "B7", "D4", "C6", "C7", "F0", "F1", "F4", "F7"], + "rows": ["B4", "D7", "D6", "B3", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5", "resolution": 1} diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h index 3faaca26a02..5f9978cbdc9 100644 --- a/keyboards/pearlboards/pearl/config.h +++ b/keyboards/pearlboards/pearl/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D3, F7, F0, E6 } -#define MATRIX_COL_PINS { D2, F1, F4, F5, F6, C7, B6, B5, B4, D7, D6, D4, D5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Audio Function */ #define AUDIO_CLICKY #define AUDIO_PIN C6 diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json index f6082c1d378..a1e90c64319 100644 --- a/keyboards/pearlboards/pearl/info.json +++ b/keyboards/pearlboards/pearl/info.json @@ -8,6 +8,11 @@ "pid": "0x6965", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["D3", "F7", "F0", "E6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "num_lock": "B1", diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h index deb979dd061..4185a8f8503 100644 --- a/keyboards/pearlboards/zeus/config.h +++ b/keyboards/pearlboards/zeus/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, C1, E1, E0, D7, D6 } -#define MATRIX_COL_PINS { F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C7, C2, C0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Audio Function */ #define AUDIO_CLICKY #define AUDIO_PIN C6 diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json index 3d2f44a892c..7de8efb8d7b 100644 --- a/keyboards/pearlboards/zeus/info.json +++ b/keyboards/pearlboards/zeus/info.json @@ -8,6 +8,11 @@ "pid": "0x6966", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"], + "rows": ["F0", "C1", "E1", "E0", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E7", "pin_b": "E6", "resolution": 1} diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h index f61e11fca90..bc31fb049e5 100644 --- a/keyboards/pearlboards/zeuspad/config.h +++ b/keyboards/pearlboards/zeuspad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D3, D5, F7, F4, F1 } -#define MATRIX_COL_PINS { B0, F0, F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* OLED Settings */ #define OLED_TIMEOUT 120000 #define OLED_FADE_OUT diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json index 3258e758a87..6b5cb66ad4c 100644 --- a/keyboards/pearlboards/zeuspad/info.json +++ b/keyboards/pearlboards/zeuspad/info.json @@ -8,6 +8,11 @@ "pid": "0x6967", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "F0", "F5", "F6"], + "rows": ["D2", "D3", "D5", "F7", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D4", "resolution": 1} diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h index 032cdf4e234..0079764d8e4 100644 --- a/keyboards/peej/lumberjack/config.h +++ b/keyboards/peej/lumberjack/config.h @@ -16,11 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1 } -#define MATRIX_COL_PINS { B0, D7, D6, D5, D4, D1, D0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json index 7e3878151fe..8c37a5bf740 100644 --- a/keyboards/peej/lumberjack/info.json +++ b/keyboards/peej/lumberjack/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h index 0bd9a069d09..265558e5159 100644 --- a/keyboards/peej/rosaline/config.h +++ b/keyboards/peej/rosaline/config.h @@ -16,11 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 } -#define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json index 2be28d4ef65..fcd6fce1b47 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json index f37e073fbd4..f110f0e3253 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layout_aliases": { diff --git a/keyboards/peej/tripel/config.h b/keyboards/peej/tripel/config.h deleted file mode 100644 index 2d50ad8038f..00000000000 --- a/keyboards/peej/tripel/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -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 { C6, D4, D0, B4, E6, D7, D1, D2, D3 } -#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json index 3816cf75926..c5aebfd1069 100644 --- a/keyboards/peej/tripel/info.json +++ b/keyboards/peej/tripel/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pegasus/config.h b/keyboards/pegasus/config.h index 78ade39d772..de6628cfbd8 100644 --- a/keyboards/pegasus/config.h +++ b/keyboards/pegasus/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F1, F4, E6 } -#define MATRIX_COL_PINS { D2, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/pegasus/info.json b/keyboards/pegasus/info.json index d6663796f87..0aaa062f4bb 100644 --- a/keyboards/pegasus/info.json +++ b/keyboards/pegasus/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], + "rows": ["F0", "F1", "F4", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h index b452a0dcb62..35a7541060d 100644 --- a/keyboards/percent/booster/config.h +++ b/keyboards/percent/booster/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D1, D6, D7, B4, B5 } -#define MATRIX_COL_PINS { C7, D4, D2, D0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json index f92476c9f6c..89b0744ee0f 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/info.json @@ -8,6 +8,11 @@ "pid": "0x4253", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D4", "D2", "D0"], + "rows": ["D1", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h index 69f53905fce..b7aa6ca2e9c 100644 --- a/keyboards/percent/canoe/config.h +++ b/keyboards/percent/canoe/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 2 -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json index 951e55ec641..2933386c5fb 100644 --- a/keyboards/percent/canoe/info.json +++ b/keyboards/percent/canoe/info.json @@ -8,6 +8,11 @@ "pid": "0x434E", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h index 7138fe39391..f5bfd300280 100644 --- a/keyboards/percent/canoe_gen2/config.h +++ b/keyboards/percent/canoe_gen2/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B3,B2,F5,F4} -#define MATRIX_COL_PINS {B0,D0,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,F6,F7} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json index e84a8359918..9426dd27b91 100644 --- a/keyboards/percent/canoe_gen2/info.json +++ b/keyboards/percent/canoe_gen2/info.json @@ -8,6 +8,11 @@ "pid": "0x89F0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"], + "rows": ["B1", "B3", "B2", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"], diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h index 274d30df727..6907429c391 100644 --- a/keyboards/percent/skog/config.h +++ b/keyboards/percent/skog/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 } -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json index 80c7d832c4e..5dc22d2874e 100644 --- a/keyboards/percent/skog/info.json +++ b/keyboards/percent/skog/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], + "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 5 diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h index b00a612cd7f..75b78de22de 100644 --- a/keyboards/percent/skog_lite/config.h +++ b/keyboards/percent/skog_lite/config.h @@ -20,12 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 18 -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B5 } -#define MATRIX_COL_PINS { C4, C2, D7, C7, C6, A0, A1, A2, A3, A7, A6, A4, A5, C5, C3} - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json index 74abc67bdc5..c6151dfba98 100644 --- a/keyboards/percent/skog_lite/info.json +++ b/keyboards/percent/skog_lite/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C4", "C2", "D7", "C7", "C6", "A0", "A1", "A2", "A3", "A7", "A6", "A4", "A5", "C5", "C3"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h index d3eee645bf7..5e5150abe19 100644 --- a/keyboards/phage_studio/pila87/config.h +++ b/keyboards/phage_studio/pila87/config.h @@ -17,14 +17,6 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { A1, A2, A10, A9, A8, C9 } -#define MATRIX_COL_PINS { B5, B4, B6, C0, C1, C2, C3, B7, B3, D2, C12, C11, C10, A15, C15, C13, A3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 91 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json index 5bba67c6831..59191d61d51 100644 --- a/keyboards/phage_studio/pila87/info.json +++ b/keyboards/phage_studio/pila87/info.json @@ -8,6 +8,11 @@ "pid": "0x5887", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"], + "rows": ["A1", "A2", "A10", "A9", "A8", "C9"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C14", "scroll_lock": "A0" diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h index 37e5c3bcc33..2496cdd216d 100644 --- a/keyboards/phantom/config.h +++ b/keyboards/phantom/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 20 diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json index b246ac36fe9..3c1b5715a47 100644 --- a/keyboards/phantom/info.json +++ b/keyboards/phantom/info.json @@ -8,6 +8,11 @@ "pid": "0x5B50", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], + "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6", "scroll_lock": "B7" diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h index cf2ab2ffcb0..11fc714e6e5 100644 --- a/keyboards/phase_studio/titan65/hotswap/config.h +++ b/keyboards/phase_studio/titan65/hotswap/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, B5, B6, C6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, F0, F1, C7, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 67 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json index d1e2b0e58b9..ce4d3cf4b56 100644 --- a/keyboards/phase_studio/titan65/hotswap/info.json +++ b/keyboards/phase_studio/titan65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xBB91", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"], + "rows": ["B4", "B5", "B6", "C6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/phase_studio/titan65/soldered/config.h b/keyboards/phase_studio/titan65/soldered/config.h deleted file mode 100644 index a53a1ea4cea..00000000000 --- a/keyboards/phase_studio/titan65/soldered/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) - * - * 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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B6, C6, C7, F7, E6 } -#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, F0, B0, B1, B2, B3 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/info.json index ba7d9f9354e..0973cfba05c 100644 --- a/keyboards/phase_studio/titan65/soldered/info.json +++ b/keyboards/phase_studio/titan65/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0xBB92", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"], + "rows": ["B6", "C6", "C7", "F7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/phoenix/config.h b/keyboards/phoenix/config.h index 2ada33779de..76ac0edf2cf 100644 --- a/keyboards/phoenix/config.h +++ b/keyboards/phoenix/config.h @@ -23,14 +23,9 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -#define DIODE_DIRECTION ROW2COL - /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define MATRIX_ROW_PINS { B1, B0, A7, A6, A5, B7 } -#define MATRIX_COL_PINS { B10, B12, B13, B14, B15, A8, A10 } - #define HAL_USE_SERIAL TRUE #define SPLIT_HAND_PIN B9 #define SERIAL_USART_DRIVER SD1 diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json index c9147ab8d82..f2f82d6d7cf 100644 --- a/keyboards/phoenix/info.json +++ b/keyboards/phoenix/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"], + "rows": ["B1", "B0", "A7", "A6", "A5", "B7"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "A9" }, diff --git a/keyboards/phrygian/ph100/config.h b/keyboards/phrygian/ph100/config.h deleted file mode 100644 index e4ceee2d486..00000000000 --- a/keyboards/phrygian/ph100/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 Phrygian Design - * - * 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 { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/phrygian/ph100/info.json b/keyboards/phrygian/ph100/info.json index 961488898af..5930a8266f3 100644 --- a/keyboards/phrygian/ph100/info.json +++ b/keyboards/phrygian/ph100/info.json @@ -8,6 +8,11 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B15", "num_lock": "B14" diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h index 7a97d2c42d5..789626b6da2 100644 --- a/keyboards/pico/65keys/config.h +++ b/keyboards/pico/65keys/config.h @@ -16,15 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/pico/65keys/info.json b/keyboards/pico/65keys/info.json index 53389861e83..f96b487d783 100644 --- a/keyboards/pico/65keys/info.json +++ b/keyboards/pico/65keys/info.json @@ -8,6 +8,11 @@ "pid": "0x9692", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h index 7a97d2c42d5..789626b6da2 100644 --- a/keyboards/pico/70keys/config.h +++ b/keyboards/pico/70keys/config.h @@ -16,15 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/pico/70keys/info.json b/keyboards/pico/70keys/info.json index 5dc25ede278..593e8eeb87e 100644 --- a/keyboards/pico/70keys/info.json +++ b/keyboards/pico/70keys/info.json @@ -8,6 +8,11 @@ "pid": "0x9692", "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h index 75857b01556..51b917771af 100644 --- a/keyboards/picolab/frusta_fundamental/config.h +++ b/keyboards/picolab/frusta_fundamental/config.h @@ -16,17 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B2, B3, B7, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCING 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json index 130b1839bf2..8e37509ca6c 100644 --- a/keyboards/picolab/frusta_fundamental/info.json +++ b/keyboards/picolab/frusta_fundamental/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h index e29507dde78..47143f7cd63 100755 --- a/keyboards/pimentoso/paddino02/rev1/config.h +++ b/keyboards/pimentoso/paddino02/rev1/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json index f7fbee01d16..67fb157d8e4 100644 --- a/keyboards/pimentoso/paddino02/rev1/info.json +++ b/keyboards/pimentoso/paddino02/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0020", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h index 976f02f2612..47143f7cd63 100755 --- a/keyboards/pimentoso/paddino02/rev2/left/config.h +++ b/keyboards/pimentoso/paddino02/rev2/left/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D4, D1 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json index 90d7e4e90d4..5d46fbbf23b 100644 --- a/keyboards/pimentoso/paddino02/rev2/left/info.json +++ b/keyboards/pimentoso/paddino02/rev2/left/info.json @@ -8,6 +8,11 @@ "pid": "0x0021", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["D0", "D4", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h index 206f0a5429f..47143f7cd63 100755 --- a/keyboards/pimentoso/paddino02/rev2/right/config.h +++ b/keyboards/pimentoso/paddino02/rev2/right/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F6, F5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json index 3e361839f33..d7a29410b08 100644 --- a/keyboards/pimentoso/paddino02/rev2/right/info.json +++ b/keyboards/pimentoso/paddino02/rev2/right/info.json @@ -8,6 +8,11 @@ "pid": "0x0022", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1"], + "rows": ["F4", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h index ce44b3ad20d..0916e7b7290 100644 --- a/keyboards/pimentoso/touhoupad/config.h +++ b/keyboards/pimentoso/touhoupad/config.h @@ -15,12 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { D4 } -#define MATRIX_COL_PINS { C6,D7,E6,B4,B6,B2,B3,B1,F7,F6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json index 755b1cf6ba9..a4db1d10641 100644 --- a/keyboards/pimentoso/touhoupad/info.json +++ b/keyboards/pimentoso/touhoupad/info.json @@ -8,6 +8,11 @@ "pid": "0x0031", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h deleted file mode 100644 index bd8fa8fb696..00000000000 --- a/keyboards/pinky/3/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2018 'Masayuki Sunahara' - * - * 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 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } - -// wiring of each half -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json index 4c96ddfc877..13a87f91210 100644 --- a/keyboards/pinky/3/info.json +++ b/keyboards/pinky/3/info.json @@ -8,6 +8,11 @@ "pid": "0x7033", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h deleted file mode 100644 index c0185d34461..00000000000 --- a/keyboards/pinky/4/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2018 'Masayuki Sunahara' - * - * 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 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } - -// wiring of each half -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json index cc1bbb1edd8..2c1732ea169 100644 --- a/keyboards/pinky/4/info.json +++ b/keyboards/pinky/4/info.json @@ -8,6 +8,11 @@ "pid": "0x7034", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h index 01210f2a0f5..4cb5aaf54e3 100644 --- a/keyboards/pisces/config.h +++ b/keyboards/pisces/config.h @@ -21,22 +21,6 @@ #define MATRIX_MASKED #define SPLIT_USB_DETECT -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C4, B0, C7 } -#define MATRIX_COL_PINS { B1, B2, B3, B4, B5, B6, B7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/pisces/info.json b/keyboards/pisces/info.json index e7243bfc8db..f1d548a8a05 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"], + "rows": ["C4", "B0", "C7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h index 43026552e1f..2b5ec82860c 100644 --- a/keyboards/pixelspace/capsule65i/config.h +++ b/keyboards/pixelspace/capsule65i/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, D1, B7, D0, F5 } -#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json index f63ec17aeef..70041085529 100644 --- a/keyboards/pixelspace/capsule65i/info.json +++ b/keyboards/pixelspace/capsule65i/info.json @@ -8,6 +8,11 @@ "pid": "0xE66E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"], + "rows": ["F4", "D1", "B7", "D0", "F5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6" }, diff --git a/keyboards/pizzakeyboards/pizza65/config.h b/keyboards/pizzakeyboards/pizza65/config.h index 3c36c8ca6fd..1500ab9b880 100644 --- a/keyboards/pizzakeyboards/pizza65/config.h +++ b/keyboards/pizzakeyboards/pizza65/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B15, A10, F1, A0, A1 } -#define MATRIX_COL_PINS { A9, A8, F0, A2, A3, A4, B9, B8, B7, B6, B5, B4, B3, A15, A14, A13} - -#define DIODE_DIRECTION COL2ROW - /* 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/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json index bbba5ae0e96..e488cd3cc59 100644 --- a/keyboards/pizzakeyboards/pizza65/info.json +++ b/keyboards/pizzakeyboards/pizza65/info.json @@ -8,6 +8,11 @@ "pid": "0x707A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "A8", "F0", "A2", "A3", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"], + "rows": ["B15", "A10", "F1", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h deleted file mode 100644 index 932c66ba01d..00000000000 --- a/keyboards/pjb/eros/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 PJB - * - * 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 { B2, B1, B0, D7, B7, D1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json index cbba6dceccd..fab701e2203 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/info.json @@ -8,6 +8,11 @@ "pid": "0x4552", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D5", "B4", "D3", "D2", "E6", "B3"], + "rows": ["B2", "B1", "B0", "D7", "B7", "D1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D6", "scroll_lock": "D0", diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h index fa0a4567f9b..7114397adfe 100644 --- a/keyboards/pkb65/config.h +++ b/keyboards/pkb65/config.h @@ -21,14 +21,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, C6, B6, B7, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/info.json index 50be7dff7df..41438841dba 100644 --- a/keyboards/pkb65/info.json +++ b/keyboards/pkb65/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["C7", "C6", "B6", "B7", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index ff4b7bb3aa6..84c2fd11dcb 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -17,17 +17,9 @@ along with this program. If not, see . #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { D0, D5, B5, B6 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } - #define AUDIO_VOICES #define AUDIO_PIN C6 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/planck/ez/config.h b/keyboards/planck/ez/config.h index 04bfc314ce6..6828e4dce23 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -18,23 +18,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 } - #define MUSIC_MAP #undef AUDIO_VOICES #undef AUDIO_PIN diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index ae67be691dd..786814b9878 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -6,6 +6,11 @@ "vid": "0x3297", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], + "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h index 7a64f87174a..d4001dd80bc 100644 --- a/keyboards/planck/light/config.h +++ b/keyboards/planck/light/config.h @@ -1,14 +1,5 @@ #pragma once - -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS \ - { B0, E7, F0, F1 } -#define MATRIX_COL_PINS \ - { E6, E3, E4, D3, D4, D5, C0, A7, A6, E1, E0, D7 } - #define AUDIO_PIN C6 #define AUDIO_PIN_ALT B5 diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json index c2ab19563e0..59588997592 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/info.json @@ -8,6 +8,11 @@ "pid": "0xBEA2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"], + "rows": ["B0", "E7", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A5" }, diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json index ebf11c9c8b5..649132c30cc 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xAE01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "D5", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json index b7a3a31628b..ac4c605313b 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0xAE01", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "D5", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json index 4ba0085cda1..c853b9230d1 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0xAE01", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "D5", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json index 46513d8248b..c541e2dc4d5 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/info.json @@ -8,6 +8,11 @@ "pid": "0xAE01", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "D5", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index 9fb2ae811e2..883572e8e11 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -8,6 +8,11 @@ "pid": "0xAE01", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "D5", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index a60c086b5b6..5bde6595092 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -17,23 +17,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -/* Note: These are not used for arm boards. They're here purely as documentation. */ -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 } - #define DIP_SWITCH_PINS { B14, A15, A0, B9 } #define MUSIC_MAP diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json index 9cc60ab5f02..904b998d039 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/info.json @@ -8,6 +8,11 @@ "pid": "0xA4F9", "device_version": "0.0.6" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], + "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index 192d3fc6d8e..296e1ac6d96 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -17,25 +17,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -/* Note: These are not used for arm boards. They're here purely as documentation. */ -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS \ - { A10, A9, A8, B15, C13, C14, C15, A2 } -#define MATRIX_COL_PINS \ - { B11, B10, B2, B1, A7, B0 } - #define DIP_SWITCH_PINS \ { B14, A15, A0, B9 } diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json index 828f0c20b8e..0b5279b2fbf 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/info.json @@ -8,6 +8,11 @@ "pid": "0xA4F9", "device_version": "0.0.6" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], + "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h index bd93164345c..832fb0789cc 100644 --- a/keyboards/planck/thk/config.h +++ b/keyboards/planck/thk/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -// THK has a different pin-out -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS { A7, A6, A5, A4 } -#define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A3, A2, A1, A0, B0 } - #define TAPPING_TOGGLE 3 #define DIP_SWITCH_PINS { D0, D1, D4, D6 } diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index 418dda97dad..c99041be74e 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json @@ -8,6 +8,11 @@ "pid": "0x25A7", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"], + "rows": ["A7", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B3"}, diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h index 1c1085c9a11..f7e0e04949b 100644 --- a/keyboards/playkbtw/ca66/config.h +++ b/keyboards/playkbtw/ca66/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { F5, F4, F1, B0, B3 } -#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, F6, B7, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json index 809eaa0c393..8cd12628a4f 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "F6", "B7", "E6"], + "rows": ["F5", "F4", "F1", "B0", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "F0" }, diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h index b91943278f7..2a5d98951ab 100644 --- a/keyboards/playkbtw/helen80/config.h +++ b/keyboards/playkbtw/helen80/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 } -#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 87 diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json index 2efe949d758..becce0932e2 100644 --- a/keyboards/playkbtw/helen80/info.json +++ b/keyboards/playkbtw/helen80/info.json @@ -8,6 +8,11 @@ "pid": "0x4845", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], + "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "scroll_lock": "B2", diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h index 42f15b3352f..dd2126d0726 100644 --- a/keyboards/playkbtw/pk60/config.h +++ b/keyboards/playkbtw/pk60/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json index 5909204f293..86adea4b619 100644 --- a/keyboards/playkbtw/pk60/info.json +++ b/keyboards/playkbtw/pk60/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h index 91cba0f8e32..4adfcb7db27 100644 --- a/keyboards/playkbtw/pk64rgb/config.h +++ b/keyboards/playkbtw/pk64rgb/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 } -#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, B1, B2, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json index 7cb2950d6a0..738e96b7818 100644 --- a/keyboards/playkbtw/pk64rgb/info.json +++ b/keyboards/playkbtw/pk64rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x3634", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], + "rows": ["D7", "D6", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["64_ansi"], diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h index 21c01e89ee5..fc758dec34e 100644 --- a/keyboards/pluckey/config.h +++ b/keyboards/pluckey/config.h @@ -17,20 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, F5, F6, B6, B5 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, F7 } -#define DIODE_DIRECTION COL2ROW - /* 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/pluckey/info.json b/keyboards/pluckey/info.json index faeb0df2f42..5b559d48b73 100644 --- a/keyboards/pluckey/info.json +++ b/keyboards/pluckey/info.json @@ -8,6 +8,11 @@ "pid": "0x91CE", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"], + "rows": ["B4", "F5", "F6", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2", "resolution": 2} diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h index 3e9f66e3d3d..389b5ff3942 100644 --- a/keyboards/plume/plume65/config.h +++ b/keyboards/plume/plume65/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D2, D5, E6, D0, D1 } -#define MATRIX_COL_PINS { B7, F7, C7, C6, B6, F0, B5, F1, B4, F4, D7, F5, D6, F6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #define RGBLED_NUM 10 // #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json index 1937223b02e..7a3570a0d51 100644 --- a/keyboards/plume/plume65/info.json +++ b/keyboards/plume/plume65/info.json @@ -8,6 +8,11 @@ "pid": "0x22CF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "F7", "C7", "C6", "B6", "F0", "B5", "F1", "B4", "F4", "D7", "F5", "D6", "F6", "D4"], + "rows": ["D2", "D5", "E6", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D2", "esc_output": "B7" diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h index 63cc719d84e..2e0377a2c9f 100644 --- a/keyboards/plut0nium/0x3e/config.h +++ b/keyboards/plut0nium/0x3e/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D5, D4, D6, D7, B4, B5, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* * RGB Underglow */ diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json index 52ad743a0a5..5e96db2c280 100644 --- a/keyboards/plut0nium/0x3e/info.json +++ b/keyboards/plut0nium/0x3e/info.json @@ -8,6 +8,11 @@ "pid": "0x3E01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D5", "D4", "D6", "D7", "B4", "B5", "B6"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 6, diff --git a/keyboards/plx/config.h b/keyboards/plx/config.h deleted file mode 100644 index f878ff1e51d..00000000000 --- a/keyboards/plx/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 Peac Design and Basekeys - * - * 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 - - -/* key matrix pins */ - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D4, D6, D7, B4, B5, B6, C6, C7, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/plx/info.json b/keyboards/plx/info.json index fe0e02d2996..0e153d81f06 100644 --- a/keyboards/plx/info.json +++ b/keyboards/plx/info.json @@ -8,6 +8,11 @@ "pid": "0xE972", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/plywrks/ahgase/config.h b/keyboards/plywrks/ahgase/config.h index d11082a188d..06b97ae4ab8 100644 --- a/keyboards/plywrks/ahgase/config.h +++ b/keyboards/plywrks/ahgase/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/info.json index 02c5e0c8b21..3a9116340dd 100644 --- a/keyboards/plywrks/ahgase/info.json +++ b/keyboards/plywrks/ahgase/info.json @@ -8,6 +8,11 @@ "pid": "0x7902", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"], + "rows": ["B2", "B3", "B7", "D6", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h index 6e6827f0e8f..e6bfca0aa42 100644 --- a/keyboards/plywrks/lune/config.h +++ b/keyboards/plywrks/lune/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F1, F0, B7, B0, B6, B5, D7, B4, D6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json index 2061b282e4c..6f3f8b8421a 100644 --- a/keyboards/plywrks/lune/info.json +++ b/keyboards/plywrks/lune/info.json @@ -8,6 +8,11 @@ "pid": "0x7901", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"], + "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h index 12721a16b05..59c9e7b69ed 100644 --- a/keyboards/pohjolaworks/louhi/config.h +++ b/keyboards/pohjolaworks/louhi/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D7, C6, B4, E6 } -#define MATRIX_COL_PINS { D4, B6, F4, F5, F6, F7, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B5 #ifdef RGB_DI_PIN # define RGBLED_NUM 14 diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json index 0185fe83bbd..1e16cf9cfb3 100644 --- a/keyboards/pohjolaworks/louhi/info.json +++ b/keyboards/pohjolaworks/louhi/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "B6", "F4", "F5", "F6", "F7", "B1"], + "rows": ["D3", "D2", "D1", "D0", "D7", "C6", "B4", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h index 3332d62aa68..dfec066dab4 100644 --- a/keyboards/poker87c/config.h +++ b/keyboards/poker87c/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 } -#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 95 diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json index 04c16583a61..94098f77197 100644 --- a/keyboards/poker87c/info.json +++ b/keyboards/poker87c/info.json @@ -8,6 +8,11 @@ "pid": "0x087C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], + "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h index fbee1e1858a..2c30da76858 100644 --- a/keyboards/poker87d/config.h +++ b/keyboards/poker87d/config.h @@ -16,22 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 } -#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 125 diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json index 22a09c541e2..c90fa21e3e3 100644 --- a/keyboards/poker87d/info.json +++ b/keyboards/poker87d/info.json @@ -8,6 +8,11 @@ "pid": "0x087D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], + "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json index 7bae2abb0d5..4825ea2b5d1 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B1", "B0", "A7", "F1", "A0"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F042", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h index e53b6d28d1f..3b3b9b0fb79 100644 --- a/keyboards/polilla/rev1/config.h +++ b/keyboards/polilla/rev1/config.h @@ -19,23 +19,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B0, A7, F1, A0 } -#define MATRIX_COL_PINS { A6, A5, A4, A3, A2, A1, F0, B7, B6, B5, B4, B3 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h index 6cb2e623085..18844c7f951 100644 --- a/keyboards/polycarbdiet/s20/config.h +++ b/keyboards/polycarbdiet/s20/config.h @@ -16,14 +16,6 @@ along with this program. If not, see . #pragma once - -// 1 2 3 4 5 -#define MATRIX_ROW_PINS { B7, E6, D0, D1, D5 } -#define MATRIX_COL_PINS { C6, C7, D4, D6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json index 5c2ce531508..1398f34cab1 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/info.json @@ -8,6 +8,11 @@ "pid": "0x7320", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "D4", "D6"], + "rows": ["B7", "E6", "D0", "D1", "D5"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h index e59d45ca45e..9b560ee1f5d 100644 --- a/keyboards/pom_keyboards/tnln95/config.h +++ b/keyboards/pom_keyboards/tnln95/config.h @@ -16,23 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B6, B4, B0, D7, E6, D4, F5, D6, C6, B5 } -#define MATRIX_COL_PINS { F4, F1, F0, F6, F7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json index ea829767bac..06dc68f8531 100644 --- a/keyboards/pom_keyboards/tnln95/info.json +++ b/keyboards/pom_keyboards/tnln95/info.json @@ -8,6 +8,11 @@ "pid": "0x3931", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "F6", "F7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B6", "B4", "B0", "D7", "E6", "D4", "F5", "D6", "C6", "B5"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "levels": 10, diff --git a/keyboards/portal_66/hotswap/config.h b/keyboards/portal_66/hotswap/config.h index 049325aeab8..4dfd5e1d021 100644 --- a/keyboards/portal_66/hotswap/config.h +++ b/keyboards/portal_66/hotswap/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#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 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/portal_66/hotswap/info.json b/keyboards/portal_66/hotswap/info.json index 3951d86e3f5..9a8e12047ef 100644 --- a/keyboards/portal_66/hotswap/info.json +++ b/keyboards/portal_66/hotswap/info.json @@ -7,6 +7,11 @@ "pid": "0x5067", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/portal_66/soldered/config.h b/keyboards/portal_66/soldered/config.h index 049325aeab8..4dfd5e1d021 100644 --- a/keyboards/portal_66/soldered/config.h +++ b/keyboards/portal_66/soldered/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#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 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/portal_66/soldered/info.json b/keyboards/portal_66/soldered/info.json index ba92bd89738..34dd599d44d 100644 --- a/keyboards/portal_66/soldered/info.json +++ b/keyboards/portal_66/soldered/info.json @@ -7,6 +7,11 @@ "pid": "0x5066", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/pos78/config.h b/keyboards/pos78/config.h index 25070624db6..4739dcb2ad3 100644 --- a/keyboards/pos78/config.h +++ b/keyboards/pos78/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B2, B1, D2, D3, D1, D0, C6, E6, B5, B6, B7, D6, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* 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/pos78/info.json b/keyboards/pos78/info.json index 6e8788300f9..53b198ba811 100644 --- a/keyboards/pos78/info.json +++ b/keyboards/pos78/info.json @@ -8,6 +8,11 @@ "pid": "0x7878", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "D2", "D3", "D1", "D0", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "D4", "num_lock": "D2" diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index c3a49487ef3..5301e26ab31 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -17,17 +17,9 @@ along with this program. If not, see . #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } - #define AUDIO_VOICES #define AUDIO_PIN C6 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json index 340c1786354..b843510153d 100644 --- a/keyboards/preonic/rev1/info.json +++ b/keyboards/preonic/rev1/info.json @@ -6,6 +6,11 @@ "pid": "0x67F3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D2", "D5", "B5", "B6", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json index 3da1615c2d5..cf1708b0613 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/info.json @@ -6,6 +6,11 @@ "pid": "0x67F3", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D2", "D5", "B5", "B6", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 2269aef97fe..a2de64a3240 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -17,11 +17,6 @@ #pragma once -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS -#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 } - #define DIP_SWITCH_PINS { B14, A15, A0, B9 } #define MUSIC_MAP diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json index cc3b9444712..7c19a70f9b9 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/info.json @@ -6,6 +6,11 @@ "pid": "0xA649", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], + "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index 4d1bfe67b9b..f05911872b6 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -17,11 +17,6 @@ #pragma once -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS -#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 } - #define DIP_SWITCH_PINS { B14, A15, A0, B9 } #define MUSIC_MAP diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json index 3f32a10b363..c97543814dc 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/info.json @@ -6,6 +6,11 @@ "pid": "0xA649", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], + "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h index 03379a660db..92ac0a089f3 100644 --- a/keyboards/primekb/meridian/config.h +++ b/keyboards/primekb/meridian/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, B9, B8, B7, B6, B5, B4, B3, A15 } -#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #define RGBLED_NUM 3 #define WS2812_SPI SPID2 diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json index ab16646490d..5dc3d0ef713 100644 --- a/keyboards/primekb/meridian/info.json +++ b/keyboards/primekb/meridian/info.json @@ -8,6 +8,11 @@ "pid": "0x004D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["A6", "A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h index 58186b3e6df..2777e43a44b 100644 --- a/keyboards/primekb/meridian_rgb/config.h +++ b/keyboards/primekb/meridian_rgb/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, D4, B7, B3, D5, D3, D2, D1, D0 } -#define MATRIX_ROW_PINS { E6, F0, F6, D7, D6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json index c3dcca05e8a..cb5d6478f31 100644 --- a/keyboards/primekb/meridian_rgb/info.json +++ b/keyboards/primekb/meridian_rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x0042", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "D4", "B7", "B3", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "F0", "F6", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B1", "num_lock": "B0", diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h index 4baa1963f2e..e3e1572d996 100644 --- a/keyboards/primekb/prime_e/config.h +++ b/keyboards/primekb/prime_e/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { E6, C7, B5, B4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index a392b703751..51847d82a78 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -5,6 +5,11 @@ "usb": { "vid": "0x5052" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "C7", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h index f32722311ad..053bc6236a7 100644 --- a/keyboards/primekb/prime_l/config.h +++ b/keyboards/primekb/prime_l/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/primekb/prime_l/v1/config.h b/keyboards/primekb/prime_l/v1/config.h deleted file mode 100644 index 553674692ad..00000000000 --- a/keyboards/primekb/prime_l/v1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat -Copyright 2020 Holten Campbell - -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 - - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 } -#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json index 967939ccbcb..079c39571b9 100644 --- a/keyboards/primekb/prime_l/v1/info.json +++ b/keyboards/primekb/prime_l/v1/info.json @@ -6,6 +6,11 @@ "pid": "0x504C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D1", "D0", "B7", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 diff --git a/keyboards/primekb/prime_l/v2/config.h b/keyboards/primekb/prime_l/v2/config.h deleted file mode 100644 index c622fe023ce..00000000000 --- a/keyboards/primekb/prime_l/v2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Holten Campbell - -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 - - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { E6, B2, B1, B0, B6 } -#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D4, D0, D1, D2, D3, D5, B7, B3 } diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/info.json index 7199de33f69..a97809736ef 100644 --- a/keyboards/primekb/prime_l/v2/info.json +++ b/keyboards/primekb/prime_l/v2/info.json @@ -6,6 +6,11 @@ "pid": "0x5042", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D4", "D0", "D1", "D2", "D3", "D5", "B7", "B3"], + "rows": ["E6", "B2", "B1", "B0", "B6"] + }, + "diode_direction": "COL2ROW", "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":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}, {"x":14, "y":0}, {"x":15, "y":0}, diff --git a/keyboards/primekb/prime_m/config.h b/keyboards/primekb/prime_m/config.h index 46995b1d310..053bc6236a7 100644 --- a/keyboards/primekb/prime_m/config.h +++ b/keyboards/primekb/prime_m/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { C5, B5, B2, D5, D3 } -#define MATRIX_COL_PINS { B3, C7, C6, D2, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/primekb/prime_m/info.json b/keyboards/primekb/prime_m/info.json index ace8f6b52a8..238633ee3a2 100644 --- a/keyboards/primekb/prime_m/info.json +++ b/keyboards/primekb/prime_m/info.json @@ -8,6 +8,11 @@ "pid": "0x504D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "C7", "C6", "D2", "D1", "D0"], + "rows": ["C5", "B5", "B2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4 diff --git a/keyboards/primekb/prime_o/config.h b/keyboards/primekb/prime_o/config.h index b67af66f47b..9c9e5754a93 100644 --- a/keyboards/primekb/prime_o/config.h +++ b/keyboards/primekb/prime_o/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D4, D6, B1, C5, B4, B3, C4, B2, B0, D5 } -#define MATRIX_COL_PINS { B6, B5, C7, C6, D2, D1, D0, C2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/primekb/prime_o/info.json b/keyboards/primekb/prime_o/info.json index 774dbc65237..b826606770e 100644 --- a/keyboards/primekb/prime_o/info.json +++ b/keyboards/primekb/prime_o/info.json @@ -8,6 +8,11 @@ "pid": "0x4024", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "C7", "C6", "D2", "D1", "D0", "C2"], + "rows": ["D4", "D6", "B1", "C5", "B4", "B3", "C4", "B2", "B0", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4 diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h index d86696aef1c..20892b683fa 100644 --- a/keyboards/primekb/prime_r/config.h +++ b/keyboards/primekb/prime_r/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 } -#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/primekb/prime_r/info.json b/keyboards/primekb/prime_r/info.json index e2e597c7939..e081dc388c9 100644 --- a/keyboards/primekb/prime_r/info.json +++ b/keyboards/primekb/prime_r/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D1", "D0", "B7", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h index 261ebaca5bc..cd0eaa142b5 100644 --- a/keyboards/program_yoink/config.h +++ b/keyboards/program_yoink/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D3, B1, B0 } -#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, D6, C2, D5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /*RGB*/ #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json index eeab79d169c..6f2162b2067 100644 --- a/keyboards/program_yoink/ortho/info.json +++ b/keyboards/program_yoink/ortho/info.json @@ -8,6 +8,11 @@ "pid": "0xF10C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "D6", "C2", "D5"], + "rows": ["D2", "D3", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D0"} diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json index 252a110e8ba..e23f4ff9704 100644 --- a/keyboards/program_yoink/staggered/info.json +++ b/keyboards/program_yoink/staggered/info.json @@ -8,6 +8,11 @@ "pid": "0xF10B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "D6", "C2", "D5"], + "rows": ["D2", "D3", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D0"} diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h index baa5b5263bd..199375c173f 100644 --- a/keyboards/projectcain/relic/config.h +++ b/keyboards/projectcain/relic/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, B2, B6, B5 } -#define MATRIX_COL_PINS { D3, D5, B0, F0, F1, F4, F5, F6, C7, C6, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/projectcain/relic/info.json b/keyboards/projectcain/relic/info.json index 9d0820b4e62..c7441bd1a64 100644 --- a/keyboards/projectcain/relic/info.json +++ b/keyboards/projectcain/relic/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "B0", "F0", "F1", "F4", "F5", "F6", "C7", "C6", "B4"], + "rows": ["D7", "B2", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "D6"} diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h index 457e2f0ab38..7abf6b197c7 100644 --- a/keyboards/projectcain/vault35/config.h +++ b/keyboards/projectcain/vault35/config.h @@ -14,23 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, D4, B0, C7 } -#define MATRIX_COL_PINS { B1, D3, F0, F1, F4, F5, F6, F7, C6, B6, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json index 488d81b6b84..3bda8233e74 100644 --- a/keyboards/projectcain/vault35/info.json +++ b/keyboards/projectcain/vault35/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"], + "rows": ["B4", "D4", "B0", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D7", "resolution": 2} diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h index b70109bfa30..199375c173f 100644 --- a/keyboards/projectcain/vault45/config.h +++ b/keyboards/projectcain/vault45/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, B6, B5, C7 } -#define MATRIX_COL_PINS { B0, D5, D4, D6, D7, B4, D3, F0, F1, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/projectcain/vault45/info.json b/keyboards/projectcain/vault45/info.json index ecfa953fd41..4a2327d4fd9 100644 --- a/keyboards/projectcain/vault45/info.json +++ b/keyboards/projectcain/vault45/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D5", "D4", "D6", "D7", "B4", "D3", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["C6", "B6", "B5", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2", "resolution": 2}, diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h index 54918d2b491..e6990c6c485 100644 --- a/keyboards/projectkb/alice/rev1/config.h +++ b/keyboards/projectkb/alice/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15, B12 } -#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json new file mode 100644 index 00000000000..c4366e81f91 --- /dev/null +++ b/keyboards/projectkb/alice/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"], + "rows": ["B1", "B0", "A7", "A5", "A4"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h index 1ac58753c79..cd1726d7ebf 100644 --- a/keyboards/projectkb/alice/rev2/config.h +++ b/keyboards/projectkb/alice/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15 } -#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json new file mode 100644 index 00000000000..83d71b16e9c --- /dev/null +++ b/keyboards/projectkb/alice/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B2", "B10", "B11", "A2", "A0"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/projectkb/signature65/config.h b/keyboards/projectkb/signature65/config.h index 2972b51fa1e..4d31d4b095f 100644 --- a/keyboards/projectkb/signature65/config.h +++ b/keyboards/projectkb/signature65/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 -#define MATRIX_COL_PINS { B14, A2, B9, B8, B5, B4, B3, A15, B11, B10, B2, A3, B1, B0, A4, A5 } -// 1 2 3 4 5 -#define MATRIX_ROW_PINS { A8, A9, B13, A6, A7 } -#define DIODE_DIRECTION COL2ROW - /* 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/projectkb/signature65/info.json b/keyboards/projectkb/signature65/info.json index 2f0f01621b7..6b7229d7e69 100644 --- a/keyboards/projectkb/signature65/info.json +++ b/keyboards/projectkb/signature65/info.json @@ -8,6 +8,11 @@ "pid": "0x0165", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "A2", "B9", "B8", "B5", "B4", "B3", "A15", "B11", "B10", "B2", "A3", "B1", "B0", "A4", "A5"], + "rows": ["A8", "A9", "B13", "A6", "A7"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/projectkb/signature87/config.h b/keyboards/projectkb/signature87/config.h index 394e5ac7063..4d31d4b095f 100644 --- a/keyboards/projectkb/signature87/config.h +++ b/keyboards/projectkb/signature87/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -// 0 1 2 3 4 5 6 7 8 9 A B -#define MATRIX_COL_PINS { A7, A6, A5, A4, A3, A2, A15, B3, B4 } -#define MATRIX_ROW_PINS { B13, B12, A8, B15, A10, A9, B9, B8, B1, B0, B10, B2 } -#define DIODE_DIRECTION COL2ROW - /* 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/projectkb/signature87/info.json b/keyboards/projectkb/signature87/info.json index 76ff092fb29..cc6d437f717 100644 --- a/keyboards/projectkb/signature87/info.json +++ b/keyboards/projectkb/signature87/info.json @@ -8,6 +8,11 @@ "pid": "0x0187", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A15", "B3", "B4"], + "rows": ["B13", "B12", "A8", "B15", "A10", "A9", "B9", "B8", "B1", "B0", "B10", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h index 95e391b0360..9765ad6b1a8 100644 --- a/keyboards/prototypist/allison/config.h +++ b/keyboards/prototypist/allison/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D1, D0, B1, B2, D3} -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/prototypist/allison/info.json b/keyboards/prototypist/allison/info.json index c8423baf41b..d37ffbcaf4a 100644 --- a/keyboards/prototypist/allison/info.json +++ b/keyboards/prototypist/allison/info.json @@ -8,6 +8,11 @@ "pid": "0x414D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F1", "F0"], + "rows": ["D2", "D1", "D0", "B1", "B2", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4, diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h index c26d0b1e19f..9765ad6b1a8 100644 --- a/keyboards/prototypist/allison_numpad/config.h +++ b/keyboards/prototypist/allison_numpad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, C7, C6, B6, B5, B4 } -#define MATRIX_COL_PINS { F6, F5, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/prototypist/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/info.json index 8931ff2dc4e..56ca74bb20a 100644 --- a/keyboards/prototypist/allison_numpad/info.json +++ b/keyboards/prototypist/allison_numpad/info.json @@ -8,6 +8,11 @@ "pid": "0x414E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F1", "F0"], + "rows": ["F4", "C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4, diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h index 4f003e3cfe2..1d22c074e20 100644 --- a/keyboards/prototypist/j01/config.h +++ b/keyboards/prototypist/j01/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B2, B0, F6, F5 } -#define MATRIX_COL_PINS { B1, F0, F7, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* 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/prototypist/j01/info.json b/keyboards/prototypist/j01/info.json index a5bf0c836a4..513e923190f 100644 --- a/keyboards/prototypist/j01/info.json +++ b/keyboards/prototypist/j01/info.json @@ -8,6 +8,11 @@ "pid": "0x6A31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F0", "F7", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B3", "B2", "B0", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/protozoa/cassini/config.h b/keyboards/protozoa/cassini/config.h index ed52fe560d8..3c86d948874 100644 --- a/keyboards/protozoa/cassini/config.h +++ b/keyboards/protozoa/cassini/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 } -#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json index 422bb0ac71f..26408ff1af1 100644 --- a/keyboards/protozoa/cassini/info.json +++ b/keyboards/protozoa/cassini/info.json @@ -8,6 +8,11 @@ "pid": "0x4341", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"], + "rows": ["A2", "B9", "B8", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h index e3f3faca9cc..8436b743bef 100644 --- a/keyboards/protozoa/p01/config.h +++ b/keyboards/protozoa/p01/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B1, B2, B10, B11, B12, B13 } -#define MATRIX_COL_PINS { A14, A15, B3, B4, B5, B6, B7, B8, B9, A0, A1, A2, A3, A4, A5, A6, A7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light */ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json index 77e1449458b..60d8d0f508e 100644 --- a/keyboards/protozoa/p01/info.json +++ b/keyboards/protozoa/p01/info.json @@ -8,6 +8,11 @@ "pid": "0x5031", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], + "rows": ["B1", "B2", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B15", "pin_b": "B14"} diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h index 91922c6d953..cabf72507ff 100644 --- a/keyboards/psuieee/pluto12/config.h +++ b/keyboards/psuieee/pluto12/config.h @@ -3,14 +3,6 @@ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/info.json index 752b2ab97f2..ef7af4d3a8c 100644 --- a/keyboards/psuieee/pluto12/info.json +++ b/keyboards/psuieee/pluto12/info.json @@ -8,6 +8,11 @@ "pid": "0x7012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B2"} diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h index be1de23f838..c0243f8ee87 100644 --- a/keyboards/pteron36/config.h +++ b/keyboards/pteron36/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, D7, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* 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/pteron36/info.json b/keyboards/pteron36/info.json index c65b15cfb25..66092d592ce 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json @@ -8,6 +8,11 @@ "pid": "0x5054", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2"], + "rows": ["E6", "D7", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} diff --git a/keyboards/puck/config.h b/keyboards/puck/config.h index 26dda7d8fad..2f38776326e 100644 --- a/keyboards/puck/config.h +++ b/keyboards/puck/config.h @@ -1,11 +1,4 @@ #pragma once - -#define MATRIX_ROW_PINS { D2, D3, C6, C7 } -#define MATRIX_COL_PINS { B4, D7, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json index f56b1ceef8f..d5bab56bf3f 100644 --- a/keyboards/puck/info.json +++ b/keyboards/puck/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "D7", "D6"], + "rows": ["D2", "D3", "C6", "C7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h index ba9c6fdc712..a8b9af7999f 100644 --- a/keyboards/punk75/config.h +++ b/keyboards/punk75/config.h @@ -17,24 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D6, D5, C1, C0, D7 } -#define MATRIX_COL_PINS { C2, C3, C6, C5, C4, A7, A6, A5, A4, B4, A3, B3, A2, B2, A1 } #define LED A0 -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 500 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/punk75/info.json b/keyboards/punk75/info.json index b232007bb24..cee5a88f616 100644 --- a/keyboards/punk75/info.json +++ b/keyboards/punk75/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"], + "rows": ["D6", "D5", "C1", "C0", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"},