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 0b644bec4a10d880fa603999fb5080ee16e53778..0000000000000000000000000000000000000000 --- 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 c0a5fd3365da6eb8e519584dcded40e791e2e887..3b5807f621cdb6a8e77f0ad809aea1c077a89a07 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 a093c267a90b9241bf6dc3645250548f336b12a5..0c56f57b207dae8aa2f397df38f5d2af4e3a98ec 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 8cff2b9060586aa9fc4aed3f0b3ad232dcf2ea09..737ea0b4fd15772e937bdd159a834a71430aaf8c 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 c4bc59fe7c14037f8a8597fa76052021ee0ee5d1..3005d1bcfbbfc22867df7e4d628d55c6dfb351e3 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 2714366c0e3a63f7af2524b119c56f24e6d70a94..c691bb4ffef294e2cf9fef7d06819a38f6374697 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 92efc6d1e5d1268dcfba11a2ce6332020760f75b..6f884a142810fc5a37cb99de6eede8c0470682f9 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 982bb670561b784059bc4bb5642bc99bd421e089..088f0737bf3e8d74376fec28e6c9f41ca14f952c 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 7a25216afdd961257d7c494160ddae1813f8a003..df9c7cf5fc7a209f3d55e95e164224dcb5b43d6c 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 d0d470a4e47f152cad811f22eaa238d32aeac9f1..f176e18d2283e91b1aa52a8f497c513538ad10eb 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 f979b1b4ba4e43f92093d21e647627a2bbc3f926..b9449c4714bf39561a177eb1ee1ba90b87dbc6fb 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 aadd885f6ad02e5d0a2a25f3985f5d091a7c0a9c..2f7eef9ba28255ec85a86d203a17f8ecc1f6d974 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 5e8a798be60ca30a50df20730e9cb7aa51883808..5dd1c8d063a7ee6ee025abb772fefa5a49232b78 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 d0909322c98f8621fb21241949749a9844178c91..7f50d959f5940055b4921a19985a85de0bec8b6f 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 6e0065c0623b0b038f934b700e703329f2b2ea81..c1008da9b8689628bc0504e6099a8c31bd1a3c69 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 fac0bf368279062520bf0c4815a3767c360ced1d..d2dbd00a3daeb7bc828d395169f10b8c5966e54b 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 a19d676b29f2102b0682a3f25b7f194931f8bccf..783d097ad09c7c5032cc6472fb1ab9d1c7df0215 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 fb6a19bc2fd3f5a35ddedf2df99c3871d5afb6e0..dfbdde65d65b4d77e1f10711726499ccec01246d 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 c06395545d51dc554538abd69644cf12b67b4f70..36f691da43002735ae11cb9303cbd9b217a94059 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 8743e3aad1fe152facc9e7acde23f71328a177c8..dfe5b680c9c3b3bb4940f934f0b4df43d8abdcf1 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 2c3f6f97f247a1c64966988cf2a63d9af1a72488..87864e2bf4b0d26b0571d62a9b7309695de6b27b 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 3ef505854e88ebe56c49d7d44796a0d0fffe6344..f635d80fff9ea1dbb2ba67f1c0c7ed018e578ae3 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 ef99f3b6313d3fb89e8e2b9955e9117d5240fed6..69e269a963b412d4ee865525a18cec6459000c2e 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 cbe8ac12e72909bcc4e031ab3f95329aa3539746..c9d7b1bf7fd2524f1e3c97ba57abd569b31af953 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 a74239f706c63a451bc07860c9725061cf3b0f50..e373627d51ca17788ef7abedbd0a2dcaba0407cb 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 909cd059786b1a9ea00f125d072375cd6d11b524..484ccc523f6b502ccbfea86d464d4895422273b9 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 11cc51ad468771aa0f46dd835cadac042729b4d9..8cbe3d419fd64795d368810f5f8f53ad8e05a444 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 510a55be41dc9c6cee6c196c121cfac1583ca721..20b610172df208cb2c83eee930d78e7c616fb648 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 5c56d6855431702746e709f7c4d871646dd998b5..daa5bfacad45c6b5b31a47ff729d8784ff6f0458 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 304e89ce21b8a37a16643027d2b59eba35adc8ad..f09dc72c013ab1821f5e53c34d88ee7fa2b74407 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 4b914a775f375808913fe5520c0b6990df0a04e4..34ef6d6e74c1cf35f5d6c9ee92e2b65e15ed0080 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 d4972614180f2cac2fd2c4733f919240a63148ad..bb85468a86c1b104122c4070ef581e9685244f01 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 4b914a775f375808913fe5520c0b6990df0a04e4..daee96bb3606febd47f01fa3e7f4f1e15cf4f234 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 0138b9656f988204399e8e268a6f5b41bc6f6a71..e01419b97ad7499bfdd840f5ba347ed570038e74 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 9e1c778cc36ed9f32aaa86eeab2cee29869d618e..1153761ca0c7d409f589fd117379e94cd04767a7 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 93d897a4feb5b8708fcd53f079bd3eeb85f3b8e0..1070dbd0662462eb761ce0a27a9d713d75e817e1 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 9fa70f3ca14635a76a50f463afeaab3c8c2fedd6..8287b3112d4b08e27cca8edf192befc4d8a12cf0 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 19a2fb56f5a6679e9382cf6b9a4802ef0c975a37..ba729aee3ecbae689f55cc6c6bb16149159912af 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 0fea2772d242cb0371b926ba006b72a979460068..a1d78859436ca9114a715e0e2dc9b7654d9d807f 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 5a8b815e9531ed0595987a983419fc913efb5b41..9dd366e1dd08523e8ce31dc92b2db76fb2a23076 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 ba2bd4ac3692337ed06fee6463a8395c5321ba94..20b610172df208cb2c83eee930d78e7c616fb648 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 d84a7f314c8464292b006e9de1d73521900262ba..d575fdb216c8e2dedc036a2ef17eae4c94d66da4 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 053d78016166fc1b6380cd71a6f4be99fd93870b..f09dc72c013ab1821f5e53c34d88ee7fa2b74407 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 4e1c96298d891f45c9697f720eb20a9d03fff722..e6a3a2318d96205259fd8cf7f3d91bfe3025e5c6 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 e4afc5a866fb53a2c360d1f5b5b48ffc4a0491f0..bb85468a86c1b104122c4070ef581e9685244f01 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 4e1c96298d891f45c9697f720eb20a9d03fff722..d06e372938259bb60a3fe02a8bca6f99395bbedb 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 658819f9366ae97cff92e71f0044daa32d45e5b2..e01419b97ad7499bfdd840f5ba347ed570038e74 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 b667f6d76afc8aff9a6f94b0bfff7a8e20c1ba50..99d33fd668c3354a2f4231a76ae1f64677b1f3d7 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 e37df487fd8b8bb9c9669006b13ea9f5302f05a7..69e269a963b412d4ee865525a18cec6459000c2e 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 ec2b0cbad0a935a790e659ba971ba329e95d9e40..c27515d0fba4b1500d636bec8c16c7e6411d49e5 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 21887dca07169d5c7ab0d327220f357248c3cc80..64b5158698b0a795d4c1c31fb8d25898153084bb 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 44e81807ee8c3cdb0764cc13242cac7418b04d74..484ccc523f6b502ccbfea86d464d4895422273b9 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 c9921cd341e71960340506a8759ba0f39233a165..5dda4a73a5d0f9eb690298acf803e5f69031a7fa 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 8e586b89b2e668765842d8cf8186a1ac8629b28e..20b610172df208cb2c83eee930d78e7c616fb648 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 9349712a41d88fc9720a23fe9fcfdc66790a2959..cf70250a152f12263bfbb849ec45a5631ee2473d 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 3e7e3529c84c4fed76e85a564adda106f2120217..f09dc72c013ab1821f5e53c34d88ee7fa2b74407 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 6931f9e8760e69f396f0b555cdf049a2fed3a97b..1815ea2b0a35a3f98e38110bdd40315d2e891f01 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 827267d2cfb3ac88a794c471ac8127b9aebef7b2..bb85468a86c1b104122c4070ef581e9685244f01 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 6931f9e8760e69f396f0b555cdf049a2fed3a97b..94f0db835326fa429d069449e48418d57a45a153 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 fc4e3efadfdbdb0ed071a6247647209964285eba..e01419b97ad7499bfdd840f5ba347ed570038e74 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 0b7ea215608ff233a9f9d79ef6653fc820ba344c..5f0fd50578af83ac3f1e6c949c57397383717f2c 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 3a5898c546b336a02d6ab192bf21adefa2d2f574..4366a8a3e9856cc81bec4234acab17c609af0e0d 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 e4f48e6c7e5e9dd04ea63cdf7a43106444293846..796d22dc7139e1d50e2d942a25c6db31a6924310 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 67e9646845f1b2b399291f9bb594fde7e018509e..fd7bb0f10780301455f9dd3eb2f2c6e0aabb8600 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 aec0957ed69eed4f681f570417ce3a8a7b94ce7b..7796a7c3111dedcd6d124fd1b92721b956e06ff0 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 a30b98a10ae34690b364d2f86908da026d018da3..250732dc7a3fbdc6446efaa2a8dc17087c9f7c05 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 a4fe5925875e67aa9f364fa3b50ed7d400ac7f64..a6e0d16a65bd5307964374490825bff666cbb391 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 3ea785525cf9b6e40acc393748745487c187d90f..d282c635eab468a369c72ab81e433917734d3bc0 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 773ee947d74f027e996e0fe5d5d24748f2ac1e5c..b5166aed2af96039d0981501d0b4e28f3cab7fb4 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 a701797dc06fc6e0df259ba9b3c83f14cecd74a3..7e31dc1674ef66aa87ead0a85126a12633ed3d10 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 0f41dca37ee7ad43e40f273753e7296d555a7432..0ad3ecd17bcc811b7f9ecaee72672bbe13dbc3ee 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 967a8c6c539b2657deaab763b4a16a0a0b0c8e6f..384e19c3d23320e08a7d1285f70e5323eb111f7e 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 1ed2cee71ddaabab68d94a0cb69e3388c22f999c..b6a9eac7a128f4d9902a2e8c1eac76b6d71af059 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 e9691010ed330db8a6947d2c4a4c1229c12cea88..178bafa5cc9ae9be00b060ef56184577a322ad7a 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 4674e238a669ac4ce794ebc45f106f8fe2eae996..f1db245dd046487c391fc8ab1d0d03fe853b6c21 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 f65dcfb0b3ad44cc99808effc6aace5ee80d975d..00f0dbf1f3cfe9605fb1187df02d04a7182b102b 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 6d3edbd0ee3a9dc3f38f287c15ad49ab7ca78692..698342ad2dc788626348415aa0a6f0b08197e4d1 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 09d5af43c8e8beaddc5b2d6bd052b0fd4063f390..ff5d7db4ff43b921be9f057b1d9f9719da286701 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 6d3edbd0ee3a9dc3f38f287c15ad49ab7ca78692..733b214195a5e9aede33d6ace7e3904b3828c727 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 5528531b91bf9a946fb1353e18e3d76d96a45597..4e5b142aa30a9eceb19c44a8f3b8081feb440c41 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 eccfea99f4754675774bc2eff1aa83033c4024d0..d0624dd90900e7417a92e6fdd3b1f69cbf289e65 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 cbff281ddcd922bd88ea47bf1b0a438d93b3754d..b5166aed2af96039d0981501d0b4e28f3cab7fb4 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 b058d2424a8dfc4b6bd2ceb44b944481263d1083..3a066df35381d09bfccfb0bb782b934f53caf116 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 c1e0e0aa198855db49ed7931361cdb0c4fd0ffc3..3e282f0f15ee010121fddc28577d6689b5c0cffd 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 f98185755f3dcafe23b634f7b8b2918d34e00404..384e19c3d23320e08a7d1285f70e5323eb111f7e 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 392e3168ff7bd0fc6ca60ddab95b666bbf14115c..7d5ea2600d66d6ad6d53b664cf60e9b8eba03ab2 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 6f001c5e248c05f4c37b5b23de73336de1c8b2ae..178bafa5cc9ae9be00b060ef56184577a322ad7a 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 ae98ff793a69f7d2ce32f7081c36941bdc747d66..5c40b6ae424a9b26c5d4850311913051f1468370 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 7fef28b05e8eeccbd3eccf491309f7f07a7d5294..00f0dbf1f3cfe9605fb1187df02d04a7182b102b 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 a39c13a0ae72769e16266c156669aecfdf835cbc..69b741769da23550ecc8edc6daeee4f18379103a 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 eda378df844019fd45472ce62594ff8266108333..ff5d7db4ff43b921be9f057b1d9f9719da286701 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 a39c13a0ae72769e16266c156669aecfdf835cbc..321dd7229d1833cef44a2f36b6b1747c4ab9bc39 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 86bbdd199b312922e77d39e32a25b90648870937..4e5b142aa30a9eceb19c44a8f3b8081feb440c41 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 257eb6f62e8ad2ca5eff9679306c754dd989484a..47cc622d8aedcb32b73d889a73e38321aabca32f 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 7a273050c0465caf1017676b1ec0873d36c76b43..1801b70053955ef6eb5244cb20d895ef9e81531a 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 22f10cee96c47b3780bc06fd2c293f4030a85868..247e86160f573716e8a5a8cbe9d79acca795631d 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 ba0c93ff9373a9301bd981e92dbd3f4af4b3249c..b5166aed2af96039d0981501d0b4e28f3cab7fb4 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 025b442468267d23369a0739fed8fad51740a56e..98ec607fb0e2d01b42d7380a5a2512b565a18dbb 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 9c2e0f83275b0fb3026e5b021844f0ee87ad08ff..06c6e3ada400fcca48dce8fcd1f4d28acce2dced 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 c17e20b3d710482232fbfa3ca46ffb1ddaf59cda..384e19c3d23320e08a7d1285f70e5323eb111f7e 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 4fee40360433ddad919005f142f28ca316ebf14e..bc311eb8159b7f29ee9afb12974f81a35edaad0c 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 01ce7edc7cf4d0fc3493aa7553cf38ec0276fe78..178bafa5cc9ae9be00b060ef56184577a322ad7a 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 d91729481fe4441b0edf01d46d0825918bb1173d..4e9bafbaf5a892a082774591d5f62087aed98238 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 d5da5febdfd86194c1eded72b4e225493e6b15c9..00f0dbf1f3cfe9605fb1187df02d04a7182b102b 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 870f9db26e8dc2b85186156d49fd56a10598743a..5d0212960c7ced5f15e9f1cea158f324d16d1f7c 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 8d60f74a6f33e5572e01f14423af08c47c163723..ff5d7db4ff43b921be9f057b1d9f9719da286701 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 870f9db26e8dc2b85186156d49fd56a10598743a..87fac0c46c37b466680165602b64ca9caf0a8a70 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 e40513cae88681714054b2b1268ee2d7fb1bf9a5..4e5b142aa30a9eceb19c44a8f3b8081feb440c41 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 f8901144af3a8432858a4ee660f69e24c6b6934d..71c5633a7890a396532844e8e9984a534219d814 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 28c21cb9f551c87136578ee5f2f3b5a247a53791..d449b25d86520ff65b729706777d1add65fb7ae6 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 4f256e8ac574d78d10f78754cdad9b2debd20ea3..377b50f882d3b2aa85a41f14fbfaba055ad35400 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 82349297dd9b0b94ea877f8692e0c59744aa94d7..2f3742c5d0cf54f740707f017958a4c71ceba156 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 f6f666d77ffc1c1b0f2bc3f3f1f1a7275e29aa27..357847f418709725fad00dd345bf694887030a25 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 0040b35e072944fca06963be873d7181f21915d8..f482b43c10b63a54f3cd7973d658f77213f329e4 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 8218fa78fcc3a15361ac63ca94173aec03667469..c86466e44f5e9058012b1cc8f298d988a22de12c 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 564d5f24a238d6e84aadb76d633a6961ae75593f..861203cf2f26085cd74a03b4eb13453382527195 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 bfd93fb77dd4f4a1f9b3b7ca3e0f6da6f2992042..2776ce75827a5c98e26f52cb9bce60210bd46260 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 dab37baf04567243ec99ff77298230abd0212075..e11b7355ceeb4ff9f71be8716e3627948e41077f 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 d2ef3e23c26d090f0ce4b21aea5f7a722479607a..281c50703cc80b9d6f73f93f10aa1a661160481d 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 65be217368d2adcb78ed61b2a71f6cbd1691f69d..005c444cdc21bd0d6650566e74f82038916893e9 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 a8a1575b782a127008ab1cb3bd4cd716bf0dc582..281c50703cc80b9d6f73f93f10aa1a661160481d 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 14c0e6d7cb3fc893c18315e1ba99d6ba5637f321..114b6034062aa85779b2a356c4312fce9430d762 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 768b1b3551cb2dc724c0c59874d94ce1cc598f52..ddc21dae3085e0ce5d34e1eef64a9e9de1b80f01 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 fe457cb6d14cde178f8b18e432a2f9b2d351aecd..069eed9093a22abd59793560339f0452aa8ebb3c 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 2ce8ad24dcecd295c04f4b6e75bf7e28e06ab38b..ae477fb0f3f8455ca0806015c8d0a21e837948a9 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 a519cb23d666bce0fea154a1a456ffa48c413a0b..98b4703714ed1d59957ce0bddf2ac0e13fc7909c 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 d01a9f389a243a97d96484bff494871408be9107..df5455b3c22eed7c727ddd04491783b7ac73a2db 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 629bbd139e61ca8065f3783f1647d6f88bc4d046..73b8a74f2a32ea294d11a68dabee2b8463bd3d64 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 c7614c0dbd3ebbbbd463d0153546217ea42b58ea..df5455b3c22eed7c727ddd04491783b7ac73a2db 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 ebdfc390281f5db1624b51688449f3f4dc5e54b0..ae5c28ddfc73b05ad1eb52abb9d496845a63bca2 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 997b75a4af8fd3154d670e00f9d2b448fdd06c87..77f51ecf5a24eab034145f1fb7b372c48fa3710c 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 222d125281e13d6401adfd3dd48e9e53a1c34296..408e670b95747e08a45f42ea21ad5c348ea47be1 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 3f233e1488cd8624c25aa711831be94bbeffde51..77f51ecf5a24eab034145f1fb7b372c48fa3710c 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 8e4221f49fdd048a0cdba84365b218546199de9d..3304476f61868f4c41657c4de3e49d52db6f7449 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 32e179e918d17a20670b121d10c386e8b940761e..1df5ab510409cefbf79416aacd78397d476691b3 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 65c59db2b4dcb46f6b81498d9ca41e422630c829..35d18ea6784e32e67c71a2aaa35cf68c4b74c86e 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 d3172d1812e702a72d43e24f571f78ee9998c8b6..d723d4d2bd0afd0238681aa4e5c9f4129f8539e9 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 16b09ca00c7aaa15510a79f885573529fb71fb96..e466fb0c28f26b1b6112c407536768d5a1a0515f 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 eb20ed751570ea6e15fd0fa54e5ad0c3f2767ef2..431f73e2e6abf3fae3b48329256eaa37386fa0e1 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 cca5ed456f0d9ce6e933df5ddd2cffa4aef56fe6..275bb03c194b1ea8525f7bbd4063d0e51b9e61fc 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 6d609e01859c3cfabd81f3797de1a85747ffec7d..df0daa52fbe0bc703d55bfaf4b03ff9f260b432d 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 1a822b21137306841851d15fe3ec3b2ec527179b..9251d4cad75fb13214e210b4b524dc0543e40857 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 6556560112c21f47641a8327e101be419cca5ad1..e9a0f89ab24699581d94c1d71c3468c5b70e29cb 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 b80b37b2eaeb80d505db25a1c1051feda72db002..75359db964dba4fc24ba4176059b3bb506b260a9 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 aedf2b55448e1eef5f447abdcf7e7cae9ba61954..781f5a9bff0e13da81edca3506cc603e2b46e054 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 c869fcbef52d5d0bb8a01e9f7fa64bc5c7402c63..ec9ca2f763d5d77bc76cbfc33f9152b791067889 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 d5c752d7f55f6076dc0bd61095bb2d7aa127e4e4..aea945a035d837357f82e0db74ca8dba941498aa 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 137098134480cb59c20f47a6f029ca0655d732b7..77f0dfe12f5772d8a280c9a719961109e0600e38 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 afe48b150c633fcf4cc20b610dd819abaed2c2d1..a5b93107ddea32c4f979768d1b4186beeaa4bf38 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 4044a561c1dd1a064d0ca48db26c3de3c719c3c6..ac2ac42b3306646c65c73de1e8eb471c8a3e3be6 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 f6d8d07de8ec589cc4105f59c2aa0e48c67b89f9..0000000000000000000000000000000000000000 --- 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 47561bc286ad9e6f33cbb4fdfeb4fe3d959e9f14..e357422b62f717fedbd7e695941258bc05d05122 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 ecc29f6399d118257acfadb123b219acf00fdce4..0c254d0dba9e6db6b6dbee38c1c7adef38ac27fa 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 404614fd99b1809a81d3a2787c7a677822d2ae2a..0089490f692d7951175daaa723db98a9521dc7dc 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 de47d3a071d95269d87a934645fe4ecc8490ffb8..f46df6af8228142a21144f3eace8bf7b07f696d7 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 49dcc857e9399ba0ec7b1765c9a4e62cb801f1d0..7a0adea3133b25a8d3355f55bce94e803ea94b1e 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 0d8bdde6dc6c4f62f308b187a2528c81a343582e..1245d9ae588062b7e3ad50496d794749f03d0a3e 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 49d67451cb6edcf7147f1196f312d563f15007a7..5605fec1b740f5b73bb30ea9223a9546e9c2f7f6 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 b2cd5ab73c54ab6c95889c3b39dc30be56e9299b..d4766283fca020cdf56defe382213212e2ac2061 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 60839d5ef08cb287c504a2b0e771e80fdf240500..c65db694951a614314b0d57b8010b9576c9726d2 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 38cdc18fce76fbd0bd4fcc04ee2a75178ab5cce7..d4766283fca020cdf56defe382213212e2ac2061 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 76fea555e4c88eac925712b5021f46fc71f3f84c..9960a7760f45481fd10a6bf158a8b4c278c332b0 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 1b4ca326d9f4c4a74eeba72cc8ebba3d5c48ea1c..0000000000000000000000000000000000000000 --- 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 43e614dbad5da831546dcff35e692119693ecc61..b813424f65014fd934c0f4dc61daaeaffc1d0d33 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 8d95b371bd03a57573aeb51663c0b3817c6627e6..ce64cbe57fb1c57b7e5916e68f7486dbe7b53d3a 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 7e32e74a56e57e70073d6362e98151899e915b32..09ee356a7e57195fd5cca3daca1a7ed51c07cd54 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 9342bd028398f5df16f4cdafd08301082d5a59f7..0000000000000000000000000000000000000000 --- 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 72e432c871726d3e1e24e2d0da2cb85ace38a6da..22d4ba3d39e0c0dcf9999e322341ee293bd047c8 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 211e7f4f768b7f284a23117c81d7cd0b1824b601..7d7310ec0ec9a5a73565449de5934c2cac825bba 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 a10de48d68f7391dcaaba81591b6e0235a6d3644..d892612a7f6cc2906f2d1180bcc6c28d36f1a8e5 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 1c175166eebe8b6ec1588240eda951456f04a8bc..62a12b77e98b41dd60bfa954723dd7f8beaac2f8 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 1d8e39f29df967b65849f0a072591229c1e72434..4e9e209ff69e78db3acbbd86a821ad83216e1839 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 00e8648df869f4b687435c9e416bc0dcea1cc64f..3469e28bb97079281b4e49c03d076f1ad8cdc53c 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 22f54c3472ee1ca571043824d5b6136cef32ac17..125914db3b1633e799967f21c06ebcabad9fced4 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 80379fab184d711e2411f6fb65af588b2545a0de..0000000000000000000000000000000000000000 --- 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 d7b265f4e3df75faa93e4736739ce44fdea582f7..f608132b5afd4d79846a79d3c1670eb89a3978ea 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 fabf306730d0eab60ec51544d91707dd3d5acbba..097366637ebdf1d323d8ff48fc16ec4c6dccaae2 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 63a1f977268eceb04d29813b34cb720800c810ba..6bacff31f01534e883847461c5d3a48c362baeed 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 cb9b7d148d2f63d609083bdc4d055795b5a1974a..57e8b04dc7b3ace2a5913c7e836444939f47e07e 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 21ed9d44c72a1169a7459ee1345700d33a24294e..0d23223dc933ad84f414491a273eb8435be90e5c 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 c5007ffbbb41a700b8e5e88bed90391a408ab0d2..7bf04c9b7672e2ff61a69cf92a98257542595cd4 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 91b824b6a498e3438f3c67a298236b3c9b993951..e474a8d691bba3347ae5e35f3bbbb3f4cf9242fe 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 e610685f9910acb69c7b7e8ef008fc9abba0287d..0000000000000000000000000000000000000000 --- 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 d68530dadf4ebb94aeac5dc2a437a0683f7620d2..8200e7d036578e458c4efacf4c1139b1a4093d81 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 e59cba6a500e503d2c47be2b1419a892e81b0648..fdee023e7d68ac14ea97eba24dcff5a341bdea34 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 b9519f15f184cbdaa5fa20cffe11584fde90ed9d..5de7cffae70ea84e665593da443a73bbbde30ffa 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 3d1926093c2cecb18d6f96fc2e9460883b1e65b8..7ed15ef362b3c4f18a1045653093427110f8fbf7 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 505eb72b11442c9ec108898d847e63832b9b8da2..7673e12dc54bb57213724e4f2b466fb219a9f7df 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 cfd82ac3b6d161003717c13d5886831a7d3cd683..dba700af6cd1e8a60fee39aa1d57d704ed2c5778 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 8d41e422e426e7479365c5c1e174f509e8caa149..3fe24a3b05978db86cd15b8922f0872e096bd071 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 629fa34c2bd9ff6ef8e21b0672f83565121cd1d1..53ad1077bb5898e86e6b99218298aed9ed532cae 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 47e6690389aa0a21cb5c909f9fd13a45ed14a5da..46d8461d2acef143036d8d5d2111f0f7b7a4517f 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 fb028e0f64536940d3824d9eabc8220aa29b2923..f29441fac80471429f24e67589d361ac2c02a0c1 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 173eb49e72ae13e76cf2b8ea6f5f5a38005e4643..3cd9d387ca046cddda8f73fad4f703a549b3491f 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 55fc373ea818ae821c027d9366b88cf58bc64d27..0000000000000000000000000000000000000000 --- 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 e60001252dbaffa42042f2962ff65969d14ecf9f..93d7ca1423fff6618644f5ab2e422d793cdf2818 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 13e3177b0e3022b3e1fe2b38e0aeddb40798ad9d..0000000000000000000000000000000000000000 --- 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 1168d21fa696c8dcd82a4261a318ad648ea66805..d4b4e36b4183e02c01284d286c945bb5bfeb6eaa 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 11c2825ca945f7572088c1e91fcb6cd4eec3602b..7da6e3f1bf27024749e7ccea2e9314caa00e319e 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 9dcf9889976c9550e5ea97f5613938579c4d94fb..032023388d3ab7f6f94291ec519a26d04f140ce3 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 11c2825ca945f7572088c1e91fcb6cd4eec3602b..7da6e3f1bf27024749e7ccea2e9314caa00e319e 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 c0fd7745d01a39e0285643e1ee8e03e0c1aa6b7d..e20a1a2692d2d4b2f9f760828a9168752aa82612 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 b4ec32ba1da0dfef315467abb47a5d16bdeff09c..7da6e3f1bf27024749e7ccea2e9314caa00e319e 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 6a5e5040d53337e92190d5c090efadf91878c957..04bb07c0bc3ef54570b5b05500bbf4a23b861d99 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 d2067fbb520540c43da05164d001077b39aba527..7da6e3f1bf27024749e7ccea2e9314caa00e319e 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 51184b3ebdfb0b3feff5ea40d2b4b2aa29f14140..164e770172050220d490e262ad002a10c89474b3 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 bd115ee140688b9eea9e672e69c65213f5d5acac..7da6e3f1bf27024749e7ccea2e9314caa00e319e 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 bd8e97916ab3001251534e57f1c7f71b60883d4d..f80dcd0dfed61af0ecb052c542d388dbc929c81b 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 02f3863e4d3aaa762057ddbafefb0b5b8d278d9f..d212094077a828b3011d7018b210ec9d824e585d 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 686415247e35f1bbc65ab1970a6665914b1c4efd..61304e85fab31fed5956d863ac1f96764063c920 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 dcf7368b383e50aad7d6e2b47e4eff4817c7edd8..7a7d3584de7ef5b0c7eb94acc3a5ae832a01f34f 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 9518ef5a42314e3459c55d5efec30c891d205dde..6aa87efd5b4129e1fa8ffbff2722053a1ba24f52 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 5de4b653887974af924feaca169e769eb933b55b..5a33d5d9812c7ab344c3711a12d8ad146e505d94 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 09f1bcd78fbe47ffadcc13d9be1f025197d1d60b..e409060f74a386d54abffc461f04e4006033175a 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 3708284700ba551feea9fcbcf71742a301fec275..4bf4e669c10e5da24ec1f578dec76134b8cb8b51 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 e976a6a1554053e6f98dff58fa8fa24dc1e53f21..aa7a1fd7279f95f8e08361ce9234ec34c53719ba 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 d8a6d95c9b3db1ca3357a780e4d29df4ce8d5a66..fe6ada22ec66b352fdcce108db4f07908405a095 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 4434ba95d749c1fbcffb7bf769564fb85ea3e55e..7b5df84f6733a6c18cced63ef4001a433ba3dcd4 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 e28d974b78f397fa9328e8a031ae6cec07de6fa7..2f93c2a7993a8460122f2514a2565462d40a8bcd 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 589c8c5089f1f4b27a32ec265124cd5d7e619610..6b9c051a94d83f62f1e8d5954a7edf537d5242ff 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 510a13bb6bb2ca5f6039a200424b49eddb4101c4..93fec1ee2daffdb15d1a8e8ba33a1e1d9eab77e6 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 42265876503535ae3e4cc5322aae805bd51e59e7..218fcaefdcdde2463227e079fd6da87bd3531a07 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 aa3f9f338c2e0e1f85e28fd9070c22ee52e43e4c..93fec1ee2daffdb15d1a8e8ba33a1e1d9eab77e6 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 fb0b1a87c24a11e0a56bb9f28f593a0f7990a0c9..0095254388c4f8c61654ac8182893e2227ea0832 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 4d5aa33be973e7c4cc4908aa60eac0db7dbd7f24..2bdd2a4f2c2d15aa29f3ffea0cdbd2d7eb32d4ec 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 8301a03813ed31933fdc4835565a3a0ce8bf3057..794647015fb0d20d6ec67c318b250a6884b24293 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 d6d4224cf0862bb94012433a1a5a007f2d8515af..a62147158e1c93347683ef4a94c425208b2c149f 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 bef25e6350478bbe0cb6f0f381523939c0d02844..608c8712c9bf5269a1f775468e00b67628882c0f 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 785d125b3660d1aec2552087204baa3a270aeda0..26b7101a1d07f878a9b03befa4fe348e927164f6 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 055ad1e00f22aaae69d773c49af8ca81f4364f6d..40c7135717ccb4fe794b1ee8dba74856017a2e04 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 6b0a73b3c27042525f1d00ed3a4a77858371885f..ab19a9a57ec19a7bbd78d6e7bd014a74ec5d94ee 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 92b0c7243ca69809572fa056d9a914a10346d744..cc7e1fbbeae9470824df10bd330791e69b77369b 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 8193eae02fbb668f14c819a064cf7000f94662f8..5896f3cd70ba4acfb8c308891afe038e1a4b0e6f 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 abf18685b2658f352782d461473553c0a8c4a247..cdba6219d40c4859b2c1c69e9a7efb613123ce6d 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 e80b0d97a4fa4633761a61eda67d371669777bd2..e96dee185b40f6d18f6287d990b635d92bef4ae7 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 0fda78c76d3dae75c0077298554c118437e55704..454577c1eb8e75ee61c06a277932f4aae85f5910 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 0763c887c81b33527d1c23ee1ce5a94a1ee23709..0000000000000000000000000000000000000000 --- 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 c031e4c16319246bae6392985ca0d93912bdd7ac..a52e887df8558bcf994581ee01025a34f893c1bb 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 aad4dce5353e70c3f135ab1300f854b77bf967ec..cfa9c05154cd83d22ebccb12b40931301fc7012f 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 5e37593039edb8d9daa2f3f262de0c7ec0feba2e..c16fb1ad5842ee839a7c1b5078e1f1d76f07164f 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 43e53608e91be5ccf0f5265867cf68792a221ac2..cbe8f13cdf1dd8c36949de495a7d600000ab0279 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 38f18f0cc1f6135065899de71136a2a5b18fbd33..4214de3415b1f2f7f3f268c66c5cdc926bed3d5e 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 bf9fce0889ecf7fa82eac9ba10c879b1420a5a81..e34b4d34ab147c731b2310ae9d8ec32468e850dc 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 6ef0d21391bbf47de43f0dbb7d36d06fb5aeb28f..ce4499442d6e61a8757bfed96190c8283b842da3 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 e8089460061d77c99e7268e03a81bb14c6de332b..b4b541dbfc6891fb21aa9fd999bb7c5368a0bafa 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 2854ea1481ddce113f96abfd934b851fde1b4ef4..d495b6936513bfd9fd030c1c89c6ba1c33d966b8 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 53f1566252c0007f15e510c6e6c793857c414d81..71400c3cf889e5357236d9b631dd46aa64950b63 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 d8eca7dd4ad283046a79299d25f18e149fd1e7d7..e6425edb3d7a0b8934cc5292a959cf99a067d853 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 1e908ea0291c76944f1e43ce8405a0df0dfc575e..e64609c8fb8107ad7e9df0c6427f010fad995e9c 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 ff5101f8ea8f9edafa78be4e2ed6c48feecde637..47804ea5421fbe22feabceb37a40c7ce9ac93007 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 969d620d93634bd96bf93f06b68d6b085ce569e7..946ad61026e345c525f172a772445858ce77fa67 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 86d02df61e08a0a632108d0745fb8b13691f93ec..0f55b0bdb861959eb63d1c1834634c5496c82df1 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 aa066fe3933e1a4f6a1892653fe884f1f3d11de9..c01191e869fb13c8bc4cd2e5310ab3a567730f45 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 d0acdedfb9b5fe16fc115659c491180ad2d78c3c..03deae0cbc45ba2a946876b2302dfa4983b92022 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 e7e2791ac8d258564321db8f5034f5c17fc6a8ec..a11f7c8d3af88fbfe8b3b56ac5ff903fdfb4da7a 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 8b5eeb45c2925d9cc355e64a22502a1f4a6106a8..c208bec1bfa123c93a8411cd326c040e0eccb420 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 866bd3e1d92ebba92c64b12fb5cc378abdbd74d1..c2fe07026c4d6b12838b4947e4f133c0f49e0669 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 9fe8e831859fa65a3004a39ca7a354eb43d0a906..f4e43522d5c21c50c9c0fa7f0fcb72bb4c078cbf 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 d5bf7a17cb825d63eb59c92a26e0b8ca122922bc..398b0be3c84e8f1a623710ad4dd9715850bb2a1b 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 a8dd3fc32a825d5bccf1ff8d665a6ad1911e1a9e..20ae2de10fd0fa71546b4d388bdd57f64fa4d5fc 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 dc6d1fc84a2c6304cb66eb59c68c19636bb4d3e2..76f004028fae5c2694b25acf75f899a1e9fe9bbd 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 0f805c70577191d4f61562801c5b4ae126a995df..ea0659607c14f6114ddc0b87c7d1c151c1a90116 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 d4617a87861501fb83e798babda990819cd2944b..40327dbc9a173be6d5fdf62f76a6e830a7413886 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 f2ee7bb80a3526111ee7fd470b3c8551f93864e1..b79348d03c4daa4edc3e7546734fcdd2b46b9e1e 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 d4617a87861501fb83e798babda990819cd2944b..40327dbc9a173be6d5fdf62f76a6e830a7413886 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 b2de93f477c7fbafa7b1ac79df7b011028ff93e2..bc3c8661f24fc7172542770fa49bd9acd7c2884a 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 7fb78172d4085a1dc834f1488a70e94029c4338a..21b4c6f146a61d8b6a0598111a59ae1ef3d20b17 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 d576f73d6951c27016f3df2cba7d3d46d80d39be..5c489fe44ecd4121bed1c5526457be4a32f17615 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 b91f26f0441ac513ef1b21a950232c55c35a70c9..0000000000000000000000000000000000000000 --- 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 b92267d5d9b19c1bc57590fa8fea22253b45f7fa..40d56dfad35385290cf745a68d0609d2349d86a5 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 b91f26f0441ac513ef1b21a950232c55c35a70c9..0000000000000000000000000000000000000000 --- 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 096e8e30e7dae962ce2741ac000dae98f53c7e74..1b042b720fbb63a432b325adefd48e7aafeb19bb 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 471415402a5ebea0febc10208422a1760035e687..f9860ae4ed6d25a3d673b8acf0bdb7c2feee9659 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 cf46ac873992065ff100b67d7187edfa76b8094c..61b515b76f2b74502d58d5b276c91ced77531f5d 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 63c16c1c710e22db189050bcb34dc883c71eb298..13bc6fedfe760dbaccb6d35e89c10f7b9493c8cf 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 83b071e98bc0da0347b033959bb61e75abac5696..926b755b0c930c639366760064c75e71334aa0ca 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 e701420bee72467b84e49b5bfd1673416205d374..6be876da3d55597884741aa542a41fb0b3f35ba7 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 c847a456501fe26c96b27fde3b074286c46364af..c149e3e7de8c0f446676e8b6ecf23c025cdb56d7 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 63619e7148e40fb8dbf897c62f503314850c94be..601a3befa87357fb5c6926b8d29eee1d10c24f9b 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 9772e6d8722b1d749dc45fcca6b350e09e9bac34..0a059ae386f696c3da81b5641b5f2b887e29aec0 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 f352f96b3956c00b78eabdaaddb028c12d62796f..2c590e67c62fc3f0b2c82316e0798619476b62df 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 d04e1374ed8314f841733f81314c34d390826627..a2194a657a981510dca52785d544f016e306e301 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 c10d9fe3570860dc31ddb60f9a5d6f185b03913f..4ae200c6a66625f1c9ab77dd7b9395b3cf9aa52b 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 af0894ce3dcb2e46829d811bcba428593e8dcaaa..e929c7656dc88f1c3dee634e8b2d919b49a5a88a 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 a7b3056d985be604110fa8e525fd972c68210f4e..fb8fbcaac5b52e2c20e0b08a9e14695ff173a7ac 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 f3c3896969cf8d5b75401c595316148e41e8e919..562c231c267515185001dce775c59eb025ba0d8a 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 e13ed8af9db5a910cb137ef7c5a4bfe552a36c47..44c0166125969326c28d0ec54ba09119def8ba91 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 49a56a278620bf6e3e3ceb5a3dd4634f420d8354..d2a22b3d204d8796ff467e07a5bcb38115f05ab6 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 5de87b2fa10e50eb474d12d23c8afac538cdade4..7cfb519fe9e640fef12ce5affcd1ada19c777f32 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 e9ea824c5f5fad5f4a3d0e516df40a912062d633..6e24721cf95408d8635f2659fb6b3b01baffcdf1 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 b59942ed247665060c66771ba0092c0fb662153d..44c0166125969326c28d0ec54ba09119def8ba91 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 31e8816a460c5b53a5c6d2bad00e60cccaa33558..965ef6d8155f2e76d0d6ac5a5874021d797ac501 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 5700fad7d231bb205533ffcfe8f66ba5a15f73fe..44c0166125969326c28d0ec54ba09119def8ba91 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 b9f924670125451176808aed22c89b42da25ca77..0525824da314c70eb57b9f4b8b33104ff3df4ebd 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 fb60cba34508b8870799815e63008651050204ac..d39c818a739bed7a7dbff6f07c86552c45c4c369 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 d386e9148a836db2de313e117bd2c15572d8939c..4da08a7a74366a55098dba4d89ec78df249f43f2 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 12402c7d3f2d8b7aadb7ec5d5b70d8592b7f2664..5723fc1e7783159e2afa087f831f80cf49313fa6 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 c308aa77f9ff8c7f9c9552843a265e8827655933..c1a730dda85c587bd917761afd54301ff0eadb30 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 aa0f99f104dec71fb6a87a20d023799cf6533f97..0000000000000000000000000000000000000000 --- 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 bbbc5ede5df41e0877508ed6984c497038843afe..1d762fd1dbfe6b9520deada88332dc9369f16136 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 a50ce96ac340b2cbebb9478450585b3ec38fa37b..123779a7ab39f25289a97f2f40cb51790bea3f00 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 04138d2dc24a3e585cafe01416114fbc9186a95b..151eee80c145639c15c62b9e798e0866acca0ca8 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 8b29e8c3d447269826dadc5c84577166f9b8f39f..123779a7ab39f25289a97f2f40cb51790bea3f00 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 2b085cf8da2146e90e001f6c90f34b5be3c2de16..81ce8eb2d572939a9b0c463c5c00a86913c7d787 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 da4fb5b410889bf2f00015f0221b33248c55f92b..5a4dcfdd8f1b474236238d29abb8320ae70ec8e8 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 3fe1a8b4f83817e4b3cb6905e1ad61813a118eda..5b4a7bb23a74c90d813098975179eb6f72e2ef15 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 c0fa5ec24a34220a6c104983dd957e5d88442a69..879046ea07ae4fa05763e65da84472f0c783f7b3 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 2e605318d12bd4d9a0b1b2b3a03317da37797eb2..787ff90f352bd8d25d6b258fe87c3f1e057f8079 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 cf6adb380161a1c638b12cec3f5b3a46b53ee1fc..a3846ef5e588011c5b8ed04c0f98504e22cf3efe 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 92dd62ea17a6142d825a2b584e731c0b33068768..787ff90f352bd8d25d6b258fe87c3f1e057f8079 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 8b6294af5f988b99f50b445c4dae8878afffb7e2..6555d4ac7a1d244819b81e4b63eca70a07f783f1 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 cdc8d665dcfe86a191a5ad2c059454ee74b526a9..bb8b6df9e57eb6c68b0d7b7f2270e9e693166c09 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 437d009dc8637d1064f0f342b4b00732164bb6f2..1b5e9e87798effc66a6f4cc8a0b0cff17bc7afb6 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 09adca69e5c0e3f8c3d2e60e032e0b6705d9a252..3f65e748ab4cfd0da2d80bcc7b644c87a2193d06 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 8a3d273415195f4336c16ae4a8e8fe4c062e4306..989abb6dc682758402f2bad97f796027dbe0a416 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 dce94fd8d4c47686845d0f9baccc44f89d694e9b..8ce24667ae6f402b73d89429a7722ea3fff31bd5 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 e51452897ac17f256fbe34ab579899848ce34396..742eaabd91ac7c39b00ee8d10c29a14e61abe023 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 57fac8225fadbfb353b3c7cab39b580258ed252f..1293e859792e1076e767f61460a144600e9aeb69 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 7576fe2aa506e9ab93c7ebcc0d5912094cb27de4..d0362f056164077279a2fcacca1eb2fe68bd4269 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 82f308f6513594a8ff3f48f7913da03b4107adc0..200ce056a7e1aeac86c0ff12ff266016b7c707c0 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 6cef09807bf5ff0d9b85c6943b56e2f07851d08e..ff07570f9e13c75950d978cd7ddd1d2360baf2c0 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 2c00ba8eef24b19555286c78a26cc972f500d5fe..7050460d34578ca03834d74093b0fc24b975727b 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 acdbe2c590bd1157ad3ae21e396af219eefe9578..8e613d3f3805f07e9d118fc1afd030b8d64ebf60 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 98b7bf0dbdf97e9b273c1d903af9623095e44d8a..beb580a588189c240b15603d32e8a43a5172ce29 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 9c2d38d6d914083c4a162f1aad51b8d448f8eed5..b60b78ea81367a57fc5dd72387665893db1951b2 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 e7b843f107a9076c05d4b472ee61ef964c66600b..c9aa18024e386833a38dd973a7d256e2b1c15bb9 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 ff390f5b2e36571a1ab4ddbd51000686ffd27cbc..b1b29b182afbdc33feead9933c1751426b6f5d59 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 2ebd9c8a415bd1a581f7785a3d84c92cead33e1c..f553a06c9b3e87ad032ffff142ebf60f9ee65350 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 bb3c168f81e6ee1e9f93f6f37640c7493a6e2110..0709407c889107c5243d01ab1737057df191c661 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 c7d020bfdfdfbae9ebaf7c2b5dd52f0e8461fe3a..b7ee00bc8d91eda4f5258bd59a6d2bf8aff663f0 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 20885ecb2956a25e61a06a2c16058fb19a1677b5..9d84d391569df056ae06bd52eef127fafc5e5e3a 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 7e5f9aa8d3596e2c9a0a83c629a1f408e16b3b6e..6047c40fc05434c64aa8d4e01fd72de28cac5467 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 3616ab53af255293e82fc82691629913a5937901..9d84d391569df056ae06bd52eef127fafc5e5e3a 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 2fe54b1701005f988b45470ac4b73bef4d4b59c6..134dcdbd63ccd694b1589278f142bd6d4651a15c 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 fdac282e3b88803682b555ab035a1f4aa38c0da2..020296700294e614d7c41a1cee785e5c00ec7c83 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 37ba71fcdfbe1c25fb88883ea4e482f619d14a47..520605c0d661201e1983dbdb4e0bfaf28ad3f03d 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 e93336086c62756b5f0ce56c12f14bfab3a56ce6..b6b02cd5ec3f0641246fbb2a3694fd8c7628fc40 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 87073419abcd9aee10e6eee0b5ecf6b8fdbef104..eaed62fef54e12c4d7c2d2897c36190f59a79c40 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 e74f584c91c52f1bfa1de832334d83f2f1927406..419464662b130d40fcf6a5f3dcf20b0b1e76acbf 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 54672e21ae23bb15116c478919b17509aebd1ac6..36dc05b3c9098a0b896887f22ffbaf890de7d11e 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 dded682184d5ea10b32d97ab6b914266bf8443f9..82d7b6d1e1decc6ed08f3dc75e3c04c896116e1a 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 d693e44ecb57d719729e01967e1a9f05d8164762..68b332c9cd90946ee0818e83c1528faf9209e57e 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 9cba4b023ce99338f1b81fe446d8734c5dc244a4..094478f34d8d805a19b980ec24c097ef41a96c65 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 ddd9fadd3abfade7e44fa25320ebde79c9462327..3553fab9b23475f31fbe92b793b3d516fdc50991 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 1f3dc86b62f77c02ade6b7d07bf9894f6f14aa46..a753832ed1d08a8bea79fba6160352da60f88b67 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 88618d3745c324f194fdabff50e502f2e5b03a7f..89e4532160bf76c06474687bb431c8bf6093ed10 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 2f7c1cad191088dc17427d733e0fbd0f2d09bd5b..5405d671a52da996110e56a29496170371a7b329 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 5dcb042f9655e4a2173c210bcadaf0be59ff32fb..377c8cd036ae9404600465e2aa230ac9bf80ca59 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 5b08f5994c91961c72814f75d7e1de15bfea8383..545aa64eeaf7a21e9228f0b010c8d6026d4001be 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 42d21e89314aecda583cdc8cb381db03b80346b4..52070e8996f210e5b5088b44f0b4ecc77fac52d1 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 8d4766eb812c7298bef4e597a5db9da3f294a087..09e76f52d5d75d3d72825aefc1a03e2f0b3abeae 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 4bdb295eca57eb3a9b6f48ac03c94691ba62afc8..d18a84790d4d403f10ef91cca66faa38a6692b39 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 0381423ee77b5d578e3713c972521e6ccafcf539..cfe82a7323d60dd259dc34df6b6291303f0f9ee6 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 511a797a5c74eaf5bf72ff4062456d712f3e70c8..278c245871391b9ca20707f47506725169b2cd15 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 e5f3d86e238831226c380ebf1fc3cc536aa25e0d..38a1aa2c76d5be7c879bfc741f3284da073401c9 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 3bd3a96b8e6b058adb77301851d041c9cb62c56b..1265608dbc5ea9a49ec3dc404427652e43e176f1 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 bbc52f701aaf554a40f83d91bd2f3ec8136d6551..5bcfb21cf73b236bdbd33c2b506ffd4097b9aa62 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 4eb2b1eca08338c5e40bec9b340bc597c436b396..bd9e24e8809d8f27cfb9150df9c4383a39352c2b 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 c212f41c91e0206226c13cf26bab216ae1fc8767..43e1b1c609a0535bc0705f7716cf5f5fa1c53b2a 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 efae138c1e0cd710f1f11a81455a30bff2e1fcd6..14d9c0122be9462eb157bf5b949e755a7813d1ef 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 005b8096eaa204ff680e6c11215174ef7132197e..4a8449897529251a0fe8d3df2447710ae3191fa4 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 9e88a65fe4f70e2df2e2081650ef81b8c86da2ba..761d31ffb7cf8b52326037b96e4a7642f773711e 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 dd993ae7a9b138a7ed889aa72f85d2072d457c99..04700c84ed532a7fa45608edc44a50f7dfdcbd90 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 502b498e92694547c862ea65089a947e8a9da64f..332acae14d8c22d8e1457f833e2278276abd64ec 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 69a6f5c50ff57e0eee2ab9d414561ca97c90e01f..421ae8277c215b6c8e35a3c194a38e18ecf6771d 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 4d46faea482b4047eec38b0a39a538b833267ae8..d40193459de62c6c840a34a57debfb87d7648660 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 b22fdf50133bd92e8fd5c102778108755717774d..0000000000000000000000000000000000000000 --- 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 1119a8f2abd6298d8ff22f487daaef5af09a2678..a7229ce13172fc52f5ff3c4891a47e1ede89c2eb 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 c07c913bb9c948aeb842bf2936edeb58ce79c5c6..2200253ff11d640d2911c0d7f6a1426157c13b5e 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 eb809438374340a541d22525c8f6d2c5b0985b1a..00ac43a1713cce789d3288340c3504b83c248e0d 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 961897c4d65777cc8db39d297e33520e613f7ed8..a8026b4d17c1e0cd4908e909ed6e56e76c5a9ddb 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 9aee029a07a1751de88d83e6c2c8e1331c81e155..d4e3df24a71e9f0476f8d042b70bdc0a7ed37ec4 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 2b450e8fff3c520c724a9769f4f929dd605a1385..0000000000000000000000000000000000000000 --- 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 3859d7852f759ed506649a3ee7880a796db6c932..97cca23a296674c90a3d90e050592bec5145e752 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 4505e2718e7abecccef5e652410bfbfd16c80e6a..0000000000000000000000000000000000000000 --- 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 1c5781995f62d60fc75dfdf469015124704b8428..afe3fb4853a43e2d71e493ec5f2f905ce88cddab 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 ff82e3e1ad5244514b2fcd6efc8fc34d0c48f274..0000000000000000000000000000000000000000 --- 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 d3c8d8aafc70e8cf4765269e92963f75943b5869..7d9951f4de8f486e7a5cad27ab7cf488feadc107 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 b8bc06ce43aaba5ae99a8ccea0d1c4eb5846d00c..0000000000000000000000000000000000000000 --- 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 088b7ce3248461ef335362fe965e0996591ea4dd..e630b3f33f3232ee55a055b3d01fdab4224c2339 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 6759ee13fd5470a998a145b04c213f66d1d8cc88..0000000000000000000000000000000000000000 --- 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 72cfe178b1b9d65aa5cb251641d2412823fed127..3ece278ba97340c0b113e8ef4181f6965ee3fc46 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 f4a236a0c0db7cc549d018107eb2a3d2776695ed..0000000000000000000000000000000000000000 --- 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 f1ef5eda34ddad712b992d56267a41bc80add1ff..464b10b4ddd032964915e65ba7f46525915f1c1b 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 d3c5f5edc07cafa704196a67f7f768ef293deca3..6c2ebfdc393ba97bf82b1fcafb5a618669080d8e 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 6698af203be30488f58641163b608aa091b0d541..f8587610df47e8ddbabc2c17ebaed8576f4e0f13 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 422b15b864e50b2a6920ac9df0d82aa8e30160f8..89d5a52301da2865a408d2501df1374c8a655255 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 db7a1ead8681ebb43a9bca6761e892d705e1f6a8..60618f6794200760ddf5733aecde184c3572db7f 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 32e6c4bd38e5d865fd55ed8566638e13ad917d1f..d324ea3f813950f11f6a55422be87eb03bb71082 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 4daeffe7639d622596812e1e9b24ab7ee8cfff9c..80357af091561e24cf1a098632f80c676699c9fa 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 3350165040089d768fa3e5c17f92d02b4ed760de..7848476216db07b8c2e67c493d1d2defdf6e1aa5 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 63b5e325f336e5cafaa67a8380f224a8c994c8e1..80b8f115b204cdf362ef55bd569dfc9385b2b081 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 91c434bba49aa4761845511332364a368fc6799d..cfd4fba90733ac05c77b9c6f91335e9dea64f150 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 8e36e83b94f3de7a1626d91987898e12e35e21b5..e415a587ca3c1b9152ede6b1364a7f9b80a402a4 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 049325aeab8b12137e3f782798ba5758ff258a92..4dfd5e1d021fb8a43668668b658aaff8c6949c2f 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 91b32a6c91b72245f6fc1b247988e7faad9fb502..6d45c27faa182d6b8264d28aa00e30c05e9d7503 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 049325aeab8b12137e3f782798ba5758ff258a92..4dfd5e1d021fb8a43668668b658aaff8c6949c2f 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 5ae3d5443b8c791774d19003d78eb32b86dd27f6..79df81ddcbe9654298da4ef224273464ec5443c5 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 f471e135d583e15e8b8d8d361737acc8c379383c..2f8b6d1f5b3a37492527b44c9210f1bf460a9884 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 e86295207c33b5e5e94ee1ac4012ed174f7e1e83..522d7959b05c444205bffb234f413b19aecaf9ab 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 51e4b85e7490b69a0b8179332f21e75b9cde19d8..2a51abdab271cc825f21e8c918c309d5bcf9ca84 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 96357ad3463eb4e8aa8d0b10c2b9bf6c8621cd9a..a2648599adab146938dc441e8c7af0139df8fdf3 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 92cef2fde0dc245026ee1eb7067049d57fa75432..8725d8ab07d4bc4c915e10f240c1f23d3f94fbd9 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 77c129e79fe9099d965917a7ebe90966ebe1c7c7..f5e1be9ac369b1a613fbb20de5b5f72093563226 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 c039db9a159c514ec561b127a726c6ed783172bf..984541d1d6b7db47861e39fe97200511682eef7d 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 0114fb8e78bf6916e5d143551f7c8892a386875d..d482167bc0e6b675708210fc66d142ec3a280782 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 3faaca26a023ff2f9f3fcf4503be227bbdc8904f..5f9978cbdc956742b9c0171202b2b4aa51890228 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 f6082c1d3785c23d88b377ecb75514c8b05f8fa0..a1e90c64319493e3de5883ac0ba583cebef73ac7 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 deb979dd061dfb83baeee6bd0ee08ff25a6c172e..4185a8f850371b5b78e31e02958394ecda52f9d0 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 3d2f44a892c9b2b49331414e573df76e13cab71a..7de8efb8d7b21b1666205fe3587d450fef4e2cf4 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 f61e11fca90403afbcf7a83004b0bf84c73aed28..bc31fb049e5c817a92664f1ac2ac8f9ef69e86d6 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 3258e758a87cc1f414d76849807a8eee014fc5d7..6b5cb66ad4c5b5609c88c203c07a628d985011fa 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 032cdf4e234426a873967c8efc1b77ef83e8b054..0079764d8e4fa13cbb5975ba4fdfdd1c8b9c57c4 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 7e3878151fed35746c74cb5e2f0034def6add874..8c37a5bf7406073ee41419e52c1366530a78206a 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 0bd9a069d096b2bfa9f24124b9f1e88e496e9a86..265558e5159a3650bb2cb5c67b5cce65fef5fc45 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 2be28d4ef652b0cda4f6df8e14107e30d071b943..fcd6fce1b474bf1812ea51a9a1bf569a0ae9cbce 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 f37e073fbd4660027401ce313155fae01ae6e091..f110f0e32534f835cb45d0959c33253d6c89d6e7 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 2d50ad8038fc943f27efb092dd2f765b73093288..0000000000000000000000000000000000000000 --- 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 3816cf75926b4dd598cf3aa1d67792d739033f15..c5aebfd106919c42209a57ec8fd75caff602f11f 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 78ade39d772151e27824cf50b069c5b2aa79c6a8..de6628cfbd8bcdbc95b35c762898a9da8517c453 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 d6663796f870775b488f809cd814f69f1843b7e8..0aaa062f4bb9573a0faa9bf422a6780706221d7c 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 b452a0dcb629452fac238fd6dd33857c94fac582..35a7541060d5ac5aa71ac47c770ec2bcab7d2055 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 f92476c9f6c26e296c81da24eff84ae8ed6b9a00..89b0744ee0ff41dc7ce2963d2234dc4a13193db4 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 69f53905fce3caae2530f7c600dbcbb414b565d4..b7aa6ca2e9c84a23b228fea2a14a4c0ae368a842 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 951e55ec64136f17b051a31edbf852540ac066c5..2933386c5fb2d122888c588ca7e8cf9e649effe3 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 7138fe3939172d0595cf379a5f22ec78b7f39062..f5bfd3002801680252698174d9644ed5dfd5a569 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 e84a83599189024febb7772c9cec41c471921393..9426dd27b9130a4a246cfa90b8a0d2dfceafab8b 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 274d30df7277d0a37e85e3bc0f01e78bf6175d1b..6907429c391b29b3152c7c8c020f6d023292eb4b 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 80c7d832c4e2a832ecbcc72ad3a24e979b51505b..5dc22d2874e526824d2dd5edb8ac3896c2206925 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 b00a612cd7fd5be383b17b35f10efa484b221049..75b78de22de15a20aa8caa03edb7f3fde8f8a086 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 74abc67bdc55d7fae59a8404a18f2332b8f37d33..c6151dfba985fa1c9134f38a4e76912b202548ea 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 d3eee645bf7a35bf1f3db397cf7d2086b01992c3..5e5150abe191c39eec84f16f25fb1596464884c1 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 5bba67c6831bd03d7c677000b5f5a18c7b4fc3a8..59191d61d51b78e2ca770ca99af9851ce24f5f85 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 37e5c3bcc33ebf352cc1d2adc65394cc964e425e..2496cdd216d7027eed5660d51322c99e2fa078a8 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 b246ac36fe952bbf917ba2823b0bd4cbc2f5ab5d..3c1b5715a47f7e651eec04f754742f2edb3b7803 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 cf2ab2ffcb031a26ec71c67727c086bcd779b202..11fc714e6e5844b86a6850c6c4e3bab27b22efa9 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 d1e2b0e58b92924dcdf524f95c332de4c7a5ef8b..ce4d3cf4b56dea9de900f52c0368809e84905add 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 a53a1ea4cead5df6a2bada333a061d01d44c0823..0000000000000000000000000000000000000000 --- 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 ba7d9f9354e630e22f60176e81e7bed95204b955..0973cfba05c722ad3b96aea511602d80a6b34816 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 2ada33779de13b5915f018d70cc733b4fbb562be..76ac0edf2cf98d3bf8d95d486a2bfb07fb4a7ec5 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 c9147ab8d820ea59e0e48fbe97fd6904282c0e7b..f2f82d6d7cf765d9fea28f87c24f3755183cd283 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 e4ceee2d486ec239e923e9374fe4cf9098b76458..0000000000000000000000000000000000000000 --- 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 961488898afdff6e5da69fb85e4e89d8b624a0d2..5930a8266f3d59a00fae18b78af99cfe01aa8d57 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 7a97d2c42d5e57a32f512ed8e1d040af2f68f372..789626b6da27b9c8370222b13c81bb7ee16633fc 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 53389861e835b67d9b20e43c14429771ffba52a1..f96b487d783580af9fd375febfadc1cdc4c1b4cb 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 7a97d2c42d5e57a32f512ed8e1d040af2f68f372..789626b6da27b9c8370222b13c81bb7ee16633fc 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 5dc25ede278576fc4a7b5681627e436986c87eec..593e8eeb87e2f594e9a0a05f902468dad3f44954 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 75857b015563658c1aaa9d32e16bf8f7e5bea1cc..51b917771afad26527fcfa2917b423d367047c74 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 130b1839bf2455294a953c3594c6472e78b79cbc..8e37509ca6cf186f867adb4ae95a1d06bdfaad2f 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 e29507dde78fee0745bb347897a06da2176494c2..47143f7cd6388cfafa9103cfae4771f5e6fb1ee5 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 f7fbee01d1650c674ba1c1d706ff4746e63472d2..67fb157d8e440549070f3cc012e3a89a561062ef 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 976f02f2612de8f6b20c401abc1d77b02832fb2c..47143f7cd6388cfafa9103cfae4771f5e6fb1ee5 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 90d7e4e90d4150d4dd6eb80f47f78c9e9d11a69a..5d46fbbf23b96118580a0248c143688496ff4eb9 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 206f0a5429f16b9509d7925e004c486a185da66c..47143f7cd6388cfafa9103cfae4771f5e6fb1ee5 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 3e361839f33a41f8079d3310b294828edacc5336..d7a29410b0875be4264ce272d7dd14e494fcbc8f 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 ce44b3ad20d55da2f6588a428b7200775f717d74..0916e7b7290b347410cedccd87fa6424ba71e7b7 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 755b1cf6ba92c65033ff639935ccd0cc18dcf345..a4db1d10641a97d99ddf7ddecb9d218935ae4d43 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 bd8fa8fb696ee7c42fee11d46a60d76f8a3a34b6..0000000000000000000000000000000000000000 --- 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 4c96ddfc8772752202dd3005249b5e49a8115d35..13a87f912103344c957b42d83452885b98906d5a 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 c0185d34461a5c4305b514fb6bc9b61e03794c01..0000000000000000000000000000000000000000 --- 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 cc1bbb1edd82112e6327120d6c5586f3a6a5dafd..2c1732ea169db1105815ac9dbb082342b6bca96c 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 01210f2a0f5c033dd5cbb1d9f74cac8bf45be464..4cb5aaf54e310dbb7c7e7dbf853507482ca6f2f7 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 e7243bfc8dbc863f416a9adaa1ad6a1438c79207..f1d548a8a05976f6c70bd852c2da8002156c0240 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 43026552e1fbfdd2b1a73f3324e19118dc0a570d..2b5ec82860c28e38c55505f99f6a8fbc54e0d476 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 f63ec17aeef139d40043bf6a0b2f7cb9763f1a8d..70041085529129cf5ef4543bc71696908dba5b93 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 3c36c8ca6fd22eed5870e760c58c40cb63ecc72b..1500ab9b88068be8df2e18f9e2e8d43bb2c40a0a 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 bbba5ae0e96b27aa8a2c1a2cce6f7c936dc53f56..e488cd3cc59de75b47d048bf1d5a470439cabced 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 932c66ba01defc9fbe70e50e369aa59eabfa43e7..0000000000000000000000000000000000000000 --- 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 cbba6dceccd637e3837d4265ecd4dc004591205f..fab701e2203de863d3b6f4556ebefca6bd9fe197 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 fa0a4567f9b1695f53ff6fdf2eb3ea90937e1253..7114397adfe0fbc5e56cf88fa4fc119b88fae202 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 50be7dff7dfe4d85ccaab47bd183609c4299f6b1..41438841dba3fe9b659f899477d0fa8449f890b0 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 ff4b7bb3aa69e8d0c11aeac1f1f45658f688b700..84c2fd11dcbb6bbcb1681da969ea02b957f3be11 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 04bfc314ce6d54f7fc1f621a66cc530f3bf2b0b3..6828e4dce23a38e26833e0018e2422a52fa67f07 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 ae67be691dde8c192ebfc606feeb70b833301b5b..786814b98789a640ce8ac098c4c82f113e3f12d1 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 7a64f87174a629d8e8fa661da8f4f544c5b92af2..d4001dd80bc7031f61fe40f200d4eb9762b4c423 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 c2ab19563e0309eabf2bbdf487b8d4b385fc95da..595889975923784d3c5816aefc1e936030d515ca 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 ebf11c9c8b5195d5deb85b665753a58ad34070db..649132c30cc471ae5054d1ba7588ad16639f86b7 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 b7a3a31628ba5c38041621413c327a7f3a2b7430..ac4c605313bc9cf20c7d7dd2e466d5d33180f310 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 4ba0085cda12ee2102882b8f1197c5ad1e0a99b9..c853b9230d19696bf388d3021a4b638f035a2ae2 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 46513d8248bfaacc2d5b23bbc10ed3dcfff3ecc4..c541e2dc4d566eb0175929be3fd4ade7a8f2948a 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 9fb2ae811e29b2c0c065091a61620df632afdf65..883572e8e119491c01604a005d120e98150ebe09 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 a60c086b5b65dd160cceb7f8c1bc71014501f876..5bde65950922464312d50c1939ab0dca264cc193 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 9cc60ab5f021e0f88d67044e9f15651f58822330..904b998d039041897d3a82434006d8d71ca0bca3 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 192d3fc6d8e9d502557463a31dbd084f4dd3d606..296e1ac6d96afefe7a549c05a739306f9c390685 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 828f0c20b8ec5af022867c757de14997f368d085..0b5279b2fbf11dfdab80e099fd1848a093d143ad 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 bd93164345c56f91ba07b526127d7d2ce6c90f2a..832fb0789cca5ba5876f520829301e5d8b616a4d 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 418dda97dad5dd9dea39def22422f21eb337b3c7..c99041be74e2ce1429aaa04c3bbce2fb7cd90920 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 1c1085c9a1194c531672c09920eec41f54777407..f7e0e04949b9f54b3f28838d6b105c6cf40c9d5e 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 809eaa0c393c8806726eb41418450816c87ac3f4..8cd12628a4f46dcb7daffb3305f7e88b74482642 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 b91943278f71abdb554b0488d7735ff006384dfe..2a5d98951abaa891caa2e41c39aab6fc0383739b 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 2efe949d758194a1364265a4752d950c8047001e..becce0932e2dbf06852ae6ab514178da38ff6b3a 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 42f15b3352ffa2bd86127090795a20e8326dcd7e..dd2126d0726d50df092fd661d9a900105dd5d159 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 5909204f2930f488df4540d56e73433450a9520d..86adea4b6192a8164a4f560dc72cc888a609c72d 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 91cba0f8e3205777f0af7d9ad56c37192108a9d4..4adfcb7db27b28bf9a6f4e73c8507e54eed8e41f 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 7cb2950d6a0aec3ad7317b30472720a1650221f9..738e96b7818d1c759c1ccca14556caaa21d2ff71 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 21c01e89ee57573ae7daeae45dc20496d28e7f35..fc758dec34e8b82e2ff979f4a356f7b6abf12f50 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 faeb0df2f42acb68468ebc0d5b515fc6fb805106..5b559d48b73dd029c2eb2d938b8f4cd67fa1be53 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 3e9f66e3d3d99828bed2c27b6474dc666e7da96c..389b5ff3942d3667618872ec5e161a4404cc97e5 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 1937223b02e4bd7a13f181af2e1126f4a8c5d322..7a3570a0d51d7fe3288ca03fb3b700d4f566fddb 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 63cc719d84e034348d9dcb49e829103b6f6b9731..2e0377a2c9f883f665137d64e032a981bc2c316d 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 52ad743a0a54f09e3ec6e2f958ba53c4afb144f6..5e96db2c2801509a717e37ca5c5e52bc4599642c 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 f878ff1e51d1790384458c96ae40cbf6eee061b1..0000000000000000000000000000000000000000 --- 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 fe0e02d2996bae8bc7c5059bf9f589ef01b129ee..0e153d81f063bf0d364c148d8197ebb845bf5e73 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 d11082a188d73ed2dd208f6972d536c76757632f..06b97ae4ab8c2cd330a578b4421369ef0549a121 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 02c5e0c8b21450ade396660f7c2e84b229a10af5..3a9116340dddc3b61d3b763ffb43d1ad20c445ee 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 6e6827f0e8f173b7bb568f921ec11a6e7648464d..e6bfca0aa42bcd71b4f3765cf15534f86582bd52 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 2061b282e4c22acc4d6c91d70d83d072521c324c..6f3f8b8421a2af95c2495c5b80bd89b611d5469e 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 12721a16b05765ad209d94afaefdfa0c6fc5e62f..59c9e7b69edb60b46b824c436413cfb666e44e85 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 0185fe83bbda4cdd69e60419996d1a1dbc033ddd..1e16cf9cfb318a9f0d06fce4f8d0fd1596e7541c 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 3332d62aa681063f49947fc6d1bb284c5a06c98c..dfec066dab4cc6fac5ff198a276bb458d91efd24 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 04c16583a61f066aafe84d183591499006646d7a..94098f771970b1a171975f5ceae60e7cdf08a892 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 fbee1e1858a24abf678afbfb882d2122e3875614..2c30da76858ae720af1ee4e4d5ba777c1115cc98 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 22a09c541e2a05ba317bdb17e4334ef57d92a38f..c90fa21e3e3fe672a033bedf7830a38cddad210a 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 7bae2abb0d5b87597a30c0006344d405e32799fc..4825ea2b5d1459c712bf0124f6d5913c2c800b29 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 e53b6d28d1f3087b4919b6b5472944256dcf7580..3b3b9b0fb79289b1ff6a804b0df0d5ccbc99a98e 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 6cb2e62308551c3bb35526f20059d90e9cce52ff..18844c7f9517cf8777ebae952c20ba36214290f0 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 5c2ce531508cedbaf901c073a264c86568c90641..1398f34cab1015a3da5cef2d293af001a5448349 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 e59d45ca45e05ced8964f032345a1c922f28ac2e..9b560ee1f5d67c10ef0879b12d1dd9abde4c328a 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 ea829767baca0404fa9e82a2632ba332eef3f106..06dc68f8531acb58939917268026db4d2fcbb21c 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 049325aeab8b12137e3f782798ba5758ff258a92..4dfd5e1d021fb8a43668668b658aaff8c6949c2f 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 3951d86e3f58eca2bf6e58cbbb0d21e926c582dc..9a8e12047ef358a5e06a2e1f295eaa54330863ec 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 049325aeab8b12137e3f782798ba5758ff258a92..4dfd5e1d021fb8a43668668b658aaff8c6949c2f 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 ba92bd897381c049b3f820a502f9716cfe25b1c1..34dd599d44d67766273502bd2ddd92f1700f60e8 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 25070624db6b612a00c2759903f4fe051f68874d..4739dcb2ad33c690b61e7ec9e2b752c7600f6a81 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 6e8788300f9939d05fb4a32a5abb6ccd55431bbc..53b198ba81193af81ec3b8f7436ba5fda41c900f 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 c3a49487ef3f09611e89a33c36a66bda983f4e31..5301e26ab31bd821f975ebea3cce8171a47d3df2 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 340c178635408fd1ac8dd3dc0940fed314484649..b843510153dde3c2f1e89442a6877a9d4aa0d14a 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 3da1615c2d5908ce50342a394c0d8f77c547e363..cf1708b061323ce40c72eae3cf3361ed7a92b37d 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 2269aef97fe608a1f1da6e98c763aebf22ff1b77..a2de64a3240bbca17c7d996b789b4b6dcd56bfbf 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 cc3b9444712696f18b370e108faa9f95f2321e7a..7c19a70f9b9da4526ae09696676fcd467a80251b 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 4d1bfe67b9b52739772482683ff9f8bf046990b1..f05911872b61cc221b96df2330f0a55a207b0104 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 3f32a10b363d53e35e84ecea47e6c5e399caff52..c97543814dc2f3d5ac9fe01d59443ecccf42eab9 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 03379a660db25bd8d0a369814c136afe66fd83f5..92ac0a089f3e8bbe462024587cc3ab1b83a14f7b 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 ab16646490d0debbb0f6e0c37be0d3d2495756eb..5dc3d0ef7135468e7c554a59389662265f85c15f 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 58186b3e6df679736e8653ec2effd0529f345189..2777e43a44b47cfed5bb523bd9b59eb8044c6062 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 c3dcca05e8a1cec09fd36d9d184f864818854470..cb5d6478f31f34dd58fdc5620f86ffa18ebc89d1 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 4baa1963f2e3245e99c990ad0eea3effa1b65bb6..e3e1572d99600fa628bc752d17ca281a181de322 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 a392b703751471064e5103eb94bcba633e69d113..51847d82a7826d017c0e3f5aabe07b4bc02b8f5d 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 f32722311ad7587d95ba2d07f514fbd5fdf4d6a5..053bc6236a7e9c4d115415793349323b752022c0 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 553674692ad30038ae43cf1cfe1fee771bb4ee28..0000000000000000000000000000000000000000 --- 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 967939ccbcb400208fe8e7f3d9a20faac260b61e..079c39571b95b1bc40aabaed0735ea5b7bbc260a 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 c622fe023ce91c4bc56d8dc92ede86a72b487ad7..0000000000000000000000000000000000000000 --- 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 7199de33f6909ea9e91844506331e7c22a0fe49c..a97809736efa45e3f2571d97a5c496f5ee0709cb 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 46995b1d31035a3499a6b3a201b99ce0e04081f2..053bc6236a7e9c4d115415793349323b752022c0 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 ace8f6b52a81aff01afc24176d9a68a8bc543e39..238633ee3a280fc846be3612beac5863c9a70ee5 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 b67af66f47b7718adf0442421add848ffd9c1a7c..9c9e5754a936bb7ecd22657c60699556965f8a69 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 774dbc65237b5a13c5a8ea909f6358641461118b..b826606770e9fa0a61cf4761e93fb5ded945d565 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 d86696aef1cfa1b784ecb7d384b0dc7bf8bd90d2..20892b683faa68f787f7c7e13e9c0d74ebc93019 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 e2e597c7939fc4eacc495ab8aabb916a2a3300ab..e081dc388c997a1efcc6211b00e6f0b4b362c905 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 261ebaca5bc81201d5f03c35e81ff3c26a77e5ae..cd0eaa142b536c7ef164de0211f29fe09ac1615b 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 eeab79d169c3a7897cc3f547bc64a71d2667cc3a..6f2162b20671c792b24155bda73c7f72c3839632 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 252a110e8ba0a1060a6d15541323f6d6a45a7d86..e23f4ff9704fba022c4e93794fbf9fbbfe4a20e4 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 baa5b5263bd480f3f7e3df8be021aa8ba86d31d8..199375c173fb59c2e435e0ac13cc14b3ff5be7ad 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 9d0820b4e6263e545b783c226f1bd7bce5a0e8eb..c7441bd1a643d7bd214a535549fceee075853a03 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 457e2f0ab3843638da2ea83c3fd7f3c755bf1ae0..7abf6b197c7383ed4bc9109996ab6c8d52992079 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 488d81b6b845e339d7fb6714536c03c01d0aa0bd..3bda8233e74026b75ff66727f89ccc25c3716839 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 b70109bfa3077a7b80a19efb4fa80818a5541aaf..199375c173fb59c2e435e0ac13cc14b3ff5be7ad 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 ecfa953fd41e01a0e212062705ab5d7ad9dd2e1c..4a2327d4fd9a4ca4f42e2a558a37aeaf72dcce40 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 54918d2b49150a2a307d4cb8658406443da52513..e6990c6c4859eeea026096fbf96c4918a941fe8e 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 0000000000000000000000000000000000000000..c4366e81f9156d2b6028c87368290f173c1fb58b --- /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 1ac58753c79c7e2abbaf6dd498d3267e9b887cd0..cd1726d7ebfde6052bd236d82249e5de069ec94f 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 0000000000000000000000000000000000000000..83d71b16e9c705e804db3c6880e9033fd142dffa --- /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 2972b51fa1e0cc7336bec95164ba251e49eaac02..4d31d4b095fa44fa26588ef835085bfcc1570fea 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 2f0f01621b7e784c79829ae15cc76788d905b6c0..6b7229d7e69bbc4b2a43e17927e63a4b64f2a79f 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 394e5ac706391f3564bd754349ab13a5462ca5d4..4d31d4b095fa44fa26588ef835085bfcc1570fea 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 76ff092fb29b1f3270d5ff38411387f11a33a30f..cc6d437f7176ff405e6e6e706d1ed543aff97dfc 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 95e391b03603e4f69a1503c9768ccdcbc602f070..9765ad6b1a840765fcbeffac7e701b3863fdee90 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 c8423baf41b13eddd8e064f3cfe5449706ab53bf..d37ffbcaf4a6cc0c3eae61619f7a32174a3fae1b 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 c26d0b1e19f6e7e064a0a12d418cf1869489bca2..9765ad6b1a840765fcbeffac7e701b3863fdee90 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 8931ff2dc4e4183d3a35c4da9ecfab290798ea79..56ca74bb20ab9c9a765f528af2e5f479fa7195f3 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 4f003e3cfe26a65ba7bbbce8a839950ebb0f10eb..1d22c074e202fb3aa0cc08e631374c254b05b0b1 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 a5bf0c836a436eee397759fa2b9a30a060b136dd..513e923190f27c428b0977a54aba3c8346b343bb 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 ed52fe560d805bbe703cdc062d1d510b6ba3c9ac..3c86d94887445e9cc29c00c220076af7cc12ef22 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 422bb0ac71fd5aab24f58053af2f382dabbec440..26408ff1af1e703071815ddb446d4b95ca7ff41c 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 e3f3faca9cc5d93cc767a90d8dc80056d28c6c52..8436b743bef1b99cb6f22c49c05e12a20b0ff526 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 77e1449458bfacce924f767cbc762bb5ce939822..60d8d0f508eaa2627f0fde83d7033b3e9da515f2 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 91922c6d95341437eb7c88a8f6e8b02ddd0633ef..cabf72507ffe8b96a84d67e4d88d2d381095e8ad 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 752b2ab97f257e4959f5892cf6193d31c0080cd1..ef7af4d3a8cdd0c4940a5ba3dab4bbea1da2cdc2 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 be1de23f838896f1e38e6501f0d5116790c787dc..c0243f8ee87365060c173da55988ebf9c1555f57 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 c65b15cfb25370bd6ae9141a648b22be08c314cc..66092d592ce1e3c28b4f41002fe8d5d8ac28f338 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 26dda7d8fad4d0ff270b706d23d1902558436d01..2f38776326e0d471e3bbea4a76066d66d176e764 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 f56b1ceef8f99c4668a99ac96c3927d21f7e738f..d5bab56bf3fd912f15df9138afa828229c956279 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 ba9c6fdc712499b89abebfda8d27ee8f5e1844e7..a8b9af7999f403d5bd87af7602f1938fe96a255e 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 b232007bb24fd15d287dabed39ca784abcbe7425..cee5a88f616b41e8ba12387e44c0f72926e6edd6 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"},