From 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:32:05 +1100 Subject: [PATCH] Move matrix config to info.json, part 6 (#20019) --- .../cablecardesigns/cypher/rev6/config.h | 7 -- .../cablecardesigns/cypher/rev6/info.json | 5 ++ keyboards/caffeinated/serpent65/config.h | 23 ----- keyboards/caffeinated/serpent65/info.json | 5 ++ keyboards/canary/canary60rgb/info.json | 5 ++ keyboards/canary/canary60rgb/v1/config.h | 16 ---- keyboards/cannonkeys/adelie/config.h | 17 ---- keyboards/cannonkeys/adelie/info.json | 5 ++ keyboards/cannonkeys/aella/config.h | 4 - keyboards/cannonkeys/aella/info.json | 5 ++ keyboards/cannonkeys/an_c/config.h | 4 - keyboards/cannonkeys/an_c/info.json | 5 ++ keyboards/cannonkeys/atlas/config.h | 4 - keyboards/cannonkeys/atlas/info.json | 5 ++ keyboards/cannonkeys/atlas_alps/config.h | 9 -- keyboards/cannonkeys/atlas_alps/info.json | 5 ++ keyboards/cannonkeys/balance/config.h | 4 - keyboards/cannonkeys/balance/info.json | 5 ++ keyboards/cannonkeys/brutalv2_65/config.h | 4 - keyboards/cannonkeys/brutalv2_65/info.json | 5 ++ keyboards/cannonkeys/chimera65/config.h | 4 - keyboards/cannonkeys/chimera65/info.json | 5 ++ keyboards/cannonkeys/cloudline/config.h | 4 - keyboards/cannonkeys/cloudline/info.json | 5 ++ keyboards/cannonkeys/crin/config.h | 5 -- keyboards/cannonkeys/crin/info.json | 5 ++ keyboards/cannonkeys/db60/config.h | 5 -- keyboards/cannonkeys/db60/info.json | 5 ++ keyboards/cannonkeys/devastatingtkl/config.h | 4 - keyboards/cannonkeys/devastatingtkl/info.json | 5 ++ keyboards/cannonkeys/gentoo/config.h | 4 - keyboards/cannonkeys/gentoo/info.json | 5 ++ keyboards/cannonkeys/gentoo_hs/config.h | 4 - keyboards/cannonkeys/gentoo_hs/info.json | 5 ++ keyboards/cannonkeys/hoodrowg/config.h | 5 -- keyboards/cannonkeys/hoodrowg/info.json | 5 ++ keyboards/cannonkeys/instant60/config.h | 4 - keyboards/cannonkeys/instant60/info.json | 5 ++ keyboards/cannonkeys/instant65/config.h | 4 - keyboards/cannonkeys/instant65/info.json | 5 ++ keyboards/cannonkeys/iron165/config.h | 4 - keyboards/cannonkeys/iron165/info.json | 5 ++ keyboards/cannonkeys/malicious_ergo/config.h | 4 - keyboards/cannonkeys/malicious_ergo/info.json | 5 ++ keyboards/cannonkeys/nearfield/config.h | 26 ------ keyboards/cannonkeys/nearfield/info.json | 5 ++ keyboards/cannonkeys/obliterated75/config.h | 4 - keyboards/cannonkeys/obliterated75/info.json | 5 ++ keyboards/cannonkeys/onyx/config.h | 4 - keyboards/cannonkeys/onyx/info.json | 5 ++ keyboards/cannonkeys/ortho48/config.h | 4 - keyboards/cannonkeys/ortho48/info.json | 5 ++ keyboards/cannonkeys/ortho60/config.h | 4 - keyboards/cannonkeys/ortho60/info.json | 5 ++ keyboards/cannonkeys/ortho75/config.h | 4 - keyboards/cannonkeys/ortho75/info.json | 5 ++ keyboards/cannonkeys/practice60/config.h | 4 - keyboards/cannonkeys/practice60/info.json | 5 ++ keyboards/cannonkeys/practice65/config.h | 4 - keyboards/cannonkeys/practice65/info.json | 5 ++ keyboards/cannonkeys/rekt1800/config.h | 4 - keyboards/cannonkeys/rekt1800/info.json | 5 ++ keyboards/cannonkeys/sagittarius/config.h | 4 - keyboards/cannonkeys/sagittarius/info.json | 5 ++ keyboards/cannonkeys/satisfaction75/config.h | 4 - keyboards/cannonkeys/satisfaction75/info.json | 5 ++ keyboards/cannonkeys/savage65/config.h | 4 - keyboards/cannonkeys/savage65/info.json | 5 ++ keyboards/cannonkeys/tmov2/config.h | 4 - keyboards/cannonkeys/tmov2/info.json | 5 ++ keyboards/cannonkeys/tsukuyomi/config.h | 4 - keyboards/cannonkeys/tsukuyomi/info.json | 5 ++ keyboards/cannonkeys/vicious40/config.h | 4 - keyboards/cannonkeys/vicious40/info.json | 5 ++ keyboards/capsunlocked/cu24/config.h | 17 ---- keyboards/capsunlocked/cu24/info.json | 5 ++ keyboards/capsunlocked/cu65/config.h | 17 ---- keyboards/capsunlocked/cu65/info.json | 5 ++ keyboards/capsunlocked/cu7/config.h | 17 ---- keyboards/capsunlocked/cu7/info.json | 5 ++ keyboards/capsunlocked/cu75/config.h | 5 -- keyboards/capsunlocked/cu75/info.json | 5 ++ keyboards/capsunlocked/cu80/v1/config.h | 7 -- keyboards/capsunlocked/cu80/v1/info.json | 5 ++ keyboards/carbo65/config.h | 7 -- keyboards/carbo65/info.json | 5 ++ keyboards/catch22/config.h | 8 -- keyboards/catch22/info.json | 5 ++ keyboards/cest73/tkm/config.h | 13 --- keyboards/cest73/tkm/info.json | 5 ++ keyboards/chalice/config.h | 7 -- keyboards/chalice/info.json | 5 ++ keyboards/chaos65/config.h | 8 -- keyboards/chaos65/info.json | 5 ++ keyboards/charue/charon/config.h | 24 ----- keyboards/charue/charon/info.json | 5 ++ keyboards/charue/sunsetter/config.h | 22 ----- keyboards/charue/sunsetter/info.json | 5 ++ keyboards/charue/sunsetter_r2/config.h | 8 -- keyboards/charue/sunsetter_r2/info.json | 5 ++ keyboards/chavdai40/rev1/config.h | 6 -- keyboards/chavdai40/rev1/info.json | 5 ++ keyboards/chavdai40/rev2/config.h | 6 -- keyboards/chavdai40/rev2/info.json | 5 ++ keyboards/checkerboards/axon40/config.h | 9 -- keyboards/checkerboards/axon40/info.json | 5 ++ .../checkerboards/candybar_ortho/config.h | 9 -- .../checkerboards/candybar_ortho/info.json | 5 ++ keyboards/checkerboards/g_idb60/config.h | 8 -- keyboards/checkerboards/g_idb60/info.json | 5 ++ keyboards/checkerboards/nop60/config.h | 8 -- keyboards/checkerboards/nop60/info.json | 5 ++ .../checkerboards/phoenix45_ortho/config.h | 8 -- .../checkerboards/phoenix45_ortho/info.json | 5 ++ keyboards/checkerboards/plexus75/config.h | 7 -- keyboards/checkerboards/plexus75/info.json | 5 ++ keyboards/checkerboards/plexus75_he/config.h | 8 -- keyboards/checkerboards/plexus75_he/info.json | 5 ++ keyboards/checkerboards/pursuit40/config.h | 8 -- keyboards/checkerboards/pursuit40/info.json | 5 ++ keyboards/checkerboards/quark/config.h | 8 -- keyboards/checkerboards/quark/info.json | 5 ++ keyboards/checkerboards/quark_lp/config.h | 7 -- keyboards/checkerboards/quark_lp/info.json | 5 ++ keyboards/checkerboards/quark_plus/config.h | 8 -- keyboards/checkerboards/quark_plus/info.json | 5 ++ .../checkerboards/quark_squared/config.h | 8 -- .../checkerboards/quark_squared/info.json | 5 ++ keyboards/checkerboards/snop60/config.h | 8 -- keyboards/checkerboards/snop60/info.json | 5 ++ .../checkerboards/ud40_ortho_alt/config.h | 8 -- .../checkerboards/ud40_ortho_alt/info.json | 5 ++ keyboards/cherrybstudio/cb1800/config.h | 18 ---- keyboards/cherrybstudio/cb1800/info.json | 5 ++ keyboards/cherrybstudio/cb65/config.h | 18 ---- keyboards/cherrybstudio/cb65/info.json | 5 ++ keyboards/cherrybstudio/cb87/config.h | 18 ---- keyboards/cherrybstudio/cb87/info.json | 5 ++ keyboards/cherrybstudio/cb87rgb/config.h | 18 ---- keyboards/cherrybstudio/cb87rgb/info.json | 5 ++ keyboards/cherrybstudio/cb87v2/config.h | 18 ---- keyboards/cherrybstudio/cb87v2/info.json | 5 ++ keyboards/cheshire/curiosity/config.h | 6 -- keyboards/cheshire/curiosity/info.json | 5 ++ keyboards/chickenman/ciel/config.h | 17 ---- keyboards/chickenman/ciel/info.json | 5 ++ keyboards/chlx/merro60/config.h | 16 ---- keyboards/chlx/merro60/info.json | 5 ++ keyboards/chlx/str_merro60/config.h | 17 ---- keyboards/chlx/str_merro60/info.json | 5 ++ keyboards/chocofly/v1/config.h | 9 -- keyboards/chocofly/v1/info.json | 5 ++ keyboards/chocv/config.h | 24 ----- keyboards/chocv/info.json | 5 ++ keyboards/cipulot/kallos/config.h | 10 --- keyboards/cipulot/kallos/info.json | 5 ++ keyboards/cipulot/kawayo/config.h | 8 -- keyboards/cipulot/kawayo/info.json | 5 ++ keyboards/ck60i/config.h | 4 - keyboards/ck60i/info.json | 5 ++ keyboards/ckeys/handwire_101/config.h | 17 ---- keyboards/ckeys/handwire_101/info.json | 5 ++ keyboards/ckeys/nakey/config.h | 17 ---- keyboards/ckeys/nakey/info.json | 5 ++ keyboards/ckeys/obelus/config.h | 17 ---- keyboards/ckeys/obelus/info.json | 5 ++ keyboards/ckeys/thedora/config.h | 7 -- keyboards/ckeys/thedora/info.json | 5 ++ keyboards/ckeys/washington/config.h | 17 ---- keyboards/ckeys/washington/info.json | 5 ++ keyboards/clawsome/bookerboard/config.h | 34 -------- keyboards/clawsome/bookerboard/info.json | 5 ++ keyboards/clawsome/coupe/config.h | 34 -------- keyboards/clawsome/coupe/info.json | 5 ++ keyboards/clawsome/doodle/config.h | 33 ------- keyboards/clawsome/doodle/info.json | 5 ++ keyboards/clawsome/fightpad/config.h | 34 -------- keyboards/clawsome/fightpad/info.json | 5 ++ keyboards/clawsome/gamebuddy/v1_0/config.h | 24 ----- keyboards/clawsome/gamebuddy/v1_0/info.json | 5 ++ keyboards/clawsome/gamebuddy/v1_m/config.h | 33 ------- keyboards/clawsome/gamebuddy/v1_m/info.json | 5 ++ keyboards/clawsome/hatchback/config.h | 33 ------- keyboards/clawsome/hatchback/info.json | 5 ++ keyboards/clawsome/luggage_rack/config.h | 33 ------- keyboards/clawsome/luggage_rack/info.json | 5 ++ keyboards/clawsome/numeros/config.h | 34 -------- keyboards/clawsome/numeros/info.json | 5 ++ keyboards/clawsome/roadster/config.h | 34 -------- keyboards/clawsome/roadster/info.json | 5 ++ keyboards/clawsome/sedan/config.h | 34 -------- keyboards/clawsome/sedan/info.json | 5 ++ keyboards/clawsome/sidekick/config.h | 24 ----- keyboards/clawsome/sidekick/info.json | 5 ++ keyboards/clawsome/suv/config.h | 33 ------- keyboards/clawsome/suv/info.json | 5 ++ keyboards/clickety_split/leeloo/info.json | 5 ++ keyboards/clickety_split/leeloo/rev1/config.h | 6 -- keyboards/cmm_studio/fuji65/config.h | 16 ---- keyboards/cmm_studio/fuji65/info.json | 5 ++ keyboards/cmm_studio/saka68/hotswap/config.h | 35 -------- keyboards/cmm_studio/saka68/hotswap/info.json | 5 ++ keyboards/cmm_studio/saka68/solder/config.h | 33 ------- keyboards/cmm_studio/saka68/solder/info.json | 5 ++ keyboards/coarse/cordillera/config.h | 4 - keyboards/coarse/cordillera/info.json | 5 ++ keyboards/coarse/ixora/config.h | 8 -- keyboards/coarse/ixora/info.json | 5 ++ keyboards/coarse/vinta/config.h | 8 -- keyboards/coarse/vinta/info.json | 5 ++ keyboards/compound/config.h | 27 ------ keyboards/compound/info.json | 5 ++ keyboards/contender/config.h | 17 ---- keyboards/contender/info.json | 5 ++ keyboards/converter/a1200/miss1200/config.h | 40 --------- keyboards/converter/a1200/miss1200/info.json | 5 ++ .../converter/a1200/mistress1200/config.h | 17 ---- .../converter/a1200/mistress1200/info.json | 5 ++ keyboards/converter/a1200/teensy2pp/config.h | 40 --------- keyboards/converter/a1200/teensy2pp/info.json | 5 ++ keyboards/converter/modelm101/config.h | 17 ---- keyboards/converter/modelm101/info.json | 5 ++ .../converter/modelm101_teensy2/config.h | 17 ---- .../converter/modelm101_teensy2/info.json | 5 ++ keyboards/converter/modelm_ssk/config.h | 17 ---- keyboards/converter/modelm_ssk/info.json | 5 ++ .../converter/numeric_keypad_iie/config.h | 87 ------------------- .../converter/numeric_keypad_iie/info.json | 5 ++ keyboards/converter/siemens_tastatur/config.h | 5 -- keyboards/cool836a/config.h | 18 ---- keyboards/cool836a/info.json | 5 ++ .../copenhagen_click/click_pad_v1/config.h | 17 ---- .../copenhagen_click/click_pad_v1/info.json | 5 ++ keyboards/coseyfannitutti/discipad/config.h | 19 ---- keyboards/coseyfannitutti/discipad/info.json | 5 ++ keyboards/coseyfannitutti/discipline/config.h | 18 ---- .../coseyfannitutti/discipline/info.json | 5 ++ keyboards/coseyfannitutti/mullet/config.h | 17 ---- keyboards/coseyfannitutti/mullet/info.json | 5 ++ keyboards/coseyfannitutti/mulletpad/config.h | 51 ----------- keyboards/coseyfannitutti/mulletpad/info.json | 5 ++ keyboards/coseyfannitutti/mysterium/config.h | 18 ---- keyboards/coseyfannitutti/mysterium/info.json | 5 ++ keyboards/coseyfannitutti/romeo/config.h | 20 ----- keyboards/coseyfannitutti/romeo/info.json | 5 ++ keyboards/cosmo65/config.h | 5 -- keyboards/cosmo65/info.json | 5 ++ keyboards/cozykeys/bloomer/v2/config.h | 24 ----- keyboards/cozykeys/bloomer/v2/info.json | 5 ++ keyboards/cozykeys/bloomer/v3/config.h | 24 ----- keyboards/cozykeys/bloomer/v3/info.json | 5 ++ keyboards/cozykeys/speedo/v2/config.h | 6 -- keyboards/cozykeys/speedo/v2/info.json | 5 ++ keyboards/cozykeys/speedo/v3/config.h | 6 -- keyboards/cozykeys/speedo/v3/info.json | 5 ++ keyboards/craftwalk/config.h | 17 ---- keyboards/craftwalk/info.json | 5 ++ keyboards/crawlpad/config.h | 8 -- keyboards/crawlpad/info.json | 5 ++ keyboards/crazy_keyboard_68/config.h | 17 ---- keyboards/crazy_keyboard_68/info.json | 5 ++ keyboards/crbn/config.h | 8 -- keyboards/crbn/info.json | 5 ++ keyboards/creatkeebs/glacier/config.h | 8 -- keyboards/creatkeebs/glacier/info.json | 5 ++ keyboards/creatkeebs/thera/config.h | 8 -- keyboards/creatkeebs/thera/info.json | 5 ++ .../crimsonkeyboards/resume1800/config.h | 18 ---- .../crimsonkeyboards/resume1800/info.json | 5 ++ keyboards/crin/config.h | 4 - keyboards/crin/info.json | 5 ++ keyboards/crkbd/config.h | 44 ---------- keyboards/crkbd/info.json | 5 ++ keyboards/crkbd/r2g/config.h | 2 - keyboards/crkbd/rev1/config.h | 2 - keyboards/custommk/genesis/rev1/config.h | 8 -- keyboards/custommk/genesis/rev1/info.json | 5 ++ keyboards/custommk/genesis/rev2/config.h | 8 -- keyboards/custommk/genesis/rev2/info.json | 5 ++ keyboards/cutie_club/borsdorf/config.h | 10 --- keyboards/cutie_club/borsdorf/info.json | 5 ++ keyboards/cutie_club/giant_macro_pad/config.h | 10 --- .../cutie_club/giant_macro_pad/info.json | 5 ++ keyboards/cutie_club/keebcats/denis/config.h | 10 --- keyboards/cutie_club/keebcats/denis/info.json | 5 ++ keyboards/cutie_club/keebcats/dougal/config.h | 10 --- .../cutie_club/keebcats/dougal/info.json | 5 ++ keyboards/cutie_club/novus/config.h | 17 ---- keyboards/cutie_club/novus/info.json | 5 ++ keyboards/cutie_club/wraith/config.h | 17 ---- keyboards/cutie_club/wraith/info.json | 5 ++ keyboards/cx60/config.h | 8 -- keyboards/cx60/info.json | 5 ++ .../handwired/108key_trackpoint/config.h | 6 -- .../handwired/108key_trackpoint/info.json | 5 ++ keyboards/handwired/2x5keypad/config.h | 8 -- keyboards/handwired/2x5keypad/info.json | 5 ++ keyboards/handwired/3dfoxc/config.h | 33 ------- keyboards/handwired/3dfoxc/info.json | 5 ++ keyboards/handwired/3dp660/config.h | 8 -- keyboards/handwired/3dp660/info.json | 5 ++ keyboards/handwired/412_64/config.h | 17 ---- keyboards/handwired/412_64/info.json | 5 ++ keyboards/handwired/42/config.h | 17 ---- keyboards/handwired/42/info.json | 5 ++ keyboards/handwired/6key/config.h | 8 -- keyboards/handwired/6key/info.json | 5 ++ keyboards/handwired/6macro/config.h | 8 -- keyboards/handwired/6macro/info.json | 5 ++ keyboards/handwired/aek64/config.h | 7 -- keyboards/handwired/aek64/info.json | 5 ++ keyboards/handwired/aim65/config.h | 33 ------- keyboards/handwired/aim65/info.json | 5 ++ keyboards/handwired/amigopunk/config.h | 8 -- keyboards/handwired/amigopunk/info.json | 5 ++ keyboards/handwired/angel/config.h | 11 --- keyboards/handwired/angel/info.json | 5 ++ keyboards/handwired/aplx2/config.h | 27 ------ keyboards/handwired/aplx2/info.json | 5 ++ keyboards/handwired/aranck/config.h | 19 ---- keyboards/handwired/aranck/info.json | 5 ++ keyboards/handwired/arrow_pad/config.h | 17 ---- keyboards/handwired/arrow_pad/info.json | 5 ++ keyboards/handwired/atreus50/config.h | 8 -- keyboards/handwired/atreus50/info.json | 5 ++ keyboards/handwired/axon/config.h | 8 -- keyboards/handwired/axon/info.json | 5 ++ .../handwired/battleship_gamepad/config.h | 8 -- .../handwired/battleship_gamepad/info.json | 5 ++ keyboards/handwired/bigmac/config.h | 33 ------- keyboards/handwired/bigmac/info.json | 5 ++ keyboards/handwired/bolek/config.h | 17 ---- keyboards/handwired/bolek/info.json | 5 ++ .../handwired/boss566y/redragon_vara/config.h | 34 -------- .../boss566y/redragon_vara/info.json | 5 ++ keyboards/handwired/brain/config.h | 12 --- keyboards/handwired/brain/info.json | 10 +++ keyboards/handwired/bstk100/config.h | 17 ---- keyboards/handwired/bstk100/info.json | 5 ++ keyboards/handwired/cans12er/config.h | 8 -- keyboards/handwired/cans12er/info.json | 5 ++ keyboards/handwired/carpolly/config.h | 37 -------- keyboards/handwired/carpolly/info.json | 5 ++ keyboards/handwired/chiron/config.h | 9 -- keyboards/handwired/chiron/info.json | 5 ++ keyboards/handwired/ck4x4/config.h | 4 - keyboards/handwired/ck4x4/info.json | 5 ++ keyboards/handwired/cmd60/config.h | 17 ---- keyboards/handwired/cmd60/info.json | 5 ++ keyboards/handwired/co60/rev1/config.h | 51 ----------- keyboards/handwired/co60/rev1/info.json | 5 ++ keyboards/handwired/co60/rev6/config.h | 9 -- keyboards/handwired/co60/rev6/info.json | 5 ++ keyboards/handwired/co60/rev7/config.h | 9 -- keyboards/handwired/co60/rev7/info.json | 5 ++ keyboards/handwired/colorlice/config.h | 8 -- keyboards/handwired/colorlice/info.json | 5 ++ keyboards/handwired/concertina/64key/config.h | 6 -- .../handwired/concertina/64key/info.json | 5 ++ .../handwired/consolekeyboard/18key/config.h | 16 ---- .../handwired/consolekeyboard/18key/info.json | 5 ++ .../handwired/consolekeyboard/20key/config.h | 16 ---- .../handwired/consolekeyboard/20key/info.json | 5 ++ .../handwired/consolekeyboard/27key/config.h | 16 ---- .../handwired/consolekeyboard/27key/info.json | 5 ++ .../handwired/consolekeyboard/30key/config.h | 16 ---- .../handwired/consolekeyboard/30key/info.json | 5 ++ keyboards/handwired/croxsplit44/config.h | 6 -- keyboards/handwired/croxsplit44/info.json | 5 ++ keyboards/handwired/curiosity/config.h | 8 -- keyboards/handwired/curiosity/info.json | 5 ++ keyboards/handwired/cyberstar/config.h | 7 -- keyboards/handwired/cyberstar/info.json | 5 ++ keyboards/handwired/d48/config.h | 9 -- keyboards/handwired/d48/info.json | 5 ++ keyboards/handwired/dactyl_left/config.h | 19 ---- keyboards/handwired/dactyl_left/info.json | 5 ++ .../handwired/dactyl_manuform/3x5_3/config.h | 7 -- .../handwired/dactyl_manuform/3x5_3/info.json | 5 ++ .../handwired/dactyl_manuform/4x5/config.h | 8 -- .../handwired/dactyl_manuform/4x5/info.json | 5 ++ .../handwired/dactyl_manuform/4x5_5/config.h | 7 -- .../handwired/dactyl_manuform/4x5_5/info.json | 5 ++ .../handwired/dactyl_manuform/4x6/config.h | 8 -- .../handwired/dactyl_manuform/4x6/info.json | 5 ++ .../handwired/dactyl_manuform/4x6_5/config.h | 8 -- .../handwired/dactyl_manuform/4x6_5/info.json | 5 ++ .../handwired/dactyl_manuform/5x6/config.h | 7 -- .../handwired/dactyl_manuform/5x6/info.json | 5 ++ .../dactyl_manuform/5x6_2_5/config.h | 33 ------- .../dactyl_manuform/5x6_2_5/info.json | 5 ++ .../handwired/dactyl_manuform/5x6_5/config.h | 30 ------- .../handwired/dactyl_manuform/5x6_5/info.json | 5 ++ .../handwired/dactyl_manuform/5x6_6/config.h | 24 ----- .../handwired/dactyl_manuform/5x6_6/info.json | 5 ++ .../handwired/dactyl_manuform/5x7/config.h | 7 -- .../handwired/dactyl_manuform/5x7/info.json | 5 ++ .../6x6/blackpill_f411/config.h | 5 -- .../6x6/blackpill_f411/info.json | 5 ++ .../dactyl_manuform/6x6/promicro/config.h | 7 -- .../dactyl_manuform/6x6/promicro/info.json | 5 ++ .../handwired/dactyl_manuform/6x6_4/config.h | 7 -- .../handwired/dactyl_manuform/6x6_4/info.json | 5 ++ .../dactyl_manuform/6x6_kinesis/config.h | 7 -- .../dactyl_manuform/6x6_kinesis/info.json | 5 ++ .../handwired/dactyl_manuform/6x7/config.h | 7 -- .../handwired/dactyl_manuform/6x7/info.json | 5 ++ .../dactyl_manuform/dmote/62key/config.h | 34 -------- .../dactyl_manuform/dmote/62key/info.json | 5 ++ keyboards/handwired/dactyl_promicro/config.h | 7 -- keyboards/handwired/dactyl_promicro/info.json | 5 ++ keyboards/handwired/dactyl_rah/config.h | 7 -- keyboards/handwired/dactyl_rah/info.json | 5 ++ keyboards/handwired/daishi/config.h | 17 ---- keyboards/handwired/daishi/info.json | 5 ++ keyboards/handwired/ddg_56/config.h | 21 ----- keyboards/handwired/ddg_56/info.json | 5 ++ keyboards/handwired/eagleii/config.h | 6 -- keyboards/handwired/eagleii/info.json | 5 ++ keyboards/handwired/elrgo_s/config.h | 37 -------- keyboards/handwired/elrgo_s/info.json | 5 ++ keyboards/handwired/ergocheap/config.h | 5 -- keyboards/handwired/ergocheap/info.json | 5 ++ keyboards/handwired/evk/v1_3/config.h | 19 ---- keyboards/handwired/evk/v1_3/info.json | 5 ++ keyboards/handwired/fc200rt_qmk/config.h | 7 -- keyboards/handwired/fc200rt_qmk/info.json | 5 ++ keyboards/handwired/fivethirteen/config.h | 17 ---- keyboards/handwired/fivethirteen/info.json | 5 ++ keyboards/handwired/floorboard/config.h | 17 ---- keyboards/handwired/floorboard/info.json | 5 ++ keyboards/handwired/frankie_macropad/config.h | 17 ---- .../handwired/frankie_macropad/info.json | 5 ++ keyboards/handwired/freoduo/config.h | 7 -- keyboards/handwired/freoduo/info.json | 5 ++ keyboards/handwired/fruity60/config.h | 9 -- keyboards/handwired/fruity60/info.json | 5 ++ keyboards/handwired/gamenum/config.h | 17 ---- keyboards/handwired/gamenum/info.json | 5 ++ keyboards/handwired/hacked_motospeed/config.h | 21 ----- .../handwired/hacked_motospeed/info.json | 5 ++ keyboards/handwired/heisenberg/config.h | 19 ---- keyboards/handwired/heisenberg/info.json | 5 ++ keyboards/handwired/hexon38/config.h | 8 -- keyboards/handwired/hexon38/info.json | 5 ++ keyboards/handwired/hnah108/config.h | 17 ---- keyboards/handwired/hnah108/info.json | 5 ++ keyboards/handwired/hnah40/config.h | 20 ----- keyboards/handwired/hnah40/info.json | 5 ++ keyboards/handwired/hnah40rgb/config.h | 19 ---- keyboards/handwired/hnah40rgb/info.json | 5 ++ keyboards/handwired/hwpm87/config.h | 20 ----- keyboards/handwired/hwpm87/info.json | 5 ++ keyboards/handwired/ibm122m/config.h | 17 ---- keyboards/handwired/ibm122m/info.json | 5 ++ keyboards/handwired/ibm_wheelwriter/config.h | 37 -------- keyboards/handwired/ibm_wheelwriter/info.json | 5 ++ keyboards/handwired/jn68m/config.h | 8 -- keyboards/handwired/jn68m/info.json | 5 ++ keyboards/handwired/jopr/config.h | 8 -- keyboards/handwired/jopr/info.json | 5 ++ keyboards/handwired/jot50/config.h | 8 -- keyboards/handwired/jot50/info.json | 5 ++ keyboards/handwired/jotanck/config.h | 8 -- keyboards/handwired/jotanck/info.json | 5 ++ keyboards/handwired/jotpad16/config.h | 8 -- keyboards/handwired/jotpad16/info.json | 5 ++ .../handwired/jtallbean/split_65/config.h | 19 ---- .../handwired/jtallbean/split_65/info.json | 13 ++- keyboards/handwired/juliet/config.h | 20 ----- keyboards/handwired/juliet/info.json | 5 ++ keyboards/handwired/k8split/config.h | 35 -------- keyboards/handwired/k8split/info.json | 5 ++ keyboards/handwired/k_numpad17/config.h | 8 -- keyboards/handwired/k_numpad17/info.json | 5 ++ keyboards/handwired/kbod/config.h | 6 -- keyboards/handwired/kbod/info.json | 5 ++ keyboards/handwired/ks63/config.h | 7 -- keyboards/handwired/ks63/info.json | 5 ++ keyboards/handwired/lagrange/config.h | 9 -- keyboards/handwired/lagrange/info.json | 13 +++ keyboards/handwired/leftynumpad/config.h | 17 ---- keyboards/handwired/leftynumpad/info.json | 5 ++ keyboards/handwired/lovelive9/config.h | 7 -- keyboards/handwired/lovelive9/info.json | 5 ++ keyboards/handwired/m40/5x5_macropad/config.h | 17 ---- .../handwired/m40/5x5_macropad/info.json | 5 ++ keyboards/handwired/macroboard/config.h | 14 --- keyboards/handwired/macroboard/f401/config.h | 22 ----- keyboards/handwired/macroboard/f401/info.json | 5 ++ keyboards/handwired/macroboard/f411/config.h | 4 - keyboards/handwired/macroboard/f411/info.json | 5 ++ keyboards/handwired/magicforce61/config.h | 17 ---- keyboards/handwired/magicforce61/info.json | 5 ++ keyboards/handwired/magicforce68/config.h | 17 ---- keyboards/handwired/magicforce68/info.json | 5 ++ keyboards/handwired/marauder/config.h | 14 --- keyboards/handwired/marauder/info.json | 5 ++ .../handwired/mechboards_micropad/config.h | 17 ---- .../handwired/mechboards_micropad/info.json | 5 ++ .../meck_tkl/blackpill_f401/config.h | 9 -- .../meck_tkl/blackpill_f401/info.json | 5 ++ keyboards/handwired/meck_tkl/config.h | 15 ---- keyboards/handwired/minorca/config.h | 8 -- keyboards/handwired/minorca/info.json | 5 ++ .../handwired/ms_sculpt_mobile/astar/config.h | 4 - .../ms_sculpt_mobile/astar/info.json | 5 ++ keyboards/handwired/ms_sculpt_mobile/config.h | 38 -------- .../ms_sculpt_mobile/teensy2pp/config.h | 4 - .../ms_sculpt_mobile/teensy2pp/info.json | 5 ++ keyboards/handwired/mutepad/config.h | 19 ---- keyboards/handwired/mutepad/info.json | 5 ++ keyboards/handwired/myskeeb/config.h | 7 -- keyboards/handwired/myskeeb/info.json | 12 ++- keyboards/handwired/nicekey/config.h | 6 -- keyboards/handwired/nicekey/info.json | 5 ++ keyboards/handwired/not_so_minidox/config.h | 8 -- keyboards/handwired/not_so_minidox/info.json | 5 ++ keyboards/handwired/novem/config.h | 17 ---- keyboards/handwired/novem/info.json | 5 ++ keyboards/handwired/nozbe_macro/config.h | 10 --- keyboards/handwired/nozbe_macro/info.json | 5 ++ keyboards/handwired/numpad20/config.h | 17 ---- keyboards/handwired/numpad20/info.json | 5 ++ .../handwired/obuwunkunubi/spaget/config.h | 9 -- .../handwired/obuwunkunubi/spaget/info.json | 5 ++ .../handwired/oem_ansi_fullsize/config.h | 24 ----- .../handwired/oem_ansi_fullsize/info.json | 5 ++ keyboards/handwired/oem_iso_fullsize/config.h | 37 -------- .../handwired/oem_iso_fullsize/info.json | 5 ++ keyboards/handwired/ortho5x13/config.h | 17 ---- keyboards/handwired/ortho5x13/info.json | 5 ++ keyboards/handwired/ortho5x14/config.h | 17 ---- keyboards/handwired/ortho5x14/info.json | 5 ++ keyboards/handwired/ortho_brass/config.h | 27 ------ keyboards/handwired/ortho_brass/info.json | 5 ++ keyboards/handwired/p65rgb/config.h | 8 -- keyboards/handwired/p65rgb/info.json | 5 ++ keyboards/handwired/pilcrow/config.h | 17 ---- keyboards/handwired/pilcrow/info.json | 5 ++ .../handwired/pill60/blackpill_f401/config.h | 22 ----- .../handwired/pill60/blackpill_f401/info.json | 5 ++ .../handwired/pill60/blackpill_f411/config.h | 22 ----- .../handwired/pill60/blackpill_f411/info.json | 5 ++ keyboards/handwired/pill60/bluepill/config.h | 22 ----- keyboards/handwired/pill60/bluepill/info.json | 5 ++ keyboards/handwired/pill60/config.h | 3 - .../handwired/postageboard/mini/config.h | 17 ---- .../handwired/postageboard/mini/info.json | 5 ++ keyboards/handwired/postageboard/r1/config.h | 17 ---- keyboards/handwired/postageboard/r1/info.json | 5 ++ keyboards/handwired/prime_exl/config.h | 8 -- keyboards/handwired/prime_exl/info.json | 5 ++ keyboards/handwired/prime_exl_plus/config.h | 8 -- keyboards/handwired/prime_exl_plus/info.json | 5 ++ keyboards/handwired/prkl30/feather/config.h | 6 -- keyboards/handwired/prkl30/feather/info.json | 5 ++ keyboards/handwired/prkl30/promicro/config.h | 6 -- keyboards/handwired/prkl30/promicro/info.json | 5 ++ keyboards/handwired/pteron/config.h | 9 -- keyboards/handwired/pteron/info.json | 5 ++ keyboards/handwired/pteron38/config.h | 25 ------ keyboards/handwired/pteron38/info.json | 5 ++ keyboards/handwired/pteron44/config.h | 25 ------ keyboards/handwired/pteron44/info.json | 5 ++ keyboards/handwired/qc60/config.h | 1 - keyboards/handwired/qc60/info.json | 5 ++ keyboards/handwired/qc60/proto/config.h | 6 -- keyboards/handwired/retro_refit/config.h | 8 -- keyboards/handwired/retro_refit/info.json | 5 ++ keyboards/handwired/riblee_f401/config.h | 6 -- keyboards/handwired/riblee_f401/info.json | 5 ++ keyboards/handwired/riblee_f411/config.h | 6 -- keyboards/handwired/riblee_f411/info.json | 5 ++ keyboards/handwired/rs60/config.h | 7 -- keyboards/handwired/rs60/info.json | 5 ++ keyboards/handwired/selene/config.h | 7 -- keyboards/handwired/selene/info.json | 5 ++ keyboards/handwired/sick68/config.h | 19 ---- keyboards/handwired/sick68/info.json | 5 ++ keyboards/handwired/sick_pad/config.h | 8 -- keyboards/handwired/sick_pad/info.json | 5 ++ keyboards/handwired/skakunm_dactyl/config.h | 7 -- keyboards/handwired/skakunm_dactyl/info.json | 5 ++ keyboards/handwired/slash/config.h | 16 ---- keyboards/handwired/slash/info.json | 5 ++ keyboards/handwired/snatchpad/config.h | 17 ---- keyboards/handwired/snatchpad/info.json | 5 ++ keyboards/handwired/sono1/config.h | 4 - keyboards/handwired/sono1/stm32f103/config.h | 4 - keyboards/handwired/sono1/stm32f103/info.json | 5 ++ keyboards/handwired/sono1/t2pp/config.h | 4 - keyboards/handwired/sono1/t2pp/info.json | 5 ++ keyboards/handwired/space_oddity/config.h | 7 -- keyboards/handwired/space_oddity/info.json | 5 ++ keyboards/handwired/split65/promicro/config.h | 8 -- .../handwired/split65/promicro/info.json | 5 ++ keyboards/handwired/split65/stm32/config.h | 6 -- keyboards/handwired/split65/stm32/info.json | 5 ++ keyboards/handwired/split89/config.h | 22 ----- keyboards/handwired/split89/info.json | 13 ++- .../handwired/splittest/bluepill/config.h | 5 -- .../handwired/splittest/bluepill/info.json | 5 ++ keyboards/handwired/splittest/config.h | 3 - .../handwired/splittest/promicro/config.h | 3 - .../handwired/splittest/promicro/info.json | 5 ++ .../handwired/splittest/teensy_2/config.h | 3 - .../handwired/splittest/teensy_2/info.json | 5 ++ keyboards/handwired/steamvan/rev1/config.h | 9 -- keyboards/handwired/steamvan/rev1/info.json | 5 ++ .../handwired/stef9998/split_5x7/info.json | 13 ++- .../stef9998/split_5x7/rev1/config.h | 45 ---------- keyboards/handwired/sticc14/config.h | 17 ---- keyboards/handwired/sticc14/info.json | 5 ++ keyboards/handwired/swiftrax/astro65/config.h | 29 ------- .../handwired/swiftrax/astro65/info.json | 5 ++ keyboards/handwired/swiftrax/bebol/config.h | 27 ------ keyboards/handwired/swiftrax/bebol/info.json | 5 ++ keyboards/handwired/swiftrax/beegboy/config.h | 10 --- .../handwired/swiftrax/beegboy/info.json | 5 ++ .../handwired/swiftrax/bumblebee/config.h | 8 -- .../handwired/swiftrax/bumblebee/info.json | 5 ++ keyboards/handwired/swiftrax/cowfish/config.h | 9 -- .../handwired/swiftrax/cowfish/info.json | 5 ++ .../handwired/swiftrax/digicarp65/config.h | 27 ------ .../handwired/swiftrax/digicarp65/info.json | 5 ++ .../handwired/swiftrax/digicarpice/config.h | 27 ------ .../handwired/swiftrax/digicarpice/info.json | 5 ++ keyboards/handwired/swiftrax/equator/config.h | 27 ------ .../handwired/swiftrax/equator/info.json | 5 ++ keyboards/handwired/swiftrax/glacier/config.h | 9 -- .../handwired/swiftrax/glacier/info.json | 5 ++ keyboards/handwired/swiftrax/joypad/config.h | 9 -- keyboards/handwired/swiftrax/joypad/info.json | 5 ++ .../swiftrax/koalafications/config.h | 9 -- .../swiftrax/koalafications/info.json | 5 ++ keyboards/handwired/swiftrax/nodu/config.h | 9 -- keyboards/handwired/swiftrax/nodu/info.json | 5 ++ .../handwired/swiftrax/pandamic/config.h | 9 -- .../handwired/swiftrax/pandamic/info.json | 5 ++ .../handwired/swiftrax/the_galleon/config.h | 10 --- .../handwired/swiftrax/the_galleon/info.json | 5 ++ keyboards/handwired/swiftrax/unsplit/config.h | 27 ------ .../handwired/swiftrax/unsplit/info.json | 5 ++ keyboards/handwired/swiftrax/walter/config.h | 9 -- keyboards/handwired/swiftrax/walter/info.json | 5 ++ keyboards/handwired/symmetry60/config.h | 17 ---- keyboards/handwired/symmetry60/info.json | 5 ++ keyboards/handwired/t111/config.h | 44 ---------- keyboards/handwired/t111/info.json | 5 ++ keyboards/handwired/tennie/config.h | 17 ---- keyboards/handwired/tennie/info.json | 5 ++ keyboards/handwired/terminus_mini/config.h | 17 ---- keyboards/handwired/terminus_mini/info.json | 5 ++ keyboards/handwired/trackpoint/config.h | 6 -- keyboards/handwired/trackpoint/info.json | 5 ++ .../tractyl_manuform/4x6_right/config.h | 7 -- .../tractyl_manuform/4x6_right/info.json | 5 ++ .../5x6_right/arduinomicro/config.h | 10 --- .../5x6_right/arduinomicro/info.json | 13 ++- .../5x6_right/elite_c/config.h | 8 -- .../5x6_right/elite_c/info.json | 5 ++ .../tractyl_manuform/5x6_right/f303/config.h | 11 --- .../tractyl_manuform/5x6_right/f303/info.json | 5 ++ .../tractyl_manuform/5x6_right/f411/config.h | 8 -- .../tractyl_manuform/5x6_right/f411/info.json | 5 ++ .../5x6_right/teensy2pp/config.h | 8 -- .../5x6_right/teensy2pp/info.json | 5 ++ keyboards/handwired/traveller/config.h | 17 ---- keyboards/handwired/traveller/info.json | 5 ++ keyboards/handwired/tritium_numpad/config.h | 9 -- keyboards/handwired/tritium_numpad/info.json | 5 ++ keyboards/handwired/twadlee/tp69/config.h | 20 ----- keyboards/handwired/twadlee/tp69/info.json | 5 ++ keyboards/handwired/twig/twig50/config.h | 6 -- keyboards/handwired/twig/twig50/info.json | 5 ++ keyboards/handwired/unicomp_mini_m/config.h | 17 ---- keyboards/handwired/unicomp_mini_m/info.json | 5 ++ keyboards/handwired/unk/rev1/config.h | 10 --- keyboards/handwired/unk/rev1/info.json | 13 ++- keyboards/handwired/uthol/config.h | 21 ----- keyboards/handwired/uthol/rev1/config.h | 23 ----- keyboards/handwired/uthol/rev1/info.json | 5 ++ keyboards/handwired/uthol/rev2/config.h | 5 -- keyboards/handwired/uthol/rev2/info.json | 5 ++ keyboards/handwired/uthol/rev3/config.h | 8 -- keyboards/handwired/uthol/rev3/info.json | 5 ++ keyboards/handwired/videowriter/config.h | 17 ---- keyboards/handwired/videowriter/info.json | 5 ++ keyboards/handwired/wabi/config.h | 19 ---- keyboards/handwired/wabi/info.json | 5 ++ keyboards/handwired/woodpad/config.h | 17 ---- keyboards/handwired/woodpad/info.json | 5 ++ keyboards/handwired/wulkan/config.h | 6 -- keyboards/handwired/wulkan/info.json | 5 ++ keyboards/handwired/xealous/config.h | 3 - keyboards/handwired/xealous/rev1/config.h | 22 ----- keyboards/handwired/xealous/rev1/info.json | 5 ++ keyboards/handwired/z150/config.h | 7 -- keyboards/handwired/z150/info.json | 5 ++ keyboards/handwired/zergo/config.h | 26 ------ keyboards/handwired/zergo/info.json | 5 ++ 702 files changed, 1779 insertions(+), 5015 deletions(-) delete mode 100755 keyboards/cannonkeys/nearfield/config.h delete mode 100644 keyboards/charue/charon/config.h delete mode 100644 keyboards/charue/sunsetter/config.h delete mode 100644 keyboards/chocofly/v1/config.h delete mode 100644 keyboards/chocv/config.h delete mode 100644 keyboards/clawsome/bookerboard/config.h delete mode 100644 keyboards/clawsome/coupe/config.h delete mode 100644 keyboards/clawsome/doodle/config.h delete mode 100644 keyboards/clawsome/fightpad/config.h delete mode 100644 keyboards/clawsome/gamebuddy/v1_0/config.h delete mode 100644 keyboards/clawsome/gamebuddy/v1_m/config.h delete mode 100644 keyboards/clawsome/hatchback/config.h delete mode 100644 keyboards/clawsome/luggage_rack/config.h delete mode 100644 keyboards/clawsome/numeros/config.h delete mode 100644 keyboards/clawsome/roadster/config.h delete mode 100644 keyboards/clawsome/sedan/config.h delete mode 100644 keyboards/clawsome/sidekick/config.h delete mode 100644 keyboards/clawsome/suv/config.h delete mode 100644 keyboards/cmm_studio/saka68/hotswap/config.h delete mode 100644 keyboards/cmm_studio/saka68/solder/config.h delete mode 100644 keyboards/coarse/ixora/config.h delete mode 100644 keyboards/coarse/vinta/config.h delete mode 100644 keyboards/compound/config.h delete mode 100644 keyboards/converter/a1200/miss1200/config.h delete mode 100644 keyboards/converter/a1200/teensy2pp/config.h delete mode 100644 keyboards/converter/numeric_keypad_iie/config.h delete mode 100644 keyboards/coseyfannitutti/mulletpad/config.h delete mode 100644 keyboards/cozykeys/bloomer/v2/config.h delete mode 100644 keyboards/cozykeys/bloomer/v3/config.h delete mode 100644 keyboards/crkbd/config.h delete mode 100644 keyboards/handwired/3dfoxc/config.h delete mode 100644 keyboards/handwired/aim65/config.h delete mode 100644 keyboards/handwired/aplx2/config.h delete mode 100644 keyboards/handwired/bigmac/config.h delete mode 100644 keyboards/handwired/boss566y/redragon_vara/config.h delete mode 100644 keyboards/handwired/carpolly/config.h delete mode 100644 keyboards/handwired/co60/rev1/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_2_5/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_5/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/config.h delete mode 100644 keyboards/handwired/ddg_56/config.h delete mode 100644 keyboards/handwired/eagleii/config.h delete mode 100644 keyboards/handwired/elrgo_s/config.h delete mode 100644 keyboards/handwired/hwpm87/config.h delete mode 100644 keyboards/handwired/ibm_wheelwriter/config.h delete mode 100644 keyboards/handwired/k8split/config.h delete mode 100644 keyboards/handwired/macroboard/f401/config.h delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/config.h delete mode 100644 keyboards/handwired/ms_sculpt_mobile/astar/config.h delete mode 100644 keyboards/handwired/ms_sculpt_mobile/config.h delete mode 100644 keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h delete mode 100644 keyboards/handwired/oem_iso_fullsize/config.h delete mode 100644 keyboards/handwired/ortho_brass/config.h delete mode 100644 keyboards/handwired/pill60/blackpill_f401/config.h delete mode 100644 keyboards/handwired/pill60/blackpill_f411/config.h delete mode 100644 keyboards/handwired/pill60/bluepill/config.h delete mode 100644 keyboards/handwired/pteron/config.h delete mode 100644 keyboards/handwired/pteron38/config.h delete mode 100644 keyboards/handwired/pteron44/config.h delete mode 100644 keyboards/handwired/qc60/config.h delete mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/config.h delete mode 100644 keyboards/handwired/swiftrax/astro65/config.h delete mode 100644 keyboards/handwired/swiftrax/bebol/config.h delete mode 100644 keyboards/handwired/swiftrax/digicarp65/config.h delete mode 100644 keyboards/handwired/swiftrax/digicarpice/config.h delete mode 100644 keyboards/handwired/swiftrax/equator/config.h delete mode 100644 keyboards/handwired/swiftrax/unsplit/config.h delete mode 100644 keyboards/handwired/t111/config.h delete mode 100644 keyboards/handwired/uthol/config.h delete mode 100644 keyboards/handwired/uthol/rev1/config.h delete mode 100644 keyboards/handwired/zergo/config.h diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h index dc8c82f7b07..8b17e3e1992 100644 --- a/keyboards/cablecardesigns/cypher/rev6/config.h +++ b/keyboards/cablecardesigns/cypher/rev6/config.h @@ -2,13 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -#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/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json index 4fc447236e1..0e8006486c0 100644 --- a/keyboards/cablecardesigns/cypher/rev6/info.json +++ b/keyboards/cablecardesigns/cypher/rev6/info.json @@ -6,6 +6,11 @@ "pid": "0xAA99", "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/caffeinated/serpent65/config.h b/keyboards/caffeinated/serpent65/config.h index cd974173a14..bb14ae71b11 100644 --- a/keyboards/caffeinated/serpent65/config.h +++ b/keyboards/caffeinated/serpent65/config.h @@ -17,29 +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 {B11, B10, B2, B1, B0, A7, A6, A5, B13, B12} -#define MATRIX_COL_PINS {A1, A2, A3, A4, B14, B15, A8, A9} -//{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 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/caffeinated/serpent65/info.json b/keyboards/caffeinated/serpent65/info.json index de52e1776e4..f2e0c2b4d56 100644 --- a/keyboards/caffeinated/serpent65/info.json +++ b/keyboards/caffeinated/serpent65/info.json @@ -8,6 +8,11 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], + "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index 069d812665a..55e0ea0c56b 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x0621", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index 757db924034..999ec9f1082 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h @@ -15,22 +15,6 @@ */ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B6 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h index e5f6cbedab0..59f438cfca8 100644 --- a/keyboards/cannonkeys/adelie/config.h +++ b/keyboards/cannonkeys/adelie/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, B1, B0 } -#define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLED_NUM 3 diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json index d075dc199a2..5dd8a27b23d 100644 --- a/keyboards/cannonkeys/adelie/info.json +++ b/keyboards/cannonkeys/adelie/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"], + "rows": ["F4", "F1", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cannonkeys/aella/config.h b/keyboards/cannonkeys/aella/config.h index a03a1f3fb83..4b007cf387e 100644 --- a/keyboards/cannonkeys/aella/config.h +++ b/keyboards/cannonkeys/aella/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A5, B0, B1, B2, B10, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A7 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json index 1fc2da7d64f..be8335bfd30 100644 --- a/keyboards/cannonkeys/aella/info.json +++ b/keyboards/cannonkeys/aella/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A5", "B0", "B1", "B2", "B10", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["A13", "B12", "B11", "B14", "A8", "A7"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h index a6b98722681..3120b3167a4 100644 --- a/keyboards/cannonkeys/an_c/config.h +++ b/keyboards/cannonkeys/an_c/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 } -#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json index 0517bb09d3a..25b2ce528cb 100644 --- a/keyboards/cannonkeys/an_c/info.json +++ b/keyboards/cannonkeys/an_c/info.json @@ -8,6 +8,11 @@ "pid": "0xA00C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"], + "rows": ["B1", "B0", "A7", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h index 9689ba3d221..0ff5f383bb0 100644 --- a/keyboards/cannonkeys/atlas/config.h +++ b/keyboards/cannonkeys/atlas/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A2, A1, A0, F1, F0, C15, C14, C13, B9, A15, A10, A9 } -#define MATRIX_ROW_PINS { A8, B14, B12, B4, 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/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json index fbc4e94d830..c3132a77802 100644 --- a/keyboards/cannonkeys/atlas/info.json +++ b/keyboards/cannonkeys/atlas/info.json @@ -8,6 +8,11 @@ "pid": "0xA7A5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "A15", "A10", "A9"], + "rows": ["A8", "B14", "B12", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h index 9adbb67a2f6..52b15c350c2 100644 --- a/keyboards/cannonkeys/atlas_alps/config.h +++ b/keyboards/cannonkeys/atlas_alps/config.h @@ -16,15 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B4, D1, D7, D6 } -#define MATRIX_COL_PINS { B6, C6, D2, E6, C7, B3, F7, F6, F5, F4, F1, F0 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json index e1831be72a0..ee7c94c0ad6 100644 --- a/keyboards/cannonkeys/atlas_alps/info.json +++ b/keyboards/cannonkeys/atlas_alps/info.json @@ -8,6 +8,11 @@ "pid": "0xA7A5", "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B5", "B4", "D1", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h index 5d93b09a273..f9c629dad82 100644 --- a/keyboards/cannonkeys/balance/config.h +++ b/keyboards/cannonkeys/balance/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, F1, C15, B3, C14, C13, B9, B8, B7 } -#define MATRIX_ROW_PINS { B4, A15, A14, A0, F0 } -#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/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json index b9844e52950..7a1db4a0ec3 100644 --- a/keyboards/cannonkeys/balance/info.json +++ b/keyboards/cannonkeys/balance/info.json @@ -8,6 +8,11 @@ "pid": "0xBA77", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "F1", "C15", "B3", "C14", "C13", "B9", "B8", "B7"], + "rows": ["B4", "A15", "A14", "A0", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6", "resolution": 2} diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h index 14b14879d62..ae9c049bc11 100644 --- a/keyboards/cannonkeys/brutalv2_65/config.h +++ b/keyboards/cannonkeys/brutalv2_65/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 } -#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json index 000e541557f..699b31fea2e 100644 --- a/keyboards/cannonkeys/brutalv2_65/info.json +++ b/keyboards/cannonkeys/brutalv2_65/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2"], + "rows": ["C14", "A1", "B14", "B15", "A8"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "on_state": 0 diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h index 26e04106abb..a47b76953a2 100644 --- a/keyboards/cannonkeys/chimera65/config.h +++ b/keyboards/cannonkeys/chimera65/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2, B1, A5, A4, A3, A2, A1, F0, C15, C14, A9, A8, A10, B3 } -#define MATRIX_ROW_PINS { A13, A14, A15, C13, B8 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/info.json index cdd07c34598..e5b30d6ea33 100644 --- a/keyboards/cannonkeys/chimera65/info.json +++ b/keyboards/cannonkeys/chimera65/info.json @@ -8,6 +8,11 @@ "pid": "0xC024", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "A5", "A4", "A3", "A2", "A1", "F0", "C15", "C14", "A9", "A8", "A10", "B3"], + "rows": ["A13", "A14", "A15", "C13", "B8"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h index d7c70521635..8826d5568ab 100644 --- a/keyboards/cannonkeys/cloudline/config.h +++ b/keyboards/cannonkeys/cloudline/config.h @@ -3,10 +3,6 @@ #pragma once -#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 } -#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index d5d8b817ea9..e6dc43ea108 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"], + "rows": ["A15", "B3", "B5", "A4", "A5", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h index c275e78f231..d6e974b21d9 100644 --- a/keyboards/cannonkeys/crin/config.h +++ b/keyboards/cannonkeys/crin/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 } -#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 } -#define DIODE_DIRECTION COL2ROW - - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index 6c6afa0f894..0fa01b54a25 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "C15", "C14", "A7", "A5", "C13", "A4", "A2", "A1", "A0", "B9", "B8", "B7", "A3", "B6", "B4", "B3", "A15"], + "rows": ["B11", "B10", "B2", "F0", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h index 9e034e7c128..1bdd8995f7b 100644 --- a/keyboards/cannonkeys/db60/config.h +++ b/keyboards/cannonkeys/db60/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 } -#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } -#define DIODE_DIRECTION COL2ROW - - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 5f4a94d367e..3b1d9fc6085 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -6,6 +6,11 @@ "vid": "0xCA04", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"], + "rows": ["B1", "B0", "A7", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h index cd6fa15243a..ab8f8fa1219 100644 --- a/keyboards/cannonkeys/devastatingtkl/config.h +++ b/keyboards/cannonkeys/devastatingtkl/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 } -#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index 557b53817bc..58c46c21ac9 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -8,6 +8,11 @@ "pid": "0xDE57", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"], + "rows": ["A15", "B3", "B5", "A4", "A5", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h index 14b14879d62..ae9c049bc11 100644 --- a/keyboards/cannonkeys/gentoo/config.h +++ b/keyboards/cannonkeys/gentoo/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 } -#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json index 6b0c9399be1..0608a560bec 100644 --- a/keyboards/cannonkeys/gentoo/info.json +++ b/keyboards/cannonkeys/gentoo/info.json @@ -8,6 +8,11 @@ "pid": "0x000F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2"], + "rows": ["C14", "A1", "B14", "B15", "A8"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "on_state": 0 diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h index 8c83fe3fc63..4b007cf387e 100644 --- a/keyboards/cannonkeys/gentoo_hs/config.h +++ b/keyboards/cannonkeys/gentoo_hs/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 } -#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 } -#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/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json index 8595a321b28..f42bb88baa5 100644 --- a/keyboards/cannonkeys/gentoo_hs/info.json +++ b/keyboards/cannonkeys/gentoo_hs/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"], + "rows": ["A14", "A15", "A0", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B14", "on_state": 0 diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h index 103faf39f94..c4e36299643 100644 --- a/keyboards/cannonkeys/hoodrowg/config.h +++ b/keyboards/cannonkeys/hoodrowg/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { B5, B4, D7, F5, F6, F7, F4, D2, D0 } -#define MATRIX_ROW_PINS { E6, B7, B0, B1, F1, F0, C6, C7, D4, D6, D5, D3 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D1 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json index 4d0adb731a4..cd08c00354f 100644 --- a/keyboards/cannonkeys/hoodrowg/info.json +++ b/keyboards/cannonkeys/hoodrowg/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "D7", "F5", "F6", "F7", "F4", "D2", "D0"], + "rows": ["E6", "B7", "B0", "B1", "F1", "F0", "C6", "C7", "D4", "D6", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "scroll_lock": "B2" diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h index 8e7158765d4..3120b3167a4 100644 --- a/keyboards/cannonkeys/instant60/config.h +++ b/keyboards/cannonkeys/instant60/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 } -#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json index 56f5126d0d5..f10aa02bb9c 100644 --- a/keyboards/cannonkeys/instant60/info.json +++ b/keyboards/cannonkeys/instant60/info.json @@ -8,6 +8,11 @@ "pid": "0x1600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"], + "rows": ["B1", "B0", "A7", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h index 5afccde3a79..898aff0ff5b 100644 --- a/keyboards/cannonkeys/instant65/config.h +++ b/keyboards/cannonkeys/instant65/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 } -#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json index eedb9bd5c7f..24e2315c1ee 100644 --- a/keyboards/cannonkeys/instant65/info.json +++ b/keyboards/cannonkeys/instant65/info.json @@ -8,6 +8,11 @@ "pid": "0x1565", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"], + "rows": ["A14", "A15", "A0", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h index eb7011b3498..eb890c1cbf6 100644 --- a/keyboards/cannonkeys/iron165/config.h +++ b/keyboards/cannonkeys/iron165/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A8, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/info.json index b0ad19785c4..39eaa707313 100644 --- a/keyboards/cannonkeys/iron165/info.json +++ b/keyboards/cannonkeys/iron165/info.json @@ -8,6 +8,11 @@ "pid": "0x5165", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A5", "B10", "A3", "A2", "B0", "A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B12", "B13", "B14", "B15", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h index 57fa0cf7c35..a45b9927797 100644 --- a/keyboards/cannonkeys/malicious_ergo/config.h +++ b/keyboards/cannonkeys/malicious_ergo/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index 9058e07878a..cb2691325b3 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B2", "B10", "B11", "A2", "A0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h deleted file mode 100755 index 5c989ba3f3d..00000000000 --- a/keyboards/cannonkeys/nearfield/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 Dr.Doof - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 } -#define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json index 83550cbd368..998cbc14d61 100644 --- a/keyboards/cannonkeys/nearfield/info.json +++ b/keyboards/cannonkeys/nearfield/info.json @@ -8,6 +8,11 @@ "pid":"0x0002", "device_version":"0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "C6", "C7", "B6", "B5", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "D1"], + "rows": ["B4", "D2", "D4", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 0, diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h index 6d2ab14c6b7..898aff0ff5b 100644 --- a/keyboards/cannonkeys/obliterated75/config.h +++ b/keyboards/cannonkeys/obliterated75/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index 30ea22bd748..fb2e02da53a 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -8,6 +8,11 @@ "pid": "0x0B75", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["A13", "B12", "B11", "B14", "A8", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h index 3c95a539604..a47b76953a2 100644 --- a/keyboards/cannonkeys/onyx/config.h +++ b/keyboards/cannonkeys/onyx/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B1, B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 } -#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json index a4e1a69c9cf..0227024f02b 100644 --- a/keyboards/cannonkeys/onyx/info.json +++ b/keyboards/cannonkeys/onyx/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B0", "C15", "C14", "A7", "A5", "C13", "A4", "A2", "A1", "A0", "B9", "B8", "B7", "A3", "B6", "B4", "B3", "A15"], + "rows": ["B11", "B10", "B2", "F0", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h index 5c864541c7b..fd38d4677fc 100644 --- a/keyboards/cannonkeys/ortho48/config.h +++ b/keyboards/cannonkeys/ortho48/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14} -#define MATRIX_ROW_PINS { B12, C13, A2, A1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json index ba7f1dbdd4b..4e368c2ae35 100644 --- a/keyboards/cannonkeys/ortho48/info.json +++ b/keyboards/cannonkeys/ortho48/info.json @@ -8,6 +8,11 @@ "pid": "0x4F48", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14"], + "rows": ["B12", "C13", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index f9c6596a9f1..378e08c49d1 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 } -#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 8426955dae3..edb26a8ed1e 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -8,6 +8,11 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], + "rows": ["B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h index 5246778d130..378e08c49d1 100644 --- a/keyboards/cannonkeys/ortho75/config.h +++ b/keyboards/cannonkeys/ortho75/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14, B7, B6, B5 } -#define MATRIX_ROW_PINS { B12, C13, A2, A1, A3 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json index 751eeb5297d..e74049eb822 100644 --- a/keyboards/cannonkeys/ortho75/info.json +++ b/keyboards/cannonkeys/ortho75/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14", "B7", "B6", "B5"], + "rows": ["B12", "C13", "A2", "A1", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B9", "pin_b": "B8"} diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h index 287b1484e92..6e361ccf78c 100644 --- a/keyboards/cannonkeys/practice60/config.h +++ b/keyboards/cannonkeys/practice60/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 } -#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json index a25485038bd..f9c793f76e5 100644 --- a/keyboards/cannonkeys/practice60/info.json +++ b/keyboards/cannonkeys/practice60/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h index ac3f193da99..1e62cd6a515 100644 --- a/keyboards/cannonkeys/practice65/config.h +++ b/keyboards/cannonkeys/practice65/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B8, B0, A0, B5, B10, B9, A6, B12, A7, A5, A4, A3, A2, A1, B13, B14 } -#define MATRIX_ROW_PINS { B4, B11, B1, B7, B6 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json index 17e548a8258..64bab13892f 100644 --- a/keyboards/cannonkeys/practice65/info.json +++ b/keyboards/cannonkeys/practice65/info.json @@ -8,6 +8,11 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B8", "B0", "A0", "B5", "B10", "B9", "A6", "B12", "A7", "A5", "A4", "A3", "A2", "A1", "B13", "B14"], + "rows": ["B4", "B11", "B1", "B7", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h index 37d156feb9e..7f21b3f8a89 100644 --- a/keyboards/cannonkeys/rekt1800/config.h +++ b/keyboards/cannonkeys/rekt1800/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B12, A14, A15, B3, B4, B5, B6, B7, B8, B9, A7, B0, B1, B2, B10, A3, A4, A5, C15 } -#define MATRIX_ROW_PINS { C13, C14, A0, A1, A2, B11 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json index e68f2144272..675b5727394 100644 --- a/keyboards/cannonkeys/rekt1800/info.json +++ b/keyboards/cannonkeys/rekt1800/info.json @@ -8,6 +8,11 @@ "pid": "0x2377", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A7", "B0", "B1", "B2", "B10", "A3", "A4", "A5", "C15"], + "rows": ["C13", "C14", "A0", "A1", "A2", "B11"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h index 5edf9fdeb98..b65cf4792be 100644 --- a/keyboards/cannonkeys/sagittarius/config.h +++ b/keyboards/cannonkeys/sagittarius/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A7, A5, A4, A3, A2, A1, A0, B5, A13, B2, B1, B0, B9, B8, B7, B6 } -#define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json index 2b25ee6b984..e5e01875a58 100644 --- a/keyboards/cannonkeys/sagittarius/info.json +++ b/keyboards/cannonkeys/sagittarius/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A7", "A5", "A4", "A3", "A2", "A1", "A0", "B5", "A13", "B2", "B1", "B0", "B9", "B8", "B7", "B6"], + "rows": ["B10", "B14", "A8", "A9", "A10", "C13", "C14", "C15", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h index ac9548dd272..9005b064b79 100644 --- a/keyboards/cannonkeys/satisfaction75/config.h +++ b/keyboards/cannonkeys/satisfaction75/config.h @@ -23,10 +23,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B13, B14, A8, A9, A10, B0, A7, A5, B5, A15, A1 } -#define MATRIX_ROW_PINS { B3, B4, A0, A2, A4, A3 } -#define DIODE_DIRECTION COL2ROW - // I2C config #define I2C_DRIVER I2CD1 #define I2C1_SCL_PIN B6 diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json index 9bf8459b1ae..60695b9ac71 100644 --- a/keyboards/cannonkeys/satisfaction75/info.json +++ b/keyboards/cannonkeys/satisfaction75/info.json @@ -8,6 +8,11 @@ "pid": "0x57F5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"], + "rows": ["B3", "B4", "A0", "A2", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B9", "pin_b": "B8", "resolution": 2} diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h index 79414a9a787..97fbded3c08 100644 --- a/keyboards/cannonkeys/savage65/config.h +++ b/keyboards/cannonkeys/savage65/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json index 1aa34de8911..c8e3dd0cf80 100644 --- a/keyboards/cannonkeys/savage65/info.json +++ b/keyboards/cannonkeys/savage65/info.json @@ -8,6 +8,11 @@ "pid": "0x5A65", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B12", "B11", "B14", "A8", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h index 8722ba8d543..1dfaa694735 100644 --- a/keyboards/cannonkeys/tmov2/config.h +++ b/keyboards/cannonkeys/tmov2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B14, A14, B1, C13, C14, C15, F0, F1, B9, B8, B7, B6, B5, B4, B3, A15 } -#define MATRIX_ROW_PINS { A10, A9, A8, B12 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json index bdb6cd7453d..cee401b524b 100644 --- a/keyboards/cannonkeys/tmov2/info.json +++ b/keyboards/cannonkeys/tmov2/info.json @@ -8,6 +8,11 @@ "pid": "0x70F2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "A14", "B1", "C13", "C14", "C15", "F0", "F1", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["A10", "A9", "A8", "B12"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h index 8987acd8376..97fbded3c08 100644 --- a/keyboards/cannonkeys/tsukuyomi/config.h +++ b/keyboards/cannonkeys/tsukuyomi/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A7, A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json index fb5b22e5b79..7cf2cba4140 100644 --- a/keyboards/cannonkeys/tsukuyomi/info.json +++ b/keyboards/cannonkeys/tsukuyomi/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A7", "A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B12", "B11", "B14", "A8", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h index d989d427ff2..a47b76953a2 100644 --- a/keyboards/cannonkeys/vicious40/config.h +++ b/keyboards/cannonkeys/vicious40/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B0, A7, A5, B1, B2, B10, B11, A9, B6, B7, B8, B9 } -#define MATRIX_ROW_PINS { A15, B3, 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/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json index 384343b8e9f..d9952509802 100644 --- a/keyboards/cannonkeys/vicious40/info.json +++ b/keyboards/cannonkeys/vicious40/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "A7", "A5", "B1", "B2", "B10", "B11", "A9", "B6", "B7", "B8", "B9"], + "rows": ["A15", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h index 65f64c2f09f..e6492683eee 100644 --- a/keyboards/capsunlocked/cu24/config.h +++ b/keyboards/capsunlocked/cu24/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, F5, B4, B6, C6, C7 } -#define MATRIX_COL_PINS { F0, F1, D0, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* RGB Glow */ #define RGB_DI_PIN F4 // The pin the LED strip is connected to #define RGBLED_NUM 5 // Number of LEDs in your strip diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json index ea361a2bf41..a95382d562b 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "D0", "D1"], + "rows": ["E6", "F5", "B4", "B6", "C6", "C7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B5", "levels": 5, diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h index fd829724fca..cf38d9dcc64 100644 --- a/keyboards/capsunlocked/cu65/config.h +++ b/keyboards/capsunlocked/cu65/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, F4, F5, F6, D3 } -#define MATRIX_COL_PINS { D6, D7, D4, B4, B5, B6, C6, D5, C7, F0, E6, B0, B1, B7, 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/capsunlocked/cu65/info.json b/keyboards/capsunlocked/cu65/info.json index 8f91a349748..137bef46a5e 100644 --- a/keyboards/capsunlocked/cu65/info.json +++ b/keyboards/capsunlocked/cu65/info.json @@ -8,6 +8,11 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D4", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "E6", "B0", "B1", "B7", "B3", "B2"], + "rows": ["F1", "F4", "F5", "F6", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h index cdc031b93b0..067756faab4 100644 --- a/keyboards/capsunlocked/cu7/config.h +++ b/keyboards/capsunlocked/cu7/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 { D7, F0, F6 } -#define MATRIX_COL_PINS { F5, F7, F4 } - -/* 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/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json index ebd7b6d491d..c210f9a96c4 100644 --- a/keyboards/capsunlocked/cu7/info.json +++ b/keyboards/capsunlocked/cu7/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F7", "F4"], + "rows": ["D7", "F0", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D4", "resolution": 2} diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h index 52dff091038..c37363f63d2 100644 --- a/keyboards/capsunlocked/cu75/config.h +++ b/keyboards/capsunlocked/cu75/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define DIODE_DIRECTION COL2ROW -#define MATRIX_ROW_PINS {F1, B7, B3, D2, D3, B2} -#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B1, B0, F0} - #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile #define RGBLED_NUM 24 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json index 7f4eb623ac0..14565d0f70a 100644 --- a/keyboards/capsunlocked/cu75/info.json +++ b/keyboards/capsunlocked/cu75/info.json @@ -8,6 +8,11 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B1", "B0", "F0"], + "rows": ["F1", "B7", "B3", "D2", "D3", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "custom", "levels": 8 diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h index d604623f6e7..991c996ea80 100644 --- a/keyboards/capsunlocked/cu80/v1/config.h +++ b/keyboards/capsunlocked/cu80/v1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B1, B5, B4, F7, D7, D6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C7, C6, B6, B0, E6, B7, B3, B2, D2, D3, D5, D4} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json index 72b2e681c90..655318e0636 100644 --- a/keyboards/capsunlocked/cu80/v1/info.json +++ b/keyboards/capsunlocked/cu80/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B0", "E6", "B7", "B3", "B2", "D2", "D3", "D5", "D4"], + "rows": ["B1", "B5", "B4", "F7", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_iso", "tkl_ansi"], diff --git a/keyboards/carbo65/config.h b/keyboards/carbo65/config.h index af627558fe6..79fdc4275fe 100644 --- a/keyboards/carbo65/config.h +++ b/keyboards/carbo65/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 } -#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15 } - -/* 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/carbo65/info.json b/keyboards/carbo65/info.json index c77e3bb9e6c..c63c2c747c2 100644 --- a/keyboards/carbo65/info.json +++ b/keyboards/carbo65/info.json @@ -8,6 +8,11 @@ "pid": "0x4336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"], + "rows": ["A2", "B9", "B8", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h index 91bf0b5d955..396a5ce868e 100644 --- a/keyboards/catch22/config.h +++ b/keyboards/catch22/config.h @@ -16,14 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json index dcdf23f9531..f9a9b08ff73 100644 --- a/keyboards/catch22/info.json +++ b/keyboards/catch22/info.json @@ -6,6 +6,11 @@ "pid": "0xCA22", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h index 062d3434eb5..9b6132cbdba 100644 --- a/keyboards/cest73/tkm/config.h +++ b/keyboards/cest73/tkm/config.h @@ -15,18 +15,5 @@ */ #pragma once - -/* matrix sz handy ruler: 1 2 3 4 5 6 7 8 9 10 11 12 */ -/* key matrix pins */ -/* row handy ruler: r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7, D0 } -/* column handy ruler: c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 */ -#define MATRIX_COL_PINS { D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 } - -//NOTE: if D6 pin shows any issues in exploatation the LED on the Teensy is to be removed - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* force n-key rollover*/ #define FORCE_NKRO diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json index 6054f24467c..e55973be0f5 100644 --- a/keyboards/cest73/tkm/info.json +++ b/keyboards/cest73/tkm/info.json @@ -8,6 +8,11 @@ "pid": "0xAA55", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "E6" }, diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h index a71d46d6b55..88e9e5f9c86 100644 --- a/keyboards/chalice/config.h +++ b/keyboards/chalice/config.h @@ -17,13 +17,6 @@ #pragma once - -#define MATRIX_ROW_PINS {F4, D1, D0, F5, D4, F6, B4, B5, B2, B6} -#define MATRIX_COL_PINS {F7, C6, B1, D2, E6, B3, D7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json index 35f5c5fb1e9..4075fa42f2f 100644 --- a/keyboards/chalice/info.json +++ b/keyboards/chalice/info.json @@ -8,6 +8,11 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C6", "B1", "D2", "E6", "B3", "D7"], + "rows": ["F4", "D1", "D0", "F5", "D4", "F6", "B4", "B5", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/chaos65/config.h b/keyboards/chaos65/config.h index 713238dfa68..caf3e9d4e4e 100644 --- a/keyboards/chaos65/config.h +++ b/keyboards/chaos65/config.h @@ -16,13 +16,5 @@ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO diff --git a/keyboards/chaos65/info.json b/keyboards/chaos65/info.json index 3243967c03e..0be9791911a 100644 --- a/keyboards/chaos65/info.json +++ b/keyboards/chaos65/info.json @@ -8,6 +8,11 @@ "pid": "0x1688", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso_blocker"], diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h deleted file mode 100644 index 1140991c954..00000000000 --- a/keyboards/charue/charon/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Charue Design - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 } -#define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json index 406b845492a..a4a8504fc82 100644 --- a/keyboards/charue/charon/info.json +++ b/keyboards/charue/charon/info.json @@ -8,6 +8,11 @@ "pid": "0x4348", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4", "F1", "F0", "B5", "B6", "C6"], + "rows": ["B0", "B1", "B2", "B3", "C7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6" }, diff --git a/keyboards/charue/sunsetter/config.h b/keyboards/charue/sunsetter/config.h deleted file mode 100644 index 1219eac27cc..00000000000 --- a/keyboards/charue/sunsetter/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Michael Pio "Coarse" Mayol - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define MATRIX_COL_PINS { B13, B12, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, F0, B3, A15 } -#define MATRIX_ROW_PINS { A8, B14, B11, B10, B2 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json index 651561f47d5..b499907a859 100644 --- a/keyboards/charue/sunsetter/info.json +++ b/keyboards/charue/sunsetter/info.json @@ -8,6 +8,11 @@ "pid": "0x5353", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B13", "B12", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "F0", "B3", "A15"], + "rows": ["A8", "B14", "B11", "B10", "B2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F1", "on_state": 0 diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h index b3a3ab3f9b9..e720d702d47 100644 --- a/keyboards/charue/sunsetter_r2/config.h +++ b/keyboards/charue/sunsetter_r2/config.h @@ -3,14 +3,6 @@ #pragma once - -/* Keyboard Matrix Assignment s*/ -#define MATRIX_ROW_PINS { B3, B2, F4, F5, F6 } -#define MATRIX_COL_PINS { F0, F1, F7, B1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB */ #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json index fcd9d0b3fe2..4d37fcd8190 100644 --- a/keyboards/charue/sunsetter_r2/info.json +++ b/keyboards/charue/sunsetter_r2/info.json @@ -8,6 +8,11 @@ "pid": "0x5335", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F7", "B1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B3", "B2", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h index 99188024349..277219f16d0 100644 --- a/keyboards/chavdai40/rev1/config.h +++ b/keyboards/chavdai40/rev1/config.h @@ -22,9 +22,3 @@ /* usb power settings */ #define USB_MAX_POWER_CONSUMPTION 100 - -#define MATRIX_ROW_PINS { A0, A15, B5, B6 } -#define MATRIX_COL_PINS { B8, B4, B3, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json index 9f345a3ae72..0e518b6de0a 100644 --- a/keyboards/chavdai40/rev1/info.json +++ b/keyboards/chavdai40/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], + "rows": ["A0", "A15", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu" } diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h index c6f78842754..277219f16d0 100644 --- a/keyboards/chavdai40/rev2/config.h +++ b/keyboards/chavdai40/rev2/config.h @@ -22,9 +22,3 @@ /* usb power settings */ #define USB_MAX_POWER_CONSUMPTION 100 - -#define MATRIX_ROW_PINS { A0, A15, B5, B6 } -#define MATRIX_COL_PINS { B7, B4, B3, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json index 5ffacfd3035..3216cb565d7 100644 --- a/keyboards/chavdai40/rev2/info.json +++ b/keyboards/chavdai40/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B7", "B4", "B3", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], + "rows": ["A0", "A15", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu" } diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h index aca5940c63d..825d77b4aef 100644 --- a/keyboards/checkerboards/axon40/config.h +++ b/keyboards/checkerboards/axon40/config.h @@ -16,15 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, D3, D1, D5 } -#define MATRIX_COL_PINS { C7, B7, D4, D6, F0, F1, C6, B6, B5, B4, E6, 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/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json index d3c6c1cb708..7bc52e7b9c9 100644 --- a/keyboards/checkerboards/axon40/info.json +++ b/keyboards/checkerboards/axon40/info.json @@ -8,6 +8,11 @@ "pid": "0x1119", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "B7", "D4", "D6", "F0", "F1", "C6", "B6", "B5", "B4", "E6", "B0"], + "rows": ["D2", "D3", "D1", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h index 966e9c79a54..091065e4831 100644 --- a/keyboards/checkerboards/candybar_ortho/config.h +++ b/keyboards/checkerboards/candybar_ortho/config.h @@ -16,15 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, D4, D7, D6, B5, B6, C7, C6 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, 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/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json index a254f9ef6eb..ceadcc42add 100644 --- a/keyboards/checkerboards/candybar_ortho/info.json +++ b/keyboards/checkerboards/candybar_ortho/info.json @@ -8,6 +8,11 @@ "pid": "0x3215", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2"], + "rows": ["B4", "D4", "D7", "D6", "B5", "B6", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/g_idb60/config.h b/keyboards/checkerboards/g_idb60/config.h index 78a8f5ed637..9b8adff3ecf 100644 --- a/keyboards/checkerboards/g_idb60/config.h +++ b/keyboards/checkerboards/g_idb60/config.h @@ -17,14 +17,6 @@ Copyright 2021 Nathan Spears #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D6, D7, B4, B5, F7 } -#define MATRIX_COL_PINS { B6, C6, C7, D4, F6, F0, B0, F1, F4, F5, D1, D0, D3, 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/checkerboards/g_idb60/info.json b/keyboards/checkerboards/g_idb60/info.json index ff4cc80b5ed..3e3b1aaa0b0 100644 --- a/keyboards/checkerboards/g_idb60/info.json +++ b/keyboards/checkerboards/g_idb60/info.json @@ -8,6 +8,11 @@ "pid": "0x3508", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "D4", "F6", "F0", "B0", "F1", "F4", "F5", "D1", "D0", "D3", "D5"], + "rows": ["D6", "D7", "B4", "B5", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h index adf72e2f653..5d3e817aac1 100644 --- a/keyboards/checkerboards/nop60/config.h +++ b/keyboards/checkerboards/nop60/config.h @@ -17,14 +17,6 @@ Copyright 2021 Nathan Spears #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, E6, B7, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, D0, D7, D3, D4, D5, D6, F7, C7, B4, B6, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 // ws2812 options diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json index 96467b77022..c1d9d31763d 100644 --- a/keyboards/checkerboards/nop60/info.json +++ b/keyboards/checkerboards/nop60/info.json @@ -8,6 +8,11 @@ "pid": "0x1416", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "D0", "D7", "D3", "D4", "D5", "D6", "F7", "C7", "B4", "B6", "B5"], + "rows": ["F0", "F1", "E6", "B7", "C6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D1", "levels": 6, diff --git a/keyboards/checkerboards/phoenix45_ortho/config.h b/keyboards/checkerboards/phoenix45_ortho/config.h index 8c11a3ccf74..21d76ea1ac7 100644 --- a/keyboards/checkerboards/phoenix45_ortho/config.h +++ b/keyboards/checkerboards/phoenix45_ortho/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, D1, D0, C4 } -#define MATRIX_COL_PINS { D3, C2, C5, B0, D6, D5, D4, B4, B5, B6, B7, C7, 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 diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json index 23f6b024fa0..41922cb5844 100644 --- a/keyboards/checkerboards/phoenix45_ortho/info.json +++ b/keyboards/checkerboards/phoenix45_ortho/info.json @@ -8,6 +8,11 @@ "pid": "0x1849", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "C2", "C5", "B0", "D6", "D5", "D4", "B4", "B5", "B6", "B7", "C7", "C6"], + "rows": ["D2", "D1", "D0", "C4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"} diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h index 0d8e9404e2a..f365fe865a4 100644 --- a/keyboards/checkerboards/plexus75/config.h +++ b/keyboards/checkerboards/plexus75/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D2, B3, B1, F1, F0 } -#define MATRIX_COL_PINS { B2, B0, D1, F7, F6, F5, F4, D4, D6, D7, B4, B5, B6, C6, 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/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json index 87d2e74deb8..92739951f83 100644 --- a/keyboards/checkerboards/plexus75/info.json +++ b/keyboards/checkerboards/plexus75/info.json @@ -8,6 +8,11 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B0", "D1", "F7", "F6", "F5", "F4", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["D2", "B3", "B1", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h index f8ccc0e356a..04b03054f16 100644 --- a/keyboards/checkerboards/plexus75_he/config.h +++ b/keyboards/checkerboards/plexus75_he/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C2, D0, D1, D2, D6, B0, B3, B2, C6, B1 } -#define MATRIX_COL_PINS { C4, C5, D3, C7, B7, B6, B5, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json index dbac1f2f6a5..d977b2f5a91 100644 --- a/keyboards/checkerboards/plexus75_he/info.json +++ b/keyboards/checkerboards/plexus75_he/info.json @@ -8,6 +8,11 @@ "pid": "0x5339", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "D3", "C7", "B7", "B6", "B5", "B4"], + "rows": ["C2", "D0", "D1", "D2", "D6", "B0", "B3", "B2", "C6", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h index cec9db65e91..e60a7e4d0c4 100644 --- a/keyboards/checkerboards/pursuit40/config.h +++ b/keyboards/checkerboards/pursuit40/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, D1, F4, F5 } -#define MATRIX_COL_PINS { F1, E6, B7, D5, D4, D6, D7, B4, B5, B6, C6, 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/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json index f9915cdf192..81988112a9b 100644 --- a/keyboards/checkerboards/pursuit40/info.json +++ b/keyboards/checkerboards/pursuit40/info.json @@ -8,6 +8,11 @@ "pid": "0x1620", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "E6", "B7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["D2", "D1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h index 42ccb063001..1cf03ae9808 100644 --- a/keyboards/checkerboards/quark/config.h +++ b/keyboards/checkerboards/quark/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 } -#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json index 0f7f3b0f440..ba624b4009e 100644 --- a/keyboards/checkerboards/quark/info.json +++ b/keyboards/checkerboards/quark/info.json @@ -8,6 +8,11 @@ "pid": "0x5340", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B3", "C2", "B2", "D6", "D2", "D3", "D4", "D5", "B1"], + "rows": ["C5", "C4", "C6", "C7", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "D1"} diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h index 89fc05ed716..ff88273648c 100644 --- a/keyboards/checkerboards/quark_lp/config.h +++ b/keyboards/checkerboards/quark_lp/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { C5, C4, C6, C7 } -#define MATRIX_COL_PINS { B6, B5, B4, B3, B0, D6, D5, D4, D3, D2, 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/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json index 6cd764fa803..d449a5a46b7 100644 --- a/keyboards/checkerboards/quark_lp/info.json +++ b/keyboards/checkerboards/quark_lp/info.json @@ -8,6 +8,11 @@ "pid": "0x5354", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"], + "rows": ["C5", "C4", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h index 69781c0fa2e..319f588aa26 100644 --- a/keyboards/checkerboards/quark_plus/config.h +++ b/keyboards/checkerboards/quark_plus/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B1, C2, D0, D6, B0, B6, B5 } -#define MATRIX_COL_PINS { C6, D1, D5, D4, D3, 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/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json index 49ab42adcb0..37360618b5f 100644 --- a/keyboards/checkerboards/quark_plus/info.json +++ b/keyboards/checkerboards/quark_plus/info.json @@ -8,6 +8,11 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D1", "D5", "D4", "D3", "D2"], + "rows": ["B4", "B1", "C2", "D0", "D6", "B0", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "B7"}, diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h index 85bed28b459..de0e84aa331 100644 --- a/keyboards/checkerboards/quark_squared/config.h +++ b/keyboards/checkerboards/quark_squared/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 } -#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json index de8496a7981..46bfedda21c 100644 --- a/keyboards/checkerboards/quark_squared/info.json +++ b/keyboards/checkerboards/quark_squared/info.json @@ -8,6 +8,11 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B3", "C2", "B2", "D6", "D2", "D3", "D4", "D5", "B1"], + "rows": ["C5", "C4", "C6", "C7", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "D1"} diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h index 5015355170d..4ef42eeb798 100644 --- a/keyboards/checkerboards/snop60/config.h +++ b/keyboards/checkerboards/snop60/config.h @@ -17,14 +17,6 @@ Copyright 2022 Nathan Spears #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D6, B4, B5 } -#define MATRIX_COL_PINS { B6, C6, C7, D5, F7, F6, F5, F4, F1, F0, B0, E6, D4, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // ws2812 options #define RGB_DI_PIN B1 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json index 0c543a7c85d..0d5392f073b 100644 --- a/keyboards/checkerboards/snop60/info.json +++ b/keyboards/checkerboards/snop60/info.json @@ -8,6 +8,11 @@ "pid": "0x2416", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "D5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "E6", "D4", "D7"], + "rows": ["B7", "D0", "D6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h index 76fe9ae3275..309d6ccf54f 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/config.h +++ b/keyboards/checkerboards/ud40_ortho_alt/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, F0, F1, F4 } -#define MATRIX_COL_PINS { B2, B1, F7, D6, D7, B4, B5, B6, C6, C7, F5, 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/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json index fa72a206d3e..701f1291631 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/info.json +++ b/keyboards/checkerboards/ud40_ortho_alt/info.json @@ -8,6 +8,11 @@ "pid": "0x7030", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "F7", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6"], + "rows": ["E6", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h index cc6d24ebc11..fbd6d0e2fdd 100644 --- a/keyboards/cherrybstudio/cb1800/config.h +++ b/keyboards/cherrybstudio/cb1800/config.h @@ -13,24 +13,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 -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json index 8d96a17bcc2..ade4585e428 100644 --- a/keyboards/cherrybstudio/cb1800/info.json +++ b/keyboards/cherrybstudio/cb1800/info.json @@ -8,6 +8,11 @@ "pid": "0x1818", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F5", "num_lock": "F6", diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h index b298fec8dc5..6251ae58ef1 100644 --- a/keyboards/cherrybstudio/cb65/config.h +++ b/keyboards/cherrybstudio/cb65/config.h @@ -13,24 +13,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 -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, F7, B5, B6, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Lighting */ #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 223d5560d4e..6f29ae1dfd8 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -8,6 +8,11 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "F7", "B5", "B6", "C6"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F1", "scroll_lock": "F4", diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h index f78600ed043..2d7e2722e55 100644 --- a/keyboards/cherrybstudio/cb87/config.h +++ b/keyboards/cherrybstudio/cb87/config.h @@ -13,24 +13,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 -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json index 09a4fe132a2..4f643881269 100644 --- a/keyboards/cherrybstudio/cb87/info.json +++ b/keyboards/cherrybstudio/cb87/info.json @@ -8,6 +8,11 @@ "pid": "0x8787", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h index eedd4de3392..750ca2634c9 100644 --- a/keyboards/cherrybstudio/cb87rgb/config.h +++ b/keyboards/cherrybstudio/cb87rgb/config.h @@ -13,24 +13,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 -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 92 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 059b6d61d4a..5e93754cfc5 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x8785", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h index 55b8bc4bee6..03549bc495b 100644 --- a/keyboards/cherrybstudio/cb87v2/config.h +++ b/keyboards/cherrybstudio/cb87v2/config.h @@ -13,24 +13,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 -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 45aea952483..8e7720928db 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -8,6 +8,11 @@ "pid": "0x8788", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h index 8c602366977..d93e66215bb 100644 --- a/keyboards/cheshire/curiosity/config.h +++ b/keyboards/cheshire/curiosity/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B13, B14, A4, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, B9, B8, B7, B6, B5, B4, B3, A15 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #define RGBLED_NUM 14 diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json index 0e63e3b6600..854b10890bf 100644 --- a/keyboards/cheshire/curiosity/info.json +++ b/keyboards/cheshire/curiosity/info.json @@ -7,6 +7,11 @@ "pid": "0x0FAD", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B13", "B14", "A4", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/chickenman/ciel/config.h b/keyboards/chickenman/ciel/config.h index c2cae71086c..2a4bb26963d 100644 --- a/keyboards/chickenman/ciel/config.h +++ b/keyboards/chickenman/ciel/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 { C5, C4, B0, C7, B7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, B3, B2, B1, D6, D5, D4, D3, D2, D1, D0, C2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/chickenman/ciel/info.json b/keyboards/chickenman/ciel/info.json index b6a4f5e8f7e..af2684d993d 100644 --- a/keyboards/chickenman/ciel/info.json +++ b/keyboards/chickenman/ciel/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "C2"], + "rows": ["C5", "C4", "B0", "C7", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"], diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h index f9f0068b168..18198a8bce8 100644 --- a/keyboards/chlx/merro60/config.h +++ b/keyboards/chlx/merro60/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, D5, D3, B5, F4 } -#define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, 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/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json index bbb3124868d..99308fecde4 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/info.json @@ -8,6 +8,11 @@ "pid": "0x0601", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"], + "rows": ["D4", "D5", "D3", "B5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index 731309b6fab..5a54a2ab895 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, E6, B0, B1, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json index e9ab25aedbb..20f8eb6681f 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/info.json @@ -8,6 +8,11 @@ "pid": "0x0602", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"], + "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/chocofly/v1/config.h b/keyboards/chocofly/v1/config.h deleted file mode 100644 index a1886ffafad..00000000000 --- a/keyboards/chocofly/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 { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/chocofly/v1/info.json b/keyboards/chocofly/v1/info.json index ab4fde45e6c..e7578ae942f 100644 --- a/keyboards/chocofly/v1/info.json +++ b/keyboards/chocofly/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x1001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 2} diff --git a/keyboards/chocv/config.h b/keyboards/chocv/config.h deleted file mode 100644 index 5d61c7d4d72..00000000000 --- a/keyboards/chocv/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 BrickBots Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - #pragma once - - - #define MATRIX_ROW_PINS { F4, F5, D1, D0 } - #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, C6, D7, E6, B4, B5} - - /* COL2ROW, ROW2COL*/ - #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/chocv/info.json b/keyboards/chocv/info.json index ce82fd6e444..16ba0fe4d2c 100644 --- a/keyboards/chocv/info.json +++ b/keyboards/chocv/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["split_3x5_3"], diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h index 66140bc3ed5..62e682cd0cf 100644 --- a/keyboards/cipulot/kallos/config.h +++ b/keyboards/cipulot/kallos/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { B3, B2, F0, C7, F4, F1 } -#define MATRIX_COL_PINS \ - { F5, F6, C6, B6, B5, B4, D7, D6, D4, D5, D3, F7, D2, D1, B7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Lightbar pin and LED count definitions*/ #define RGB_DI_PIN D0 #define RGBLED_NUM 13 diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json index 1295d76e7f4..a0e9aefe174 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/info.json @@ -8,6 +8,11 @@ "pid": "0x6B7A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"], + "rows": ["B3", "B2", "F0", "C7", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h index 1a9b80ee582..a87365e69db 100644 --- a/keyboards/cipulot/kawayo/config.h +++ b/keyboards/cipulot/kawayo/config.h @@ -16,14 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS \ - { B1, B12, C13, A7, B0 } -#define MATRIX_COL_PINS \ - { B10, A0, B9, B8, B7, B6, B5, B4, B3, A15, A14, A4, A3, A2, A1 } - -/* 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/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json index f335b2b76c6..317149fa67d 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/info.json @@ -8,6 +8,11 @@ "pid": "0x6B7F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], + "rows": ["B1", "B12", "C13", "A7", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h index 908eb0d188b..1304a2fe310 100644 --- a/keyboards/ck60i/config.h +++ b/keyboards/ck60i/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 , B11, B10, B2 , B1 , B0 , A7 , C15, C14} -#define MATRIX_ROW_PINS { B9 , C13, A3 , B14, A8} -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json index 22e8f265f64..d99757f19bd 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/info.json @@ -8,6 +8,11 @@ "pid": "0x6049", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "B11", "B10", "B2", "B1", "B0", "A7", "C15", "C14"], + "rows": ["B9", "C13", "A3", "B14", "A8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A5", "pin_b": "A4"} diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h index 791c68f739f..95780766c57 100755 --- a/keyboards/ckeys/handwire_101/config.h +++ b/keyboards/ckeys/handwire_101/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 } -#define MATRIX_COL_PINS { D4, C6, D7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ckeys/handwire_101/info.json b/keyboards/ckeys/handwire_101/info.json index 3d270685c5f..970a0523851 100644 --- a/keyboards/ckeys/handwire_101/info.json +++ b/keyboards/ckeys/handwire_101/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layout_aliases": { diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h index e8c0aaebbe9..60f42fbcda9 100644 --- a/keyboards/ckeys/nakey/config.h +++ b/keyboards/ckeys/nakey/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, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, 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/ckeys/nakey/info.json b/keyboards/ckeys/nakey/info.json index 453ad39b132..9fbcc7635e5 100644 --- a/keyboards/ckeys/nakey/info.json +++ b/keyboards/ckeys/nakey/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3"], + "rows": ["F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h index 1bc6def7fd9..0588edea278 100644 --- a/keyboards/ckeys/obelus/config.h +++ b/keyboards/ckeys/obelus/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 } -#define MATRIX_COL_PINS { F0, F1, B2, 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/ckeys/obelus/info.json b/keyboards/ckeys/obelus/info.json index 9697e3a9dd4..33c7a234718 100644 --- a/keyboards/ckeys/obelus/info.json +++ b/keyboards/ckeys/obelus/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "B2", "B3"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h index 5bcb91e8225..8eaf7dc2f30 100755 --- a/keyboards/ckeys/thedora/config.h +++ b/keyboards/ckeys/thedora/config.h @@ -16,13 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { A2, A1, A0, B8 } -#define MATRIX_COL_PINS { B5, B4, 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/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json index b72287fc2e6..a442db236d1 100644 --- a/keyboards/ckeys/thedora/info.json +++ b/keyboards/ckeys/thedora/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "B3", "B2", "B1", "B0"], + "rows": ["A2", "A1", "A0", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B13", "pin_b": "B15"} diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h index b57e29acdef..1b4e5a6d87e 100644 --- a/keyboards/ckeys/washington/config.h +++ b/keyboards/ckeys/washington/config.h @@ -15,23 +15,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, F5, F6 } -#define MATRIX_COL_PINS { 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/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json index b9bb2fce7b2..03649056f26 100644 --- a/keyboards/ckeys/washington/info.json +++ b/keyboards/ckeys/washington/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3"], + "rows": ["F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "C6"} diff --git a/keyboards/clawsome/bookerboard/config.h b/keyboards/clawsome/bookerboard/config.h deleted file mode 100644 index 60c531b89f6..00000000000 --- a/keyboards/clawsome/bookerboard/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -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, E6, D7 } -#define MATRIX_COL_PINS { B6, B2, B3 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json index 2e153f567dd..d0ac88f5480 100644 --- a/keyboards/clawsome/bookerboard/info.json +++ b/keyboards/clawsome/bookerboard/info.json @@ -8,6 +8,11 @@ "pid": "0x41CE", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3"], + "rows": ["B5", "B4", "E6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/clawsome/coupe/config.h b/keyboards/clawsome/coupe/config.h deleted file mode 100644 index bad945e802e..00000000000 --- a/keyboards/clawsome/coupe/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -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 { D7, D2, C6, B5, D4, B4, D0, D3, D1, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B3, B2 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/coupe/info.json b/keyboards/clawsome/coupe/info.json index be50f5c13e0..7bbc577308f 100644 --- a/keyboards/clawsome/coupe/info.json +++ b/keyboards/clawsome/coupe/info.json @@ -8,6 +8,11 @@ "pid": "0x7E94", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B6", "B3", "B2"], + "rows": ["D7", "D2", "C6", "B5", "D4", "B4", "D0", "D3", "D1", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["60_ansi"], diff --git a/keyboards/clawsome/doodle/config.h b/keyboards/clawsome/doodle/config.h deleted file mode 100644 index 7dcdcc03a87..00000000000 --- a/keyboards/clawsome/doodle/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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 } -#define MATRIX_COL_PINS { D7, F4, E6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/doodle/info.json b/keyboards/clawsome/doodle/info.json index 6c40392ec89..8b675684eb5 100644 --- a/keyboards/clawsome/doodle/info.json +++ b/keyboards/clawsome/doodle/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "F4", "E6"], + "rows": ["D4", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/fightpad/config.h b/keyboards/clawsome/fightpad/config.h deleted file mode 100644 index a62845a6af7..00000000000 --- a/keyboards/clawsome/fightpad/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -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, B6 } -#define MATRIX_COL_PINS { D7, E6, B4, B2, B3, B1, F7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/info.json index df9c6216271..3aad0874869 100644 --- a/keyboards/clawsome/fightpad/info.json +++ b/keyboards/clawsome/fightpad/info.json @@ -8,6 +8,11 @@ "pid": "0x481C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B2", "B3", "B1", "F7"], + "rows": ["B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/gamebuddy/v1_0/config.h b/keyboards/clawsome/gamebuddy/v1_0/config.h deleted file mode 100644 index bf867467f2b..00000000000 --- a/keyboards/clawsome/gamebuddy/v1_0/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { D1, D0, E6, B3, B2 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, C6, D7, B6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json index 273755e62cb..b4875077f46 100644 --- a/keyboards/clawsome/gamebuddy/v1_0/info.json +++ b/keyboards/clawsome/gamebuddy/v1_0/info.json @@ -8,6 +8,11 @@ "pid": "0x17B9", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "C6", "D7", "B6"], + "rows": ["D1", "D0", "E6", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/gamebuddy/v1_m/config.h b/keyboards/clawsome/gamebuddy/v1_m/config.h deleted file mode 100644 index 5c2f368800e..00000000000 --- a/keyboards/clawsome/gamebuddy/v1_m/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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 { C6, D7, B5, B3, B2 } -#define MATRIX_COL_PINS { B1, F7, F6, F5, E6, B4, B6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json index 9c9ee3938b9..3330139b593 100644 --- a/keyboards/clawsome/gamebuddy/v1_m/info.json +++ b/keyboards/clawsome/gamebuddy/v1_m/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F7", "F6", "F5", "E6", "B4", "B6"], + "rows": ["C6", "D7", "B5", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/hatchback/config.h b/keyboards/clawsome/hatchback/config.h deleted file mode 100644 index 0c0cd52041c..00000000000 --- a/keyboards/clawsome/hatchback/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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 { B0, B6, D4, B4, D0, B5, D1, E6, D2, D7, D3, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D5, C7, F1 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/info.json index 63cd7a80d77..79af5d5279c 100644 --- a/keyboards/clawsome/hatchback/info.json +++ b/keyboards/clawsome/hatchback/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D5", "C7", "F1"], + "rows": ["B0", "B6", "D4", "B4", "D0", "B5", "D1", "E6", "D2", "D7", "D3", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/luggage_rack/config.h b/keyboards/clawsome/luggage_rack/config.h deleted file mode 100644 index b6df355827a..00000000000 --- a/keyboards/clawsome/luggage_rack/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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 { D3, F4, B0, B2, F7, B6, B1, F5, F6 } -#define MATRIX_COL_PINS { D4, D0, D1 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json index e9038901222..3c813bd36a0 100644 --- a/keyboards/clawsome/luggage_rack/info.json +++ b/keyboards/clawsome/luggage_rack/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D0", "D1"], + "rows": ["D3", "F4", "B0", "B2", "F7", "B6", "B1", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/numeros/config.h b/keyboards/clawsome/numeros/config.h deleted file mode 100644 index a1ee98579ff..00000000000 --- a/keyboards/clawsome/numeros/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -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, C6, B2, B6, B5 } -#define MATRIX_COL_PINS { B3, E6, D7, D4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/numeros/info.json b/keyboards/clawsome/numeros/info.json index 06e9ba97512..f51ea9fa56a 100644 --- a/keyboards/clawsome/numeros/info.json +++ b/keyboards/clawsome/numeros/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "E6", "D7", "D4"], + "rows": ["D0", "C6", "B2", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/clawsome/roadster/config.h b/keyboards/clawsome/roadster/config.h deleted file mode 100644 index 30294c7cfbe..00000000000 --- a/keyboards/clawsome/roadster/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -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 { D2, D3, D0, D1 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/roadster/info.json b/keyboards/clawsome/roadster/info.json index 4e486b037e5..69ecaee3681 100644 --- a/keyboards/clawsome/roadster/info.json +++ b/keyboards/clawsome/roadster/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D2", "D3", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clawsome/sedan/config.h b/keyboards/clawsome/sedan/config.h deleted file mode 100644 index b7fe854916c..00000000000 --- a/keyboards/clawsome/sedan/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -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 { C6, D4, D0, D1, D3 } -#define MATRIX_COL_PINS { B0, F4, F7, B1, B3, B2, B6, F0, F1, C7, D5, B7, B5, B4, E6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/sedan/info.json b/keyboards/clawsome/sedan/info.json index fc6ddd8a78a..65a979315cf 100644 --- a/keyboards/clawsome/sedan/info.json +++ b/keyboards/clawsome/sedan/info.json @@ -8,6 +8,11 @@ "pid": "0x8C78", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "F4", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6"], + "rows": ["C6", "D4", "D0", "D1", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["65_ansi"], diff --git a/keyboards/clawsome/sidekick/config.h b/keyboards/clawsome/sidekick/config.h deleted file mode 100644 index be550c7a71b..00000000000 --- a/keyboards/clawsome/sidekick/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 AAClawson (AlisGraveNil) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { D0, C6, B2, B6, B5 } -#define MATRIX_COL_PINS { F6, F5, B1, B3, E6, D7, D4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json index 93e170a09a3..cfc028476fe 100644 --- a/keyboards/clawsome/sidekick/info.json +++ b/keyboards/clawsome/sidekick/info.json @@ -8,6 +8,11 @@ "pid": "0xDB9F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "B1", "B3", "E6", "D7", "D4"], + "rows": ["D0", "C6", "B2", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/clawsome/suv/config.h b/keyboards/clawsome/suv/config.h deleted file mode 100644 index 915ec1cf5b3..00000000000 --- a/keyboards/clawsome/suv/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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 { F0, B6, D0, F6, D4, F7, B3, B1, B0, C6, B2, D7 } -#define MATRIX_COL_PINS { D3, D2, D1, B4, B5, B7, D5, C7, F1, F5, F4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/clawsome/suv/info.json b/keyboards/clawsome/suv/info.json index 2dadb4f79d2..ddf951c9bbb 100644 --- a/keyboards/clawsome/suv/info.json +++ b/keyboards/clawsome/suv/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "B4", "B5", "B7", "D5", "C7", "F1", "F5", "F4"], + "rows": ["F0", "B6", "D0", "F6", "D4", "F7", "B3", "B1", "B0", "C6", "B2", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json index cdd9d713a6d..1390b98d1c2 100644 --- a/keyboards/clickety_split/leeloo/info.json +++ b/keyboards/clickety_split/leeloo/info.json @@ -8,6 +8,11 @@ "pid": "0x2022", "device_version": "0.1.3" }, + "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"} diff --git a/keyboards/clickety_split/leeloo/rev1/config.h b/keyboards/clickety_split/leeloo/rev1/config.h index b309fa210b1..96c6b71d374 100644 --- a/keyboards/clickety_split/leeloo/rev1/config.h +++ b/keyboards/clickety_split/leeloo/rev1/config.h @@ -17,12 +17,6 @@ #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 */ #define TAPPING_TERM 100 diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h index 3e0f08ab9a9..5cf553bca9b 100644 --- a/keyboards/cmm_studio/fuji65/config.h +++ b/keyboards/cmm_studio/fuji65/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 { B5, B4, D7, D6, B6 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json index 9f47befd54c..30d273318e1 100644 --- a/keyboards/cmm_studio/fuji65/info.json +++ b/keyboards/cmm_studio/fuji65/info.json @@ -8,6 +8,11 @@ "pid": "0x364D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B5", "B4", "D7", "D6", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cmm_studio/saka68/hotswap/config.h b/keyboards/cmm_studio/saka68/hotswap/config.h deleted file mode 100644 index b8a29be0dec..00000000000 --- a/keyboards/cmm_studio/saka68/hotswap/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 CMM.Studio Freather - - - -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 { D2, D1, B0, F6, F7 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D3, D5 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json index ee91cf527f8..555d98c1472 100644 --- a/keyboards/cmm_studio/saka68/hotswap/info.json +++ b/keyboards/cmm_studio/saka68/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5348", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D3", "D5"], + "rows": ["D2", "D1", "B0", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h deleted file mode 100644 index 76960df064a..00000000000 --- a/keyboards/cmm_studio/saka68/solder/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 CMM.Studio Freather - * - * 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 { D1, D0, B0, F6, F7 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D2, D3, D5 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/info.json index 8612ead7ae3..a4d5ae4f050 100644 --- a/keyboards/cmm_studio/saka68/solder/info.json +++ b/keyboards/cmm_studio/saka68/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D2", "D3", "D5"], + "rows": ["D1", "D0", "B0", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h index e251f6f90d7..ef26abfc02f 100644 --- a/keyboards/coarse/cordillera/config.h +++ b/keyboards/coarse/cordillera/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #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 BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json index 9d84f0dee38..507d4992365 100644 --- a/keyboards/coarse/cordillera/info.json +++ b/keyboards/coarse/cordillera/info.json @@ -8,6 +8,11 @@ "pid": "0x1401", "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", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/coarse/ixora/config.h b/keyboards/coarse/ixora/config.h deleted file mode 100644 index 1d10a996968..00000000000 --- a/keyboards/coarse/ixora/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { A0 } -#define MATRIX_COL_PINS { B4, A15, B3, A1, B6, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json index ef7bae51293..c38424ffa7b 100644 --- a/keyboards/coarse/ixora/info.json +++ b/keyboards/coarse/ixora/info.json @@ -8,6 +8,11 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B4", "A15", "B3", "A1", "B6", "B5"], + "rows": ["A0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A10", "num_lock": "A9", diff --git a/keyboards/coarse/vinta/config.h b/keyboards/coarse/vinta/config.h deleted file mode 100644 index 629f4b9b16c..00000000000 --- a/keyboards/coarse/vinta/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { A10, A9, B0, A7, A6 } -#define MATRIX_COL_PINS { A5, A4, A3, A2, A1, A0, F1, F0, B7, B6, B5, B4, B3, A15, A14, A13 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json index 8a615aac0d0..0caf3a3e33b 100644 --- a/keyboards/coarse/vinta/info.json +++ b/keyboards/coarse/vinta/info.json @@ -8,6 +8,11 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"], + "rows": ["A10", "A9", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu", "debounce": 0, diff --git a/keyboards/compound/config.h b/keyboards/compound/config.h deleted file mode 100644 index f2824f96307..00000000000 --- a/keyboards/compound/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Rafael Yumagulov - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B0,B7,D0,D1,D2} -#define MATRIX_COL_PINS {F0,D5,D4,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,F1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/compound/info.json b/keyboards/compound/info.json index ea280b386ba..f3b95cec428 100644 --- a/keyboards/compound/info.json +++ b/keyboards/compound/info.json @@ -8,6 +8,11 @@ "pid": "0xB0BA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B0", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h index e81b8a2094b..2371ec5ef16 100644 --- a/keyboards/contender/config.h +++ b/keyboards/contender/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, D3, B5, B7, B4, B2 } -#define MATRIX_COL_PINS { C7, D6, B3, B0, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C6 #define RGBLED_NUM 33 #define RGBLIGHT_LED_MAP { \ diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json index 942963aaeef..385aad6e0ef 100644 --- a/keyboards/contender/info.json +++ b/keyboards/contender/info.json @@ -8,6 +8,11 @@ "pid": "0xC010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D6", "B3", "B0", "B1"], + "rows": ["D4", "D3", "B5", "B7", "B4", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h deleted file mode 100644 index 07e8b9ac935..00000000000 --- a/keyboards/converter/a1200/miss1200/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 8bits4ever - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json index 326d73ec834..74d569b8d95 100644 --- a/keyboards/converter/a1200/miss1200/info.json +++ b/keyboards/converter/a1200/miss1200/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h index 6b2204ec43b..21ba99e0b7f 100644 --- a/keyboards/converter/a1200/mistress1200/config.h +++ b/keyboards/converter/a1200/mistress1200/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, F1, F0, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define TAPPING_TOGGLE 3 #undef LOCKING_SUPPORT_ENABLE diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json index dfbe75c79ca..c37bdadd617 100644 --- a/keyboards/converter/a1200/mistress1200/info.json +++ b/keyboards/converter/a1200/mistress1200/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h deleted file mode 100644 index c859413d185..00000000000 --- a/keyboards/converter/a1200/teensy2pp/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 8bits4ever - -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 { F0, F1, F2, F3, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json index a69aa382789..e4d0c09c0fe 100644 --- a/keyboards/converter/a1200/teensy2pp/info.json +++ b/keyboards/converter/a1200/teensy2pp/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], + "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h index 00d991fcc81..764fb56f643 100644 --- a/keyboards/converter/modelm101/config.h +++ b/keyboards/converter/modelm101/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, F3, F2, F1, F0 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index 9bffe2e242f..a3698672ba6 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h index 7e0e627bd96..764fb56f643 100644 --- a/keyboards/converter/modelm101_teensy2/config.h +++ b/keyboards/converter/modelm101_teensy2/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, C6, C7, D5, D4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, B0, B1, B2, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index 12ee7274d7c..efeb041c3c1 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "B7"], + "rows": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h index f38e3db3dd1..3b6e758833c 100644 --- a/keyboards/converter/modelm_ssk/config.h +++ b/keyboards/converter/modelm_ssk/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_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D5, D4, D3, D2, D1 } -#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M does not have NKRO */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json index 3f947eac2ab..d68bb0389f2 100644 --- a/keyboards/converter/modelm_ssk/info.json +++ b/keyboards/converter/modelm_ssk/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D5", "D4", "D3", "D2", "D1"], + "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6", "num_lock": "B4", diff --git a/keyboards/converter/numeric_keypad_iie/config.h b/keyboards/converter/numeric_keypad_iie/config.h deleted file mode 100644 index 81671354fd0..00000000000 --- a/keyboards/converter/numeric_keypad_iie/config.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -Copyright 2019 Adam Newbold - -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 Mappings -============ - -Dsub-15 Connection ------------------- - - Dsub-15 (female) - ,-------------------------. - \ 08 07 06 05 04 03 02 01 / - \ 15 14 13 12 11 10 09 / - `---------------------' - -Header Pins ------------ - _____________________________________ -| | -| 11 10 9 8 7 6 5 4 3 2 1 | -|_____________________________________| - - -Header / Matrix ---------------- - -Pin Name Description --------------------------------------------------------------- -1,2,5,3,4,6 Y0-Y5 Y-direction key-matrix connections -7 NC -9,11,10,8 X4-X7 X-direction key-matrix connections - - -Microcontroller Configuration ------------------------------ - -(Pins are for an Arduino Micro) - -+-----------------------------------+ -| Dsub-15 | Header | Matrix | Micro | -|---------+--------+--------+-------| -| 12 | 11 | X5 | B0 | -| 11 | 10 | X6 | D3 | -| 10 | 9 | X4 | B2 | -| 9 | 8 | X7 | D2 | -| NC | 7 | NC | -- | -| 7 | 6 | Y5 | E6 | -| 6 | 5 | Y2 | D4 | -| 5 | 4 | Y4 | D7 | -| 3 | 3 | Y3 | C6 | -| 2 | 2 | Y1 | D0 | -| 1 | 1 | Y0 | D1 | -+-----------------------------------+ - -Note: Dsub-15 pins 4, 8, 13, 14, and 15 are unused - -Reference ---------- - -https://deskthority.net/wiki/Apple_Numeric_Keypad_IIe -https://geekhack.org/index.php?topic=78048.0 -http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_connector - -*/ - -#define MATRIX_ROW_PINS { B0, B2, D2, D3 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index 41b75f69b93..ae160c70380 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6"], + "rows": ["B0", "B2", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h index b21326d298c..49725a9592b 100644 --- a/keyboards/converter/siemens_tastatur/config.h +++ b/keyboards/converter/siemens_tastatur/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -//This is all fake and not used -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } -#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } -#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/cool836a/config.h b/keyboards/cool836a/config.h index 10106469694..886f8a69f1d 100644 --- a/keyboards/cool836a/config.h +++ b/keyboards/cool836a/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, B5, B4, F4, B1, B6 } -#define MATRIX_COL_PINS { F5, D0, B2, C6, D7, E6 } - -/* COL2ROW, ROW2COL */ -//#define DIODE_DIRECTION COL2ROW -#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/cool836a/info.json b/keyboards/cool836a/info.json index e2488c43e06..bcdbbef97cd 100644 --- a/keyboards/cool836a/info.json +++ b/keyboards/cool836a/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D0", "B2", "C6", "D7", "E6"], + "rows": ["D1", "B5", "B4", "F4", "B1", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h index 2f30b0bb1cd..970e69e7f62 100755 --- a/keyboards/copenhagen_click/click_pad_v1/config.h +++ b/keyboards/copenhagen_click/click_pad_v1/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 } -#define MATRIX_COL_PINS { 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/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json index f6abac2e6a6..1298de4c899 100755 --- a/keyboards/copenhagen_click/click_pad_v1/info.json +++ b/keyboards/copenhagen_click/click_pad_v1/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5"], + "rows": ["F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "breathing": true diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h index 0f304c68b53..edcaedfb794 100644 --- a/keyboards/coseyfannitutti/discipad/config.h +++ b/keyboards/coseyfannitutti/discipad/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) - * - */ - -/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */ -#define MATRIX_ROW_PINS { B1, B0, D7, D6, D4 } -#define MATRIX_COL_PINS { C0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json index ac3d9a07c52..86a6836466c 100644 --- a/keyboards/coseyfannitutti/discipad/info.json +++ b/keyboards/coseyfannitutti/discipad/info.json @@ -8,6 +8,11 @@ "pid": "0x1769", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3"], + "rows": ["B1", "B0", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h index e91656f198b..d43ae80cb95 100644 --- a/keyboards/coseyfannitutti/discipline/config.h +++ b/keyboards/coseyfannitutti/discipline/config.h @@ -16,24 +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 { B2, A1, B1, A0, B0 } -#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json index aa1afd9fcc4..0f947f807ad 100644 --- a/keyboards/coseyfannitutti/discipline/info.json +++ b/keyboards/coseyfannitutti/discipline/info.json @@ -8,6 +8,11 @@ "pid": "0x6869", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7"], + "rows": ["B2", "A1", "B1", "A0", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "layout_aliases": { diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h index 5ee6b135fcf..d56fccaf1f9 100644 --- a/keyboards/coseyfannitutti/mullet/config.h +++ b/keyboards/coseyfannitutti/mullet/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, B0, F0, F1 } -#define MATRIX_COL_PINS { B2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D5 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json index 8bdb22f18db..fc2f47c2c0e 100644 --- a/keyboards/coseyfannitutti/mullet/info.json +++ b/keyboards/coseyfannitutti/mullet/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"], + "rows": ["D0", "D1", "B0", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/coseyfannitutti/mulletpad/config.h b/keyboards/coseyfannitutti/mulletpad/config.h deleted file mode 100644 index 6cd992c919c..00000000000 --- a/keyboards/coseyfannitutti/mulletpad/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2019 COSEYFANNITUTTI - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F4, F1, F5, F6, F7 } -#define MATRIX_COL_PINS { F0, C7, C6, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/coseyfannitutti/mulletpad/info.json b/keyboards/coseyfannitutti/mulletpad/info.json index be3ef711cc8..48b3df3c838 100644 --- a/keyboards/coseyfannitutti/mulletpad/info.json +++ b/keyboards/coseyfannitutti/mulletpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "C7", "C6", "B6"], + "rows": ["F4", "F1", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h index 2c9c5629cf1..0acee7345a5 100644 --- a/keyboards/coseyfannitutti/mysterium/config.h +++ b/keyboards/coseyfannitutti/mysterium/config.h @@ -16,24 +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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17*/ -#define MATRIX_ROW_PINS { C2, C3, C7, C4, C6, C5 } -#define MATRIX_COL_PINS { A0, B0, A1, B1, A2, B2, A3, B3, A4, B4, A5, A6, A7, D6, D5, D1, D0, 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/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json index f89161a596d..945652ed494 100644 --- a/keyboards/coseyfannitutti/mysterium/info.json +++ b/keyboards/coseyfannitutti/mysterium/info.json @@ -8,6 +8,11 @@ "pid": "0x8769", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D6", "D5", "D1", "D0", "D7"], + "rows": ["C2", "C3", "C7", "C4", "C6", "C5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h index ea75f82f4ba..31a3fe8cb01 100644 --- a/keyboards/coseyfannitutti/romeo/config.h +++ b/keyboards/coseyfannitutti/romeo/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) - * - */ - -/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */ -/* 0 1 2 3 4 5 6 7 8 9 10 11*/ -#define MATRIX_ROW_PINS { B1, B4, B3, B2 } -#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, 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/coseyfannitutti/romeo/info.json b/keyboards/coseyfannitutti/romeo/info.json index a2dbb614860..e42a0206e45 100644 --- a/keyboards/coseyfannitutti/romeo/info.json +++ b/keyboards/coseyfannitutti/romeo/info.json @@ -8,6 +8,11 @@ "pid": "0x4069", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6"], + "rows": ["B1", "B4", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h index b8131f5d7d7..b8a063e9ab1 100644 --- a/keyboards/cosmo65/config.h +++ b/keyboards/cosmo65/config.h @@ -27,8 +27,3 @@ along with this program. If not, see http://www.gnu.org/licenses/. #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING - -/* keyboard matrix assignments */ -#define MATRIX_ROW_PINS { D5, D0, F0, F5, F4 } -#define MATRIX_COL_PINS { E6, D4, D6, D7, B4, B5, B6, C6, C7, D1, D2, D3, F1, F6 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json index 436e08038dc..b98db6c7900 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/info.json @@ -8,6 +8,11 @@ "pid": "0x6331", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D1", "D2", "D3", "F1", "F6"], + "rows": ["D5", "D0", "F0", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h deleted file mode 100644 index 214d5d549bc..00000000000 --- a/keyboards/cozykeys/bloomer/v2/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Paul Ewing - -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 { D0, D1, D3, D2, D4, B2 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 } -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json index e1963db0401..3810d5c40ee 100644 --- a/keyboards/cozykeys/bloomer/v2/info.json +++ b/keyboards/cozykeys/bloomer/v2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], + "rows": ["D0", "D1", "D3", "D2", "D4", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h deleted file mode 100644 index 214d5d549bc..00000000000 --- a/keyboards/cozykeys/bloomer/v3/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Paul Ewing - -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 { D0, D1, D3, D2, D4, B2 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 } -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json index 8540b0878ea..0c5e01cd05e 100644 --- a/keyboards/cozykeys/bloomer/v3/info.json +++ b/keyboards/cozykeys/bloomer/v3/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], + "rows": ["D0", "D1", "D3", "D2", "D4", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h index 6752b3934a8..2643e4de4a1 100644 --- a/keyboards/cozykeys/speedo/v2/config.h +++ b/keyboards/cozykeys/speedo/v2/config.h @@ -16,12 +16,6 @@ along with this program. If not, see . */ #pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 } -#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/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json index 6527ed1257a..0e94558e177 100644 --- a/keyboards/cozykeys/speedo/v2/info.json +++ b/keyboards/cozykeys/speedo/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x1192", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["D1", "D2", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h index 885b09d0ba2..85beda5e41f 100644 --- a/keyboards/cozykeys/speedo/v3/config.h +++ b/keyboards/cozykeys/speedo/v3/config.h @@ -16,12 +16,6 @@ along with this program. If not, see . */ #pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 } -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B5 #define RGBLED_NUM 12 diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index 2aa0d944854..a1a3bc18e43 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -8,6 +8,11 @@ "pid": "0x1192", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h index fdf42006ff7..5b878f779e7 100644 --- a/keyboards/craftwalk/config.h +++ b/keyboards/craftwalk/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F6, B3, B5 } -#define MATRIX_COL_PINS { B1, F7, F5, F4, B2, E6, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 19 diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json index 6fd1b7cea6d..67c7fe6525e 100644 --- a/keyboards/craftwalk/info.json +++ b/keyboards/craftwalk/info.json @@ -8,6 +8,11 @@ "pid": "0x2E8F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F7", "F5", "F4", "B2", "E6", "B4"], + "rows": ["F6", "B3", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h index f0c5263403f..9a38384749e 100755 --- a/keyboards/crawlpad/config.h +++ b/keyboards/crawlpad/config.h @@ -1,16 +1,8 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5 } -#define MATRIX_COL_PINS { D4, D5, D6, D7 } - /* Pins for custom per-row LEDs. Should be changed to use named pins. */ #define LED_ROW_PINS { 8, 9, 10, 11 } -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json index 0cdc5ef29a2..11582d861f5 100644 --- a/keyboards/crawlpad/info.json +++ b/keyboards/crawlpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6070", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D5", "D6", "D7"], + "rows": ["F0", "F1", "F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h index 15f68b19b2a..5298ea8a77d 100644 --- a/keyboards/crazy_keyboard_68/config.h +++ b/keyboards/crazy_keyboard_68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F6 #ifdef RGB_DI_PIN # define RGBLED_NUM 84 diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json index 740813ff4db..f1519acc41b 100644 --- a/keyboards/crazy_keyboard_68/info.json +++ b/keyboards/crazy_keyboard_68/info.json @@ -8,6 +8,11 @@ "pid": "0x13DE", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/crbn/config.h b/keyboards/crbn/config.h index 840d8e7ca58..f7584af0bb2 100644 --- a/keyboards/crbn/config.h +++ b/keyboards/crbn/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B1, F7, F6 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json index 5eeedab7002..63d2d92a67c 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2"], + "rows": ["B3", "B1", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4", "resolution": 2} diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h index 68655d9d8f9..76fcf3fa590 100644 --- a/keyboards/creatkeebs/glacier/config.h +++ b/keyboards/creatkeebs/glacier/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, E6, F5, D0 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F6, B0, B6, C6, C7, B1, B2, B3, B7, 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 diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json index 227adcbea20..3e306346f80 100644 --- a/keyboards/creatkeebs/glacier/info.json +++ b/keyboards/creatkeebs/glacier/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "F6", "B0", "B6", "C6", "C7", "B1", "B2", "B3", "B7", "D3", "D2", "D1"], + "rows": ["F0", "F1", "F4", "E6", "F5", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h index 3a17d73f172..72e4f39e53b 100644 --- a/keyboards/creatkeebs/thera/config.h +++ b/keyboards/creatkeebs/thera/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B2, B1, B0, E6, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/creatkeebs/thera/info.json b/keyboards/creatkeebs/thera/info.json index d30721658f1..5124ba95d66 100644 --- a/keyboards/creatkeebs/thera/info.json +++ b/keyboards/creatkeebs/thera/info.json @@ -8,6 +8,11 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], + "rows": ["B2", "B1", "B0", "E6", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h index 35b0326ec62..7c66ab16c64 100644 --- a/keyboards/crimsonkeyboards/resume1800/config.h +++ b/keyboards/crimsonkeyboards/resume1800/config.h @@ -16,24 +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 { A5, A0, A1, B1, B2, B0 } -#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D1, D5, D6, A6, A7, C7, C6, C5, C4, D7, C3, C2, C1, C0, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json index dbb1fa2ed99..4a259cbd932 100644 --- a/keyboards/crimsonkeyboards/resume1800/info.json +++ b/keyboards/crimsonkeyboards/resume1800/info.json @@ -8,6 +8,11 @@ "pid": "0xC18B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A2", "B3", "A3", "B4", "A4", "D1", "D5", "D6", "A6", "A7", "C7", "C6", "C5", "C4", "D7", "C3", "C2", "C1", "C0", "D0"], + "rows": ["A5", "A0", "A1", "B1", "B2", "B0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "num_lock": "B5" diff --git a/keyboards/crin/config.h b/keyboards/crin/config.h index 880213cc110..3fe5a403296 100644 --- a/keyboards/crin/config.h +++ b/keyboards/crin/config.h @@ -17,9 +17,5 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, B3 } -#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13 } -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/crin/info.json b/keyboards/crin/info.json index 748e64c4379..1e0bc9b38be 100644 --- a/keyboards/crin/info.json +++ b/keyboards/crin/info.json @@ -8,6 +8,11 @@ "pid": "0xCC11", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], + "rows": ["A9", "A8", "B15", "B14", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h deleted file mode 100644 index 709cf4acb0e..00000000000 --- a/keyboards/crkbd/config.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2019 @foostan -Copyright 2020 Drashna Jaelre <@drashna> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -#define MATRIX_ROW_PINS \ - { D4, C6, D7, E6 } - -// wiring of each half -#define MATRIX_COL_PINS \ - { F4, F5, F6, F7, B1, B3 } -// #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 - -/* - * 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/crkbd/info.json b/keyboards/crkbd/info.json index 778b33c565d..9f1b12ca25b 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "community_layouts": ["split_3x5_3", "split_3x6_3"], "layouts": { diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h index 2219e0d2289..06dc572be17 100644 --- a/keyboards/crkbd/r2g/config.h +++ b/keyboards/crkbd/r2g/config.h @@ -69,7 +69,5 @@ along with this program. If not, see . # define ENABLE_RGB_MATRIX_SOLID_SPLASH #endif -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index 1614ebc53b1..854a63a35da 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h @@ -35,5 +35,3 @@ along with this program. If not, see . { 27, 27 } # define SPLIT_TRANSPORT_MIRROR #endif - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h index c5e7661c65b..f739f1abfbb 100644 --- a/keyboards/custommk/genesis/rev1/config.h +++ b/keyboards/custommk/genesis/rev1/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 } -#define MATRIX_COL_PINS { F4, F5, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 #define RGB_DI_PIN E6 diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index aaab705432e..d957e4c604d 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xFAB0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "D7", "B4"], + "rows": ["F0", "C7", "C6", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7", "resolution": 2}, diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h index f152f723feb..00b9711420d 100644 --- a/keyboards/custommk/genesis/rev2/config.h +++ b/keyboards/custommk/genesis/rev2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0} -#define MATRIX_COL_PINS { F4, F5, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 #define RGB_DI_PIN E6 diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json index 45b83c512ab..901376fb3b7 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0xFAB1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "D7", "B4"], + "rows": ["F0", "C7", "C6", "B6", "B5", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7", "resolution": 2}, diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h index 655ac6ece1d..c25df59397a 100644 --- a/keyboards/cutie_club/borsdorf/config.h +++ b/keyboards/cutie_club/borsdorf/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { A15, A14, B12, B5, B4 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, 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/cutie_club/borsdorf/info.json b/keyboards/cutie_club/borsdorf/info.json index c53dc5f9dd5..3bd5ba0b09e 100644 --- a/keyboards/cutie_club/borsdorf/info.json +++ b/keyboards/cutie_club/borsdorf/info.json @@ -8,6 +8,11 @@ "pid": "0x6D8A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0"], + "rows": ["A15", "A14", "B12", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B13" }, diff --git a/keyboards/cutie_club/giant_macro_pad/config.h b/keyboards/cutie_club/giant_macro_pad/config.h index c78221d4c80..c5eb6384a37 100755 --- a/keyboards/cutie_club/giant_macro_pad/config.h +++ b/keyboards/cutie_club/giant_macro_pad/config.h @@ -16,16 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { C10, C11, C12, D2, B3, B4, B5, B6, B7, B8, A3, B2, B1, B0, C5, C4, A7, A6, A5, A4 } -#define MATRIX_COL_PINS { C9, C8, C7, C6, B15, B14, B13, B12, A8, A15, B9, A2, A1, A0, C3, C2, C1, C0, 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/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json index d68b8aa4d40..0ee63b2221e 100644 --- a/keyboards/cutie_club/giant_macro_pad/info.json +++ b/keyboards/cutie_club/giant_macro_pad/info.json @@ -8,6 +8,11 @@ "pid": "0x74B6", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C9", "C8", "C7", "C6", "B15", "B14", "B13", "B12", "A8", "A15", "B9", "A2", "A1", "A0", "C3", "C2", "C1", "C0", "F1", "F0"], + "rows": ["C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "A3", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h index 7e46d166b7b..c5eb6384a37 100644 --- a/keyboards/cutie_club/keebcats/denis/config.h +++ b/keyboards/cutie_club/keebcats/denis/config.h @@ -16,16 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 } -#define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, 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/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/info.json index 0fe5fcf5340..c4171df94de 100644 --- a/keyboards/cutie_club/keebcats/denis/info.json +++ b/keyboards/cutie_club/keebcats/denis/info.json @@ -8,6 +8,11 @@ "pid": "0xB260", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], + "rows": ["B2", "D0", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h index d2f4b19e871..c5eb6384a37 100644 --- a/keyboards/cutie_club/keebcats/dougal/config.h +++ b/keyboards/cutie_club/keebcats/dougal/config.h @@ -16,16 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 } -#define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json index 7555611d897..5060e146772 100644 --- a/keyboards/cutie_club/keebcats/dougal/info.json +++ b/keyboards/cutie_club/keebcats/dougal/info.json @@ -8,6 +8,11 @@ "pid": "0xB265", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "B7"], + "rows": ["B2", "D0", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h index 001aeb53754..4c65b71f76e 100644 --- a/keyboards/cutie_club/novus/config.h +++ b/keyboards/cutie_club/novus/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, C7, B2, B3, D0, D1, D2, D3, D7, B4, B5, D5, D4, 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/cutie_club/novus/info.json b/keyboards/cutie_club/novus/info.json index 834021416a2..e51a007def7 100644 --- a/keyboards/cutie_club/novus/info.json +++ b/keyboards/cutie_club/novus/info.json @@ -8,6 +8,11 @@ "pid": "0x3F42", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "B2", "B3", "D0", "D1", "D2", "D3", "D7", "B4", "B5", "D5", "D4", "D6"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h index e7a71048565..46a265902c4 100644 --- a/keyboards/cutie_club/wraith/config.h +++ b/keyboards/cutie_club/wraith/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, D6, D4, D5, D3, D2, D1, D0, B7 } -#define MATRIX_COL_PINS { 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/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json index 4c27785468c..f18b39837e2 100644 --- a/keyboards/cutie_club/wraith/info.json +++ b/keyboards/cutie_club/wraith/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "on_state": 0 diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h index 5b9aea0a99e..56f7ce0fdd7 100644 --- a/keyboards/cx60/config.h +++ b/keyboards/cx60/config.h @@ -16,14 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F1, F4, F5, F6, E6 } -#define MATRIX_COL_PINS { C7, C6, F7, F0, B4, D7, D6, B0, B1, B2, B3, D2, D3, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json index c8593795635..1220b32c8ad 100644 --- a/keyboards/cx60/info.json +++ b/keyboards/cx60/info.json @@ -8,6 +8,11 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "F7", "F0", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "D2", "D3", "D5"], + "rows": ["F1", "F4", "F5", "F6", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h index 5887401a3a2..8aca85bf26a 100644 --- a/keyboards/handwired/108key_trackpoint/config.h +++ b/keyboards/handwired/108key_trackpoint/config.h @@ -37,11 +37,5 @@ #define PS2_USART_RX_VECT USART1_RX_vect #endif -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, F0, D3, D4, F1, D6, D7, E0, E1, E2, E3, E4, E5, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json index 54233290e55..e771c4b8aad 100644 --- a/keyboards/handwired/108key_trackpoint/info.json +++ b/keyboards/handwired/108key_trackpoint/info.json @@ -8,6 +8,11 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h index 10e22657492..4b1dc39862c 100644 --- a/keyboards/handwired/2x5keypad/config.h +++ b/keyboards/handwired/2x5keypad/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B2 } -#define MATRIX_COL_PINS { 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/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json index 7267d486728..3679eca918b 100644 --- a/keyboards/handwired/2x5keypad/info.json +++ b/keyboards/handwired/2x5keypad/info.json @@ -8,6 +8,11 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/3dfoxc/config.h b/keyboards/handwired/3dfoxc/config.h deleted file mode 100644 index 9f08703b6d7..00000000000 --- a/keyboards/handwired/3dfoxc/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 david l goodrich - * - * 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 { F0, F1, C7, D5, B7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json index dfd4e8d4f09..bafce6ccbf0 100644 --- a/keyboards/handwired/3dfoxc/info.json +++ b/keyboards/handwired/3dfoxc/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h index c2effa2e468..f804456960f 100644 --- a/keyboards/handwired/3dp660/config.h +++ b/keyboards/handwired/3dp660/config.h @@ -20,14 +20,6 @@ along with this program. If not, see . #define TAPPING_TERM 400 -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D7, B4, B5, B6, F7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/info.json index bfe19819fe1..dd047530843 100644 --- a/keyboards/handwired/3dp660/info.json +++ b/keyboards/handwired/3dp660/info.json @@ -8,6 +8,11 @@ "pid": "0x3660", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h index 5037639719d..7caa265c1a1 100644 --- a/keyboards/handwired/412_64/config.h +++ b/keyboards/handwired/412_64/config.h @@ -2,23 +2,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 { D3, F4, F5, F6, F7, B1, B3, B2 } -#define MATRIX_COL_PINS { B0, D2, D0, D1, D4, C6, D7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/412_64/info.json b/keyboards/handwired/412_64/info.json index 2e8ead29508..e8e7ab9241d 100644 --- a/keyboards/handwired/412_64/info.json +++ b/keyboards/handwired/412_64/info.json @@ -8,6 +8,11 @@ "pid": "0x0412", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D2", "D0", "D1", "D4", "C6", "D7", "E6"], + "rows": ["D3", "F4", "F5", "F6", "F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h index 9341a90a761..57a8664649b 100644 --- a/keyboards/handwired/42/config.h +++ b/keyboards/handwired/42/config.h @@ -1,22 +1,5 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_COL_PINS { F5, F6, F7, F0, F1, F4, B6, B5, D7, C7, D6, B7 } -#define MATRIX_ROW_PINS { D2, D3, D0, 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/handwired/42/info.json b/keyboards/handwired/42/info.json index 16d3af16675..f887edea52a 100644 --- a/keyboards/handwired/42/info.json +++ b/keyboards/handwired/42/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"], + "rows": ["D2", "D3", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h index 31b6c8888d9..0ba89040c74 100644 --- a/keyboards/handwired/6key/config.h +++ b/keyboards/handwired/6key/config.h @@ -16,13 +16,5 @@ #pragma once - -/* pin-out */ -#define MATRIX_ROW_PINS { B4, D0 } -#define MATRIX_COL_PINS { D3, D2, D1 } - /* dip switch */ #define DIP_SWITCH_PINS { C6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json index 7d7e17b64cf..fec35620a28 100644 --- a/keyboards/handwired/6key/info.json +++ b/keyboards/handwired/6key/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1"], + "rows": ["B4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h index 0dc61becd35..e93fe5511f1 100644 --- a/keyboards/handwired/6macro/config.h +++ b/keyboards/handwired/6macro/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* pinout - DON'T CHANGE */ -#define MATRIX_ROW_PINS { B3, B4 } -#define MATRIX_COL_PINS { B0, B1, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #define RGBLED_NUM 10 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json index 1d1aac48ad3..d081a75d3e8 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/info.json @@ -8,6 +8,11 @@ "pid": "0x0037", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2"], + "rows": ["B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h index e847297296c..62911151584 100644 --- a/keyboards/handwired/aek64/config.h +++ b/keyboards/handwired/aek64/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -// Originally made for a Teensy 2++ -#define MATRIX_COL_PINS { F0, E6, E7, B0, B1, B2, B3, B4, B5, B6, D3, D0, D1, D2 } -#define MATRIX_ROW_PINS { E0, E1, C0, C1, C2 } - -#define DIODE_DIRECTION COL2ROW - /* Enable the space-cadet options */ #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_PGUP #define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json index 471208ca41c..4c71a69358a 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "E6", "E7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "D3", "D0", "D1", "D2"], + "rows": ["E0", "E1", "C0", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h deleted file mode 100644 index 84e51951a98..00000000000 --- a/keyboards/handwired/aim65/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Matteo Bonora - * - * 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, D4, D7, E6, B4, B5, B3, B1 } -#define MATRIX_COL_PINS { D1, C6, B6, B2, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json index de4263d1cd7..9439a11c765 100644 --- a/keyboards/handwired/aim65/info.json +++ b/keyboards/handwired/aim65/info.json @@ -8,6 +8,11 @@ "pid": "0x0F34", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "C6", "B6", "B2", "F7", "F6", "F5", "F4"], + "rows": ["D0", "D4", "D7", "E6", "B4", "B5", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h index 2cbbb3152a5..bcdca4920c7 100644 --- a/keyboards/handwired/amigopunk/config.h +++ b/keyboards/handwired/amigopunk/config.h @@ -16,14 +16,6 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { C0, C1, C2, C3, C4, C5 } -#define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json index e79911a6763..eb0d9d7fb2c 100644 --- a/keyboards/handwired/amigopunk/info.json +++ b/keyboards/handwired/amigopunk/info.json @@ -8,6 +8,11 @@ "pid": "0x1805", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], + "rows": ["C0", "C1", "C2", "C3", "C4", "C5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E0", "pin_b": "E1"} diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h index a138c0c2d1a..b7e08c2b248 100644 --- a/keyboards/handwired/angel/config.h +++ b/keyboards/handwired/angel/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { B6, B2, B5, B4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5 } -#define DIODE_DIRECTION COL2ROW - // https://docs.qmk.fm/using-qmk/software-features/tap_hold #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json index 004d30d93a8..3bf7d831789 100644 --- a/keyboards/handwired/angel/info.json +++ b/keyboards/handwired/angel/info.json @@ -8,6 +8,11 @@ "pid": "0x0805", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5"], + "rows": ["B6", "B2", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h deleted file mode 100644 index c140e5bced8..00000000000 --- a/keyboards/handwired/aplx2/config.h +++ /dev/null @@ -1,27 +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 { D1 } -#define MATRIX_COL_PINS { B5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json index dc1dd86e630..76aff146f2f 100644 --- a/keyboards/handwired/aplx2/info.json +++ b/keyboards/handwired/aplx2/info.json @@ -8,6 +8,11 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D3"], + "rows": ["D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h index 024ad37c13e..6f44c0cbba3 100644 --- a/keyboards/handwired/aranck/config.h +++ b/keyboards/handwired/aranck/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 \ - { D3, D2, D1, D0 } -#define MATRIX_COL_PINS \ - { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json index dd48558b140..7d2ea6124b1 100644 --- a/keyboards/handwired/aranck/info.json +++ b/keyboards/handwired/aranck/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["planck_mit"], diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h index 6861311460c..2ed5b28c873 100644 --- a/keyboards/handwired/arrow_pad/config.h +++ b/keyboards/handwired/arrow_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 { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define FORCE_NKRO /* diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index 8451637df53..91690cf83e8 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/info.json @@ -8,6 +8,11 @@ "pid": "0x4096", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7" }, diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h index 69a24d90386..9876e14fd31 100644 --- a/keyboards/handwired/atreus50/config.h +++ b/keyboards/handwired/atreus50/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0 } -#define MATRIX_COL_PINS { D4, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json index 2ef04b31f4e..4b12ba33d44 100644 --- a/keyboards/handwired/atreus50/info.json +++ b/keyboards/handwired/atreus50/info.json @@ -8,6 +8,11 @@ "pid": "0x040D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h index a4b2c64c668..dcf26800ca2 100644 --- a/keyboards/handwired/axon/config.h +++ b/keyboards/handwired/axon/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D5, D6, D4, D0 } -#define MATRIX_COL_PINS { B0, D7, B1, B2, C0, C1, C2, C3, C4, C5, 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/handwired/axon/info.json b/keyboards/handwired/axon/info.json index 0bf0deaaf3e..89300e23981 100644 --- a/keyboards/handwired/axon/info.json +++ b/keyboards/handwired/axon/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "B1", "B2", "C0", "C1", "C2", "C3", "C4", "C5", "D1"], + "rows": ["D5", "D6", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h index e28cd08a2ae..f2eee84a577 100644 --- a/keyboards/handwired/battleship_gamepad/config.h +++ b/keyboards/handwired/battleship_gamepad/config.h @@ -16,19 +16,11 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } - /* joystick configuration */ #define JOYSTICK_BUTTON_COUNT 25 #define JOYSTICK_AXIS_COUNT 2 #define JOYSTICK_AXIS_RESOLUTION 10 -/* 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/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json index d4705a5c5f3..06ef96ba21e 100644 --- a/keyboards/handwired/battleship_gamepad/info.json +++ b/keyboards/handwired/battleship_gamepad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/bigmac/config.h b/keyboards/handwired/bigmac/config.h deleted file mode 100644 index f33849faf74..00000000000 --- a/keyboards/handwired/bigmac/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Taylore101 - * - * 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 { F0, F1, C7, D5, B7 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3, D2, D1, D0, D4, C6, D7, E6, B4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json index 853bd946ad1..13c523245cf 100644 --- a/keyboards/handwired/bigmac/info.json +++ b/keyboards/handwired/bigmac/info.json @@ -8,6 +8,11 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h index ec81b3337a0..02f5f29c3f3 100644 --- a/keyboards/handwired/bolek/config.h +++ b/keyboards/handwired/bolek/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, B5, D3, D2, D1, B4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, E6, D7, C6, D0, 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/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json index 410ed8b9338..e72d4f45fb5 100644 --- a/keyboards/handwired/bolek/info.json +++ b/keyboards/handwired/bolek/info.json @@ -8,6 +8,11 @@ "pid": "0x3708", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"], + "rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/boss566y/redragon_vara/config.h b/keyboards/handwired/boss566y/redragon_vara/config.h deleted file mode 100644 index d7e3fbe2005..00000000000 --- a/keyboards/handwired/boss566y/redragon_vara/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 boss566y - -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 { B0, B1, B2, B3, B7, D0, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D1, D2, D3, C6, D5, C7, D4, D7, B4, B5, B6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json index 697cfac2262..f29633d4290 100644 --- a/keyboards/handwired/boss566y/redragon_vara/info.json +++ b/keyboards/handwired/boss566y/redragon_vara/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "C6", "D5", "C7", "D4", "D7", "B4", "B5", "B6"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "community_layouts": ["fullsize_ansi"], diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 9b7c48da75f..088f03a379f 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -23,18 +23,6 @@ along with this program. If not, see . #define SPLIT_USB_DETECT -// wiring of each half - -#define MATRIX_COL_PINS \ - { D1, D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } - -#define MATRIX_COL_PINS_RIGHT \ - { B5, B4, E6, D7, C6, D4, D1 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index a085da297fe..aad4662d72c 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 6] }, @@ -15,6 +20,11 @@ "soft_serial_pin": "D0", "bootmagic": { "matrix": [5, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h index 2a14eca16a2..2a30bd33633 100644 --- a/keyboards/handwired/bstk100/config.h +++ b/keyboards/handwired/bstk100/config.h @@ -18,23 +18,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* 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/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json index 03580c3332c..4d316b4397a 100644 --- a/keyboards/handwired/bstk100/info.json +++ b/keyboards/handwired/bstk100/info.json @@ -8,6 +8,11 @@ "pid": "0xB100", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D5", "num_lock": "D4", diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h index 74a7679e0b0..5f360813239 100644 --- a/keyboards/handwired/cans12er/config.h +++ b/keyboards/handwired/cans12er/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3 } -#define MATRIX_COL_PINS { D0, D4, C6, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/cans12er/info.json b/keyboards/handwired/cans12er/info.json index 37dd4242996..e3938ebc420 100644 --- a/keyboards/handwired/cans12er/info.json +++ b/keyboards/handwired/cans12er/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D4", "C6", "D7"], + "rows": ["F7", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/carpolly/config.h b/keyboards/handwired/carpolly/config.h deleted file mode 100644 index 4c2410ca986..00000000000 --- a/keyboards/handwired/carpolly/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Paul Enrico N. Viola - * - * 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 { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B6, B5, B4, D7, D6, D4, D5, C7 } - -#define DIODE_DIRECTION COL2ROW - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json index 482af57cc1a..3cac934d6e6 100644 --- a/keyboards/handwired/carpolly/info.json +++ b/keyboards/handwired/carpolly/info.json @@ -8,6 +8,11 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h index d881fecbaa6..5a01accc736 100644 --- a/keyboards/handwired/chiron/config.h +++ b/keyboards/handwired/chiron/config.h @@ -17,18 +17,9 @@ along with this program. If not, see . #pragma once - -// Pro Micro Pins 4, 6, 7, 8, 9 -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -// Pro Micro Pins A3, A2, A1, A0, 15, 14, 16 -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - - // Pro Micro Pins RX1 #define SPLIT_HAND_PIN D2 -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index b1590d8ded2..e737e8428c8 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7 diff --git a/keyboards/handwired/ck4x4/config.h b/keyboards/handwired/ck4x4/config.h index 0a5d6c5c6a9..6a40218df2e 100644 --- a/keyboards/handwired/ck4x4/config.h +++ b/keyboards/handwired/ck4x4/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B7, B8, B9, B10 } -#define MATRIX_ROW_PINS { B3, B4, B5, B6 } -#define DIODE_DIRECTION COL2ROW - //LEDS A6, RGB B15 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json index 17541e918f3..661f4edb2a5 100644 --- a/keyboards/handwired/ck4x4/info.json +++ b/keyboards/handwired/ck4x4/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B8", "B9", "B10"], + "rows": ["B3", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h index 6ec23cbd19f..b9449c4714b 100644 --- a/keyboards/handwired/cmd60/config.h +++ b/keyboards/handwired/cmd60/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, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, C6, D7, B4, B5, 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/handwired/cmd60/info.json b/keyboards/handwired/cmd60/info.json index 635bead9001..f3db2960f52 100644 --- a/keyboards/handwired/cmd60/info.json +++ b/keyboards/handwired/cmd60/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6", "D7", "B4", "B5", "B6"], + "rows": ["F0", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h deleted file mode 100644 index c42a0d5b0cd..00000000000 --- a/keyboards/handwired/co60/rev1/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2018 John M Daly - -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, B2, B5, B4, D7, D6, B3, B0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/info.json index 05a7a3a336a..6ded2d0cc1b 100644 --- a/keyboards/handwired/co60/rev1/info.json +++ b/keyboards/handwired/co60/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3", "B0"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h index 6f938b06b75..fa1c24a396c 100644 --- a/keyboards/handwired/co60/rev6/config.h +++ b/keyboards/handwired/co60/rev6/config.h @@ -16,15 +16,6 @@ */ #pragma once - -/* ROWS: Top to bottom, COLS: Left to right -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, A15, A10 } -#define MATRIX_COL_PINS { A2, A3, A6, B14, B15, A8, A9, A7, B3, B4, C14, C15, C13, 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/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/info.json index a189309496a..2fd31825833 100644 --- a/keyboards/handwired/co60/rev6/info.json +++ b/keyboards/handwired/co60/rev6/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "6.0.0" }, + "matrix_pins": { + "cols": ["A2", "A3", "A6", "B14", "B15", "A8", "A9", "A7", "B3", "B4", "C14", "C15", "C13", "B5", "B6"], + "rows": ["B0", "B1", "B2", "A15", "A10"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index 6647698dfbf..d31fe37783f 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/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 { A8, A2, B13, B2, B10 } -#define MATRIX_COL_PINS { A10, A9, A3, A4, A5, A6, B0, B1, A15, B3, B4, B5, C13, C14, C15 } - -/* 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/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json index 67d54fb0fbd..eecfabfca3c 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "7.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A3", "A4", "A5", "A6", "B0", "B1", "A15", "B3", "B4", "B5", "C13", "C14", "C15"], + "rows": ["A8", "A2", "B13", "B2", "B10"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h index 4e981b44282..36417b4a7bf 100644 --- a/keyboards/handwired/colorlice/config.h +++ b/keyboards/handwired/colorlice/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6, B0, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 9a884c67183..66e5836a15d 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -8,6 +8,11 @@ "pid": "0x0302", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h index 2eb9a4cd673..29473a1720c 100644 --- a/keyboards/handwired/concertina/64key/config.h +++ b/keyboards/handwired/concertina/64key/config.h @@ -16,14 +16,8 @@ #pragma once - -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - /* LEDs are not used in the standard 64key configuration. */ #define RGB_DI_PIN D3 #define RGBLED_NUM 0 -#define DIODE_DIRECTION COL2ROW - #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json index 39db7106735..86a5a1326c0 100644 --- a/keyboards/handwired/concertina/64key/info.json +++ b/keyboards/handwired/concertina/64key/info.json @@ -8,6 +8,11 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h index 59aa11f675b..800ed9d19a4 100644 --- a/keyboards/handwired/consolekeyboard/18key/config.h +++ b/keyboards/handwired/consolekeyboard/18key/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 { D1, D0 } -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json index 9fb64bcf210..a7c04ae2422 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/info.json @@ -8,6 +8,11 @@ "pid": "0x3332", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], + "rows": ["D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h index 7d8f67d24e6..800ed9d19a4 100644 --- a/keyboards/handwired/consolekeyboard/20key/config.h +++ b/keyboards/handwired/consolekeyboard/20key/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 { D1, D0 } -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json index 085815f58a7..4d99a74d5bf 100644 --- a/keyboards/handwired/consolekeyboard/20key/info.json +++ b/keyboards/handwired/consolekeyboard/20key/info.json @@ -8,6 +8,11 @@ "pid": "0x3432", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], + "rows": ["D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h index 59966bc8577..800ed9d19a4 100644 --- a/keyboards/handwired/consolekeyboard/27key/config.h +++ b/keyboards/handwired/consolekeyboard/27key/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 { D1, D0, F7} -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json index 37124c01960..0f17682dc66 100644 --- a/keyboards/handwired/consolekeyboard/27key/info.json +++ b/keyboards/handwired/consolekeyboard/27key/info.json @@ -8,6 +8,11 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], + "rows": ["D1", "D0", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h index ba82037cf4c..305448feec8 100644 --- a/keyboards/handwired/consolekeyboard/30key/config.h +++ b/keyboards/handwired/consolekeyboard/30key/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 { D1, D0, F7} -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json index e8f51b2c79a..0c53a6fa9ce 100644 --- a/keyboards/handwired/consolekeyboard/30key/info.json +++ b/keyboards/handwired/consolekeyboard/30key/info.json @@ -8,6 +8,11 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], + "rows": ["D1", "D0", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h index b76c3236416..be2926baf4a 100644 --- a/keyboards/handwired/croxsplit44/config.h +++ b/keyboards/handwired/croxsplit44/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D4, D5, D6, D7 } -#define MATRIX_COL_PINS { B6, B5, B4, D2, C0, C1, F5, F4, F3, F2, F1, F0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C4 #ifdef RGB_DI_PIN #define RGBLED_NUM 42 diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json index 7e5eaca944b..c4420fda111 100644 --- a/keyboards/handwired/croxsplit44/info.json +++ b/keyboards/handwired/croxsplit44/info.json @@ -8,6 +8,11 @@ "pid": "0x6146", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"], + "rows": ["D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/curiosity/config.h b/keyboards/handwired/curiosity/config.h index bec41310c47..65854bfac79 100644 --- a/keyboards/handwired/curiosity/config.h +++ b/keyboards/handwired/curiosity/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, F7, F6, F5 } -#define MATRIX_COL_PINS { D3, D4, F4, C6, D7, E6, B5, B4, B1, B3, B2, 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/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json index 6e796c4d8c2..a9a22fc39c7 100644 --- a/keyboards/handwired/curiosity/info.json +++ b/keyboards/handwired/curiosity/info.json @@ -8,6 +8,11 @@ "pid": "0x4355", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D4", "F4", "C6", "D7", "E6", "B5", "B4", "B1", "B3", "B2", "B6"], + "rows": ["D0", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h index a8ecd699855..befd720cc3c 100644 --- a/keyboards/handwired/cyberstar/config.h +++ b/keyboards/handwired/cyberstar/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A15, B3, A9, B5, A3 } -#define MATRIX_COL_PINS { A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8, A10, A14, B8, B9 } - -/* 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/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index e14b964e212..d83be6176ff 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -8,6 +8,11 @@ "pid": "0x432A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"], + "rows": ["A15", "B3", "A9", "B5", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h index 23dbfa831cd..c793057a923 100644 --- a/keyboards/handwired/d48/config.h +++ b/keyboards/handwired/d48/config.h @@ -1,14 +1,5 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { B8, B9, B1, B2, B4 } - -#define MATRIX_COL_PINS { A2, B0, A7, A8, A13, A14, B12, B11, B10, B15, B14, B13 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A15 diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index c607f21937f..08c9e6a1f86 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"], + "rows": ["B8", "B9", "B1", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "A6"}, diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h index 1e3f256b703..d7658643b71 100644 --- a/keyboards/handwired/dactyl_left/config.h +++ b/keyboards/handwired/dactyl_left/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, F6, F7 } -#define MATRIX_COL_PINS \ - { 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/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json index 122b5ddf25a..e8ce55e0014 100644 --- a/keyboards/handwired/dactyl_left/info.json +++ b/keyboards/handwired/dactyl_left/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h index 33f7c9769e3..ddae773badc 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } - -#define DIODE_DIRECTION ROW2COL - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGB_MATRIX_LED_COUNT 36 diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index 7302ced47e9..f99eba6502f 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h index 8cb68765ba1..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x5/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json index 00e052ce3a3..0f47f25afa2 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/info.json @@ -8,6 +8,11 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/config.h b/keyboards/handwired/dactyl_manuform/4x5_5/config.h index d0580b7c219..8904c34114c 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x5_5/config.h @@ -3,12 +3,5 @@ #pragma once - -// Wiring pins -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B4 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, F6 } - -#define DIODE_DIRECTION COL2ROW - #define EE_HANDS #define SPLIT_USB_DETECT diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json index b762c15cf84..e1f8ed4ccd3 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "F6"], + "rows": ["F7", "B1", "B3", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h index 64844dd7bf5..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -// row-driven -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index 5d6bb593ca0..7f89885c89b 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -8,6 +8,11 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h index 64844dd7bf5..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -// row-driven -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index e650d4990cc..93f4ec5bc1d 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h index 5abd1a68a20..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index 28cd7324ba6..532a1746d0a 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h deleted file mode 100644 index 91cd7800d54..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 Jan Christoph Ebersbach - -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 - - -// left half pro-mirco -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -// // right half adafruit feather -// #define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2 } -// #define MATRIX_ROW_PINS { D6, B7, B6, B5, D7, C6 } - -#define DIODE_DIRECTION COL2ROW - -// WS2812 RGB LED strip input and number of LEDs -// #define RGB_DI_PIN D3 -// #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json index f6643ce8c84..aaf843b177a 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0", "bootmagic": { diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/config.h deleted file mode 100644 index 65c4afbaf8a..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - -// WS2812 RGB LED strip input and number of LEDs -// #define RGB_DI_PIN D3 -// #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json index e422a73131a..7494e0ecf42 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0", "bootmagic": { diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h deleted file mode 100644 index 2b99868d19d..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2022 fgoodwin - -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_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index c81ac40fdba..9635c471233 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h index 38e4b1ab4b2..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/config.h +++ b/keyboards/handwired/dactyl_manuform/5x7/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, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index 4eed5d53b41..6e3b62e2184 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json @@ -8,6 +8,11 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h index 0f40ee28ac4..9639d4ba1d6 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h @@ -16,11 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B12, B13, B14, B15, A8 , A9, A10} -#define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4} -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // in col2row col is input, and row is output // #define SPLIT_HAND_MATRIX_GRID A10, A4 // 68kohm diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json index f28579ba5f1..0295176c259 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"] + }, + "diode_direction": "COL2ROW", "split": { "bootmagic": { "matrix": [7, 0] diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h index d156461f59c..85aee07d825 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json index 52523980a9a..32c81a5f932 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h index ebf41bd2922..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json index 4e9b4441632..b2da174b5a9 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json @@ -8,6 +8,11 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h index ebf41bd2922..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json index 6c929eb18c0..190acc18488 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json @@ -8,6 +8,11 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h index 1cbf1f65452..fbff478bedf 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/config.h +++ b/keyboards/handwired/dactyl_manuform/6x7/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index b2ea65651eb..5f774715a0a 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -8,6 +8,11 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h index dd38c6af7d8..c7f20b11037 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h @@ -1,39 +1,5 @@ #pragma once - -// MCUs are flipped on each side, relative to the shape of the case, -// but for ease of mounting, the pinout is not flipped with the controller. -// The same finger on each hand uses a column connected to the pin with the -// same silk-screen label on each Pro Micro. - -// Pin use: -// -// MCU | Silk | DMOTE -// -----+------+---------- -// D3 | TX0 | -// D2 | RX1 | -// D1 | 2 | LED strip input (dominant half only) -// D0 | 3 | Serial interface between halves -// D4 | 4 | Outermost pinky-finger column -// C6 | 5 | Column -// D7 | 6 | Column -// E6 | 7 | Column -// B4 | 8 | Column -// B5 | 9 | Outermost index-finger column -// -----+------+---------- -// F4 | A3 | -// F5 | A2 | -// F6 | A1 | Top row (furthest from user) -// F7 | A0 | Row -// B1 | 15 | Row -// B3 | 14 | Row -// B2 | 16 | Row -// B6 | 10 | Bottom row (closest to user) -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED, normally used to indicate keyboard state: #define RGBLIGHT_EFFECT_KNIGHT #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json index d26f06c45b5..4e86c8b3a67 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json @@ -10,6 +10,11 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "enabled": true, "soft_serial_pin": "D0" diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h index dc6f53955cc..00548e339cd 100644 --- a/keyboards/handwired/dactyl_promicro/config.h +++ b/keyboards/handwired/dactyl_promicro/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json index 51451dfcc1d..48202d90cd7 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h index abe8240150f..e40f6dfc69e 100644 --- a/keyboards/handwired/dactyl_rah/config.h +++ b/keyboards/handwired/dactyl_rah/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_DELAY 0 // Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json index bc21fcee0fd..f683a05edac 100644 --- a/keyboards/handwired/dactyl_rah/info.json +++ b/keyboards/handwired/dactyl_rah/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h index 1fefa56fc60..2e6498ab5d8 100644 --- a/keyboards/handwired/daishi/config.h +++ b/keyboards/handwired/daishi/config.h @@ -17,22 +17,5 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D6, D7, E0, E1, C0, C1, C2 } -#define MATRIX_COL_PINS { E6, E7, E3, B0, B1, B2, A6, A5, A4, A3, A2, A1, A0, F7, F6, F5, F4, F3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Set delay for tap_code on rotary encoder */ #define TAP_CODE_DELAY 10 diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json index 27671cc28a7..7bd1c6dd8d5 100644 --- a/keyboards/handwired/daishi/info.json +++ b/keyboards/handwired/daishi/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "E7", "E3", "B0", "B1", "B2", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7", "F6", "F5", "F4", "F3"], + "rows": ["D6", "D7", "E0", "E1", "C0", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F0", "resolution": 2} diff --git a/keyboards/handwired/ddg_56/config.h b/keyboards/handwired/ddg_56/config.h deleted file mode 100644 index e46edef395e..00000000000 --- a/keyboards/handwired/ddg_56/config.h +++ /dev/null @@ -1,21 +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 - -#define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 } -#define MATRIX_COL_PINS { A2, B8, B13, B14, B4, B11, B12, A13, A15, A8, A7, A6, B0, B1 } diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/info.json index f7253711e4f..a6407d262d4 100644 --- a/keyboards/handwired/ddg_56/info.json +++ b/keyboards/handwired/ddg_56/info.json @@ -8,6 +8,11 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A2", "B8", "B13", "B14", "B4", "B11", "B12", "A13", "A15", "A8", "A7", "A6", "B0", "B1"], + "rows": ["B5", "B15", "B9", "B10", "A14"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A1", "pin_b": "A0"}, diff --git a/keyboards/handwired/eagleii/config.h b/keyboards/handwired/eagleii/config.h deleted file mode 100644 index 7ebd3a4a8cd..00000000000 --- a/keyboards/handwired/eagleii/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { D0, B5, F1, B2, F7, F6, D4, D7, B4, B7, F5, B0 } -#define MATRIX_COL_PINS { D2, C6, E6, D5, B3, D3, D1, C7, F0, B6, B1, F4 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json index 23730b8af65..e84808c71da 100644 --- a/keyboards/handwired/eagleii/info.json +++ b/keyboards/handwired/eagleii/info.json @@ -8,6 +8,11 @@ "pid": "0x9789", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "D5", "B3", "D3", "D1", "C7", "F0", "B6", "B1", "F4"], + "rows": ["D0", "B5", "F1", "B2", "F7", "F6", "D4", "D7", "B4", "B7", "F5", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/elrgo_s/config.h b/keyboards/handwired/elrgo_s/config.h deleted file mode 100644 index 40b3f759d8f..00000000000 --- a/keyboards/handwired/elrgo_s/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2021 Yaroslav Smirnov - * - * 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 { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -// Reversed sort - -#define DIODE_DIRECTION COL2ROW - -/* 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/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index 33e3c7566c9..ba850bb5d40 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json @@ -8,6 +8,11 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h index 61946adcd2c..44589227461 100644 --- a/keyboards/handwired/ergocheap/config.h +++ b/keyboards/handwired/ergocheap/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A8, A9, B14, B12, B13, B15, B3, B11, A4, A5, A6, A7, B0, B1, B10 } -#define MATRIX_ROW_PINS { B5, B6, B7, B9, B8 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 500 #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json index 959a4299f58..097a4e62786 100644 --- a/keyboards/handwired/ergocheap/info.json +++ b/keyboards/handwired/ergocheap/info.json @@ -8,6 +8,11 @@ "pid": "0x6942", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["B5", "B6", "B7", "B9", "B8"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h index a43abb351ae..1b4e5a6d87e 100644 --- a/keyboards/handwired/evk/v1_3/config.h +++ b/keyboards/handwired/evk/v1_3/config.h @@ -15,25 +15,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B7, D0 } -#define MATRIX_COL_PINS \ - { D1, D2, D3, C6, C7, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative. - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json index bc6a5220038..10564bb2a7a 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "D4" }, diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h index 055c910e8bf..82fe0166b2f 100644 --- a/keyboards/handwired/fc200rt_qmk/config.h +++ b/keyboards/handwired/fc200rt_qmk/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6, B7, D0, D1 } -#define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1 } - -/* 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/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json index ebbd75ee7ec..395b42bcc8d 100644 --- a/keyboards/handwired/fc200rt_qmk/info.json +++ b/keyboards/handwired/fc200rt_qmk/info.json @@ -8,6 +8,11 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B0", "B1", "B2", "B3", "E6", "B7", "D0", "D1"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h index 5f5fef769b8..b9449c4714b 100644 --- a/keyboards/handwired/fivethirteen/config.h +++ b/keyboards/handwired/fivethirteen/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F6, F7, B6, B5, B4 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, F0, D0, D1, D2, D3, C6, C7, 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/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/info.json index 0a23ba02a28..66e51571e2d 100644 --- a/keyboards/handwired/fivethirteen/info.json +++ b/keyboards/handwired/fivethirteen/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "F0", "D0", "D1", "D2", "D3", "C6", "C7", "D6", "D7"], + "rows": ["F6", "F7", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h index cb020114b23..af56b8a7fe4 100644 --- a/keyboards/handwired/floorboard/config.h +++ b/keyboards/handwired/floorboard/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 { A2, A1, A0, B8 } -#define MATRIX_COL_PINS { B7, B6, B5, B4, B3, B2, B1, B9, B0, B15, B14, B13 } - -/* 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/handwired/floorboard/info.json b/keyboards/handwired/floorboard/info.json index 226041e40d2..b56a6309fe4 100644 --- a/keyboards/handwired/floorboard/info.json +++ b/keyboards/handwired/floorboard/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B1", "B9", "B0", "B15", "B14", "B13"], + "rows": ["A2", "A1", "A0", "B8"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h index 577b27b3720..fb1f9c37151 100644 --- a/keyboards/handwired/frankie_macropad/config.h +++ b/keyboards/handwired/frankie_macropad/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 } -#define MATRIX_COL_PINS { B3, B4, B5, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json index 24fb55f5daf..3416222269c 100644 --- a/keyboards/handwired/frankie_macropad/info.json +++ b/keyboards/handwired/frankie_macropad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B4", "B5", "B6"], + "rows": ["B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h index 56a55afd7cc..16acada5e70 100644 --- a/keyboards/handwired/freoduo/config.h +++ b/keyboards/handwired/freoduo/config.h @@ -15,15 +15,8 @@ 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 { B2, B6, F6, B3, B1, F7 } #define EE_HANDS -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D4 #if !defined(RGBLED_NUM) diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json index 12024a8c900..aaa5a77193a 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/info.json @@ -8,6 +8,11 @@ "pid": "0x0602", "device_version": "0.0.1" }, +"matrix_pins": { + "cols": ["B2", "B6", "F6", "B3", "B1", "F7"], + "rows": ["C6", "D7", "E6", "B4", "B5"] +}, +"diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/fruity60/config.h b/keyboards/handwired/fruity60/config.h index c325baca18c..091cb7b510b 100644 --- a/keyboards/handwired/fruity60/config.h +++ b/keyboards/handwired/fruity60/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS \ - { B6, B5, D7, C6, D0, D1 } -#define MATRIX_COL_PINS \ - { F7, F6, F5, F4, F1, F0, D2, D3, B7, D6, 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/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json index 0cffe5b5b2c..fdfc1772643 100644 --- a/keyboards/handwired/fruity60/info.json +++ b/keyboards/handwired/fruity60/info.json @@ -8,6 +8,11 @@ "pid": "0xB170", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"], + "rows": ["B6", "B5", "D7", "C6", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["60_tsangan_hhkb"], diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h index 95477b88f01..b9449c4714b 100644 --- a/keyboards/handwired/gamenum/config.h +++ b/keyboards/handwired/gamenum/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, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json index daf77d1784f..e35fb4a4e5a 100644 --- a/keyboards/handwired/gamenum/info.json +++ b/keyboards/handwired/gamenum/info.json @@ -8,6 +8,11 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h index 2f3caa2b2fc..f968fcc0d7e 100644 --- a/keyboards/handwired/hacked_motospeed/config.h +++ b/keyboards/handwired/hacked_motospeed/config.h @@ -17,27 +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) - * -*/ - -// WR XR YR ZR VR ZL YL XL WL VL -#define MATRIX_ROW_PINS { B3, B4, F1, B5, B6, D5, D4, D6, D7, C4} - -// ER DR CR BR AR FR FL AL BL CL DL EL -#define MATRIX_COL_PINS { F7, F6, F5, F4, F3, F2, E0, E1, C0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json index 57b66e3bdfe..c64931a74bf 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/info.json @@ -8,6 +8,11 @@ "pid": "0x0690", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"], + "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h index 0051981fc16..ced4a9b4e5e 100644 --- a/keyboards/handwired/heisenberg/config.h +++ b/keyboards/handwired/heisenberg/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 \ - { D3, D2, D1, D0 } -#define MATRIX_COL_PINS \ - { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json index 2ad37b00c6f..a839fe711bc 100644 --- a/keyboards/handwired/heisenberg/info.json +++ b/keyboards/handwired/heisenberg/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["planck_mit"], diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h index 5a75dff2201..599f0016617 100644 --- a/keyboards/handwired/hexon38/config.h +++ b/keyboards/handwired/hexon38/config.h @@ -2,14 +2,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, F0, B2, F4 } -#define MATRIX_COL_PINS { C6, D3, D2, D1, D0, B7, F6, F7, B6, B5, B4, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/info.json index a0ea12aae5c..2f22eeeaf8f 100644 --- a/keyboards/handwired/hexon38/info.json +++ b/keyboards/handwired/hexon38/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D3", "D2", "D1", "D0", "B7", "F6", "F7", "B6", "B5", "B4", "D7"], + "rows": ["B0", "F0", "B2", "F4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h index 2face5fbed7..875f441b12e 100644 --- a/keyboards/handwired/hnah108/config.h +++ b/keyboards/handwired/hnah108/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, F1, C7, B4, B5, B6, C6 } -#define MATRIX_COL_PINS { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 30 // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 116591fddff..e18dc6c09d8 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], + "rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h index 083450a7432..3ebccf9ad2d 100644 --- a/keyboards/handwired/hnah40/config.h +++ b/keyboards/handwired/hnah40/config.h @@ -16,26 +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 { B4, B5, B3, D4 } -#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json index d01cdbd00d8..cd94929ea18 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"], + "rows": ["B4", "B5", "B3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h index d4cf391b6d7..c964590d808 100644 --- a/keyboards/handwired/hnah40rgb/config.h +++ b/keyboards/handwired/hnah40rgb/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 \ - { B7, D7, F1, F0 } -#define MATRIX_COL_PINS \ - { D5, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 50 diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index b1fe1f8479e..743a0bbecda 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], + "rows": ["B7", "D7", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h deleted file mode 100644 index 427c62a66bd..00000000000 --- a/keyboards/handwired/hwpm87/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 CAO THAI DUONG (@KD-MM2) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define DIODE_DIRECTION ROW2COL - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 } diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index 8654ea75617..a719ba5ef24 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B7", "F0", "F1", "D6", "C7", "B6", "F7", "F6", "F5", "F4"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "D5", "on_state": 0 diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h index e8ca31777e2..af3de54eb2b 100644 --- a/keyboards/handwired/ibm122m/config.h +++ b/keyboards/handwired/ibm122m/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_COL_PINS { E6, B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C7, F1 } -#define MATRIX_ROW_PINS { F0, B5, B4, B3, B2, B1, B0, E7 } - -/* 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/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json index aa423f0ecef..6a157a8031b 100644 --- a/keyboards/handwired/ibm122m/info.json +++ b/keyboards/handwired/ibm122m/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C7", "F1"], + "rows": ["F0", "B5", "B4", "B3", "B2", "B1", "B0", "E7"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", "debounce": 15, diff --git a/keyboards/handwired/ibm_wheelwriter/config.h b/keyboards/handwired/ibm_wheelwriter/config.h deleted file mode 100644 index 254f60be748..00000000000 --- a/keyboards/handwired/ibm_wheelwriter/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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 { B0, B1, B2, B3, B7, D0, D1, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5 } - -#define DIODE_DIRECTION COL2ROW - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json index d75336e0b63..19161e5a071 100644 --- a/keyboards/handwired/ibm_wheelwriter/info.json +++ b/keyboards/handwired/ibm_wheelwriter/info.json @@ -8,6 +8,11 @@ "pid": "0x5F89", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/jn68m/config.h b/keyboards/handwired/jn68m/config.h index a0045560a11..e736c430c0d 100644 --- a/keyboards/handwired/jn68m/config.h +++ b/keyboards/handwired/jn68m/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, D5, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, 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 diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json index 5ea575525a8..c7934968dc0 100644 --- a/keyboards/handwired/jn68m/info.json +++ b/keyboards/handwired/jn68m/info.json @@ -8,6 +8,11 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "D1"], + "rows": ["B0", "B1", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h index 7078ebb31d1..00bbcf507d9 100644 --- a/keyboards/handwired/jopr/config.h +++ b/keyboards/handwired/jopr/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D6, D2, D4, D3, D5, D7, C6, B6, F5 } -#define MATRIX_COL_PINS { B3, B2, B1, B0, F7, E6, F6, B5, C7, 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/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json index f9bb248aeed..3e0ce0ab5fc 100644 --- a/keyboards/handwired/jopr/info.json +++ b/keyboards/handwired/jopr/info.json @@ -8,6 +8,11 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"], + "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h index 4cb70762fbe..5f360813239 100644 --- a/keyboards/handwired/jot50/config.h +++ b/keyboards/handwired/jot50/config.h @@ -1,13 +1,5 @@ #pragma once - -/* pro_micro pin-out */ -#define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, 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 diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json index 1bcf932946e..f7cfe21d00f 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], + "rows": ["D7", "E6", "B4", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "breathing": true diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h index f3e53c98ced..81fc446b3a0 100644 --- a/keyboards/handwired/jotanck/config.h +++ b/keyboards/handwired/jotanck/config.h @@ -1,18 +1,10 @@ #pragma once - -/* pro_micro pin-out */ -#define MATRIX_ROW_PINS { D7, E6, B6, B2 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 } - /* leds */ #define JOTANCK_LEDS #define JOTANCK_LED1 B5 #define JOTANCK_LED2 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/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json index 57e41a0f8be..0a3c9a9e83c 100644 --- a/keyboards/handwired/jotanck/info.json +++ b/keyboards/handwired/jotanck/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], + "rows": ["D7", "E6", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h index 9a1af0d614e..0e9074f2ce7 100644 --- a/keyboards/handwired/jotpad16/config.h +++ b/keyboards/handwired/jotpad16/config.h @@ -1,18 +1,10 @@ #pragma once - -/* pro_micro pin-out */ -#define MATRIX_ROW_PINS { B6, B2, D2, D3 } -#define MATRIX_COL_PINS { E6, D7, B3, B1 } - /* leds */ #define JOTPAD16_LEDS #define JOTPAD16_LED1 B5 #define JOTPAD16_LED2 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/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json index 7ec8f9aa97a..2d01be7b48f 100644 --- a/keyboards/handwired/jotpad16/info.json +++ b/keyboards/handwired/jotpad16/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D7", "B3", "B1"], + "rows": ["B6", "B2", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "debounce": 0, diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h index 781bff90f36..313fe1940c1 100644 --- a/keyboards/handwired/jtallbean/split_65/config.h +++ b/keyboards/handwired/jtallbean/split_65/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, F1, F0, C7, B6 } -#define MATRIX_COL_PINS { C6, B5, B4, D7, D6, D4, D2, D3, B7 } // B7 is not actually used, but it is needed since # of entries must equal 9 -#define MATRIX_ROW_PINS_RIGHT { E6, F0, F1, F7, D7 } -#define MATRIX_COL_PINS_RIGHT { B4, B5, B6, C6, C7, D4, D6, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json index 6adb995ff7a..5c48352c1fd 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/info.json @@ -8,8 +8,19 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"], + "rows": ["F4", "F1", "F0", "C7", "B6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"], + "rows": ["E6", "F0", "F1", "F7", "D7"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h index df5d4248ca4..4570cdb18e1 100644 --- a/keyboards/handwired/juliet/config.h +++ b/keyboards/handwired/juliet/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) - * - */ - -/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */ -/* 0 1 2 3 4 5 6 7 8 9 10 11*/ -#define MATRIX_ROW_PINS { F5, D2, D3, F4 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B1, B3, B2, B6} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/juliet/info.json b/keyboards/handwired/juliet/info.json index 0fc7f4726f2..c2acd0ad73a 100644 --- a/keyboards/handwired/juliet/info.json +++ b/keyboards/handwired/juliet/info.json @@ -8,6 +8,11 @@ "pid": "0x4069", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"], + "rows": ["F5", "D2", "D3", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/k8split/config.h b/keyboards/handwired/k8split/config.h deleted file mode 100644 index e8e7ad9411c..00000000000 --- a/keyboards/handwired/k8split/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Ckat - -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 { D5, D3, D2, D1, D0, B7 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/info.json index 900871f88a8..4cb7713c7f7 100644 --- a/keyboards/handwired/k8split/info.json +++ b/keyboards/handwired/k8split/info.json @@ -8,6 +8,11 @@ "pid": "0xC868", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D5", "D3", "D2", "D1", "D0", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h index 0fd1452887c..9bcc1ca12ed 100644 --- a/keyboards/handwired/k_numpad17/config.h +++ b/keyboards/handwired/k_numpad17/config.h @@ -20,14 +20,6 @@ along with this program. If not, see . #define TAPPING_TERM 400 -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D1, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B2, B1, F6 , 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json index 1ea003178b2..ceac0277d0c 100644 --- a/keyboards/handwired/k_numpad17/info.json +++ b/keyboards/handwired/k_numpad17/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "F6", "F4"], + "rows": ["D1", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h index 2366898f054..f9528817727 100644 --- a/keyboards/handwired/kbod/config.h +++ b/keyboards/handwired/kbod/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 } -#define MATRIX_COL_PINS { D0, D1, F0, F1, 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json index 6ce0f46f2c1..667e53756e0 100644 --- a/keyboards/handwired/kbod/info.json +++ b/keyboards/handwired/kbod/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h index 1a75229c514..f470196e1d6 100644 --- a/keyboards/handwired/ks63/config.h +++ b/keyboards/handwired/ks63/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json index df7bf5c6459..8bb32c871df 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/info.json @@ -8,6 +8,11 @@ "pid": "0x3061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h index 618862f2e2a..5875c7e7c4c 100644 --- a/keyboards/handwired/lagrange/config.h +++ b/keyboards/handwired/lagrange/config.h @@ -19,12 +19,3 @@ #define EE_HANDS #define SPLIT_USB_DETECT - -/* pin-out */ -#define MATRIX_ROW_PINS { E6, F1, F0, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B4, B5, D7, B6, C6, D6 } -#define MATRIX_ROW_PINS_RIGHT { B5, B4, D7, B6, C6, D6, D4 } -#define MATRIX_COL_PINS_RIGHT { C7, F7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 7d1179e1f40..1141183e18f 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -8,6 +8,19 @@ "pid": "0x2718", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "D7", "B6", "C6", "D6"], + "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", + "split": { + "matrix_pins": { + "right": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"] + } + } + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D2" diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h index 3f59e844597..831b41bcd2a 100644 --- a/keyboards/handwired/leftynumpad/config.h +++ b/keyboards/handwired/leftynumpad/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, D4, C6, D7 } -#define MATRIX_COL_PINS { E6, B4, B5, B6, 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/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/info.json index ffa7915a7dd..c265fe3cfea 100644 --- a/keyboards/handwired/leftynumpad/info.json +++ b/keyboards/handwired/leftynumpad/info.json @@ -8,6 +8,11 @@ "pid": "0xBEEF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5", "B6", "B2"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 10, diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h index f99c65303ce..d960bc9b2a2 100644 --- a/keyboards/handwired/lovelive9/config.h +++ b/keyboards/handwired/lovelive9/config.h @@ -2,13 +2,6 @@ #pragma once -/* default pin-out */ -#define MATRIX_ROW_PINS { NO_PIN } -#define MATRIX_COL_PINS { B4, B6, B2, D7, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json index be3541c4fd8..f5cecc75e59 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"], + "rows": [null] + }, + "diode_direction": "COL2ROW", "backlight": { "breathing_period": 2 }, diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h index 20618498456..6770ce638c1 100644 --- a/keyboards/handwired/m40/5x5_macropad/config.h +++ b/keyboards/handwired/m40/5x5_macropad/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 { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, 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/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index 3e9138af274..d5eeb65eb05 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index 4063b253b60..a3de56d0767 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -17,20 +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 DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B9 #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 diff --git a/keyboards/handwired/macroboard/f401/config.h b/keyboards/handwired/macroboard/f401/config.h deleted file mode 100644 index c5ea2ff6a21..00000000000 --- a/keyboards/handwired/macroboard/f401/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Michał Szczepaniak - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { A4, A3, A2, A1, A0 } -#define MATRIX_COL_PINS { A5, A6, A7, B0, B1, B10 } diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json index acd7e83f77d..e14cb41fd36 100644 --- a/keyboards/handwired/macroboard/f401/info.json +++ b/keyboards/handwired/macroboard/f401/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["A4", "A3", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h index c7004fd5205..cc951dcefcc 100644 --- a/keyboards/handwired/macroboard/f411/config.h +++ b/keyboards/handwired/macroboard/f411/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A15, B3, B4, B5, B7 } -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 } - #define AUDIO_INIT_DELAY #define AUDIO_PIN B10 #define AUDIO_PWM_DRIVER PWMD2 diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json index 2517a82403f..a912b9f1414 100644 --- a/keyboards/handwired/macroboard/f411/info.json +++ b/keyboards/handwired/macroboard/f411/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A10"], + "rows": ["A15", "B3", "B4", "B5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h index 2518265be63..b9449c4714b 100644 --- a/keyboards/handwired/magicforce61/config.h +++ b/keyboards/handwired/magicforce61/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, D4 } -#define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/info.json index 9652a35ba50..fd457aba7e0 100644 --- a/keyboards/handwired/magicforce61/info.json +++ b/keyboards/handwired/magicforce61/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5"], + "rows": ["D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h index b4c67fbbd70..b9449c4714b 100644 --- a/keyboards/handwired/magicforce68/config.h +++ b/keyboards/handwired/magicforce68/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 { B2, B0, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B7, D6 } - -/* 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/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json index c1df42eed83..46563948582 100644 --- a/keyboards/handwired/magicforce68/info.json +++ b/keyboards/handwired/magicforce68/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B0", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h index 608411ef313..1d6272b3d49 100644 --- a/keyboards/handwired/marauder/config.h +++ b/keyboards/handwired/marauder/config.h @@ -16,20 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 } -#define DIODE_DIRECTION COL2ROW #define LAYER_STATE_8BIT #define RGB_DI_PIN D3 diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json index 16fdc30e260..059cc1dd33e 100644 --- a/keyboards/handwired/marauder/info.json +++ b/keyboards/handwired/marauder/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"], + "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h index ac759e6771d..3fd748d1824 100644 --- a/keyboards/handwired/mechboards_micropad/config.h +++ b/keyboards/handwired/mechboards_micropad/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 } -#define MATRIX_COL_PINS { B2, B3, B1, 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/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json index e5e848fd711..6d751780f62 100644 --- a/keyboards/handwired/mechboards_micropad/info.json +++ b/keyboards/handwired/mechboards_micropad/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h deleted file mode 100644 index dcf0a27d210..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define MATRIX_ROW_PINS \ - { B15, A8, A9, B14, A15, B3 } -#define MATRIX_COL_PINS \ - { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 } diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json index 68df328ac74..eeaa9c392be 100644 --- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json +++ b/keyboards/handwired/meck_tkl/blackpill_f401/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], + "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "on_state": 0 diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h index 06430fffeb3..30221cc2168 100644 --- a/keyboards/handwired/meck_tkl/config.h +++ b/keyboards/handwired/meck_tkl/config.h @@ -3,21 +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) - * - */ - -/* 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/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h index 2bfa5062647..b9449c4714b 100644 --- a/keyboards/handwired/minorca/config.h +++ b/keyboards/handwired/minorca/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* MinOrca PCB default pin-out */ -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json index b91e59ca67e..c7b463f2231 100644 --- a/keyboards/handwired/minorca/info.json +++ b/keyboards/handwired/minorca/info.json @@ -8,6 +8,11 @@ "pid": "0x6660", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/config.h b/keyboards/handwired/ms_sculpt_mobile/astar/config.h deleted file mode 100644 index aafa6953c74..00000000000 --- a/keyboards/handwired/ms_sculpt_mobile/astar/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D3, D2, E2 } -#define MATRIX_COL_PINS { B4, B5, E6, B7, B6, D6, C7, F7, F6, F4, F5, F1, F0, D5, B0, B1, B2, B3 } diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/info.json index 6f6786e9ada..9454bcda709 100644 --- a/keyboards/handwired/ms_sculpt_mobile/astar/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/astar/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B4", "B5", "E6", "B7", "B6", "D6", "C7", "F7", "F6", "F4", "F5", "F1", "F0", "D5", "B0", "B1", "B2", "B3"], + "rows": ["D7", "C6", "D4", "D0", "D1", "D3", "D2", "E2"] + }, + "diode_direction": "ROW2COL", "keyboard_name": "sculpt mobile astar", "processor": "atmega32u4", "bootloader": "caterina" diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h deleted file mode 100644 index 27fba0b887e..00000000000 --- a/keyboards/handwired/ms_sculpt_mobile/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* COL2ROW or 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/handwired/ms_sculpt_mobile/teensy2pp/config.h b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h deleted file mode 100644 index 7a514a76cb6..00000000000 --- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define MATRIX_ROW_PINS { F7, F6, F4, F5, F3, F2, F1, F0 } -#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C1, C0, C3, C2, C5, C4, C7 } diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json index 08fc09e4b10..2d500a8ae28 100644 --- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "sculpt mobile teensypp", + "matrix_pins": { + "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C1", "C0", "C3", "C2", "C5", "C4", "C7"], + "rows": ["F7", "F6", "F4", "F5", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay" } diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h index 9ebec0ffef6..9dcdd90bb7e 100644 --- a/keyboards/handwired/mutepad/config.h +++ b/keyboards/handwired/mutepad/config.h @@ -3,27 +3,8 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top 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 } -#define MATRIX_COL_PINS \ - { B1, B3, B2, B6 } - #define TAP_CODE_DELAY 10 -/* 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/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json index 6068f33b9dc..15b8d4bc69a 100644 --- a/keyboards/handwired/mutepad/info.json +++ b/keyboards/handwired/mutepad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5", "resolution": 2} diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h index b88e3f0d486..2e2a2bbcbf5 100644 --- a/keyboards/handwired/myskeeb/config.h +++ b/keyboards/handwired/myskeeb/config.h @@ -1,12 +1,5 @@ #pragma once - -// Wiring of Each Half -#define DIODE_DIRECTION COL2ROW -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F6, F7, F5 } -#define MATRIX_COL_PINS_RIGHT { F5, B3, F7, B1, F6, B2, B6 } - // Comunication and Split Detection #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json index 750645d6f44..a72ceb4fc7c 100644 --- a/keyboards/handwired/myskeeb/info.json +++ b/keyboards/handwired/myskeeb/info.json @@ -8,8 +8,18 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D3" + "soft_serial_pin": "D3", + "matrix_pins": { + "right": { + "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h index f5019df2852..4b007cf387e 100644 --- a/keyboards/handwired/nicekey/config.h +++ b/keyboards/handwired/nicekey/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { C6 } -#define MATRIX_ROW_PINS { 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/handwired/nicekey/info.json b/keyboards/handwired/nicekey/info.json index 24872ad800d..20a10a7e839 100644 --- a/keyboards/handwired/nicekey/info.json +++ b/keyboards/handwired/nicekey/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h index 23cc53d3f88..6a4ebbec82e 100644 --- a/keyboards/handwired/not_so_minidox/config.h +++ b/keyboards/handwired/not_so_minidox/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, D4 } - //#define EE_HANDS #define MASTER_LEFT diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json index fa408e66333..dee4d76c50c 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "D4"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/novem/config.h b/keyboards/handwired/novem/config.h index 5758bc41c38..b5a88cb22e5 100644 --- a/keyboards/handwired/novem/config.h +++ b/keyboards/handwired/novem/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, B4, B5 } -#define MATRIX_COL_PINS { B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/info.json index 656863da644..be6e3a1764b 100644 --- a/keyboards/handwired/novem/info.json +++ b/keyboards/handwired/novem/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2", "B6"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h index 66b0bf2b75c..81860eaf4dd 100644 --- a/keyboards/handwired/nozbe_macro/config.h +++ b/keyboards/handwired/nozbe_macro/config.h @@ -17,16 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B0 } -#define MATRIX_COL_PINS \ - { D1, D0, D4, 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 diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json index 162b3a68036..5d796312ccf 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6"], + "rows": ["B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5" }, diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h index 9c2c66732a3..b9449c4714b 100644 --- a/keyboards/handwired/numpad20/config.h +++ b/keyboards/handwired/numpad20/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F6, B1, B3, B6, B5 } -#define MATRIX_COL_PINS { D1, D0, F5, 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json index adc0abec123..fb3a11e4003 100644 --- a/keyboards/handwired/numpad20/info.json +++ b/keyboards/handwired/numpad20/info.json @@ -8,6 +8,11 @@ "pid": "0x0504", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "F5", "F4"], + "rows": ["F6", "B1", "B3", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/obuwunkunubi/spaget/config.h b/keyboards/handwired/obuwunkunubi/spaget/config.h index 6a7baeba338..55acb93cec0 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/config.h +++ b/keyboards/handwired/obuwunkunubi/spaget/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, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B1, B3, B2, 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 diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json index 8a205c67945..6bec9fa1630 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/info.json +++ b/keyboards/handwired/obuwunkunubi/spaget/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"}, diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h index 5f31deab10f..8906351de9a 100644 --- a/keyboards/handwired/oem_ansi_fullsize/config.h +++ b/keyboards/handwired/oem_ansi_fullsize/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) - * - */ - -#define MATRIX_ROW_PINS \ - { F5, F4, F3, F2, F1, F0 } -// R0 R1 R2 R3 R4 R5 - -#define MATRIX_COL_PINS \ - { C3, C2, C1, C0, E1, E0, D7, E6, D5, D4, D3, D2, D1, D0, B7, B0, B1, B2, B3, B4, B5, F6 } -// C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF CG CH CI CJ CK CL - - -/* 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/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/info.json index 57a3a74df99..f22616b3381 100644 --- a/keyboards/handwired/oem_ansi_fullsize/info.json +++ b/keyboards/handwired/oem_ansi_fullsize/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "E1", "E0", "D7", "E6", "D5", "D4", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2", "B3", "B4", "B5", "F6"], + "rows": ["F5", "F4", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "community_layouts": ["fullsize_ansi"], diff --git a/keyboards/handwired/oem_iso_fullsize/config.h b/keyboards/handwired/oem_iso_fullsize/config.h deleted file mode 100644 index af6146110d5..00000000000 --- a/keyboards/handwired/oem_iso_fullsize/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/** Copyright 2021 andresteare - * - * 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 { C0, B4, F3, F4, F5, F6 } -#define MATRIX_COL_PINS { C2, C1, E0, D4, D5, A4, A0, B2, B0, E7, E6, D6, B1, B3, D3, D2, B6, F7, F0, F1, F2 } - -#define DIODE_DIRECTION ROW2COL - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json index b1c5c509691..266d53ede20 100644 --- a/keyboards/handwired/oem_iso_fullsize/info.json +++ b/keyboards/handwired/oem_iso_fullsize/info.json @@ -8,6 +8,11 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C2", "C1", "E0", "D4", "D5", "A4", "A0", "B2", "B0", "E7", "E6", "D6", "B1", "B3", "D3", "D2", "B6", "F7", "F0", "F1", "F2"], + "rows": ["C0", "B4", "F3", "F4", "F5", "F6"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h index 55782eaff19..b9449c4714b 100644 --- a/keyboards/handwired/ortho5x13/config.h +++ b/keyboards/handwired/ortho5x13/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json index 6057d1e0929..b15b3fa61b8 100644 --- a/keyboards/handwired/ortho5x13/info.json +++ b/keyboards/handwired/ortho5x13/info.json @@ -8,6 +8,11 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h index 92f72b4fc78..c37ac425370 100644 --- a/keyboards/handwired/ortho5x14/config.h +++ b/keyboards/handwired/ortho5x14/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, C7, D5, B7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json index 8e657b7675f..5faccec8afa 100644 --- a/keyboards/handwired/ortho5x14/info.json +++ b/keyboards/handwired/ortho5x14/info.json @@ -8,6 +8,11 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/ortho_brass/config.h b/keyboards/handwired/ortho_brass/config.h deleted file mode 100644 index 3f8e24089be..00000000000 --- a/keyboards/handwired/ortho_brass/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Christoph Jabs (BifbofII) - * - * 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 - - -/* Handwired pin-out */ -#define MATRIX_ROW_PINS \ - { D3, D2, D1, D0 } -#define MATRIX_COL_PINS \ - { F4, F7, F5, F1, C7, F0, B1, B0, F6, B6, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json index c931dc327f0..860d0441a45 100644 --- a/keyboards/handwired/ortho_brass/info.json +++ b/keyboards/handwired/ortho_brass/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h index a3693706d4d..ced8197ddb0 100644 --- a/keyboards/handwired/p65rgb/config.h +++ b/keyboards/handwired/p65rgb/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, C6, B6, B5, D5 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B0, B1, B2, B3, B7, D0, D1, D2, D3, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B4 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index 316fa0f61dc..82e433527a3 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x75B4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"], + "rows": ["C7", "C6", "B6", "B5", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C7", "esc_output": "E6" diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h index 8ae32975fea..b9449c4714b 100644 --- a/keyboards/handwired/pilcrow/config.h +++ b/keyboards/handwired/pilcrow/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, F7, B1, B3 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, F5, F6, B6, B2, F4, B5} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json index 2c05b74a36b..28bb690c3cb 100644 --- a/keyboards/handwired/pilcrow/info.json +++ b/keyboards/handwired/pilcrow/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "F5", "F6", "B6", "B2", "F4", "B5"], + "rows": ["B4", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/pill60/blackpill_f401/config.h b/keyboards/handwired/pill60/blackpill_f401/config.h deleted file mode 100644 index 7de86543198..00000000000 --- a/keyboards/handwired/pill60/blackpill_f401/config.h +++ /dev/null @@ -1,22 +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 - -#define MATRIX_COL_PINS \ - { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 } -#define MATRIX_ROW_PINS \ - { B4, B3, A15, B13, B5 } diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json index acd7e83f77d..8d85a2e9300 100644 --- a/keyboards/handwired/pill60/blackpill_f401/info.json +++ b/keyboards/handwired/pill60/blackpill_f401/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], + "rows": ["B4", "B3", "A15", "B13", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/handwired/pill60/blackpill_f411/config.h b/keyboards/handwired/pill60/blackpill_f411/config.h deleted file mode 100644 index 7de86543198..00000000000 --- a/keyboards/handwired/pill60/blackpill_f411/config.h +++ /dev/null @@ -1,22 +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 - -#define MATRIX_COL_PINS \ - { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 } -#define MATRIX_ROW_PINS \ - { B4, B3, A15, B13, B5 } diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json index 2517a82403f..4e0935f79ce 100644 --- a/keyboards/handwired/pill60/blackpill_f411/info.json +++ b/keyboards/handwired/pill60/blackpill_f411/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], + "rows": ["B4", "B3", "A15", "B13", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/handwired/pill60/bluepill/config.h b/keyboards/handwired/pill60/bluepill/config.h deleted file mode 100644 index 1ba5ff2069d..00000000000 --- a/keyboards/handwired/pill60/bluepill/config.h +++ /dev/null @@ -1,22 +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 - -#define MATRIX_COL_PINS \ - { A8, B11, B10, B15, A10, A1, A2, A3, A4, A5, A6, A7, B0, B1 } -#define MATRIX_ROW_PINS \ - { B4, B3, A15, B13, B5 } diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/info.json index cf993be2471..028b1d89d87 100644 --- a/keyboards/handwired/pill60/bluepill/info.json +++ b/keyboards/handwired/pill60/bluepill/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "B11", "B10", "B15", "A10", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1"], + "rows": ["B4", "B3", "A15", "B13", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h index e96fba1db88..399d0f2212c 100644 --- a/keyboards/handwired/pill60/config.h +++ b/keyboards/handwired/pill60/config.h @@ -15,8 +15,5 @@ */ #pragma once - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD5 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/handwired/postageboard/mini/config.h b/keyboards/handwired/postageboard/mini/config.h index b9a34e14148..091cb7b510b 100644 --- a/keyboards/handwired/postageboard/mini/config.h +++ b/keyboards/handwired/postageboard/mini/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5 } -#define MATRIX_COL_PINS { E6, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/info.json index 65be217368d..b6944f2916d 100644 --- a/keyboards/handwired/postageboard/mini/info.json +++ b/keyboards/handwired/postageboard/mini/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["E6", "B3", "B7"], + "rows": ["D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/postageboard/r1/config.h b/keyboards/handwired/postageboard/r1/config.h index 68c6dc0281e..091cb7b510b 100644 --- a/keyboards/handwired/postageboard/r1/config.h +++ b/keyboards/handwired/postageboard/r1/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 } -#define MATRIX_COL_PINS { B7, C6, 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/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/info.json index dab37baf045..a1ea87df869 100644 --- a/keyboards/handwired/postageboard/r1/info.json +++ b/keyboards/handwired/postageboard/r1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "C6", "C7"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h index c4d0c8a8a2a..8f57ec2b911 100644 --- a/keyboards/handwired/prime_exl/config.h +++ b/keyboards/handwired/prime_exl/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B1, E6, D5, D6, B4, D7, D4, F1, F0, B0 } -#define MATRIX_COL_PINS { D0, B3, B2, D1, D2, D3, F7, F6, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index e8409b78d71..01516ed006e 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -8,6 +8,11 @@ "pid": "0x6578", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "B3", "B2", "D1", "D2", "D3", "F7", "F6", "F5"], + "rows": ["B1", "E6", "D5", "D6", "B4", "D7", "D4", "F1", "F0", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h index 935d12bedb1..1b683fdce9c 100644 --- a/keyboards/handwired/prime_exl_plus/config.h +++ b/keyboards/handwired/prime_exl_plus/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D2, D6, B4, F1, E6, F0, F4, B5, D7, D3 } -#define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B7, B3, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D4 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json index 0114de4c26b..0d6d19bf5a2 100644 --- a/keyboards/handwired/prime_exl_plus/info.json +++ b/keyboards/handwired/prime_exl_plus/info.json @@ -8,6 +8,11 @@ "pid": "0x6579", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"], + "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h index a1b7295e324..f8d36fe894b 100644 --- a/keyboards/handwired/prkl30/feather/config.h +++ b/keyboards/handwired/prkl30/feather/config.h @@ -15,12 +15,6 @@ */ #pragma once -/* PRKL30 feather pinout */ -#define MATRIX_ROW_PINS { F4, F1, F0, D2} -#define MATRIX_COL_PINS { D3, D1, B7, D6, C7, B6, B5, D7, C6, D0} -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light Configuration */ #define RGB_DI_PIN D1 diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json index 8078ee04814..5a3e21d8f1d 100644 --- a/keyboards/handwired/prkl30/feather/info.json +++ b/keyboards/handwired/prkl30/feather/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"], + "rows": ["F4", "F1", "F0", "D2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "F6"} diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h index c3767088c79..f8d36fe894b 100644 --- a/keyboards/handwired/prkl30/promicro/config.h +++ b/keyboards/handwired/prkl30/promicro/config.h @@ -15,12 +15,6 @@ */ #pragma once -/* prkl30 default pinout */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B4, B5, F6, F5, F4, F7, B1, B3, B2, B6} -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light Configuration */ #define RGB_DI_PIN D1 diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json index a7ca847765b..ddec0f8eebd 100644 --- a/keyboards/handwired/prkl30/promicro/info.json +++ b/keyboards/handwired/prkl30/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"} diff --git a/keyboards/handwired/pteron/config.h b/keyboards/handwired/pteron/config.h deleted file mode 100644 index 61e8611e243..00000000000 --- a/keyboards/handwired/pteron/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 } -#define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/info.json index b21d12c9f98..94dbc9dcfc0 100644 --- a/keyboards/handwired/pteron/info.json +++ b/keyboards/handwired/pteron/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["D7", "E6", "B4", "B5", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/pteron38/config.h b/keyboards/handwired/pteron38/config.h deleted file mode 100644 index f5b02309119..00000000000 --- a/keyboards/handwired/pteron38/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, B4, B5, B6 } -#define MATRIX_COL_PINS { F6, F5, F7, B1, B3, C6, D4, D0, D1, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json index a2ea58d57aa..63eef29a9db 100644 --- a/keyboards/handwired/pteron38/info.json +++ b/keyboards/handwired/pteron38/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2"], + "rows": ["E6", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/pteron44/config.h b/keyboards/handwired/pteron44/config.h deleted file mode 100644 index 6429437f973..00000000000 --- a/keyboards/handwired/pteron44/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, B4, B5, B6 } -#define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json index 23b4ac785a3..86971c42022 100644 --- a/keyboards/handwired/pteron44/info.json +++ b/keyboards/handwired/pteron44/info.json @@ -8,6 +8,11 @@ "pid": "0x542C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["E6", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/qc60/config.h b/keyboards/handwired/qc60/config.h deleted file mode 100644 index 6f70f09beec..00000000000 --- a/keyboards/handwired/qc60/config.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json index e36142dea8e..2d65522a5d4 100644 --- a/keyboards/handwired/qc60/info.json +++ b/keyboards/handwired/qc60/info.json @@ -8,6 +8,11 @@ "pid": "0x0C60", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"], + "rows": ["F4", "F5", "C6", "D7", "E6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h index 2e7d2f3b9b6..209a5ea30da 100644 --- a/keyboards/handwired/qc60/proto/config.h +++ b/keyboards/handwired/qc60/proto/config.h @@ -1,11 +1,5 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, C6, D7, E6 } -#define MATRIX_COL_PINS { F7, F6, B1, B3, B2, B6, B5, B4 } -#define DIODE_DIRECTION ROW2COL - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 1 // Number of LEDs diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h index a08c558a1a5..3dc99447eec 100644 --- a/keyboards/handwired/retro_refit/config.h +++ b/keyboards/handwired/retro_refit/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -// See note in retro_refit.h for an explanation of how this matrix is wired up -#define MATRIX_ROW_PINS { D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D3, C7, 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json index a04b54cf952..cd7e8c11151 100644 --- a/keyboards/handwired/retro_refit/info.json +++ b/keyboards/handwired/retro_refit/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"], + "rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h index 2cee851436c..09a304e1c73 100644 --- a/keyboards/handwired/riblee_f401/config.h +++ b/keyboards/handwired/riblee_f401/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 } -#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B6, B7, B8, B9 } - -#define DIODE_DIRECTION COL2ROW - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 \ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 94cc2c35f2f..60cfdb9d3be 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], + "rows": ["A6", "A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "A0", diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h index 395e35d9133..425b35f266a 100644 --- a/keyboards/handwired/riblee_f411/config.h +++ b/keyboards/handwired/riblee_f411/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 } -#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B14, A0, B8, B9 } - -#define DIODE_DIRECTION COL2ROW - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json index 4941f567520..3a4c78b9487 100644 --- a/keyboards/handwired/riblee_f411/info.json +++ b/keyboards/handwired/riblee_f411/info.json @@ -8,6 +8,11 @@ "pid": "0x002B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"], + "rows": ["A6", "A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411", diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h index b9bf17a4a03..fb1ac6044de 100644 --- a/keyboards/handwired/rs60/config.h +++ b/keyboards/handwired/rs60/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . */ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 } -#define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3, F4, F5, F6, F7, B1, B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json index ddd2cff3530..4269af4173c 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/info.json @@ -8,6 +8,11 @@ "pid": "0x4260", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D4", "D0", "D1", "D2", "D3", "F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["B5", "B6", "B4", "B2", "E6"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B4", "esc_output": "C6", diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h index f0b09a2a7f9..c346b076235 100644 --- a/keyboards/handwired/selene/config.h +++ b/keyboards/handwired/selene/config.h @@ -16,15 +16,8 @@ #pragma once - -#define MATRIX_ROW_PINS { B10, B9, B15, B14, B13, B8} -#define MATRIX_COL_PINS { A9, A10, B11, B7, B6, B5, B4, B3, B2, B1, B0, C14, A4, A5, A6, A7, A8, A15, A13, A14, B12 } #define RGB_DI_PIN A3 #define RGBLED_NUM 50 - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json index c798895e866..2ce960ed202 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"], + "rows": ["B10", "B9", "B15", "B14", "B13", "B8"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h index 018fb3cd487..ee4bc0e70cf 100644 --- a/keyboards/handwired/sick68/config.h +++ b/keyboards/handwired/sick68/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 \ - { D3, D2, D1, D0, D4 } -#define MATRIX_COL_PINS \ - { C6, D7, E6, B4, B5, B0, D5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/sick68/info.json b/keyboards/handwired/sick68/info.json index eb998970233..53ee2f7ee55 100644 --- a/keyboards/handwired/sick68/info.json +++ b/keyboards/handwired/sick68/info.json @@ -8,6 +8,11 @@ "pid": "0x5F00", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B0", "D5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["65_ansi"], diff --git a/keyboards/handwired/sick_pad/config.h b/keyboards/handwired/sick_pad/config.h index e27980a0ebe..ee1c2446589 100644 --- a/keyboards/handwired/sick_pad/config.h +++ b/keyboards/handwired/sick_pad/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B9, B15, B14, B13 } - -/* 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/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/info.json index 2a5f85ad68a..8ba6353c999 100644 --- a/keyboards/handwired/sick_pad/info.json +++ b/keyboards/handwired/sick_pad/info.json @@ -8,6 +8,11 @@ "pid": "0xDA20", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B15", "B14", "B13"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h index 2e01a71d28f..3e57cd2e764 100644 --- a/keyboards/handwired/skakunm_dactyl/config.h +++ b/keyboards/handwired/skakunm_dactyl/config.h @@ -4,13 +4,6 @@ #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json index a38c564091d..468dbf84945 100644 --- a/keyboards/handwired/skakunm_dactyl/info.json +++ b/keyboards/handwired/skakunm_dactyl/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/slash/config.h b/keyboards/handwired/slash/config.h index ffa31f3c7ad..bde67936ea0 100644 --- a/keyboards/handwired/slash/config.h +++ b/keyboards/handwired/slash/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C7, D6, B7, B6, B5, D7, C6, D0 } -#define MATRIX_COL_PINS { D2, F0, F1, F4, F5, F6, F7, 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/handwired/slash/info.json b/keyboards/handwired/slash/info.json index b272ff1ed2a..ffd76babc15 100644 --- a/keyboards/handwired/slash/info.json +++ b/keyboards/handwired/slash/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"], + "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h index 57d303a983f..4dee4933a81 100644 --- a/keyboards/handwired/snatchpad/config.h +++ b/keyboards/handwired/snatchpad/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboards - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, F5, F6 } -#define MATRIX_COL_PINS { 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/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json index a86091abfdb..908a390c339 100644 --- a/keyboards/handwired/snatchpad/info.json +++ b/keyboards/handwired/snatchpad/info.json @@ -8,6 +8,11 @@ "pid": "0x7370", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2"], + "rows": ["F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"}, diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h index 9f1a9ae2444..c4105bdf5fe 100644 --- a/keyboards/handwired/sono1/config.h +++ b/keyboards/handwired/sono1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */ #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h index b961eaffd67..7cd783c0e99 100644 --- a/keyboards/handwired/sono1/stm32f103/config.h +++ b/keyboards/handwired/sono1/stm32f103/config.h @@ -17,9 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 } -#define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 } - #define LED_CTRL_XFER_PIN B6 #define LED_KB_LOCK_PIN B12 diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json index b25392382a7..f6e874a77f0 100644 --- a/keyboards/handwired/sono1/stm32f103/info.json +++ b/keyboards/handwired/sono1/stm32f103/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A4", "A3", "B11", "B10", "B1", "B0", "A7", "A6"], + "rows": ["A5", "B3", "A9", "A10", "B13", "B14", "B15", "A8", "B7", "B8", "B9", "C13", "A15", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B5", "num_lock": "B4", diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h index 15bea036a2f..144031ea7b2 100644 --- a/keyboards/handwired/sono1/t2pp/config.h +++ b/keyboards/handwired/sono1/t2pp/config.h @@ -17,9 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 } -#define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 } - #define LED_CTRL_XFER_PIN B4 #define LED_KB_LOCK_PIN B1 diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json index 3e637c3e94a..37ab6723baa 100644 --- a/keyboards/handwired/sono1/t2pp/info.json +++ b/keyboards/handwired/sono1/t2pp/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "D7", "B7", "D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "num_lock": "B2", diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h index 708be5389d1..9a1e829e46e 100644 --- a/keyboards/handwired/space_oddity/config.h +++ b/keyboards/handwired/space_oddity/config.h @@ -7,13 +7,6 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { B2, B6, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 } - -/* 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/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json index e03c13c3e07..48fe44be74e 100644 --- a/keyboards/handwired/space_oddity/info.json +++ b/keyboards/handwired/space_oddity/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/split65/promicro/config.h b/keyboards/handwired/split65/promicro/config.h index 7deab0a7db5..b92456da981 100644 --- a/keyboards/handwired/split65/promicro/config.h +++ b/keyboards/handwired/split65/promicro/config.h @@ -15,14 +15,6 @@ */ #pragma once - - -#define MATRIX_COL_PINS {F4, F5, F6, F7, B1, B3, B2, B6} -#define MATRIX_ROW_PINS {D4, C6, D7, E6, B4} - -// COL2ROW, ROW2COL -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json index 81738c4d470..56d2dcb9ab7 100644 --- a/keyboards/handwired/split65/promicro/info.json +++ b/keyboards/handwired/split65/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/handwired/split65/stm32/config.h b/keyboards/handwired/split65/stm32/config.h index 483b8975840..020e44f02ed 100644 --- a/keyboards/handwired/split65/stm32/config.h +++ b/keyboards/handwired/split65/stm32/config.h @@ -21,12 +21,6 @@ #define AUDIO_PIN_ALT A4 #define AUDIO_PIN_ALT_AS_NEGATIVE -#define MATRIX_COL_PINS {A2, A1, A0, B8, B13, B14, B15, B9} -#define MATRIX_ROW_PINS {B5, B4, B3, B2, B1} - -// COL2ROW, ROW2COL -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index f497c14c019..e2c0a634f32 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"], + "rows": ["B5", "B4", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "A9" }, diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h index 637326617cd..042c165a182 100644 --- a/keyboards/handwired/split89/config.h +++ b/keyboards/handwired/split89/config.h @@ -16,31 +16,9 @@ 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) - * - */ - -/* Left side matrix */ -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F5, F4, B5, B4, E6, D7, C6, D4, D2, D3 } -/* Right side matrix */ -#define MATRIX_ROW_PINS_RIGHT { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS_RIGHT { F5, F4, B5, B4, E6, D7, C6, D4, D2, D3 } - /* this will be tied to high (VCC with a 2k to 10k resistor) on the left keyboard half and tied to low (GND using a wire jumper only) on the right keyboard half. This allows a user to plug in a USB cable to either side and function correctly with or without a TRS/TRRS cable with a single hex file. */ #define SPLIT_HAND_PIN 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/handwired/split89/info.json b/keyboards/handwired/split89/info.json index 2cc68544a76..719eb054559 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/info.json @@ -8,8 +8,19 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/handwired/splittest/bluepill/config.h b/keyboards/handwired/splittest/bluepill/config.h index 54b00b88a57..d19bb3dee8d 100644 --- a/keyboards/handwired/splittest/bluepill/config.h +++ b/keyboards/handwired/splittest/bluepill/config.h @@ -3,11 +3,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { B10 } -#define MATRIX_COL_PINS { B1 } - #define SPLIT_HAND_PIN A7 #if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2)) diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/info.json index cf993be2471..17b7f86a6f8 100644 --- a/keyboards/handwired/splittest/bluepill/info.json +++ b/keyboards/handwired/splittest/bluepill/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B1"], + "rows": ["B10"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h index af60e7e0a98..49bc3cbddb4 100644 --- a/keyboards/handwired/splittest/config.h +++ b/keyboards/handwired/splittest/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once - -#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/handwired/splittest/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h index 45f005222f2..f0fd3dfc85c 100644 --- a/keyboards/handwired/splittest/promicro/config.h +++ b/keyboards/handwired/splittest/promicro/config.h @@ -20,9 +20,6 @@ // use I2C on AVR #define USE_I2C -// wiring of each half -#define MATRIX_ROW_PINS { B3 } -#define MATRIX_COL_PINS { B6 } #define SPLIT_HAND_PIN F6 /* ws2812 RGB LED */ diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json index ecf716ff972..a99bc3ea135 100644 --- a/keyboards/handwired/splittest/promicro/info.json +++ b/keyboards/handwired/splittest/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B6"], + "rows": ["B3"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h index 7b77a5e36b4..6b52516807c 100644 --- a/keyboards/handwired/splittest/teensy_2/config.h +++ b/keyboards/handwired/splittest/teensy_2/config.h @@ -20,9 +20,6 @@ // use I2C on AVR #define USE_I2C -// wiring of each half -#define MATRIX_ROW_PINS { F5 } -#define MATRIX_COL_PINS { F7 } #define SPLIT_HAND_PIN F0 /* ws2812 RGB LED */ diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json index a67cb4e2f25..f6fd6faf330 100644 --- a/keyboards/handwired/splittest/teensy_2/info.json +++ b/keyboards/handwired/splittest/teensy_2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["F7"], + "rows": ["F5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index b52e370419c..9885c0737cc 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/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 { A6, A5, A4, A3 } -#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, A10, B9, B6, B5, B4, B3, A15 } - -/* 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/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json index ed10d8005b5..8e7670c2de1 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "A8", "B15", "B14", "B13", "A10", "B9", "B6", "B5", "B4", "B3", "A15"], + "rows": ["A6", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json index 75d151d5b6b..91b6cd39c56 100644 --- a/keyboards/handwired/stef9998/split_5x7/info.json +++ b/keyboards/handwired/stef9998/split_5x7/info.json @@ -8,8 +8,19 @@ "pid": "0x6063", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/config.h b/keyboards/handwired/stef9998/split_5x7/rev1/config.h deleted file mode 100644 index 2957afc125b..00000000000 --- a/keyboards/handwired/stef9998/split_5x7/rev1/config.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright 2022 stef9998 - -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 { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B2, B6, B1, B3, F7, F5, F6 } - -#define MATRIX_ROW_PINS_RIGHT { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h index 43a17c9e880..b4a9e4014d9 100644 --- a/keyboards/handwired/sticc14/config.h +++ b/keyboards/handwired/sticc14/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 } -#define MATRIX_COL_PINS { B6, B2, 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/handwired/sticc14/info.json b/keyboards/handwired/sticc14/info.json index 194ac0eeb33..7733b642ec5 100644 --- a/keyboards/handwired/sticc14/info.json +++ b/keyboards/handwired/sticc14/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/swiftrax/astro65/config.h b/keyboards/handwired/swiftrax/astro65/config.h deleted file mode 100644 index f379fab4904..00000000000 --- a/keyboards/handwired/swiftrax/astro65/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2020 Swiftrax - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS \ - { B0, B3, F7, B1, B2 } -#define MATRIX_COL_PINS \ - { E6, D5, D3, D4, D6, D7, B4, B5, B6, C6, C7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/info.json index fef1bd69991..8de67f3706b 100644 --- a/keyboards/handwired/swiftrax/astro65/info.json +++ b/keyboards/handwired/swiftrax/astro65/info.json @@ -8,6 +8,11 @@ "pid": "0xEAEF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D5", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B3", "F7", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], diff --git a/keyboards/handwired/swiftrax/bebol/config.h b/keyboards/handwired/swiftrax/bebol/config.h deleted file mode 100644 index 057d1527df0..00000000000 --- a/keyboards/handwired/swiftrax/bebol/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 Swiftrax - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B3, F7, F0, B7 } -#define MATRIX_COL_PINS { B1, D2, D3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json index 29c7f213237..e1b1fcdc644 100644 --- a/keyboards/handwired/swiftrax/bebol/info.json +++ b/keyboards/handwired/swiftrax/bebol/info.json @@ -8,6 +8,11 @@ "pid": "0xEAC4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "D2", "D3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["B2", "B3", "F7", "F0", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/beegboy/config.h b/keyboards/handwired/swiftrax/beegboy/config.h index 282a766e556..092f2ba0e99 100644 --- a/keyboards/handwired/swiftrax/beegboy/config.h +++ b/keyboards/handwired/swiftrax/beegboy/config.h @@ -17,15 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B0, B3, B2, D0, B7, D2, D1, B5, B4, C6, B6 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D5, D3 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json index a52b6e37e76..29fc7ddddab 100644 --- a/keyboards/handwired/swiftrax/beegboy/info.json +++ b/keyboards/handwired/swiftrax/beegboy/info.json @@ -8,6 +8,11 @@ "pid": "0xEAC5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D5", "D3"], + "rows": ["B1", "B0", "B3", "B2", "D0", "B7", "D2", "D1", "B5", "B4", "C6", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h index c10291a82af..48211c215f7 100644 --- a/keyboards/handwired/swiftrax/bumblebee/config.h +++ b/keyboards/handwired/swiftrax/bumblebee/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C7, D3, D5, D4, D6, D7, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Indicators */ #define RGB_DI_PIN E6 #define RGBLED_NUM 3 diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json index 2147a556c2d..ad779c155bf 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/info.json @@ -8,6 +8,11 @@ "pid": "0xE881", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B6"} diff --git a/keyboards/handwired/swiftrax/cowfish/config.h b/keyboards/handwired/swiftrax/cowfish/config.h index 8a947bbea41..092f2ba0e99 100644 --- a/keyboards/handwired/swiftrax/cowfish/config.h +++ b/keyboards/handwired/swiftrax/cowfish/config.h @@ -17,14 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D0, D1, B7, E6, D4, D6 } -#define MATRIX_COL_PINS { B3, B2, B1, F0, F1, F4, F5, F6, F7, B5, B6, B4, C6, D7, C7, D2, D3, D5} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/info.json index 4de9d072921..0d725ab8bce 100644 --- a/keyboards/handwired/swiftrax/cowfish/info.json +++ b/keyboards/handwired/swiftrax/cowfish/info.json @@ -8,6 +8,11 @@ "pid": "0xEB53", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "B4", "C6", "D7", "C7", "D2", "D3", "D5"], + "rows": ["D0", "D1", "B7", "E6", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/digicarp65/config.h b/keyboards/handwired/swiftrax/digicarp65/config.h deleted file mode 100644 index 80b735d0d8a..00000000000 --- a/keyboards/handwired/swiftrax/digicarp65/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2022 Swiftrax - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 } -#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json index 2eef1057563..49066b66548 100644 --- a/keyboards/handwired/swiftrax/digicarp65/info.json +++ b/keyboards/handwired/swiftrax/digicarp65/info.json @@ -8,6 +8,11 @@ "pid": "0xE7F1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B2", "B1", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B7"} diff --git a/keyboards/handwired/swiftrax/digicarpice/config.h b/keyboards/handwired/swiftrax/digicarpice/config.h deleted file mode 100644 index 18f75ffe695..00000000000 --- a/keyboards/handwired/swiftrax/digicarpice/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2022 Swiftrax - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { F0, D5, D7, D6, D4 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json index f311c9606d2..7e92b0a59cf 100644 --- a/keyboards/handwired/swiftrax/digicarpice/info.json +++ b/keyboards/handwired/swiftrax/digicarpice/info.json @@ -8,6 +8,11 @@ "pid": "0xE79A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "D5", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/equator/config.h b/keyboards/handwired/swiftrax/equator/config.h deleted file mode 100644 index d5df0d19421..00000000000 --- a/keyboards/handwired/swiftrax/equator/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Swiftrax - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B3, C7, B4, B5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/info.json index 0e58b5569c5..697e23d5904 100644 --- a/keyboards/handwired/swiftrax/equator/info.json +++ b/keyboards/handwired/swiftrax/equator/info.json @@ -8,6 +8,11 @@ "pid": "0xE984", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B2", "B3", "C7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h index b83d4cc9435..cdc4c78084b 100644 --- a/keyboards/handwired/swiftrax/glacier/config.h +++ b/keyboards/handwired/swiftrax/glacier/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6, E5, E4, D4, D5, D7, D6 } -#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, D0, D1, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json index dc3bae097c7..993f4ca0405 100644 --- a/keyboards/handwired/swiftrax/glacier/info.json +++ b/keyboards/handwired/swiftrax/glacier/info.json @@ -8,6 +8,11 @@ "pid": "0xE890", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"], + "rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/joypad/config.h b/keyboards/handwired/swiftrax/joypad/config.h index 2f54bc0c4e5..092f2ba0e99 100644 --- a/keyboards/handwired/swiftrax/joypad/config.h +++ b/keyboards/handwired/swiftrax/joypad/config.h @@ -17,14 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { C6, B3, B0, B1, D6, D5 } -#define MATRIX_COL_PINS { C7, B4, D0, C2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/info.json index bef5225bcd0..4ff90591d16 100644 --- a/keyboards/handwired/swiftrax/joypad/info.json +++ b/keyboards/handwired/swiftrax/joypad/info.json @@ -8,6 +8,11 @@ "pid": "0xEA68", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "B4", "D0", "C2"], + "rows": ["C6", "B3", "B0", "B1", "D6", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C5", "pin_b": "C4"} diff --git a/keyboards/handwired/swiftrax/koalafications/config.h b/keyboards/handwired/swiftrax/koalafications/config.h index 442b53a9ba2..7435ce54aff 100644 --- a/keyboards/handwired/swiftrax/koalafications/config.h +++ b/keyboards/handwired/swiftrax/koalafications/config.h @@ -17,14 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B2, E6, F1, F4, F5 } -#define MATRIX_COL_PINS { F0, D5, D3, D2, B3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 \ No newline at end of file diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/info.json index dccea0b2b81..0129cc95a4c 100644 --- a/keyboards/handwired/swiftrax/koalafications/info.json +++ b/keyboards/handwired/swiftrax/koalafications/info.json @@ -8,6 +8,11 @@ "pid": "0xEA44", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D5", "D3", "D2", "B3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B1", "B2", "E6", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/nodu/config.h b/keyboards/handwired/swiftrax/nodu/config.h index e65ed138ade..6726795c452 100644 --- a/keyboards/handwired/swiftrax/nodu/config.h +++ b/keyboards/handwired/swiftrax/nodu/config.h @@ -17,14 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B3, F5, F4, F1 } -#define MATRIX_COL_PINS { F0, B7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 \ No newline at end of file diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/info.json index c73c80f4d5b..f0110b33fbf 100644 --- a/keyboards/handwired/swiftrax/nodu/info.json +++ b/keyboards/handwired/swiftrax/nodu/info.json @@ -8,6 +8,11 @@ "pid": "0xEA6E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "B3", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/handwired/swiftrax/pandamic/config.h b/keyboards/handwired/swiftrax/pandamic/config.h index 77daa76c24a..092f2ba0e99 100644 --- a/keyboards/handwired/swiftrax/pandamic/config.h +++ b/keyboards/handwired/swiftrax/pandamic/config.h @@ -17,14 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D1, D2, B5, B7, D3, D5, D6, D4, D7, B4 } -#define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json index 60fe2886f5f..253e20b7155 100644 --- a/keyboards/handwired/swiftrax/pandamic/info.json +++ b/keyboards/handwired/swiftrax/pandamic/info.json @@ -8,6 +8,11 @@ "pid": "0xEB0E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D0"], + "rows": ["D1", "D2", "B5", "B7", "D3", "D5", "D6", "D4", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B0"} diff --git a/keyboards/handwired/swiftrax/the_galleon/config.h b/keyboards/handwired/swiftrax/the_galleon/config.h index 99d688f0651..7f9b0b12d49 100644 --- a/keyboards/handwired/swiftrax/the_galleon/config.h +++ b/keyboards/handwired/swiftrax/the_galleon/config.h @@ -17,15 +17,5 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B0, D2, B7, D5, D3, D6, D4, B4, D7, B6, B5, C7, C6} -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B3, B2 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/info.json index bd62d9de2da..751ec9eb009 100644 --- a/keyboards/handwired/swiftrax/the_galleon/info.json +++ b/keyboards/handwired/swiftrax/the_galleon/info.json @@ -8,6 +8,11 @@ "pid": "0xEA2D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2"], + "rows": ["B1", "B0", "D2", "B7", "D5", "D3", "D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/unsplit/config.h b/keyboards/handwired/swiftrax/unsplit/config.h deleted file mode 100644 index 702e06abe2f..00000000000 --- a/keyboards/handwired/swiftrax/unsplit/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 Swiftrax - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B6, D7, B5, B4 } -#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, C6, C7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json index 619bd652fbd..7e21ec0208c 100644 --- a/keyboards/handwired/swiftrax/unsplit/info.json +++ b/keyboards/handwired/swiftrax/unsplit/info.json @@ -8,6 +8,11 @@ "pid": "0xEAB1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "C6", "C7", "F6", "F5", "F4", "F1"], + "rows": ["B6", "D7", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h index 7bfee265ab6..5af5a9ff81e 100644 --- a/keyboards/handwired/swiftrax/walter/config.h +++ b/keyboards/handwired/swiftrax/walter/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 { B2, B1, F4, F1, F0 } -#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json index 88da47f36b8..0a6fd978379 100644 --- a/keyboards/handwired/swiftrax/walter/info.json +++ b/keyboards/handwired/swiftrax/walter/info.json @@ -8,6 +8,11 @@ "pid": "0xE964", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B2", "B1", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B7"} diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h index 7c1deda7d5e..776749f54af 100644 --- a/keyboards/handwired/symmetry60/config.h +++ b/keyboards/handwired/symmetry60/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, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B1 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json index 850ae03b35f..6b6019821a2 100644 --- a/keyboards/handwired/symmetry60/info.json +++ b/keyboards/handwired/symmetry60/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], diff --git a/keyboards/handwired/t111/config.h b/keyboards/handwired/t111/config.h deleted file mode 100644 index c5f41e5e05d..00000000000 --- a/keyboards/handwired/t111/config.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 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 - - -#define MATRIX_ROW_PINS { A15, B6, B5, B4, B3, B9, B8, B7 } -/* 0 1 2 3 4 5 6 7*/ -#define MATRIX_COL_PINS { B15, B11, B10, B1, B0, A10, A9, A7, A6, A5, A4, A8, B13, B14 } -/* 0 1 2 3 4 5 6 7 8 9 A B C D*/ - - -/* 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/handwired/t111/info.json b/keyboards/handwired/t111/info.json index 0b5c1046186..f232a0ea33b 100644 --- a/keyboards/handwired/t111/info.json +++ b/keyboards/handwired/t111/info.json @@ -8,6 +8,11 @@ "pid": "0x6FAA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B11", "B10", "B1", "B0", "A10", "A9", "A7", "A6", "A5", "A4", "A8", "B13", "B14"], + "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h index 71a51554f2f..b24f5b8c970 100644 --- a/keyboards/handwired/tennie/config.h +++ b/keyboards/handwired/tennie/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C6, D4, D0} -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBW #define RGB_DI_PIN D1 #ifdef RGB_DI_PIN diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json index f2a8bcc1f9b..a6e31cba07e 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/info.json @@ -8,6 +8,11 @@ "pid": "0x1313", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["C6", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h index 63e11e97af4..50ee7eac613 100644 --- a/keyboards/handwired/terminus_mini/config.h +++ b/keyboards/handwired/terminus_mini/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B5, B4, D7, D6 } -#define MATRIX_COL_PINS { B0, D0, D5, B6, D4, C7, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - //define tapping-toggle count #define TAPPING_TOGGLE 1 diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json index c059e9af7e2..bb8214b97da 100644 --- a/keyboards/handwired/terminus_mini/info.json +++ b/keyboards/handwired/terminus_mini/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/trackpoint/config.h b/keyboards/handwired/trackpoint/config.h index e42a53eeb81..8d4e88d3cb7 100644 --- a/keyboards/handwired/trackpoint/config.h +++ b/keyboards/handwired/trackpoint/config.h @@ -37,11 +37,5 @@ #define PS2_USART_RX_VECT USART1_RX_vect #endif -#define MATRIX_COL_PINS { F1, F4, F5 } -#define MATRIX_ROW_PINS { F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json index b0c0848ca68..a1778c22206 100644 --- a/keyboards/handwired/trackpoint/info.json +++ b/keyboards/handwired/trackpoint/info.json @@ -8,6 +8,11 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5"], + "rows": ["F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index f602a26b422..971e75680e0 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 } -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN E7 #define RGB_MATRIX_LED_COUNT 62 diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index ab4b08c8eb2..e0123bb019e 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -6,6 +6,11 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3", "bootmagic": { diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h index 902f292b10d..f77cc8f309e 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h @@ -18,16 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -// left -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } -// right -#define MATRIX_COL_PINS_RIGHT { D6, D7, B4, D3, C6, C7 } -#define MATRIX_ROW_PINS_RIGHT { D4, B7, F7, B6, B5, F6 } - -#define DIODE_DIRECTION COL2ROW - //#undef USE_I2C #define MASTER_RIGHT diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json index e58e87b2dd4..eebc5d5546c 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json @@ -1,7 +1,18 @@ { "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)", + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D6", "D7", "B4", "D3", "C6", "C7"], + "rows": ["D4", "B7", "F7", "B6", "B5", "F6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h index c52610e9d3d..b472107f427 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { D4, D7, E6, B4, B5, B7 } -#define MATRIX_ROW_PINS \ - { F7, F6, F5, F4, F1, F0 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN D3 #define RGBLED_NUM 20 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index dabab602ddb..7300efd02b1 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Elite-C", + "matrix_pins": { + "cols": ["D4", "D7", "E6", "B4", "B5", "B7"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "C7"} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index d10cb0bd8bb..5ca6f5d9585 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -18,17 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3, B4, B5 } -#define MATRIX_ROW_PINS \ - { B10, B11, B12, A14, A13, A15 } -// B2 used for BOOT1, has internal pull down? -// A9 has internal pull-down -// A11 and A12 are used for USB sense. DO NOT USE. - -#define DIODE_DIRECTION COL2ROW - // #define USB_VBUS_PIN B10 #define SPLIT_HAND_PIN C14 // high = left, low = right diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index bed70941bfa..34357594de4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Proton-C", + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5"], + "rows": ["B10", "B11", "B12", "A14", "A13", "A15"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A7", "pin_b": "A8"} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 227863aaa5b..d562a2a41c6 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { A15, B3, B4, B5, B6, B7 } -#define MATRIX_ROW_PINS \ - { B12, B13, B14, B15, A8, A10 } - -#define DIODE_DIRECTION COL2ROW - // #define USB_VBUS_PIN B10 // doesn't seem to work for me on one of my controllers... */ #define SPLIT_HAND_PIN C14 // high = left, low = right diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 0791e50ebf8..034170e6a37 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) BlackPill", + "matrix_pins": { + "cols": ["A15", "B3", "B4", "B5", "B6", "B7"], + "rows": ["B12", "B13", "B14", "B15", "A8", "A10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A13", "pin_b": "A14"} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index 51ff0d31239..069b6e876cd 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { C0, C1, C2, C3, C4, C5 } -#define MATRIX_ROW_PINS \ - { F7, F6, F5, F4, F3, F2 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs #define RGB_DI_PIN E7 #define RGBLED_NUM 20 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index 7f60ae0edc5..facf3469434 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++", + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "D4"} diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h index bd0d306dc3f..4c71623b244 100644 --- a/keyboards/handwired/traveller/config.h +++ b/keyboards/handwired/traveller/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, D3, D2 } -#define MATRIX_COL_PINS { B5, D6, B7, B6, F6, B1, B3, F7, B4, E6, D7, C6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN # define RGBLED_NUM 1 diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json index ee064ad0cc8..9c7270c6de2 100644 --- a/keyboards/handwired/traveller/info.json +++ b/keyboards/handwired/traveller/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"], + "rows": ["D0", "D1", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h index 5782f0e058d..e2db822d67c 100644 --- a/keyboards/handwired/tritium_numpad/config.h +++ b/keyboards/handwired/tritium_numpad/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 { D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F6, B1, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index b2ca85264ef..f152b8bb5b9 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F4", "F6", "B1", "B2"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h index 7c1079397a6..390c13b55cf 100644 --- a/keyboards/handwired/twadlee/tp69/config.h +++ b/keyboards/handwired/twadlee/tp69/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) - */ -/* 19 17 16 15 14 2 8 6 7 9 */ -#define MATRIX_ROW_PINS { B2, B1, B0, C0, D1, D0, D3, D4, D2, C3 } -/* 20 21 18 0 1 3 4 5 */ -#define MATRIX_COL_PINS { D5, D6, A4, B16, B17, A1, A2, D7 } - -/* for trackpoint: C1 (22) C2 (23) */ - -/* 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/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json index a06580eadd9..75c11c44c2d 100644 --- a/keyboards/handwired/twadlee/tp69/info.json +++ b/keyboards/handwired/twadlee/tp69/info.json @@ -8,6 +8,11 @@ "pid": "0xCACA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"], + "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"] + }, + "diode_direction": "COL2ROW", "processor": "MKL26Z64", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h index 59a6a26c447..25236b2a2fa 100644 --- a/keyboards/handwired/twig/twig50/config.h +++ b/keyboards/handwired/twig/twig50/config.h @@ -3,12 +3,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B7, B6, B5, B4 } -#define MATRIX_COL_PINS { A2, A1, A0, B8 , B13, B14, B15, B9, B10, B11, B3, B2, B1, B0} - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 150 #define FORCE_NKRO diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index aae4bfa5312..a6a6c2e1a30 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.2.1" }, + "matrix_pins": { + "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"], + "rows": ["B7", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/unicomp_mini_m/config.h b/keyboards/handwired/unicomp_mini_m/config.h index f48e5ae696c..fc62f69c4b1 100644 --- a/keyboards/handwired/unicomp_mini_m/config.h +++ b/keyboards/handwired/unicomp_mini_m/config.h @@ -17,22 +17,5 @@ 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, F3, F2, F1, F0, E6, E7, B0, B1 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, B7, D5, D4, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Mini M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json index 7216203ba89..9dd8d59b59a 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "B7", "D5", "D4", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B5", "num_lock": "B6", diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h index c6674b53f7d..177ad60ecd2 100644 --- a/keyboards/handwired/unk/rev1/config.h +++ b/keyboards/handwired/unk/rev1/config.h @@ -20,16 +20,6 @@ along with this program. If not, see . #define MASTER_LEFT // Comment this line for the right half firmware -// wiring of each half -#define MATRIX_ROW_PINS { F5, B1, F6, B3, F7 } -#define MATRIX_COL_PINS { B2, B6, D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS_RIGHT { C6, D7, B4, E6, D4 } -#define MATRIX_COL_PINS_RIGHT { B1, B3, B2, B6, F7, B5, 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 /* Locking resynchronize hack */ diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json index bb6031cfd09..1faa61b7066 100644 --- a/keyboards/handwired/unk/rev1/info.json +++ b/keyboards/handwired/unk/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B6", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "B1", "F6", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B1", "B3", "B2", "B6", "F7", "B5", "F6", "F5"], + "rows": ["C6", "D7", "B4", "E6", "D4"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/handwired/uthol/config.h b/keyboards/handwired/uthol/config.h deleted file mode 100644 index 5e6816b6b0f..00000000000 --- a/keyboards/handwired/uthol/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h deleted file mode 100644 index b5e17a0fe3a..00000000000 --- a/keyboards/handwired/uthol/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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 - - -/* Uthol PCB default pin-out */ -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 } -#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 } diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/info.json index 1a0047080ac..02802966b2d 100644 --- a/keyboards/handwired/uthol/rev1/info.json +++ b/keyboards/handwired/uthol/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h index dd132283c3c..744e66d9489 100644 --- a/keyboards/handwired/uthol/rev2/config.h +++ b/keyboards/handwired/uthol/rev2/config.h @@ -17,11 +17,6 @@ #pragma once - -/* Uthol PCB default pin-out */ -#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 } - //RGB Stuff #define RGB_DI_PIN E6 #define RGBLED_NUM 39 diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json index 95112123d55..bcefbb49569 100644 --- a/keyboards/handwired/uthol/rev2/info.json +++ b/keyboards/handwired/uthol/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"], + "rows": ["B1", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h index 1e6b532e2af..d7829f2fdcc 100644 --- a/keyboards/handwired/uthol/rev3/config.h +++ b/keyboards/handwired/uthol/rev3/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix size */ -// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1 -#define MATRIX_COL_PINS \ - { B1, B10, B9, B8, B5, B4, B3, A15, B15, B14, B13, B12 } -#define MATRIX_ROW_PINS \ - { A4, A3, A2, A1, A0 } - // OLED config #define OLED_DISPLAY_128X64 #define OLED_DISPLAY_WIDTH 128 diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index b5d099b27a0..34c0a3503ab 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"], + "rows": ["A4", "A3", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14", "resolution": 2} diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h index b519d821535..d1f1e1b0bf2 100644 --- a/keyboards/handwired/videowriter/config.h +++ b/keyboards/handwired/videowriter/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, C6, D1, D0, D4, D2, D3, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json index 329085fe85e..bc04ac2b8a9 100644 --- a/keyboards/handwired/videowriter/info.json +++ b/keyboards/handwired/videowriter/info.json @@ -8,6 +8,11 @@ "pid": "0x5657", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 7] }, diff --git a/keyboards/handwired/wabi/config.h b/keyboards/handwired/wabi/config.h index 69da1bc47cd..274c715a937 100644 --- a/keyboards/handwired/wabi/config.h +++ b/keyboards/handwired/wabi/config.h @@ -14,25 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on -diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { D5, F5, F6, F7, B0 } -#define MATRIX_COL_PINS { F4, F1, F0, E6, B3, B7, D0, D1, D2, D3, D4, D6, 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/handwired/wabi/info.json b/keyboards/handwired/wabi/info.json index a93666554d6..6f9fb6cb93a 100644 --- a/keyboards/handwired/wabi/info.json +++ b/keyboards/handwired/wabi/info.json @@ -8,6 +8,11 @@ "pid": "0xB07D", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B5"], + "rows": ["D5", "F5", "F6", "F7", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h index 4609f67ea75..9113106abf3 100644 --- a/keyboards/handwired/woodpad/config.h +++ b/keyboards/handwired/woodpad/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, D4, C6, D7 } -#define MATRIX_COL_PINS { B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/woodpad/info.json b/keyboards/handwired/woodpad/info.json index c31bca5e098..de084c3c1fd 100644 --- a/keyboards/handwired/woodpad/info.json +++ b/keyboards/handwired/woodpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x4"], diff --git a/keyboards/handwired/wulkan/config.h b/keyboards/handwired/wulkan/config.h index 36d848fc8b5..1c801d7e3c1 100644 --- a/keyboards/handwired/wulkan/config.h +++ b/keyboards/handwired/wulkan/config.h @@ -1,9 +1,3 @@ #pragma once - -#define MATRIX_ROW_PINS { B8, A0, A1, A2 } -#define MATRIX_COL_PINS { B13, B14, B15, B9, B7, B6, B5, B4, B3, B2, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index 09907a556b2..fcfaa319149 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/keyboards/handwired/wulkan/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"], + "rows": ["B8", "A0", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h index 7019bf461f8..72e031c8de5 100644 --- a/keyboards/handwired/xealous/config.h +++ b/keyboards/handwired/xealous/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . //#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate. #define FORCE_NKRO -#define DIODE_DIRECTION COL2ROW - - #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 #define STARTUP_SONG SONG(STARTUP_SOUND) diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h index 17497c5ccd0..99106694575 100644 --- a/keyboards/handwired/xealous/rev1/config.h +++ b/keyboards/handwired/xealous/rev1/config.h @@ -18,28 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -// Ascii art of pro micro. Pin names PD3, PD2, etc. -//Usage| Name | Label Label| Name | Usage -// PORT -// | PD3 TX0 RAW | -// | PD2 RX1 GND |SerGnd -// | GND RESET | -// | GND VCC |SerVCc -// | PD1 2 A3 PF4 | Col7 -//Ser | PD0 3 A2 PF5 | Col6 -//Row4 | PD4 4 A1 PF6 | Col5 -//AUDIO| PC6 5 A0 PF7 | Col4 -//Row3 | PD7 6 15 PB1 | Col3 -//Row2 | PE6 7 14 PB3 | Col2 -//Row1 | PB4 8 13 PB2 | Col1 -//Row0 | PB5 9 10 PB6 | Col0 - -// Note reservation of C6 for audio -#define MATRIX_ROW_PINS { B5, B4, E6, D7, D4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json index c470e72a167..bc310cad072 100644 --- a/keyboards/handwired/xealous/rev1/info.json +++ b/keyboards/handwired/xealous/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x5141", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/z150/config.h b/keyboards/handwired/z150/config.h index 8fc91281ca8..7a054266ea4 100644 --- a/keyboards/handwired/z150/config.h +++ b/keyboards/handwired/z150/config.h @@ -17,17 +17,10 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B13, B14, B15, A8, A9, A3, A10, A1, A2, A15, A0 } -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4 } - #define NUM_LOCK_LED_PIN B5 #define SCROLL_LOCK_LED_PIN B4 #define CAPS_LOCK_LED_PIN B3 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json index 72796b314e6..6b93b73e20a 100644 --- a/keyboards/handwired/z150/info.json +++ b/keyboards/handwired/z150/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["B13", "B14", "B15", "A8", "A9", "A3", "A10", "A1", "A2", "A15", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/handwired/zergo/config.h b/keyboards/handwired/zergo/config.h deleted file mode 100644 index 63666aa09fb..00000000000 --- a/keyboards/handwired/zergo/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 E.Zelianin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, D7, C3, D6, D5, D4 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C2, C1, B7, D3, D2, B6, B5, B4, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json index 7b9776134ce..6a472c3302d 100644 --- a/keyboards/handwired/zergo/info.json +++ b/keyboards/handwired/zergo/info.json @@ -8,6 +8,11 @@ "pid": "0xB92B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C2", "C1", "B7", "D3", "D2", "B6", "B5", "B4", "B3", "B2"], + "rows": ["B1", "D7", "C3", "D6", "D5", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": {