From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: [PATCH] Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/abacus/config.h | 16 ------ keyboards/abacus/info.json | 5 ++ keyboards/abstract/ellipse/rev1/config.h | 17 ------- keyboards/abstract/ellipse/rev1/info.json | 5 ++ keyboards/acekeyboard/titan60/config.h | 20 -------- keyboards/acekeyboard/titan60/info.json | 5 ++ keyboards/acheron/apollo/87h/delta/config.h | 6 --- keyboards/acheron/apollo/87h/delta/info.json | 5 ++ keyboards/acheron/apollo/87h/gamma/config.h | 6 --- keyboards/acheron/apollo/87h/gamma/info.json | 5 ++ keyboards/acheron/apollo/87htsc/config.h | 6 --- keyboards/acheron/apollo/87htsc/info.json | 5 ++ keyboards/acheron/apollo/88htsc/config.h | 6 --- keyboards/acheron/apollo/88htsc/info.json | 5 ++ keyboards/acheron/arctic/config.h | 4 -- keyboards/acheron/arctic/info.json | 5 ++ keyboards/acheron/athena/alpha/config.h | 6 --- keyboards/acheron/athena/alpha/info.json | 5 ++ keyboards/acheron/athena/beta/config.h | 6 --- keyboards/acheron/athena/beta/info.json | 5 ++ keyboards/acheron/austin/config.h | 4 -- keyboards/acheron/austin/info.json | 5 ++ keyboards/acheron/elongate/beta/config.h | 17 ------- keyboards/acheron/elongate/beta/info.json | 5 ++ keyboards/acheron/elongate/delta/config.h | 6 --- keyboards/acheron/elongate/delta/info.json | 5 ++ keyboards/acheron/keebspcb/config.h | 4 -- keyboards/acheron/keebspcb/info.json | 5 ++ keyboards/acheron/lasgweloth/config.h | 4 -- keyboards/acheron/lasgweloth/info.json | 5 ++ keyboards/acheron/shark/alpha/config.h | 22 -------- keyboards/acheron/shark/alpha/info.json | 5 ++ keyboards/acheron/shark/beta/config.h | 5 -- keyboards/acheron/shark/beta/info.json | 5 ++ keyboards/ada/ada1800mini/config.h | 17 ------- keyboards/ada/ada1800mini/info.json | 5 ++ keyboards/ada/infinity81/config.h | 17 ------- keyboards/ada/infinity81/info.json | 5 ++ keyboards/adelheid/config.h | 17 ------- keyboards/adelheid/info.json | 5 ++ keyboards/adkb96/info.json | 5 ++ keyboards/adkb96/rev1/config.h | 6 --- keyboards/adm42/config.h | 3 -- keyboards/adm42/info.json | 5 ++ keyboards/adm42/rev4/config.h | 3 -- keyboards/adpenrose/akemipad/config.h | 17 ------- keyboards/adpenrose/akemipad/info.json | 5 ++ keyboards/adpenrose/kintsugi/config.h | 17 ------- keyboards/adpenrose/kintsugi/info.json | 5 ++ keyboards/adpenrose/obi/config.h | 17 ------- keyboards/adpenrose/obi/info.json | 5 ++ keyboards/adpenrose/shisaku/config.h | 17 ------- keyboards/adpenrose/shisaku/info.json | 5 ++ keyboards/aeboards/aegis/config.h | 8 --- keyboards/aeboards/aegis/info.json | 5 ++ .../aeboards/constellation/rev1/config.h | 8 --- .../aeboards/constellation/rev1/info.json | 5 ++ .../aeboards/constellation/rev2/config.h | 8 --- .../aeboards/constellation/rev2/info.json | 5 ++ .../aeboards/constellation/rev3/config.h | 8 --- .../aeboards/constellation/rev3/info.json | 5 ++ keyboards/afternoonlabs/breeze/rev0/config.h | 8 --- keyboards/afternoonlabs/breeze/rev0/info.json | 5 ++ keyboards/afternoonlabs/breeze/rev1/config.h | 8 --- keyboards/afternoonlabs/breeze/rev1/info.json | 5 ++ keyboards/afternoonlabs/gust/rev1/config.h | 23 --------- keyboards/afternoonlabs/gust/rev1/info.json | 5 ++ .../afternoonlabs/oceanbreeze/rev1/config.h | 8 --- .../afternoonlabs/oceanbreeze/rev1/info.json | 5 ++ .../southern_breeze/rev1/config.h | 8 --- .../southern_breeze/rev1/info.json | 5 ++ .../afternoonlabs/summer_breeze/rev1/config.h | 8 --- .../summer_breeze/rev1/info.json | 5 ++ keyboards/ai03/andromeda/config.h | 4 -- keyboards/ai03/andromeda/info.json | 5 ++ keyboards/ai03/equinox/config.h | 17 ------- keyboards/ai03/equinox/rev0/config.h | 22 -------- keyboards/ai03/equinox/rev0/info.json | 5 ++ keyboards/ai03/equinox/rev1/info.json | 5 ++ keyboards/ai03/jp60/config.h | 17 ------- keyboards/ai03/jp60/info.json | 5 ++ keyboards/ai03/lunar/config.h | 17 ------- keyboards/ai03/lunar/info.json | 5 ++ keyboards/ai03/orbit/config.h | 19 ------- keyboards/ai03/orbit/info.json | 13 ++++- keyboards/ai03/orbit_x/config.h | 19 ------- keyboards/ai03/orbit_x/info.json | 13 ++++- keyboards/ai03/polaris/config.h | 17 ------- keyboards/ai03/polaris/info.json | 5 ++ keyboards/ai03/quasar/config.h | 17 ------- keyboards/ai03/quasar/info.json | 5 ++ keyboards/ai03/soyuz/config.h | 17 ------- keyboards/ai03/soyuz/info.json | 5 ++ keyboards/ai03/vega/config.h | 4 -- keyboards/ai03/vega/info.json | 5 ++ keyboards/ai03/voyager60_alps/config.h | 6 --- keyboards/ai03/voyager60_alps/info.json | 5 ++ keyboards/akb/eb46/config.h | 37 -------------- keyboards/akb/eb46/info.json | 5 ++ keyboards/akb/raine/config.h | 10 ---- keyboards/akb/raine/info.json | 5 ++ keyboards/akegata_denki/device_one/config.h | 7 --- keyboards/akegata_denki/device_one/info.json | 7 ++- keyboards/alas/config.h | 6 --- keyboards/alas/info.json | 5 ++ keyboards/aleblazer/zodiark/config.h | 6 --- keyboards/aleblazer/zodiark/info.json | 5 ++ keyboards/alf/dc60/config.h | 17 ------- keyboards/alf/dc60/info.json | 5 ++ keyboards/alf/x11/config.h | 17 ------- keyboards/alf/x11/info.json | 5 ++ keyboards/alf/x2/config.h | 10 ---- keyboards/alf/x2/info.json | 5 ++ keyboards/alfredslab/swift65/hotswap/config.h | 16 ------ .../alfredslab/swift65/hotswap/info.json | 5 ++ keyboards/alfredslab/swift65/solder/config.h | 16 ------ keyboards/alfredslab/swift65/solder/info.json | 5 ++ keyboards/aliceh66/pianoforte/config.h | 4 -- keyboards/aliceh66/pianoforte/info.json | 5 ++ keyboards/aliceh66/pianoforte_hs/config.h | 4 -- keyboards/aliceh66/pianoforte_hs/info.json | 5 ++ keyboards/alpha/config.h | 8 --- keyboards/alpha/info.json | 5 ++ keyboards/alpine65/config.h | 4 -- keyboards/alpine65/info.json | 5 ++ keyboards/alps64/config.h | 6 --- keyboards/alps64/info.json | 13 +++-- keyboards/alt34/rev1/config.h | 5 -- keyboards/alt34/rev1/info.json | 5 ++ keyboards/amag23/config.h | 7 --- keyboards/amag23/info.json | 5 ++ keyboards/amjkeyboard/amj40/config.h | 9 ---- keyboards/amjkeyboard/amj40/info.json | 5 ++ keyboards/amjkeyboard/amj60/config.h | 17 ------- keyboards/amjkeyboard/amj60/info.json | 5 ++ keyboards/amjkeyboard/amj66/config.h | 8 --- keyboards/amjkeyboard/amj66/info.json | 5 ++ keyboards/amjkeyboard/amj84/config.h | 17 ------- keyboards/amjkeyboard/amj84/info.json | 5 ++ keyboards/amjkeyboard/amjpad/config.h | 9 ---- keyboards/amjkeyboard/amjpad/info.json | 5 ++ keyboards/ano/config.h | 5 -- keyboards/ano/info.json | 5 ++ keyboards/anomalykb/a65i/config.h | 6 --- keyboards/anomalykb/a65i/info.json | 5 ++ keyboards/aos/tkl/config.h | 7 --- keyboards/aos/tkl/info.json | 5 ++ keyboards/aozora/config.h | 16 ------ keyboards/aozora/info.json | 5 ++ keyboards/aplyard/aplx6/rev1/config.h | 26 ---------- keyboards/aplyard/aplx6/rev1/info.json | 5 ++ keyboards/aplyard/aplx6/rev2/config.h | 8 --- keyboards/aplyard/aplx6/rev2/info.json | 5 ++ keyboards/arabica37/rev1/config.h | 8 --- keyboards/arabica37/rev1/info.json | 5 ++ keyboards/ares/config.h | 5 -- keyboards/ares/info.json | 5 ++ keyboards/arisu/config.h | 17 ------- keyboards/arisu/info.json | 5 ++ keyboards/ash1800/config.h | 17 ------- keyboards/ash1800/info.json | 5 ++ keyboards/ash_xiix/config.h | 17 ------- keyboards/ash_xiix/info.json | 5 ++ keyboards/ashpil/modelm_usbc/config.h | 51 ------------------- keyboards/ashpil/modelm_usbc/info.json | 5 ++ keyboards/at_at/660m/config.h | 4 -- keyboards/at_at/660m/info.json | 5 ++ keyboards/atlantis/ak81_ve/config.h | 8 --- keyboards/atlantis/ak81_ve/info.json | 5 ++ keyboards/atlas_65/config.h | 17 ------- keyboards/atlas_65/info.json | 5 ++ keyboards/atomic/config.h | 17 ------- keyboards/atomic/info.json | 5 ++ keyboards/atreus/astar/config.h | 38 -------------- keyboards/atreus/astar/info.json | 5 ++ keyboards/atreus/astar_mirrored/config.h | 17 ------- keyboards/atreus/astar_mirrored/info.json | 5 ++ keyboards/atreus/f103/config.h | 36 ------------- keyboards/atreus/f103/info.json | 5 ++ keyboards/atreus/feather/config.h | 19 ------- keyboards/atreus/feather/info.json | 5 ++ keyboards/atreus/promicro/config.h | 40 --------------- keyboards/atreus/promicro/info.json | 5 ++ keyboards/atreus/teensy2/config.h | 34 ------------- keyboards/atreus/teensy2/info.json | 5 ++ keyboards/atreus62/config.h | 8 --- keyboards/atreus62/info.json | 13 +++-- keyboards/atreyu/rev1/config.h | 17 ------- keyboards/atreyu/rev1/info.json | 5 ++ keyboards/atreyu/rev2/config.h | 17 ------- keyboards/atreyu/rev2/info.json | 5 ++ keyboards/atset/at1/config.h | 7 --- keyboards/atset/at1/info.json | 5 ++ keyboards/atset/at12/config.h | 7 --- keyboards/atset/at12/info.json | 5 ++ keyboards/atset/at16/config.h | 7 --- keyboards/atset/at16/info.json | 5 ++ keyboards/atset/at3/config.h | 7 --- keyboards/atset/at3/info.json | 5 ++ keyboards/atset/at6/config.h | 7 --- keyboards/atset/at6/info.json | 5 ++ keyboards/atset/at9/config.h | 7 --- keyboards/atset/at9/info.json | 5 ++ keyboards/atxkb/1894/config.h | 17 ------- keyboards/atxkb/1894/info.json | 5 ++ keyboards/aurora65/config.h | 7 --- keyboards/aurora65/info.json | 5 ++ keyboards/avalanche/v1/config.h | 9 ---- keyboards/avalanche/v1/info.json | 5 ++ keyboards/avalanche/v2/config.h | 5 -- keyboards/avalanche/v2/info.json | 5 ++ keyboards/avalanche/v3/config.h | 5 -- keyboards/avalanche/v3/info.json | 5 ++ keyboards/avalanche/v4/config.h | 5 -- keyboards/avalanche/v4/info.json | 5 ++ keyboards/aves60/config.h | 17 ------- keyboards/aves60/info.json | 5 ++ keyboards/aves65/config.h | 9 ---- keyboards/aves65/info.json | 5 ++ .../axolstudio/foundation_gamma/config.h | 26 ---------- .../axolstudio/foundation_gamma/info.json | 5 ++ keyboards/axolstudio/helpo/config.h | 27 ---------- keyboards/axolstudio/helpo/info.json | 5 ++ keyboards/axolstudio/yeti/hotswap/config.h | 9 ---- keyboards/axolstudio/yeti/hotswap/info.json | 5 ++ keyboards/axolstudio/yeti/soldered/config.h | 27 ---------- keyboards/axolstudio/yeti/soldered/info.json | 5 ++ keyboards/aya/config.h | 5 -- keyboards/aya/info.json | 5 ++ keyboards/salicylic_acid3/7skb/rev1/config.h | 6 --- keyboards/salicylic_acid3/7skb/rev1/info.json | 5 ++ keyboards/salicylic_acid3/7splus/config.h | 7 --- keyboards/salicylic_acid3/7splus/info.json | 5 ++ keyboards/salicylic_acid3/ajisai74/config.h | 7 --- keyboards/salicylic_acid3/ajisai74/info.json | 5 ++ keyboards/salicylic_acid3/ergoarrows/config.h | 7 --- .../salicylic_acid3/ergoarrows/info.json | 5 ++ .../salicylic_acid3/getta25/rev1/config.h | 7 --- .../salicylic_acid3/getta25/rev1/info.json | 5 ++ .../salicylic_acid3/jisplit89/rev1/config.h | 6 --- .../salicylic_acid3/jisplit89/rev1/info.json | 5 ++ keyboards/salicylic_acid3/nafuda/config.h | 7 --- keyboards/salicylic_acid3/nafuda/info.json | 5 ++ .../salicylic_acid3/naked48/rev1/config.h | 9 ---- .../salicylic_acid3/naked48/rev1/info.json | 13 ++++- .../salicylic_acid3/naked60/rev1/config.h | 12 ----- .../salicylic_acid3/naked60/rev1/info.json | 13 ++++- .../salicylic_acid3/naked64/rev1/config.h | 8 --- .../salicylic_acid3/naked64/rev1/info.json | 13 ++++- keyboards/salicylic_acid3/nknl7en/config.h | 7 --- keyboards/salicylic_acid3/nknl7en/info.json | 5 ++ keyboards/salicylic_acid3/nknl7jp/config.h | 7 --- keyboards/salicylic_acid3/nknl7jp/info.json | 5 ++ .../salicylic_acid3/setta21/rev1/config.h | 6 --- .../salicylic_acid3/setta21/rev1/info.json | 5 ++ keyboards/sam/s80/config.h | 16 ------ keyboards/sam/s80/info.json | 5 ++ keyboards/sam/sg81m/config.h | 15 ------ keyboards/sam/sg81m/info.json | 5 ++ keyboards/sanctified/dystopia/config.h | 24 --------- keyboards/sanctified/dystopia/info.json | 5 ++ keyboards/sandwich/keeb68/config.h | 17 ------- keyboards/sandwich/keeb68/info.json | 5 ++ keyboards/satt/vision/config.h | 4 -- keyboards/satt/vision/info.json | 5 ++ keyboards/sauce/mild/config.h | 17 ------- keyboards/sauce/mild/info.json | 5 ++ .../sawnsprojects/amber80/solder/config.h | 16 ------ .../sawnsprojects/amber80/solder/info.json | 5 ++ .../krush/krush60/solder/config.h | 7 --- .../krush/krush60/solder/info.json | 5 ++ .../krush/krush65/hotswap/config.h | 7 --- .../krush/krush65/hotswap/info.json | 5 ++ .../krush/krush65/solder/config.h | 7 --- .../krush/krush65/solder/info.json | 5 ++ keyboards/sawnsprojects/satxri6key/config.h | 16 ------ keyboards/sawnsprojects/satxri6key/info.json | 5 ++ keyboards/sawnsprojects/vcl65/solder/config.h | 7 --- .../sawnsprojects/vcl65/solder/info.json | 5 ++ keyboards/scatter42/config.h | 17 ------- keyboards/scatter42/info.json | 5 ++ keyboards/sck/gtm/config.h | 8 --- keyboards/sck/gtm/info.json | 5 ++ keyboards/sck/m0116b/config.h | 17 ------- keyboards/sck/m0116b/info.json | 5 ++ keyboards/sck/neiso/config.h | 19 ------- keyboards/sck/neiso/info.json | 5 ++ keyboards/sck/osa/config.h | 17 ------- keyboards/sck/osa/info.json | 5 ++ keyboards/sendyyeah/75pixels/config.h | 27 ---------- keyboards/sendyyeah/75pixels/info.json | 5 ++ keyboards/sendyyeah/bevi/config.h | 27 ---------- keyboards/sendyyeah/bevi/info.json | 5 ++ keyboards/senselessclay/ck60/config.h | 8 --- keyboards/senselessclay/ck60/info.json | 5 ++ keyboards/senselessclay/ck65/config.h | 19 ------- keyboards/senselessclay/ck65/info.json | 5 ++ keyboards/senselessclay/gos65/config.h | 24 --------- keyboards/senselessclay/gos65/info.json | 5 ++ keyboards/senselessclay/had60/config.h | 22 -------- keyboards/senselessclay/had60/info.json | 5 ++ keyboards/sentraq/number_pad/config.h | 17 ------- keyboards/sentraq/number_pad/info.json | 5 ++ keyboards/sentraq/s60_x/default/config.h | 8 --- keyboards/sentraq/s60_x/default/info.json | 5 ++ keyboards/sentraq/s60_x/rgb/config.h | 8 --- keyboards/sentraq/s60_x/rgb/info.json | 5 ++ keyboards/sentraq/s65_plus/config.h | 8 --- keyboards/sentraq/s65_plus/info.json | 5 ++ keyboards/sentraq/s65_x/config.h | 8 --- keyboards/sentraq/s65_x/info.json | 5 ++ keyboards/sets3n/kk980/config.h | 19 ------- keyboards/sets3n/kk980/info.json | 5 ++ keyboards/shambles/config.h | 8 --- keyboards/shambles/info.json | 5 ++ keyboards/shapeshifter4060/config.h | 7 --- keyboards/shapeshifter4060/info.json | 5 ++ keyboards/shiro/config.h | 17 ------- keyboards/shiro/info.json | 5 ++ keyboards/shk9/config.h | 8 --- keyboards/shk9/info.json | 5 ++ keyboards/shoc/config.h | 7 --- keyboards/shoc/info.json | 5 ++ keyboards/sidderskb/majbritt/rev1/config.h | 38 -------------- keyboards/sidderskb/majbritt/rev1/info.json | 5 ++ keyboards/sidderskb/majbritt/rev2/config.h | 8 --- keyboards/sidderskb/majbritt/rev2/info.json | 5 ++ keyboards/signum/3_0/config.h | 20 -------- keyboards/signum/3_0/elitec/config.h | 6 --- keyboards/signum/3_0/elitec/info.json | 7 +++ keyboards/signum/3_0/teensy/config.h | 22 -------- keyboards/signum/3_0/teensy/info.json | 7 +++ keyboards/silverbullet44/config.h | 17 ------- keyboards/silverbullet44/info.json | 5 ++ keyboards/singa/config.h | 5 -- keyboards/singa/info.json | 5 ++ keyboards/skeletn87/hotswap/config.h | 8 --- keyboards/skeletn87/hotswap/info.json | 5 ++ keyboards/skeletn87/soldered/config.h | 8 --- keyboards/skeletn87/soldered/info.json | 5 ++ keyboards/skeletonkbd/skeletonnumpad/config.h | 17 ------- .../skeletonkbd/skeletonnumpad/info.json | 5 ++ keyboards/skergo/config.h | 8 --- keyboards/skergo/info.json | 5 ++ .../skippys_custom_pcs/rooboard65/config.h | 17 ------- .../skippys_custom_pcs/rooboard65/info.json | 5 ++ keyboards/skippys_custom_pcs/roopad/config.h | 19 ------- keyboards/skippys_custom_pcs/roopad/info.json | 5 ++ keyboards/slz40/config.h | 17 ------- keyboards/slz40/info.json | 5 ++ keyboards/smallkeyboard/config.h | 17 ------- keyboards/smallkeyboard/info.json | 5 ++ keyboards/smithrune/iron165r2/config.h | 6 --- keyboards/smithrune/iron165r2/info.json | 5 ++ keyboards/smithrune/iron180/config.h | 4 -- keyboards/smithrune/iron180/info.json | 5 ++ keyboards/smk60/config.h | 6 --- keyboards/smk60/info.json | 5 ++ keyboards/snampad/config.h | 17 ------- keyboards/snampad/info.json | 5 ++ keyboards/sneakbox/aliceclone/config.h | 7 --- keyboards/sneakbox/aliceclone/info.json | 5 ++ keyboards/sneakbox/aliceclonergb/config.h | 7 --- keyboards/sneakbox/aliceclonergb/info.json | 5 ++ keyboards/sneakbox/ava/config.h | 7 --- keyboards/sneakbox/ava/info.json | 5 ++ keyboards/sneakbox/disarray/ortho/config.h | 7 --- keyboards/sneakbox/disarray/ortho/info.json | 5 ++ .../sneakbox/disarray/staggered/config.h | 7 --- .../sneakbox/disarray/staggered/info.json | 5 ++ keyboards/soda/cherish/config.h | 4 -- keyboards/soda/cherish/info.json | 5 ++ keyboards/soda/pocket/config.h | 5 -- keyboards/soda/pocket/info.json | 5 ++ keyboards/sofle/keyhive/config.h | 8 --- keyboards/sofle/keyhive/info.json | 11 ++++ keyboards/sofle/rev1/config.h | 5 -- keyboards/sofle/rev1/info.json | 5 ++ keyboards/soup10/config.h | 18 ------- keyboards/soup10/info.json | 5 ++ keyboards/sowbug/68keys/config.h | 8 --- keyboards/sowbug/68keys/info.json | 5 ++ keyboards/sowbug/ansi_tkl/config.h | 10 ---- keyboards/sowbug/ansi_tkl/info.json | 5 ++ keyboards/soy20/config.h | 8 --- keyboards/soy20/info.json | 5 ++ keyboards/spaceholdings/nebula12/config.h | 7 --- keyboards/spaceholdings/nebula12/info.json | 5 ++ keyboards/spaceholdings/nebula12b/config.h | 7 --- keyboards/spaceholdings/nebula12b/info.json | 5 ++ keyboards/spaceholdings/nebula68/config.h | 8 --- keyboards/spaceholdings/nebula68/info.json | 5 ++ keyboards/spaceholdings/nebula68b/config.h | 7 --- keyboards/spaceholdings/nebula68b/info.json | 5 ++ keyboards/spaceman/pancake/rev1/config.h | 18 ------- .../spaceman/pancake/rev1/feather/config.h | 4 -- .../spaceman/pancake/rev1/feather/info.json | 7 +++ .../spaceman/pancake/rev1/promicro/config.h | 20 -------- .../spaceman/pancake/rev1/promicro/info.json | 7 +++ keyboards/spaceman/pancake/rev2/config.h | 21 -------- keyboards/spaceman/pancake/rev2/info.json | 5 ++ keyboards/spaceman/yun65/config.h | 22 -------- keyboards/spaceman/yun65/info.json | 5 ++ keyboards/spacetime/config.h | 17 ------- keyboards/spacetime/info.json | 5 ++ keyboards/spacey/config.h | 33 ------------ keyboards/spacey/info.json | 5 ++ keyboards/sparrow62/config.h | 7 --- keyboards/sparrow62/info.json | 5 ++ keyboards/specskeys/config.h | 17 ------- keyboards/specskeys/info.json | 5 ++ keyboards/splitish/config.h | 5 -- keyboards/splitish/info.json | 5 ++ keyboards/splitkb/kyria/rev1/config.h | 9 ---- keyboards/splitkb/kyria/rev1/info.json | 5 ++ keyboards/splitkb/kyria/rev2/config.h | 13 ----- keyboards/splitkb/kyria/rev2/info.json | 11 ++++ keyboards/splitty/config.h | 8 --- keyboards/splitty/info.json | 5 ++ keyboards/sporewoh/banime40/config.h | 9 ---- keyboards/sporewoh/banime40/info.json | 5 ++ keyboards/star75/config.h | 8 --- keyboards/star75/info.json | 5 ++ keyboards/stello65/beta/config.h | 17 ------- keyboards/stello65/beta/info.json | 5 ++ keyboards/stello65/hs_rev1/config.h | 17 ------- keyboards/stello65/hs_rev1/info.json | 5 ++ keyboards/stello65/sl_rev1/config.h | 17 ------- keyboards/stello65/sl_rev1/info.json | 5 ++ .../stenokeyboards/the_uni/pro_micro/config.h | 8 --- .../the_uni/pro_micro/info.json | 5 ++ .../stenokeyboards/the_uni/rp_2040/config.h | 5 -- .../stenokeyboards/the_uni/rp_2040/info.json | 5 ++ .../stenokeyboards/the_uni/usb_c/config.h | 8 --- .../stenokeyboards/the_uni/usb_c/info.json | 5 ++ keyboards/stratos/config.h | 8 --- keyboards/stratos/info.json | 5 ++ keyboards/studiokestra/bourgeau/config.h | 8 --- keyboards/studiokestra/bourgeau/info.json | 5 ++ keyboards/studiokestra/cascade/config.h | 8 --- keyboards/studiokestra/cascade/info.json | 5 ++ keyboards/studiokestra/galatea/config.h | 5 -- keyboards/studiokestra/galatea/rev1/info.json | 5 ++ keyboards/studiokestra/galatea/rev2/info.json | 5 ++ keyboards/studiokestra/nascent/config.h | 5 -- keyboards/studiokestra/nascent/info.json | 5 ++ keyboards/studiokestra/nue/config.h | 5 -- keyboards/studiokestra/nue/info.json | 5 ++ keyboards/suavity/ehan/config.h | 7 --- keyboards/suavity/ehan/info.json | 5 ++ keyboards/subatomic/config.h | 8 --- keyboards/subatomic/info.json | 5 ++ keyboards/subrezon/la_nc/config.h | 19 ------- keyboards/subrezon/la_nc/info.json | 5 ++ keyboards/superuser/ext/config.h | 35 ------------- keyboards/superuser/ext/info.json | 5 ++ keyboards/superuser/frl/config.h | 35 ------------- keyboards/superuser/frl/info.json | 5 ++ keyboards/superuser/tkl/config.h | 35 ------------- keyboards/superuser/tkl/info.json | 5 ++ keyboards/swiftrax/retropad/config.h | 9 ---- keyboards/swiftrax/retropad/info.json | 5 ++ keyboards/switchplate/southpaw_65/config.h | 16 ------ .../switchplate/southpaw_fullsize/config.h | 17 ------- .../switchplate/southpaw_fullsize/info.json | 5 ++ keyboards/switchplate/switchplate910/config.h | 17 ------- .../switchplate/switchplate910/info.json | 5 ++ keyboards/synapse/config.h | 10 ---- keyboards/synapse/info.json | 5 ++ keyboards/system76/launch_1/config.h | 16 ------ keyboards/system76/launch_1/info.json | 5 ++ keyboards/w1_at/config.h | 7 --- keyboards/w1_at/info.json | 5 ++ keyboards/waldo/config.h | 8 --- keyboards/waldo/info.json | 5 ++ keyboards/walletburner/cajal/config.h | 8 --- keyboards/walletburner/cajal/info.json | 5 ++ keyboards/walletburner/neuron/config.h | 8 --- keyboards/walletburner/neuron/info.json | 5 ++ keyboards/waterfowl/config.h | 7 --- keyboards/waterfowl/info.json | 5 ++ keyboards/wavtype/foundation/config.h | 17 ------- keyboards/wavtype/foundation/info.json | 5 ++ keyboards/wavtype/p01_ultra/config.h | 17 ------- keyboards/wavtype/p01_ultra/info.json | 5 ++ keyboards/weirdo/geminate60/config.h | 4 -- keyboards/weirdo/geminate60/info.json | 5 ++ keyboards/weirdo/kelowna/rgb64/config.h | 4 -- keyboards/weirdo/kelowna/rgb64/info.json | 5 ++ keyboards/weirdo/ls_60/config.h | 4 -- keyboards/weirdo/ls_60/info.json | 5 ++ keyboards/weirdo/naiping/np64/config.h | 4 -- keyboards/weirdo/naiping/np64/info.json | 5 ++ keyboards/weirdo/naiping/nphhkb/config.h | 4 -- keyboards/weirdo/naiping/nphhkb/info.json | 5 ++ keyboards/weirdo/naiping/npminila/config.h | 4 -- keyboards/weirdo/naiping/npminila/info.json | 5 ++ keyboards/weirdo/tiger910/config.h | 7 --- keyboards/weirdo/tiger910/info.json | 5 ++ keyboards/wekey/polaris/config.h | 17 ------- keyboards/wekey/polaris/info.json | 5 ++ keyboards/wekey/we27/config.h | 17 ------- keyboards/wekey/we27/info.json | 5 ++ keyboards/westfoxtrot/aanzee/config.h | 9 ---- keyboards/westfoxtrot/aanzee/info.json | 5 ++ keyboards/westfoxtrot/cyclops/config.h | 17 ------- keyboards/westfoxtrot/cyclops/info.json | 5 ++ keyboards/westfoxtrot/cypher/rev1/config.h | 17 ------- keyboards/westfoxtrot/cypher/rev1/info.json | 5 ++ keyboards/westfoxtrot/cypher/rev5/config.h | 17 ------- keyboards/westfoxtrot/cypher/rev5/info.json | 5 ++ keyboards/westfoxtrot/prophet/config.h | 10 ---- keyboards/westfoxtrot/prophet/info.json | 5 ++ keyboards/westm/westm68/config.h | 4 -- keyboards/westm/westm68/info.json | 5 ++ keyboards/westm/westm9/config.h | 4 -- keyboards/westm/westm9/info.json | 5 ++ keyboards/westm/westmergo/config.h | 4 -- keyboards/westm/westmergo/info.json | 5 ++ keyboards/whale/sk/v3/config.h | 35 ------------- keyboards/whale/sk/v3/info.json | 5 ++ keyboards/wilba_tech/rama_works_kara/config.h | 8 --- .../wilba_tech/rama_works_kara/info.json | 5 ++ keyboards/wilba_tech/rama_works_koyu/config.h | 8 --- .../wilba_tech/rama_works_koyu/info.json | 5 ++ .../wilba_tech/rama_works_m10_b/config.h | 17 ------- .../wilba_tech/rama_works_m10_b/info.json | 5 ++ .../wilba_tech/rama_works_m10_c/config.h | 17 ------- .../wilba_tech/rama_works_m10_c/info.json | 5 ++ .../wilba_tech/rama_works_m50_a/config.h | 17 ------- .../wilba_tech/rama_works_m50_a/info.json | 5 ++ .../wilba_tech/rama_works_m50_ax/config.h | 17 ------- .../wilba_tech/rama_works_m50_ax/info.json | 5 ++ .../wilba_tech/rama_works_m60_a/config.h | 8 --- .../wilba_tech/rama_works_m60_a/info.json | 5 ++ .../wilba_tech/rama_works_m65_b/config.h | 17 ------- .../wilba_tech/rama_works_m65_b/info.json | 5 ++ .../wilba_tech/rama_works_m65_bx/config.h | 17 ------- .../wilba_tech/rama_works_m65_bx/info.json | 5 ++ keyboards/wilba_tech/rama_works_m6_a/config.h | 17 ------- .../wilba_tech/rama_works_m6_a/info.json | 5 ++ keyboards/wilba_tech/rama_works_m6_b/config.h | 17 ------- .../wilba_tech/rama_works_m6_b/info.json | 5 ++ .../wilba_tech/rama_works_u80_a/config.h | 17 ------- .../wilba_tech/rama_works_u80_a/info.json | 5 ++ keyboards/wilba_tech/wt60_a/config.h | 17 ------- keyboards/wilba_tech/wt60_a/info.json | 5 ++ keyboards/wilba_tech/wt60_b/config.h | 17 ------- keyboards/wilba_tech/wt60_b/info.json | 5 ++ keyboards/wilba_tech/wt60_bx/config.h | 17 ------- keyboards/wilba_tech/wt60_bx/info.json | 5 ++ keyboards/wilba_tech/wt60_c/config.h | 17 ------- keyboards/wilba_tech/wt60_c/info.json | 5 ++ keyboards/wilba_tech/wt60_g/config.h | 17 ------- keyboards/wilba_tech/wt60_g/info.json | 5 ++ keyboards/wilba_tech/wt60_g2/config.h | 17 ------- keyboards/wilba_tech/wt60_g2/info.json | 5 ++ keyboards/wilba_tech/wt60_h1/config.h | 17 ------- keyboards/wilba_tech/wt60_h1/info.json | 5 ++ keyboards/wilba_tech/wt60_h2/config.h | 17 ------- keyboards/wilba_tech/wt60_h2/info.json | 5 ++ keyboards/wilba_tech/wt60_h3/config.h | 17 ------- keyboards/wilba_tech/wt60_h3/info.json | 5 ++ keyboards/wilba_tech/wt60_xt/config.h | 16 ------ keyboards/wilba_tech/wt60_xt/info.json | 5 ++ keyboards/wilba_tech/wt65_a/config.h | 17 ------- keyboards/wilba_tech/wt65_a/info.json | 5 ++ keyboards/wilba_tech/wt65_b/config.h | 17 ------- keyboards/wilba_tech/wt65_b/info.json | 5 ++ keyboards/wilba_tech/wt65_d/config.h | 5 -- keyboards/wilba_tech/wt65_d/info.json | 5 ++ keyboards/wilba_tech/wt65_f/config.h | 17 ------- keyboards/wilba_tech/wt65_f/info.json | 5 ++ keyboards/wilba_tech/wt65_fx/config.h | 17 ------- keyboards/wilba_tech/wt65_fx/info.json | 5 ++ keyboards/wilba_tech/wt65_g/config.h | 17 ------- keyboards/wilba_tech/wt65_g/info.json | 5 ++ keyboards/wilba_tech/wt65_g2/config.h | 17 ------- keyboards/wilba_tech/wt65_g2/info.json | 5 ++ keyboards/wilba_tech/wt65_h1/config.h | 17 ------- keyboards/wilba_tech/wt65_h1/info.json | 5 ++ keyboards/wilba_tech/wt65_xt/config.h | 17 ------- keyboards/wilba_tech/wt65_xt/info.json | 5 ++ keyboards/wilba_tech/wt65_xtx/config.h | 17 ------- keyboards/wilba_tech/wt65_xtx/info.json | 5 ++ keyboards/wilba_tech/wt69_a/config.h | 17 ------- keyboards/wilba_tech/wt69_a/info.json | 5 ++ keyboards/wilba_tech/wt70_jb/config.h | 17 ------- keyboards/wilba_tech/wt70_jb/info.json | 5 ++ keyboards/wilba_tech/wt75_a/config.h | 17 ------- keyboards/wilba_tech/wt75_a/info.json | 5 ++ keyboards/wilba_tech/wt75_b/config.h | 17 ------- keyboards/wilba_tech/wt75_b/info.json | 5 ++ keyboards/wilba_tech/wt75_c/config.h | 17 ------- keyboards/wilba_tech/wt75_c/info.json | 5 ++ keyboards/wilba_tech/wt80_a/config.h | 17 ------- keyboards/wilba_tech/wt80_a/info.json | 5 ++ keyboards/wilba_tech/wt80_bc/config.h | 17 ------- keyboards/wilba_tech/wt80_bc/info.json | 5 ++ keyboards/wilba_tech/wt80_g/config.h | 17 ------- keyboards/wilba_tech/wt80_g/info.json | 5 ++ keyboards/wilba_tech/wt8_a/config.h | 17 ------- keyboards/wilba_tech/wt8_a/info.json | 5 ++ keyboards/wilba_tech/zeal60/config.h | 8 --- keyboards/wilba_tech/zeal60/info.json | 5 ++ keyboards/wilba_tech/zeal65/config.h | 8 --- keyboards/wilba_tech/zeal65/info.json | 5 ++ keyboards/winkeyless/b87/config.h | 8 --- keyboards/winkeyless/b87/info.json | 5 ++ keyboards/winkeyless/bface/config.h | 6 --- keyboards/winkeyless/bface/info.json | 5 ++ keyboards/winkeyless/bmini/config.h | 4 -- keyboards/winkeyless/bmini/info.json | 5 ++ keyboards/winkeyless/bminiex/config.h | 4 -- keyboards/winkeyless/bminiex/info.json | 5 ++ keyboards/winry/winry25tc/config.h | 6 --- keyboards/winry/winry25tc/info.json | 5 ++ keyboards/wolf/kuku65/config.h | 37 -------------- keyboards/wolf/kuku65/info.json | 5 ++ keyboards/wolf/ryujin/config.h | 26 ---------- keyboards/wolf/ryujin/info.json | 5 ++ keyboards/wolf/sabre/config.h | 37 -------------- keyboards/wolf/sabre/info.json | 5 ++ keyboards/wolf/ts60/config.h | 19 ------- keyboards/wolf/ts60/info.json | 5 ++ keyboards/wolfmarkclub/wm1/config.h | 6 --- keyboards/wolfmarkclub/wm1/info.json | 5 ++ keyboards/woodkeys/bigseries/1key/config.h | 8 --- keyboards/woodkeys/bigseries/1key/info.json | 5 ++ keyboards/woodkeys/bigseries/2key/config.h | 8 --- keyboards/woodkeys/bigseries/2key/info.json | 5 ++ keyboards/woodkeys/bigseries/3key/config.h | 8 --- keyboards/woodkeys/bigseries/3key/info.json | 5 ++ keyboards/woodkeys/bigseries/4key/config.h | 8 --- keyboards/woodkeys/bigseries/4key/info.json | 5 ++ keyboards/woodkeys/scarletbandana/config.h | 7 --- keyboards/woodkeys/scarletbandana/info.json | 5 ++ keyboards/work_louder/loop/config.h | 19 ------- keyboards/work_louder/loop/info.json | 5 ++ keyboards/work_louder/nano/config.h | 19 ------- keyboards/work_louder/nano/info.json | 5 ++ keyboards/work_louder/work_board/config.h | 19 ------- keyboards/work_louder/work_board/info.json | 5 ++ keyboards/wren/config.h | 17 ------- keyboards/wren/info.json | 5 ++ keyboards/wsk/alpha9/config.h | 8 --- keyboards/wsk/alpha9/info.json | 5 ++ keyboards/wsk/g4m3ralpha/config.h | 8 --- keyboards/wsk/g4m3ralpha/info.json | 5 ++ keyboards/wsk/gothic50/config.h | 10 ---- keyboards/wsk/gothic50/info.json | 5 ++ keyboards/wsk/gothic70/config.h | 9 ---- keyboards/wsk/gothic70/info.json | 5 ++ keyboards/wsk/houndstooth/config.h | 8 --- keyboards/wsk/houndstooth/info.json | 5 ++ keyboards/wsk/jerkin/config.h | 8 --- keyboards/wsk/jerkin/info.json | 5 ++ keyboards/wsk/kodachi50/config.h | 8 --- keyboards/wsk/kodachi50/info.json | 5 ++ keyboards/wsk/pain27/config.h | 8 --- keyboards/wsk/pain27/info.json | 5 ++ keyboards/wsk/sl40/config.h | 8 --- keyboards/wsk/sl40/info.json | 5 ++ keyboards/wsk/tkl30/config.h | 8 --- keyboards/wsk/tkl30/info.json | 5 ++ keyboards/wuque/ikki68/config.h | 6 --- keyboards/wuque/ikki68/info.json | 5 ++ keyboards/wuque/ikki68_aurora/config.h | 6 --- keyboards/wuque/ikki68_aurora/info.json | 5 ++ keyboards/wuque/mammoth20x/config.h | 6 --- keyboards/wuque/mammoth20x/info.json | 5 ++ keyboards/wuque/mammoth75x/config.h | 6 --- keyboards/wuque/mammoth75x/info.json | 5 ++ keyboards/wuque/promise87/ansi/config.h | 6 --- keyboards/wuque/promise87/ansi/info.json | 5 ++ keyboards/wuque/promise87/wkl/config.h | 6 --- keyboards/wuque/promise87/wkl/info.json | 5 ++ keyboards/wuque/serneity65/config.h | 6 --- keyboards/wuque/serneity65/info.json | 5 ++ keyboards/wuque/tata80/wk/config.h | 8 --- keyboards/wuque/tata80/wk/info.json | 5 ++ keyboards/wuque/tata80/wkl/config.h | 8 --- keyboards/wuque/tata80/wkl/info.json | 5 ++ 683 files changed, 1764 insertions(+), 4315 deletions(-) delete mode 100644 keyboards/afternoonlabs/gust/rev1/config.h delete mode 100644 keyboards/ai03/equinox/rev0/config.h delete mode 100644 keyboards/akb/eb46/config.h delete mode 100644 keyboards/akegata_denki/device_one/config.h delete mode 100644 keyboards/aplyard/aplx6/rev1/config.h delete mode 100644 keyboards/ashpil/modelm_usbc/config.h delete mode 100644 keyboards/atreus/astar/config.h delete mode 100644 keyboards/atreus/f103/config.h delete mode 100644 keyboards/atreus/promicro/config.h delete mode 100644 keyboards/atreus/teensy2/config.h delete mode 100644 keyboards/avalanche/v1/config.h delete mode 100644 keyboards/axolstudio/foundation_gamma/config.h delete mode 100644 keyboards/axolstudio/helpo/config.h delete mode 100644 keyboards/axolstudio/yeti/soldered/config.h delete mode 100644 keyboards/sanctified/dystopia/config.h delete mode 100644 keyboards/sendyyeah/75pixels/config.h delete mode 100644 keyboards/sendyyeah/bevi/config.h delete mode 100644 keyboards/sidderskb/majbritt/rev1/config.h delete mode 100644 keyboards/signum/3_0/config.h delete mode 100644 keyboards/signum/3_0/elitec/config.h create mode 100644 keyboards/signum/3_0/elitec/info.json delete mode 100644 keyboards/signum/3_0/teensy/config.h create mode 100644 keyboards/signum/3_0/teensy/info.json delete mode 100644 keyboards/spaceman/pancake/rev1/config.h create mode 100644 keyboards/spaceman/pancake/rev1/feather/info.json delete mode 100644 keyboards/spaceman/pancake/rev1/promicro/config.h create mode 100644 keyboards/spaceman/pancake/rev1/promicro/info.json delete mode 100644 keyboards/spaceman/pancake/rev2/config.h delete mode 100644 keyboards/spaceman/yun65/config.h delete mode 100644 keyboards/spacey/config.h delete mode 100644 keyboards/subrezon/la_nc/config.h delete mode 100644 keyboards/superuser/ext/config.h delete mode 100644 keyboards/superuser/frl/config.h delete mode 100644 keyboards/superuser/tkl/config.h delete mode 100644 keyboards/whale/sk/v3/config.h delete mode 100644 keyboards/wolf/kuku65/config.h delete mode 100644 keyboards/wolf/ryujin/config.h delete mode 100644 keyboards/wolf/sabre/config.h diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index 2e28b792a1d780541f151329db7f5d1acac48f9d..e579dea057f922824d6c05ad669e9b3ecfbda520 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/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 { D3, D2, D4, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5} - #define DIP_SWITCH_PINS { D0 } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN D1 #ifdef RGB_DI_PIN diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index d14c59f8a2a8bd0e1e2b2443522ef01c82c4a29b..b2fd151cec194c0603a3d349ca62ff9860bf5fa5 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"], + "rows": ["D3", "D2", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F0"} diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h index f7932863e9a251cd4f46038bfd4c4b550e404bbb..d3feabbe2007c1f643c32d1857491aa161afb805 100644 --- a/keyboards/abstract/ellipse/rev1/config.h +++ b/keyboards/abstract/ellipse/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 { D3, C7 } -#define MATRIX_COL_PINS { F0, B6, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 3 diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json index 230e286c5da24ad2f3358354405b499ec36d32eb..693faa86b5201a0a2f5f421ff8fa4d40348b5e8c 100644 --- a/keyboards/abstract/ellipse/rev1/info.json +++ b/keyboards/abstract/ellipse/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "B6", "B5"], + "rows": ["D3", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1", "resolution": 2}, diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h index 07378f5e3d9642ed220582f028dab898b3c845ed..3a01bebf93fafe9193541d390c3404f9dfc2a4b2 100644 --- a/keyboards/acekeyboard/titan60/config.h +++ b/keyboards/acekeyboard/titan60/config.h @@ -17,26 +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) - * - */ - - -// 0 1 2 3 4 5 6 7 8 9 A B C D -#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json index 00629035c0132439dde22a098f585d726a67cdea..00399db841461bf843a0a843a31c7c0bf395ba64 100644 --- a/keyboards/acekeyboard/titan60/info.json +++ b/keyboards/acekeyboard/titan60/info.json @@ -8,6 +8,11 @@ "pid": "0x5449", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 490c13c2e979793e5abf29595148342314163c9a..377801604d63ab88c381b53976fb2d048cdfd200 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } -#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } -#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/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json index 4e14f51df0324794443fa2651c3a29c0b4465d97..0ad176f4516d785e14ccfe86cca35f248bad0093 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -4,6 +4,11 @@ "pid": "0x8775", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], + "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 07da517e24b125c2111b6ff650f174dda21e42db..6209fa21f728a19a558b209a197c5c2c522510e5 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15 } -#define MATRIX_COL_PINS { B3 , A15, A10, A8 , B14, B12, B10, B1 , B0 , A7 , A4 , A5 , A6 , C15, A0 , A1 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { C14, C13, B9 , B4 , A3 , A2 } -#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/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json index 4a93afd70c200aa0141851f122c9ea9a49a6752c..424f64405dd140833863c5081bdf4ddce33f896e 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/info.json @@ -4,6 +4,11 @@ "pid": "0x8774", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"], + "rows": ["C14", "C13", "B9", "B4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 8b61b285fd5aaa9c7f53993c4abb82694fc179cf..7447e1dd298ae7f7cb33cb78648d8f9ead0209e6 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } -#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } -#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/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index 68fc1b018a12117cb07cb5bd7de61c477d16935a..36897ff86e5520a34f6fcc7bbdb0cd3400f5a06e 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -8,6 +8,11 @@ "pid": "0x8776", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], + "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 490c13c2e979793e5abf29595148342314163c9a..377801604d63ab88c381b53976fb2d048cdfd200 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } -#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } -#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/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json index 92dd80182686cb82019b567f7cc6ee8915b863c3..3a7e0f7e5a61176a85e6e8aba7c48b6ff0f0ba24 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/info.json @@ -8,6 +8,11 @@ "pid": "0x8873", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], + "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index 0187e823fca4f327bf48f2d1a8df53d2fec3786e..f608132b5afd4d79846a79d3c1670eb89a3978ea 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, F1, F0, C15, C14, C13, B9, B8} -#define MATRIX_ROW_PINS { B7, B6, A6, A7, B1} -#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/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json index 42a7bb7b42b14f8eb3344826e252fe6ffcc8009e..f51a4c383e234714ae4972319291e8725f8aedd5 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/info.json @@ -8,6 +8,11 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"], + "rows": ["B7", "B6", "A6", "A7", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index e99fb833281f84250730f0d272f91f3bd08f4f89..fba5b051ccf526beb7019e243dca2ece6456181f 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 } -#define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 } - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index 2ebf2da8de231661dd37d71eb1f449c260938a6c..a59bf20ff91f351f532abae4305bc08128e0cfa4 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -4,6 +4,11 @@ "pid": "0x6584", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"], + "rows": ["B9", "C13", "B8", "B5", "A14", "C14"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 7fbc624522da84b72366080ce3abd3cc199471db..dc5f35487648a1b15e4f29dbd00cb24658a07085 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 } -#define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 } - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index dd8e766f90d8dc024db83a1a114517db39bbce85..a303c5a25c30c698f1731d8c57afa1bf40a53589 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"], + "rows": ["C11", "C12", "C10", "A15", "C0", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "levels": 20, diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index ce12edfd33f76383718985d04db83e9ddad04e14..a47b76953a28ccf85ea695a4e6541b345bf6983c 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 } -#define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index dad488df8f32090b6330473bbaa45cf17d3f7931..0cc16067e532d881330406ace4d2442437fc591f 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -8,6 +8,11 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"], + "rows": ["C13", "A4", "A7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index a3b19e7fe6ab22b4fa899bd513c11bd145cc4185..30b0b74c95fb1baf38788295f8016a47d985a0a6 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/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, B7, D5, B5, D6 } -#define MATRIX_COL_PINS { F5, F6, F4, F1, F0, B2, B1, C6, B0, B3, E6, D4, B4} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D7 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index 1f625bca831bfeb40cacb3395f6072d7a5329ca3..e373bb66544819b8bd4ef1df2e76cf084eda9999 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -8,6 +8,11 @@ "pid": "0x454C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"], + "rows": ["D3", "B7", "D5", "B5", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D1", "num_lock": "D2", diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 0ceba36100295adb183aabcf37bd9a938362c596..60362ab0657616795f5454267d9bde2cec56fcdd 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 } -#define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index f5f87333eb344776d8d66494799205c9b4d2d47f..5341ab654e0bad4d1dd804e06a011d8d8379f138 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -8,6 +8,11 @@ "pid": "0x454D", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"], + "rows": ["B3", "A15", "B0", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 1a8eab8b808adafc0d8953f52898f6183d080e6c..4b007cf387ee6a288bd263126612efecfecc4011 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B12, A1, A0, F1, F0, C15, C14, C13, B9, B8, B7, B6, B5} -#define MATRIX_ROW_PINS { B4, B3, A2, A3, A4} -#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/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index 9c96a01191889d150ac5b2cc5d0a947785a04c21..5c53bc70e2e78d7e319447e279fa6dcf5c8a558d 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -8,6 +8,11 @@ "pid": "0x4B45", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"], + "rows": ["B4", "B3", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["60_ansi_tsangan"], diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index e41924d0c6a105f527030ec06e981eead9c84859..f608132b5afd4d79846a79d3c1670eb89a3978ea 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7} -#define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 } -#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/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json index b97521e48eec7bd97d19022bdf01a8106856ec94..47d4b5510577a895fd9714048fbe012bf2b8a510 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/info.json @@ -8,6 +8,11 @@ "pid": "0x7641", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"], + "rows": ["B9", "B8", "A3", "B0", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"], diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 9c36ac3a1f6179c714aec1a9e75e4babd6456672..91f51146f0b486c6ef4476934b1a7dc1c842c99d 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -17,28 +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, A15, B10, B2} -#define MATRIX_COL_PINS {B1, B12, A1, A7, A5, A4, A3, A2, A0, C15, C14, C13} -//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1} -/* Unused pins, in the default layout, are: -EncA (B6) because it is not used in the default PCB -All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason; -B0, which is unconnected on the PCB -*/ - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index d6b5dfcd0f60bd1d145f629a7004aba78797d345..07c6550cb837771f5ebb4ba8ccfbb620fdeb5103 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,11 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"], + "rows": ["B4", "A15", "B10", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B7"} diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 8cfc57b9d587b7927659882b7f84b10c61f8527c..9a08dd123458f88126843c07d85f38df8f5b130e 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { A5 , A10, C13, B9 , B8 , B5 , B4 , B3 , A15, A0 , A1 , A2 } -#define MATRIX_ROW_PINS { A8 , B14, A4 , A3 } -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 73025df6c4b041d9637789874793190059b3ffb8..313e877c8eca95cf0d676f52e08bfa6e70671322 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"], + "rows": ["A8", "B14", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h index 54da0bdad4f21c82d9bb9806e079fc2e259ef2c7..378ffa80b43933041977f906cebbe8464d27d65f 100644 --- a/keyboards/ada/ada1800mini/config.h +++ b/keyboards/ada/ada1800mini/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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, B3, B2, B1 } - -#define DIODE_DIRECTION COL2ROW - - //TODO: implement RGB matrix when I get the hardware #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json index e3f97c6706a5666e24838361bfff61ddd7fbb872..fdc7df02df784fb4fa7a38e3fdd493144c03adb9 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/info.json @@ -8,6 +8,11 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h index d8fc5bf2263aaa96c6d8ee909165c483c3393f5b..0d64933ad9ba354c0b36f1540b189cb8ef247747 100644 --- a/keyboards/ada/infinity81/config.h +++ b/keyboards/ada/infinity81/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 { B3, B2, B1, B0, F6, B7 } -#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F5, F1, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN # define RGBLED_NUM 107 diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json index 5c32cd06394dc7c0e72939f75480391fecfa45f5..6f4a6ac996331825d69c7000f15ec9f5847ad724 100644 --- a/keyboards/ada/infinity81/info.json +++ b/keyboards/ada/infinity81/info.json @@ -8,6 +8,11 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"], + "rows": ["B3", "B2", "B1", "B0", "F6", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h index e22e250f85befeddb491360a3589d655230eb314..db23a5311997bbf18dbdf5f9673652f3b76e9e01 100644 --- a/keyboards/adelheid/config.h +++ b/keyboards/adelheid/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, F4, D1, D2, D3, D5, F7 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, F6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 } - -/* 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/adelheid/info.json b/keyboards/adelheid/info.json index 19970b27cf9ac13b588425f808f55aa4e995f1d1..c323d62a7503e8092043a6a1dc199d2a96221373 100644 --- a/keyboards/adelheid/info.json +++ b/keyboards/adelheid/info.json @@ -8,6 +8,11 @@ "pid": "0xAD78", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6" }, diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json index e86480d7d7d958a4036b81e7ecf71b54c921af1a..1a9a95cec396ad856c019ce20e1b940e2f79f056 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/info.json @@ -8,6 +8,11 @@ "pid": "0xAD96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h index c5a96736718f48e8443a4926a71852b2e06bd74a..89de3d9a643a846f44da9deca5f0fd99714d25b8 100644 --- a/keyboards/adkb96/rev1/config.h +++ b/keyboards/adkb96/rev1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 100 diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h index 03749906e8ff7a9ee58483e52cd87c352eed7720..af23da4c6628c88c2eb044846168dddc886d9287 100644 --- a/keyboards/adm42/config.h +++ b/keyboards/adm42/config.h @@ -16,9 +16,6 @@ #pragma once - -#define DIODE_DIRECTION ROW2COL - #define TAP_CODE_DELAY 1 #if defined(CONSOLE_ENABLE) diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json index 3596cdb446d793103c88024be92d70ae23d3ce27..5d518c3b86a387a83d6e8035eb479a94af0da8fc 100644 --- a/keyboards/adm42/info.json +++ b/keyboards/adm42/info.json @@ -9,6 +9,11 @@ "pid": "0xE873", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["C7", "D5", "D3", "D2"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h index fa2bcb3e43d2f2a4b49ab44931ded4c761714265..73a212910a472d6df46fcbafcb296eff82344441 100644 --- a/keyboards/adm42/rev4/config.h +++ b/keyboards/adm42/rev4/config.h @@ -16,9 +16,6 @@ #pragma once -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_ROW_PINS { C7, D5, D3, D2 } - #define ADM42_LED E6 #define RGB_DI_PIN B7 diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h index 47fcf429ac8797e3f973fb24a6fccad5aedfc950..9743566d12ee4f0bd4803875e941c3126b0714e6 100644 --- a/keyboards/adpenrose/akemipad/config.h +++ b/keyboards/adpenrose/akemipad/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 { D4, D7, E6, B6, B4, B5 } -#define MATRIX_COL_PINS { D3, D2, F5, F6, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Audio functionality */ diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 9b5a8d6ef6ad52d6b907cf52ea4a1fdcece7523b..80085f949e18f54fbe7d84e5f563bd4d42e7583f 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -7,6 +7,11 @@ "pid": "0x0004", "vid": "0x4450" }, + "matrix_pins": { + "cols": ["D3", "D2", "F5", "F6", "B2"], + "rows": ["D4", "D7", "E6", "B6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B3"} diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 5ffeb868374c9bd3634f1b87991c9b9350c18f07..0e10856cc815f93a1afcdbe02cc0db7ee0aa6331 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/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 { B0, E6, D7, C6, D4, D2, F4, F5, B5, B4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Underglow options: */ diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index a26c65b42a869769bcc11e8c9dceffdcd39de5c7..efe7d069d0084ba82faaa64dcbae48774e9c6595 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"], + "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B7", "pin_b": "D5"} diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index c9f606999e19a1a12f148f839e50b7feb06e803a..fd9156ca82f06ce5399f33263cd75fa5e38eb365 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/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 { F4, F5, C7, C6 } -#define MATRIX_COL_PINS { F6, B7, B6, B4, B5, D6, D5, D3, D7, D4, D2, D1, D0, B0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Underglow options: */ diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index c0c1b73c64484b44b0c3ba83efd9a18c0006cb31..6417bf57ca33d35cbc7044907b98a103341f8e0e 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -7,6 +7,11 @@ "pid": "0x0002", "vid": "0x4450" }, + "matrix_pins": { + "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"], + "rows": ["F4", "F5", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F0"} diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h index 47555b5190fd5cdf486e6f34b673def6ea99c9c1..9113167572fd706221e107209139081f51ba4f2c 100644 --- a/keyboards/adpenrose/shisaku/config.h +++ b/keyboards/adpenrose/shisaku/config.h @@ -3,22 +3,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 { B2, B0, B1, D0, B4, D6, B3, D7 } -#define MATRIX_COL_PINS { D1, C3, C4, D4, C0, C1, C2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Solenoid pin */ #define SOLENOID_PIN C5 diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json index dd1aaf540a219fe3c0f47d4ccb863c7437ad8bdf..9223f5a10166d89094d350dedb58294e4628af9d 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "C3", "C4", "D4", "C0", "C1", "C2"], + "rows": ["B2", "B0", "B1", "D0", "B4", "D6", "B3", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h index edaef2f7b9548f16c129b73d44d7ea93fb5e4d71..8606067a4cf7c6a530ae65481ab0f92ef1ac2281 100644 --- a/keyboards/aeboards/aegis/config.h +++ b/keyboards/aeboards/aegis/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 } -#define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, 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 diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json index b3817db45241d19ecf7d29c68fe8e079350aa4c6..63b9ea551e480a3359d87b74da24291409015983 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/info.json @@ -8,6 +8,11 @@ "pid": "0x0807", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"], + "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h index 83eb6e90d39a91aafc99265b9e2710fa00cf0850..01155887a5eba2f3cbbca08165b73ad0f4dde0b7 100755 --- a/keyboards/aeboards/constellation/rev1/config.h +++ b/keyboards/aeboards/constellation/rev1/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 } -#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json index 6f82ab71f5e590a234ac20f83a7465308726bd3b..aec20e5829e0fe39944b5cbf838d3b9b22a597de 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B0", "B1", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h index faaedf495da490a29e42a5dd025d07c7dd7aa949..f4b7be6bdf7f1bfd364bb9476839a3a54090a5f8 100755 --- a/keyboards/aeboards/constellation/rev2/config.h +++ b/keyboards/aeboards/constellation/rev2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B15, A14, A2, B13, B14 } -#define MATRIX_COL_PINS { B12, A1, H0, C15, C14, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 } - -/* 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/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json index 1009cca20dd5b9a830894fad17541239310216fa..ac79c2e3368a3233d1d8755d9ec81e7e20da9c69 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], + "rows": ["B15", "A14", "A2", "B13", "B14"] + }, + "diode_direction": "COL2ROW", "processor": "STM32L422", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h index 83eb6e90d39a91aafc99265b9e2710fa00cf0850..01155887a5eba2f3cbbca08165b73ad0f4dde0b7 100755 --- a/keyboards/aeboards/constellation/rev3/config.h +++ b/keyboards/aeboards/constellation/rev3/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 } -#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json index 514fcb778ea19e63a92b8080cd4e514094f3b15b..b50c8893e151cb463cd2fd2e00ea1580a82e67ff 100644 --- a/keyboards/aeboards/constellation/rev3/info.json +++ b/keyboards/aeboards/constellation/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x065D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B0", "B1", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h index be38eaf0ab4ee13cefac935a77bad8a92cf3c253..3500564544bd9d151d0e1fa26cf2a4c0f6a4edcd 100644 --- a/keyboards/afternoonlabs/breeze/rev0/config.h +++ b/keyboards/afternoonlabs/breeze/rev0/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json index 19e22b8342731dfa261cc1a3a78c6b63894ecb29..5d3ebbe5cad8c56c826bb11596a568482d9adef7 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.0" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h index 1e51a357b2c56a81f814eecfff18752e90d54ffa..d6bb6df14ce91e5d49a8b748af9601c09bacb74f 100644 --- a/keyboards/afternoonlabs/breeze/rev1/config.h +++ b/keyboards/afternoonlabs/breeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json index 4feeeca8755dd7902d96473b55240e38bd74420a..191c3ffc63abe0a5a9c133a7db72ef25e1c88bbd 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h deleted file mode 100644 index db2839cfc94817be472f4fcba540131d0e918320..0000000000000000000000000000000000000000 --- a/keyboards/afternoonlabs/gust/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * 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 - -// wiring of each half -#define MATRIX_ROW_PINS { F5, F4, D0 } -#define MATRIX_COL_PINS { D1, D2, D3 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json index a07fab20e2999d91a1a833c89739007fd0a76862..e031108f511952b6eb8231f5113e2bd29d549188 100644 --- a/keyboards/afternoonlabs/gust/rev1/info.json +++ b/keyboards/afternoonlabs/gust/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3"], + "rows": ["F5", "F4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h index 42621b39ef34443d6779b405aec7ade0934df91d..d6bb6df14ce91e5d49a8b748af9601c09bacb74f 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1, B6 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json index 531d2622ca4065f3639efdadd17356b166cae07e..1a099ee548434ea475bd85e962704cdb71f66525 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h index 1e51a357b2c56a81f814eecfff18752e90d54ffa..d6bb6df14ce91e5d49a8b748af9601c09bacb74f 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h +++ b/keyboards/afternoonlabs/southern_breeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json index 17bb446694afe16a2d3d7ac2a30f9e7f18966673..c9a7ecc3ca9238a16f38d8faf9d9297ae69984fc 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h index 1e51a357b2c56a81f814eecfff18752e90d54ffa..d6bb6df14ce91e5d49a8b748af9601c09bacb74f 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h +++ b/keyboards/afternoonlabs/summer_breeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json index e5ac8d452da7612de49e9b3c647440a2f47ef471..f42ad75bac61472f24e14b0f2517cd859177c499 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h index 1fb163a652ff81319ba01686a65fca46496ea1ae..056f54d52121fef7a3a56ffde77f03b09a68536a 100644 --- a/keyboards/ai03/andromeda/config.h +++ b/keyboards/ai03/andromeda/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, B5, B8, B9 } -#define MATRIX_ROW_PINS { B4, B3, A15, A3, A4, A5 } -#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/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json index ade4938b829bbdac1015af6a359a49ea36ddaed7..e29bb3e121aeb7120d49132fc2a4d3c4e4e07244 100644 --- a/keyboards/ai03/andromeda/info.json +++ b/keyboards/ai03/andromeda/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"], + "rows": ["B4", "B3", "A15", "A3", "A4", "A5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A2", "scroll_lock": "A1", diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index 32065a4740d1557de3a5fc7496a921e993a2fab5..50001e978cc44418b838c378a8e58ec6cef42592 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/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, C5, D4, D5 } -#define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, 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/ai03/equinox/rev0/config.h b/keyboards/ai03/equinox/rev0/config.h deleted file mode 100644 index 78c6fb8fcdfec33028d6fa4a3316289f6f5466b7..0000000000000000000000000000000000000000 --- a/keyboards/ai03/equinox/rev0/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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 - -// Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins -#undef MATRIX_COL_PINS -#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 } diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json index d76623777e2ccdc5a16a50203cc4e68cd5611ec7..f5dd365564584a0c8d55cca3758c5cdd489cb025 100644 --- a/keyboards/ai03/equinox/rev0/info.json +++ b/keyboards/ai03/equinox/rev0/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C4", "B7", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"], + "rows": ["D3", "C5", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D1", "levels": 5, diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json index 19cd40d140aea68c8be0b12ef12fff444cbf71bd..9c0727f7baa81c15bdb3b7d41dad7e00d9e4ecba 100644 --- a/keyboards/ai03/equinox/rev1/info.json +++ b/keyboards/ai03/equinox/rev1/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D1", "D2", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"], + "rows": ["D3", "C5", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h index 76e81dc2aa7cd3ec3484c9bf89ccbfdd1f62091d..9fe6627ecc19255680979595d446d4a8df04ba7a 100644 --- a/keyboards/ai03/jp60/config.h +++ b/keyboards/ai03/jp60/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, B5, B4, D7, E6 } -#define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, 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/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index 3a07c7224c3fee3cc60ebc33c4ccbd6de524a348..c7b55c53be96e42f0f5e3653fcbcbba86a7e379b 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -8,6 +8,11 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h index 10c8ab70ab6c477a5bbf69370a54034f76c2c6ec..50001e978cc44418b838c378a8e58ec6cef42592 100644 --- a/keyboards/ai03/lunar/config.h +++ b/keyboards/ai03/lunar/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, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, 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/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json index 6c069207e13f76f70d4ef12c0999623c8ce49835..2b97d0042ce35b1fa4f722be190fb1dbac65601b 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B3", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h index 85d4ae5bfe752a90ecf5b29906a7d21e76f7dffb..f4157a1729cfaf1e22b372fa0793bbe139d89c80 100644 --- a/keyboards/ai03/orbit/config.h +++ b/keyboards/ai03/orbit/config.h @@ -17,25 +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, F6, F5, F4, D3 } -#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 } -#define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 #define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index 840fb1fc20d6af78038e92c02a31e6b08916cacc..981f3cd685271f4b003149a7d00669e90b4788c3 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -8,11 +8,22 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"], + "rows": ["F7", "F6", "F5", "F4", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"], + "rows": ["B6", "B5", "B4", "D7", "E6"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h index 27a383f7bb68d236d68249f902a39294b8530a2b..05d319d030a28e91a1d0fef2e0929ef9364f526d 100644 --- a/keyboards/ai03/orbit_x/config.h +++ b/keyboards/ai03/orbit_x/config.h @@ -17,25 +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, D6, D4, F0 } -#define MATRIX_COL_PINS { E6, F6, B1, B0, C7, C6 } -#define MATRIX_ROW_PINS_RIGHT { B5, D7, B4, D4 } -#define MATRIX_COL_PINS_RIGHT { D6, B6, B1, B0, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D5 #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 2500 diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json index fdb26bddf44c2f96ca1635f92e76cb34430293e8..ef52a070e2d5ed9a19a985a624dffadb22544764 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -8,8 +8,19 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F6", "B1", "B0", "C7", "C6"], + "rows": ["D7", "D6", "D4", "F0"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D6", "B6", "B1", "B0", "B3", "B2"], + "rows": ["B5", "D7", "B4", "D4"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h index 871f4bc8db9bd24d61e631f0723edba6f0bc6ecb..3946e761c330956ff1f85ffac7022b55e016b2f9 100644 --- a/keyboards/ai03/polaris/config.h +++ b/keyboards/ai03/polaris/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 { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json index ae0fcb927db9211b554a98c8e09adcdcfa7996f0..ee2f32ffae47c3c7f7487bdd5a664d4b9004d003 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h index 04765c07887f14faa0752a04dce31acc2e71219d..50001e978cc44418b838c378a8e58ec6cef42592 100644 --- a/keyboards/ai03/quasar/config.h +++ b/keyboards/ai03/quasar/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, D4, D6, D7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, F0, F1, F4, F5, F6, F7, C7, C6, 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/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json index c29799484dca88a40ff1315d5449244f707beeb1..68dc3c4a6fc59743c502dd3de3e6e75efab22e99 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"], + "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h index 027bc03faae16a4b5ce957549b89092b1c00c619..50001e978cc44418b838c378a8e58ec6cef42592 100644 --- a/keyboards/ai03/soyuz/config.h +++ b/keyboards/ai03/soyuz/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, B6, E6, B4 } -#define MATRIX_COL_PINS { F4, B3, D7, 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/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json index b008ef45b6c656255c8917c1cbe3c27a51ec1b5a..f10a5d40007292e02e9a6ada7bb3ec7206c44423 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/info.json @@ -8,6 +8,11 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "B3", "D7", "B5"], + "rows": ["D4", "C6", "B6", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h index b2798481d4966fd0c20797c459a7474abd118b30..b575a49f388875069b7472a880f4f385fa76481d 100644 --- a/keyboards/ai03/vega/config.h +++ b/keyboards/ai03/vega/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B5, A3, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6 } -#define MATRIX_ROW_PINS { A1, A2, B3, A15, A10 } -#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/ai03/vega/info.json b/keyboards/ai03/vega/info.json index 7b3c16cb52616e651f51e8f9faa667b935fb8dd2..3da23cac09311f2a8cf16ab1391e91d82d1ab3c4 100644 --- a/keyboards/ai03/vega/info.json +++ b/keyboards/ai03/vega/info.json @@ -8,6 +8,11 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], + "rows": ["A1", "A2", "B3", "A15", "A10"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h index 30b7481688c6474c1bbca61211de03f6370014d9..704a6879f5cb783b3fc8cc332e78a4d0ebdb2b8f 100644 --- a/keyboards/ai03/voyager60_alps/config.h +++ b/keyboards/ai03/voyager60_alps/config.h @@ -14,12 +14,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3} - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index a7a68e43b03b34dabe2dee627396f15e9266095f..fed5542930be67f42bca800c6d325e6c3287acfa 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -8,6 +8,11 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h deleted file mode 100644 index 3fa5884805dc6ec7cc7c98a99752ad4674452d47..0000000000000000000000000000000000000000 --- a/keyboards/akb/eb46/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 \ - { B5, B4, D7, B6 } -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json index ad1f03501a7738b13eee3d04d34f641a57cb2f39..d5c4312cc60fbd48ac47c2fafa3f25d6a750d94a 100644 --- a/keyboards/akb/eb46/info.json +++ b/keyboards/akb/eb46/info.json @@ -7,6 +7,11 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "C6"], + "rows": ["B5", "B4", "D7", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h index 1f717ab43610963116e05c275d677b3710ae0683..4ffa418a0917790300f60312161703b7db3544f7 100644 --- a/keyboards/akb/raine/config.h +++ b/keyboards/akb/raine/config.h @@ -16,16 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { E6, C6, F7, B2, B0 } -#define MATRIX_COL_PINS \ - { F6, F5, F4, B1, F1, F0, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7 } - -/* 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/akb/raine/info.json b/keyboards/akb/raine/info.json index f6f648e137ef6053f016029701704542799dc0c7..9fe50b25af4e09b566bcdcacdb4c5337ec6106ae 100644 --- a/keyboards/akb/raine/info.json +++ b/keyboards/akb/raine/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], + "rows": ["E6", "C6", "F7", "B2", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/akegata_denki/device_one/config.h b/keyboards/akegata_denki/device_one/config.h deleted file mode 100644 index dc1e1cded34d22e79cfa1c70b539ce1573cd8297..0000000000000000000000000000000000000000 --- a/keyboards/akegata_denki/device_one/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { B1, B0, A9, A8, A0 } -#define MATRIX_COL_PINS { A2, A3, A4, A5, A6, A7, A1, A10, A15, B3, B4, B5, B6, B7, B8} - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json index a00144adf7addddb98acd63ff103d79d2032afcc..59449c47547c3f005c02aa6d97d3a186af9ee092 100644 --- a/keyboards/akegata_denki/device_one/info.json +++ b/keyboards/akegata_denki/device_one/info.json @@ -6,7 +6,12 @@ "vid": "0xFEED", "pid": "0xADD0", "device_version": "0.0.1" - }, + }, + "matrix_pins": { + "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], + "rows": ["B1", "B0", "A9", "A8", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu", "board": "ST_NUCLEO32_F042K6", diff --git a/keyboards/alas/config.h b/keyboards/alas/config.h index 95a8e7bcdb11fdf4afe4c5e5a50921c25c9d0b2a..a4424815608e141255a3d9efd8de092e543cecde 100644 --- a/keyboards/alas/config.h +++ b/keyboards/alas/config.h @@ -17,12 +17,6 @@ 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 RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json index aa87efaae34eb74c2ebf47ad7c9281b00573d3ee..1563fd843cdd7e173369e112b755ff898c70709a 100755 --- a/keyboards/alas/info.json +++ b/keyboards/alas/info.json @@ -8,6 +8,11 @@ "pid": "0x414C", "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", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h index 148e9a767200294ebe5bf0bb10d4f2df3c9bac9b..5f80ba36b48db9dc1dc66d589fde3a81e3864ffa 100644 --- a/keyboards/aleblazer/zodiark/config.h +++ b/keyboards/aleblazer/zodiark/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 1 -#define DIODE_DIRECTION COL2ROW - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, F4 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - #define RGB_DI_PIN B5 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index 8211117625744312d470b4c3f918134595b06f38..ca63fd47dd57cff89eee2d686adb5ade1d3c7df7 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -8,6 +8,11 @@ "pid": "0xF902", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D4", "resolution": 3} diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index e81b6a2010638a1aa733386bc96053fef926f407..b62a2cc0acfca2a88c3c7dae53a33e8332b14794 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/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 { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index faf199d8a06a6411a1682823c8c2b01607d8f336..1ec142f403b6807ac011f810b6eff83d70bbcba0 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5, diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index 04ebe0c65798874b56735072605558d93bd48898..1c4361c5c51d9821d08caa28362952262eefa33f 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/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 { B0, B1, B2, B3, B4, B5, B6 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLED_NUM 28 diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index 8b3ae6f2bae3a94ac13a100198957bbf0598a44b..a3e18ce9b35775b36dfe863fe11ea37153e5aff5 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 374873d5d57a4baa0c2afe3beb5a9e917af9bfc1..5faf0aad8b6888556a7a59562b951c923173a47f 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -16,16 +16,6 @@ #pragma once - -/* key matrix pins */ -#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 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/alf/x2/info.json b/keyboards/alf/x2/info.json index 5e0b3087a8644ead5abc5b0a7f4beb17bb37fcf6..7c1b3b99672c718fa954dfb18f9cc9a51302fd23 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "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", "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 585855ebe93e0c1ca2eecd1764165fdcf9361fd5..1fc317877dcf9b108258dec709f78bf624d2aa62 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/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 { B1, B2, B3, D6, D4 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 89ac7c7b17cde6fc70b7f649e7a7804e83bed068..775c5808797d2f9c79b03765a756c868f4f97429 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xD4C4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"], + "rows": ["B1", "B2", "B3", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index aa2502a0a164bde880b5b1c3dfbea3448d67a775..ae3dc8c2e09e72a60193b1db5bcb314fc0caebf6 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -17,22 +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) - * - */ -#define MATRIX_ROW_PINS { B1, B2, B3, D4, D6 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1, D0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 0f1d9c428e43d9e0ab8a863f2627860ebf4b1420..23f3e16fc4b24f2dd8c1f24a0ea5c3013985198e 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0xD4C3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"], + "rows": ["B1", "B2", "B3", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h index 40d071201a5e681ba430135e2093400e3347f623..91e02255699af8b6ff9a0a074452269efd38399a 100644 --- a/keyboards/aliceh66/pianoforte/config.h +++ b/keyboards/aliceh66/pianoforte/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F1, F0, E6, B6 } -#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5, B0, C6, C7, F6, F7, F5, F4 } -#define DIODE_DIRECTION COL2ROW - #define DYNAMIC_KEYMAP_LAYER_COUNT 2 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json index 56e2bf2cdfcb7df6b25f645c0d80115a237850c4..60fd6a7ba93604d3ae15b3239c08dbb13acd6dce 100644 --- a/keyboards/aliceh66/pianoforte/info.json +++ b/keyboards/aliceh66/pianoforte/info.json @@ -8,6 +8,11 @@ "pid": "0x7066", "vid": "0x6168" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"], + "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"], diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h index 7aa6ea4e4b49a8203cad617fe7cd44120f9b1931..91e02255699af8b6ff9a0a074452269efd38399a 100644 --- a/keyboards/aliceh66/pianoforte_hs/config.h +++ b/keyboards/aliceh66/pianoforte_hs/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, F5, E6, D4 } -#define MATRIX_ROW_PINS { D2, D1, D3, D0, D5, B0, F0, F1, F7, F4, C7, C6 } -#define DIODE_DIRECTION COL2ROW - #define DYNAMIC_KEYMAP_LAYER_COUNT 2 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json index d6e7fa34e8ea85e8a76acd2ac034966a4d6bd979..42bc824a9fd90159450e9f85ef295a9b80f8d8a2 100644 --- a/keyboards/aliceh66/pianoforte_hs/info.json +++ b/keyboards/aliceh66/pianoforte_hs/info.json @@ -8,6 +8,11 @@ "pid": "0x7068", "vid": "0x6168" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"], + "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 828839870afd9e2372221f3a5ae5e64085da2105..0f104a2a5c3ac722b1d61187c35dee7d36058e8e 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, B4, B5 } -#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, 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 diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index 472bedb1faf67c3997ceb5a8310cf0e0a50ad9d8..1f76cce458dae3b820fd702ff090c447fc67b4e1 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["D4", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h index 61af018700dd76e0947035a8ae01621a20d8258e..1dee90a07f10f68b4c371dc9bb0794aa4de6f18f 100644 --- a/keyboards/alpine65/config.h +++ b/keyboards/alpine65/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 , A15, A9 , A8 , B14, B12, A10, A0 , A1 } -#define MATRIX_ROW_PINS { C14, C15, C13, A2 , A3 } -#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/alpine65/info.json b/keyboards/alpine65/info.json index 1c1407b45b722a6be3d76261954cec868faad3ef..ec59236ea53d4b96312f19220115fbd1434b5010 100644 --- a/keyboards/alpine65/info.json +++ b/keyboards/alpine65/info.json @@ -8,6 +8,11 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"], + "rows": ["C14", "C15", "C13", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h index aff4064bb40d6bc229403b0bb85e32ce4b09b88b..4b007cf387ee6a288bd263126612efecfecc4011 100644 --- a/keyboards/alps64/config.h +++ b/keyboards/alps64/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5, D6, C2 } - -#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/alps64/info.json b/keyboards/alps64/info.json index e1ea2b9b5ee7c78c276853bd1650d5c30e9444c4..3f3d6af0fc37b29f65a4dcaf7430c66a9110ab59 100644 --- a/keyboards/alps64/info.json +++ b/keyboards/alps64/info.json @@ -4,10 +4,15 @@ "url": "", "maintainer": "qmk", "usb": { - "vid": "0x6873", - "pid": "0x6464", - "device_version": "0.0.1" - }, + "vid": "0x6873", + "pid": "0x6464", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"], + "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C5", }, diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h index 60e4a857cf22fb783cddfa277e53b6604b2629b4..ffff9dc8c6fd0d4c6180d8bc1537200ee6100143 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/config.h @@ -17,11 +17,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 { B6, B2, B3, B1, 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/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json index ce9e5388d7ec4beabab48a0c45d6b254b08a2c30..b49357c68679af08d793455d0990037807d7022b 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_2"], diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h index 82e82fc469bd824de88c0bee5b3a03ea1a28c58e..34e622bfb3335d6b5bba491ba84460ebd81e9dce 100644 --- a/keyboards/amag23/config.h +++ b/keyboards/amag23/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { A0, A1, A2, A3 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGBLED_NUM 7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json index 822f18c906b66b1605d223c59bdcd3aff72bf2f7..de2e7335078b2bfc1a930070f51a69aa18c35ba9 100644 --- a/keyboards/amag23/info.json +++ b/keyboards/amag23/info.json @@ -8,6 +8,11 @@ "pid": "0x2323", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5"], + "rows": ["A0", "A1", "A2", "A3"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h index bdefff8c4f996d57eb18c6c400e26a99a5a21b46..f14e2fb185c8d2decf249173bafd9293d02577cf 100755 --- a/keyboards/amjkeyboard/amj40/config.h +++ b/keyboards/amjkeyboard/amj40/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 { F4, F5, F6, F7} -#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7} - -/* 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/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index fe66c34b86997dd7efb89b00bedeb46a7367a984..60eeb456f4c8a01e40e13f7fd155194fd66fb2e7 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -8,6 +8,11 @@ "pid": "0x6072", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 0a38f730328f66b3e57f985d45aaff6f5184f252..0f15b431618259b9873b0eef9f9c6675dd668de9 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/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, F6, F5, F4, D5 } -#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index d62489469143b6257762bc9d43f9e2299c0857a3..2f322c3bb6b12080bc49c29f7e76713e96e430ac 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,11 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["F7", "F6", "F5", "F4", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4, diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h index 72711198764ddfbd0ca3f945406e77db64a4e8bb..b48aca7770038b4a3c782b071caeb58eb63d55b8 100644 --- a/keyboards/amjkeyboard/amj66/config.h +++ b/keyboards/amjkeyboard/amj66/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5, D6, D7, 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 diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index ed41d4d58cadbd894ac17bd1b99f7d891523af60..277d2ed790844b2a0d6595a0fcd4e1ac2635c0fa 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -8,6 +8,11 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"], + "rows": ["F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h index 7aef945e5b6aa6366a621e801aee9ae7c311202c..da28e924006cc0ce22c62eaf34e69e70ad048364 100644 --- a/keyboards/amjkeyboard/amj84/config.h +++ b/keyboards/amjkeyboard/amj84/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 { D0, F7, F6, F5, F4, D5 } -#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3, 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/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json index 20f8fd99b14e412730e647d6a48e8afc2253a5d9..aeb61944458fa52b2d3983a47579c178d0191b3f 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/info.json @@ -8,6 +8,11 @@ "pid": "0x6068", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"], + "rows": ["D0", "F7", "F6", "F5", "F4", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h index 63e6e899fa9d899f10822b5c61af1116580b39d7..02b595d6f7c524b5fb60e2748f2c128eddb5ea87 100644 --- a/keyboards/amjkeyboard/amjpad/config.h +++ b/keyboards/amjkeyboard/amjpad/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 { F7, F6, F5, F4, D5, D0 } -#define MATRIX_COL_PINS { F1, F0, E6, C7 } - -/* 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/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 7a22d14639af950c5211bef9fead0a0c42db3134..3bd3a7f24c2b9794dc3fbca4011944b48088c6b4 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F1", "F0", "E6", "C7"], + "rows": ["F7", "F6", "F5", "F4", "D5", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h index df6d076d5c0458770bc1b991371a298d09a8c36c..296abfa02e63001b3ac0ff1ce5d4bd39aa4e9e1a 100644 --- a/keyboards/ano/config.h +++ b/keyboards/ano/config.h @@ -16,11 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { A4, B14, B15, B9, B10, B11 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, A5, A6, A7, A8, A15, A2, A1, A0, B8, B13 } - -#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/ano/info.json b/keyboards/ano/info.json index 19d53a9ce10a28197f245b851fe7ee2508b26983..fd4ff724b83f845a63044a3edb0d88b0a692b62a 100644 --- a/keyboards/ano/info.json +++ b/keyboards/ano/info.json @@ -8,6 +8,11 @@ "pid": "0x0651", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "A5", "A6", "A7", "A8", "A15", "A2", "A1", "A0", "B8", "B13"], + "rows": ["A4", "B14", "B15", "B9", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "A14", "resolution": 2} diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h index 4e13b2edd93e39edf09816db4fce06ca410e458e..947f85bbb2b10ffd1e6a5ec8052f850a9aabd21b 100644 --- a/keyboards/anomalykb/a65i/config.h +++ b/keyboards/anomalykb/a65i/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B3, B2, B1, B0, B5 } -#define MATRIX_COL_PINS { D7, D6, D4, B4, B6, E6, F1, B7, C6, C7, D5, D3, D2, F0, 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/anomalykb/a65i/info.json b/keyboards/anomalykb/a65i/info.json index d3307d7964bc61b52a34f7f16894e63134779f3a..f5054f1b20a71acd691203e7ddd79fd973735bf7 100644 --- a/keyboards/anomalykb/a65i/info.json +++ b/keyboards/anomalykb/a65i/info.json @@ -7,6 +7,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"], + "rows": ["B3", "B2", "B1", "B0", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h index 466eff89afddcf64cc0dee5698a99c08b7d64a98..84928fb97509f0bb79c3bd5084d4d073c304ea87 100644 --- a/keyboards/aos/tkl/config.h +++ b/keyboards/aos/tkl/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D3, D2, B7, F1, C7, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F5, F6, F7, B6, B5, D7, B4, D6, F0, D1, C6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json index c6d37930a4a9d579ef126d91811be3a45a0f9eeb..06a8892c634d771d65294335a278a9b0a8bdf10f 100644 --- a/keyboards/aos/tkl/info.json +++ b/keyboards/aos/tkl/info.json @@ -7,6 +7,11 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"], + "rows": ["D3", "D2", "B7", "F1", "C7", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/aozora/config.h b/keyboards/aozora/config.h index dc68828e0f7847d49c1291b47f2a93319552a2d8..5171d0c312defb4812b1e0b7194b482f2811d770 100644 --- a/keyboards/aozora/config.h +++ b/keyboards/aozora/config.h @@ -16,21 +16,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 { F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, D2} - -#define DIODE_DIRECTION COL2ROW - /* EEPROM for via */ #define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json index b385261282cf62e41377dd833171aac02faac48f..b49708a336c6698aa3f49f37f68e6073142f84b9 100644 --- a/keyboards/aozora/info.json +++ b/keyboards/aozora/info.json @@ -8,6 +8,11 @@ "pid": "0xE86A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D2"], + "rows": ["F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h deleted file mode 100644 index cd4a58eec51e980e337344a9a3ff576ed24eba93..0000000000000000000000000000000000000000 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 April Aplyard - -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 { E6, B3 } -#define MATRIX_COL_PINS { F7, B6, F4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json index 6a1ac3071b6be59c13d8cc02d7955cc4e4c849b3..167699150fb8620534c774206497cd7db1f02852 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B6", "F4"], + "rows": ["E6", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index f2793935cbcb2ccf5002c5bbe0708f94f249c5e4..2724ccf11718e146e5e389c1d36ffa2b12273014 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* 9Key PCB default pin-out */ -#define MATRIX_ROW_PINS { B4, B5 } -#define MATRIX_COL_PINS { C6, D7, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 #define TAP_CODE_DELAY 50 diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 114894a71449b3f949e65fdc116fa9ecbf73f56b..726dab814c886c4d20c8addcb83e26e288fb06d7 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -3,6 +3,11 @@ "pid": "0x0040", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6"], + "rows": ["B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h index 495e8dcb326a804f3b9f69481b747721b5296ffb..62111b4b719fc711a546e9a769fbd31e5c0a2e83 100644 --- a/keyboards/arabica37/rev1/config.h +++ b/keyboards/arabica37/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } - -// wiring of each half -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json index 3629bf761f85e0d0e25beef2a48f277839aac8ea..36ff667df1fe412fd0c8fbffdeab2ff4501dfd65 100644 --- a/keyboards/arabica37/rev1/info.json +++ b/keyboards/arabica37/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "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/ares/config.h b/keyboards/ares/config.h index 3d384af9eadc440e1e15217aee060c41a482f7e6..ddc21dae3085e0ce5d34e1eef64a9e9de1b80f01 100644 --- a/keyboards/ares/config.h +++ b/keyboards/ares/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 } -#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/ares/info.json b/keyboards/ares/info.json index 391c7a8125cd632d2229521ad9fb4ff2a564d03d..ecbe2c18dcbb0c5cf3878d309b72efda81fb59ac 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/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": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h index 5001da55908e543110bbc83039c90264d9ee92eb..3cf449a32bf402ccfc19ec321657f8415c6a7ef1 100644 --- a/keyboards/arisu/config.h +++ b/keyboards/arisu/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, B0, B7, B5, B4, D7, D6, B3 } - -/* 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/arisu/info.json b/keyboards/arisu/info.json index 1fe2eadbe3edfb663c956c7c6eb62748fafc202d..941f9a467d9258b5720fa3abd28111522a0b6c0e 100644 --- a/keyboards/arisu/info.json +++ b/keyboards/arisu/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h index c48bc4ec6adda841ad9dc1e6f21a1d3d58d422af..2f259d40f67bb99513046d6fb75700bba2f41984 100644 --- a/keyboards/ash1800/config.h +++ b/keyboards/ash1800/config.h @@ -17,27 +17,10 @@ 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, B4, D7, D0, D1, D2, D3, D5, D4, D6 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 } - #define NUM_LOCK_LED_PIN E6 #define CAPS_LOCK_LED_PIN F0 #define SCROLL_LOCK_LED_PIN 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/ash1800/info.json b/keyboards/ash1800/info.json index 2c9338b2f6f6244d27e87d68cb669011106cb784..e843d52f2b8b01efc87c0b37ae674c960924f9aa 100644 --- a/keyboards/ash1800/info.json +++ b/keyboards/ash1800/info.json @@ -7,6 +7,11 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h index e21327b99c9b79acdb05933928416d859d7a71a5..8f81c450eb55805339149e18ced108609569811a 100644 --- a/keyboards/ash_xiix/config.h +++ b/keyboards/ash_xiix/config.h @@ -14,27 +14,10 @@ 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, B4, D7, D0, D1, D2, D3, D5, D4, D6 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 } - #define NUM_LOCK_LED_PIN E6 #define CAPS_LOCK_LED_PIN F0 #define SCROLL_LOCK_LED_PIN 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 #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json index 4bc7fb1987f8a42f0ee0e23d4cd8af0e9a1a3868..3eaa711e31350791e60319c8d2e5500b570c5146 100644 --- a/keyboards/ash_xiix/info.json +++ b/keyboards/ash_xiix/info.json @@ -8,6 +8,11 @@ "pid": "0x14BC", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h deleted file mode 100644 index 00c5f5626bec89e5296815ce2a0de4d89bc36cf2..0000000000000000000000000000000000000000 --- a/keyboards/ashpil/modelm_usbc/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2019 ashpil - -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 { C7, C6, C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS { E6, E7, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* - * 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/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json index c048dd047a0608dde65a473f6b0fa1e4dab7c839..f34dfa63fea94c6a4e3bf13d795eaefd54a8b0b7 100644 --- a/keyboards/ashpil/modelm_usbc/info.json +++ b/keyboards/ashpil/modelm_usbc/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "E7", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5"], + "rows": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "ROW2COL", "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h index bf470511936c41f7e79675cf3a69cd095eaf7206..70ad2757b92bc8777196c0cc15ceb0b591863002 100644 --- a/keyboards/at_at/660m/config.h +++ b/keyboards/at_at/660m/config.h @@ -23,10 +23,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B9, B8, B7, B6, B5, B3, B4, B0 } -#define MATRIX_ROW_PINS { A3, A4, A5, A0, A1 } -#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/at_at/660m/info.json b/keyboards/at_at/660m/info.json index 49af2851772714a45495811561a0114db2f2bf2c..4fdd84daeb02f7ef00396c0a7d721b91df53d9f0 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/info.json @@ -8,6 +8,11 @@ "pid": "0x6600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"], + "rows": ["A3", "A4", "A5", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 7379856a4f82e618bf54c6fe999e42957226dfcb..9790c7555654c5af4faa0077ad6edf046a0dedd4 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h @@ -16,17 +16,9 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 } -#define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 } - #define ENCODERS_CCW_KEY { { 4, 5 } } // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 3, 5 } } // Note: array is { col, row ) -/* 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/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json index 0269bd1e279dabd4b026e7fd8115944fbaa9d4ee..eb731f38608e8ee6a693c0a64149c3a63a577cf0 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/info.json @@ -7,6 +7,11 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"], + "rows": ["F1", "F7", "F6", "F5", "F4", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B0"} diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h index 78beebcc65a7fe2fd569921c63b33ec1549756ca..d0851ac1fde226a67087485e51d9c3cfc536c1dc 100644 --- a/keyboards/atlas_65/config.h +++ b/keyboards/atlas_65/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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 } - -/* 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/atlas_65/info.json b/keyboards/atlas_65/info.json index 7d755c37bfa49a5572fd2df88b2fa368f0b46a74..af2487f604804bfda437c62e0ea8e06f0d2d1e38 100644 --- a/keyboards/atlas_65/info.json +++ b/keyboards/atlas_65/info.json @@ -8,6 +8,11 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h index 9c50c21e3fff0dcb1f102ab77536d109d61eafcb..b9449c4714bf39561a177eb1ee1ba90b87dbc6fb 100644 --- a/keyboards/atomic/config.h +++ b/keyboards/atomic/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, D5, B5, B6, C6 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, 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/atomic/info.json b/keyboards/atomic/info.json index 95f50889957a4445fe8435a0b644377dd13e4a13..0324d8533e9072d4f378d433d4515eda522f8cab 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"], + "rows": ["D0", "D5", "B5", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/atreus/astar/config.h b/keyboards/atreus/astar/config.h deleted file mode 100644 index 90bf37823d1c0505cb621c9979c43be549bcfc04..0000000000000000000000000000000000000000 --- a/keyboards/atreus/astar/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 - * - * 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 { D0, D1, D3, D2 } -#if defined(PCBDOWN) - #define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 } -#else - #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 } -#endif - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/info.json index 4369a04103857829d6d574d059aba4f1c088360b..e201078ffe77b98a2673af1f7066a4fc58d35958 100644 --- a/keyboards/atreus/astar/info.json +++ b/keyboards/atreus/astar/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D7", "C6", "B5", "B4", "E6", "D4", "B6", "F6", "F7", "D6", "B7"], + "rows": ["D0", "D1", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/atreus/astar_mirrored/config.h b/keyboards/atreus/astar_mirrored/config.h index 83c9cf7fc6822a0a3f6c7688b9422291d1ff26eb..3bd163dec358a0b00b59970e99ea8a291f95d4ae 100644 --- a/keyboards/atreus/astar_mirrored/config.h +++ b/keyboards/atreus/astar_mirrored/config.h @@ -16,21 +16,4 @@ #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 PCBDOWN 1 - -#define MATRIX_ROW_PINS { D0, D1, D3, D2 } -#define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/info.json index 4369a04103857829d6d574d059aba4f1c088360b..b83be5d29d42b505555c8c4c046196af63f57403 100644 --- a/keyboards/atreus/astar_mirrored/info.json +++ b/keyboards/atreus/astar_mirrored/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B7", "D6", "F7", "F6", "B6", "D4", "E6", "B4", "B5", "C6", "D7"], + "rows": ["D0", "D1", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/atreus/f103/config.h b/keyboards/atreus/f103/config.h deleted file mode 100644 index d6d3b033ddbc490b7b4df299fafa8114edafcbf9..0000000000000000000000000000000000000000 --- a/keyboards/atreus/f103/config.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 DmNosachev - * - * 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) - * -*/ - -/* key matrix pins */ -#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, B5, B4, B3, A15, A10, A9 } -#define MATRIX_ROW_PINS { A5, A4, A3, A2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json index cf993be24710c06fbc4df1762287e52ee83711f8..341ed4e8e647bad0d28276c16301b1b810110765 100644 --- a/keyboards/atreus/f103/info.json +++ b/keyboards/atreus/f103/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"], + "rows": ["A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/atreus/feather/config.h b/keyboards/atreus/feather/config.h index 34880f0e3ea4be846596ead7d365d0da91d77303..505296a5056aad5968ea9eedbeef473f5bd43322 100644 --- a/keyboards/atreus/feather/config.h +++ b/keyboards/atreus/feather/config.h @@ -16,23 +16,4 @@ #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, D3, D2 } -// #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 } -#define MATRIX_ROW_PINS { B7, D6, C7, F5 } -#define MATRIX_COL_PINS { D7, B5, D1, D0, C6, B6, F0, D2, D3, F4, F1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define OUTPUT_AUTO_ENABLE diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json index 4369a04103857829d6d574d059aba4f1c088360b..1f70534b7f5520914c42fc29b153e5ca6aa87b69 100644 --- a/keyboards/atreus/feather/info.json +++ b/keyboards/atreus/feather/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"], + "rows": ["B7", "D6", "C7", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/atreus/promicro/config.h b/keyboards/atreus/promicro/config.h deleted file mode 100644 index 6c0dd1d4b967b2dab76e14830686bdae87ec91c9..0000000000000000000000000000000000000000 --- a/keyboards/atreus/promicro/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 - * - * 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) - * -*/ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, B2, B4, B5 } -#if defined(PCBDOWN) - #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B6, B3, B1, F7, F6, F5 } -#else - #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B6, E6, D7, C6, D4, D0 } -#endif - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/info.json index 4369a04103857829d6d574d059aba4f1c088360b..e614b4e2a0a8713a926865839f738c910ca92e8b 100644 --- a/keyboards/atreus/promicro/info.json +++ b/keyboards/atreus/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B6", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F4", "B2", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/atreus/teensy2/config.h b/keyboards/atreus/teensy2/config.h deleted file mode 100644 index 4664561f9b6344391e48b67cf1b7d484cbae679b..0000000000000000000000000000000000000000 --- a/keyboards/atreus/teensy2/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 - * - * 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 { D0, D1, D2, D3 } -#define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/info.json index 0b2db81c11eb27f6d99f7dc8cc21221cf814446b..067ea9a01dd110ef7ceeaa64e3a2401866266eec 100644 --- a/keyboards/atreus/teensy2/info.json +++ b/keyboards/atreus/teensy2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["F6", "F5", "F4", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h index b497998196bb2cb0ff829a3d382e6c05728a1d0d..9b7700e0139b2f846c3b115e3839714280844934 100644 --- a/keyboards/atreus62/config.h +++ b/keyboards/atreus62/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6 } - -/* 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 /* Locking resynchronize hack */ diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json index 9818475ace0fbe6057fec18f72dc7a43ac9f64bc..0221f2c551ba0c1553c48615f58f90881ce9b092 100644 --- a/keyboards/atreus62/info.json +++ b/keyboards/atreus62/info.json @@ -4,10 +4,15 @@ "url": "", "maintainer": "qmk", "usb": { - "vid": "0xFEED", - "pid": "0x6062", - "device_version": "0.0.1" - }, + "vid": "0xFEED", + "pid": "0x6062", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"], + "rows": ["D2", "D3", "D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h index 99eb2c21e60c6987c7f7c065f1ac05d185e0628c..d7c434426bc969ec15d2c2f37b0db626a43d00d9 100644 --- a/keyboards/atreyu/rev1/config.h +++ b/keyboards/atreyu/rev1/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, E6, B4, B5, F6, F7, B1, B3, B6, B2 } -#define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3 } - -/* 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/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json index 6d191d0635627de9333b0d3f6c21c6e8fad198d0..00012812a4a799d27d7e8028d41ba1a0bded2ab4 100644 --- a/keyboards/atreyu/rev1/info.json +++ b/keyboards/atreyu/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h index de63cf3bd1b5e661f54411a636e8e27cb1330e39..d7c434426bc969ec15d2c2f37b0db626a43d00d9 100644 --- a/keyboards/atreyu/rev2/config.h +++ b/keyboards/atreyu/rev2/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, E6, B4, B5, F6, F7, B1, B3, B6, B2 } -#define MATRIX_COL_PINS { F4, F5, C6, D4, D2, D3 } - -/* 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/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json index a890b8d271645575a6e73d2757522538e06c82c1..707f8554e0c58034dafcaebb4e5e4c23ab6b880a 100644 --- a/keyboards/atreyu/rev2/info.json +++ b/keyboards/atreyu/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "C6", "D4", "D2", "D3"], + "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "B7"}, diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index 11b4549d4619310ed14396b67a140de127ec200a..dc6abdcaf250b0a4ee9bbdc996d991f30e6fa141 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -15,13 +15,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D2 } -#define MATRIX_COL_PINS { 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/atset/at1/info.json b/keyboards/atset/at1/info.json index 8e68513a436c4b424d5d1a32eb1df7f21eb23161..85b848e8d6466600b423abf35c0b33a9cf375364 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6"], + "rows": ["D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index 77ace78035bd9ce6ee3ca7789ec776f85c7c5bc2..dc6abdcaf250b0a4ee9bbdc996d991f30e6fa141 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -15,13 +15,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D3, 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/atset/at12/info.json b/keyboards/atset/at12/info.json index e7914318b823539f88747c4e75827455d8c42548..7708afac2021036d0707621a81f8857b35392b2e 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index 6db5e0ead50262f2a1993375571367a726725d31..dc6abdcaf250b0a4ee9bbdc996d991f30e6fa141 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -15,13 +15,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D3, D2, D1, D0 } -#define MATRIX_COL_PINS { B6, B5, B4, 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/atset/at16/info.json b/keyboards/atset/at16/info.json index 3ea641eec95f639daf05e3ae330e6b4ea5c29ce6..2d5daf6ab111c1f8b1b3b5a98174ad1b7f5e5c83 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "B2"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index b9d7f7c641967389f596056f103a40cbc86bcac9..dc6abdcaf250b0a4ee9bbdc996d991f30e6fa141 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -15,13 +15,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D2 } -#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/atset/at3/info.json b/keyboards/atset/at3/info.json index 1241361d71af13b04b0c8e2834dfc5f15370cdc4..9f804fad1a3ad491465517dd1b09ff7c02eef543 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4"], + "rows": ["D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index 522ad5fec39c930dd75c1c12ee24bfa184022e8e..dc6abdcaf250b0a4ee9bbdc996d991f30e6fa141 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -15,13 +15,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D2, D1 } -#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/atset/at6/info.json b/keyboards/atset/at6/info.json index 03be76e696630775e602dca9accccb2214b80cf0..bfcbafdff568c757fd0da80d51ff96ec03aebc48 100644 --- a/keyboards/atset/at6/info.json +++ b/keyboards/atset/at6/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4"], + "rows": ["D2", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index cc0fa4cbc829ddb9b7c69af408d414b7905b616f..dc6abdcaf250b0a4ee9bbdc996d991f30e6fa141 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -15,13 +15,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/atset/at9/info.json b/keyboards/atset/at9/info.json index ecff089964c068bedb5193880964e043fecb0342..2afafe5cefb74f9e7f79e81a81240f334be29b68 100644 --- a/keyboards/atset/at9/info.json +++ b/keyboards/atset/at9/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "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/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h index e4f44cdfcee7ba97edbdbe36404655b566241654..637150ae7b46d24d656e5deacf5d857b036ee7a9 100644 --- a/keyboards/atxkb/1894/config.h +++ b/keyboards/atxkb/1894/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 { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json index fef98bcacf9a847f7bd46f561d5e43d5cb766700..69615775b4a767333e3c4e0c8b4f4fe14f66cd50 100644 --- a/keyboards/atxkb/1894/info.json +++ b/keyboards/atxkb/1894/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h index 7b3f4608ead822574ce119eb2057571fc0b58aed..38fa2c088191c8cf61b68fd6ebe830a240456ab9 100644 --- a/keyboards/aurora65/config.h +++ b/keyboards/aurora65/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 } -#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B2, B1, B0, A0, A1, A2, A3, A5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light */ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json index 28adec5eab0e9dae62ba7916cacb47aa17b1ae90..3d7c71815a4ba649e935490f672a81999724438c 100644 --- a/keyboards/aurora65/info.json +++ b/keyboards/aurora65/info.json @@ -8,6 +8,11 @@ "pid": "0x4136", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"], + "rows": ["B3", "B4", "B5", "A8", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h deleted file mode 100644 index 940476e03a64a6fd8f1faf4287d97b7ce41d5d96..0000000000000000000000000000000000000000 --- a/keyboards/avalanche/v1/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index 518a0c0742797ba9e151a881f39e051f2a48ce58..e8ce03904f19f9a62ac11eeeb23cb730d4c3c443 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 3978f581e1c7a0235d9b30022ea737f6cfff96be..1b6ce7be909cd8c6f6958213e3abdf00ee6e7df2 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -3,11 +3,6 @@ #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index 7105fc17874a409537e0e2171cfd7566b18ac62e..3289a95fafec2fa55eadeb0fb3f58eb69b90fdb2 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "F4", "resolution": 2} diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h index efe0c2793240d58cd3a5a3aaee53e098e697efe0..699a7c88fa9be9c30f20f4b7ffdc3dc3c74ab54b 100644 --- a/keyboards/avalanche/v3/config.h +++ b/keyboards/avalanche/v3/config.h @@ -3,11 +3,6 @@ #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 70ffcc9efc32e43d9f92c39de90171003c97c44f..27ae1d8a1384484a4e447e8101bc7a4894802ef5 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "F4", "resolution": 2} diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h index 86dff022e06ff183a58be1a5c64afe054bffa397..10d9ca889a48b30051c649e1c09dae19d8dc01ca 100644 --- a/keyboards/avalanche/v4/config.h +++ b/keyboards/avalanche/v4/config.h @@ -3,11 +3,6 @@ #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN D3 # define RGBLED_NUM 64 diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index 5b31b5ca111d6c630dceb98e27ebf5a1a4979fd4..93207e83b120392eb76e243c5387cdd71c4dd8e3 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "F4", "resolution": 2} diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h index f8a64364ad8aed86c8841a66845b9be897688b62..fef8226df6bb459a3d5840abaf61aaf8c4c0cbc8 100644 --- a/keyboards/aves60/config.h +++ b/keyboards/aves60/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 { F6, F7, F5, F1, F4 } -#define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D5 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json index 71420c4423b571c7327231d8907f516148011002..3cb54d2180d3b18efd5231d0cf5d19a0f561cde4 100644 --- a/keyboards/aves60/info.json +++ b/keyboards/aves60/info.json @@ -8,6 +8,11 @@ "pid": "0xD408", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F6", "F7", "F5", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [4, 6] }, diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h index 9037aa13f4a8454cecdb87cb55215dbe9986039d..00312ff33557f04d21e28f049b2f74c179adeef5 100644 --- a/keyboards/aves65/config.h +++ b/keyboards/aves65/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 {D4,D6,D7,B4,E6} -#define MATRIX_COL_PINS {D0,D1,D2,D3,D5,B5,F0,F1,F4,F5,F6,F7,C7,C6,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/aves65/info.json b/keyboards/aves65/info.json index 8984465f078e72b216c03903f8055ac5a42a96fb..26e9a7ab4487f201bf778800bbf5d66c853de28b 100644 --- a/keyboards/aves65/info.json +++ b/keyboards/aves65/info.json @@ -8,6 +8,11 @@ "pid": "0x9038", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], + "rows": ["D4", "D6", "D7", "B4", "E6"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D4", "esc_output": "D0" diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h deleted file mode 100644 index c6cbb045b3953e09cfd398325c7cef8127546b33..0000000000000000000000000000000000000000 --- a/keyboards/axolstudio/foundation_gamma/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 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 - - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B2, B1, B0, F7, F6, F5 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, F4, F1, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json index ecc7bcad90c076a348003120e854191499980ebc..aac82dd201667e82cb203fbb2a81a749daf2df86 100644 --- a/keyboards/axolstudio/foundation_gamma/info.json +++ b/keyboards/axolstudio/foundation_gamma/info.json @@ -8,6 +8,11 @@ "pid": "0xE3EB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "F4", "F1", "F0"], + "rows": ["B2", "B1", "B0", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/axolstudio/helpo/config.h b/keyboards/axolstudio/helpo/config.h deleted file mode 100644 index 549e53672c13e5e126edd08097203022b5e5f2a2..0000000000000000000000000000000000000000 --- a/keyboards/axolstudio/helpo/config.h +++ /dev/null @@ -1,27 +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 - - -/* Keyboard Matrix Assignments */ - -#define MATRIX_ROW_PINS { A2, A3, A4, A5 } -#define MATRIX_COL_PINS { A1, B4, B3, B2, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index 1174a32d05bb5d6c90dcd77a064f5c70fbf661f7..c6d1d58f6c5771a9807f584702cb477bcf733b99 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -8,6 +8,11 @@ "pid": "0xC89F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B4", "B3", "B2", "B1"], + "rows": ["A2", "A3", "A4", "A5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h index 61f18a8b3a42704f73ead8d2358206374b1e529b..694a6449f0f9cf5b4d85874c2304431bc3d36221 100644 --- a/keyboards/axolstudio/yeti/hotswap/config.h +++ b/keyboards/axolstudio/yeti/hotswap/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ - -#define MATRIX_ROW_PINS { E6, C6, B4, B5, B6 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B7, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json index 40aa7b8b704fd60faad9e7ce77890bc821d8889b..064d987d13a6897ef6fb71cf44bfa71b0a874122 100644 --- a/keyboards/axolstudio/yeti/hotswap/info.json +++ b/keyboards/axolstudio/yeti/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x9F9E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], + "rows": ["E6", "C6", "B4", "B5", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/axolstudio/yeti/soldered/config.h b/keyboards/axolstudio/yeti/soldered/config.h deleted file mode 100644 index 0e31a7113d1e7dffc74179dff3db580041b3f0f5..0000000000000000000000000000000000000000 --- a/keyboards/axolstudio/yeti/soldered/config.h +++ /dev/null @@ -1,27 +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 - - -/* Keyboard Matrix Assignments */ - -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, D7, D6, D4, B3, B7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json index 7bd5d8e095369fa270630b206d17b49df42e4544..0f283bc675a5d332913e7a3eafc637fdcd629ebc 100644 --- a/keyboards/axolstudio/yeti/soldered/info.json +++ b/keyboards/axolstudio/yeti/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0x9F9F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "F0", "F7", "D7", "D6", "D4", "B3", "B7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/aya/config.h b/keyboards/aya/config.h index 56e966ce0fb1a7900819ffed68511060c98ac0c5..14fc201d49648550caef1bbfe89b28ade8a76035 100644 --- a/keyboards/aya/config.h +++ b/keyboards/aya/config.h @@ -16,10 +16,5 @@ #pragma once - -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -#define DIODE_DIRECTION ROW2COL - #define SPLIT_HAND_PIN B5 #define USE_I2C diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json index 325ab9d72159c4b23a065585cdb81eab70882488..d35001e1327b186612a3582efd9efe047a7a6f03 100644 --- a/keyboards/aya/info.json +++ b/keyboards/aya/info.json @@ -8,6 +8,11 @@ "pid": "0x2925", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index b85eee3da2ae594b50e487fcf7fe79db83d73a6b..4156fd3aaeee3ace2ab48ca556df661c6986d01a 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -18,12 +18,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, B5 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index 242135b16c7e55dce3311910512a8e27c1ca1616..f0bf9b1d980c9c65c6c4a8ea1b669abebae72219 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xEB5F", "device_version": "0.0.7" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h index 23eae6dac4bd2d111a7a556e09212cca611197d7..b4ac29b52de1e6eb073c371bbe4af8d20f378cbf 100644 --- a/keyboards/salicylic_acid3/7splus/config.h +++ b/keyboards/salicylic_acid3/7splus/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 7762132ec02715ec3f8969f43e7e02282c62c4f9..72dcc86573c145a729a630452158e80630138fc4 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -8,6 +8,11 @@ "pid": "0xEAE7", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h index aa568db0a6ac2dd25f1e2f6e070acae3c79b8d4a..8f24db085d103af0a8beefaaed67d5203a4474ae 100644 --- a/keyboards/salicylic_acid3/ajisai74/config.h +++ b/keyboards/salicylic_acid3/ajisai74/config.h @@ -17,13 +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, B5, D3 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index e9b4d6e60e680e72b82c5ef142353adf1fdcda25..8378a1cd5dbdd6dbeec462f4be9f8e67e58a177b 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -8,6 +8,11 @@ "pid": "0xEB54", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h index c64ee24098f0c252f7e17f755e833dd42af6766c..150c2f4dccf1105ac3e319626df200cf0a01707c 100644 --- a/keyboards/salicylic_acid3/ergoarrows/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 9396eca3675c54c78df4a9a8023bd06076044402..6d0282fdd687679aea0f7301c84accd14ee7a41c 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -8,6 +8,11 @@ "pid": "0xEA54", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index 479aa6c3f729eb5dc70c31bbde714d70948d68d8..d004f287df7604a783d7d2bd20c094a0607adb88 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* 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/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index 74435407049195091e2326c0e52d590a980fbf6a..33f5822449c5889134a6966c7fd3db9143ea8175 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.1.3" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index 65b373f1681fc071f9eea2e6eb3bca005cd99177..70e81ae77496da931570ff285e3c2dd65d3fcd49 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index 53f61f87f2d329a04c6243fdfe2d3b5a2b04fb7d..33488610b803d32055ebddd34c60ed9ff0ee160b 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xEB4F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h index f9312912ce4fb90afdbebb2b10d23ee87b597236..4d7fc6297be158bd64744ac3a3ad2dabbd077ede 100644 --- a/keyboards/salicylic_acid3/nafuda/config.h +++ b/keyboards/salicylic_acid3/nafuda/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { F4, F5, F6 } - -#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/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index 05cf322ccf730d7fade6e61c62e4c13397d24aee..3cef936a33b29ddfe3c6c6f420c19f3c1829522a 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.1.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index 8adf11f4dfc92b021a0d301928e1e390f19c1741..3f1c2f9ca5ba41f2ae6d7f12be7f454abaab4ed5 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5 } -// When using Nafuda, comment out MATRIX_ROW_PINS_RIGHT and MATRIX_COL_PINS_RIGHT. -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, 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/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index 5dc05a02d0505e0463d1259bc8a4a6b4c286a846..96d81a7e716d896db52b05be3b803578fcaa2ac9 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0xE8BA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"], + "rows": ["D4", "C6", "D7", "E6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h index d7e3f223eab4be19f25c0f483a63e44501d28fb3..2f62289261b57a02fc5e605e844fc1283fd19a6d 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/config.h +++ b/keyboards/salicylic_acid3/naked60/rev1/config.h @@ -17,18 +17,6 @@ along with this program. If not, see . #pragma once -// Rows are doubled-up -#define MATRIX_ROW_PINS { B6, D1, D0, D4, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 } -// When using Setta21 -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B2 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 } -// When using Nafuda -//#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, B6 } -//#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 } - -#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/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json index 2f46e127ea05512b6da95a50361a775aa6ebdac5..92da4070a582235fb61dd496777d45b2ffbffeaa 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/info.json +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0xEB5C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"], + "rows": ["B6", "D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B2"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index 11031a4f257721c2c644bda7fa7a12baa6e9896e..4d991f2ea3c36dfa7a93759ad7ce22568e943091 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3 } -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4, B5, B2, B2 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6 } - -#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/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json index 52a7c2906ed600e1354b9cef50b3e20d76e18fe6..2416e063d96632c962a24e380c0b47f1e6070119 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0x3060", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "B2", "B2"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h index 43e7cfb2225a53f99d9f241476f1456e86f4eac7..24acc89bcfe4714656f8f2db8564c420d3cc1515 100644 --- a/keyboards/salicylic_acid3/nknl7en/config.h +++ b/keyboards/salicylic_acid3/nknl7en/config.h @@ -17,13 +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, B5, D2 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index 06d915c2f411df35dfb232f50c24eaa56ab46159..c36278aa4701ed74191c34bbdcd56d1528f4792a 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -8,6 +8,11 @@ "pid": "0xEA56", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h index 69ef56fe6e68704eab571206a9ac65a11367880b..3c8fca5ab005050e0317a144de971eca8d2cc77f 100644 --- a/keyboards/salicylic_acid3/nknl7jp/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/config.h @@ -17,13 +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, B5, D2 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index 7338cb15fe55b24bd1c9fcc86802b1783a968708..b2f07e233a3fa85739d8e8eb712a93c9f4e199da 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -8,6 +8,11 @@ "pid": "0xEA55", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 6672b0014c8d76c615a271dc6f1c18f9d3ed330d..26f1bf26610dea799cda6d1b0d75c3296f17d149 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -#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/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index a798c25e634eca8d48317305d86ca26fe3833883..b4013093cd313901367d029adc7ed71de9b99b4d 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.1.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x4"], diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h index 0a235bd36c1d17cf2b5408a6a2934cf65d4ef118..3d6d768957fec64a05533852b960440daf5e76ab 100644 --- a/keyboards/sam/s80/config.h +++ b/keyboards/sam/s80/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, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 20 diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index ab0cde43a1de40ee3cf33426eeeb7ecfff0f1817..dd03cf3098d7301a5a37a88be59c8a3eb1fa4856 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -8,6 +8,11 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h index 7cfba55dc88bb2953e8113af6fac560b5021c8de..946649d0382483fee51dcdced6e36c422fbb4321 100644 --- a/keyboards/sam/sg81m/config.h +++ b/keyboards/sam/sg81m/config.h @@ -16,21 +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 { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B7, B6, B5, B4, C7, C6, D0, D1, D2, D3, D4, D5, D6, D7 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 //reserved pin for potential underglow rgb #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json index ebf5dda94734bd1013a8488d95a02cd4695c21da..9f741abeff953ae651178d29344e46ca417372a0 100644 --- a/keyboards/sam/sg81m/info.json +++ b/keyboards/sam/sg81m/info.json @@ -8,6 +8,11 @@ "pid": "0x3831", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "C7", "C6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h deleted file mode 100644 index 1ab243f5ed40ea0216bd41c55569cdbfc37dc756..0000000000000000000000000000000000000000 --- a/keyboards/sanctified/dystopia/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 Quentin Melis - * - * 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 { B2, B3, E6, D5, D3 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/info.json index 3c0814074e53be021d1c7b27438fa0b90a0cd589..c71f327f6a59f76ce9bbb80558818d98a13d0acb 100644 --- a/keyboards/sanctified/dystopia/info.json +++ b/keyboards/sanctified/dystopia/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D6", "D7", "B4"], + "rows": ["B2", "B3", "E6", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h index d12d01cb38dbff8562cafb4ea94be4323b2564ce..fdd0cd8c86412755a6a5e8a77c392237e0fd0248 100644 --- a/keyboards/sandwich/keeb68/config.h +++ b/keyboards/sandwich/keeb68/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, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { B6, C6, F7, E6, B7, D0, D1, D2, D3, D4, D6, D7, 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/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json index ed30bd810a0a8b7794205eaba0de9744a4ab00e7..c4e875299711d43f28d20dd45ab78b14ca6b8038 100644 --- a/keyboards/sandwich/keeb68/info.json +++ b/keyboards/sandwich/keeb68/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "F7", "E6", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C7", "levels": 5, diff --git a/keyboards/satt/vision/config.h b/keyboards/satt/vision/config.h index 6617b6ef13cd37f8bfa2fb079a061aa0f71751b1..4b007cf387ee6a288bd263126612efecfecc4011 100644 --- a/keyboards/satt/vision/config.h +++ b/keyboards/satt/vision/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4, A3, B8, B7, B6, B5, B4, B3, A15 } -#define MATRIX_ROW_PINS { B12, B2, A2, A1 } -#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/satt/vision/info.json b/keyboards/satt/vision/info.json index fcca710f19bcb87a39e393bd4ddc9df91b720a41..15977a58928050599142df0c44085adc8fd8024e 100644 --- a/keyboards/satt/vision/info.json +++ b/keyboards/satt/vision/info.json @@ -8,6 +8,11 @@ "pid": "0x5649", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A6", "A5", "A4", "A3", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B12", "B2", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h index abe48866337e74482ce4f6479df7b2b40f38db10..037c0b0a23239202d60a66125fd4d66507a0e431 100644 --- a/keyboards/sauce/mild/config.h +++ b/keyboards/sauce/mild/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 { C13, C14, C15, A15, F0, F1 } -#define MATRIX_COL_PINS { A10, A9, A8, B11, B10, B2, B1, B0, A7, A5, A4, A3, A2, A1, 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/sauce/mild/info.json b/keyboards/sauce/mild/info.json index 90b36d48f86e7b712c55da15dad350d55a9b2dd4..71179445ee76d9bd015d28ab397d3b19e67528e8 100644 --- a/keyboards/sauce/mild/info.json +++ b/keyboards/sauce/mild/info.json @@ -8,6 +8,11 @@ "pid": "0x7783", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "B6", "B5", "B4"], + "rows": ["C13", "C14", "C15", "A15", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6", "scroll_lock": "B14" diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h index 53a07a179c2bdf190684397399364ce5cb4df4ad..a20ec04bdb73b3912cb3f79b9c7bce6a92495d60 100644 --- a/keyboards/sawnsprojects/amber80/solder/config.h +++ b/keyboards/sawnsprojects/amber80/solder/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 { B1, B2, B3, B7, D0, D1, F1, F0, D7, B4, D5, D3 } -#define MATRIX_COL_PINS { F4, F6, F7, C7, C6, B6, B5, D6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB */ #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json index 1e9870fa906031cacf12f4e3f60508fba7ad3e70..3cd4c7c96d51d29d90d14987d5af3cec47dd3c7f 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -8,6 +8,11 @@ "pid": "0xA801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F7", "C7", "C6", "B6", "B5", "D6", "D4"], + "rows": ["B1", "B2", "B3", "B7", "D0", "D1", "F1", "F0", "D7", "B4", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F5", "scroll_lock": "B0", diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h index 76f4acfbf6fbef04a43ae57f8845181981e5000b..6a5ac54353e45e2a18993007b6aa1b4736bc1edb 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index a54172480db487bc0e1a374ea8fa6000aa0196ad..380fa706b019243903382c6796a705d8f7587291 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x6B32", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"], + "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F0", "on_state": 0 diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index 8a947093dc953af719c49bec3cf450c1061b9029..ef7cb2628932469a28895aa3d65db4b772535f22 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D4, F1, F0 } -#define MATRIX_COL_PINS { B7, B3, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D0, D5, D6, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Encoders */ #define ENCODERS_CW_KEY { { 12, 3 } } diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 3872047ef8b98049944ad40a50e094d9244224ca..94a091b0f82288380a4301d63aa88eacd102fdce 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5B31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D0", "D5", "D6", "D3"], + "rows": ["B1", "B2", "D4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D2"} diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index 76f4acfbf6fbef04a43ae57f8845181981e5000b..6a5ac54353e45e2a18993007b6aa1b4736bc1edb 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index 96661272996c2e6463bed5a88c722804a7239d09..cf337c55f50e90a900e2d5d1ae5e83b233f9c207 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x6B31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"], + "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "B3"} diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h index f0c527387d4d296ddc96c34b6a96df74d797c0af..a5f61e98e782aa8fee8d655b8c8882e849d5ac63 100644 --- a/keyboards/sawnsprojects/satxri6key/config.h +++ b/keyboards/sawnsprojects/satxri6key/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 { F7, F6 } -#define MATRIX_COL_PINS { F1, F4, F5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index 50c304dda2586e5d66eb4257b4353b5da02a1413..f2db2dedc46ec998cb3a9c6425c57b29b0267037 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -8,6 +8,11 @@ "pid": "0x0727", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5"], + "rows": ["F7", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h index bd4258f12ad5633b52e331361fa9d3e7b7de410e..5cb0b63ba9457344fbaeda98e425102830f1ac47 100644 --- a/keyboards/sawnsprojects/vcl65/solder/config.h +++ b/keyboards/sawnsprojects/vcl65/solder/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 } -#define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json index 1b0c638ecc2def5e75b9f670d5a5fffae7c9103f..617851ba00262afab524d53c28ec7c73535a806d 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x1727", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B5", "F5", "C7", "B4", "C6", "D7", "D6", "D4", "D5", "D3", "D2", "B6", "D1", "D0"], + "rows": ["F6", "F7", "F0", "F4", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F1", "on_state": 0 diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h index 564a2451fd4d31a2a67424dcc450c77bd84449c0..2021cca3b0fe0429b6411c358c0fe989c5bd5cb5 100644 --- a/keyboards/scatter42/config.h +++ b/keyboards/scatter42/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 { F4, F5, F6, F7, B1, B3 } - -/* 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/scatter42/info.json b/keyboards/scatter42/info.json index f928b4c24c977febab28ccb3703f4c73588cb09f..748093a516ec15581d054a421d05682346326b63 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/info.json @@ -8,6 +8,11 @@ "pid": "0x3B47", "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/sck/gtm/config.h b/keyboards/sck/gtm/config.h index f4961f224259d0b97aa48b04b3f55b22819894e5..a99fc7a3e8fc547c051f92ec26a3f26bcacb3840 100644 --- a/keyboards/sck/gtm/config.h +++ b/keyboards/sck/gtm/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C4, C5, D1 } -#define MATRIX_COL_PINS { B4, B5, B6, B7, C7, 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/sck/gtm/info.json b/keyboards/sck/gtm/info.json index 3f254f2c778f1ca3057240e3698863310e96b6cb..c3cc44cd64fee85df683749ceb286d4f35766676 100644 --- a/keyboards/sck/gtm/info.json +++ b/keyboards/sck/gtm/info.json @@ -8,6 +8,11 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B7", "C7", "D0"], + "rows": ["C4", "C5", "D1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3", "resolution": 1} diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h index f76b93ff6873024e78ecafcd7a3e11f284136a53..a3c400ab478887dd34666ffb90ac99c69b41d6a6 100644 --- a/keyboards/sck/m0116b/config.h +++ b/keyboards/sck/m0116b/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 { D1, F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { D5, D3, D2, D0, B3, B2, B1, B0, E6, B5, B6, C6, C7, F7, D4, D6, D7, 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/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json index 8588e9d6059095a31508c6cb845b62c5d1544b9f..8a2c4d109a4fac0015125727938b7f4f3f01e997 100644 --- a/keyboards/sck/m0116b/info.json +++ b/keyboards/sck/m0116b/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D0", "B3", "B2", "B1", "B0", "E6", "B5", "B6", "C6", "C7", "F7", "D4", "D6", "D7", "B4"], + "rows": ["D1", "F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 6] }, diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h index 21a4f0d60cee1520674519797d961a75544e5891..a3c400ab478887dd34666ffb90ac99c69b41d6a6 100644 --- a/keyboards/sck/neiso/config.h +++ b/keyboards/sck/neiso/config.h @@ -17,25 +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 } -#define MATRIX_COL_PINS \ - { B3, D2, F5, F7, 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/sck/neiso/info.json b/keyboards/sck/neiso/info.json index 3140669af584daf1c335bb3870a82ca6280b12c1..2f233b4066c39134ed4a5eb754c863db75fbee4a 100644 --- a/keyboards/sck/neiso/info.json +++ b/keyboards/sck/neiso/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "D2", "F5", "F7", "B4"], + "rows": ["F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index 801a7fdc16ead5b56cad5a96e19cfacbfc399194..b81c970db780d310d8e44d7f4ac5d10ec1ddbdf8 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/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, F1, F4, F5, F6, B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index c919d3b6e8d15f2a029381a3b29bbcdd2c49893e..547363e4141f3d5f4ae9bf5550f2e4e43f392146 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"], + "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C6", "num_lock": "C7", diff --git a/keyboards/sendyyeah/75pixels/config.h b/keyboards/sendyyeah/75pixels/config.h deleted file mode 100644 index 5f5bc38b34c80043f6c988fbab8c1f57d991649a..0000000000000000000000000000000000000000 --- a/keyboards/sendyyeah/75pixels/config.h +++ /dev/null @@ -1,27 +0,0 @@ - /* Copyright 2021 sendyyeah - * - * 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 { B6, F4, F5, F6, F7, B1, B3, B2, B4, B5 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json index 81ced955d6997e458e937a941e78e1f1c5d6b811..aeaf26da6c93e715169a76977d6f997726b00162 100644 --- a/keyboards/sendyyeah/75pixels/info.json +++ b/keyboards/sendyyeah/75pixels/info.json @@ -8,6 +8,11 @@ "pid": "0x3735", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"], + "rows": ["B6", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x15"], diff --git a/keyboards/sendyyeah/bevi/config.h b/keyboards/sendyyeah/bevi/config.h deleted file mode 100644 index 7ef151b3bdf2aaef8cffd07fffe2fdc543a38d57..0000000000000000000000000000000000000000 --- a/keyboards/sendyyeah/bevi/config.h +++ /dev/null @@ -1,27 +0,0 @@ - /* Copyright 2021 sendyyeah - * - * 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 { B3, B2, D3, D2, D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json index 355fe1f85098a043ae4d0cee5851127cc71e3fe1..b4a62656a244b81a208304a1a81b1f95789381d2 100644 --- a/keyboards/sendyyeah/bevi/info.json +++ b/keyboards/sendyyeah/bevi/info.json @@ -8,6 +8,11 @@ "pid": "0x4256", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B6", "B4", "B5"], + "rows": ["B3", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h index a5da1ed51e6df369c077c94ab829cbdeb363d438..5c4153e3d004dace9437527a6d369f03fa4bb9da 100644 --- a/keyboards/senselessclay/ck60/config.h +++ b/keyboards/senselessclay/ck60/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 } -#define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB matrix lighting */ #define RGB_DI_PIN B1 #define RGB_MATRIX_LED_COUNT 62 diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json index d089aa333c3e10c6782f911024b5807eb598cbcb..45e84f254ba254944a58f71c27c05936e302e5a9 100644 --- a/keyboards/senselessclay/ck60/info.json +++ b/keyboards/senselessclay/ck60/info.json @@ -8,6 +8,11 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B3", "B2", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h index 5aeeee7a744cad8f7895b8172c3a6717e203a384..2d2326fb40bf9b55d34c481545b78a84274b3273 100644 --- a/keyboards/senselessclay/ck65/config.h +++ b/keyboards/senselessclay/ck65/config.h @@ -17,25 +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) - * - */ -/* rev0 */ -#define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 } -#define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, 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/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json index cb596c21e28c4f3d3097c4abaf955e3eb6d399a8..7bc2839a9f1e308839f8c47688ddeef4bb9380d6 100644 --- a/keyboards/senselessclay/ck65/info.json +++ b/keyboards/senselessclay/ck65/info.json @@ -8,6 +8,11 @@ "pid": "0x0651", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B3", "B2", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h index 22dadfed74ebb7407f323bbbbb09edde45dd53d4..02d27c11e6a166fd2a06b83183f81a6c839611df 100644 --- a/keyboards/senselessclay/gos65/config.h +++ b/keyboards/senselessclay/gos65/config.h @@ -17,30 +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) - * - */ -/* rev0 */ -/* -#define MATRIX_ROW_PINS { B1, B2, F6, F5, F4 } -#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 } -*/ -/* rev1 */ -#define MATRIX_ROW_PINS { B1, B2, F1, F6, F5 } -#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, 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/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index b1007fe065b6e80978ab67595ab793fb4c6d6b0a..bdd73caed4b1de82732e575bf9c0002131c6ae0d 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -8,6 +8,11 @@ "pid": "0x0650", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B1", "B2", "F1", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h index 01d85c05171782dfde7279e7c116529ab2a8841d..bdeea958dc72f867d1ce62c6f8ee76ec27cab7be 100644 --- a/keyboards/senselessclay/had60/config.h +++ b/keyboards/senselessclay/had60/config.h @@ -17,28 +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) - * - */ -/* rev0 */ -//#define MATRIX_ROW_PINS { F0, D0, D4, F5, F4 } -//#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, F6, F7, C7, C6, B6, B5, B4, D7, D6 } -/* rev1 */ -#define MATRIX_ROW_PINS { F1, F0, F7, F6, F5 } -#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, 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/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json index a5a46d0cd5dd4a980122868202c6ddc3115f4706..f76a1355ee7dfe450d48338aa075bdc6e7db3502 100644 --- a/keyboards/senselessclay/had60/info.json +++ b/keyboards/senselessclay/had60/info.json @@ -8,6 +8,11 @@ "pid": "0x060F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F1", "F0", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index 0d96be0bafda43c19bfa908b5917951b8453abbe..fe49e0c52109e8cc058da1849b8fe9b702bb876a 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/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 { F5, F0, B5, D6, D4 } -#define MATRIX_COL_PINS { C7, D5, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 13 diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index 5b7af3fb0f3416271af96defe09195a4b748e040..a5db65d78b73dcf2f34c2d9e6b7e4e3376a47e93 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D5", "D1", "D0"], + "rows": ["F5", "F0", "B5", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h index 01ce1f2e65075956f1acc07d7a81291567570dc7..1fa22a6e9db1be3bd18c6af1972c99091d6898c2 100644 --- a/keyboards/sentraq/s60_x/default/config.h +++ b/keyboards/sentraq/s60_x/default/config.h @@ -1,19 +1,11 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json index ae5728a679e015991ae4edcd80a18f7a010a0595..78e8827c0080f3d2dac810548d78074cd94e1991 100644 --- a/keyboards/sentraq/s60_x/default/info.json +++ b/keyboards/sentraq/s60_x/default/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "S60-X", + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F1"], + "rows": ["B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index 2332b484e1522839f1e8b70e49e52c3f3bad5853..85f6271c32237c922a0c7b97b288ec6706cbff1b 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -1,19 +1,11 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json index 6420a8069a88278c385cf90692eeea4386c98c57..0c6aba4ac655786daedf70e9df51914b61659eb2 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "S60-X-RGB", + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], + "rows": ["B5", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 3b8323074f8a7f17fa63ed48615cbc559f4e661f..ea97d48f843bfe9639612e93ac164dd2cc35ba3e 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -1,10 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 } - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -22,9 +17,6 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20 -/* 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/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index 3d9f6d1f21b9b71ba6e32a8a059b10a794c19ef2..b19bffd207b44d80181963da8deb8010cb3a8dc7 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"], + "rows": ["C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index e8d1cb933da1a9e670f9198f998bb37d60e25785..c4678115db6686d8c93cf8cf7bdc0946cb381db8 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -1,10 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } -#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 } - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -23,9 +18,6 @@ #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20 #define RGBLIGHT_SLEEP -/* 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/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index a37852080cb2508e6563e917c9fe0937799f6c21..0ef809d1fe5c3c953a2055b015f1df485db837ae 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"], + "rows": ["C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h index bd71fdfc2ff0c54d7819d005c26a155084a0398c..b360e531a882d38b304197a2d19779c2c32dcc9a 100644 --- a/keyboards/sets3n/kk980/config.h +++ b/keyboards/sets3n/kk980/config.h @@ -16,25 +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) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B2, B3, D3, D4, D5, D6 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B1, B0, 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/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json index d4132bf736cf46b439bfcc363339c660fedbd072..470509657655cf99a8f22625a78aa485ba67274e 100644 --- a/keyboards/sets3n/kk980/info.json +++ b/keyboards/sets3n/kk980/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"], + "rows": ["B2", "B3", "D3", "D4", "D5", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h index 95acbd460015d04bb9fa8f59ca5bdacd643d68c8..db73ba34a9cfc88ab6f63719d205b63f1b3a3d25 100644 --- a/keyboards/shambles/config.h +++ b/keyboards/shambles/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F5, B3, B1, F7 } -#define MATRIX_COL_PINS { D3, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, F4, F6 } - -/* 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/shambles/info.json b/keyboards/shambles/info.json index a82614f0aecdd497f49a3730a42ea84c386c6aad..b57cdd3a00830232d77ddbdf5295fea41bab39d0 100644 --- a/keyboards/shambles/info.json +++ b/keyboards/shambles/info.json @@ -8,6 +8,11 @@ "pid": "0x0F42", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "F4", "F6"], + "rows": ["F5", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h index 981222dbe88d8c5c742a829fa67913127b79153a..514076daf84496910c7e89df864c07ea4d0b27e6 100644 --- a/keyboards/shapeshifter4060/config.h +++ b/keyboards/shapeshifter4060/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4 } - -/* 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 /* Locking resynchronize hack */ diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json index 7a23820e24ae8a676c2e63a36e217a590f2ae858..13c77a9618cef9dc946795257bbea9ad2b094c09 100644 --- a/keyboards/shapeshifter4060/info.json +++ b/keyboards/shapeshifter4060/info.json @@ -8,6 +8,11 @@ "pid": "0xA1F1", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D0", "D1", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h index 8e2a8a7974cc40dd68ea16fb7eaa99f03aa27ad5..e962d78666802b62b9b39e35ac00bea0047211b2 100644 --- a/keyboards/shiro/config.h +++ b/keyboards/shiro/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, B4 } -#define MATRIX_COL_PINS { F4, 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/shiro/info.json b/keyboards/shiro/info.json index a28a2fd905c9f700d3ea674084a31209b8aa5180..919cce0741a6df62ff8ee2bea21fe9d45140c4b5 100644 --- a/keyboards/shiro/info.json +++ b/keyboards/shiro/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h index 5079642e46783a3a1477f12989c9077936b52b04..deabfc9973647336d72024657f2fea4ba3f59a6c 100644 --- a/keyboards/shk9/config.h +++ b/keyboards/shk9/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B1, B2 } -#define MATRIX_COL_PINS { B3, 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/shk9/info.json b/keyboards/shk9/info.json index 444736778be7922c031e50377e8298d3045b1dba..fdb20b9a4d88ab67ab1a18a92a4eef8a855fb8cb 100644 --- a/keyboards/shk9/info.json +++ b/keyboards/shk9/info.json @@ -8,6 +8,11 @@ "pid": "0x4B39", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B4", "B5"], + "rows": ["B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/shoc/config.h b/keyboards/shoc/config.h index 8190ac773a6317f950058c035d309dbdb00403cb..beb5d63a40f4af2d0dc0a0ac339d5070483325a7 100644 --- a/keyboards/shoc/config.h +++ b/keyboards/shoc/config.h @@ -18,10 +18,3 @@ #define OLED_DISPLAY_128X64 #define OLED_TIMEOUT 300000 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B6, B2 } -#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json index d398e6795652d2c0b20dc9e87d60355e03b93ee7..8a4196375cbac8b67975b7b1fe4468d10ca45927 100644 --- a/keyboards/shoc/info.json +++ b/keyboards/shoc/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sidderskb/majbritt/rev1/config.h b/keyboards/sidderskb/majbritt/rev1/config.h deleted file mode 100644 index 9a8b654abf6b5db8eacd2fe969e3ffd38d707d84..0000000000000000000000000000000000000000 --- a/keyboards/sidderskb/majbritt/rev1/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2020 MechMerlin - -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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 } - -#define DIODE_DIRECTION COL2ROW - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json index 890bb5a5cbc21555611ae0e355b4588166455154..aad1ca1a1ef41e73d4d7f7291b807cce58094413 100644 --- a/keyboards/sidderskb/majbritt/rev1/info.json +++ b/keyboards/sidderskb/majbritt/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h index c0c6902e3b6f8cf33bd9412903e52be4f61f977a..ced239c83344efbdf0cd94f7b599ccce219ca6a4 100644 --- a/keyboards/sidderskb/majbritt/rev2/config.h +++ b/keyboards/sidderskb/majbritt/rev2/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 { B0, B1, F7, C6, B5} -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, C7, B6, D6, B4, D4, D7, 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/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json index 2ba227e4a8604e5bf7a1c086a544a903bb7a231b..574f8822473eed9989ab431c3bd8fe599fd5bd60 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "B1", "F7", "C6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B7"} diff --git a/keyboards/signum/3_0/config.h b/keyboards/signum/3_0/config.h deleted file mode 100644 index b554c93b851b39ea6817096d4cbe0975f8fe4fa3..0000000000000000000000000000000000000000 --- a/keyboards/signum/3_0/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 Stan Gurenkov - * - * 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 - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/signum/3_0/elitec/config.h b/keyboards/signum/3_0/elitec/config.h deleted file mode 100644 index 7373bfab66084ab5433d8221826a367729567ede..0000000000000000000000000000000000000000 --- a/keyboards/signum/3_0/elitec/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, D1, F5, B5 } -#define MATRIX_COL_PINS { B4, D7, D0, E6, D4, F6, F4, F7, B1, B3, C6, B2 } diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/info.json new file mode 100644 index 0000000000000000000000000000000000000000..84336ac59f43d822aefe10e5419eb484ae6a37df --- /dev/null +++ b/keyboards/signum/3_0/elitec/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"], + "rows": ["D2", "D1", "F5", "B5"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/signum/3_0/teensy/config.h b/keyboards/signum/3_0/teensy/config.h deleted file mode 100644 index 2a81c0f565d33efe54da58a79b6fc7f8abbf4b6f..0000000000000000000000000000000000000000 --- a/keyboards/signum/3_0/teensy/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Stan Gurenkov - * - * 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 */ -// clang-format off -#define MATRIX_ROW_PINS { B0, B3, F6, C7 } -#define MATRIX_COL_PINS { C6, D2, B7, D3, D0, F7, F5, B6, B5, B4, D1, D7 } -// clang-format on diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7eae11532366702f0b6278f7f442ca08db27142f --- /dev/null +++ b/keyboards/signum/3_0/teensy/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"], + "rows": ["B0", "B3", "F6", "C7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index 378fe0b2a6a35bd3e9c143e7de0db1e2f6ea4939..70f72f1d0001e754dd8a2ef2a07e9b5dd687497c 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/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 - #define MASTER_RIGHT #define RGB_DI_PIN D3 diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index 18d9889666f1730a703e5c7c6b1faedbf1a7cb26..3458bfe1f52ee54a8a023ac300547588e9173ba1 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "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/singa/config.h b/keyboards/singa/config.h index 3e9694ca3668b4cdc3cbaaf18226a1ec0c7ec5e8..75b78de22de15a20aa8caa03edb7f3fde8f8a086 100644 --- a/keyboards/singa/config.h +++ b/keyboards/singa/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 18 -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 } -#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/singa/info.json b/keyboards/singa/info.json index b41713f7098b07c627607f068dc95c4a13719828..4302010a1ed4f20745e4f9ca50be9d09695d9091 100644 --- a/keyboards/singa/info.json +++ b/keyboards/singa/info.json @@ -8,6 +8,11 @@ "pid": "0x7575", "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"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 5307bcd65abeadb7c2392ffaae77d0dd7e9fbd10..7af4feb36315cd4eede986119fa1c8b0340f9300 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index 39b296a67933ab715203ebe826a7918ea9f6a0a2..31aebd5e9005c8cf94f204cd69f90e78f2981521 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xB5E9", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 8, diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index 095b95d13c1ce1a88940d38511cb21cd3e1cfc80..698eecb6fca4ba06b4b81eab165ad9896950eb90 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index 32ed0e6f0e368c50013f67ca64081abe88e52b99..e7afa01ebaf0eedcb19d0a34c512b200a28e8a96 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0xB5E8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 8, diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h index 7814933e42308460a7f9985bdbfc1c6f164e230b..c8ed85b89e67825e05b276d91e0834d5f0116484 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/config.h +++ b/keyboards/skeletonkbd/skeletonnumpad/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, C6, C7, F7, F6 } -#define MATRIX_COL_PINS { D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN # define RGBLED_NUM 17 diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json index c637cbfffc161394b3cefac0ee8b406f0e21ba4c..82f7c4cee1b317fec41204780510eb8867ef8ef6 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/info.json +++ b/keyboards/skeletonkbd/skeletonnumpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6E70", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5"], + "rows": ["B6", "C6", "C7", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h index 9d5633e57490f1792b68a8de43fc0fb90da9e3e4..a463c64167ecad94eb9d754103615e6edb1f3b95 100644 --- a/keyboards/skergo/config.h +++ b/keyboards/skergo/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B4, B3, B2, B1 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7 } - -/* 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/skergo/info.json b/keyboards/skergo/info.json index 01572f630f6e39b12ecd3584251cd1b6c9811d4e..944516fecd363f291885bf2b645e35c72145b7f2 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/info.json @@ -8,6 +8,11 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"], + "rows": ["B0", "B4", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "layout_aliases": { diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h index 2f32ae1375f5615c8349a3b10f60a3b5ea2e0129..f8b5ae2db693c1b864cfa3e6fc9eb0e207c92847 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/config.h +++ b/keyboards/skippys_custom_pcs/rooboard65/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, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, 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/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json index 497b5a0e7fe896bee81c6d0782f84a30d0c5b524..dada0aec1f629d0e6c191c2e48b603be64eb9377 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h index 7c4946f423b5c510c10c92c5fc4099b6057ed478..e912cc50ea151f748b969cdb68110aeaf4687b00 100644 --- a/keyboards/skippys_custom_pcs/roopad/config.h +++ b/keyboards/skippys_custom_pcs/roopad/config.h @@ -17,25 +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) - * -*/ - -// Checked with Eagle Schematic -#define MATRIX_ROW_PINS { B5, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { F0, B4, D7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B6 #define RGBLED_NUM 21 #define RGBLIGHT_SLEEP diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json index 9b7c0797659bb181c484b0bbae8a35715df87b3e..e0110579f81e9167d9de17096ad482e997113c2e 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "B4", "D7", "D6", "D4"], + "rows": ["B5", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h index b55916fe15426c9408c3523d6162a85c76237d8a..e66e3202cc29f70cf82d6259bce0d00db2177fb2 100644 --- a/keyboards/slz40/config.h +++ b/keyboards/slz40/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, B2, B6 } -#define MATRIX_COL_PINS { F4, D2, F5, D1, F6, D0, F7, D4, B1, C6, E6, D7 } - -/* 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/slz40/info.json b/keyboards/slz40/info.json index dcbd0c73b297b66be4a06a1434a5f4f1d1422f0e..788fe1db95260456ac3984ca18fce6842129487d 100644 --- a/keyboards/slz40/info.json +++ b/keyboards/slz40/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D2", "F5", "D1", "F6", "D0", "F7", "D4", "B1", "C6", "E6", "D7"], + "rows": ["B4", "B5", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h index 570607c3ca677b05535b506aed1c949098e54294..4bee1c3663f1512a23498e40197c4b0a0a9b1740 100644 --- a/keyboards/smallkeyboard/config.h +++ b/keyboards/smallkeyboard/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) - * - */ -#define MATRIX_ROW_PINS {C7, C6 } -#define MATRIX_COL_PINS {F7, F6, F5} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json index 11a96f5af678d0817f127382b6b74846a6db731f..16c79cf6ad2d8b9da146981bdf05c169096c5f1c 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/info.json @@ -8,6 +8,11 @@ "pid": "0x736B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5"], + "rows": ["C7", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h index d8e7bc64d807ef7838246bc0d5bd6d63c9f59ba7..9749d68d72d0c231c07b3b718d39be20ff1ac3b9 100644 --- a/keyboards/smithrune/iron165r2/config.h +++ b/keyboards/smithrune/iron165r2/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { A3 , B8 , B9 , B1 , B0 , B5 , B4 , B3 , A15, A8 , A1 , A0 , C15, C14, C13} -#define MATRIX_ROW_PINS { B10, A10, A2 , A5 , A7 } - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json index ed24e0e63c90939780a2cf1714a53ecda3ae2191..35a2a0c4bd2cf461bbda6c0a39d8b45819249d19 100644 --- a/keyboards/smithrune/iron165r2/info.json +++ b/keyboards/smithrune/iron165r2/info.json @@ -8,6 +8,11 @@ "pid": "0x1652", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "B8", "B9", "B1", "B0", "B5", "B4", "B3", "A15", "A8", "A1", "A0", "C15", "C14", "C13"], + "rows": ["B10", "A10", "A2", "A5", "A7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A4" }, diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h index 92c28d57195ef14f86b094e793a2321a048467d8..7506922b008ea412d9534e24ee53899553b97bbf 100644 --- a/keyboards/smithrune/iron180/config.h +++ b/keyboards/smithrune/iron180/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 } -#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json index 0f8c436240d13cd43b854cfa2a8db05b4b09f9de..17febf6be574ae10ce345e68e877f285f53f1564 100644 --- a/keyboards/smithrune/iron180/info.json +++ b/keyboards/smithrune/iron180/info.json @@ -8,6 +8,11 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], + "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h index a4aa26d5d5a591a79973f7cdfe7e31205b0bc18b..622495f6d0c382fabe084a36d5aff8047beb3c98 100644 --- a/keyboards/smk60/config.h +++ b/keyboards/smk60/config.h @@ -4,12 +4,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, F0, F1, F5, B2 } -#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F6, F7, F4, B1, B3, D0, D1, D2, D3, D5} -#define DIODE_DIRECTION COL2ROW - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json index 9e356ef6c8e6017e1521b2d64c7d147bb959470c..bc32109a17c48b4f080d12347781611ce504c175 100644 --- a/keyboards/smk60/info.json +++ b/keyboards/smk60/info.json @@ -8,6 +8,11 @@ "pid": "0x6585", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "C6", "C7", "F6", "F7", "F4", "B1", "B3", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B0", "F0", "F1", "F5", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso"], diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h index 9c0f2de65b9b471a4b5f19924f336f44fee576ed..63349588ecafc7d81f53a4caf294ab7b4e3f048a 100644 --- a/keyboards/snampad/config.h +++ b/keyboards/snampad/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, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, D2, D3 } - -/* 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/snampad/info.json b/keyboards/snampad/info.json index a8f8997593e2f04026d6a465f37f1f3f624bf2bf..a8a9222d675d5b534e2773c813706d8c185084eb 100644 --- a/keyboards/snampad/info.json +++ b/keyboards/snampad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x4"], diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h index cae120ac7e5e8f967132e0727f9abfaa805948a8..31e6bd43c84f6940a7985f2c4e44fa09bf1efc0c 100644 --- a/keyboards/sneakbox/aliceclone/config.h +++ b/keyboards/sneakbox/aliceclone/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 } -#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, 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/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json index 6890765f7f92956238de8d9aa74f8cddc46e8ce4..fb2b7c56cd375f0233500c2e583a175e382d2e11 100644 --- a/keyboards/sneakbox/aliceclone/info.json +++ b/keyboards/sneakbox/aliceclone/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], + "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 1} diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h index 26bddb382a7a101484e2eddb3c2ed56a8374595a..6a7dcff5edfd60ef97e328803e86cd5b9281515a 100644 --- a/keyboards/sneakbox/aliceclonergb/config.h +++ b/keyboards/sneakbox/aliceclonergb/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 } -#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json index cb7226ae81be07a87dabc2a2ccc27c55926be518..a138d5d276bd06949174193717e8f0e8e1ce9021 100644 --- a/keyboards/sneakbox/aliceclonergb/info.json +++ b/keyboards/sneakbox/aliceclonergb/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], + "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 1} diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h index 23a01323059e4776000ddf5141aa4d6c79aa50bc..a936b135f90549d44d1c4d8896adf14ef871dbaa 100644 --- a/keyboards/sneakbox/ava/config.h +++ b/keyboards/sneakbox/ava/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, B7 } -#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index dae35f1dc61a7eba8d58dba53e79214a240b9da2..068806ca3346f3a6a61b646f37e767b7fd5811d6 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], + "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 1} diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h index 78b024604c63ca7509ff6ec6ec05018d0c40b862..f71cc2ebbb28898ed560d1d8cf1a1caf50770493 100644 --- a/keyboards/sneakbox/disarray/ortho/config.h +++ b/keyboards/sneakbox/disarray/ortho/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, B0} -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, 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/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json index 65c8ff41d1e145f1f89c204f903a6a7f94fca2a2..d832b56a730045c81b8624c57047ba91fcfa4ef8 100644 --- a/keyboards/sneakbox/disarray/ortho/info.json +++ b/keyboards/sneakbox/disarray/ortho/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["B7", "D0", "D1", "D2", "D3", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2", "resolution": 1} diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h index 486442bcf1f39694963c7076b977a5a373e41146..f71cc2ebbb28898ed560d1d8cf1a1caf50770493 100644 --- a/keyboards/sneakbox/disarray/staggered/config.h +++ b/keyboards/sneakbox/disarray/staggered/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3} -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, 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/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json index 1a788b77ec68002a6b56a1561c56e8e84a91af9f..a69447365aaa60830af9851f4f0646a3b2133c31 100644 --- a/keyboards/sneakbox/disarray/staggered/info.json +++ b/keyboards/sneakbox/disarray/staggered/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], + "rows": ["B7", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2", "resolution": 1} diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h index 95d332cf9525400eab96279693a60703887ec4d8..fdcd9d801bd08dc260fa6dee76e15e7fc4658be7 100644 --- a/keyboards/soda/cherish/config.h +++ b/keyboards/soda/cherish/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8} -#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 } -#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/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 713356f944ca037ccdd2f35baf05e7cf299c23e7..446fda090bf30265cfbcecbb5e95b116ec0bd953 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -8,6 +8,11 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h index 4b6ff7b4abd4b722203313c57d3d277e3260cca7..89571c505ff6b303f60c6dc8674e5b83a20375de 100644 --- a/keyboards/soda/pocket/config.h +++ b/keyboards/soda/pocket/config.h @@ -15,11 +15,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { A2, A1, B14, B4, B5, B6, B7} -#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 } -#define DIODE_DIRECTION ROW2COL - #define LED_NUM_LOCK_PIN B15 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json index b91f795b048cefebe598dbdc421ebc68a14f316f..96b5276f8015e6ca5f2c5649a119fbc1b4ccf095 100644 --- a/keyboards/soda/pocket/info.json +++ b/keyboards/soda/pocket/info.json @@ -8,6 +8,11 @@ "pid": "0x4F51", "device_version": "1.0.2" }, + "matrix_pins": { + "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h index c65caad1deb500f4945d8a2dea93917d11b25409..0f02ae7cfbe972596ebc5fc77b063f404838d33d 100755 --- a/keyboards/sofle/keyhive/config.h +++ b/keyboards/sofle/keyhive/config.h @@ -18,14 +18,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via. -#define MATRIX_ROW_PINS_RIGHT { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS_RIGHT { F6, F7, B1, B3, B2, B6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via. - -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 // OLED settings diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json index f1d76cb78895539847ecd135142daca91e304829..5bfc312cf2841a3a0dc6bb1325f328a78e09c757 100644 --- a/keyboards/sofle/keyhive/info.json +++ b/keyboards/sofle/keyhive/info.json @@ -6,6 +6,11 @@ "pid": "0x1287", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} @@ -19,6 +24,12 @@ {"pin_a": "F4", "pin_b": "F5", "resolution": 2} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null], + "rows": ["C6", "D7", "E6", "B4", "B5"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h index 34886b3be1c0e9a3cb0c2ed653529c7db3804b04..be64549748443f5506b87e6f594f5df6edb3bd89 100644 --- a/keyboards/sofle/rev1/config.h +++ b/keyboards/sofle/rev1/config.h @@ -1,10 +1,5 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 100 #define TAP_CODE_DELAY 10 diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json index 4a113ec2f2895792f54b22959ceb19ed8c6d2488..1f9829426e0c2b7b2ae086d5095d5025469b5b21 100644 --- a/keyboards/sofle/rev1/info.json +++ b/keyboards/sofle/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0287", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4", "resolution": 2} diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h index fd11a7d1a92b9ea95865a9f89683297f198041b5..f479b15794124ece576e1a5088119fb9fb1493bd 100644 --- a/keyboards/soup10/config.h +++ b/keyboards/soup10/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) - * - */ -// 0 1 2 3 -#define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, 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/soup10/info.json b/keyboards/soup10/info.json index e96e371d3e39df10e773eaed863bdb7e95fc5161..df601d401233d8a103674cdade2dbe286ccbd2cd 100644 --- a/keyboards/soup10/info.json +++ b/keyboards/soup10/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 1] }, diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h index 265cb24f07027ac6f20d7cfa0a4308a9ff2df3ce..5f01daec820da5fe423ab1ed12e199dbe244c3a6 100644 --- a/keyboards/sowbug/68keys/config.h +++ b/keyboards/sowbug/68keys/config.h @@ -18,14 +18,6 @@ #pragma once - -// key matrix pins -#define MATRIX_ROW_PINS { C14, C15, A0, A1, A2 } -#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10 } - -// COL2ROW or ROW2COL -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B9 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json index fef199e6cd1da6a5db011629005a5a085514a574..8da6bdc825bb5730b8132d076822ce37234b7576 100644 --- a/keyboards/sowbug/68keys/info.json +++ b/keyboards/sowbug/68keys/info.json @@ -8,6 +8,11 @@ "pid": "0x8888", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"], + "rows": ["C14", "C15", "A0", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h index 770a48b14df65d578dfdf39229d8b33e300a145b..7c520910bcb2e7237f3170afc263d46ab8b48b20 100644 --- a/keyboards/sowbug/ansi_tkl/config.h +++ b/keyboards/sowbug/ansi_tkl/config.h @@ -18,16 +18,6 @@ #pragma once - -// key matrix pins -#define MATRIX_ROW_PINS \ - { C14, C15, A0, A1, A2, A3 } -#define MATRIX_COL_PINS \ - { A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3 } - -// COL2ROW or ROW2COL -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B9 #define RGB_MATRIX_KEYPRESSES #define RGBLED_NUM 87 diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json index 30cef14f70185ceb95a7a6c936882d30c402be70..a1c19c60aa2bfce60a56283fbb1bd18460db0550 100644 --- a/keyboards/sowbug/ansi_tkl/info.json +++ b/keyboards/sowbug/ansi_tkl/info.json @@ -8,6 +8,11 @@ "pid": "0x8889", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"], + "rows": ["C14", "C15", "A0", "A1", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 19ca0d46e56b41df84f95b64dd72d29910506e7a..6e73672c8d1dd572e0fd26c9e19b618ecef96cfd 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -16,14 +16,6 @@ along with this program. If not, see .*/ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, B6, B7, C7 } - -/* 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/soy20/info.json b/keyboards/soy20/info.json index 4add710d13d465647697b04aebe78adefd255db0..069427beedaa520f8706ca81294c259f2c165df6 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/info.json @@ -8,6 +8,11 @@ "pid": "0x534F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "C7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4"], diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h index fb56b1ddda21a25dec1a94667bf706bde0efe368..8199836860b1574bd780e208d2e8d8c22671b011 100755 --- a/keyboards/spaceholdings/nebula12/config.h +++ b/keyboards/spaceholdings/nebula12/config.h @@ -24,13 +24,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -#define MATRIX_ROW_PINS { A8, C15, A0, A1 } -#define MATRIX_COL_PINS { A9, C13, C14 } -// To enable debugger set A13 A14 -> A5 A7 - -/* 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/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json index fac12196b1f89dbc33fa87a9a5dc4ed1472af98c..898a6ea11ec5e552b1bd5c961435f50c0d01387b 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/info.json @@ -8,6 +8,11 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "C13", "C14"], + "rows": ["A8", "C15", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h index 9c44c01b7aced9b9978d99f2a3501191ad384b49..0928d190df7dc27a2f23808d9b177e9383b9fa04 100755 --- a/keyboards/spaceholdings/nebula12b/config.h +++ b/keyboards/spaceholdings/nebula12b/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B7, B4, F7, F6 } -#define MATRIX_COL_PINS { F4, F5, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB options */ #define RGB_DI_PIN D5 diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json index 400e5790c980db1cbdc539fe61b75af7bb650365..8d5af9da505b44b12c32fb2b97e2c94752f951e5 100755 --- a/keyboards/spaceholdings/nebula12b/info.json +++ b/keyboards/spaceholdings/nebula12b/info.json @@ -8,6 +8,11 @@ "pid": "0x5332", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "D7"], + "rows": ["B7", "B4", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index 5e9d0a58e54d3147148093ebfd2f19e0c846ef99..a3b44e4afee9e858124c7dd230e3cbbbbac2e543 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 } -#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 } -// To enable debugger set A13 A14 -> A5 A7 - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json index 77bda023d3440b5b572d0219a06bbdf05113dbf5..9ee3469f0d510d901ade77e46232d9b26673ce4c 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/info.json @@ -8,6 +8,11 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"], + "rows": ["B3", "B4", "B5", "A8", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h index ee00fb233cc9d4752f873c8d678b97b5b9525e81..08ce4cb92d70d1b18244bb529d0f7b79b93381e7 100755 --- a/keyboards/spaceholdings/nebula68b/config.h +++ b/keyboards/spaceholdings/nebula68b/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D4, D6, D7, B4, E6 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB options */ #define RGB_DI_PIN B7 diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json index b1ca0f0fd08c6ab43bfc36d880b642a16500d48b..ef5d1b6b9c7ef935024eff5e493ea9d190ebfddb 100755 --- a/keyboards/spaceholdings/nebula68b/info.json +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -8,6 +8,11 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D4", "D6", "D7", "B4", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h deleted file mode 100644 index 5c72d34933e8d47a7d8739778f3e76d10fb26adc..0000000000000000000000000000000000000000 --- a/keyboards/spaceman/pancake/rev1/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 DIODE_DIRECTION COL2ROW diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h index ea6af6336d6ef3dfad32afaa32096e8b9d42d87d..9ff72156da900bc1ecc3894ad290f9f47332ed41 100644 --- a/keyboards/spaceman/pancake/rev1/feather/config.h +++ b/keyboards/spaceman/pancake/rev1/feather/config.h @@ -15,8 +15,4 @@ */ #pragma once -/* Pancake default pinout */ -#define MATRIX_ROW_PINS { B5, D7, C6, D0 } -#define MATRIX_COL_PINS { C7, D6, B7, B6, F0, D2, D3, F1, F4, F5, F6, F7 } - #define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/info.json new file mode 100644 index 0000000000000000000000000000000000000000..2d8072e7f186dec1f05c0583a7195d5d5aed6875 --- /dev/null +++ b/keyboards/spaceman/pancake/rev1/feather/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"], + "rows": ["B5", "D7", "C6", "D0"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/spaceman/pancake/rev1/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h deleted file mode 100644 index 3024db4d46ed17f2c2743b7913b8bf296c750715..0000000000000000000000000000000000000000 --- a/keyboards/spaceman/pancake/rev1/promicro/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 - -/* Pancake default pinout */ -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, E6, B4, B5, D7, C6, D4, D0, D1 } diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/info.json new file mode 100644 index 0000000000000000000000000000000000000000..47ab8fdcd0a3c4742bc70d9071b3f4e30dea0e3e --- /dev/null +++ b/keyboards/spaceman/pancake/rev1/promicro/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h deleted file mode 100644 index 294f9cc663eb8f6ef9f51ea7aa292f90ff0c5d66..0000000000000000000000000000000000000000 --- a/keyboards/spaceman/pancake/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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 DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { C7, C6, B6, B5 } -#define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 } diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json index 22da63e5f22581fc774f4ece161bf91e6aa7680b..49c12d20e06c88425f961541ee20734f1cd885a8 100644 --- a/keyboards/spaceman/pancake/rev2/info.json +++ b/keyboards/spaceman/pancake/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x5032", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["C7", "C6", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h deleted file mode 100644 index b8900721e42081074523bc7db348672250ec3b15..0000000000000000000000000000000000000000 --- a/keyboards/spaceman/yun65/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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 DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { E6, D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7, D5, B3 } - diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json index 1103a08c72063a8fca252f3ee33eba272df720ca..5ffd5772f6dff9cffab2a7ea8e719ceb7ab0623b 100644 --- a/keyboards/spaceman/yun65/info.json +++ b/keyboards/spaceman/yun65/info.json @@ -8,6 +8,11 @@ "pid": "0x594E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D5", "B3"], + "rows": ["E6", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h index 22fced8d29c6f3471165ffdf9b37f63e5efae5ea..b7ece10f6c7c9759071f5ee1c41520fab6a1a695 100644 --- a/keyboards/spacetime/config.h +++ b/keyboards/spacetime/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 { F4, F5, F6, F7, B1, B3, 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/spacetime/info.json b/keyboards/spacetime/info.json index b4c037caebe01568d0bec7ad73b8d6203683e7bf..c82bd6ecbb8d905efbd6a50bd295b4da57d32a52 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -8,6 +8,11 @@ "pid": "0x0A0C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h deleted file mode 100644 index 411f2c257895aa5739377a0dfdf2283a40270766..0000000000000000000000000000000000000000 --- a/keyboards/spacey/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2021 vanilla - -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, F6, F5, F4 } -#define MATRIX_COL_PINS { D5, B7, B5, B4, E6, D7, C7, B3, B2, B6, F0, F1, B1, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json index c24d46d753bd01360c048f0ee3c27279a130c580..881efb60d6bad7a597e9765d2e6596f6df181362 100644 --- a/keyboards/spacey/info.json +++ b/keyboards/spacey/info.json @@ -8,6 +8,11 @@ "pid": "0x2045", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "B7", "B5", "B4", "E6", "D7", "C7", "B3", "B2", "B6", "F0", "F1", "B1", "F7"], + "rows": ["D4", "C6", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/sparrow62/config.h b/keyboards/sparrow62/config.h index 45d0711d858ac5eda7163005ea8b89654909e77c..3f234d31cba6b4b9776414fb8771715881538a31 100644 --- a/keyboards/sparrow62/config.h +++ b/keyboards/sparrow62/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json index c3d8a099e547ac3ffd7658f84d43e718a07cd223..62e9d019c31be53df15d7a0a2bbc12ec8c8eefd0 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/info.json @@ -8,6 +8,11 @@ "pid": "0x7461", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h index a987f5782f114801df968d3c8f4b944b25bca3f0..490ac5e5c027530d5a344b5721cb8b24d2b68ae5 100644 --- a/keyboards/specskeys/config.h +++ b/keyboards/specskeys/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, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, 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/specskeys/info.json b/keyboards/specskeys/info.json index 8a4ff0d90b9eac8b569aca9b4d24c1ae232f478b..ab08aaef3da3073c8b4f4f51f25eee6166d674f1 100644 --- a/keyboards/specskeys/info.json +++ b/keyboards/specskeys/info.json @@ -8,6 +8,11 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 1 diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h index 7f7b41f58cda9a1a0d05da8e7b69d72e895f219d..f3fe3850d708b6b2c0b9f476b3ddec526fb3f06e 100644 --- a/keyboards/splitish/config.h +++ b/keyboards/splitish/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { F4 , F5 , F6 , F7 , B1 , B3 , C6 , D4 , D0 , D1 , D2 , D3 } -#define MATRIX_ROW_PINS { B4 , B5 , B2 , B6 } -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json index 067b20c8cff769028ab36e04e7abedf07a67720b..d973c34ebafef8d01631566f9129625027af7ddb 100644 --- a/keyboards/splitish/info.json +++ b/keyboards/splitish/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["B4", "B5", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 8ca0d50ea65a860aad6b97a38ff007edc853164f..dc83cf6b86b6734fa2ccdd46058787bfcc54971c 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once -// wiring -#define MATRIX_ROW_PINS \ - { B4, E6, D7, D4 } -#define MATRIX_COL_PINS \ - { B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 895f9283ac1ad27b68452534971b68613067b0e4..3a2b853eaccb901e4552b9711ef08692db6c79f2 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -4,6 +4,11 @@ "pid": "0x9D9D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B4", "E6", "D7", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B5"} diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 1799c6aa496910208fcceab70ae39d60f6f0b8ec..8b878739fe0dcc510aea32bce2fdf3e318533506 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -17,19 +17,6 @@ along with this program. If not, see . #pragma once -// wiring -#define MATRIX_ROW_PINS \ - { F6, F7, B1, B3 } -#define MATRIX_COL_PINS \ - { B2, B6, B5, B4, E6, D7, C6, D4 } -#define MATRIX_ROW_PINS_RIGHT \ - { D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT \ - { B4, B5, B6, B2, B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // Side detection // col 4 row 3 on right-hand-side #define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index d21d820804e05c22b8005d62ae59740477cc7a6e..c0aa1047c551cc1a8533395fb62258868765d850 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -4,6 +4,11 @@ "pid": "0x9D9D", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} @@ -16,6 +21,12 @@ {"pin_a": "F5", "pin_b": "F4"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6"] + } } }, "layouts": { diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h index 3056705bb2a044d15f398f7cd09f94c8bffa900a..e190122bc84791b15fb62d40320f2b543120e95a 100644 --- a/keyboards/splitty/config.h +++ b/keyboards/splitty/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { F0, F1, D4, D5, D6 } -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3, B4, B5, B6 } -#define DIODE_DIRECTION COL2ROW - /* Split Keyboard specific options. */ #define USE_I2C #define EE_HANDS diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json index bdcb13d044c8975347039a9f84538bd2f5aeed0d..a2983474bee6a308f7076c9b7312e6871672748b 100644 --- a/keyboards/splitty/info.json +++ b/keyboards/splitty/info.json @@ -8,6 +8,11 @@ "pid": "0x6052", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], + "rows": ["F0", "F1", "D4", "D5", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sporewoh/banime40/config.h b/keyboards/sporewoh/banime40/config.h index 5059ce5d4e9fa5fcacb946b64d61de06b2fef205..75882003aad947926eba3496e64a65e317f0ee00 100644 --- a/keyboards/sporewoh/banime40/config.h +++ b/keyboards/sporewoh/banime40/config.h @@ -17,13 +17,4 @@ along with this program. If not, see . #pragma once - -/* pin-out for PCB */ -#define MATRIX_ROW_PINS { E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define DYNAMIC_KEYMAP_LAYER_COUNT 10 diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index 71a30c5b32b3f2abac1f2ce1d35fdd083d31dcb1..726aef3e28c0ae42962b94d6bf13d48a30cc8bbd 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["E6", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x10"], diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h index e6162107051aa7f0fd39e8da749f16c26c0c916c..a9e98683c5e0ded0c0d6681932f9c9f4fec9e902 100644 --- a/keyboards/star75/config.h +++ b/keyboards/star75/config.h @@ -3,14 +3,6 @@ Copyright 2022 Horns Lyn (@hornslyn) SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, 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/star75/info.json b/keyboards/star75/info.json index 4bf206e4e58817ecae0f844095b04ba913bcdbaa..1f28a208193424e3f005c5e999c29bceccbf1f70 100644 --- a/keyboards/star75/info.json +++ b/keyboards/star75/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h index 4efc0635a17905b49768ed2bafa66923819eac9b..61ebee945d93f121db60a196ccb2938721a4166d 100644 --- a/keyboards/stello65/beta/config.h +++ b/keyboards/stello65/beta/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 { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { C7, B6, B5, B4, D7, D6, D4, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define ENCODERS_CW_KEY { { 4, 7 } } #define ENCODERS_CCW_KEY { { 4, 6 } } diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json index d4e73eba1d727daa38b2ea1d8424f449599b6699..e01f7399ebfffaece8d8831f8b438441d4d8be35 100644 --- a/keyboards/stello65/beta/info.json +++ b/keyboards/stello65/beta/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 2} diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h index d076264be94545be6f716e60b50e46b42e4297d7..6511724728f062ca0512556ee7621deae6cc14a3 100644 --- a/keyboards/stello65/hs_rev1/config.h +++ b/keyboards/stello65/hs_rev1/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 { F1, F0, D1, D2, B6, C6, C7, F7, F6, F5 } -#define MATRIX_COL_PINS { E6, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN # define RGBLED_NUM 4 diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json index 218f2657ad36cab8229b6138f4364e828b0984dd..17f48c644f4dff08118b81b941135baf18aa588f 100644 --- a/keyboards/stello65/hs_rev1/info.json +++ b/keyboards/stello65/hs_rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["F1", "F0", "D1", "D2", "B6", "C6", "C7", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h index de25e1504faf239feb93079e9c5b337edeb44d53..0247bae3a139d6e5a6bb1aca43ff52f71be33a19 100644 --- a/keyboards/stello65/sl_rev1/config.h +++ b/keyboards/stello65/sl_rev1/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 { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN # define RGBLED_NUM 4 diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json index 647afe2e9c8952e9c3e335cc945121edc458b119..6d36772839b9ffd7c49a823685c401f48145b368 100644 --- a/keyboards/stello65/sl_rev1/info.json +++ b/keyboards/stello65/sl_rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/config.h b/keyboards/stenokeyboards/the_uni/pro_micro/config.h index 860b809ef34e3cd9628dfb79adc30266f0fa26b2..bf5b37166ad7bbd2dd2420d631cb7aa5334c0f6c 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/config.h +++ b/keyboards/stenokeyboards/the_uni/pro_micro/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, B2, B6 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 } - -/* 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/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/info.json index e1dda21feba5e5034474db573570b122c8c66bc9..40dd660d0978a4842f5a606aa652dffcf082ef95 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json +++ b/keyboards/stenokeyboards/the_uni/pro_micro/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F4", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/config.h b/keyboards/stenokeyboards/the_uni/rp_2040/config.h index 46c8a81a84274fc626ef573810f3b4959c5f1baf..a2c060d424cf0e57b9e8d5e6595d06c029e3719d 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/config.h +++ b/keyboards/stenokeyboards/the_uni/rp_2040/config.h @@ -16,15 +16,10 @@ #pragma once -#define MATRIX_COL_PINS { GP24, GP23, GP21, GP20, GP19, GP6, GP5, GP4, GP3, GP2, GP1 } -#define MATRIX_ROW_PINS { GP25, GP18, GP17 } // #define DEBUG_MATRIX_SCAN_RATE #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET //#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/info.json index 642551468760827d763cab2929d489b4b611ff81..c48ad290f4bfb16524729c67ba308ad5d48419ea 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json +++ b/keyboards/stenokeyboards/the_uni/rp_2040/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["GP24", "GP23", "GP21", "GP20", "GP19", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP25", "GP18", "GP17"] + }, + "diode_direction": "COL2ROW", "processor": "RP2040", "bootloader": "rp2040" } diff --git a/keyboards/stenokeyboards/the_uni/usb_c/config.h b/keyboards/stenokeyboards/the_uni/usb_c/config.h index 94fa1c6b63bc084fe8385f35355692825b04a1f9..bf5b37166ad7bbd2dd2420d631cb7aa5334c0f6c 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/config.h +++ b/keyboards/stenokeyboards/the_uni/usb_c/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D6, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D5, D3, D2, D1, D0, D4 } - -/* 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/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/info.json index 14c0e6d7cb3fc893c18315e1ba99d6ba5637f321..ef761abe8a50d767821018776d6f9ab1d688c3da 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/info.json +++ b/keyboards/stenokeyboards/the_uni/usb_c/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "D5", "D3", "D2", "D1", "D0", "D4"], + "rows": ["B7", "D6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h index 6cec383ec992d77be25a855ee5b403084957044b..0f48233bf1749a8022949c388c9b63da05a8f855 100644 --- a/keyboards/stratos/config.h +++ b/keyboards/stratos/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB LEDs */ #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN D2 diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json index 2f278e18e7fdded63acf37410e52953c7759ae59..c7a490036ce386449f10d3b52f361dd035cbe4f6 100644 --- a/keyboards/stratos/info.json +++ b/keyboards/stratos/info.json @@ -8,6 +8,11 @@ "pid": "0x992D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h index 45c78b063f6ac887a4767ed9624aa9d2ec305b45..e17664611cbcd14b3b3ec7079a73b6f5a7ffb801 100644 --- a/keyboards/studiokestra/bourgeau/config.h +++ b/keyboards/studiokestra/bourgeau/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D4, D6, D7, D5, B1, F0 } -#define MATRIX_COL_PINS { E6, B0, D2, D1, D0, D3, B6, F1, F4, F5, F6, F7, C7, C6, B5, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLED_NUM 24 diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json index 0cde6da6847f3dbec6e24da983c3a1ab4107017a..6f19e91dd77f5a0387773ae8aeeba0ee5c4f4174 100644 --- a/keyboards/studiokestra/bourgeau/info.json +++ b/keyboards/studiokestra/bourgeau/info.json @@ -8,6 +8,11 @@ "pid": "0x7501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "D2", "D1", "D0", "D3", "B6", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4"], + "rows": ["D4", "D6", "D7", "D5", "B1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h index 1ef5926c8e8b74cdf1567ed35fdcb54b020fd665..d48b336fe73fd1df959cb0f1e354ab89b00b9a08 100644 --- a/keyboards/studiokestra/cascade/config.h +++ b/keyboards/studiokestra/cascade/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { F0, B1, D4, F4, F1 } -#define MATRIX_COL_PINS { E6, D5, D1, D0, F5, F6, F7, C7, C6, B6, B5, B4, D6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json index 096e20a27ba707da871833c67bd3bd4ee8b60697..1cda31cab74dc9884406c5e3d692492e67c65b8f 100644 --- a/keyboards/studiokestra/cascade/info.json +++ b/keyboards/studiokestra/cascade/info.json @@ -8,6 +8,11 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D5", "D1", "D0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D6", "D7"], + "rows": ["F0", "B1", "D4", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h index 7c5b4dbb2944c026fc6f621fd596b6202fcdf157..e95d41f6de5772a2c2dcc710ad59e9c13b6ba4fd 100644 --- a/keyboards/studiokestra/galatea/config.h +++ b/keyboards/studiokestra/galatea/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B2, D5 } -#define MATRIX_ROW_PINS { D1, D0, B0, B7, E6, B3, B6, C6, D6, D7, B4, D3 } -#define DIODE_DIRECTION COL2ROW - #if defined(KEYBOARD_studiokestra_galatea_rev2) #define RGB_DI_PIN D4 #define RGBLED_NUM 24 diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json index ce1b7f581602f99b2353053436967117f9f47b9b..e6a1899e550955dee5e2004871ab848854a68e2d 100644 --- a/keyboards/studiokestra/galatea/rev1/info.json +++ b/keyboards/studiokestra/galatea/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"], + "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B5", "scroll_lock": "D2", diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index dc3865c584a5a982f517ffa76b9678d62eaad461..ae1dee5aa06a6af835b8ef51f8d82c8573231ad3 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x8802", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"], + "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B5", "scroll_lock": "D2", diff --git a/keyboards/studiokestra/nascent/config.h b/keyboards/studiokestra/nascent/config.h index 5bb31afde592b4b54b9efee5a69cb6a417cf3231..f1b419a3e20753b051baf4dd0307175733f0eda3 100644 --- a/keyboards/studiokestra/nascent/config.h +++ b/keyboards/studiokestra/nascent/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { D2, D3, D7, D6, D4, D5, B0, E6 } -#define MATRIX_ROW_PINS { F5, F4, F7, F6, C6, C7, B4, B5, D0, D1 } -#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/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json index 43aba81924e8bb0e2a1bf06b6261950420655110..69d74f9fca4f48f38d68affa97a67ca6fc0cc4a3 100644 --- a/keyboards/studiokestra/nascent/info.json +++ b/keyboards/studiokestra/nascent/info.json @@ -8,6 +8,11 @@ "pid": "0x0165", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D7", "D6", "D4", "D5", "B0", "E6"], + "rows": ["F5", "F4", "F7", "F6", "C6", "C7", "B4", "B5", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h index 0165b7cef4e41f4315046a98168c51c4df51c28c..e2d4270dd62d31e3e3c405c5a0fb193f6462b752 100644 --- a/keyboards/studiokestra/nue/config.h +++ b/keyboards/studiokestra/nue/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { F0, F6, F7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 } -#define MATRIX_ROW_PINS { B0, B7, F1, F5, F4} -#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/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json index bff06e269d124fa0fc2288977862aedf0010b7ce..c4cbd11a7b0cac4e6ca734b592c892b10d2f86bd 100644 --- a/keyboards/studiokestra/nue/info.json +++ b/keyboards/studiokestra/nue/info.json @@ -8,6 +8,11 @@ "pid": "0x0701", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F6", "F7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B0", "B7", "F1", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/suavity/ehan/config.h b/keyboards/suavity/ehan/config.h index 6041beba7f42f9a573656f181e62d4e3aa834fa6..befff72ca8143a1e4ac27d56fcf0bc33f1afa10e 100644 --- a/keyboards/suavity/ehan/config.h +++ b/keyboards/suavity/ehan/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, C14, B7, B6, B5, B4, B3, A15, C13, B9, B8 } -// Matrix Column Pins: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 C16 -#define MATRIX_ROW_PINS { A7, B0, A3, A4, A5, A6 } -// Matrix Row Pins: R0 R1 R2 R3 R4 R5 -#define DIODE_DIRECTION COL2ROW -// Current flow out of the diodes are from rows to columns - /* 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/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json index 492165be2b7d72b26e5207db1d4ef19915199515..330809655ccd7d5f6900dfc13219fdfaee3180f3 100755 --- a/keyboards/suavity/ehan/info.json +++ b/keyboards/suavity/ehan/info.json @@ -8,6 +8,11 @@ "pid": "0x4548", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "C14", "B7", "B6", "B5", "B4", "B3", "A15", "C13", "B9", "B8"], + "rows": ["A7", "B0", "A3", "A4", "A5", "A6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B11", "scroll_lock": "F1" diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h index 058b582c361c76eadbda8778f29967c06f09541f..b0c6bce36a60e02f314485c9a77b8b82d6a76393 100644 --- a/keyboards/subatomic/config.h +++ b/keyboards/subatomic/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, C6, C5 } - // #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/subatomic/info.json b/keyboards/subatomic/info.json index 99af17a9b736de890fad3364cab3eedb77656d64..483d7689f1e028377600c07df3e58d43a132b73a 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/info.json @@ -8,6 +8,11 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "C6", "C5"], + "rows": ["D2", "D5", "B5", "B6", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/subrezon/la_nc/config.h b/keyboards/subrezon/la_nc/config.h deleted file mode 100644 index 7e45963ed7c6b4d488d5f80f1548288b58bced66..0000000000000000000000000000000000000000 --- a/keyboards/subrezon/la_nc/config.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2022 Daniel Osipishin (@subrezon) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -// key matrix -#define MATRIX_ROW_PINS {D3, F4, D2, B2, B5, B6} - -#define MATRIX_COL_PINS {B3, B1, F7, F6, F5, D4, C6, D7, E6, B4} - -#define DIODE_DIRECTION COL2ROW - -// uncomment to reduce firmware size -//#define NO_DEBUG -//#define NO_PRINT -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/info.json index b0a8eb7daabd605ff5e8e856fd416d0362dd676c..3d735868150f7f8dfd6bb88b2b1efb64e28fd300 100644 --- a/keyboards/subrezon/la_nc/info.json +++ b/keyboards/subrezon/la_nc/info.json @@ -6,6 +6,11 @@ "pid": "0x1A7C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "D4", "C6", "D7", "E6", "B4"], + "rows": ["D3", "F4", "D2", "B2", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h deleted file mode 100644 index 0bcd052fed10a106ec7a54b5ab737719e0e76f9e..0000000000000000000000000000000000000000 --- a/keyboards/superuser/ext/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 superuser - -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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { B2, B1, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json index 57d4ccbb18b28472153f089c438372379d095eef..990e210f024f80294435d559e0d83fd7e7e76d9c 100644 --- a/keyboards/superuser/ext/info.json +++ b/keyboards/superuser/ext/info.json @@ -8,6 +8,11 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h deleted file mode 100644 index 607133eaf8b4e799022af696eef12553d1dc2a4a..0000000000000000000000000000000000000000 --- a/keyboards/superuser/frl/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 superuser - -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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json index 14c7b1e54f3cb2a61a2add531f5d5f1ad04e9ff9..e4c752140e3c8ac9984b8e9cf4c8157d28742c5b 100644 --- a/keyboards/superuser/frl/info.json +++ b/keyboards/superuser/frl/info.json @@ -8,6 +8,11 @@ "pid": "0x4652", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h deleted file mode 100644 index 665276c79d5b0be70c5b444407901e53ee0f7266..0000000000000000000000000000000000000000 --- a/keyboards/superuser/tkl/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 superuser - -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 { B2, D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json index 6e94c7a28e83db5256925aede6e00e3f318c8516..1469c7c95a0fed671be049d33a5e3704f0571938 100644 --- a/keyboards/superuser/tkl/info.json +++ b/keyboards/superuser/tkl/info.json @@ -8,6 +8,11 @@ "pid": "0x544B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], + "rows": ["B2", "D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index f963856c97cc63d8a6f0284b1fa5232551a02579..66a3ef6740ed639a61712ab57fc1953793bac420 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/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 { C7, C6, B5 } -#define MATRIX_COL_PINS { B4, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index ea43a71b12b4e81ab16cec162c2aa5e49d03505f..96f523fb4b847803a8a72ce8be1c452d5ffa2aeb 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -8,6 +8,11 @@ "pid": "0xEB0C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "D2"], + "rows": ["C7", "C6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h index 598ac367b30e1973aeaecf2bc5f29cd837e5fa51..12b18b0cbae546098202fee64dcc349e16ba7635 100644 --- a/keyboards/switchplate/southpaw_65/config.h +++ b/keyboards/switchplate/southpaw_65/config.h @@ -21,22 +21,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -/* - * 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, ROW2COL */ -//#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C7 #define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h index 92247d7951c1afb0e475f8fd47615f817e86bc2c..8abadb95221c30b729f2d1bd75d5fd3feaf9113c 100644 --- a/keyboards/switchplate/southpaw_fullsize/config.h +++ b/keyboards/switchplate/southpaw_fullsize/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 { E1, C0, C1, C2, C3, C4 } -#define MATRIX_COL_PINS { A7, C7, C6, C5, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, E0, D7, 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/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json index 1b1cda7d2f678684cc2ad4894921764f20030aae..756ee8490684ba6390e80d3bdb35bf481efda1b6 100644 --- a/keyboards/switchplate/southpaw_fullsize/info.json +++ b/keyboards/switchplate/southpaw_fullsize/info.json @@ -8,6 +8,11 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A7", "C7", "C6", "C5", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "E0", "D7", "D6"], + "rows": ["E1", "C0", "C1", "C2", "C3", "C4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h index adb547468a6e8859f35f65bde7f342fbd28ac31d..ef90a43c6f2df6f275bf9a89a141f5b3d856522d 100644 --- a/keyboards/switchplate/switchplate910/config.h +++ b/keyboards/switchplate/switchplate910/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, F5, F6, F7, D1 } -#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, B3, B2, B0, 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/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/info.json index 58074710941192dad312f3ae8dc900843258de89..b324cc64159fff4a2d79f3f6e1b8e67e3e6d17a4 100644 --- a/keyboards/switchplate/switchplate910/info.json +++ b/keyboards/switchplate/switchplate910/info.json @@ -8,6 +8,11 @@ "pid": "0x2065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "B3", "B2", "B0", "B1"], + "rows": ["F4", "F5", "F6", "F7", "D1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h index f9b40cedee9b367e2a72e8730e868369ebc1ea46..9f86bdabd72a6520940331541dc3390290e97338 100644 --- a/keyboards/synapse/config.h +++ b/keyboards/synapse/config.h @@ -16,14 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { E6, B0, F4, F1 } -#define MATRIX_COL_PINS \ - { F0, D4, F5, B1, B2, B3, B7, D0, D1, D2, D3, B6 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json index ff629b48c552e19a2fd731f9b53a7bbdf89e6379..8f207c975b1a7167d62f76f7e60a623c8f6c1833 100644 --- a/keyboards/synapse/info.json +++ b/keyboards/synapse/info.json @@ -8,6 +8,11 @@ "pid": "0x5359", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"], + "rows": ["E6", "B0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D7", "pin_b": "D6"}, diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 886b5e2b7859f655d40b6f6858b0e7e53b33cd62..10b1036c729fa6963f1d2cf7b3bf6682f696a239 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -17,22 +17,6 @@ #pragma once - -/* - * Key matrix pins - * ROWS: AVR pins used for rows, top to bottom - * COLS: AVR pins used for columns, left to right - */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 } - -/* - * Diode Direction - * COL2ROW = COL => Anode (+), ROW => Cathode (-) - * ROW2COL = ROW => Anode (+), COL => Cathode (-) - */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DI_PIN E2 # define RGB_MATRIX_LED_COUNT 84 diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index e61caec07c604e7f673d54c88003718851bdb5bb..e6c8743541e71138e66c8ba28ff42359c018915f 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -7,6 +7,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h index e272a69ec9ee2f767390afbcb0bfd2dac5e1a0cb..79fdc4275fe9506af917eab83130de37226ac383 100644 --- a/keyboards/w1_at/config.h +++ b/keyboards/w1_at/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 { B7, A0, A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15, A8, A9, A10 } - -/* 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/w1_at/info.json b/keyboards/w1_at/info.json index a922e0f4c93e6aa945ca4f2a91c647bb0dd93772..0f7bdfb854748e38af79bbb0d7deaa36f4727976 100644 --- a/keyboards/w1_at/info.json +++ b/keyboards/w1_at/info.json @@ -8,6 +8,11 @@ "pid": "0x5754", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"], + "rows": ["A2", "B9", "B8", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "num_lock": "B3", diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h index 028b00de1000ead3bde2a685a4631e5cac1085a4..097b1818aed312d08083a7ac8b3e7d503ed429e3 100644 --- a/keyboards/waldo/config.h +++ b/keyboards/waldo/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { F7, D5, D3, D2, B3, B2, C7, C6, B6, B5, B4, D7, D6, D4, 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 /* Locking resynchronize hack */ diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json index 0c85e1d8d51f5bebca8fbcf1ae95dae6eaf99619..6ee9b4befd366b098466fd0bed7a35e6c88aa000 100644 --- a/keyboards/waldo/info.json +++ b/keyboards/waldo/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "D5", "D3", "D2", "B3", "B2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B1"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h index 61e2d421aebb6a731565692ea8346bb802fd4a75..9b9506927fa72c8b6103402fc8f9a0a0adcb78e3 100644 --- a/keyboards/walletburner/cajal/config.h +++ b/keyboards/walletburner/cajal/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D5, C7, C6 } -#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, B2, B3, D0, D1, D2, D3, B4, F6 } - -/* 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/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json index 7aa0563d4c52343d2feab65167a1c17ad49d34ef..bba30bebcd9f92b6494b7fb7f9cb18905a5a2456 100644 --- a/keyboards/walletburner/cajal/info.json +++ b/keyboards/walletburner/cajal/info.json @@ -8,6 +8,11 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"], + "rows": ["D4", "D5", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D7"} diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h index 84f34447308190834ffcf82541ccfb39ddb62483..905e59e17e4e4be1dab929f82593910716dc89c9 100644 --- a/keyboards/walletburner/neuron/config.h +++ b/keyboards/walletburner/neuron/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D3, F5 } -#define MATRIX_COL_PINS { F0, F7, F6, F4, F1, E6, D6, D2, B4, D7, B6, D5 } - -/* 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/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json index dd746f4c4b0d7120d0e72581ae45522b18322701..0b7ee467f6868ff28b1da6d78a37f401153ed45e 100644 --- a/keyboards/walletburner/neuron/info.json +++ b/keyboards/walletburner/neuron/info.json @@ -8,6 +8,11 @@ "pid": "0x6E75", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"], + "rows": ["D0", "D1", "D3", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h index 62f5ba6633c745798a3f2f718b4ea52256bc91b5..40d9a4b8da474f2c6f1f1db78d696a6b0c0e4dd0 100644 --- a/keyboards/waterfowl/config.h +++ b/keyboards/waterfowl/config.h @@ -16,13 +16,6 @@ #pragma once -// Wiring -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 } - -// COL2ROW, ROW2COL -#define DIODE_DIRECTION COL2ROW - #define OLED_DISPLAY_128X64 #define SPLIT_MODS_ENABLE #define SPLIT_WPM_ENABLE diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json index 17f01e24e2df1282bc5e8a9af6b62adf95eae8bd..0ee5b095b113403fcce755cb85b26027063c3765 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/info.json @@ -8,6 +8,11 @@ "pid": "0x9CE3", "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": "B4", "pin_b": "B5"}, diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h index 7c189d3ad1c828b5db8103ee416b862eabcc9971..91ce68b9386abc501259d0ba16ad99c7641c0a8a 100644 --- a/keyboards/wavtype/foundation/config.h +++ b/keyboards/wavtype/foundation/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 { B3, B2, B1, F0, F1 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, D2, D1, D0, D3, D5, D4, B7, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json index 36153f2bca16d2166a7fd54cc91eb82d1a9b05f5..3b770ae352acbd0c955cd24ce396fda4d016a2b6 100644 --- a/keyboards/wavtype/foundation/info.json +++ b/keyboards/wavtype/foundation/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B3", "B2", "B1", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 1] }, diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h index ad046b7fd199dfe7a6d4df3363b7c71e9d53a651..534b0f83dad69b03a03280cb1897c28fb59d51c1 100644 --- a/keyboards/wavtype/p01_ultra/config.h +++ b/keyboards/wavtype/p01_ultra/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, B5, B6, D4 } -#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN # define RGBLED_NUM 18 diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json index d88ac83836bb78d0725a3a91ff06552ad19bfcfe..1c27944c7698e03cf332d1d5a7827f59361a5026 100644 --- a/keyboards/wavtype/p01_ultra/info.json +++ b/keyboards/wavtype/p01_ultra/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B4", "D7", "D6", "B5", "B6", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h index f187c1b234c9eeed791adfa508f8a7caea58a56f..fd3f070d3538f43d70248f3bf1023437517356a1 100644 --- a/keyboards/weirdo/geminate60/config.h +++ b/keyboards/weirdo/geminate60/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} -#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN A6 #define RGBLED_NUM 1 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json index 890a01786722f28ab0644627af696dabb1f32afe..76de73c51e2b49da7552122e39cbc51aeb010921 100644 --- a/keyboards/weirdo/geminate60/info.json +++ b/keyboards/weirdo/geminate60/info.json @@ -8,6 +8,11 @@ "pid": "0x676D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], + "rows": ["A9", "A10", "B10", "B11", "B15"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h index 92fa599442c7a6ea2be446b2963b40dca06a0135..e3e65a074bd283b766b474139666d67ea2ee689b 100644 --- a/keyboards/weirdo/kelowna/rgb64/config.h +++ b/keyboards/weirdo/kelowna/rgb64/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { A3, A4, A5, A7, B0, B1, B10, B15, A8, A9, A10, B7, B6, B5, B4} -#define MATRIX_ROW_PINS { B12, B13, B14, C11, A1} -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN A6 #define RGBLED_NUM 64 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json index 934da67ee451cefa310cbd2899585cc1a2e17f81..ff6b6b0f85e7905efea53ad138a59c92b419a4d1 100644 --- a/keyboards/weirdo/kelowna/rgb64/info.json +++ b/keyboards/weirdo/kelowna/rgb64/info.json @@ -8,6 +8,11 @@ "pid": "0x4C64", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"], + "rows": ["B12", "B13", "B14", "C11", "A1"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h index 46340f783376637244c6a7d2408f647baae08918..93b7d5c69e8e85fc35b7fdb02124fe4ff3283638 100644 --- a/keyboards/weirdo/ls_60/config.h +++ b/keyboards/weirdo/ls_60/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} -#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN A6 #define RGBLED_NUM 1 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json index 906a993884226e6709e3c65fb81708969d5a944a..a9247037fc4522794181858d7f0a36356d87f049 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/info.json @@ -8,6 +8,11 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], + "rows": ["A9", "A10", "B10", "B11", "B15"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h index 8fa16298e2707f932eda6af9ffc28fa75bea5ab2..2b4073cbd68bc477e1fe6d6f4a28f43f09e16a2f 100644 --- a/keyboards/weirdo/naiping/np64/config.h +++ b/keyboards/weirdo/naiping/np64/config.h @@ -15,10 +15,6 @@ */ #pragma once -#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 } -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B1 #define RGBLED_NUM 80 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json index c188d4bb11f38c3501335c3ced50f2177cf8367a..0c1bf74f3cdfa12f2dcef5f1463b0244f8d18114 100644 --- a/keyboards/weirdo/naiping/np64/info.json +++ b/keyboards/weirdo/naiping/np64/info.json @@ -8,6 +8,11 @@ "pid": "0x7064", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h index 43b8d1c32e8bffad518e4c1298aaeec42c9a99e1..683ba29edc5cd5c3088fece78eda90dad0f283c3 100644 --- a/keyboards/weirdo/naiping/nphhkb/config.h +++ b/keyboards/weirdo/naiping/nphhkb/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { A4, C15, C14, A5, A6, A15, B1, B10, B12, B13, B14, B15, B6, A8, B5} -#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4} -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN A7 #define RGBLED_NUM 78 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json index b1b1c1f23d7df76d366750bc71ad4d01cb1762ef..c0df6fb453f9554b842be84259f8034c519d53e0 100644 --- a/keyboards/weirdo/naiping/nphhkb/info.json +++ b/keyboards/weirdo/naiping/nphhkb/info.json @@ -8,6 +8,11 @@ "pid": "0x7068", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"], + "rows": ["B7", "B8", "B9", "C13", "B4"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h index 265ae2e2074f28555ba309d9b550ab1cf799dfeb..fd2dcbdde196f756a1d5d4ab9d701c35372ef21c 100644 --- a/keyboards/weirdo/naiping/npminila/config.h +++ b/keyboards/weirdo/naiping/npminila/config.h @@ -15,10 +15,6 @@ */ #pragma once -#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 } -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN D1 #define RGBLED_NUM 82 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json index 9904ca28fcaaf2e29414db8ba1588cf7e96f8103..7c489e378c4f812a8e0a5c106785895d09fcf4dd 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/info.json @@ -8,6 +8,11 @@ "pid": "0x706D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h index 34f2b70605f1fccd827e8a39baa48b801d872afc..e484ffe49eddb1e641a99344613af46fb160069d 100644 --- a/keyboards/weirdo/tiger910/config.h +++ b/keyboards/weirdo/tiger910/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 } - -/* 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/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json index 9634cc6f9af519350b94bd33d70b6ff674b166cb..d09e61840873e10460fefb18efdd7778d8334a02 100644 --- a/keyboards/weirdo/tiger910/info.json +++ b/keyboards/weirdo/tiger910/info.json @@ -8,6 +8,11 @@ "pid": "0x5447", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "D2", "D3", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h index e43421638eb592cc5c98efd57d56be6b31eb3c29..c86ead57bd89650d41e9d9bbfd940aeb5bd03b0e 100644 --- a/keyboards/wekey/polaris/config.h +++ b/keyboards/wekey/polaris/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, F1, F0, B7, F7, D5, C6, C7, F5, F6 } -#define MATRIX_COL_PINS { E6, B4, B5, B6, 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/wekey/polaris/info.json b/keyboards/wekey/polaris/info.json index ad7477b5fc4ff470ae488260f61296565ff944fc..11a7ca9b9da242676b55f96014583864142af3a0 100644 --- a/keyboards/wekey/polaris/info.json +++ b/keyboards/wekey/polaris/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"], + "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h index c720fc2103d1def8a918b100eaf6cca6ea42b8d2..86f2ffb3ee427396a87cd806703df871702e1ae8 100644 --- a/keyboards/wekey/we27/config.h +++ b/keyboards/wekey/we27/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, D7, B4, B5, B6, F6 } -#define MATRIX_COL_PINS { F4, F5, C7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE // The pin connected to the data pin of the LEDs #define RGB_DI_PIN C6 diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json index 0a114ad5487deb0a5399b0cdfb6f258193ea958b..736b7f5d70b01b957ca2b31e06cfd211708acae1 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "C7", "D6", "D4"], + "rows": ["F1", "D7", "B4", "B5", "B6", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 2} diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index 70f820c25ef97cb6862ccd28b8b291f02bff3335..c1e79e76991e32c126e81b7692905d78bf3033dd 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/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 {B4,D7,D6,D4,B3} -#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json index 4c3e9bf058efb4e9b1c3f09b6264b2a2e98c082e..a2b5f6b49cd425dd3b13754620166546025a95d9 100644 --- a/keyboards/westfoxtrot/aanzee/info.json +++ b/keyboards/westfoxtrot/aanzee/info.json @@ -8,6 +8,11 @@ "pid": "0xAA01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"], + "rows": ["B4", "D7", "D6", "D4", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h index 9e3dfc491167000f2212eaf869ed5cfe27514428..d1de752f793881bdb553eeff790fecfe57fb2969 100644 --- a/keyboards/westfoxtrot/cyclops/config.h +++ b/keyboards/westfoxtrot/cyclops/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 { D1, D0, D7, B4, F0 } -#define MATRIX_COL_PINS { D3, D2, D5, D6, B6, B1, B2, B3, C6, C7, F7, F6, F4, F5, F1 } - -/* 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/westfoxtrot/cyclops/info.json b/keyboards/westfoxtrot/cyclops/info.json index 7af7031374ae56ef95e044f5557eb03da213c412..419a53588bfe78a17a96af23b0f346d78bea992f 100644 --- a/keyboards/westfoxtrot/cyclops/info.json +++ b/keyboards/westfoxtrot/cyclops/info.json @@ -8,6 +8,11 @@ "pid": "0x0A66", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D5", "D6", "B6", "B1", "B2", "B3", "C6", "C7", "F7", "F6", "F4", "F5", "F1"], + "rows": ["D1", "D0", "D7", "B4", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h index a6e5ac891ffd79b29e3d5b7eb5f7078e9de1ec67..cd1f84bc1fce15b3c48d029e6c921af7b3f2be59 100644 --- a/keyboards/westfoxtrot/cypher/rev1/config.h +++ b/keyboards/westfoxtrot/cypher/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 { B0, B1, B2, B3, B4, F6, B6, B7, C6, C7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, E6, 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/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json index 50894868664851817e6c6e5b8c769aff5d267194..217d979c419e51afbd027fd6cb7d75698712af22 100644 --- a/keyboards/westfoxtrot/cypher/rev1/info.json +++ b/keyboards/westfoxtrot/cypher/rev1/info.json @@ -6,6 +6,11 @@ "pid": "0xAA97", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "levels": 5, diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h index 61604a74a9819cf36b765bb4f34e6d08e635f2f4..050bb413f79725602f30a4f93f911003cddb8c84 100644 --- a/keyboards/westfoxtrot/cypher/rev5/config.h +++ b/keyboards/westfoxtrot/cypher/rev5/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 { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 } - -/* 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/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json index 17bc326890c7a84aee5179649cebd396eafc252f..3725b4e3c9d2e1a16996d9647ac20ea64978465e 100644 --- a/keyboards/westfoxtrot/cypher/rev5/info.json +++ b/keyboards/westfoxtrot/cypher/rev5/info.json @@ -6,6 +6,11 @@ "pid": "0xAA98", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"], + "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D0", "levels": 5, diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h index 3206c0e56d4f7eea887d025361e07488b9c3a0d3..d7d992f50ec68a901d0830b5485fb09b3e2368bf 100644 --- a/keyboards/westfoxtrot/prophet/config.h +++ b/keyboards/westfoxtrot/prophet/config.h @@ -1,15 +1,5 @@ #pragma once - -/* - * Keyboard Matrix Assignments -*/ -#define MATRIX_ROW_PINS { C13, B2, B1, A4, A3 } -#define MATRIX_COL_PINS { A6, A7, B0, A9, A8, A14, A15, B3, B4, B5, B8, B7, B6, B9 } - -/* 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/westfoxtrot/prophet/info.json b/keyboards/westfoxtrot/prophet/info.json index ee65ab26014dd1ed2851f643dc944da9e490f74f..94be2e52dbfc0773b5968a3744bbf21276f06199 100644 --- a/keyboards/westfoxtrot/prophet/info.json +++ b/keyboards/westfoxtrot/prophet/info.json @@ -8,6 +8,11 @@ "pid": "0xAA03", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "A9", "A8", "A14", "A15", "B3", "B4", "B5", "B8", "B7", "B6", "B9"], + "rows": ["C13", "B2", "B1", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h index 68ad7707870c33e981fd673631e7873d0403ad82..9a425a91a89efd4608816e22f9a0bc1b693fe081 100644 --- a/keyboards/westm/westm68/config.h +++ b/keyboards/westm/westm68/config.h @@ -20,10 +20,6 @@ /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 } -#define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 } -#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/westm/westm68/info.json b/keyboards/westm/westm68/info.json index 8ff4f8d8ce98d731de92adf281f2f5b4b8b4ec58..46138869fcad72f6c58392d212795867b8795802 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -7,6 +7,11 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["A13", "B9", "F1", "A10", "A9"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h index 51efda06a6312f52f3cf753dd7e53802b7221f0c..9a425a91a89efd4608816e22f9a0bc1b693fe081 100644 --- a/keyboards/westm/westm9/config.h +++ b/keyboards/westm/westm9/config.h @@ -20,10 +20,6 @@ /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define MATRIX_ROW_PINS { A14, A15, B3 } -#define MATRIX_COL_PINS { B8, B5, B4 } -#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/westm/westm9/info.json b/keyboards/westm/westm9/info.json index c9ec1e17d7fe6b3184d1e328b81c0bd6817f6239..ed0b994805fd13a0ec0e10743981deb335156067 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -7,6 +7,11 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B8", "B5", "B4"], + "rows": ["A14", "A15", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h index fd10220d9f8590774f37c7df9f61da5e4f46ebd7..7b6f2e21208667bdda0b9aed8832532bbcbf6b25 100644 --- a/keyboards/westm/westmergo/config.h +++ b/keyboards/westm/westmergo/config.h @@ -16,10 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 } -#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 } -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json index a50da579e35ad2803605a107b0036437ce3145b5..edfc012c28d13ee66f552ab60b35bbaf02297308 100644 --- a/keyboards/westm/westmergo/info.json +++ b/keyboards/westm/westmergo/info.json @@ -8,6 +8,11 @@ "pid": "0x0201", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["A13", "B9", "F1", "A10", "A9"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/whale/sk/v3/config.h b/keyboards/whale/sk/v3/config.h deleted file mode 100644 index c473b10dc88553fb1d85db94982e4bbeed687d2d..0000000000000000000000000000000000000000 --- a/keyboards/whale/sk/v3/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Whale Mo - -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 { B1, B2, B3, B4, B5, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, F4, F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json index 0ab3b6c0a21c4f584ee6a589ed71cae0f3159762..78967cd6e905cfe9b916e650acf1407213c26034 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/info.json @@ -8,6 +8,11 @@ "pid": "0x0495", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"], + "rows": ["B1", "B2", "B3", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "debounce": 3, diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h index 6f8d6f9b8be34761ce022fbede9e47a907e1fcaf..d34fd6468c060bb2a727659abce55bccb9a43cad 100644 --- a/keyboards/wilba_tech/rama_works_kara/config.h +++ b/keyboards/wilba_tech/rama_works_kara/config.h @@ -15,18 +15,10 @@ */ #pragma once - -// M60-A PCB default pin-out -#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } - // IS31FL3731 driver #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 72 -// 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/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json index 18bba59fe59b736ecc8ba4bdff523106eb2abfc5..3dd9ad22c265a5902d0b2d7f1c5c7f8844e9fc58 100644 --- a/keyboards/wilba_tech/rama_works_kara/info.json +++ b/keyboards/wilba_tech/rama_works_kara/info.json @@ -8,6 +8,11 @@ "pid": "0x4B52", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h index c0b005d443bdbb4be0b98bfbbda9d970cf38245b..c3bb43ec6d43372ae755fe03d47290465719861c 100644 --- a/keyboards/wilba_tech/rama_works_koyu/config.h +++ b/keyboards/wilba_tech/rama_works_koyu/config.h @@ -15,18 +15,10 @@ */ #pragma once - -// KOYU PCB pin-out -#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } - // IS31FL3731 driver #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 72 -// 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/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json index 190638c00165451d612175e84f2a0bfa7619a1b0..55a180af636be5ef29df7ce2640a4b0d2779fda4 100644 --- a/keyboards/wilba_tech/rama_works_koyu/info.json +++ b/keyboards/wilba_tech/rama_works_koyu/info.json @@ -8,6 +8,11 @@ "pid": "0x4B59", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h index be92b36639e23c1055f3ea00d1ad9d30bc11cd3c..00ecf5f18620be0393c06456f18be54d5335cada 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/config.h +++ b/keyboards/wilba_tech/rama_works_m10_b/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 } -#define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, 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/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json index 4b7c87be21aca30c0f86fee434f81aa2ad6e412f..01337765867f2a7bc931119b38a49cade819d3cb 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/info.json +++ b/keyboards/wilba_tech/rama_works_m10_b/info.json @@ -8,6 +8,11 @@ "pid": "0x00AB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], + "rows": ["E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6" }, diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h index 9f68eb4287a4e9963f9b98cd4d5e0ebba3655677..1cc9655b1be849771902ebfce1bcbb5b8a179f67 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/config.h +++ b/keyboards/wilba_tech/rama_works_m10_c/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 { E6 } -#define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, 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/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json index b60dd538154bd02affe026c07a6941f9cf7fb15d..6b6bd3d61be5711459701eafc7f9285067ab6aa6 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/info.json +++ b/keyboards/wilba_tech/rama_works_m10_c/info.json @@ -8,6 +8,11 @@ "pid": "0x00AC", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], + "rows": ["E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h index 79a1614268dc114993848c8e308976905617e3ea..ab04ab070bf93d1250af75190a9e0e0112aed9b7 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/config.h +++ b/keyboards/wilba_tech/rama_works_m50_a/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 { F0, F1, F5, F6 } -#define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, 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/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json index a53a960f0a055638f5f299ed568d8a401258ecbd..e26b56dd2fda79e21e5526ba913806be72381f51 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/info.json +++ b/keyboards/wilba_tech/rama_works_m50_a/info.json @@ -8,6 +8,11 @@ "pid": "0x050A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], + "rows": ["F0", "F1", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m50_ax/config.h b/keyboards/wilba_tech/rama_works_m50_ax/config.h index add6c1c779741e87176e55129ff661b5c72d56c7..9b6b3c7955831214852e4e29cf62ef1ce1e82ee0 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/config.h +++ b/keyboards/wilba_tech/rama_works_m50_ax/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 { F0, F1, F5, F6 } -#define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, 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/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/info.json index 2fc265fec9a63b40809f38b9c7fc9093122fb565..fc296c2754912fbaf68efefff2a6bd8bfd12b9a2 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/info.json +++ b/keyboards/wilba_tech/rama_works_m50_ax/info.json @@ -8,6 +8,11 @@ "pid": "0x150A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], + "rows": ["F0", "F1", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h index acc21edc28686188a075dc342d760123c0a97aed..c80a0184967500696133ee0c66a082c89d3005ad 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/config.h +++ b/keyboards/wilba_tech/rama_works_m60_a/config.h @@ -15,18 +15,10 @@ */ #pragma once - -// M60-A PCB default pin-out -#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } - // IS31FL3731 driver #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 72 -// 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/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json index d76b1789476dd400a92333a06587fafbf14f39ee..8ba17a5df2045ef179b84929c2d331cf6c774f37 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/info.json +++ b/keyboards/wilba_tech/rama_works_m60_a/info.json @@ -8,6 +8,11 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h index 5b745b109d50b2df14ed4e924db078211c6a94b1..6d3f0fb97fad66d4bb3a922871ec75fd0b9721b8 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/config.h +++ b/keyboards/wilba_tech/rama_works_m65_b/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, 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/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json index 55f9f05536dabae3b801f67f65868cc25fef7a6a..a8ca36bf16b84a4b1fa6a4823416b651a38b0182 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/info.json +++ b/keyboards/wilba_tech/rama_works_m65_b/info.json @@ -8,6 +8,11 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h index eb2b08304aef3c6ede7e05aedb27bfc8d6d67f4e..e367a7fc76bf48291c51730aacba5cde6019c1e5 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/config.h +++ b/keyboards/wilba_tech/rama_works_m65_bx/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, 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/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json index ca5bf2b21e14656831d510e5a3f1f594ba67b72a..1e4af340dbdcd59d63555834d1d27ce51fa0dfb2 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/info.json +++ b/keyboards/wilba_tech/rama_works_m65_bx/info.json @@ -8,6 +8,11 @@ "pid": "0x165B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m6_a/config.h b/keyboards/wilba_tech/rama_works_m6_a/config.h index 9937b3f5beda4bffcd55aba0d3ad2c6ef4c15409..6a19f1e7e9fbc923d63673476b50e157f7c2eb9b 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/config.h +++ b/keyboards/wilba_tech/rama_works_m6_a/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 { E6 } -#define MATRIX_COL_PINS { D4, B5, F4, D7, C6, 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/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json index 67912b6ce0cdee894f0e8a8ca5fec25a76f61100..5158e7e06fffe5bdb2b95a11c257d5668ec373f9 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/info.json +++ b/keyboards/wilba_tech/rama_works_m6_a/info.json @@ -8,6 +8,11 @@ "pid": "0x006A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], + "rows": ["E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m6_b/config.h b/keyboards/wilba_tech/rama_works_m6_b/config.h index 6b6b405cd0f487c196150eeeb7099e6f2351cae4..a117bcc2a84e0a49a913c1c828d30447f8e0c459 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/config.h +++ b/keyboards/wilba_tech/rama_works_m6_b/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 { E6 } -#define MATRIX_COL_PINS { D4, B5, F4, D7, C6, 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/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json index 96fc84b00276242825dac0aac080fb0aa904a52d..3a3b32d1df1b696afadc87001a0ee0bb21a03654 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/info.json +++ b/keyboards/wilba_tech/rama_works_m6_b/info.json @@ -8,6 +8,11 @@ "pid": "0x006B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], + "rows": ["E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h index 8a94e15b470551e1b93266a834046a08ffdae2ca..cb2d88bd472348a3e3492451b42b7b1e5612b698 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/config.h +++ b/keyboards/wilba_tech/rama_works_u80_a/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 } - -/* 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/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json index 27a5fe7148f69b75a3bfe41bcfc5e79997bd72ac..2ee00ae161f28b15d1e04f17a0877d8a7e6d1403 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/info.json +++ b/keyboards/wilba_tech/rama_works_u80_a/info.json @@ -8,6 +8,11 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h index 0179cfaa644c17daf1e93ea305433d7b2bdf1f95..488eeade83c55cb8616287a7e83db4fedb1f298e 100644 --- a/keyboards/wilba_tech/wt60_a/config.h +++ b/keyboards/wilba_tech/wt60_a/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 { F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } - -/* 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/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json index 85b1e2e6a1cbcf3845f725d4058601836e341761..e429b635de54b1f5eaf2b77bc9b4af42d4016a7c 100644 --- a/keyboards/wilba_tech/wt60_a/info.json +++ b/keyboards/wilba_tech/wt60_a/info.json @@ -8,6 +8,11 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h index 887e11c81fc5c5fe00b09c361c5eabe0d790eeaa..cf495a2e781cc1a13db149042c8bfd1e9fe4b28c 100644 --- a/keyboards/wilba_tech/wt60_b/config.h +++ b/keyboards/wilba_tech/wt60_b/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, 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/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/info.json index 6e8d463abb7e59bd876b46b275f5aaa2d47ade7b..1a9338a5c81f8318a9b9e0b9bd42e4054485aefd 100644 --- a/keyboards/wilba_tech/wt60_b/info.json +++ b/keyboards/wilba_tech/wt60_b/info.json @@ -8,6 +8,11 @@ "pid": "0x60B0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h index 5bc298d70ebda1c8789b995a22d072b0d616a559..6f89b14954518990d53e4e9cb733112783169fd0 100644 --- a/keyboards/wilba_tech/wt60_bx/config.h +++ b/keyboards/wilba_tech/wt60_bx/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, 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/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/info.json index 8c3cf7de2a0e7f26958aa3267b32ba5c1b66847a..9b63c7f8e77c0becc7e7c44b4c3434b5f2b25b1a 100644 --- a/keyboards/wilba_tech/wt60_bx/info.json +++ b/keyboards/wilba_tech/wt60_bx/info.json @@ -8,6 +8,11 @@ "pid": "0x60B1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h index 7b7fdaf0204680c63c2b7f9bc35f9fafaf2b2de3..776aebcf20b6c14f294fc94539a0c09a9c11607b 100644 --- a/keyboards/wilba_tech/wt60_c/config.h +++ b/keyboards/wilba_tech/wt60_c/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, 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/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json index b39a2786a47fcd27fc56929fbba43004210dbc2e..b23b639c7e7df1b2d5ee0f120e6cb6f11b8d7ccf 100644 --- a/keyboards/wilba_tech/wt60_c/info.json +++ b/keyboards/wilba_tech/wt60_c/info.json @@ -8,6 +8,11 @@ "pid": "0x60C0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_g/config.h b/keyboards/wilba_tech/wt60_g/config.h index 32645266942d481078e5570ab85b6db19af4c106..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt60_g/config.h +++ b/keyboards/wilba_tech/wt60_g/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0 - -/* 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/wilba_tech/wt60_g/info.json b/keyboards/wilba_tech/wt60_g/info.json index 5c22b6dc213fd3e560e47d28e3a9679dca99fe72..113729e250ced5e7bc18ff467f7bc3e2608f4494 100644 --- a/keyboards/wilba_tech/wt60_g/info.json +++ b/keyboards/wilba_tech/wt60_g/info.json @@ -8,6 +8,11 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_g2/config.h b/keyboards/wilba_tech/wt60_g2/config.h index c841f6365a5c9cd54afdb67a8650dfdc8dd2f4b5..b7d24e1cd3c40ee7b5a43846359b602cd6563059 100644 --- a/keyboards/wilba_tech/wt60_g2/config.h +++ b/keyboards/wilba_tech/wt60_g2/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0 - -/* 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/wilba_tech/wt60_g2/info.json b/keyboards/wilba_tech/wt60_g2/info.json index 33b0fd0d5025cd397fd6b428b698aac0af031b06..b1d34eb65db72893b873d87ba90f0f33412b9f56 100644 --- a/keyboards/wilba_tech/wt60_g2/info.json +++ b/keyboards/wilba_tech/wt60_g2/info.json @@ -8,6 +8,11 @@ "pid": "0x002F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_h1/config.h b/keyboards/wilba_tech/wt60_h1/config.h index 32645266942d481078e5570ab85b6db19af4c106..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt60_h1/config.h +++ b/keyboards/wilba_tech/wt60_h1/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0 - -/* 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/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json index 928ea8ba8ab60628c4ec3f13bb0180687191f30a..4ef210f05f220185bd3984cd390f6b4a17863f41 100644 --- a/keyboards/wilba_tech/wt60_h1/info.json +++ b/keyboards/wilba_tech/wt60_h1/info.json @@ -8,6 +8,11 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_tsangan_hhkb"], diff --git a/keyboards/wilba_tech/wt60_h2/config.h b/keyboards/wilba_tech/wt60_h2/config.h index 32645266942d481078e5570ab85b6db19af4c106..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt60_h2/config.h +++ b/keyboards/wilba_tech/wt60_h2/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0 - -/* 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/wilba_tech/wt60_h2/info.json b/keyboards/wilba_tech/wt60_h2/info.json index e9c59d1b8c931aa51a324a2c8606127e140c1e8f..046a8526bc8f3f91ce04dc72f0563b708625d989 100644 --- a/keyboards/wilba_tech/wt60_h2/info.json +++ b/keyboards/wilba_tech/wt60_h2/info.json @@ -8,6 +8,11 @@ "pid": "0x002B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt60_h3/config.h b/keyboards/wilba_tech/wt60_h3/config.h index 32645266942d481078e5570ab85b6db19af4c106..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt60_h3/config.h +++ b/keyboards/wilba_tech/wt60_h3/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0 - -/* 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/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json index df002063a37c0c9c3177950a4881ebb3f619aa03..f4cb4bedbc950659b84a198a7a8edd283f09e461 100644 --- a/keyboards/wilba_tech/wt60_h3/info.json +++ b/keyboards/wilba_tech/wt60_h3/info.json @@ -8,6 +8,11 @@ "pid": "0x002C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/wilba_tech/wt60_xt/config.h b/keyboards/wilba_tech/wt60_xt/config.h index 888197a2168a16a6e5b9b5391063dc9b0fca742c..ea2f490317b6d380354f00081b8ec43f38e166ee 100644 --- a/keyboards/wilba_tech/wt60_xt/config.h +++ b/keyboards/wilba_tech/wt60_xt/config.h @@ -20,22 +20,6 @@ #define AUDIO_PIN C6 #define AUDIO_CLICKY -/* - * 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, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, B6, B5, B4, D7, D6, 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/wilba_tech/wt60_xt/info.json b/keyboards/wilba_tech/wt60_xt/info.json index d31d8380b14dd86f8ea2b916a170d70dfe42227b..edbd17a5c360587a8456971d224aae65a65c051d 100644 --- a/keyboards/wilba_tech/wt60_xt/info.json +++ b/keyboards/wilba_tech/wt60_xt/info.json @@ -8,6 +8,11 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h index 906887f3fa87c4fb553fd6afbfe52c242eda5b0f..aa75002b4fcbe31ccca5e08c749c37117b924c34 100644 --- a/keyboards/wilba_tech/wt65_a/config.h +++ b/keyboards/wilba_tech/wt65_a/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 { F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json index 1c73d405563f8f445ec4f60c0e7a1c21439a522a..1b56bd785c3f218ecae3d0a8cf0812fce3ccd9c9 100644 --- a/keyboards/wilba_tech/wt65_a/info.json +++ b/keyboards/wilba_tech/wt65_a/info.json @@ -8,6 +8,11 @@ "pid": "0x065A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h index 2cec4c23d719b13c9776ae36ec9b5167e7563493..60cdbe4cc6ab95b3d2f625a60befe6b0a4fc750c 100644 --- a/keyboards/wilba_tech/wt65_b/config.h +++ b/keyboards/wilba_tech/wt65_b/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 { F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json index 17dc827d5582f7a0968d4b052748224d74320f9f..5ac0d81f28d65adccf47b1f4e29114216986cfae 100644 --- a/keyboards/wilba_tech/wt65_b/info.json +++ b/keyboards/wilba_tech/wt65_b/info.json @@ -8,6 +8,11 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_d/config.h b/keyboards/wilba_tech/wt65_d/config.h index d383760f196926696ea228845c31e32361c42837..f37e4b2db650e8a2167f557206fcd5b87f5ef281 100644 --- a/keyboards/wilba_tech/wt65_d/config.h +++ b/keyboards/wilba_tech/wt65_d/config.h @@ -3,11 +3,6 @@ #pragma once -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, D3, D2, B7, B0, B3, C7, C6, B6, B5, B4, D7, D6, D4 } -#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/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/info.json index 68dc46d54870b5c3a9280b54ee7a032b8e83e7ec..dec1e89e95ecba7798949a9452cdcba0ea970455 100644 --- a/keyboards/wilba_tech/wt65_d/info.json +++ b/keyboards/wilba_tech/wt65_d/info.json @@ -8,6 +8,11 @@ "pid": "0x0031", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "D3", "D2", "B7", "B0", "B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["E6", "F0", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F1" }, diff --git a/keyboards/wilba_tech/wt65_f/config.h b/keyboards/wilba_tech/wt65_f/config.h index bf47e02d25a2c2472404bc1a58e5e72f703ffde9..b7d24e1cd3c40ee7b5a43846359b602cd6563059 100644 --- a/keyboards/wilba_tech/wt65_f/config.h +++ b/keyboards/wilba_tech/wt65_f/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0 - -/* 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/wilba_tech/wt65_f/info.json b/keyboards/wilba_tech/wt65_f/info.json index f5916bea1bfe59815420d6ad54966962e736b24c..9cf7004132f2523ed132eed64c8de91d0dc42e5c 100644 --- a/keyboards/wilba_tech/wt65_f/info.json +++ b/keyboards/wilba_tech/wt65_f/info.json @@ -8,6 +8,11 @@ "pid": "0x002D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_fx/config.h b/keyboards/wilba_tech/wt65_fx/config.h index bf47e02d25a2c2472404bc1a58e5e72f703ffde9..b7d24e1cd3c40ee7b5a43846359b602cd6563059 100644 --- a/keyboards/wilba_tech/wt65_fx/config.h +++ b/keyboards/wilba_tech/wt65_fx/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0 - -/* 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/wilba_tech/wt65_fx/info.json b/keyboards/wilba_tech/wt65_fx/info.json index afbc80b8c1bf83ab886ff9d781be1a9622533a25..d9195621e23871e8d73d4bdc9ffe35f4856343ce 100644 --- a/keyboards/wilba_tech/wt65_fx/info.json +++ b/keyboards/wilba_tech/wt65_fx/info.json @@ -8,6 +8,11 @@ "pid": "0x002E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_g/config.h b/keyboards/wilba_tech/wt65_g/config.h index 807b7fa8eed7b8480531d9184b96d5f5ffc17184..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt65_g/config.h +++ b/keyboards/wilba_tech/wt65_g/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0 - -/* 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/wilba_tech/wt65_g/info.json b/keyboards/wilba_tech/wt65_g/info.json index bdfea960a4339604d630c95d8f053b2420169ec5..1f794e5e37fa07ccd3821c1e281f600f76c06f88 100644 --- a/keyboards/wilba_tech/wt65_g/info.json +++ b/keyboards/wilba_tech/wt65_g/info.json @@ -8,6 +8,11 @@ "pid": "0x0022", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_g2/config.h b/keyboards/wilba_tech/wt65_g2/config.h index 807b7fa8eed7b8480531d9184b96d5f5ffc17184..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt65_g2/config.h +++ b/keyboards/wilba_tech/wt65_g2/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0 - -/* 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/wilba_tech/wt65_g2/info.json b/keyboards/wilba_tech/wt65_g2/info.json index 5d8769625ac91f3496395a83d71960e7448e4926..b3d8d3bdbb503d43c9bd7fde85e09f88c40033ff 100644 --- a/keyboards/wilba_tech/wt65_g2/info.json +++ b/keyboards/wilba_tech/wt65_g2/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_h1/config.h b/keyboards/wilba_tech/wt65_h1/config.h index 807b7fa8eed7b8480531d9184b96d5f5ffc17184..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt65_h1/config.h +++ b/keyboards/wilba_tech/wt65_h1/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0 - -/* 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/wilba_tech/wt65_h1/info.json b/keyboards/wilba_tech/wt65_h1/info.json index 2ccb1d90998038506e6644dbc08f385befdb1df6..65e8c39016eda1281ffddfd39b000de0a6c894f5 100644 --- a/keyboards/wilba_tech/wt65_h1/info.json +++ b/keyboards/wilba_tech/wt65_h1/info.json @@ -8,6 +8,11 @@ "pid": "0x0025", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_tsangan"], diff --git a/keyboards/wilba_tech/wt65_xt/config.h b/keyboards/wilba_tech/wt65_xt/config.h index 525df76d1b99103b22ee5f61f25e09a2a983c335..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt65_xt/config.h +++ b/keyboards/wilba_tech/wt65_xt/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, 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/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/info.json index 575d1c3add00724e4ae7b81aed0116210f68643f..98c21c8230cca1952abff344e3f108216463d696 100644 --- a/keyboards/wilba_tech/wt65_xt/info.json +++ b/keyboards/wilba_tech/wt65_xt/info.json @@ -8,6 +8,11 @@ "pid": "0x001D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt65_xtx/config.h b/keyboards/wilba_tech/wt65_xtx/config.h index c799ec8bc4ef84ed592a3bdb28e421ff668d7552..9b6b3c7955831214852e4e29cf62ef1ce1e82ee0 100644 --- a/keyboards/wilba_tech/wt65_xtx/config.h +++ b/keyboards/wilba_tech/wt65_xtx/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 { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, 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/wilba_tech/wt65_xtx/info.json b/keyboards/wilba_tech/wt65_xtx/info.json index 196044185ba52665ba73e35fffe77a21810b8f76..e9394e8a022e2f417bf1fe32682607e388ccbda5 100644 --- a/keyboards/wilba_tech/wt65_xtx/info.json +++ b/keyboards/wilba_tech/wt65_xtx/info.json @@ -8,6 +8,11 @@ "pid": "0x001E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt69_a/config.h b/keyboards/wilba_tech/wt69_a/config.h index e893d73def70c8713209f27e1e26e9acf1cab859..bc06d6ce9c02dc7e218bc4a5eb9d02552a035c17 100644 --- a/keyboards/wilba_tech/wt69_a/config.h +++ b/keyboards/wilba_tech/wt69_a/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 { F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json index 67faf978d4ec86675becfbbbc13d1603a1a957c4..7d643b66ce3b84b1920f405ede1b07411c5bacb4 100644 --- a/keyboards/wilba_tech/wt69_a/info.json +++ b/keyboards/wilba_tech/wt69_a/info.json @@ -8,6 +8,11 @@ "pid": "0x069A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h index 0a853d659c011335a43e52cea831decfbd2780df..afc09fb5fe599d2f8ee96ddc21192622f70b40fe 100644 --- a/keyboards/wilba_tech/wt70_jb/config.h +++ b/keyboards/wilba_tech/wt70_jb/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 { E6, F0, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, D3, D2, D1, D0, B7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B3 } - -/* 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/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json index a004bb43a0c2b3fa25f6761e04fde1eb78137e5f..a913e0b225d4e455e4c64b7b07fd379bc7bacc38 100644 --- a/keyboards/wilba_tech/wt70_jb/info.json +++ b/keyboards/wilba_tech/wt70_jb/info.json @@ -8,6 +8,11 @@ "pid": "0x001F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "D3", "D2", "D1", "D0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B3"], + "rows": ["E6", "F0", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h index d678e7f0e923ecf94a4ca03ba0fbd5ec6f56aa8c..4638b0fba965ebd9e1a796f4a648a4892605640b 100644 --- a/keyboards/wilba_tech/wt75_a/config.h +++ b/keyboards/wilba_tech/wt75_a/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json index 24342333354b8c23c1cb6bdcd807ce2a2dc2f867..a531ab8a19ad969b31c2533fc983f0435ce05b4f 100644 --- a/keyboards/wilba_tech/wt75_a/info.json +++ b/keyboards/wilba_tech/wt75_a/info.json @@ -8,6 +8,11 @@ "pid": "0x075A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h index e36da68c4ee0d1da0e18ba4085af63846b2e4236..f519fe66034d5feb72e6258c2e54823fe91a5185 100644 --- a/keyboards/wilba_tech/wt75_b/config.h +++ b/keyboards/wilba_tech/wt75_b/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B7, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B2, D4 } - -/* 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/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json index b2bd5a02ae6c5a9656a4b6225a1009aad88763ce..af090acd3a50ec4877c89e5debbfa7673c10b5ea 100644 --- a/keyboards/wilba_tech/wt75_b/info.json +++ b/keyboards/wilba_tech/wt75_b/info.json @@ -8,6 +8,11 @@ "pid": "0x075B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h index 0bd449089c93a446815021e8aef1c2f71745219a..7d07822eb6ac0749df8ae5e94547507945a8b878 100644 --- a/keyboards/wilba_tech/wt75_c/config.h +++ b/keyboards/wilba_tech/wt75_c/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B7, D4 } - -/* 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/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json index 85a99879083be248c164c24f1edd275c265e7a73..86ccc5df0ec92794d75d0fcf7360c1c44d91fdbf 100644 --- a/keyboards/wilba_tech/wt75_c/info.json +++ b/keyboards/wilba_tech/wt75_c/info.json @@ -8,6 +8,11 @@ "pid": "0x075C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h index 8112d1f888caaf8213c5bc381cf7765ef2470234..59cb397a00fff5d215c4af3f35aa53d8b135830c 100644 --- a/keyboards/wilba_tech/wt80_a/config.h +++ b/keyboards/wilba_tech/wt80_a/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 } - -/* 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/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json index 337207404acb79981b3806a1401e499f12acf756..0a814235d9906d66e48df0dc5c8fc102b07fff54 100644 --- a/keyboards/wilba_tech/wt80_a/info.json +++ b/keyboards/wilba_tech/wt80_a/info.json @@ -8,6 +8,11 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h index aa5ba2d5731e0173756304cbca06cba9b010c8cb..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt80_bc/config.h +++ b/keyboards/wilba_tech/wt80_bc/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 } - -/* 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/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/info.json index e2858d238a1682557f599fc9de17eb5927b83b51..a85325525b071aedf11aeb4a7ae386c4fb54334e 100644 --- a/keyboards/wilba_tech/wt80_bc/info.json +++ b/keyboards/wilba_tech/wt80_bc/info.json @@ -8,6 +8,11 @@ "pid": "0x80B0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt80_g/config.h b/keyboards/wilba_tech/wt80_g/config.h index aa5ba2d5731e0173756304cbca06cba9b010c8cb..9541b1df1261e3235a56826aa1c74a5bb2ab3647 100644 --- a/keyboards/wilba_tech/wt80_g/config.h +++ b/keyboards/wilba_tech/wt80_g/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 { F1, F0, E6, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 } - -/* 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/wilba_tech/wt80_g/info.json b/keyboards/wilba_tech/wt80_g/info.json index 1c7ff192d15c014abd81def3c1aacf02a5fa7d6c..8aec5901ea0545fc7ade834efc9bea0dc7915d5b 100644 --- a/keyboards/wilba_tech/wt80_g/info.json +++ b/keyboards/wilba_tech/wt80_g/info.json @@ -8,6 +8,11 @@ "pid": "0x0023", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], + "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h index 3ef5baf588581d51fef0c527b0eabef9f2f5f579..1377a18714c297b9aa7fcb7ad44a715bd6b8fadd 100644 --- a/keyboards/wilba_tech/wt8_a/config.h +++ b/keyboards/wilba_tech/wt8_a/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 { E6 } -#define MATRIX_COL_PINS { F4, F1, B2, B6, F6, F7, D5, 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/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json index 53cffb13aee7bd14ae1a919aca295112491a8f47..b462b05eeb3e449811326d433eaf626ef51f57ef 100644 --- a/keyboards/wilba_tech/wt8_a/info.json +++ b/keyboards/wilba_tech/wt8_a/info.json @@ -8,6 +8,11 @@ "pid": "0x008A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"], + "rows": ["E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h index 5a3ad34bf7ff9a425557840586e8a0c18e2c270d..e57bafe20dd1375e5b7ea91d4170428e1880db3f 100644 --- a/keyboards/wilba_tech/zeal60/config.h +++ b/keyboards/wilba_tech/zeal60/config.h @@ -15,18 +15,10 @@ */ #pragma once - -// Zeal60 PCB default pin-out -#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } - // IS31FL3731 driver #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 72 -// 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/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json index 5ef0875419b416c7f049afa2907a1b6290c61966..764b040320464ed11b3b223200d4e9815c6455f6 100644 --- a/keyboards/wilba_tech/zeal60/info.json +++ b/keyboards/wilba_tech/zeal60/info.json @@ -8,6 +8,11 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"], diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h index 1ab6b627513fc69c4c3fc0935c8f945da65b201d..4a73ed3b2763c45180b29a349da0b86dfbbe2f28 100644 --- a/keyboards/wilba_tech/zeal65/config.h +++ b/keyboards/wilba_tech/zeal65/config.h @@ -15,18 +15,10 @@ */ #pragma once - -// Zeal60 PCB default pin-out -#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 } -#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } - // IS31FL3731 driver #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 72 -// 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/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json index 935dc188749dcf8e839a0975c0044e21cab324b4..0918277e8150477b6481145f2c2d2d715d1b7e39 100644 --- a/keyboards/wilba_tech/zeal65/info.json +++ b/keyboards/wilba_tech/zeal65/info.json @@ -8,6 +8,11 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h index ce27a1c563df5aa0cfebe4a655cdaf1425889ac0..b585802fb85b3323996199cc79f27606dbc2e645 100644 --- a/keyboards/winkeyless/b87/config.h +++ b/keyboards/winkeyless/b87/config.h @@ -16,11 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS {B5, B4, B3, B2, B1, B0, B6, B7} -#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, A5, C5, C4, C3, C2, D7, C6, C7, A7, A6} - #define RGBLED_NUM 20 // Number of LEDs // RGB effects #define RGBLIGHT_EFFECT_BREATHING @@ -33,6 +28,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json index 542cc74d270ffc2b95f5659b696d7378d454ab60..506ddf78ec8a6cfd1d77867c48d8fa93add424a8 100644 --- a/keyboards/winkeyless/b87/info.json +++ b/keyboards/winkeyless/b87/info.json @@ -8,6 +8,11 @@ "pid": "0x0B87", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C5", "C4", "C3", "C2", "D7", "C6", "C7", "A7", "A6"], + "rows": ["B5", "B4", "B3", "B2", "B1", "B0", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h index cbb0be707da1cd3d6a9ef67bd85535b0eff06dfe..b7529e431110f5e5d28fc74b9d552e1ef3b95c63 100644 --- a/keyboards/winkeyless/bface/config.h +++ b/keyboards/winkeyless/bface/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #pragma once -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#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, C4, C3, C2, D7} - -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json index f7a8c61032c1f9b4b9da33afd2cbc7b7975773d5..fc3b3c45d30f4e3ec536335f3cefcb13ce02491f 100644 --- a/keyboards/winkeyless/bface/info.json +++ b/keyboards/winkeyless/bface/info.json @@ -8,6 +8,11 @@ "pid": "0x4246", "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/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h index 033807a3f5f7e8549c75d6bee3e574277101f335..ddc21dae3085e0ce5d34e1eef64a9e9de1b80f01 100644 --- a/keyboards/winkeyless/bmini/config.h +++ b/keyboards/winkeyless/bmini/config.h @@ -20,10 +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, 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/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json index 58edbac998494f562add73529e88e0c277e75d34..add6deafad1d68c2b3cb4b2d4637ce7787c7d843 100644 --- a/keyboards/winkeyless/bmini/info.json +++ b/keyboards/winkeyless/bmini/info.json @@ -8,6 +8,11 @@ "pid": "0x424D", "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/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h index 351de6f4754556e0503b5c63cfb11777e0711b63..116c09d6ac78defe8ab6aa49c8ee462d3ccfb3a1 100644 --- a/keyboards/winkeyless/bminiex/config.h +++ b/keyboards/winkeyless/bminiex/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 20 -#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, 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/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json index afd766f480abd8f6bdbeb79a5a4f7a570f892423..c60a38fe2f3f8ce87a472d1c4320be9f152ce6c4 100644 --- a/keyboards/winkeyless/bminiex/info.json +++ b/keyboards/winkeyless/bminiex/info.json @@ -8,6 +8,11 @@ "pid": "0x4258", "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", "levels": 5 diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h index f67f725ef633a3d7ddb1f16ec832a419e3d46fd7..90e70999b680173fa6b57a65098cc10265b4ee95 100644 --- a/keyboards/winry/winry25tc/config.h +++ b/keyboards/winry/winry25tc/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { E6, F0, D6, D2, B6 } -#define MATRIX_COL_PINS { F5, C7, B7, B2, B4 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D5 #define RGBLED_NUM 40 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json index 4cbb746408b67995da7df1d2c44f7e5fddb57c95..0391d278b9f521deca4e3da9ae720eecd10586f1 100644 --- a/keyboards/winry/winry25tc/info.json +++ b/keyboards/winry/winry25tc/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "C7", "B7", "B2", "B4"], + "rows": ["E6", "F0", "D6", "D2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wolf/kuku65/config.h b/keyboards/wolf/kuku65/config.h deleted file mode 100644 index a103afe451030e52a318d52643d866ebde71dd8f..0000000000000000000000000000000000000000 --- a/keyboards/wolf/kuku65/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2020 - -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) - * -*/ - -// Checked with Eagle Schematic -#define MATRIX_ROW_PINS { B3, B2, B1, B0, B7 } -#define MATRIX_COL_PINS { D0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json index 39fec251a1d7bbbcb4818f953acc6041b996866a..36022287d24e4221d5f3e82ba9ec3d6ee7d4889c 100644 --- a/keyboards/wolf/kuku65/info.json +++ b/keyboards/wolf/kuku65/info.json @@ -8,6 +8,11 @@ "pid": "0x0052", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], + "rows": ["B3", "B2", "B1", "B0", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wolf/ryujin/config.h b/keyboards/wolf/ryujin/config.h deleted file mode 100644 index dd9ec9803aeb49dc3fc5dfa37a79d5fd402dea6d..0000000000000000000000000000000000000000 --- a/keyboards/wolf/ryujin/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 - -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 - - -// Checked with Eagle Schematic -#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json index 5afce87aefc929d5026c3124098da224fd71f8d3..4a7c08060651c42c10835a7347536b30515cb087 100644 --- a/keyboards/wolf/ryujin/info.json +++ b/keyboards/wolf/ryujin/info.json @@ -8,6 +8,11 @@ "pid": "0x0200", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D5", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h deleted file mode 100644 index c0150fce0bce351edfeb89b554f2c870223d5ca5..0000000000000000000000000000000000000000 --- a/keyboards/wolf/sabre/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2020 - -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) - * -*/ - -// Checked with Eagle Schematic -#define MATRIX_ROW_PINS { D0, D1, F1, F0, B5, B6, C7, C6, F6, F7, F4, F5 } -#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B2, B1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json index 40ee60a6d0fc1a2ee01cfa9e62b17bedff4c9b52..526422d945eaa91c7ae3358374bbf1b6bd24026e 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/info.json @@ -8,6 +8,11 @@ "pid": "0x0055", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"], + "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h index 7664e747c7deffb686ee17c748b52f63d72189c7..cfc1ef79bc7e7fd6acf2b71bf194ab31ec1a79f2 100644 --- a/keyboards/wolf/ts60/config.h +++ b/keyboards/wolf/ts60/config.h @@ -17,25 +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) - * -*/ - -// Checked with Eagle Schematic -#define MATRIX_ROW_PINS { D2, D3, D6, D4, F6, F7, F5, F0, F4, F1 } -#define MATRIX_COL_PINS { D1, D5, C7, C6, B6, B5, B4, D7} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Define RGB Underglow */ #define RGB_DI_PIN D0 #define RGBLED_NUM 16 diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json index 8b40cd6ff22d7b76b06f2682f2353feda83706a4..a8b8e9126800b8fa6dbfa9811e5001334107f2f6 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/info.json @@ -8,6 +8,11 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"], + "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 6 diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h index f9802c89f3935914924c887bb07b0252cf201103..93b0d14a3a879eb908e406fffe130d629dc09727 100644 --- a/keyboards/wolfmarkclub/wm1/config.h +++ b/keyboards/wolfmarkclub/wm1/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 C D E -#define MATRIX_ROW_PINS { C4, A7, A6, A5, A4 } -#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, C6, C10, C11, C12, D2, B5, B6, B7, B8 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN A3 #ifdef RGB_DI_PIN #define RGBLED_NUM 18 diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json index 3eef787a74b5f28ac5a5301dd757f7708f51c8d8..ac1827daf6ab42ca668adee572f0c37622646cad 100644 --- a/keyboards/wolfmarkclub/wm1/info.json +++ b/keyboards/wolfmarkclub/wm1/info.json @@ -8,6 +8,11 @@ "pid": "0x2B29", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"], + "rows": ["C4", "A7", "A6", "A5", "A4"] + }, + "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":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3, "w":1.75}, {"x":16.25, "y":3.25}, {"x":0, "y":4, "w":1.5}, {"x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2}, {"x":6.5, "y":4}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":13.25, "y":4, "w":1.5}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25}, {"x":17.25, "y":4.25}] diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h index 32263155ff6c9d99b338c0c5449a43487cfba9ce..643a094f441278eb90476d9c835c4ba5d299ec0a 100755 --- a/keyboards/woodkeys/bigseries/1key/config.h +++ b/keyboards/woodkeys/bigseries/1key/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json index f2f93b63eab7d9bec66b8a716a38389fe731be4a..1d0a787d9ac9072b38161a1874b5ff58923bad86 100644 --- a/keyboards/woodkeys/bigseries/1key/info.json +++ b/keyboards/woodkeys/bigseries/1key/info.json @@ -8,6 +8,11 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B4"], + "rows": ["B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "debounce": 50, diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h index 6b400657653032d5e84ca2a6610e6b0fb7d174ca..62734fc947bbed360e1e75496d8906d9454ef560 100755 --- a/keyboards/woodkeys/bigseries/2key/config.h +++ b/keyboards/woodkeys/bigseries/2key/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B4, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json index 5137f4f1d198cf50162502c93045b781776aaffa..c3a2b62eb81ef2460038a501772fb67ae84dd12e 100644 --- a/keyboards/woodkeys/bigseries/2key/info.json +++ b/keyboards/woodkeys/bigseries/2key/info.json @@ -8,6 +8,11 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B4", "B3"], + "rows": ["B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "debounce": 50, diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h index 9c81df0835b398e2ea2dfe90d138c296dec867d7..592aae3c888c5de09126e5f0ea7c5f2c07f6c0d7 100755 --- a/keyboards/woodkeys/bigseries/3key/config.h +++ b/keyboards/woodkeys/bigseries/3key/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B4, B3, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json index af1c85f925beb109f8d03831007b9a777728c922..43b99312db90e7d5f09aeea10fdce5d22e978334 100644 --- a/keyboards/woodkeys/bigseries/3key/info.json +++ b/keyboards/woodkeys/bigseries/3key/info.json @@ -8,6 +8,11 @@ "pid": "0x6073", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B4", "B3", "B5"], + "rows": ["B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 50, diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h index 9b1f699ce1fd3296ffc489b9c18f0a73cf521828..53e1242c8898051159e112c0b38626f7cdc14ef8 100755 --- a/keyboards/woodkeys/bigseries/4key/config.h +++ b/keyboards/woodkeys/bigseries/4key/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B5 } -#define MATRIX_COL_PINS { B4, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json index b6e02aa987d1cc32019d25ab1984b9df370e8bf5..8fb9a9071ac6ff7eeb90fee46ef8f3758d641cb1 100644 --- a/keyboards/woodkeys/bigseries/4key/info.json +++ b/keyboards/woodkeys/bigseries/4key/info.json @@ -8,6 +8,11 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B4", "B3"], + "rows": ["B0", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "debounce": 50, diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h index fac7647ab846aff018f39c86f09229ec9df6c473..c640c6254fbfce0cefb56f0ac8784c16b8ff8ce9 100644 --- a/keyboards/woodkeys/scarletbandana/config.h +++ b/keyboards/woodkeys/scarletbandana/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING @@ -36,9 +32,6 @@ along with this program. If not, see . #define RGBLED_NUM 8 // Number of LEDs #endif -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 } -#define MATRIX_COL_PINS { B2, B3, B7, B1, F5, F4, F6, F7, B0, F0, F1, D0, D1, D2, D5, B6, C7 } - #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 #define STARTUP_SONG SONG(PREONIC_SOUND) diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json index 180cd46098018e1a0e1590fcb7d763a35c6d0175..7550db40c87210a35429a6c93346566ce6eb98d8 100644 --- a/keyboards/woodkeys/scarletbandana/info.json +++ b/keyboards/woodkeys/scarletbandana/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"], + "rows": ["D4", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 1e17946cef677ac2e9a7c0438e5c5c72d1748639..020b95da170e68d71db54ba08162ffc0175bcebf 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -17,25 +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 \ - { F5 } -#define MATRIX_COL_PINS { B3, B2, B1, D6, D7, B4, B5, B6, C6, C7, F7, F6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - - #define USB_MAX_POWER_CONSUMPTION 100 #define RGBLIGHT_DI_PIN E6 diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index df4a5c1be045003f1f013933e9d0d13b3fb86f8e..00e70ab0db6fab766f8c2849cd4cebe1fc427bfa 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -7,6 +7,11 @@ "vid": "0x574C", "pid": "0x1DF9" }, + "matrix_pins": { + "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["F5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h index 9148cf1abf84479d52b4cdbe1921b5a9855d0c38..add9608eb4d00e29c6db655636eea8b2f6b809be 100644 --- a/keyboards/work_louder/nano/config.h +++ b/keyboards/work_louder/nano/config.h @@ -17,25 +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 } -#define MATRIX_COL_PINS \ - { B5, B6, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 #define RGBLIGHT_DI_PIN C7 diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index 3eb050b92adb99d9cf200ac34b8b6f52274ffc42..798127b4c0f13c6e043998db2a6e9513620b88a1 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -8,6 +8,11 @@ "pid": "0xE6F0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6"], + "rows": ["F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D7", "pin_b": "B4"} diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index d9da63eb508347fd6ab409b9b7c25431befd5896..de4cf74badb350407b39b79d8f62ee95417e43ce 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -17,25 +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, F5 } -#define MATRIX_COL_PINS \ - { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, E6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 #define RGBLIGHT_DI_PIN D2 diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index 5e934e90e0d001d694a77190438b4eb2b2e1231a..6826f123a9c68c9d4b94eb2429bb2bf659aa2dab 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -7,6 +7,11 @@ "vid": "0x574C", "pid": "0xDCD1" }, + "matrix_pins": { + "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"], + "rows": ["F0", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h index 72e110cc6baf830cb6c9548d23c9a5343d1122af..bd4af23167d6ac24e2fa719808ca3d8b1a616e50 100644 --- a/keyboards/wren/config.h +++ b/keyboards/wren/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, C6, D4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D7, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define USE_I2C /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json index 184ddea75b75c01b0ef907558e1d81a45505697b..06fa7ddf10bb51f7c91a72cb371594939f37caae 100644 --- a/keyboards/wren/info.json +++ b/keyboards/wren/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"], + "rows": ["D3", "D2", "C6", "D4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B4"} diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h index 19943cdb98cbdd96e2c5c03d50098dba25154c95..9796f37b97fb12c30f4dbfe0c64166cfb6cd7f98 100644 --- a/keyboards/wsk/alpha9/config.h +++ b/keyboards/wsk/alpha9/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, B4, B5 } -#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5, D1, D0, D2 } - -/* 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/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json index 65d1bec3f77e25d484fc7fa34c21a56ca62f5120..bb5415b0224ca439b47b22c39794e2b192352930 100644 --- a/keyboards/wsk/alpha9/info.json +++ b/keyboards/wsk/alpha9/info.json @@ -8,6 +8,11 @@ "pid": "0x692A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "D1", "D0", "D2"], + "rows": ["D4", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D3", "on_state": 0 diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h index fb101db58ff3b26b099ecb6367d0c7268a4a237d..98d3d12d3d0494d6a3ae9d699823bf09355fb926 100644 --- a/keyboards/wsk/g4m3ralpha/config.h +++ b/keyboards/wsk/g4m3ralpha/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, B4, B5, D1 } -#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, 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 diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json index a55225c0bc0e3cf407fbca436232fba9da5fb164..37672ede0ae36fcb253b391b6d7c8b042856883b 100644 --- a/keyboards/wsk/g4m3ralpha/info.json +++ b/keyboards/wsk/g4m3ralpha/info.json @@ -8,6 +8,11 @@ "pid": "0x56D9", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["D4", "B4", "B5", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h index da5729ed4f77967d5a21ddc042c61bd76cbf7efb..b893b35e691c1191aad3a1074c7559525fa7e0d8 100644 --- a/keyboards/wsk/gothic50/config.h +++ b/keyboards/wsk/gothic50/config.h @@ -1,15 +1,5 @@ #pragma once - -/* key matrix pins */ - -#define MATRIX_ROW_PINS { B5, B4, D7, D6 } -#define MATRIX_COL_PINS { E6, F0, F1, C7, C6, B6, D4, D5, D3, D2, D1, D0, B7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json index bce25f39344c09539205df469641ed25a09a684d..f773ebf1936ff81e7379c6d5e8b244190284ad65 100644 --- a/keyboards/wsk/gothic50/info.json +++ b/keyboards/wsk/gothic50/info.json @@ -8,6 +8,11 @@ "pid": "0x04EF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "C7", "C6", "B6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0"], + "rows": ["B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h index 8cfb2dcab94bb3cff347af68f505391be571aaee..de29eadb1431711c28673b7724303fcb03844385 100644 --- a/keyboards/wsk/gothic70/config.h +++ b/keyboards/wsk/gothic70/config.h @@ -1,14 +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, B0, B7, B5, B4, D7, D6, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json index f7baad64c12279dd1d8baab9a50de4a049e6ee80..0fd4a6018d9ee79fb49b580cd898018acd52ccbd 100644 --- a/keyboards/wsk/gothic70/info.json +++ b/keyboards/wsk/gothic70/info.json @@ -8,6 +8,11 @@ "pid": "0x63CC", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h index b9cc1722c311fad4ebe7f32522d740997817290f..08f6b873c5bc33f2ca343244741d79ce488296f1 100644 --- a/keyboards/wsk/houndstooth/config.h +++ b/keyboards/wsk/houndstooth/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, F7, D7, B1, B4, B2, B5, B6 } -#define MATRIX_COL_PINS { D1, F4, D0, F5, D4, F6 } - -/* 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/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json index 490088543cbf47e021ab79622e47f6baefb3e173..e383e46b3c33850791547e415e98c5dbaf8d6730 100644 --- a/keyboards/wsk/houndstooth/info.json +++ b/keyboards/wsk/houndstooth/info.json @@ -8,6 +8,11 @@ "pid": "0xFA9C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "F4", "D0", "F5", "D4", "F6"], + "rows": ["C6", "F7", "D7", "B1", "B4", "B2", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h index dcecb58d1535a51238173769ee506dd7063a58ac..68d4a8fef749a40b74283a354da9114bfb0ae457 100644 --- a/keyboards/wsk/jerkin/config.h +++ b/keyboards/wsk/jerkin/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B4, B5 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, B1, F7, F6, F5, F4, E6, D7 } - -/* 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/wsk/jerkin/info.json b/keyboards/wsk/jerkin/info.json index bc273e6c5efbb9346f3a95fa9e35dfbb0d7b60bf..19099a4f56190df61b01a57c9f12616c2daf4275 100644 --- a/keyboards/wsk/jerkin/info.json +++ b/keyboards/wsk/jerkin/info.json @@ -8,6 +8,11 @@ "pid": "0x79AE", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "B1", "F7", "F6", "F5", "F4", "E6", "D7"], + "rows": ["B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h index 8f965e4b0969ecac8717e2167e913f0f5450949f..eecc8ba082fe304c512e91155d34e505ea82da6d 100644 --- a/keyboards/wsk/kodachi50/config.h +++ b/keyboards/wsk/kodachi50/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, B5, B6, B2, B3, B1, F7, F6 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, 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/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json index 713c1f064f0bb5bac7f3b0e79a1df085b9d0d706..29f17cc2254598727e6c043c3f661700a97ab700 100644 --- a/keyboards/wsk/kodachi50/info.json +++ b/keyboards/wsk/kodachi50/info.json @@ -8,6 +8,11 @@ "pid": "0x72D4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"], + "rows": ["D2", "B5", "B6", "B2", "B3", "B1", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h index 593192dfb5067353dfca5fc4d82ce36100317245..5ddf06145f50f134926d153845de65e275892e44 100644 --- a/keyboards/wsk/pain27/config.h +++ b/keyboards/wsk/pain27/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, D0 } -#define MATRIX_COL_PINS { D2, B3, F6, B1, B2, B6, D4, C6, D7, 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/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json index ee3d584873871e35da166be16fbf4f58ea7f6536..021d5ac5739c2b5a2aeacab58eb5ac0da5c29e2f 100644 --- a/keyboards/wsk/pain27/info.json +++ b/keyboards/wsk/pain27/info.json @@ -8,6 +8,11 @@ "pid": "0x9E8C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "B3", "F6", "B1", "B2", "B6", "D4", "C6", "D7", "E6"], + "rows": ["F4", "F5", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h index 2dca1b6d6dd344ba373269e9f195b4aea82cfe4b..ed32129b5973a73fccaa5030b23e0568267a17cb 100644 --- a/keyboards/wsk/sl40/config.h +++ b/keyboards/wsk/sl40/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, D2, D0 } -#define MATRIX_COL_PINS { D3, D1, F6, F7, B6, B2, B3, B1, 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 diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json index f9f700e42c67c634552f4de18e65ec4f2f507f21..713987382f0572951c428861b2eb03f8954d5b92 100644 --- a/keyboards/wsk/sl40/info.json +++ b/keyboards/wsk/sl40/info.json @@ -8,6 +8,11 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D1", "F6", "F7", "B6", "B2", "B3", "B1", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "D2", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h index 8b12e346b635bb64e785b730e4e50e84714d637f..4cb0e034be7b5d327ac7527f1fdf6ac0ea2c6e5d 100644 --- a/keyboards/wsk/tkl30/config.h +++ b/keyboards/wsk/tkl30/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, B5, F4 } -#define MATRIX_COL_PINS { D3, D1, D0, D4, F7, C6, B1, D7, B3, E6, B2, B4, B6, F6, E5 } - -/* 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/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json index b210528ba0a2fb6be20de5865459f98243b653b8..f3f57e50b5f341b0b89c2a17042f013929aa1b3a 100644 --- a/keyboards/wsk/tkl30/info.json +++ b/keyboards/wsk/tkl30/info.json @@ -8,6 +8,11 @@ "pid": "0x0B7F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D1", "D0", "D4", "F7", "C6", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "F6", "E5"], + "rows": ["D2", "B5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h index 45f78436988c03f71afd01702d7ab0aa5b607048..53b28706403eaa88597a3417daf0ae153bdb5351 100644 --- a/keyboards/wuque/ikki68/config.h +++ b/keyboards/wuque/ikki68/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6,F7 } - -#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/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json index 4cdf46a99a6912ff8fc3ad1cba9b7a4341d4829d..fd1cb7f9ba0daaa14f6a0d92b1ac8a4330b94aa1 100644 --- a/keyboards/wuque/ikki68/info.json +++ b/keyboards/wuque/ikki68/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["68_ansi"], diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h index 85a6ecf974ba42a6f39df9b9ebf12c41dbede9d4..496e22c07a5113f4ca79d94881d14cfbf95a4033 100644 --- a/keyboards/wuque/ikki68_aurora/config.h +++ b/keyboards/wuque/ikki68_aurora/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, F0, F1, E6, B5, B4, D7, D6, D4, F4, F5, F6 } - -#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/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json index bf47f85a75d379f44fd79e961e4dcb990d574f51..d9157dc5d6a39ba3eab7b2f8ea9d07902094c136 100644 --- a/keyboards/wuque/ikki68_aurora/info.json +++ b/keyboards/wuque/ikki68_aurora/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"], + "rows": ["B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F7", "on_state": 0 diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index 8d9a74f5aad68d890ba952f151b160ad4041f0f6..c35fac65d61dec970af13b7c966c467b11a1bed6 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D5, F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { B0, B1, E6, F7 } - -#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/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json index b251951becbd25c393932872806ed585ea549830..e348f8af5a7155ea9fd8955f03a71ea318383d50 100644 --- a/keyboards/wuque/mammoth20x/info.json +++ b/keyboards/wuque/mammoth20x/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "E6", "F7"], + "rows": ["D5", "F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 2} diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h index 55702e33527b68aa69bd68c3ad82a1e7ef38283b..6b0d17be5cd00f73853b4c2a54f2ce8d0b8d2e77 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B0, C7, D2, F7, D1, D0 } -#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, E6, F0, F1, F4, F5, F6, C6, B7, B3 } - -#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/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json index b668948f46c0316a355479013e3f4f0a186654fb..bacdeef0e4ac97f46b292a66f86fff68ee6e0c36 100644 --- a/keyboards/wuque/mammoth75x/info.json +++ b/keyboards/wuque/mammoth75x/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "E6", "F0", "F1", "F4", "F5", "F6", "C6", "B7", "B3"], + "rows": ["B0", "C7", "D2", "F7", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1", "resolution": 2} diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h index e609117661ea473d45f44411d101289fca124b50..814dbd2d02fbcf28c04101418c4c48ee48dd403f 100644 --- a/keyboards/wuque/promise87/ansi/config.h +++ b/keyboards/wuque/promise87/ansi/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } -#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 1 diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json index 0a0fefabd04e3770f983bcff370fdf96c83969ec..d6cfb88bb295be1bc1c712885f25c5ce659b8080 100644 --- a/keyboards/wuque/promise87/ansi/info.json +++ b/keyboards/wuque/promise87/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], + "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", "on_state": 0 diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h index e609117661ea473d45f44411d101289fca124b50..814dbd2d02fbcf28c04101418c4c48ee48dd403f 100644 --- a/keyboards/wuque/promise87/wkl/config.h +++ b/keyboards/wuque/promise87/wkl/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } -#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 1 diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json index eca78d19b5d2a481d0c8bff93c0392ab417dc1a9..1b8876686b66080c6bc5ba5694d9d64fb0877d30 100644 --- a/keyboards/wuque/promise87/wkl/info.json +++ b/keyboards/wuque/promise87/wkl/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], + "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", "on_state": 0 diff --git a/keyboards/wuque/serneity65/config.h b/keyboards/wuque/serneity65/config.h index 036181772b1185c8c2900221b1098bdb3d6441de..134605fcab5cae76da30435afd5965c2a15b72bf 100644 --- a/keyboards/wuque/serneity65/config.h +++ b/keyboards/wuque/serneity65/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B0, F0, B1, D2, D3 } -#define MATRIX_COL_PINS { B6, B5, D5, D4, D6, B4, D7, F1, F4, F5, F6, F7, C7, E6, B7 } - -#define DIODE_DIRECTION COL2ROW - // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 3, 4 } } #define ENCODERS_CCW_KEY { { 5, 4 } } diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json index 744b112f70a8401ec6c6d0348db67873b4bbb677..4d295b0f755259031b6fba6ff7f20a01cf21ebc3 100644 --- a/keyboards/wuque/serneity65/info.json +++ b/keyboards/wuque/serneity65/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"], + "rows": ["B0", "F0", "B1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h index c4890ec9b1ec7415e24dc62544fbced0b1947437..bbde3a61578756c5fab582a2cee82cbcac743e8a 100644 --- a/keyboards/wuque/tata80/wk/config.h +++ b/keyboards/wuque/tata80/wk/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* 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/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json index f1b5acf12d042943d20bdd14204ee80d94c06b19..23146206c4ac6381c30f2a4a04fa0cc863400cb6 100644 --- a/keyboards/wuque/tata80/wk/info.json +++ b/keyboards/wuque/tata80/wk/info.json @@ -8,6 +8,11 @@ "pid": "0x0168", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { diff --git a/keyboards/wuque/tata80/wkl/config.h b/keyboards/wuque/tata80/wkl/config.h index c4890ec9b1ec7415e24dc62544fbced0b1947437..bbde3a61578756c5fab582a2cee82cbcac743e8a 100644 --- a/keyboards/wuque/tata80/wkl/config.h +++ b/keyboards/wuque/tata80/wkl/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* 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/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json index c23c8dd856f50a650c067fe1d255b7486806c34a..47089bf7a15d25b887b4b60ca5b518c4deb4bd3e 100644 --- a/keyboards/wuque/tata80/wkl/info.json +++ b/keyboards/wuque/tata80/wkl/info.json @@ -8,6 +8,11 @@ "pid": "0x0169", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": {