aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2025-02-28 09:23:04 +1100
committerNick Brassel <[email protected]>2025-02-28 09:23:04 +1100
commita63fd7f01cdabd9ce85bb09ae2b573fd3b8e60aa (patch)
tree35d817580e5244d62a150a2d012f72906a610977 /keyboards
parent6d0e5728aa61b442885d48caf49d29e5c60e8197 (diff)
parentcdb865cf60b17593f5c811c24a21d7b3030d8653 (diff)
downloadqmk_firmware-a63fd7f01cdabd9ce85bb09ae2b573fd3b8e60aa.tar.gz
qmk_firmware-a63fd7f01cdabd9ce85bb09ae2b573fd3b8e60aa.zip
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/0_sixty/rules.mk1
-rw-r--r--keyboards/0xcb/splaytoraid/rules.mk1
-rw-r--r--keyboards/1upkeyboards/pi40/rules.mk1
-rw-r--r--keyboards/1upkeyboards/pi50/rules.mk1
-rw-r--r--keyboards/1upkeyboards/sweet16/rules.mk1
-rw-r--r--keyboards/25keys/aleth42/rules.mk1
-rw-r--r--keyboards/25keys/zinc/rules.mk1
-rw-r--r--keyboards/40percentclub/i75/rules.mk1
-rw-r--r--keyboards/40percentclub/polyandry/rules.mk1
-rw-r--r--keyboards/8pack/rules.mk1
-rw-r--r--keyboards/a_jazz/akc084/keyboard.json2
-rw-r--r--keyboards/a_jazz/akc084/keymaps/default/keymap.c18
-rw-r--r--keyboards/a_jazz/akc084/readme.md6
-rw-r--r--keyboards/adkb96/rules.mk1
-rw-r--r--keyboards/adm42/rules.mk1
-rwxr-xr-xkeyboards/aeboards/constellation/rules.mk1
-rw-r--r--keyboards/aeboards/ext65/rules.mk1
-rw-r--r--keyboards/aeboards/satellite/rules.mk1
-rw-r--r--keyboards/al1/readme.md2
-rw-r--r--keyboards/alf/dc60/readme.md2
-rw-r--r--keyboards/atreus/rules.mk1
-rw-r--r--keyboards/atreyu/rules.mk1
-rw-r--r--keyboards/biacco42/ergo42/rules.mk1
-rw-r--r--keyboards/biacco42/meishi2/readme.md3
-rw-r--r--keyboards/binepad/bn009/rules.mk3
-rwxr-xr-xkeyboards/binepad/bnr1/rules.mk1
-rw-r--r--keyboards/boston_meetup/rules.mk1
-rw-r--r--keyboards/bpiphany/frosty_flake/rules.mk1
-rw-r--r--keyboards/bpiphany/pegasushoof/rules.mk1
-rw-r--r--keyboards/bpiphany/unloved_bastard/readme.md4
-rw-r--r--keyboards/buzzard/rules.mk1
-rw-r--r--keyboards/cannonkeys/db60/hotswap/rules.mk (renamed from keyboards/westm/westm9/rules.mk)2
-rw-r--r--keyboards/cannonkeys/db60/j02/rules.mk (renamed from keyboards/westm/westm68/rules.mk)2
-rw-r--r--keyboards/cannonkeys/db60/rev2/rules.mk (renamed from keyboards/cannonkeys/db60/rules.mk)2
-rw-r--r--keyboards/clickety_split/leeloo/rules.mk2
-rw-r--r--keyboards/converter/palm_usb/info.json20
-rw-r--r--keyboards/converter/palm_usb/stowaway/config.h (renamed from keyboards/converter/palm_usb/config.h)0
-rw-r--r--keyboards/converter/palm_usb/stowaway/keyboard.json18
-rw-r--r--keyboards/converter/palm_usb/stowaway/matrix.c (renamed from keyboards/converter/palm_usb/matrix.c)0
-rw-r--r--keyboards/converter/palm_usb/stowaway/readme.md (renamed from keyboards/converter/palm_usb/readme.md)0
-rw-r--r--keyboards/converter/palm_usb/stowaway/rules.mk (renamed from keyboards/converter/palm_usb/rules.mk)2
-rw-r--r--keyboards/cool836a/readme.md2
-rw-r--r--keyboards/crkbd/rules.mk1
-rw-r--r--keyboards/custommk/genesis/rules.mk1
-rw-r--r--keyboards/cxt_studio/12e3/keyboard.json99
-rw-r--r--keyboards/cxt_studio/12e3/keymaps/default/keymap.c40
-rw-r--r--keyboards/cxt_studio/12e3/keymaps/default/rules.mk1
-rw-r--r--keyboards/cxt_studio/12e3/readme.md27
-rw-r--r--keyboards/cxt_studio/12e4/config.h6
-rw-r--r--keyboards/cxt_studio/12e4/cxt_studio.c (renamed from keyboards/cxt_studio/cxt_studio.c)20
-rw-r--r--keyboards/cxt_studio/12e4/keyboard.json (renamed from keyboards/cxt_studio/keyboard.json)2
-rw-r--r--keyboards/cxt_studio/12e4/keymaps/default/keymap.json (renamed from keyboards/cxt_studio/keymaps/default/keymap.json)2
-rw-r--r--keyboards/cxt_studio/12e4/readme.md (renamed from keyboards/cxt_studio/readme.md)10
-rw-r--r--keyboards/cxt_studio/config.h22
-rw-r--r--keyboards/dailycraft/bat43/rules.mk1
-rw-r--r--keyboards/dailycraft/claw44/rules.mk1
-rw-r--r--keyboards/dailycraft/sandbox/rules.mk1
-rw-r--r--keyboards/dailycraft/wings42/rules.mk1
-rw-r--r--keyboards/darkproject/kd83a_bfg_edition/config.h3
-rw-r--r--keyboards/darkproject/kd87a_bfg_edition/config.h3
-rw-r--r--keyboards/delikeeb/vanana/rules.mk1
-rw-r--r--keyboards/delikeeb/waaffle/rev3/rules.mk1
-rw-r--r--keyboards/deltapad/readme.md5
-rw-r--r--keyboards/deltasplit75/rules.mk1
-rw-r--r--keyboards/dp3000/rules.mk1
-rw-r--r--keyboards/drhigsby/ogurec/rules.mk1
-rw-r--r--keyboards/duck/jetfire/readme.md2
-rw-r--r--keyboards/duck/octagon/rules.mk1
-rw-r--r--keyboards/duck/orion/rules.mk1
-rw-r--r--keyboards/ducky/one2mini/rules.mk1
-rw-r--r--keyboards/ducky/one2sf/rules.mk1
-rw-r--r--keyboards/dumbpad/rules.mk1
-rw-r--r--keyboards/durgod/galaxy/rules.mk1
-rw-r--r--keyboards/durgod/venus/rules.mk1
-rw-r--r--keyboards/dztech/tofu/ii/rules.mk1
-rw-r--r--keyboards/dztech/tofu/jr/rules.mk1
-rw-r--r--keyboards/eco/rules.mk1
-rw-r--r--keyboards/eek/rules.mk1
-rw-r--r--keyboards/ergoslab/rules.mk1
-rw-r--r--keyboards/ergotravel/rules.mk1
-rw-r--r--keyboards/ericrlau/numdiscipline/readme.md1
-rw-r--r--keyboards/evyd13/atom47/rules.mk1
-rw-r--r--keyboards/exclusive/e85/rules.mk1
-rw-r--r--keyboards/ferris/0_1/matrix.c45
-rw-r--r--keyboards/ferris/0_2/matrix.c3
-rw-r--r--keyboards/fortitude60/rules.mk1
-rw-r--r--keyboards/fruitykeeb/fruitbar/r1/rules.mk1
-rw-r--r--keyboards/ghs/jem/rules.mk1
-rw-r--r--keyboards/gmmk/gmmk2/p96/config.h3
-rw-r--r--keyboards/hadron/rules.mk1
-rw-r--r--keyboards/handwired/bento/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/rules.mk1
-rw-r--r--keyboards/handwired/ergodox_stm32/board.h (renamed from keyboards/ergodox_stm32/board.h)0
-rw-r--r--keyboards/handwired/ergodox_stm32/chconf.h (renamed from keyboards/ergodox_stm32/chconf.h)0
-rw-r--r--keyboards/handwired/ergodox_stm32/config.h (renamed from keyboards/ergodox_stm32/config.h)0
-rw-r--r--keyboards/handwired/ergodox_stm32/ergodox_stm32.c (renamed from keyboards/ergodox_stm32/ergodox_stm32.c)0
-rw-r--r--keyboards/handwired/ergodox_stm32/ergodox_stm32.h (renamed from keyboards/ergodox_stm32/ergodox_stm32.h)0
-rw-r--r--keyboards/handwired/ergodox_stm32/halconf.h (renamed from keyboards/ergodox_stm32/halconf.h)0
-rw-r--r--keyboards/handwired/ergodox_stm32/keyboard.json (renamed from keyboards/ergodox_stm32/keyboard.json)0
-rw-r--r--keyboards/handwired/ergodox_stm32/keymaps/default/keymap.c (renamed from keyboards/ergodox_stm32/keymaps/default/keymap.c)0
-rw-r--r--keyboards/handwired/ergodox_stm32/ld/stm32f103_bootloader.ld (renamed from keyboards/ergodox_stm32/ld/stm32f103_bootloader.ld)0
-rw-r--r--keyboards/handwired/ergodox_stm32/matrix.c (renamed from keyboards/ergodox_stm32/matrix.c)0
-rw-r--r--keyboards/handwired/ergodox_stm32/mcuconf.h (renamed from keyboards/ergodox_stm32/mcuconf.h)0
-rw-r--r--keyboards/handwired/ergodox_stm32/readme.md (renamed from keyboards/ergodox_stm32/readme.md)2
-rw-r--r--keyboards/handwired/ergodox_stm32/rules.mk (renamed from keyboards/ergodox_stm32/rules.mk)0
-rw-r--r--keyboards/handwired/fc200rt_qmk/readme.md1
-rw-r--r--keyboards/handwired/meck_tkl/blackpill_f401/rules.mk2
-rw-r--r--keyboards/handwired/meck_tkl/rules.mk4
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/rules.mk1
-rw-r--r--keyboards/handwired/novem/readme.md2
-rw-r--r--keyboards/handwired/onekey/at_start_f415/board.h4
-rw-r--r--keyboards/handwired/onekey/at_start_f415/config.h4
-rw-r--r--keyboards/handwired/onekey/at_start_f415/halconf.h4
-rw-r--r--keyboards/handwired/onekey/at_start_f415/keyboard.json4
-rw-r--r--keyboards/handwired/onekey/at_start_f415/mcuconf.h4
-rw-r--r--keyboards/handwired/onekey/keymaps/community_module/keymap.c7
-rw-r--r--keyboards/handwired/onekey/keymaps/community_module/keymap.json3
-rw-r--r--keyboards/handwired/onekey/rules.mk1
-rw-r--r--keyboards/handwired/pill60/rules.mk1
-rw-r--r--keyboards/handwired/postageboard/rules.mk1
-rw-r--r--keyboards/handwired/qc60/rules.mk1
-rw-r--r--keyboards/handwired/sono1/rules.mk1
-rw-r--r--keyboards/handwired/splittest/rules.mk1
-rw-r--r--keyboards/handwired/stef9998/split_5x7/rules.mk1
-rw-r--r--keyboards/handwired/symmetric70_proto/promicro/rules.mk1
-rw-r--r--keyboards/handwired/symmetric70_proto/proton_c/rules.mk1
-rw-r--r--keyboards/handwired/unk/rules.mk1
-rw-r--r--keyboards/handwired/xealous/config.h32
-rw-r--r--keyboards/handwired/xealous/matrix.c49
-rw-r--r--keyboards/handwired/xealous/rev1/config.h13
-rw-r--r--keyboards/handwired/xealous/rules.mk3
-rw-r--r--keyboards/hhkb/ansi/32u2/rules.mk (renamed from keyboards/hhkb/ansi/rules.mk)2
-rw-r--r--keyboards/hhkb/ansi/32u4/rules.mk4
-rw-r--r--keyboards/hillside/46/rules.mk1
-rw-r--r--keyboards/hillside/48/rules.mk1
-rw-r--r--keyboards/hillside/52/rules.mk1
-rw-r--r--keyboards/hineybush/h75_singa/readme.md2
-rw-r--r--keyboards/ibm/model_m/mschwingen/mschwingen.c5
-rw-r--r--keyboards/ibnuda/squiggle/rules.mk1
-rw-r--r--keyboards/idobao/id80/v1/rules.mk2
-rw-r--r--keyboards/idobao/id80/v3/rules.mk2
-rw-r--r--keyboards/inett_studio/sq80/rules.mk1
-rw-r--r--keyboards/input_club/infinity60/rules.mk1
-rw-r--r--keyboards/jacky_studio/bear_65/rules.mk1
-rw-r--r--keyboards/jacky_studio/piggy60/rev1/rules.mk1
-rw-r--r--keyboards/jacky_studio/piggy60/rules.mk1
-rw-r--r--keyboards/jadookb/jkb65/rules.mk1
-rw-r--r--keyboards/jian/rules.mk1
-rw-r--r--keyboards/jiran/rules.mk1
-rw-r--r--keyboards/jones/rules.mk1
-rw-r--r--keyboards/jorne/rules.mk1
-rw-r--r--keyboards/jukaie/jk01/config.h3
-rw-r--r--keyboards/junco/rules.mk1
-rw-r--r--keyboards/kakunpc/angel17/rules.mk1
-rw-r--r--keyboards/kakunpc/angel64/alpha/rules.mk3
-rw-r--r--keyboards/kakunpc/angel64/rev1/rules.mk3
-rw-r--r--keyboards/kakunpc/angel64/rules.mk5
-rw-r--r--keyboards/kakunpc/business_card/readme.md8
-rw-r--r--keyboards/kakunpc/business_card/rules.mk1
-rw-r--r--keyboards/kakunpc/suihankey/rules.mk1
-rw-r--r--keyboards/kakunpc/suihankey/split/rules.mk1
-rw-r--r--keyboards/kapcave/paladinpad/rules.mk1
-rw-r--r--keyboards/kapl/rules.mk1
-rw-r--r--keyboards/kbdfans/d45/rules.mk1
-rw-r--r--keyboards/kbdfans/kbd75/rules.mk1
-rw-r--r--keyboards/keebio/bdn9/rules.mk1
-rw-r--r--keyboards/keebio/convolution/rules.mk1
-rw-r--r--keyboards/keebio/dsp40/rules.mk1
-rw-r--r--keyboards/keebio/ergodicity/readme.md4
-rw-r--r--keyboards/keebio/foldkb/rules.mk1
-rw-r--r--keyboards/keebio/kbo5000/rules.mk1
-rw-r--r--keyboards/keebio/levinson/rules.mk1
-rw-r--r--keyboards/keebio/quefrency/rules.mk1
-rw-r--r--keyboards/keebio/rorschach/rules.mk1
-rw-r--r--keyboards/keebio/sinc/rules.mk1
-rw-r--r--keyboards/keebio/viterbi/rules.mk1
-rw-r--r--keyboards/keycapsss/kimiko/rules.mk1
-rw-r--r--keyboards/keycapsss/plaid_pad/rules.mk1
-rw-r--r--keyboards/keyhive/navi10/rules.mk1
-rw-r--r--keyboards/keyhive/uno/rules.mk1
-rw-r--r--keyboards/kin80/rules.mk1
-rw-r--r--keyboards/kira/kira75/readme.md2
-rw-r--r--keyboards/kprepublic/bm16a/v1/readme.md1
-rw-r--r--keyboards/kprepublic/bm16s/readme.md1
-rw-r--r--keyboards/kprepublic/jj40/rules.mk1
-rw-r--r--keyboards/kprepublic/jj50/rules.mk1
-rw-r--r--keyboards/kradoindustries/promenade/keyboard.json10
-rw-r--r--keyboards/kradoindustries/promenade/keymaps/default/keymap.c20
-rw-r--r--keyboards/kradoindustries/promenade/matrix_diagram.md8
-rw-r--r--keyboards/kumaokobo/kudox/rules.mk1
-rw-r--r--keyboards/kumaokobo/kudox_full/rules.mk1
-rw-r--r--keyboards/kumaokobo/kudox_game/rules.mk1
-rw-r--r--keyboards/kumaokobo/pico/rules.mk1
-rw-r--r--keyboards/lazydesigners/dimple/rules.mk1
-rw-r--r--keyboards/lets_split/rules.mk1
-rw-r--r--keyboards/lfkeyboards/lfk78/rules.mk1
-rw-r--r--keyboards/lfkeyboards/lfk87/rules.mk1
-rw-r--r--keyboards/lfkeyboards/smk65/rules.mk1
-rw-r--r--keyboards/lily58/rules.mk1
-rw-r--r--keyboards/lime/rules.mk1
-rw-r--r--keyboards/maple_computing/christmas_tree/rules.mk1
-rw-r--r--keyboards/maple_computing/ivy/rules.mk1
-rw-r--r--keyboards/maple_computing/launchpad/rules.mk1
-rw-r--r--keyboards/maple_computing/minidox/rules.mk1
-rw-r--r--keyboards/mariorion_v25/rules.mk1
-rw-r--r--keyboards/marksard/rhymestone/rules.mk1
-rw-r--r--keyboards/marksard/treadstone32/readme.md4
-rw-r--r--keyboards/marksard/treadstone32/rules.mk1
-rw-r--r--keyboards/marksard/treadstone48/readme.md4
-rw-r--r--keyboards/marksard/treadstone48/rules.mk1
-rw-r--r--keyboards/masterworks/classy_tkl/readme.md2
-rw-r--r--keyboards/maxipad/rules.mk1
-rw-r--r--keyboards/mb44/readme.md2
-rw-r--r--keyboards/mechkeys/mechmini/rules.mk1
-rw-r--r--keyboards/mechllama/g35/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rules.mk2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/rules.mk1
-rw-r--r--keyboards/mechlovin/delphine/readme.md2
-rw-r--r--keyboards/mechlovin/delphine/rules.mk1
-rw-r--r--keyboards/mechlovin/hannah60rgb/rules.mk1
-rw-r--r--keyboards/mechlovin/hannah65/rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/hannah65/rules.mk1
-rw-r--r--keyboards/mechlovin/hannah910/rules.mk1
-rw-r--r--keyboards/mechlovin/hex4b/rules.mk1
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/infinity87/rules.mk1
-rw-r--r--keyboards/mechlovin/mechlovin9/rules.mk1
-rw-r--r--keyboards/mechlovin/olly/jf/rules.mk1
-rw-r--r--keyboards/mechlovin/zed1800/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/rules.mk1
-rw-r--r--keyboards/mechwild/bde/rules.mk1
-rw-r--r--keyboards/mechwild/mokulua/readme.md2
-rw-r--r--keyboards/mechwild/mokulua/rules.mk1
-rw-r--r--keyboards/mechwild/obe/f401/rules.mk1
-rw-r--r--keyboards/mechwild/obe/f411/rules.mk1
-rw-r--r--keyboards/mechwild/obe/rules.mk1
-rw-r--r--keyboards/mechwild/waka60/f401/rules.mk1
-rw-r--r--keyboards/mechwild/waka60/f411/rules.mk1
-rw-r--r--keyboards/mechwild/waka60/rules.mk1
-rw-r--r--keyboards/melgeek/z70ultra/rules.mk1
-rw-r--r--keyboards/meme/readme.md2
-rw-r--r--keyboards/mint60/readme.md3
-rw-r--r--keyboards/moky/moky88/config.h3
-rw-r--r--keyboards/moky/moky88/moky88.c176
-rw-r--r--keyboards/montsinger/rebound/rules.mk1
-rw-r--r--keyboards/murcielago/rules.mk1
-rw-r--r--keyboards/nullbitsco/scramble/rules.mk1
-rw-r--r--keyboards/oddball/v1/rules.mk (renamed from keyboards/oddball/rules.mk)2
-rw-r--r--keyboards/oddball/v2/rules.mk1
-rw-r--r--keyboards/oddball/v2_1/rules.mk1
-rw-r--r--keyboards/omkbd/ergodash/rules.mk1
-rw-r--r--keyboards/omkbd/runner3680/rules.mk1
-rw-r--r--keyboards/orthodox/rules.mk1
-rw-r--r--keyboards/peej/rosaline/rules.mk1
-rw-r--r--keyboards/peej/tripel/rules.mk1
-rw-r--r--keyboards/pegasus/readme.md2
-rw-r--r--keyboards/peranekofactory/tone/rules.mk1
-rw-r--r--keyboards/phase_studio/titan65/rules.mk1
-rw-r--r--keyboards/pica40/rules.mk1
-rw-r--r--keyboards/pinky/rules.mk1
-rw-r--r--keyboards/ploopyco/madromys/post_rules.mk1
-rw-r--r--keyboards/ploopyco/madromys/rules.mk3
-rw-r--r--keyboards/ploopyco/mouse/config.h11
-rw-r--r--keyboards/ploopyco/mouse/info.json (renamed from keyboards/ploopyco/mouse/keyboard.json)27
-rw-r--r--keyboards/ploopyco/mouse/post_rules.mk1
-rw-r--r--keyboards/ploopyco/mouse/readme.md6
-rw-r--r--keyboards/ploopyco/mouse/rev1_002/config.h33
-rw-r--r--keyboards/ploopyco/mouse/rev1_002/keyboard.json21
-rw-r--r--keyboards/ploopyco/mouse/rev1_002/readme.md3
-rw-r--r--keyboards/ploopyco/mouse/rev1_002/rules.mk (renamed from keyboards/ploopyco/mouse/rules.mk)2
-rw-r--r--keyboards/ploopyco/mouse/rev1_003/config.h32
-rw-r--r--keyboards/ploopyco/mouse/rev1_003/keyboard.json25
-rw-r--r--keyboards/ploopyco/mouse/rev1_003/readme.md3
-rw-r--r--keyboards/ploopyco/trackball/config.h11
-rw-r--r--keyboards/ploopyco/trackball/info.json5
-rw-r--r--keyboards/ploopyco/trackball/post_rules.mk1
-rw-r--r--keyboards/ploopyco/trackball/readme.md25
-rw-r--r--keyboards/ploopyco/trackball/rev1_004/config.h (renamed from keyboards/ploopyco/trackball/rev1/config.h)6
-rw-r--r--keyboards/ploopyco/trackball/rev1_004/keyboard.json (renamed from keyboards/ploopyco/trackball/rev1/keyboard.json)0
-rw-r--r--keyboards/ploopyco/trackball/rev1_004/readme.md (renamed from keyboards/ploopyco/trackball/rev1/readme.md)0
-rw-r--r--keyboards/ploopyco/trackball/rev1_004/rules.mk2
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/config.h9
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/readme.md4
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/rules.mk2
-rw-r--r--keyboards/ploopyco/trackball/rev1_007/config.h32
-rw-r--r--keyboards/ploopyco/trackball/rev1_007/keyboard.json25
-rw-r--r--keyboards/ploopyco/trackball/rev1_007/readme.md3
-rw-r--r--keyboards/ploopyco/trackball/rules.mk6
-rw-r--r--keyboards/ploopyco/trackball_mini/post_rules.mk1
-rw-r--r--keyboards/ploopyco/trackball_mini/rules.mk3
-rw-r--r--keyboards/ploopyco/trackball_nano/post_rules.mk1
-rw-r--r--keyboards/ploopyco/trackball_nano/rules.mk3
-rw-r--r--keyboards/ploopyco/trackball_thumb/config.h6
-rw-r--r--keyboards/ploopyco/trackball_thumb/info.json14
-rw-r--r--keyboards/ploopyco/trackball_thumb/post_rules.mk1
-rw-r--r--keyboards/ploopyco/trackball_thumb/readme.md4
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/config.h6
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json12
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/readme.md4
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk2
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_002/config.h32
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_002/keyboard.json25
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_002/readme.md3
-rw-r--r--keyboards/ploopyco/trackball_thumb/rules.mk6
-rw-r--r--keyboards/polilla/rules.mk1
-rw-r--r--keyboards/primekb/meridian/rules.mk1
-rw-r--r--keyboards/primekb/prime_e/rules.mk1
-rw-r--r--keyboards/primekb/prime_l/rules.mk1
-rw-r--r--keyboards/program_yoink/rules.mk1
-rw-r--r--keyboards/projectcain/vault35/rules.mk1
-rw-r--r--keyboards/projectd/65/projectd_65_ansi/config.h3
-rw-r--r--keyboards/projectd/75/ansi/config.h3
-rw-r--r--keyboards/projectd/75/iso/config.h3
-rw-r--r--keyboards/projectkb/alice/rules.mk1
-rw-r--r--keyboards/qpockets/space_space/rules.mk1
-rw-r--r--keyboards/qwertyydox/rules.mk1
-rw-r--r--keyboards/rate/pistachio/rules.mk1
-rw-r--r--keyboards/recompile_keys/choco60/rules.mk1
-rw-r--r--keyboards/recompile_keys/nomu30/rules.mk1
-rw-r--r--keyboards/redox/rev1/rules.mk1
-rw-r--r--keyboards/rgbkb/mun/rules.mk1
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/rules.mk2
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/rules.mk1
-rw-r--r--keyboards/rgbkb/pan/rev1/rules.mk2
-rw-r--r--keyboards/rgbkb/pan/rules.mk3
-rw-r--r--keyboards/rgbkb/sol/rules.mk1
-rw-r--r--keyboards/rgbkb/sol3/rev1/keyboard.json2
-rw-r--r--keyboards/rgbkb/sol3/rules.mk1
-rw-r--r--keyboards/rgbkb/zen/rules.mk1
-rw-r--r--keyboards/rgbkb/zygomorph/rules.mk1
-rw-r--r--keyboards/rmi_kb/herringbone/rules.mk1
-rw-r--r--keyboards/rmi_kb/mona/rules.mk1
-rw-r--r--keyboards/rmi_kb/tkl_ff/rules.mk1
-rw-r--r--keyboards/rmi_kb/wete/rules.mk1
-rwxr-xr-xkeyboards/rookiebwoy/late9/rules.mk1
-rwxr-xr-xkeyboards/rookiebwoy/neopad/rules.mk1
-rw-r--r--keyboards/rura66/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/7skb/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/getta25/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/jisplit89/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/naked48/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/naked60/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/naked64/rules.mk1
-rw-r--r--keyboards/salicylic_acid3/setta21/rules.mk1
-rw-r--r--keyboards/sawnsprojects/okayu/rules.mk1
-rw-r--r--keyboards/sharkoon/skiller_sgk50_s4/keyboard.json130
-rw-r--r--keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c12
-rw-r--r--keyboards/silakka54/config.h25
-rw-r--r--keyboards/silakka54/keyboard.json102
-rw-r--r--keyboards/silakka54/keymaps/default/keymap.c22
-rw-r--r--keyboards/silakka54/readme.md26
-rw-r--r--keyboards/skyloong/gk61/pro/config.h3
-rw-r--r--keyboards/skyloong/gk61/pro/pro.c149
-rw-r--r--keyboards/skyloong/gk61/pro_48/config.h4
-rw-r--r--keyboards/skyloong/gk61/pro_48/pro_48.c93
-rw-r--r--keyboards/smoll/lefty/rules.mk1
-rw-r--r--keyboards/sofle/rules.mk1
-rw-r--r--keyboards/spaceholdings/nebula68b/rules.mk1
-rw-r--r--keyboards/spacetime/rules.mk1
-rw-r--r--keyboards/splitkb/aurora/corne/rules.mk16
-rw-r--r--keyboards/splitkb/aurora/helix/rules.mk1
-rw-r--r--keyboards/splitkb/aurora/lily58/rules.mk16
-rw-r--r--keyboards/splitkb/aurora/sofle_v2/rules.mk1
-rw-r--r--keyboards/splitkb/aurora/sweep/rules.mk16
-rw-r--r--keyboards/splitkb/kyria/rev1/rules.mk1
-rw-r--r--keyboards/splitkb/kyria/rev2/rules.mk1
-rw-r--r--keyboards/splitkb/kyria/rules.mk1
-rw-r--r--keyboards/splitty/rules.mk1
-rw-r--r--keyboards/studiokestra/galatea/rules.mk1
-rw-r--r--keyboards/takashiski/hecomi/rules.mk1
-rw-r--r--keyboards/takashiski/namecard2x4/rules.mk1
-rw-r--r--keyboards/teleport/native/ansi/rules.mk1
-rw-r--r--keyboards/teleport/native/iso/rules.mk1
-rw-r--r--keyboards/teleport/native/rules.mk3
-rw-r--r--keyboards/tgr/tris/readme.md2
-rw-r--r--keyboards/themadnoodle/noodlepad/rules.mk3
-rw-r--r--keyboards/tkw/grandiceps/rules.mk1
-rw-r--r--keyboards/tkw/stoutgat/v2/rules.mk1
-rw-r--r--keyboards/tominabox1/le_chiffre/rules.mk1
-rw-r--r--keyboards/tominabox1/littlefoot_lx/rules.mk1
-rw-r--r--keyboards/tominabox1/underscore33/rules.mk1
-rw-r--r--keyboards/trnthsn/e8ghty/rules.mk1
-rw-r--r--keyboards/trnthsn/s6xty5neor2/rules.mk1
-rw-r--r--keyboards/tweetydabird/lotus58/rules.mk1
-rw-r--r--keyboards/unison/rules.mk1
-rw-r--r--keyboards/uzu42/rules.mk1
-rw-r--r--keyboards/vitamins_included/rules.mk1
-rw-r--r--keyboards/westm/westm68/rev1/rules.mk2
-rw-r--r--keyboards/westm/westm68/rev2/rules.mk2
-rw-r--r--keyboards/westm/westm9/rev1/rules.mk2
-rw-r--r--keyboards/westm/westm9/rev2/rules.mk2
-rw-r--r--keyboards/whale/sk/rules.mk1
-rw-r--r--keyboards/woodkeys/meira/featherble/rules.mk3
-rw-r--r--keyboards/woodkeys/meira/promicro/rules.mk3
-rw-r--r--keyboards/woodkeys/meira/rules.mk4
-rw-r--r--keyboards/work_louder/loop/post_rules.mk1
-rw-r--r--keyboards/work_louder/loop/rules.mk3
-rw-r--r--keyboards/work_louder/work_board/post_rules.mk1
-rw-r--r--keyboards/work_louder/work_board/rules.mk3
-rw-r--r--keyboards/x16/readme.md1
-rw-r--r--keyboards/yanghu/unicorne/rules.mk1
-rw-r--r--keyboards/ymdk/id75/f103/board.h (renamed from keyboards/ymdk/id75/board.h)0
-rw-r--r--keyboards/ymdk/id75/f103/config.h (renamed from keyboards/ymdk/id75/config.h)0
-rw-r--r--keyboards/ymdk/id75/f103/halconf.h (renamed from keyboards/ymdk/id75/halconf.h)0
-rw-r--r--keyboards/ymdk/id75/f103/keyboard.json13
-rw-r--r--keyboards/ymdk/id75/f103/mcuconf.h (renamed from keyboards/ymdk/id75/mcuconf.h)0
-rw-r--r--keyboards/ymdk/id75/f103/rules.mk (renamed from keyboards/ymdk/id75/rules.mk)0
-rw-r--r--keyboards/ymdk/id75/info.json (renamed from keyboards/ymdk/id75/keyboard.json)231
-rw-r--r--keyboards/ymdk/id75/readme.md12
-rw-r--r--keyboards/ymdk/melody96/rules.mk1
-rw-r--r--keyboards/ymdk/yd60mq/rules.mk1
-rw-r--r--keyboards/yosino58/rules.mk1
-rw-r--r--keyboards/yushakobo/navpad/10/rules.mk1
-rw-r--r--keyboards/yynmt/acperience12/rules.mk1
-rw-r--r--keyboards/zsa/planck_ez/base/rules.mk2
-rw-r--r--keyboards/zsa/planck_ez/glow/rules.mk2
-rw-r--r--keyboards/zsa/planck_ez/rules.mk4
-rw-r--r--keyboards/zsa/voyager/voyager.c2
423 files changed, 1186 insertions, 1218 deletions
diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk
deleted file mode 100644
index a0d06a89dd..0000000000
--- a/keyboards/0_sixty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 0_sixty/base
diff --git a/keyboards/0xcb/splaytoraid/rules.mk b/keyboards/0xcb/splaytoraid/rules.mk
deleted file mode 100644
index 65884dec4f..0000000000
--- a/keyboards/0xcb/splaytoraid/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 0xcb/splaytoraid/rp2040_ce
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
deleted file mode 100644
index 48aea570e0..0000000000
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/1upkeyboards/pi50/rules.mk b/keyboards/1upkeyboards/pi50/rules.mk
deleted file mode 100644
index a9660074af..0000000000
--- a/keyboards/1upkeyboards/pi50/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 1upkeyboards/pi50/grid
diff --git a/keyboards/1upkeyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk
deleted file mode 100644
index 7d269ac93f..0000000000
--- a/keyboards/1upkeyboards/sweet16/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 1upkeyboards/sweet16/v1
diff --git a/keyboards/25keys/aleth42/rules.mk b/keyboards/25keys/aleth42/rules.mk
deleted file mode 100644
index 8034ad5440..0000000000
--- a/keyboards/25keys/aleth42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 25keys/aleth42/rev1
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
deleted file mode 100644
index 1edcb0a345..0000000000
--- a/keyboards/25keys/zinc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 25keys/zinc/rev1
diff --git a/keyboards/40percentclub/i75/rules.mk b/keyboards/40percentclub/i75/rules.mk
deleted file mode 100644
index 48b0427550..0000000000
--- a/keyboards/40percentclub/i75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 40percentclub/i75/promicro
diff --git a/keyboards/40percentclub/polyandry/rules.mk b/keyboards/40percentclub/polyandry/rules.mk
deleted file mode 100644
index 3064c8202c..0000000000
--- a/keyboards/40percentclub/polyandry/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 40percentclub/polyandry/promicro
diff --git a/keyboards/8pack/rules.mk b/keyboards/8pack/rules.mk
deleted file mode 100644
index 81024a7119..0000000000
--- a/keyboards/8pack/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 8pack/rev12
diff --git a/keyboards/a_jazz/akc084/keyboard.json b/keyboards/a_jazz/akc084/keyboard.json
index a489a5ade5..a8290ea75f 100644
--- a/keyboards/a_jazz/akc084/keyboard.json
+++ b/keyboards/a_jazz/akc084/keyboard.json
@@ -20,7 +20,7 @@
},
"indicators": {
"caps_lock": "A9",
- "num_lock": "A10"
+ "scroll_lock": "A10"
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"],
diff --git a/keyboards/a_jazz/akc084/keymaps/default/keymap.c b/keyboards/a_jazz/akc084/keymaps/default/keymap.c
index 0ea7355fec..2bd7992707 100644
--- a/keyboards/a_jazz/akc084/keymaps/default/keymap.c
+++ b/keyboards/a_jazz/akc084/keymaps/default/keymap.c
@@ -25,19 +25,19 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_MUTE,
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL, KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT(
- _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_MYCM, KC_CALC, _______, _______, _______, _______,
+ _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_MYCM, KC_CALC, _______, _______, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______
)
}; \ No newline at end of file
diff --git a/keyboards/a_jazz/akc084/readme.md b/keyboards/a_jazz/akc084/readme.md
index d93c8a687d..4be104f581 100644
--- a/keyboards/a_jazz/akc084/readme.md
+++ b/keyboards/a_jazz/akc084/readme.md
@@ -1,8 +1,8 @@
-# A-JAZZ AKC084
+# A-JAZZ AKC084 (AKP846)
A customizable 84keys keyboard
-![akc084](https://i.imgur.com/381vaD7.png)
+![akc084](https://i.imgur.com/6D0jBco.png)
* Keyboard Maintainer: [Feng](https://github.com/fenggx-a-jazz)
* Hardware Supported: [a-jazz](https://www.a-jazz.com)
* Hardware Availability: [a-jazz](https://ajazzstore.com/collections/all/products/ajazz-akp846)
@@ -18,6 +18,6 @@ Flashing example for this keyboard:
See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide.
## Bootloader ESC the bootloader in 3 ways:
-* **Bootmagic reset: Hold down Enter in the keyboard then replug
+* **Bootmagic reset: Hold down Esc in the keyboard then replug
* **Physical reset button: Briefly press the button on the back of the PCB
* **Keycode in layout: Press the key mapped to QK_BOOT
diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk
deleted file mode 100644
index ac7561b21d..0000000000
--- a/keyboards/adkb96/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = adkb96/rev1
diff --git a/keyboards/adm42/rules.mk b/keyboards/adm42/rules.mk
deleted file mode 100644
index 06fc88e9f6..0000000000
--- a/keyboards/adm42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = adm42/rev4 \ No newline at end of file
diff --git a/keyboards/aeboards/constellation/rules.mk b/keyboards/aeboards/constellation/rules.mk
deleted file mode 100755
index bd2af5d22b..0000000000
--- a/keyboards/aeboards/constellation/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = aeboards/constellation/rev1
diff --git a/keyboards/aeboards/ext65/rules.mk b/keyboards/aeboards/ext65/rules.mk
deleted file mode 100644
index d8b0595a5d..0000000000
--- a/keyboards/aeboards/ext65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = aeboards/ext65/rev2 \ No newline at end of file
diff --git a/keyboards/aeboards/satellite/rules.mk b/keyboards/aeboards/satellite/rules.mk
deleted file mode 100644
index bc32615d2b..0000000000
--- a/keyboards/aeboards/satellite/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = aeboards/satellite/rev1
diff --git a/keyboards/al1/readme.md b/keyboards/al1/readme.md
index 3531e2fdc6..4dcf83f05f 100644
--- a/keyboards/al1/readme.md
+++ b/keyboards/al1/readme.md
@@ -1,7 +1,5 @@
# TriangleLabs AL1
-![AL1](imgur.com image replace me!)
-
* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin), [Olivia](https://github.com/olivia)
* Hardware Supported: AL1 PCB
* Hardware Availability: [GroupBuy](https://geekhack.org/index.php?topic=93258.0)
diff --git a/keyboards/alf/dc60/readme.md b/keyboards/alf/dc60/readme.md
index d8e20a8f4f..628878e8de 100644
--- a/keyboards/alf/dc60/readme.md
+++ b/keyboards/alf/dc60/readme.md
@@ -1,7 +1,5 @@
# dc60
-![dc60](imgur.com image replace me!)
-
A 60% PCB sold with the Alf DC60.
Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
diff --git a/keyboards/atreus/rules.mk b/keyboards/atreus/rules.mk
deleted file mode 100644
index d933cb327d..0000000000
--- a/keyboards/atreus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = atreus/astar
diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk
deleted file mode 100644
index 4daffe6b9d..0000000000
--- a/keyboards/atreyu/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = atreyu/rev1
diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
deleted file mode 100644
index 18059c0a3b..0000000000
--- a/keyboards/biacco42/ergo42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/biacco42/meishi2/readme.md b/keyboards/biacco42/meishi2/readme.md
index 97c5465f86..b190ff38ce 100644
--- a/keyboards/biacco42/meishi2/readme.md
+++ b/keyboards/biacco42/meishi2/readme.md
@@ -5,8 +5,7 @@
meishi2 - The better micro macro keyboard
Keyboard Maintainer: [Biacco42](https://github.com/Biacco42)
-Hardware Supported: The PCBs, controllers supported
-Hardware Availability: [links to where you can find this hardware](https://github.com/Biacco42/meishi2)
+Hardware Availability: https://github.com/Biacco42/meishi2
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/binepad/bn009/rules.mk b/keyboards/binepad/bn009/rules.mk
deleted file mode 100644
index 74214d60ed..0000000000
--- a/keyboards/binepad/bn009/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is mostly left blank
-
-DEFAULT_FOLDER = binepad/bn009/r2
diff --git a/keyboards/binepad/bnr1/rules.mk b/keyboards/binepad/bnr1/rules.mk
deleted file mode 100755
index ce85c57404..0000000000
--- a/keyboards/binepad/bnr1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = binepad/bnr1/v2
diff --git a/keyboards/boston_meetup/rules.mk b/keyboards/boston_meetup/rules.mk
deleted file mode 100644
index 6d6745a0e5..0000000000
--- a/keyboards/boston_meetup/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = boston_meetup/2019
diff --git a/keyboards/bpiphany/frosty_flake/rules.mk b/keyboards/bpiphany/frosty_flake/rules.mk
deleted file mode 100644
index e5402b32f7..0000000000
--- a/keyboards/bpiphany/frosty_flake/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=bpiphany/frosty_flake/20140521
diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk
deleted file mode 100644
index 20adecaa08..0000000000
--- a/keyboards/bpiphany/pegasushoof/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=bpiphany/pegasushoof/2013
diff --git a/keyboards/bpiphany/unloved_bastard/readme.md b/keyboards/bpiphany/unloved_bastard/readme.md
index 9909d5af3f..b11a9bfa77 100644
--- a/keyboards/bpiphany/unloved_bastard/readme.md
+++ b/keyboards/bpiphany/unloved_bastard/readme.md
@@ -1,9 +1,5 @@
# unloved_bastard
-![unloved_bastard](imgur.com image replace me!)
-
-A short description of the keyboard/project
-
Keyboard Maintainer: [Alexander Fougner](https://github.com/fougner)
Hardware Supported: CoolerMaster Masterkeys S PBT (Not the Pro versions with backlighting etc)
Hardware Availability: Pretty much anywhere
diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk
deleted file mode 100644
index 2f66720b77..0000000000
--- a/keyboards/buzzard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = buzzard/rev1
diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/cannonkeys/db60/hotswap/rules.mk
index 3ff78857b3..0ab54aaaf7 100644
--- a/keyboards/westm/westm9/rules.mk
+++ b/keyboards/cannonkeys/db60/hotswap/rules.mk
@@ -1,4 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm9/rev2
diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/cannonkeys/db60/j02/rules.mk
index 2a716f41c4..0ab54aaaf7 100644
--- a/keyboards/westm/westm68/rules.mk
+++ b/keyboards/cannonkeys/db60/j02/rules.mk
@@ -1,4 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm68/rev2
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rev2/rules.mk
index 60addd7fe7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rev2/rules.mk
@@ -1,4 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = cannonkeys/db60/rev2
diff --git a/keyboards/clickety_split/leeloo/rules.mk b/keyboards/clickety_split/leeloo/rules.mk
deleted file mode 100644
index 9d35960f7c..0000000000
--- a/keyboards/clickety_split/leeloo/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default Folder
-DEFAULT_FOLDER = clickety_split/leeloo/rev3
diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json
deleted file mode 100644
index c5b893d757..0000000000
--- a/keyboards/converter/palm_usb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "keyboard_name": "Stowaway Converter",
- "manufacturer": "QMK",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0001",
- "device_version": "1.0.0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "features": {
- "bootmagic": false,
- "mousekey": false,
- "extrakey": false,
- "console": true,
- "command": true
- }
-}
diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/stowaway/config.h
index 84394b9f71..84394b9f71 100644
--- a/keyboards/converter/palm_usb/config.h
+++ b/keyboards/converter/palm_usb/stowaway/config.h
diff --git a/keyboards/converter/palm_usb/stowaway/keyboard.json b/keyboards/converter/palm_usb/stowaway/keyboard.json
index 9a263327ad..c93957b7d8 100644
--- a/keyboards/converter/palm_usb/stowaway/keyboard.json
+++ b/keyboards/converter/palm_usb/stowaway/keyboard.json
@@ -1,4 +1,22 @@
{
+ "keyboard_name": "Stowaway Converter",
+ "manufacturer": "QMK",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0001",
+ "device_version": "1.0.0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true,
+ "command": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/stowaway/matrix.c
index db3784df19..db3784df19 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/stowaway/matrix.c
diff --git a/keyboards/converter/palm_usb/readme.md b/keyboards/converter/palm_usb/stowaway/readme.md
index 850005d9ea..850005d9ea 100644
--- a/keyboards/converter/palm_usb/readme.md
+++ b/keyboards/converter/palm_usb/stowaway/readme.md
diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/stowaway/rules.mk
index bdb3bb0d6b..ccb8eb9ecc 100644
--- a/keyboards/converter/palm_usb/rules.mk
+++ b/keyboards/converter/palm_usb/stowaway/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = converter/palm_usb/stowaway
diff --git a/keyboards/cool836a/readme.md b/keyboards/cool836a/readme.md
index dd3ace3cbc..9473b7136a 100644
--- a/keyboards/cool836a/readme.md
+++ b/keyboards/cool836a/readme.md
@@ -28,7 +28,7 @@ git clone のあと、
-----------------
## English
-- [Here](https://github.com/telzo2000/cool836A) are a full description of this project and build guide by the great Designer: [m.ki](imgur.com image replace me!)
+- [Here](https://github.com/telzo2000/cool836A) are a full description of this project and build guide by the great Designer: m.ki
- Each virsions(A, B+, C+) of cool836A has the same circuit and that means you can install this firmware on any of them.
- However, this repository is currently(Jan 7, 2021) tested on ver.B+ (RED version) only. Feel free to contact [ME](https://github.com/ketcha-k) for any problems.
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
deleted file mode 100644
index 836587e45e..0000000000
--- a/keyboards/crkbd/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = crkbd/rev1
diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk
deleted file mode 100644
index 3d64c0af2b..0000000000
--- a/keyboards/custommk/genesis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = custommk/genesis/rev2
diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json
new file mode 100644
index 0000000000..763f6bd5b9
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/keyboard.json
@@ -0,0 +1,99 @@
+{
+ "manufacturer": "cxt_studio",
+ "keyboard_name": "cxt_studio 12E3",
+ "maintainer": "muge",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "encoder": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "F7"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "D7", "B4", "B5"],
+ "rows": ["C7", "C6", "D6", "F4"]
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F6"},
+ {"pin_a": "E6", "pin_b": "F0"},
+ {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
+ ]
+ },
+ "processor": "atmega32u4",
+ "rgb_matrix": {
+ "animations": {
+ "breathing": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "solid_reactive_simple"
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0},
+ {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0},
+ {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0},
+ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+ {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1},
+ {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1},
+ {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1},
+ {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1},
+ {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2},
+ {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2},
+ {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2},
+ {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2}
+ ]
+ },
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x12E3",
+ "vid": "0x0215"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [3, 2], "x": 4, "y": 0},
+ {"matrix": [3, 3], "x": 5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [3, 1], "x": 4, "y": 1, "w": 2, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2}
+ ]
+ }
+ }
+}
+
diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..78375680d4
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+ _BASE,
+ _RGBL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_BASE] = LAYOUT(
+ KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, MS_BTN3, RM_TOGG,
+ KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, KC_MUTE,
+ MO(1), KC_LGUI, KC_DEL, KC_APP
+ ),
+
+ [_RGBL] = LAYOUT(
+ RM_NEXT, RM_SATU, KC_INS, KC_DEL, _______, _______,
+ RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______,
+ _______, QK_BOOT, KC_PGDN, KC_END
+ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ // Encoders: Left, Right, Big
+ [_BASE] = {
+ ENCODER_CCW_CW(MS_WHLD, MS_WHLU),
+ ENCODER_CCW_CW(KC_PGDN, KC_PGUP),
+ ENCODER_CCW_CW(KC_VOLD, KC_VOLU)
+ },
+ [_RGBL] = {
+ ENCODER_CCW_CW(RM_HUED, RM_HUEU),
+ ENCODER_CCW_CW(RM_SPDD, RM_SPDU),
+ ENCODER_CCW_CW(RM_VALD, RM_VALU)
+ },
+};
+#endif
diff --git a/keyboards/cxt_studio/12e3/keymaps/default/rules.mk b/keyboards/cxt_studio/12e3/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/cxt_studio/12e3/readme.md b/keyboards/cxt_studio/12e3/readme.md
new file mode 100644
index 0000000000..8ea527f473
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/readme.md
@@ -0,0 +1,27 @@
+# cxt_studio/12e3
+
+![cxt_studio/12e3](https://i.postimg.cc/NFK8rY8N/M5rtTSP.png)
+
+3x4 ortho layout, with 3 encoders.
+
+* Keyboard Maintainer: [muge](https://github.com/muge)
+* Hardware Supported: CXT Studio 12E3
+* Hardware Availability: AliExpress, Taobao
+
+Make example for this keyboard (after setting up your build environment):
+
+ make cxt_studio/12e3:default
+
+Flashing example for this keyboard:
+
+ make cxt_studio/12e3:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB, located under the large encoder, on the right side
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. It is included in the default layout
diff --git a/keyboards/cxt_studio/12e4/config.h b/keyboards/cxt_studio/12e4/config.h
new file mode 100644
index 0000000000..de0fbad7ec
--- /dev/null
+++ b/keyboards/cxt_studio/12e4/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Colin Kinloch (@ColinKinloch)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGB_MATRIX_TYPING_HEATMAP_SPREAD 9
diff --git a/keyboards/cxt_studio/cxt_studio.c b/keyboards/cxt_studio/12e4/cxt_studio.c
index 2b36905340..03a15e4d48 100644
--- a/keyboards/cxt_studio/cxt_studio.c
+++ b/keyboards/cxt_studio/12e4/cxt_studio.c
@@ -3,8 +3,6 @@
#include "quantum.h"
-static uint8_t anim = 0;
-
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) {
@@ -21,32 +19,26 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
case 1: {
if (clockwise) {
- rgblight_increase_hue();
+ rgb_matrix_increase_hue();
} else {
- rgblight_decrease_hue();
+ rgb_matrix_decrease_hue();
}
}
break;
case 2: {
if (clockwise) {
- rgblight_increase_val();
+ rgb_matrix_increase_val();
} else {
- rgblight_decrease_val();
+ rgb_matrix_decrease_val();
}
}
break;
case 3: {
if (clockwise) {
- anim++;
+ rgb_matrix_step();
} else {
- anim--;
+ rgb_matrix_step_reverse();
}
- if (anim >= RGB_MATRIX_EFFECT_MAX) {
- anim = 0;
- } else if (anim < 0) {
- anim = RGB_MATRIX_EFFECT_MAX - 1;
- }
- rgblight_mode(anim);
}
break;
}
diff --git a/keyboards/cxt_studio/keyboard.json b/keyboards/cxt_studio/12e4/keyboard.json
index 7ee7b52d50..b48e75f4ca 100644
--- a/keyboards/cxt_studio/keyboard.json
+++ b/keyboards/cxt_studio/12e4/keyboard.json
@@ -1,6 +1,6 @@
{
"manufacturer": "CXT",
- "keyboard_name": "cxt_studio",
+ "keyboard_name": "cxt_studio 12E4",
"maintainer": "ColinKinloch",
"bootloader": "atmel-dfu",
"diode_direction": "ROW2COL",
diff --git a/keyboards/cxt_studio/keymaps/default/keymap.json b/keyboards/cxt_studio/12e4/keymaps/default/keymap.json
index 9e31833520..b05d3ba179 100644
--- a/keyboards/cxt_studio/keymaps/default/keymap.json
+++ b/keyboards/cxt_studio/12e4/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "cxt_studio",
+ "keyboard": "cxt_studio/12e4",
"keymap": "default",
"layout": "LAYOUT",
"layers": [
diff --git a/keyboards/cxt_studio/readme.md b/keyboards/cxt_studio/12e4/readme.md
index 6397a3fdfd..760c3544b4 100644
--- a/keyboards/cxt_studio/readme.md
+++ b/keyboards/cxt_studio/12e4/readme.md
@@ -1,20 +1,20 @@
-# cxt_studio
+# cxt_studio/12e4
-![cxt_studio](https://i.imgur.com/AMCTioSh.jpeg)
+![cxt_studio/12e4](https://i.imgur.com/AMCTioSh.jpeg)
3x4 ortho rgb lighting 4 knobs.
* Keyboard Maintainer: [Colin Kinloch](https://github.com/ColinKinloch)
-* Hardware Supported: CXT-Studio
+* Hardware Supported: CXT-Studio/12E4
* Hardware Availability: AliExpress. I think the manufacturer is on Taobao.
Make example for this keyboard (after setting up your build environment):
- make cxt_studio:default
+ make cxt_studio/12e4:default
Flashing example for this keyboard:
- make cxt_studio:default:flash
+ make cxt_studio/12e4:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/cxt_studio/config.h b/keyboards/cxt_studio/config.h
deleted file mode 100644
index e56e07a254..0000000000
--- a/keyboards/cxt_studio/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2023 Colin Kinloch (@ColinKinloch)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGB_MATRIX_TYPING_HEATMAP_SPREAD 9
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/bat43/rules.mk b/keyboards/dailycraft/bat43/rules.mk
deleted file mode 100644
index b152851948..0000000000
--- a/keyboards/dailycraft/bat43/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dailycraft/bat43/rev2
diff --git a/keyboards/dailycraft/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk
deleted file mode 100644
index 0344b3ee28..0000000000
--- a/keyboards/dailycraft/claw44/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dailycraft/claw44/rev1
diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk
deleted file mode 100644
index c62f01e18f..0000000000
--- a/keyboards/dailycraft/sandbox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dailycraft/sandbox/rev2
diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk
deleted file mode 100644
index b027fec9b9..0000000000
--- a/keyboards/dailycraft/wings42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dailycraft/wings42/rev2
diff --git a/keyboards/darkproject/kd83a_bfg_edition/config.h b/keyboards/darkproject/kd83a_bfg_edition/config.h
index 880aabd5d7..fce00d29ab 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd83a_bfg_edition/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_CS_PIN_2 B15
diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h
index a32f712231..9e68844daf 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_CS_PIN_2 B15
diff --git a/keyboards/delikeeb/vanana/rules.mk b/keyboards/delikeeb/vanana/rules.mk
deleted file mode 100644
index ff3dc1df61..0000000000
--- a/keyboards/delikeeb/vanana/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = delikeeb/vanana/rev2
diff --git a/keyboards/delikeeb/waaffle/rev3/rules.mk b/keyboards/delikeeb/waaffle/rev3/rules.mk
deleted file mode 100644
index dbd58ca5bf..0000000000
--- a/keyboards/delikeeb/waaffle/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = delikeeb/waaffle/rev3/pro_micro
diff --git a/keyboards/deltapad/readme.md b/keyboards/deltapad/readme.md
index 858f99b436..f5dae4d9b0 100644
--- a/keyboards/deltapad/readme.md
+++ b/keyboards/deltapad/readme.md
@@ -1,15 +1,10 @@
# deltapad
-
-
-*A short description of the keyboard/project*
-
A 4x4 keypad
* Keyboard Maintainer: [Richard Snijder](https://github.com/rich239)
* Hardware Supported: Atmel 32u4 based keypads
-
Make example for this keyboard (after setting up your build environment):
make deltapad:default
diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk
deleted file mode 100644
index ee888337e5..0000000000
--- a/keyboards/deltasplit75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = deltasplit75/v2
diff --git a/keyboards/dp3000/rules.mk b/keyboards/dp3000/rules.mk
deleted file mode 100644
index 0f44aefd44..0000000000
--- a/keyboards/dp3000/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dp3000/rev1
diff --git a/keyboards/drhigsby/ogurec/rules.mk b/keyboards/drhigsby/ogurec/rules.mk
deleted file mode 100644
index ed83fb6386..0000000000
--- a/keyboards/drhigsby/ogurec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = drhigsby/ogurec/left_pm
diff --git a/keyboards/duck/jetfire/readme.md b/keyboards/duck/jetfire/readme.md
index 8de2f5ced6..2e12315d6b 100644
--- a/keyboards/duck/jetfire/readme.md
+++ b/keyboards/duck/jetfire/readme.md
@@ -1,7 +1,5 @@
# Jetfire
-![jetfire](imgur.com image replace me!)
-
The Duck Jetfire is a hybrid full size and 1800 layout keyboard that went on
Group Buy in November 2017.
diff --git a/keyboards/duck/octagon/rules.mk b/keyboards/duck/octagon/rules.mk
deleted file mode 100644
index 46bd457bb7..0000000000
--- a/keyboards/duck/octagon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = duck/octagon/v2 \ No newline at end of file
diff --git a/keyboards/duck/orion/rules.mk b/keyboards/duck/orion/rules.mk
deleted file mode 100644
index 3788e0fbfb..0000000000
--- a/keyboards/duck/orion/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = duck/orion/v3
diff --git a/keyboards/ducky/one2mini/rules.mk b/keyboards/ducky/one2mini/rules.mk
deleted file mode 100644
index 628be832ee..0000000000
--- a/keyboards/ducky/one2mini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ducky/one2mini/1861st
diff --git a/keyboards/ducky/one2sf/rules.mk b/keyboards/ducky/one2sf/rules.mk
deleted file mode 100644
index 0c9ddb957f..0000000000
--- a/keyboards/ducky/one2sf/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ducky/one2sf/1967st
diff --git a/keyboards/dumbpad/rules.mk b/keyboards/dumbpad/rules.mk
deleted file mode 100644
index 87ec1ab01b..0000000000
--- a/keyboards/dumbpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dumbpad/v0x
diff --git a/keyboards/durgod/galaxy/rules.mk b/keyboards/durgod/galaxy/rules.mk
deleted file mode 100644
index ff1e1ff205..0000000000
--- a/keyboards/durgod/galaxy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=durgod/dgk6x/galaxy
diff --git a/keyboards/durgod/venus/rules.mk b/keyboards/durgod/venus/rules.mk
deleted file mode 100644
index 57acf2a48c..0000000000
--- a/keyboards/durgod/venus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=durgod/dgk6x/venus
diff --git a/keyboards/dztech/tofu/ii/rules.mk b/keyboards/dztech/tofu/ii/rules.mk
deleted file mode 100644
index c08cfdaae9..0000000000
--- a/keyboards/dztech/tofu/ii/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dztech/tofu/ii/v1
diff --git a/keyboards/dztech/tofu/jr/rules.mk b/keyboards/dztech/tofu/jr/rules.mk
deleted file mode 100644
index 7333c613fd..0000000000
--- a/keyboards/dztech/tofu/jr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = dztech/tofu/jr/v1
diff --git a/keyboards/eco/rules.mk b/keyboards/eco/rules.mk
deleted file mode 100644
index a3d419658b..0000000000
--- a/keyboards/eco/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = eco/rev2
diff --git a/keyboards/eek/rules.mk b/keyboards/eek/rules.mk
deleted file mode 100644
index 65b8265b53..0000000000
--- a/keyboards/eek/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = eek/silk_down
diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk
deleted file mode 100644
index 8eb40c77d5..0000000000
--- a/keyboards/ergoslab/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ergoslab/rev1
diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk
deleted file mode 100644
index 3f30277bb5..0000000000
--- a/keyboards/ergotravel/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ergotravel/rev1
diff --git a/keyboards/ericrlau/numdiscipline/readme.md b/keyboards/ericrlau/numdiscipline/readme.md
index bd040df2a5..9770432e56 100644
--- a/keyboards/ericrlau/numdiscipline/readme.md
+++ b/keyboards/ericrlau/numdiscipline/readme.md
@@ -13,7 +13,6 @@ A modified version of the through hole 65% Discipline keyboard by cftkb.
Other Information:
* Keyboard Maintainer: [ELau](https://github.com/ericrlau)
-* Hardware Supported: The PCBs, controllers supported
* Hardware Availability: https://github.com/ericrlau/NumDiscipline
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/evyd13/atom47/rules.mk b/keyboards/evyd13/atom47/rules.mk
deleted file mode 100644
index 9d5b753077..0000000000
--- a/keyboards/evyd13/atom47/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = evyd13/atom47/rev4
diff --git a/keyboards/exclusive/e85/rules.mk b/keyboards/exclusive/e85/rules.mk
deleted file mode 100644
index 8eef46d0ab..0000000000
--- a/keyboards/exclusive/e85/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = exclusive/e85/hotswap
diff --git a/keyboards/ferris/0_1/matrix.c b/keyboards/ferris/0_1/matrix.c
index a3e2bebba6..c05b193c1a 100644
--- a/keyboards/ferris/0_1/matrix.c
+++ b/keyboards/ferris/0_1/matrix.c
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "i2c_master.h"
extern i2c_status_t mcp23017_status;
-#define I2C_TIMEOUT 1000
+#define MCP23017_I2C_TIMEOUT 1000
// For a better understanding of the i2c protocol, this is a good read:
// https://www.robot-electronics.co.uk/i2c-tutorial
@@ -41,9 +41,7 @@ extern i2c_status_t mcp23017_status;
// All address pins of the mcp23017 are connected to the ground on the ferris
// | 0 | 1 | 0 | 0 | A2 | A1 | A0 |
// | 0 | 1 | 0 | 0 | 0 | 0 | 0 |
-#define I2C_ADDR 0b0100000
-#define I2C_ADDR_WRITE ((I2C_ADDR << 1) | I2C_WRITE)
-#define I2C_ADDR_READ ((I2C_ADDR << 1) | I2C_READ)
+#define I2C_ADDR (0b0100000 << 1)
// Register addresses
// See https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library/blob/master/Adafruit_MCP23017.h
@@ -51,8 +49,8 @@ extern i2c_status_t mcp23017_status;
#define IODIRB 0x01
#define GPPUA 0x0C // GPIO pull-up resistor register
#define GPPUB 0x0D
-#define GPIOA 0x12 // general purpose i/o port register (write modifies OLAT)
-#define GPIOB 0x13
+#define MCP23017_GPIOA 0x12 // general purpose i/o port register (write modifies OLAT)
+#define MCP23017_GPIOB 0x13
#define OLATA 0x14 // output latch register
#define OLATB 0x15
@@ -60,14 +58,14 @@ bool i2c_initialized = 0;
i2c_status_t mcp23017_status = I2C_ADDR;
uint8_t init_mcp23017(void) {
- print("starting init");
+ print("init mcp23017\n");
mcp23017_status = I2C_ADDR;
// I2C subsystem
if (i2c_initialized == 0) {
i2c_init(); // on pins D(1,0)
i2c_initialized = true;
- wait_ms(I2C_TIMEOUT);
+ wait_ms(MCP23017_I2C_TIMEOUT);
}
// set pin direction
@@ -76,8 +74,10 @@ uint8_t init_mcp23017(void) {
// - driving : output : 0
// This means: we will read all the bits on GPIOA
// This means: we will write to the pins 0-4 on GPIOB (in select_rows)
- uint8_t buf[] = {IODIRA, 0b11111111, 0b11110000};
- mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+ uint8_t buf[] = {0b11111111, 0b11110000};
+ print("before transmit\n");
+ mcp23017_status = i2c_write_register(I2C_ADDR, IODIRA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT);
+ uprintf("after transmit %i\n", mcp23017_status);
if (!mcp23017_status) {
// set pull-up
// - unused : on : 1
@@ -85,8 +85,8 @@ uint8_t init_mcp23017(void) {
// - driving : off : 0
// This means: we will read all the bits on GPIOA
// This means: we will write to the pins 0-4 on GPIOB (in select_rows)
- uint8_t pullup_buf[] = {GPPUA, 0b11111111, 0b11110000};
- mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, pullup_buf, sizeof(pullup_buf), I2C_TIMEOUT);
+ mcp23017_status = i2c_write_register(I2C_ADDR, GPPUA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT);
+ uprintf("after transmit2 %i\n", mcp23017_status);
}
return mcp23017_status;
}
@@ -144,12 +144,12 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
// if (++mcp23017_reset_loop >= 1300) {
// since mcp23017_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans
// this will be approx bit more frequent than once per second
- dprint("trying to reset mcp23017\n");
+ print("trying to reset mcp23017\n");
mcp23017_status = init_mcp23017();
if (mcp23017_status) {
- dprint("right side not responding\n");
+ print("right side not responding\n");
} else {
- dprint("right side attached\n");
+ print("right side attached\n");
}
}
}
@@ -204,18 +204,13 @@ static matrix_row_t read_cols(uint8_t row) {
if (mcp23017_status) { // if there was an error
return 0;
} else {
- uint8_t buf[] = {GPIOA};
- mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
// We read all the pins on GPIOA.
// The initial state was all ones and any depressed key at a given column for the currently selected row will have its bit flipped to zero.
// The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys.
// Since the pins connected to eact columns are sequential, and counting from zero up (col 5 -> GPIOA0, col 6 -> GPIOA1 and so on), the only transformation needed is a bitwise not to swap all zeroes and ones.
uint8_t data[] = {0};
- if (!mcp23017_status) {
- mcp23017_status = i2c_receive(I2C_ADDR_READ, data, sizeof(data), I2C_TIMEOUT);
- data[0] = ~(data[0]);
- }
- return data[0];
+ mcp23017_status = i2c_read_register(I2C_ADDR, MCP23017_GPIOA, data, sizeof(data), MCP23017_I2C_TIMEOUT);
+ return ~data[0];
}
}
}
@@ -236,7 +231,7 @@ static void unselect_rows(void) {
static void select_row(uint8_t row) {
if (row < MATRIX_ROWS_PER_SIDE) {
- // select on atmega32u4
+ // select on MCU
pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU;
pin_t pin = matrix_row_pins_mcu[row];
gpio_set_pin_output(pin);
@@ -248,8 +243,8 @@ static void select_row(uint8_t row) {
} else {
// Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
// Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
- uint8_t buf[] = {GPIOB, 0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))};
- mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+ uint8_t buf[] = {0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))};
+ mcp23017_status = i2c_write_register(I2C_ADDR, MCP23017_GPIOB, buf, sizeof(buf), MCP23017_I2C_TIMEOUT);
}
}
}
diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c
index 74fab717a1..76bbcaf7b5 100644
--- a/keyboards/ferris/0_2/matrix.c
+++ b/keyboards/ferris/0_2/matrix.c
@@ -30,8 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern i2c_status_t mcp23017_status;
#define MCP23017_I2C_TIMEOUT 1000
-#define I2C_WRITE 0x00
-#define I2C_READ 0x01
+
// For a better understanding of the i2c protocol, this is a good read:
// https://www.robot-electronics.co.uk/i2c-tutorial
diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk
deleted file mode 100644
index ef158b8cf0..0000000000
--- a/keyboards/fortitude60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = fortitude60/rev1
diff --git a/keyboards/fruitykeeb/fruitbar/r1/rules.mk b/keyboards/fruitykeeb/fruitbar/r1/rules.mk
deleted file mode 100644
index 3328de6095..0000000000
--- a/keyboards/fruitykeeb/fruitbar/r1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = fruitykeeb/fruitbar/r1/promicro
diff --git a/keyboards/ghs/jem/rules.mk b/keyboards/ghs/jem/rules.mk
deleted file mode 100644
index e96c00e5c0..0000000000
--- a/keyboards/ghs/jem/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ghs/jem/soldered
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index 1b246e4f3f..852d29df65 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_CS_PIN_2 B15
diff --git a/keyboards/hadron/rules.mk b/keyboards/hadron/rules.mk
deleted file mode 100644
index 8498675750..0000000000
--- a/keyboards/hadron/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = hadron/ver2
diff --git a/keyboards/handwired/bento/rules.mk b/keyboards/handwired/bento/rules.mk
deleted file mode 100644
index e160faab83..0000000000
--- a/keyboards/handwired/bento/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/bento/rev1
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
deleted file mode 100644
index 29194b429e..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro
diff --git a/keyboards/ergodox_stm32/board.h b/keyboards/handwired/ergodox_stm32/board.h
index c1c37c0659..c1c37c0659 100644
--- a/keyboards/ergodox_stm32/board.h
+++ b/keyboards/handwired/ergodox_stm32/board.h
diff --git a/keyboards/ergodox_stm32/chconf.h b/keyboards/handwired/ergodox_stm32/chconf.h
index bc3672f6f7..bc3672f6f7 100644
--- a/keyboards/ergodox_stm32/chconf.h
+++ b/keyboards/handwired/ergodox_stm32/chconf.h
diff --git a/keyboards/ergodox_stm32/config.h b/keyboards/handwired/ergodox_stm32/config.h
index f4f81e30bd..f4f81e30bd 100644
--- a/keyboards/ergodox_stm32/config.h
+++ b/keyboards/handwired/ergodox_stm32/config.h
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/handwired/ergodox_stm32/ergodox_stm32.c
index 99d51866f7..99d51866f7 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/handwired/ergodox_stm32/ergodox_stm32.c
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.h b/keyboards/handwired/ergodox_stm32/ergodox_stm32.h
index 5a736ad818..5a736ad818 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.h
+++ b/keyboards/handwired/ergodox_stm32/ergodox_stm32.h
diff --git a/keyboards/ergodox_stm32/halconf.h b/keyboards/handwired/ergodox_stm32/halconf.h
index 71a1596c47..71a1596c47 100644
--- a/keyboards/ergodox_stm32/halconf.h
+++ b/keyboards/handwired/ergodox_stm32/halconf.h
diff --git a/keyboards/ergodox_stm32/keyboard.json b/keyboards/handwired/ergodox_stm32/keyboard.json
index 49c0a858d4..49c0a858d4 100644
--- a/keyboards/ergodox_stm32/keyboard.json
+++ b/keyboards/handwired/ergodox_stm32/keyboard.json
diff --git a/keyboards/ergodox_stm32/keymaps/default/keymap.c b/keyboards/handwired/ergodox_stm32/keymaps/default/keymap.c
index 001d74b18d..001d74b18d 100644
--- a/keyboards/ergodox_stm32/keymaps/default/keymap.c
+++ b/keyboards/handwired/ergodox_stm32/keymaps/default/keymap.c
diff --git a/keyboards/ergodox_stm32/ld/stm32f103_bootloader.ld b/keyboards/handwired/ergodox_stm32/ld/stm32f103_bootloader.ld
index 77100fce38..77100fce38 100644
--- a/keyboards/ergodox_stm32/ld/stm32f103_bootloader.ld
+++ b/keyboards/handwired/ergodox_stm32/ld/stm32f103_bootloader.ld
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/handwired/ergodox_stm32/matrix.c
index 6acd2dda22..6acd2dda22 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/handwired/ergodox_stm32/matrix.c
diff --git a/keyboards/ergodox_stm32/mcuconf.h b/keyboards/handwired/ergodox_stm32/mcuconf.h
index 0494526e5e..0494526e5e 100644
--- a/keyboards/ergodox_stm32/mcuconf.h
+++ b/keyboards/handwired/ergodox_stm32/mcuconf.h
diff --git a/keyboards/ergodox_stm32/readme.md b/keyboards/handwired/ergodox_stm32/readme.md
index f8b9c4c553..84accbb5fe 100644
--- a/keyboards/ergodox_stm32/readme.md
+++ b/keyboards/handwired/ergodox_stm32/readme.md
@@ -4,6 +4,6 @@
Make example for this keyboard (after setting up your build environment):
- make ergodox_stm32:default
+ make handwired/ergodox_stm32:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/handwired/ergodox_stm32/rules.mk
index a4e9df8c6a..a4e9df8c6a 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/handwired/ergodox_stm32/rules.mk
diff --git a/keyboards/handwired/fc200rt_qmk/readme.md b/keyboards/handwired/fc200rt_qmk/readme.md
index 6490227806..2b7a0dd1ec 100644
--- a/keyboards/handwired/fc200rt_qmk/readme.md
+++ b/keyboards/handwired/fc200rt_qmk/readme.md
@@ -25,7 +25,6 @@ Choose any key from the corrosponding row and column and solder it to the pin on
_NOTE: Some of the keys had mislabled columns and rows, so make sure the columns are all connected without diodes to one another, and that the rows are soldered after the diode_
* Keyboard Maintainer: [NaCly](https://github.com/Na-Cly)
-* Hardware Supported: The PCBs, controllers supported
* Hardware Availability: Leopold FC200RT + Teensy 2.0
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
new file mode 100644
index 0000000000..6e47ffcd67
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
@@ -0,0 +1,2 @@
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
deleted file mode 100644
index cdf3900ff0..0000000000
--- a/keyboards/handwired/meck_tkl/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
-
-DEFAULT_FOLDER = handwired/meck_tkl/blackpill_f401
diff --git a/keyboards/handwired/ms_sculpt_mobile/rules.mk b/keyboards/handwired/ms_sculpt_mobile/rules.mk
deleted file mode 100644
index 8a3cc6858c..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/ms_sculpt_mobile/teensy2pp
diff --git a/keyboards/handwired/novem/readme.md b/keyboards/handwired/novem/readme.md
index c259c2cb82..4ccf815236 100644
--- a/keyboards/handwired/novem/readme.md
+++ b/keyboards/handwired/novem/readme.md
@@ -2,8 +2,6 @@
![novem](https://i.imgur.com/nPjBE9b.jpg)
-A short description of the keyboard/project
-
* Keyboard Maintainer: [Jose I. Martinez](https://github.com/mechanicalguy21)
* Hardware Supported: This is a handwired keyboard created over a 3d printed case.
STL will be shared soon.
diff --git a/keyboards/handwired/onekey/at_start_f415/board.h b/keyboards/handwired/onekey/at_start_f415/board.h
index f4adc2d418..a31d8f8e37 100644
--- a/keyboards/handwired/onekey/at_start_f415/board.h
+++ b/keyboards/handwired/onekey/at_start_f415/board.h
@@ -1,5 +1,5 @@
-// Copyright 2023-2024 HorrorTroll <https://github.com/HorrorTroll>
-// Copyright 2023-2024 Zhaqian <https://github.com/zhaqian12>
+// Copyright 2023-2025 HorrorTroll <https://github.com/HorrorTroll>
+// Copyright 2023-2025 Zhaqian <https://github.com/zhaqian12>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/handwired/onekey/at_start_f415/config.h b/keyboards/handwired/onekey/at_start_f415/config.h
index 0e47e813c5..41aece900c 100644
--- a/keyboards/handwired/onekey/at_start_f415/config.h
+++ b/keyboards/handwired/onekey/at_start_f415/config.h
@@ -1,5 +1,5 @@
-// Copyright 2023-2024 HorrorTroll <https://github.com/HorrorTroll>
-// Copyright 2023-2024 Zhaqian <https://github.com/zhaqian12>
+// Copyright 2023-2025 HorrorTroll <https://github.com/HorrorTroll>
+// Copyright 2023-2025 Zhaqian <https://github.com/zhaqian12>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/handwired/onekey/at_start_f415/halconf.h b/keyboards/handwired/onekey/at_start_f415/halconf.h
index 1423633d15..e3c075936d 100644
--- a/keyboards/handwired/onekey/at_start_f415/halconf.h
+++ b/keyboards/handwired/onekey/at_start_f415/halconf.h
@@ -1,5 +1,5 @@
-// Copyright 2023-2024 HorrorTroll <https://github.com/HorrorTroll>
-// Copyright 2023-2024 Zhaqian <https://github.com/zhaqian12>
+// Copyright 2023-2025 HorrorTroll <https://github.com/HorrorTroll>
+// Copyright 2023-2025 Zhaqian <https://github.com/zhaqian12>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/handwired/onekey/at_start_f415/keyboard.json b/keyboards/handwired/onekey/at_start_f415/keyboard.json
index f598923a6a..6e5683a474 100644
--- a/keyboards/handwired/onekey/at_start_f415/keyboard.json
+++ b/keyboards/handwired/onekey/at_start_f415/keyboard.json
@@ -17,4 +17,8 @@
"ws2812": {
"pin": "B0"
}
+ "apa102": {
+ "data_pin": "B0",
+ "clock_pin": "B1"
+ }
}
diff --git a/keyboards/handwired/onekey/at_start_f415/mcuconf.h b/keyboards/handwired/onekey/at_start_f415/mcuconf.h
index 9bc11d507c..246f6762d3 100644
--- a/keyboards/handwired/onekey/at_start_f415/mcuconf.h
+++ b/keyboards/handwired/onekey/at_start_f415/mcuconf.h
@@ -1,5 +1,5 @@
-// Copyright 2023-2024 HorrorTroll <https://github.com/HorrorTroll>
-// Copyright 2023-2024 Zhaqian <https://github.com/zhaqian12>
+// Copyright 2023-2025 HorrorTroll <https://github.com/HorrorTroll>
+// Copyright 2023-2025 Zhaqian <https://github.com/zhaqian12>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/handwired/onekey/keymaps/community_module/keymap.c b/keyboards/handwired/onekey/keymaps/community_module/keymap.c
new file mode 100644
index 0000000000..5115a9fea0
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/community_module/keymap.c
@@ -0,0 +1,7 @@
+// Copyright 2025 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ LAYOUT_ortho_1x1(CM_HELO)
+};
diff --git a/keyboards/handwired/onekey/keymaps/community_module/keymap.json b/keyboards/handwired/onekey/keymaps/community_module/keymap.json
new file mode 100644
index 0000000000..e3b4051b9e
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/community_module/keymap.json
@@ -0,0 +1,3 @@
+{
+ "modules": ["qmk/hello_world"]
+}
diff --git a/keyboards/handwired/onekey/rules.mk b/keyboards/handwired/onekey/rules.mk
deleted file mode 100644
index 2094801ed9..0000000000
--- a/keyboards/handwired/onekey/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/onekey/promicro
diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk
deleted file mode 100644
index 9299a64d61..0000000000
--- a/keyboards/handwired/pill60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/pill60/bluepill
diff --git a/keyboards/handwired/postageboard/rules.mk b/keyboards/handwired/postageboard/rules.mk
deleted file mode 100644
index a7fcf6bea6..0000000000
--- a/keyboards/handwired/postageboard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=handwired/postageboard/mini
diff --git a/keyboards/handwired/qc60/rules.mk b/keyboards/handwired/qc60/rules.mk
deleted file mode 100644
index 4905848cf9..0000000000
--- a/keyboards/handwired/qc60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/qc60/proto
diff --git a/keyboards/handwired/sono1/rules.mk b/keyboards/handwired/sono1/rules.mk
deleted file mode 100644
index 9b472f28f2..0000000000
--- a/keyboards/handwired/sono1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/sono1/t2pp
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
deleted file mode 100644
index ae4d823b53..0000000000
--- a/keyboards/handwired/splittest/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/splittest/promicro
diff --git a/keyboards/handwired/stef9998/split_5x7/rules.mk b/keyboards/handwired/stef9998/split_5x7/rules.mk
deleted file mode 100644
index f06c490f00..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1
diff --git a/keyboards/handwired/symmetric70_proto/promicro/rules.mk b/keyboards/handwired/symmetric70_proto/promicro/rules.mk
deleted file mode 100644
index 7aa985b3f1..0000000000
--- a/keyboards/handwired/symmetric70_proto/promicro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/symmetric70_proto/promicro/base
diff --git a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk
deleted file mode 100644
index 28c4536e4b..0000000000
--- a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/symmetric70_proto/proton_c/base
diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk
deleted file mode 100644
index d4536e0cbb..0000000000
--- a/keyboards/handwired/unk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/unk/rev1
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
deleted file mode 100644
index 6cc6b4d1de..0000000000
--- a/keyboards/handwired/xealous/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-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 <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define USE_I2C
-#define SCL_CLOCK 800000UL
-
-//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
-
-#ifdef AUDIO_ENABLE
- #define AUDIO_PIN C6
- #define STARTUP_SONG SONG(STARTUP_SOUND)
- #define NO_MUSIC_MODE
- #define TONE_QWERTY SONG(Q__NOTE(_E4));
- #define TONE_NUMPAD SONG(Q__NOTE(_D4));
-#endif
diff --git a/keyboards/handwired/xealous/matrix.c b/keyboards/handwired/xealous/matrix.c
deleted file mode 100644
index b8ae9fd738..0000000000
--- a/keyboards/handwired/xealous/matrix.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "timer.h"
-
-// Copy this code to split_common/matrix.c,
-// and call it instead of the unoptimized col_reader. Scan-rate jumps from 1200->1920
-// Also remove the sleep_us(30), not necessary for this keyboard.
-// In usb_descriptor.c, set .PollingIntervalMS = 0x01
-#define ROW_SHIFTER ((uint8_t)1)
-inline static matrix_row_t optimized_col_reader(void) {
- //MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
- return (PINB & (1 << 6) ? 0 : (ROW_SHIFTER << 0)) |
- (PINB & (1 << 2) ? 0 : (ROW_SHIFTER << 1)) |
- (PINB & (1 << 3) ? 0 : (ROW_SHIFTER << 2)) |
- (PINB & (1 << 1) ? 0 : (ROW_SHIFTER << 3)) |
- (PINF & (1 << 7) ? 0 : (ROW_SHIFTER << 4)) |
- (PINF & (1 << 6) ? 0 : (ROW_SHIFTER << 5)) |
- (PINF & (1 << 5) ? 0 : (ROW_SHIFTER << 6)) |
- (PINF & (1 << 4) ? 0 : (ROW_SHIFTER << 7));
-}
-
-
diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h
index 49be10cce4..2ea66a692c 100644
--- a/keyboards/handwired/xealous/rev1/config.h
+++ b/keyboards/handwired/xealous/rev1/config.h
@@ -18,6 +18,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
+#define USE_I2C
+#define SCL_CLOCK 800000UL
+
+//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
+
+#ifdef AUDIO_ENABLE
+ #define AUDIO_PIN C6
+ #define STARTUP_SONG SONG(STARTUP_SOUND)
+ #define NO_MUSIC_MODE
+ #define TONE_QWERTY SONG(Q__NOTE(_E4));
+ #define TONE_NUMPAD SONG(Q__NOTE(_D4));
+#endif
+
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
deleted file mode 100644
index 4a97d066df..0000000000
--- a/keyboards/handwired/xealous/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += matrix.c
-
-DEFAULT_FOLDER = handwired/xealous/rev1
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk
index 841565b846..94eaaab9c0 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/32u2/rules.mk
@@ -2,5 +2,3 @@ CUSTOM_MATRIX = yes
# project specific files
SRC = matrix.c
-
-DEFAULT_FOLDER = hhkb/ansi/32u4
diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk
new file mode 100644
index 0000000000..94eaaab9c0
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u4/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = yes
+
+# project specific files
+SRC = matrix.c
diff --git a/keyboards/hillside/46/rules.mk b/keyboards/hillside/46/rules.mk
deleted file mode 100644
index f3e926a8dc..0000000000
--- a/keyboards/hillside/46/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = hillside/46/0_1 \ No newline at end of file
diff --git a/keyboards/hillside/48/rules.mk b/keyboards/hillside/48/rules.mk
deleted file mode 100644
index d8d69d9ec1..0000000000
--- a/keyboards/hillside/48/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = hillside/48/0_1
diff --git a/keyboards/hillside/52/rules.mk b/keyboards/hillside/52/rules.mk
deleted file mode 100644
index 402bc6bb95..0000000000
--- a/keyboards/hillside/52/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = hillside/52/0_1
diff --git a/keyboards/hineybush/h75_singa/readme.md b/keyboards/hineybush/h75_singa/readme.md
index 815785834c..b110fd5b14 100644
--- a/keyboards/hineybush/h75_singa/readme.md
+++ b/keyboards/hineybush/h75_singa/readme.md
@@ -1,7 +1,5 @@
# h75_singa
-![h75_singa](imgur.com image replace me!) - TBD
-
New 75% PCB for Singa Keyboards
* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c
index cb4854d8d1..34a878c769 100644
--- a/keyboards/ibm/model_m/mschwingen/mschwingen.c
+++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c
@@ -19,9 +19,12 @@
#include "uart.h"
#include "print.h"
#include "sendchar.h"
-#include "ws2812.h"
#include "sleep_led.h"
+#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812
+#include "ws2812.h"
+#endif
+
#ifdef UART_DEBUG
# undef sendchar
static int8_t capture_sendchar(uint8_t c) {
diff --git a/keyboards/ibnuda/squiggle/rules.mk b/keyboards/ibnuda/squiggle/rules.mk
deleted file mode 100644
index 0214333999..0000000000
--- a/keyboards/ibnuda/squiggle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ibnuda/squiggle/rev1
diff --git a/keyboards/idobao/id80/v1/rules.mk b/keyboards/idobao/id80/v1/rules.mk
deleted file mode 100644
index 20283f04be..0000000000
--- a/keyboards/idobao/id80/v1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Defalt to the ansi version
-DEFAULT_FOLDER = idobao/id80/v2/ansi
diff --git a/keyboards/idobao/id80/v3/rules.mk b/keyboards/idobao/id80/v3/rules.mk
deleted file mode 100644
index 218fc05539..0000000000
--- a/keyboards/idobao/id80/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Defalt to the ansi version
-DEFAULT_FOLDER = idobao/id80/v3/ansi
diff --git a/keyboards/inett_studio/sq80/rules.mk b/keyboards/inett_studio/sq80/rules.mk
deleted file mode 100644
index d4f8260d93..0000000000
--- a/keyboards/inett_studio/sq80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = inett_studio/sq80/hotswap_layout_i
diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
deleted file mode 100644
index 9c4b1e74c2..0000000000
--- a/keyboards/input_club/infinity60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = input_club/infinity60/led
diff --git a/keyboards/jacky_studio/bear_65/rules.mk b/keyboards/jacky_studio/bear_65/rules.mk
deleted file mode 100644
index 91bb6f74b9..0000000000
--- a/keyboards/jacky_studio/bear_65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jacky_studio/bear_65/rev1
diff --git a/keyboards/jacky_studio/piggy60/rev1/rules.mk b/keyboards/jacky_studio/piggy60/rev1/rules.mk
deleted file mode 100644
index 873e9334ed..0000000000
--- a/keyboards/jacky_studio/piggy60/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jacky_studio/piggy60/rules.mk b/keyboards/jacky_studio/piggy60/rules.mk
deleted file mode 100644
index 873e9334ed..0000000000
--- a/keyboards/jacky_studio/piggy60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk
deleted file mode 100644
index 2bbb2a41ce..0000000000
--- a/keyboards/jadookb/jkb65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jadookb/jkb65/r1
diff --git a/keyboards/jian/rules.mk b/keyboards/jian/rules.mk
deleted file mode 100644
index c19fa00b5c..0000000000
--- a/keyboards/jian/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jian/rev2
diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk
deleted file mode 100644
index 3ffe13302d..0000000000
--- a/keyboards/jiran/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jiran/rev1
diff --git a/keyboards/jones/rules.mk b/keyboards/jones/rules.mk
deleted file mode 100644
index 9f0da2abec..0000000000
--- a/keyboards/jones/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jones/v1
diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk
deleted file mode 100644
index c43649b348..0000000000
--- a/keyboards/jorne/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jorne/rev1
diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h
index d8dfb9f535..41534ce6c4 100644
--- a/keyboards/jukaie/jk01/config.h
+++ b/keyboards/jukaie/jk01/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_CS_PIN_2 B15
diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk
deleted file mode 100644
index bb94741e5a..0000000000
--- a/keyboards/junco/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = junco/rev1
diff --git a/keyboards/kakunpc/angel17/rules.mk b/keyboards/kakunpc/angel17/rules.mk
deleted file mode 100644
index 48095d37e6..0000000000
--- a/keyboards/kakunpc/angel17/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kakunpc/angel17/rev1
diff --git a/keyboards/kakunpc/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk
new file mode 100644
index 0000000000..09c02c88b0
--- /dev/null
+++ b/keyboards/kakunpc/angel64/alpha/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c
diff --git a/keyboards/kakunpc/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk
new file mode 100644
index 0000000000..09c02c88b0
--- /dev/null
+++ b/keyboards/kakunpc/angel64/rev1/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c
diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
deleted file mode 100644
index c95d5297bd..0000000000
--- a/keyboards/kakunpc/angel64/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CUSTOM_MATRIX = yes
-
-SRC += matrix.c
-
-DEFAULT_FOLDER = kakunpc/angel64/rev1
diff --git a/keyboards/kakunpc/business_card/readme.md b/keyboards/kakunpc/business_card/readme.md
index cbd05af410..98fdf1be90 100644
--- a/keyboards/kakunpc/business_card/readme.md
+++ b/keyboards/kakunpc/business_card/readme.md
@@ -1,12 +1,6 @@
# business_card
-![business_card](imgur.com image replace me!)
-
-A short description of the keyboard/project
-
-Keyboard Maintainer: [kakunpc](https://github.com/kakunpc)
-Hardware Supported: The PCBs, controllers supported
-Hardware Availability: links to where you can find this hardware
+* Keyboard Maintainer: [kakunpc](https://github.com/kakunpc)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/kakunpc/business_card/rules.mk b/keyboards/kakunpc/business_card/rules.mk
deleted file mode 100644
index 4525d52332..0000000000
--- a/keyboards/kakunpc/business_card/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kakunpc/business_card/beta
diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
deleted file mode 100644
index 46a0114bd5..0000000000
--- a/keyboards/kakunpc/suihankey/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
deleted file mode 100644
index 1dc7b014f0..0000000000
--- a/keyboards/kakunpc/suihankey/split/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kakunpc/suihankey/split/rev1
diff --git a/keyboards/kapcave/paladinpad/rules.mk b/keyboards/kapcave/paladinpad/rules.mk
deleted file mode 100644
index 02685414e3..0000000000
--- a/keyboards/kapcave/paladinpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kapcave/paladinpad/rev2
diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk
deleted file mode 100644
index a5dd22ce1c..0000000000
--- a/keyboards/kapl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kapl/rev1
diff --git a/keyboards/kbdfans/d45/rules.mk b/keyboards/kbdfans/d45/rules.mk
deleted file mode 100644
index 041e632f65..0000000000
--- a/keyboards/kbdfans/d45/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kbdfans/d45/v2
diff --git a/keyboards/kbdfans/kbd75/rules.mk b/keyboards/kbdfans/kbd75/rules.mk
deleted file mode 100644
index 5c46171316..0000000000
--- a/keyboards/kbdfans/kbd75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kbdfans/kbd75/rev1
diff --git a/keyboards/keebio/bdn9/rules.mk b/keyboards/keebio/bdn9/rules.mk
deleted file mode 100644
index 431a8ad027..0000000000
--- a/keyboards/keebio/bdn9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/bdn9/rev1
diff --git a/keyboards/keebio/convolution/rules.mk b/keyboards/keebio/convolution/rules.mk
deleted file mode 100644
index 9df8bd1c47..0000000000
--- a/keyboards/keebio/convolution/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/convolution/rev1
diff --git a/keyboards/keebio/dsp40/rules.mk b/keyboards/keebio/dsp40/rules.mk
deleted file mode 100644
index 3e8e9be18c..0000000000
--- a/keyboards/keebio/dsp40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/dsp40/rev1
diff --git a/keyboards/keebio/ergodicity/readme.md b/keyboards/keebio/ergodicity/readme.md
index 0f841d6e3e..61f4ee658c 100644
--- a/keyboards/keebio/ergodicity/readme.md
+++ b/keyboards/keebio/ergodicity/readme.md
@@ -1,9 +1,5 @@
# Ergodicity
-![ergodicity](imgur.com image replace me!)
-
-A short description of the keyboard/project
-
Keyboard Maintainer: [nooges/bakingpy](https://github.com/nooges)
Hardware Supported: Ergodicity PCB w/ATmega32u4
Hardware Availability: [Keebio](https://keeb.io)
diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk
deleted file mode 100644
index 6a0522a902..0000000000
--- a/keyboards/keebio/foldkb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/foldkb/rev1
diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk
deleted file mode 100644
index 06d2f2f412..0000000000
--- a/keyboards/keebio/kbo5000/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/kbo5000/rev1
diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk
deleted file mode 100644
index 44cdce9d12..0000000000
--- a/keyboards/keebio/levinson/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/levinson/rev2
diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk
deleted file mode 100644
index fb40fc8a56..0000000000
--- a/keyboards/keebio/quefrency/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/quefrency/rev1
diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk
deleted file mode 100644
index 6cdac68a4e..0000000000
--- a/keyboards/keebio/rorschach/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/rorschach/rev1
diff --git a/keyboards/keebio/sinc/rules.mk b/keyboards/keebio/sinc/rules.mk
deleted file mode 100644
index 1419957479..0000000000
--- a/keyboards/keebio/sinc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/sinc/rev1
diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk
deleted file mode 100644
index ecf6a3fa87..0000000000
--- a/keyboards/keebio/viterbi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keebio/viterbi/rev2
diff --git a/keyboards/keycapsss/kimiko/rules.mk b/keyboards/keycapsss/kimiko/rules.mk
deleted file mode 100644
index cb9f69d6bb..0000000000
--- a/keyboards/keycapsss/kimiko/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keycapsss/kimiko/rev2
diff --git a/keyboards/keycapsss/plaid_pad/rules.mk b/keyboards/keycapsss/plaid_pad/rules.mk
deleted file mode 100644
index 0ab7cc3141..0000000000
--- a/keyboards/keycapsss/plaid_pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keycapsss/plaid_pad/rev1
diff --git a/keyboards/keyhive/navi10/rules.mk b/keyboards/keyhive/navi10/rules.mk
deleted file mode 100644
index 6ebb2d0ceb..0000000000
--- a/keyboards/keyhive/navi10/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keyhive/navi10/rev3
diff --git a/keyboards/keyhive/uno/rules.mk b/keyboards/keyhive/uno/rules.mk
deleted file mode 100644
index 3220994593..0000000000
--- a/keyboards/keyhive/uno/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keyhive/uno/rev1
diff --git a/keyboards/kin80/rules.mk b/keyboards/kin80/rules.mk
deleted file mode 100644
index b264c9cfc5..0000000000
--- a/keyboards/kin80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kin80/blackpill401
diff --git a/keyboards/kira/kira75/readme.md b/keyboards/kira/kira75/readme.md
index a30b60d179..237e81d06b 100644
--- a/keyboards/kira/kira75/readme.md
+++ b/keyboards/kira/kira75/readme.md
@@ -1,7 +1,5 @@
# Kira 75
-![kira75](imgur.com image replace me!)
-
75% keyboard designed by thesiscamper
Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
diff --git a/keyboards/kprepublic/bm16a/v1/readme.md b/keyboards/kprepublic/bm16a/v1/readme.md
index d24a879505..6ad3773371 100644
--- a/keyboards/kprepublic/bm16a/v1/readme.md
+++ b/keyboards/kprepublic/bm16a/v1/readme.md
@@ -5,7 +5,6 @@
A 16 key macropad, with USB C, RGB underglow and backlight.
* Keyboard Maintainer: QMK Community
-* Hardware Supported: The PCBs, controllers supported
* Hardware Availability: [KPrepublic](https://kprepublic.com/products/bm16a-16-keys-custom-mechanical-keyboard-pcb-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-bottom-underglow-alps-mx); [AliExpress](https://www.aliexpress.com/store/product/bm16a-16-keys-Custom-Mechanical-Keyboard-PCB-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-bottom/3034003_32970629907.html)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/kprepublic/bm16s/readme.md b/keyboards/kprepublic/bm16s/readme.md
index 6a887e553a..5b121cdaea 100644
--- a/keyboards/kprepublic/bm16s/readme.md
+++ b/keyboards/kprepublic/bm16s/readme.md
@@ -3,7 +3,6 @@
A 16-key macropad, with USB C and per-key RGB backlighting. This is a variant of the BM16A, but with low profile Choc switches.
* Keyboard Maintainer: QMK Community
-* Hardware Supported: The PCBs, controllers supported
* Hardware Availability: [KPrepublic](https://kprepublic.com/collections/pcb/products/bm16s-16-keys-custom-mechanical-keyboard-pcb-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-switch-leds-choc-switch); [AliExpress](https://www.aliexpress.com/item/bm16s-16-keys-Custom-Mechanical-Keyboard-PCB-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-switch/32999247908.html); [Massdrop](https://www.massdrop.com/buy/78169)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk
deleted file mode 100644
index fa09523958..0000000000
--- a/keyboards/kprepublic/jj40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kprepublic/jj40/rev1
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
deleted file mode 100644
index 8f77c68db2..0000000000
--- a/keyboards/kprepublic/jj50/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kprepublic/jj50/rev1
diff --git a/keyboards/kradoindustries/promenade/keyboard.json b/keyboards/kradoindustries/promenade/keyboard.json
index 86330dbc2e..028ba1b24d 100644
--- a/keyboards/kradoindustries/promenade/keyboard.json
+++ b/keyboards/kradoindustries/promenade/keyboard.json
@@ -73,8 +73,8 @@
{"matrix": [1, 3], "x":3.5, "y":1},
{"matrix": [1, 4], "x":4.5, "y":1},
{"matrix": [1, 5], "x":5.5, "y":1},
- {"matrix": [1, 6], "x":6.5, "y":1, "h":1.5},
- {"matrix": [1, 7], "x":7.5, "y":1, "h":1.5},
+ {"matrix": [1, 6], "x":6.5, "y":1},
+ {"matrix": [1, 7], "x":7.5, "y":1},
{"matrix": [1, 8], "x":8.5, "y":1},
{"matrix": [1, 9], "x":9.5, "y":1},
{"matrix": [1, 10], "x":10.5, "y":1},
@@ -88,6 +88,8 @@
{"matrix": [2, 3], "x":3.5, "y":2},
{"matrix": [2, 4], "x":4.5, "y":2},
{"matrix": [2, 5], "x":5.5, "y":2},
+ {"matrix": [2, 6], "x":6.5, "y":2},
+ {"matrix": [2, 7], "x":7.5, "y":2},
{"matrix": [2, 8], "x":8.5, "y":2},
{"matrix": [2, 9], "x":9.5, "y":2},
{"matrix": [2, 10], "x":10.5, "y":2},
@@ -101,8 +103,8 @@
{"matrix": [3, 3], "x":3.5, "y":3},
{"matrix": [3, 4], "x":4.5, "y":3},
{"matrix": [3, 5], "x":5.5, "y":3},
- {"matrix": [3, 6], "x":6.5, "y":2.5, "h":1.5},
- {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
+ {"matrix": [3, 6], "x":6.5, "y":3},
+ {"matrix": [3, 7], "x":7.5, "y":3},
{"matrix": [3, 8], "x":8.5, "y":3},
{"matrix": [3, 9], "x":9.5, "y":3},
{"matrix": [3, 10], "x":10.5, "y":3},
diff --git a/keyboards/kradoindustries/promenade/keymaps/default/keymap.c b/keyboards/kradoindustries/promenade/keymaps/default/keymap.c
index aef0f28161..be8401e608 100644
--- a/keyboards/kradoindustries/promenade/keymaps/default/keymap.c
+++ b/keyboards/kradoindustries/promenade/keymaps/default/keymap.c
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* .-----------------------------------------------------------------------------------------------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | - | = | 6 | 7 | 8 | 9 | 0 | BACKSP |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB | Q | W | E | R | T | [ | ] | Y | U | I | O | P | ' |
+ * | TAB | Q | W | E | R | T | [ | ] | Y | U | I | O | P | \ |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A | S | D | F | G | | | H | J | K | L | ; | ENTER |
+ * | CAP LK | A | S | D | F | G | HOME | PG UP | H | J | K | L | ; | ENTER |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
* | LSHIFT | Z | X | C | V | B | END | PG DN | N | M | , | . | / | RSHIFT |
* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL | LGUI | FN | LALT | SPACE | SPACE | SPACE | SPACE | SPACE | LEFT | DOWN | UP | RIGHT | RCTRL |
+ * | LCTRL | LGUI | LALT | FN | SPACE | SPACE | SPACE | SPACE | LEFT | DOWN | UP | RIGHT | RCTRL |
* '-----------------------------------------------------------------------------------------------------------------------------'
*/
[_BASE] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HOME, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RCTL
),
@@ -47,20 +47,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* .-----------------------------------------------------------------------------------------------------------------------------.
* | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DEL |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | | Home | Up | End | PgUp | | | | | | | | PRT SC | |
+ * | | HOME | UP | END | PG UP | | | | | | | | PRT SC | |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | | Left | Down | Right | PgDn | | | | | | | | | Reset |
+ * | | LEFT | DOWN | RIGHT | PG DN | | | | | | | | ' | RGB Off|
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
* | | | | | | | | | | MUTE | VOL DN | VOL UP | \ | |
* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * | | | | | | | | | | | | | | Reset |
+ * | | | | | | ENTER | ENTER | BACKSP | | | | | Reset |
* '-----------------------------------------------------------------------------------------------------------------------------'
*/
[_FN] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,
- _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, QK_BOOT,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, UG_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
+ _______, _______, _______, _______, _______, KC_ENT, KC_ENT, KC_BSPC, _______, _______, _______, _______, QK_BOOT
)
};
diff --git a/keyboards/kradoindustries/promenade/matrix_diagram.md b/keyboards/kradoindustries/promenade/matrix_diagram.md
index 086471b8b9..3c205c9a99 100644
--- a/keyboards/kradoindustries/promenade/matrix_diagram.md
+++ b/keyboards/kradoindustries/promenade/matrix_diagram.md
@@ -5,10 +5,10 @@
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │
├─────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼─────┤
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │
-├─────┼───┼───┼───┼───┼───┤ │ ├───┼───┼───┼───┼───┼─────┤
-│20 │21 │22 │23 │24 │25 ├───┼───┤28 │29 │2A │2B │2C │2D │
-├─────┼───┼───┼───┼───┼───┤36 │37 ├───┼───┼───┼───┼───┼─────┤
-│30 │31 │32 │33 │34 │35 │ │ │38 │39 │3A │3B │3C │3D │
+├─────┼───┼───┼───┼───┼───├───┼───┼───┼───┼───┼───┼───┼─────┤
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │
+├─────┼───┼───┼───┼───┼───├───┼───┼───┼───┼───┼───┼───┼─────┤
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │
├─────┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┼───┼─────┤
│40 │41 │42 │43 │44 │45 │46 │48 │49 │4A │4B │4C │4D │
└─────┴───┴───┴───┴───┴───┴───────┴───┴───┴───┴───┴───┴─────┘
diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
deleted file mode 100644
index 16c27e7c3b..0000000000
--- a/keyboards/kumaokobo/kudox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kumaokobo/kudox/rev3
diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
deleted file mode 100644
index c912dcd2e5..0000000000
--- a/keyboards/kumaokobo/kudox_full/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kumaokobo/kudox_full/rev1
diff --git a/keyboards/kumaokobo/kudox_game/rules.mk b/keyboards/kumaokobo/kudox_game/rules.mk
deleted file mode 100644
index 28918ca489..0000000000
--- a/keyboards/kumaokobo/kudox_game/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kumaokobo/kudox_game/rev2
diff --git a/keyboards/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk
deleted file mode 100644
index df859afa0f..0000000000
--- a/keyboards/kumaokobo/pico/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kumaokobo/pico/65keys
diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk
deleted file mode 100644
index cd05623d84..0000000000
--- a/keyboards/lazydesigners/dimple/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lazydesigners/dimple/staggered/rev1
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
deleted file mode 100644
index 0fb6d36204..0000000000
--- a/keyboards/lets_split/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lets_split/rev2
diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk
deleted file mode 100644
index 5ebd387c83..0000000000
--- a/keyboards/lfkeyboards/lfk78/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lfkeyboards/lfk78/revj
diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk
deleted file mode 100644
index 05b80ac74a..0000000000
--- a/keyboards/lfkeyboards/lfk87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lfkeyboards/lfk78/revc
diff --git a/keyboards/lfkeyboards/smk65/rules.mk b/keyboards/lfkeyboards/smk65/rules.mk
deleted file mode 100644
index b2d7497663..0000000000
--- a/keyboards/lfkeyboards/smk65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lfkeyboards/smk65/revb
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk
deleted file mode 100644
index a63bd42ad3..0000000000
--- a/keyboards/lily58/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lily58/rev1
diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk
deleted file mode 100644
index 4643abab93..0000000000
--- a/keyboards/lime/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = lime/rev1
diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
deleted file mode 100644
index 3a6633cf56..0000000000
--- a/keyboards/maple_computing/christmas_tree/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = maple_computing/christmas_tree/v2017
diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk
deleted file mode 100644
index 2665d44abd..0000000000
--- a/keyboards/maple_computing/ivy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = maple_computing/ivy/rev1
diff --git a/keyboards/maple_computing/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk
deleted file mode 100644
index 8c35a608a6..0000000000
--- a/keyboards/maple_computing/launchpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = maple_computing/launchpad/rev1
diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
deleted file mode 100644
index d5a7f49e40..0000000000
--- a/keyboards/maple_computing/minidox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/mariorion_v25/rules.mk b/keyboards/mariorion_v25/rules.mk
deleted file mode 100644
index f0bfa47284..0000000000
--- a/keyboards/mariorion_v25/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mariorion_v25/prod
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
deleted file mode 100644
index 1833888708..0000000000
--- a/keyboards/marksard/rhymestone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/marksard/treadstone32/readme.md b/keyboards/marksard/treadstone32/readme.md
index 170c6bc761..4e3d544698 100644
--- a/keyboards/marksard/treadstone32/readme.md
+++ b/keyboards/marksard/treadstone32/readme.md
@@ -4,9 +4,7 @@
A 32-key Symmetric staggered keyboard.
-Keyboard Maintainer: [marksard](https://github.com/marksard)
-Hardware Supported: The PCBs, controllers supported
-Hardware Availability: links to where you can find this hardware
+* Keyboard Maintainer: [marksard](https://github.com/marksard)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
deleted file mode 100644
index 2d7ca16d86..0000000000
--- a/keyboards/marksard/treadstone32/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = marksard/treadstone32/rev1
diff --git a/keyboards/marksard/treadstone48/readme.md b/keyboards/marksard/treadstone48/readme.md
index c5f6f8f73f..692891447c 100644
--- a/keyboards/marksard/treadstone48/readme.md
+++ b/keyboards/marksard/treadstone48/readme.md
@@ -4,9 +4,7 @@
A 47 (or 48) keys Symmetric Staggered keyboard.
-Keyboard Maintainer: [marksard](https://github.com/marksard)
-Hardware Supported: The PCBs, controllers supported
-Hardware Availability: links to where you can find this hardware
+* Keyboard Maintainer: [marksard](https://github.com/marksard)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
deleted file mode 100644
index 23865d27e6..0000000000
--- a/keyboards/marksard/treadstone48/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = marksard/treadstone48/rev1
diff --git a/keyboards/masterworks/classy_tkl/readme.md b/keyboards/masterworks/classy_tkl/readme.md
index 0557ed7f4c..1e5903483c 100644
--- a/keyboards/masterworks/classy_tkl/readme.md
+++ b/keyboards/masterworks/classy_tkl/readme.md
@@ -2,8 +2,6 @@
![Classy TKL](https://i.imgur.com/p1dxfYKl.jpg)
-A short description of the keyboard/project
-
* Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul)
* Hardware Supported: [Classy TKL PCB](https://github.com/4pplet/classyTKL)
* Hardware Availability: https://geekhack.org/index.php?topic=105933
diff --git a/keyboards/maxipad/rules.mk b/keyboards/maxipad/rules.mk
deleted file mode 100644
index 98a712a7b8..0000000000
--- a/keyboards/maxipad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = maxipad/promicro
diff --git a/keyboards/mb44/readme.md b/keyboards/mb44/readme.md
index 3cd59ecdb1..3029c69f9e 100644
--- a/keyboards/mb44/readme.md
+++ b/keyboards/mb44/readme.md
@@ -5,8 +5,6 @@
To reset and put into bootloader mode, please use the hardware reset button on the botton of the PCB. If the PCB is on the default firmware, software reset is available by holding the bottom left corner key and pressing `B` in the standard qwerty layout.
* Keyboard Maintainer: [melonbred](https://github.com/melonbred)
-* Hardware Supported: The PCBs, controllers supported
-* Hardware Availability: Links to where you can find this hardware
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/mechkeys/mechmini/rules.mk b/keyboards/mechkeys/mechmini/rules.mk
deleted file mode 100644
index 9d63d875eb..0000000000
--- a/keyboards/mechkeys/mechmini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechkeys/mechmini/v2
diff --git a/keyboards/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk
deleted file mode 100644
index 36acf8d17f..0000000000
--- a/keyboards/mechllama/g35/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechllama/g35/v2
diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk
deleted file mode 100644
index 18047f12c7..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk
deleted file mode 100644
index a1d2ba038d..0000000000
--- a/keyboards/mechlovin/adelais/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
deleted file mode 100644
index d348ae660f..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rules.mk
deleted file mode 100644
index 16a636a342..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rules.mk
deleted file mode 100644
index f33198890d..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/avr/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-DEFAULT_FOLDER = mechlovin/adelais/standard_led/avr/rev1 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk
deleted file mode 100644
index a1d2ba038d..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/delphine/readme.md b/keyboards/mechlovin/delphine/readme.md
index 9a5389a5f3..397a0ada40 100644
--- a/keyboards/mechlovin/delphine/readme.md
+++ b/keyboards/mechlovin/delphine/readme.md
@@ -1,7 +1,5 @@
# delphine
-![delphine](imgur.com image replace me!)
-
A Number-Pad PCB, Mono backlight and RGB backlight version, Dolpad compatible.
* Keyboard Maintainer: [Mechlovin'](https://github.com/mechlovin)
diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk
deleted file mode 100644
index 819bce1cd3..0000000000
--- a/keyboards/mechlovin/delphine/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/delphine/mono_led
diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk
deleted file mode 100644
index e876a56afb..0000000000
--- a/keyboards/mechlovin/hannah60rgb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1
diff --git a/keyboards/mechlovin/hannah65/rev1/rules.mk b/keyboards/mechlovin/hannah65/rev1/rules.mk
deleted file mode 100644
index ae9bc176a4..0000000000
--- a/keyboards/mechlovin/hannah65/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus
diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk
deleted file mode 100644
index ae9bc176a4..0000000000
--- a/keyboards/mechlovin/hannah65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus
diff --git a/keyboards/mechlovin/hannah910/rules.mk b/keyboards/mechlovin/hannah910/rules.mk
deleted file mode 100644
index a356867197..0000000000
--- a/keyboards/mechlovin/hannah910/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hannah910/rev1
diff --git a/keyboards/mechlovin/hex4b/rules.mk b/keyboards/mechlovin/hex4b/rules.mk
deleted file mode 100644
index e3d9ab46b4..0000000000
--- a/keyboards/mechlovin/hex4b/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hex4b/rev1
diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk
deleted file mode 100644
index 101153f240..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk
deleted file mode 100644
index 4aa072cae7..0000000000
--- a/keyboards/mechlovin/infinity87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1
diff --git a/keyboards/mechlovin/mechlovin9/rules.mk b/keyboards/mechlovin/mechlovin9/rules.mk
deleted file mode 100644
index 79de7c7d31..0000000000
--- a/keyboards/mechlovin/mechlovin9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/mechlovin9/rev1
diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk
deleted file mode 100644
index fa0eceeb8a..0000000000
--- a/keyboards/mechlovin/olly/jf/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/olly/jf/rev1
diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk
deleted file mode 100644
index e0088c95c3..0000000000
--- a/keyboards/mechlovin/zed1800/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/zed1800/saber
diff --git a/keyboards/mechlovin/zed65/no_backlight/rules.mk b/keyboards/mechlovin/zed65/no_backlight/rules.mk
deleted file mode 100644
index a699765498..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66
diff --git a/keyboards/mechlovin/zed65/rules.mk b/keyboards/mechlovin/zed65/rules.mk
deleted file mode 100644
index a699765498..0000000000
--- a/keyboards/mechlovin/zed65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66
diff --git a/keyboards/mechwild/bde/rules.mk b/keyboards/mechwild/bde/rules.mk
deleted file mode 100644
index 138a291916..0000000000
--- a/keyboards/mechwild/bde/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/bde/rev2
diff --git a/keyboards/mechwild/mokulua/readme.md b/keyboards/mechwild/mokulua/readme.md
index 24f01b10d4..5a6b69e66e 100644
--- a/keyboards/mechwild/mokulua/readme.md
+++ b/keyboards/mechwild/mokulua/readme.md
@@ -2,8 +2,6 @@
![Mokulua](https://i.imgur.com/7fifiQch.jpg)
-*A short description of the keyboard/project*
-
* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
* Hardware Supported: Mokulua v1.3
* Hardware Availability: https://mechwild.com/product/mokulua/
diff --git a/keyboards/mechwild/mokulua/rules.mk b/keyboards/mechwild/mokulua/rules.mk
deleted file mode 100644
index 3a87a143e5..0000000000
--- a/keyboards/mechwild/mokulua/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/mokulua/standard \ No newline at end of file
diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk
deleted file mode 100644
index 8709dbb4de..0000000000
--- a/keyboards/mechwild/obe/f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/obe/f401/base
diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk
deleted file mode 100644
index e24fe60509..0000000000
--- a/keyboards/mechwild/obe/f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/obe/f411/base
diff --git a/keyboards/mechwild/obe/rules.mk b/keyboards/mechwild/obe/rules.mk
deleted file mode 100644
index 8709dbb4de..0000000000
--- a/keyboards/mechwild/obe/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/obe/f401/base
diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk
deleted file mode 100644
index a0d74c14eb..0000000000
--- a/keyboards/mechwild/waka60/f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/waka60/f401/base
diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk
deleted file mode 100644
index 0dd69ff65f..0000000000
--- a/keyboards/mechwild/waka60/f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/waka60/f411/base
diff --git a/keyboards/mechwild/waka60/rules.mk b/keyboards/mechwild/waka60/rules.mk
deleted file mode 100644
index a0d74c14eb..0000000000
--- a/keyboards/mechwild/waka60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechwild/waka60/f401/base
diff --git a/keyboards/melgeek/z70ultra/rules.mk b/keyboards/melgeek/z70ultra/rules.mk
deleted file mode 100644
index 8cc384b91f..0000000000
--- a/keyboards/melgeek/z70ultra/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = melgeek/z70ultra/rev1
diff --git a/keyboards/meme/readme.md b/keyboards/meme/readme.md
index 94b55d746e..7b09a5e18f 100644
--- a/keyboards/meme/readme.md
+++ b/keyboards/meme/readme.md
@@ -1,7 +1,5 @@
# Meme
-![meme](imgur.com image replace me!)
-
65% gasket mount keyboard.
Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
diff --git a/keyboards/mint60/readme.md b/keyboards/mint60/readme.md
index 1824c682f8..3a28f56181 100644
--- a/keyboards/mint60/readme.md
+++ b/keyboards/mint60/readme.md
@@ -2,11 +2,8 @@
![Mint60](https://i.imgur.com/suOE8HN.jpg)
-A short description of the keyboard/project
-
Keyboard Maintainer: [Eucalyn](https://github.com/eucalyn) [@eucalyn_](https://twitter.com/eucalyn_)
Hardware Supported: The Mint60 PCBs, ProMicro supported
-Hardware Availability: links to where you can find this hardware
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
index a673a38069..7c102e1a97 100644
--- a/keyboards/moky/moky88/config.h
+++ b/keyboards/moky/moky88/config.h
@@ -15,5 +15,4 @@
/* RGB Driver */
#define AW20216S_CS_PIN_1 D2
#define AW20216S_CS_PIN_2 B8
-#define AW20216S_EN_PIN_1 B9
-#define AW20216S_EN_PIN_2 B9
+#define AW20216S_EN_PIN B9
diff --git a/keyboards/moky/moky88/moky88.c b/keyboards/moky/moky88/moky88.c
index 3cbd6e1468..2de672f94f 100644
--- a/keyboards/moky/moky88/moky88.c
+++ b/keyboards/moky/moky88/moky88.c
@@ -23,97 +23,97 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS18_SW2, CS17_SW2, CS16_SW2 }, // 0 Esc
- {0, CS18_SW3, CS17_SW3, CS16_SW3 }, // 1 F1
- {0, CS18_SW4, CS17_SW4, CS16_SW4 }, // 2 F2
- {0, CS18_SW5, CS17_SW5, CS16_SW5 }, // 3 F3
- {0, CS18_SW6, CS17_SW6, CS16_SW6 }, // 4 F4
- {0, CS18_SW7, CS17_SW7, CS16_SW7 }, // 5 F5
- {0, CS18_SW8, CS17_SW8, CS16_SW8 }, // 6 F6
- {0, CS18_SW9, CS17_SW9, CS16_SW9 }, // 7 F7
- {0, CS18_SW10, CS17_SW10, CS16_SW10 }, // 8 F8
- {0, CS18_SW11, CS17_SW11, CS16_SW11 }, // 9 F9
- {0, CS18_SW12, CS17_SW12, CS16_SW12 }, // 10 F10
- {1, CS18_SW1, CS17_SW1, CS16_SW1 }, // 11 F11
- {1, CS18_SW2, CS17_SW2, CS16_SW2 }, // 12 F12
- {1, CS18_SW3, CS17_SW3, CS16_SW3 }, // 13 MUTE
- {1, CS18_SW4, CS17_SW4, CS16_SW4 }, // 14 PSCR
- {1, CS18_SW5, CS17_SW5, CS16_SW5 }, // 15 SCRL
- {1, CS18_SW6, CS17_SW6, CS16_SW6 }, // 16 PAUSE
+ {0, SW2_CS18, SW2_CS17, SW2_CS16 }, // 0 Esc
+ {0, SW3_CS18, SW3_CS17, SW3_CS16 }, // 1 F1
+ {0, SW4_CS18, SW4_CS17, SW4_CS16 }, // 2 F2
+ {0, SW5_CS18, SW5_CS17, SW5_CS16 }, // 3 F3
+ {0, SW6_CS18, SW6_CS17, SW6_CS16 }, // 4 F4
+ {0, SW7_CS18, SW7_CS17, SW7_CS16 }, // 5 F5
+ {0, SW8_CS18, SW8_CS17, SW8_CS16 }, // 6 F6
+ {0, SW9_CS18, SW9_CS17, SW9_CS16 }, // 7 F7
+ {0, SW10_CS18, SW10_CS17, SW10_CS16 }, // 8 F8
+ {0, SW11_CS18, SW11_CS17, SW11_CS16 }, // 9 F9
+ {0, SW12_CS18, SW12_CS17, SW12_CS16 }, // 10 F10
+ {1, SW1_CS18, SW1_CS17, SW1_CS16 }, // 11 F11
+ {1, SW2_CS18, SW2_CS17, SW2_CS16 }, // 12 F12
+ {1, SW3_CS18, SW3_CS17, SW3_CS16 }, // 13 MUTE
+ {1, SW4_CS18, SW4_CS17, SW4_CS16 }, // 14 PSCR
+ {1, SW5_CS18, SW5_CS17, SW5_CS16 }, // 15 SCRL
+ {1, SW6_CS18, SW6_CS17, SW6_CS16 }, // 16 PAUSE
- {0, CS15_SW2, CS14_SW2, CS13_SW2 }, // 17 `~
- {0, CS15_SW3, CS14_SW3, CS13_SW3 }, // 18 1
- {0, CS15_SW4, CS14_SW4, CS13_SW4 }, // 19 2
- {0, CS15_SW5, CS14_SW5, CS13_SW5 }, // 20 3
- {0, CS15_SW6, CS14_SW6, CS13_SW6 }, // 21 4
- {0, CS15_SW7, CS14_SW7, CS13_SW7 }, // 22 5
- {0, CS15_SW8, CS14_SW8, CS13_SW8 }, // 23 6
- {0, CS15_SW9, CS14_SW9, CS13_SW9 }, // 24 7
- {0, CS15_SW10, CS14_SW10, CS13_SW10 }, // 25 8
- {0, CS15_SW11, CS14_SW11, CS13_SW11 }, // 26 9
- {0, CS15_SW12, CS14_SW12, CS13_SW12 }, // 27 0
- {1, CS15_SW1, CS14_SW1, CS13_SW1 }, // 28 -_
- {1, CS15_SW2, CS14_SW2, CS13_SW2 }, // 29 =+
- {1, CS15_SW3, CS14_SW3, CS13_SW3 }, // 30 BSPC
- {1, CS15_SW4, CS14_SW4, CS13_SW4 }, // 31 INS
- {1, CS15_SW5, CS14_SW5, CS13_SW5 }, // 32 HOME
- {1, CS15_SW6, CS14_SW6, CS13_SW6 }, // 33 PGUP
+ {0, SW2_CS15, SW2_CS14, SW2_CS13 }, // 17 `~
+ {0, SW3_CS15, SW3_CS14, SW3_CS13 }, // 18 1
+ {0, SW4_CS15, SW4_CS14, SW4_CS13 }, // 19 2
+ {0, SW5_CS15, SW5_CS14, SW5_CS13 }, // 20 3
+ {0, SW6_CS15, SW6_CS14, SW6_CS13 }, // 21 4
+ {0, SW7_CS15, SW7_CS14, SW7_CS13 }, // 22 5
+ {0, SW8_CS15, SW8_CS14, SW8_CS13 }, // 23 6
+ {0, SW9_CS15, SW9_CS14, SW9_CS13 }, // 24 7
+ {0, SW10_CS15, SW10_CS14, SW10_CS13 }, // 25 8
+ {0, SW11_CS15, SW11_CS14, SW11_CS13 }, // 26 9
+ {0, SW12_CS15, SW12_CS14, SW12_CS13 }, // 27 0
+ {1, SW1_CS15, SW1_CS14, SW1_CS13 }, // 28 -_
+ {1, SW2_CS15, SW2_CS14, SW2_CS13 }, // 29 =+
+ {1, SW3_CS15, SW3_CS14, SW3_CS13 }, // 30 BSPC
+ {1, SW4_CS15, SW4_CS14, SW4_CS13 }, // 31 INS
+ {1, SW5_CS15, SW5_CS14, SW5_CS13 }, // 32 HOME
+ {1, SW6_CS15, SW6_CS14, SW6_CS13 }, // 33 PGUP
- {0, CS12_SW2, CS11_SW2, CS10_SW2 }, // 34 Tab
- {0, CS12_SW3, CS11_SW3, CS10_SW3 }, // 35 Q
- {0, CS12_SW4, CS11_SW4, CS10_SW4 }, // 36 W
- {0, CS12_SW5, CS11_SW5, CS10_SW5 }, // 37 E
- {0, CS12_SW6, CS11_SW6, CS10_SW6 }, // 38 R
- {0, CS12_SW7, CS11_SW7, CS10_SW7 }, // 39 T
- {0, CS12_SW8, CS11_SW8, CS10_SW8 }, // 40 Y
- {0, CS12_SW9, CS11_SW9, CS10_SW9 }, // 41 U
- {0, CS12_SW10, CS11_SW10, CS10_SW10 }, // 42 I
- {0, CS12_SW11, CS11_SW11, CS10_SW11 }, // 43 O
- {0, CS12_SW12, CS11_SW12, CS10_SW12 }, // 44 P
- {1, CS12_SW1, CS11_SW1, CS10_SW1 }, // 45 [{
- {1, CS12_SW2, CS11_SW2, CS10_SW2 }, // 48 ]}
- {1, CS12_SW3, CS11_SW3, CS10_SW3 }, // 47 \|
- {1, CS12_SW4, CS11_SW4, CS10_SW4 }, // 48 Del
- {1, CS12_SW5, CS11_SW5, CS10_SW5 }, // 49 End
- {1, CS12_SW6, CS11_SW6, CS10_SW6 }, // 50 PGDN
+ {0, SW2_CS12, SW2_CS11, SW2_CS10 }, // 34 Tab
+ {0, SW3_CS12, SW3_CS11, SW3_CS10 }, // 35 Q
+ {0, SW4_CS12, SW4_CS11, SW4_CS10 }, // 36 W
+ {0, SW5_CS12, SW5_CS11, SW5_CS10 }, // 37 E
+ {0, SW6_CS12, SW6_CS11, SW6_CS10 }, // 38 R
+ {0, SW7_CS12, SW7_CS11, SW7_CS10 }, // 39 T
+ {0, SW8_CS12, SW8_CS11, SW8_CS10 }, // 40 Y
+ {0, SW9_CS12, SW9_CS11, SW9_CS10 }, // 41 U
+ {0, SW10_CS12, SW10_CS11, SW10_CS10 }, // 42 I
+ {0, SW11_CS12, SW11_CS11, SW11_CS10 }, // 43 O
+ {0, SW12_CS12, SW12_CS11, SW12_CS10 }, // 44 P
+ {1, SW1_CS12, SW1_CS11, SW1_CS10 }, // 45 [{
+ {1, SW2_CS12, SW2_CS11, SW2_CS10 }, // 48 ]}
+ {1, SW3_CS12, SW3_CS11, SW3_CS10 }, // 47 \|
+ {1, SW4_CS12, SW4_CS11, SW4_CS10 }, // 48 Del
+ {1, SW5_CS12, SW5_CS11, SW5_CS10 }, // 49 End
+ {1, SW6_CS12, SW6_CS11, SW6_CS10 }, // 50 PGDN
- {0, CS1_SW2, CS2_SW2, CS3_SW2 }, // 51 Caps
- {0, CS1_SW3, CS2_SW3, CS3_SW3 }, // 52 A
- {0, CS1_SW4, CS2_SW4, CS3_SW4 }, // 33 S
- {0, CS1_SW5, CS2_SW5, CS3_SW5 }, // 54 D
- {0, CS1_SW6, CS2_SW6, CS3_SW6 }, // 55 F
- {0, CS1_SW7, CS2_SW7, CS3_SW7 }, // 56 G
- {0, CS1_SW8, CS2_SW8, CS3_SW8 }, // 57 H
- {0, CS1_SW9, CS2_SW9, CS3_SW9 }, // 58 J
- {0, CS1_SW10, CS2_SW10, CS3_SW10 }, // 59 K
- {0, CS1_SW11, CS2_SW11, CS3_SW11 }, // 60 L
- {0, CS1_SW12, CS2_SW12, CS3_SW12 }, // 61 ;:
- {1, CS1_SW1, CS2_SW1, CS3_SW1 }, // 62 '
- {1, CS1_SW3, CS2_SW3, CS3_SW3 }, // 63 Enter
+ {0, SW2_CS1, SW2_CS2, SW2_CS3 }, // 51 Caps
+ {0, SW3_CS1, SW3_CS2, SW3_CS3 }, // 52 A
+ {0, SW4_CS1, SW4_CS2, SW4_CS3 }, // 33 S
+ {0, SW5_CS1, SW5_CS2, SW5_CS3 }, // 54 D
+ {0, SW6_CS1, SW6_CS2, SW6_CS3 }, // 55 F
+ {0, SW7_CS1, SW7_CS2, SW7_CS3 }, // 56 G
+ {0, SW8_CS1, SW8_CS2, SW8_CS3 }, // 57 H
+ {0, SW9_CS1, SW9_CS2, SW9_CS3 }, // 58 J
+ {0, SW10_CS1, SW10_CS2, SW10_CS3 }, // 59 K
+ {0, SW11_CS1, SW11_CS2, SW11_CS3 }, // 60 L
+ {0, SW12_CS1, SW12_CS2, SW12_CS3 }, // 61 ;:
+ {1, SW1_CS1, SW1_CS2, SW1_CS3 }, // 62 '
+ {1, SW3_CS1, SW3_CS2, SW3_CS3 }, // 63 Enter
- {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 64 Shift
- {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 65 Z
- {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 66 X
- {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 67 C
- {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 68 V
- {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 69 B
- {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 70 N
- {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 71 M
- {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 72 ,<
- {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 73 .>
- {1, CS4_SW1, CS5_SW1, CS6_SW1 }, // 74 ?
- {1, CS4_SW3, CS5_SW3, CS6_SW3 }, // 75 Shift
- {1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 76 Up
+ {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 64 Shift
+ {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 65 Z
+ {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 66 X
+ {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 67 C
+ {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 68 V
+ {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 69 B
+ {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 70 N
+ {0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 71 M
+ {0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 72 ,<
+ {0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 73 .>
+ {1, SW1_CS4, SW1_CS5, SW1_CS6 }, // 74 ?
+ {1, SW3_CS4, SW3_CS5, SW3_CS6 }, // 75 Shift
+ {1, SW5_CS4, SW5_CS5, SW5_CS6 }, // 76 Up
- {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 77 Ctrl_L
- {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 78 Win_L
- {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 79 ALT_L
- {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 80 SPACE
- {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 81 ALT_L
- {1, CS7_SW1, CS8_SW1, CS9_SW1 }, // 82 Win_L
- {1, CS7_SW2, CS8_SW2, CS9_SW2 }, // 83 Fn
- {1, CS7_SW3, CS8_SW3, CS9_SW3 }, // 84 Ctrl_L
- {1, CS7_SW4, CS8_SW4, CS9_SW4 }, // 85 Left
- {1, CS7_SW5, CS8_SW5, CS9_SW5 }, // 86 Down
- {1, CS7_SW6, CS8_SW6, CS9_SW6 }, // 87 Right
+ {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 77 Ctrl_L
+ {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 78 Win_L
+ {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 79 ALT_L
+ {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 80 SPACE
+ {0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 81 ALT_L
+ {1, SW1_CS7, SW1_CS8, SW1_CS9 }, // 82 Win_L
+ {1, SW2_CS7, SW2_CS8, SW2_CS9 }, // 83 Fn
+ {1, SW3_CS7, SW3_CS8, SW3_CS9 }, // 84 Ctrl_L
+ {1, SW4_CS7, SW4_CS8, SW4_CS9 }, // 85 Left
+ {1, SW5_CS7, SW5_CS8, SW5_CS9 }, // 86 Down
+ {1, SW6_CS7, SW6_CS8, SW6_CS9 }, // 87 Right
};
diff --git a/keyboards/montsinger/rebound/rules.mk b/keyboards/montsinger/rebound/rules.mk
deleted file mode 100644
index d277d184e1..0000000000
--- a/keyboards/montsinger/rebound/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = montsinger/rebound/rev1
diff --git a/keyboards/murcielago/rules.mk b/keyboards/murcielago/rules.mk
deleted file mode 100644
index 661563697a..0000000000
--- a/keyboards/murcielago/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = murcielago/rev1 \ No newline at end of file
diff --git a/keyboards/nullbitsco/scramble/rules.mk b/keyboards/nullbitsco/scramble/rules.mk
deleted file mode 100644
index 5753f7786d..0000000000
--- a/keyboards/nullbitsco/scramble/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = nullbitsco/scramble/v2
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/v1/rules.mk
index 2fc8995acb..84de35aeb1 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/v1/rules.mk
@@ -1,3 +1 @@
POINTING_DEVICE_DRIVER = adns9800
-
-DEFAULT_FOLDER = oddball/v1
diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk
new file mode 100644
index 0000000000..84de35aeb1
--- /dev/null
+++ b/keyboards/oddball/v2/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk
new file mode 100644
index 0000000000..84de35aeb1
--- /dev/null
+++ b/keyboards/oddball/v2_1/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk
deleted file mode 100644
index 492cdde65d..0000000000
--- a/keyboards/omkbd/ergodash/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = omkbd/ergodash/rev1
diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk
deleted file mode 100644
index 3460ad8964..0000000000
--- a/keyboards/omkbd/runner3680/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = omkbd/runner3680/5x8
diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk
deleted file mode 100644
index fd71b6c8fb..0000000000
--- a/keyboards/orthodox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = orthodox/rev3
diff --git a/keyboards/peej/rosaline/rules.mk b/keyboards/peej/rosaline/rules.mk
deleted file mode 100644
index 928164362a..0000000000
--- a/keyboards/peej/rosaline/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = peej/rosaline/staggered
diff --git a/keyboards/peej/tripel/rules.mk b/keyboards/peej/tripel/rules.mk
deleted file mode 100644
index 8d89700456..0000000000
--- a/keyboards/peej/tripel/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = peej/tripel/left
diff --git a/keyboards/pegasus/readme.md b/keyboards/pegasus/readme.md
index c523c03540..9c6d575e92 100644
--- a/keyboards/pegasus/readme.md
+++ b/keyboards/pegasus/readme.md
@@ -5,8 +5,6 @@
Pegasus is a 40% keyboard with a 12.75u "WKL" layout with 0.75u blockers.
* Keyboard Maintainer: [melonbred](https://github.com/melonbred)
-* Hardware Supported: The PCBs, controllers supported
-* Hardware Availability: Links to where you can find this hardware
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/peranekofactory/tone/rules.mk b/keyboards/peranekofactory/tone/rules.mk
deleted file mode 100644
index e87862a9f6..0000000000
--- a/keyboards/peranekofactory/tone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = peranekofactory/tone/rev2
diff --git a/keyboards/phase_studio/titan65/rules.mk b/keyboards/phase_studio/titan65/rules.mk
deleted file mode 100644
index d55ca35d7a..0000000000
--- a/keyboards/phase_studio/titan65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = phase_studio/titan65/hotswap
diff --git a/keyboards/pica40/rules.mk b/keyboards/pica40/rules.mk
deleted file mode 100644
index 9670889712..0000000000
--- a/keyboards/pica40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = pica40/rev2
diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk
deleted file mode 100644
index 89b708f68f..0000000000
--- a/keyboards/pinky/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = pinky/3
diff --git a/keyboards/ploopyco/madromys/post_rules.mk b/keyboards/ploopyco/madromys/post_rules.mk
new file mode 100644
index 0000000000..fab9162dc6
--- /dev/null
+++ b/keyboards/ploopyco/madromys/post_rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/ploopyco/madromys/rules.mk b/keyboards/ploopyco/madromys/rules.mk
deleted file mode 100644
index b7e33d92f9..0000000000
--- a/keyboards/ploopyco/madromys/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-POINTING_DEVICE_DRIVER = pmw3360
-
-DEFAULT_FOLDER = ploopyco/madromys/rev1_001
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 0f8774dcd7..0645283880 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -18,11 +18,6 @@
#pragma once
-// These pins are not broken out, and cannot be used normally.
-// They are set as output and pulled high, by default
-#define UNUSABLE_PINS \
- { B4, D6, F1, F5, F6, F7 }
-
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
@@ -30,13 +25,7 @@
// #define DEBUG_LED_PIN F7
-/* PMW33XX Settings */
-#define PMW33XX_CS_PIN B0
-
#define ENCODER_BUTTON_COL 1
#define ENCODER_BUTTON_ROW 0
/* Custom encoder needs to specify just how many encoders we have */
#define NUM_ENCODERS 1
-
-#define ENCODER_A_PINS { F0 }
-#define ENCODER_B_PINS { F4 }
diff --git a/keyboards/ploopyco/mouse/keyboard.json b/keyboards/ploopyco/mouse/info.json
index 4c81ee7338..1a70989f25 100644
--- a/keyboards/ploopyco/mouse/keyboard.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Mouse",
- "manufacturer": "PloopyCo",
+ "manufacturer": "Ploopy",
"url": "www.ploopy.co",
"maintainer": "drashna",
"usb": {
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"max_power": 100
},
+ "bootmagic": {
+ "matrix": [0, 3]
+ },
"features": {
"bootmagic": true,
"extrakey": true,
@@ -17,28 +20,6 @@
"pointing_device": true,
"encoder": true
},
- "bootmagic": {
- "matrix": [0, 3]
- },
- "ws2812": {
- "pin": "B5"
- },
- "rgblight": {
- "led_count": 4,
- "max_brightness": 40,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "matrix_pins": {
- "direct": [
- ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"]
- ]
- },
"encoder": {
"driver": "custom"
},
diff --git a/keyboards/ploopyco/mouse/post_rules.mk b/keyboards/ploopyco/mouse/post_rules.mk
new file mode 100644
index 0000000000..0d1a00b89e
--- /dev/null
+++ b/keyboards/ploopyco/mouse/post_rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = pmw3360 \ No newline at end of file
diff --git a/keyboards/ploopyco/mouse/readme.md b/keyboards/ploopyco/mouse/readme.md
index 060448c2bf..c5c6bb7dce 100644
--- a/keyboards/ploopyco/mouse/readme.md
+++ b/keyboards/ploopyco/mouse/readme.md
@@ -6,14 +6,14 @@ It's a DIY, QMK Powered Mouse!!!!
* Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
-* Hardware Supported: ATMega32u4 8MHz(3.3v)
+* Hardware Supported: ATMega32u4 8MHz(3.3v), Raspberry RP2040
* Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
Make example for this keyboard (after setting up your build environment):
make ploopyco/mouse:default:flash
-
-To jump to the bootloader, hold down "Button 4" (the "forward" button on the left side)
+
+To jump to the bootloader, hold down "Button 4" (the "forward" button on the left side)
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ploopyco/mouse/rev1_002/config.h b/keyboards/ploopyco/mouse/rev1_002/config.h
new file mode 100644
index 0000000000..49b53bc8dd
--- /dev/null
+++ b/keyboards/ploopyco/mouse/rev1_002/config.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2020 Ploopy Corporation
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// These pins are not broken out, and cannot be used normally.
+// They are set as output and pulled high, by default
+#define UNUSABLE_PINS \
+ { B4, D6, F1, F5, F6, F7 }
+
+// If board has a debug LED, you can enable it by defining this
+// #define DEBUG_LED_PIN F7
+
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B0
+
+#define ENCODER_A_PINS { F0 }
+#define ENCODER_B_PINS { F4 }
diff --git a/keyboards/ploopyco/mouse/rev1_002/keyboard.json b/keyboards/ploopyco/mouse/rev1_002/keyboard.json
new file mode 100644
index 0000000000..bfed3232f0
--- /dev/null
+++ b/keyboards/ploopyco/mouse/rev1_002/keyboard.json
@@ -0,0 +1,21 @@
+{
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"]
+ ]
+ },
+ "ws2812": {
+ "pin": "B5"
+ },
+ "rgblight": {
+ "led_count": 3,
+ "max_brightness": 40,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true
+ }
+ }
+}
diff --git a/keyboards/ploopyco/mouse/rev1_002/readme.md b/keyboards/ploopyco/mouse/rev1_002/readme.md
new file mode 100644
index 0000000000..a9400ea100
--- /dev/null
+++ b/keyboards/ploopyco/mouse/rev1_002/readme.md
@@ -0,0 +1,3 @@
+See the [main readme](../readme.md) for more details.
+
+This is for the R1.002 version of the Mouse. It's easily distinguishable from the R1.003+ versions of the Mouse because it has an ATmega32u4 on the board.
diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rev1_002/rules.mk
index 3d1d3fc961..3437a35bdf 100644
--- a/keyboards/ploopyco/mouse/rules.mk
+++ b/keyboards/ploopyco/mouse/rev1_002/rules.mk
@@ -1,4 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/ploopyco/mouse/rev1_003/config.h b/keyboards/ploopyco/mouse/rev1_003/config.h
new file mode 100644
index 0000000000..b4291e307b
--- /dev/null
+++ b/keyboards/ploopyco/mouse/rev1_003/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2024 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
+ * Copyright 2019 Sunjun Kim
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define UNUSABLE_PINS \
+ { GP1, GP3, GP4, GP6, GP8, GP10, GP11, GP16, GP18, GP20, GP25, GP27, GP29 }
+
+/* PMW3360 Settings */
+#define PMW33XX_LIFTOFF_DISTANCE 0x00
+#define PMW33XX_CS_PIN GP5
+#define SPI_SCK_PIN GP2
+#define SPI_MISO_PIN GP0
+#define SPI_MOSI_PIN GP7
+
+#define ENCODER_A_PINS { GP26 }
+#define ENCODER_B_PINS { GP28 }
diff --git a/keyboards/ploopyco/mouse/rev1_003/keyboard.json b/keyboards/ploopyco/mouse/rev1_003/keyboard.json
new file mode 100644
index 0000000000..46eca8012f
--- /dev/null
+++ b/keyboards/ploopyco/mouse/rev1_003/keyboard.json
@@ -0,0 +1,25 @@
+{
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "device_version": "1.0.0"
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "direct": [
+ ["GP15", "GP21", "GP23", "GP17", "GP19", "GP22", "GP14", "GP24"]
+ ]
+ },
+ "rgblight": {
+ "led_count": 1,
+ "max_brightness": 40,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true
+ }
+ },
+ "ws2812": {
+ "pin": "GP12"
+ }
+}
diff --git a/keyboards/ploopyco/mouse/rev1_003/readme.md b/keyboards/ploopyco/mouse/rev1_003/readme.md
new file mode 100644
index 0000000000..3e402f4280
--- /dev/null
+++ b/keyboards/ploopyco/mouse/rev1_003/readme.md
@@ -0,0 +1,3 @@
+See the [main readme](../readme.md) for more details.
+
+This is for the R1.003+ version of the Mouse. It's easily distinguishable from the previous versions of the Mouse because it has an RP2040 on the board.
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index 2aac27437a..1a9b4ad225 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -23,20 +23,11 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
+/* PMW3360 settings */
#define ROTATIONAL_TRANSFORM_ANGLE 20
-
-// If board has a debug LED, you can enable it by defining this
-// #define DEBUG_LED_PIN F7
-
-/* PMW33XX Settings */
-#define PMW33XX_CS_PIN B0
#define POINTING_DEVICE_INVERT_Y
-
#define ENCODER_BUTTON_COL 1
#define ENCODER_BUTTON_ROW 0
/* Custom encoder needs to specify just how many encoders we have */
#define NUM_ENCODERS 1
-
-#define ENCODER_A_PINS { F0 }
-#define ENCODER_B_PINS { F4 }
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index 8014db1d63..9e3312d4bc 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -1,6 +1,6 @@
{
- "keyboard_name": "Trackball",
- "manufacturer": "PloopyCo",
+ "keyboard_name": "Classic Trackball",
+ "manufacturer": "Ploopy",
"url": "www.ploopy.co",
"maintainer": "drashna",
"usb": {
@@ -12,7 +12,6 @@
"bootmagic": {
"matrix": [0, 3]
},
-
"features": {
"bootmagic": true,
"extrakey": true,
diff --git a/keyboards/ploopyco/trackball/post_rules.mk b/keyboards/ploopyco/trackball/post_rules.mk
new file mode 100644
index 0000000000..0d1a00b89e
--- /dev/null
+++ b/keyboards/ploopyco/trackball/post_rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = pmw3360 \ No newline at end of file
diff --git a/keyboards/ploopyco/trackball/readme.md b/keyboards/ploopyco/trackball/readme.md
index c668c5dd03..cca2c15114 100644
--- a/keyboards/ploopyco/trackball/readme.md
+++ b/keyboards/ploopyco/trackball/readme.md
@@ -1,27 +1,34 @@
-# Ploopyco Trackball
+# Ploopy Classic Trackball
-![Ploopyco Trackball](https://i.redd.it/j7z0y83txps31.jpg)
+![Ploopy Trackball](https://i.redd.it/j7z0y83txps31.jpg)
It's a DIY, QMK Powered Trackball!!!!
-* Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
-* Hardware Supported: ATMega32u4 8MHz(3.3v)
+* Keyboard Maintainer: [Ploopy](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
+* Hardware Supported: ATMega32u4 8MHz(3.3v), Raspberry RP2040
* Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
Make example for this keyboard (after setting up your build environment):
- make ploopyco/trackball/rev1:default:flash
+ make ploopyco/trackball/rev1_004:default:flash
make ploopyco/trackball/rev1_005:default:flash
-
-To jump to the bootloader, hold down "Button 4" (immediate right of the trackball)
+ make ploopyco/trackball/rev1_007:default:flash
+
+To jump to the bootloader, hold down "Button 4" (immediate right of the trackball)
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
## Revisions
-There are two main revisions for the PloopyCo Trackball, everything up to 1.004, and 1.005-1.006.
+There are three main revisions for the Ploopy Classic Trackball:
+
+- Everything up to 1.004 (very rare)
+- Revision 1.005 and 1.006 (commonly sold between 2020 and 2024)
+- Revision 1.007 (first available in 2025)
+
+In the 1.005 revision, button four was changed from pin B5 to B6, and the debug LED pin was changed from F7 to B5.
-In the 1.005 revision, button for was changed from pin B5 to B6, and the debug LED pin was changed from F7 to B5.
+In the 1.007 revision, the board was switched from an ATMega32u4 architecture to the Raspberry RP2040 architecture.
The PCB should indicate which revision this is.
diff --git a/keyboards/ploopyco/trackball/rev1/config.h b/keyboards/ploopyco/trackball/rev1_004/config.h
index 35ab215341..25bcf86391 100644
--- a/keyboards/ploopyco/trackball/rev1/config.h
+++ b/keyboards/ploopyco/trackball/rev1_004/config.h
@@ -25,3 +25,9 @@
// If board has a debug LED, you can enable it by defining this
#define DEBUG_LED_PIN F7
+
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B0
+
+#define ENCODER_A_PINS { F0 }
+#define ENCODER_B_PINS { F4 }
diff --git a/keyboards/ploopyco/trackball/rev1/keyboard.json b/keyboards/ploopyco/trackball/rev1_004/keyboard.json
index 8e372e7c2b..8e372e7c2b 100644
--- a/keyboards/ploopyco/trackball/rev1/keyboard.json
+++ b/keyboards/ploopyco/trackball/rev1_004/keyboard.json
diff --git a/keyboards/ploopyco/trackball/rev1/readme.md b/keyboards/ploopyco/trackball/rev1_004/readme.md
index a824c4690e..a824c4690e 100644
--- a/keyboards/ploopyco/trackball/rev1/readme.md
+++ b/keyboards/ploopyco/trackball/rev1_004/readme.md
diff --git a/keyboards/ploopyco/trackball/rev1_004/rules.mk b/keyboards/ploopyco/trackball/rev1_004/rules.mk
new file mode 100644
index 0000000000..3437a35bdf
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1_004/rules.mk
@@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 8000000
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index 014d67f9c1..404caca093 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -22,3 +22,12 @@
// They are set as output and pulled high, by default
#define UNUSABLE_PINS \
{ D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
+
+// If board has a debug LED, you can enable it by defining this
+// #define DEBUG_LED_PIN F7
+
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B0
+
+#define ENCODER_A_PINS { F0 }
+#define ENCODER_B_PINS { F4 }
diff --git a/keyboards/ploopyco/trackball/rev1_005/readme.md b/keyboards/ploopyco/trackball/rev1_005/readme.md
index a923d16591..980f118a10 100644
--- a/keyboards/ploopyco/trackball/rev1_005/readme.md
+++ b/keyboards/ploopyco/trackball/rev1_005/readme.md
@@ -1,3 +1,3 @@
-See the [main readme](../readme.md) for more details.
+See the [main readme](../readme.md) for more details.
-This is just the rev 1.005+ trackball
+This is for the R1.005-R1.006 version of the Classic. It's easily distinguishable from the R1.007+ versions of the Classic because it has an ATmega32u4 on the board. \ No newline at end of file
diff --git a/keyboards/ploopyco/trackball/rev1_005/rules.mk b/keyboards/ploopyco/trackball/rev1_005/rules.mk
new file mode 100644
index 0000000000..3437a35bdf
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1_005/rules.mk
@@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 8000000
diff --git a/keyboards/ploopyco/trackball/rev1_007/config.h b/keyboards/ploopyco/trackball/rev1_007/config.h
new file mode 100644
index 0000000000..97f2e46b5c
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1_007/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2024 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
+ * Copyright 2019 Sunjun Kim
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define UNUSABLE_PINS \
+ { GP1, GP3, GP4, GP6, GP8, GP10, GP11, GP14, GP16, GP18, GP20, GP22, GP24, GP25, GP27, GP29 }
+
+/* PMW3360 Settings */
+#define PMW33XX_LIFTOFF_DISTANCE 0x00
+#define PMW33XX_CS_PIN GP5
+#define SPI_SCK_PIN GP2
+#define SPI_MISO_PIN GP0
+#define SPI_MOSI_PIN GP7
+
+#define ENCODER_A_PINS { GP26 }
+#define ENCODER_B_PINS { GP28 }
diff --git a/keyboards/ploopyco/trackball/rev1_007/keyboard.json b/keyboards/ploopyco/trackball/rev1_007/keyboard.json
new file mode 100644
index 0000000000..4098c86fda
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1_007/keyboard.json
@@ -0,0 +1,25 @@
+{
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "device_version": "1.0.0"
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "direct": [
+ ["GP15", "GP21", "GP23", "GP17", "GP19"]
+ ]
+ },
+ "rgblight": {
+ "led_count": 1,
+ "max_brightness": 40,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true
+ }
+ },
+ "ws2812": {
+ "pin": "GP12"
+ }
+}
diff --git a/keyboards/ploopyco/trackball/rev1_007/readme.md b/keyboards/ploopyco/trackball/rev1_007/readme.md
new file mode 100644
index 0000000000..6b8da3a959
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1_007/readme.md
@@ -0,0 +1,3 @@
+See the [main readme](../readme.md) for more details.
+
+This is for the R1.007+ version of the Classic. It's easily distinguishable from the previous versions of the Classic because it has an RP2040 on the board.
diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk
deleted file mode 100644
index 9ea10ba6e8..0000000000
--- a/keyboards/ploopyco/trackball/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Processor frequency
-F_CPU = 8000000
-
-POINTING_DEVICE_DRIVER = pmw3360
-
-DEFAULT_FOLDER = ploopyco/trackball/rev1_005
diff --git a/keyboards/ploopyco/trackball_mini/post_rules.mk b/keyboards/ploopyco/trackball_mini/post_rules.mk
new file mode 100644
index 0000000000..99fca15fc1
--- /dev/null
+++ b/keyboards/ploopyco/trackball_mini/post_rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns5050
diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk
deleted file mode 100644
index 2705ac6855..0000000000
--- a/keyboards/ploopyco/trackball_mini/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-POINTING_DEVICE_DRIVER = adns5050
-
-DEFAULT_FOLDER = ploopyco/trackball_mini/rev1_001
diff --git a/keyboards/ploopyco/trackball_nano/post_rules.mk b/keyboards/ploopyco/trackball_nano/post_rules.mk
new file mode 100644
index 0000000000..99fca15fc1
--- /dev/null
+++ b/keyboards/ploopyco/trackball_nano/post_rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns5050
diff --git a/keyboards/ploopyco/trackball_nano/rules.mk b/keyboards/ploopyco/trackball_nano/rules.mk
deleted file mode 100644
index df29dfbc07..0000000000
--- a/keyboards/ploopyco/trackball_nano/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-POINTING_DEVICE_DRIVER = adns5050
-
-DEFAULT_FOLDER = ploopyco/trackball_nano/rev1_001
diff --git a/keyboards/ploopyco/trackball_thumb/config.h b/keyboards/ploopyco/trackball_thumb/config.h
index f03ffc7699..0f269bd21a 100644
--- a/keyboards/ploopyco/trackball_thumb/config.h
+++ b/keyboards/ploopyco/trackball_thumb/config.h
@@ -29,9 +29,6 @@
// If board has a debug LED, you can enable it by defining this
// #define DEBUG_LED_PIN F7
-/* PMW3360 Settings */
-#define POINTING_DEVICE_CS_PIN B0
-
#define ENCODER_BUTTON_COL 1
#define ENCODER_BUTTON_ROW 0
@@ -41,6 +38,3 @@
#define ENCODER_HIGH_THRES_B 90
/* Custom encoder needs to specify just how many encoders we have */
#define NUM_ENCODERS 1
-
-#define ENCODER_A_PINS { F4 }
-#define ENCODER_B_PINS { F0 }
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
index e27bf47252..7e93296d24 100644
--- a/keyboards/ploopyco/trackball_thumb/info.json
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -1,22 +1,22 @@
{
- "keyboard_name": "PloopyCo Thumb Trackball",
+ "keyboard_name": "Thumb Trackball",
+ "manufacturer": "Ploopy",
"url": "www.ploopy.co",
"maintainer": "ploopyco",
- "manufacturer": "Ploopy Corporation",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
"usb": {
"vid": "0x5043",
"pid": "0x5C46",
+ "device_version": "0.0.1",
"max_power": 100
},
+ "bootmagic": {
+ "matrix": [0, 3]
+ },
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true,
+ "nkro": false,
"pointing_device": true,
"encoder": true
},
diff --git a/keyboards/ploopyco/trackball_thumb/post_rules.mk b/keyboards/ploopyco/trackball_thumb/post_rules.mk
new file mode 100644
index 0000000000..0d1a00b89e
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/post_rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = pmw3360 \ No newline at end of file
diff --git a/keyboards/ploopyco/trackball_thumb/readme.md b/keyboards/ploopyco/trackball_thumb/readme.md
index 8299c08809..bb870d2003 100644
--- a/keyboards/ploopyco/trackball_thumb/readme.md
+++ b/keyboards/ploopyco/trackball_thumb/readme.md
@@ -3,13 +3,13 @@
It's a DIY, QMK Powered Trackball...for thumb ballers!
* Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
-* Hardware Supported: ATMega32u4 8MHz(3.3v)
+* Hardware Supported: ATMega32u4 8MHz(3.3v), Raspberry RP2040
* Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
Make example for this keyboard (after setting up your build environment):
make ploopyco/trackball_thumb/rev1_001:default:flash
-
+
To jump to the bootloader, hold down "Button 4" (button closest to the USB port).
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h b/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
index a648e8e8e4..108a104cdc 100644
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
@@ -22,3 +22,9 @@
// They are set as output and pulled high, by default
#define UNUSABLE_PINS \
{ D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
+
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B0
+
+#define ENCODER_A_PINS { F0 }
+#define ENCODER_B_PINS { F4 }
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json b/keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json
index db12ee6217..04457f19b9 100644
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json
@@ -1,13 +1,14 @@
{
- "usb": {
- "device_version": "1.0.0"
- },
- "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"matrix_pins": {
"direct": [
["D5", "B6", "D4", "D2", "E6", "D7"]
]
},
+ "ws2812": {
+ "pin": "B5"
+ },
"rgblight": {
"led_count": 3,
"max_brightness": 40,
@@ -16,8 +17,5 @@
"rainbow_mood": true,
"rainbow_swirl": true
}
- },
- "ws2812": {
- "pin": "B5"
}
}
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md b/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md
index 5a5f0563e7..658a71df0a 100644
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md
@@ -1,3 +1,3 @@
-This is the R1.001+ version of the Thumb. Future versions may have other features.
+See the [main readme](../readme.md) for more details.
-See the [main readme](../readme.md) for more details.
+This is for the R1.001 version of the Thumb. It's easily distinguishable from the R1.002+ versions of the Thumb because it has an ATmega32u4 on the board. \ No newline at end of file
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk b/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk
new file mode 100644
index 0000000000..3437a35bdf
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk
@@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 8000000
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_002/config.h b/keyboards/ploopyco/trackball_thumb/rev1_002/config.h
new file mode 100644
index 0000000000..e25f50604e
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_002/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2024 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
+ * Copyright 2019 Sunjun Kim
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define UNUSABLE_PINS \
+ { GP1, GP3, GP4, GP6, GP8, GP10, GP11, GP14, GP18, GP20, GP22, GP24, GP25, GP27, GP29 }
+
+/* PMW3360 Settings */
+#define PMW33XX_LIFTOFF_DISTANCE 0x00
+#define PMW33XX_CS_PIN GP5
+#define SPI_SCK_PIN GP2
+#define SPI_MISO_PIN GP0
+#define SPI_MOSI_PIN GP7
+
+#define ENCODER_A_PINS { GP28 }
+#define ENCODER_B_PINS { GP26 }
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_002/keyboard.json b/keyboards/ploopyco/trackball_thumb/rev1_002/keyboard.json
new file mode 100644
index 0000000000..a3a50a536e
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_002/keyboard.json
@@ -0,0 +1,25 @@
+{
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "device_version": "1.0.0"
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "direct": [
+ ["GP17", "GP16", "GP15", "GP21", "GP23", "GP19"]
+ ]
+ },
+ "rgblight": {
+ "led_count": 1,
+ "max_brightness": 40,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true
+ }
+ },
+ "ws2812": {
+ "pin": "GP12"
+ }
+}
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_002/readme.md b/keyboards/ploopyco/trackball_thumb/rev1_002/readme.md
new file mode 100644
index 0000000000..c1e95d9a8e
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_002/readme.md
@@ -0,0 +1,3 @@
+See the [main readme](../readme.md) for more details.
+
+This is for the R1.002+ version of the Thumb. It's easily distinguishable from the previous versions of the Thumb because it has an RP2040 on the board.
diff --git a/keyboards/ploopyco/trackball_thumb/rules.mk b/keyboards/ploopyco/trackball_thumb/rules.mk
deleted file mode 100644
index 0bd44d316a..0000000000
--- a/keyboards/ploopyco/trackball_thumb/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Processor frequency
-F_CPU = 8000000
-
-POINTING_DEVICE_DRIVER = pmw3360
-
-DEFAULT_FOLDER = ploopyco/trackball_thumb/rev1_001
diff --git a/keyboards/polilla/rules.mk b/keyboards/polilla/rules.mk
deleted file mode 100644
index 0d72c40bb6..0000000000
--- a/keyboards/polilla/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = polilla/rev1 \ No newline at end of file
diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk
deleted file mode 100644
index 585a04ad28..0000000000
--- a/keyboards/primekb/meridian/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = primekb/meridian/ktr1010
diff --git a/keyboards/primekb/prime_e/rules.mk b/keyboards/primekb/prime_e/rules.mk
deleted file mode 100644
index debb966e0d..0000000000
--- a/keyboards/primekb/prime_e/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = primekb/prime_e/std
diff --git a/keyboards/primekb/prime_l/rules.mk b/keyboards/primekb/prime_l/rules.mk
deleted file mode 100644
index 235bfea925..0000000000
--- a/keyboards/primekb/prime_l/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = primekb/prime_l/v1
diff --git a/keyboards/program_yoink/rules.mk b/keyboards/program_yoink/rules.mk
deleted file mode 100644
index a7cc1a2dbf..0000000000
--- a/keyboards/program_yoink/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = program_yoink/staggered
diff --git a/keyboards/projectcain/vault35/rules.mk b/keyboards/projectcain/vault35/rules.mk
deleted file mode 100644
index 3cf3a331d8..0000000000
--- a/keyboards/projectcain/vault35/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = projectcain/vault35/atmega32u4
diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h
index c8da5c42a7..6e23afc902 100644
--- a/keyboards/projectd/65/projectd_65_ansi/config.h
+++ b/keyboards/projectd/65/projectd_65_ansi/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_EN_PIN C13
diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h
index 282e20a8e2..acbe853949 100644
--- a/keyboards/projectd/75/ansi/config.h
+++ b/keyboards/projectd/75/ansi/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_CS_PIN_2 B15
diff --git a/keyboards/projectd/75/iso/config.h b/keyboards/projectd/75/iso/config.h
index 282e20a8e2..acbe853949 100644
--- a/keyboards/projectd/75/iso/config.h
+++ b/keyboards/projectd/75/iso/config.h
@@ -22,8 +22,11 @@
/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
#define AW20216S_CS_PIN_1 A15
#define AW20216S_CS_PIN_2 B15
diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk
deleted file mode 100644
index d672576992..0000000000
--- a/keyboards/projectkb/alice/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = projectkb/alice/rev1
diff --git a/keyboards/qpockets/space_space/rules.mk b/keyboards/qpockets/space_space/rules.mk
deleted file mode 100644
index 0ffe2efbf2..0000000000
--- a/keyboards/qpockets/space_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = qpockets/space_space/rev2
diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk
deleted file mode 100644
index 688444b566..0000000000
--- a/keyboards/qwertyydox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = qwertyydox/rev1
diff --git a/keyboards/rate/pistachio/rules.mk b/keyboards/rate/pistachio/rules.mk
deleted file mode 100644
index a5f4485316..0000000000
--- a/keyboards/rate/pistachio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rate/pistachio/rev2
diff --git a/keyboards/recompile_keys/choco60/rules.mk b/keyboards/recompile_keys/choco60/rules.mk
deleted file mode 100644
index 6abfd34d47..0000000000
--- a/keyboards/recompile_keys/choco60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = recompile_keys/choco60/rev1
diff --git a/keyboards/recompile_keys/nomu30/rules.mk b/keyboards/recompile_keys/nomu30/rules.mk
deleted file mode 100644
index 431b619249..0000000000
--- a/keyboards/recompile_keys/nomu30/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = recompile_keys/nomu30/rev1
diff --git a/keyboards/redox/rev1/rules.mk b/keyboards/redox/rev1/rules.mk
deleted file mode 100644
index c971da1680..0000000000
--- a/keyboards/redox/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = redox/rev1/base
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
deleted file mode 100644
index 317c4d5a87..0000000000
--- a/keyboards/rgbkb/mun/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/mun/rev1
diff --git a/keyboards/rgbkb/pan/rev1/32a/rules.mk b/keyboards/rgbkb/pan/rev1/32a/rules.mk
index c2ee0bc86f..f54ef3e987 100644
--- a/keyboards/rgbkb/pan/rev1/32a/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/32a/rules.mk
@@ -1,2 +1,4 @@
# Processor frequency
F_CPU = 16000000
+
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
new file mode 100644
index 0000000000..9a69649289
--- /dev/null
+++ b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk
deleted file mode 100644
index 4d3c0f6679..0000000000
--- a/keyboards/rgbkb/pan/rev1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# The default configuration is a atmega32a
-DEFAULT_FOLDER = rgbkb/pan/rev1/32a
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
deleted file mode 100644
index b6f1d46a65..0000000000
--- a/keyboards/rgbkb/pan/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-WS2812_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = rgbkb/pan/rev1
diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk
deleted file mode 100644
index f8325017f9..0000000000
--- a/keyboards/rgbkb/sol/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/sol/rev2
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index a81ea7bc21..775e3f8629 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -153,6 +153,8 @@
"pin": "A9"
},
"transport": {
+ "watchdog": true,
+ "watchdog_timeout": 20000,
"sync": {
"indicators": true,
"layer_state": true,
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
deleted file mode 100644
index 74804682a2..0000000000
--- a/keyboards/rgbkb/sol3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/sol3/rev1
diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk
deleted file mode 100644
index ee94832d4d..0000000000
--- a/keyboards/rgbkb/zen/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/zen/rev2
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
deleted file mode 100644
index 8544e8767d..0000000000
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/zygomorph/rev1
diff --git a/keyboards/rmi_kb/herringbone/rules.mk b/keyboards/rmi_kb/herringbone/rules.mk
deleted file mode 100644
index 1efe9fa4f5..0000000000
--- a/keyboards/rmi_kb/herringbone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rmi_kb/herringbone/v1
diff --git a/keyboards/rmi_kb/mona/rules.mk b/keyboards/rmi_kb/mona/rules.mk
deleted file mode 100644
index 54aa705d96..0000000000
--- a/keyboards/rmi_kb/mona/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rmi_kb/mona/v1_1
diff --git a/keyboards/rmi_kb/tkl_ff/rules.mk b/keyboards/rmi_kb/tkl_ff/rules.mk
deleted file mode 100644
index c8847cc266..0000000000
--- a/keyboards/rmi_kb/tkl_ff/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rmi_kb/tkl_ff/v1
diff --git a/keyboards/rmi_kb/wete/rules.mk b/keyboards/rmi_kb/wete/rules.mk
deleted file mode 100644
index cda6fbfbe4..0000000000
--- a/keyboards/rmi_kb/wete/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rmi_kb/wete/v2
diff --git a/keyboards/rookiebwoy/late9/rules.mk b/keyboards/rookiebwoy/late9/rules.mk
deleted file mode 100755
index 358facb3ca..0000000000
--- a/keyboards/rookiebwoy/late9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rookiebwoy/late9/rev1
diff --git a/keyboards/rookiebwoy/neopad/rules.mk b/keyboards/rookiebwoy/neopad/rules.mk
deleted file mode 100755
index c34c04435e..0000000000
--- a/keyboards/rookiebwoy/neopad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rookiebwoy/neopad/rev1
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
deleted file mode 100644
index 556ec17655..0000000000
--- a/keyboards/rura66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
deleted file mode 100644
index 15364c29a5..0000000000
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
deleted file mode 100644
index 069fe74b14..0000000000
--- a/keyboards/salicylic_acid3/getta25/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/getta25/rev1
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
deleted file mode 100644
index d54d2ccef4..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
deleted file mode 100644
index dadfa7a257..0000000000
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
deleted file mode 100644
index 904309ea35..0000000000
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
deleted file mode 100644
index 0ac8d83bfc..0000000000
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
deleted file mode 100644
index 02e68b5748..0000000000
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
diff --git a/keyboards/sawnsprojects/okayu/rules.mk b/keyboards/sawnsprojects/okayu/rules.mk
deleted file mode 100644
index 59655554eb..0000000000
--- a/keyboards/sawnsprojects/okayu/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = sawnsprojects/okayu/stm32f072 \ No newline at end of file
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json b/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
index 7d36616e52..b7a628fd78 100644
--- a/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
@@ -21,7 +21,7 @@
"rgb_matrix": true
},
"matrix_pins": {
- "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7"],
+ "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "C6", "C7", "C8", "C9", "A8"],
"rows": ["A0", "A1", "A2", "A3", "C13"]
},
"processor": "WB32FQ95",
@@ -77,11 +77,15 @@
"driver": "ws2812",
"layout": [
{"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 154, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 172, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 190, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 207, "y": 64, "flags": 4},
- {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
- {"matrix": [3, 13], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [4, 15], "x": 224, "y": 64, "flags": 4},
+ {"matrix": [3, 15], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 200, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 190, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 172, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 155, "y": 48, "flags": 4},
@@ -93,6 +97,7 @@
{"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 17, "y": 48, "flags": 4},
+ {"matrix": [4, 3], "x": 52, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 34, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 17, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
@@ -109,8 +114,10 @@
{"matrix": [2, 9], "x": 155, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
- {"matrix": [2, 13], "x": 207, "y": 32, "flags": 4},
- {"matrix": [2, 12], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [2, 12], "x": 200, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 224, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 207, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 190, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 172, "y": 16, "flags": 4},
@@ -137,7 +144,9 @@
{"matrix": [0, 10], "x": 172, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 190, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 207, "y": 0, "flags": 4},
- {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}
+ {"matrix": [0, 13], "x": 210, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 210, "y": 0, "flags": 4},
+ {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4}
],
"max_brightness": 110,
"sleep": true,
@@ -145,13 +154,13 @@
},
"url": "",
"usb": {
- "device_version": "1.0.0",
+ "device_version": "1.1.0",
"pid": "0x1020",
"suspend_wakeup_delay": 1000,
"vid": "0x6332"
},
"ws2812": {
- "pin": "A8"
+ "pin": "B15"
},
"community_layouts": ["60_ansi", "60_iso"],
"layouts": {
@@ -170,7 +179,9 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 0.5},
+ {"matrix": [0, 14], "x": 13.5, "y": 0},
+ {"matrix": [0, 15], "x": 14.5, "y": 0, "w": 0.5},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -184,7 +195,8 @@
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1},
+ {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 0.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -197,28 +209,34 @@
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 0.75},
+ {"matrix": [3, 1], "x": 0.75, "y": 3, "w": 0.5},
+ {"matrix": [3, 2], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3},
+ {"matrix": [3, 14], "x": 13.25, "y": 3, "w": 0.75},
+ {"matrix": [3, 15], "x": 14, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.25},
+ {"matrix": [4, 9], "x": 9, "y": 4},
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 15], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
@@ -236,7 +254,7 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -250,7 +268,7 @@
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -264,18 +282,18 @@
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -283,7 +301,7 @@
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 15], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso": {
@@ -301,7 +319,7 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -328,20 +346,20 @@
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 2], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -349,7 +367,7 @@
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 15], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
index a8a64d1f2d..9a9e207113 100644
--- a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
@@ -4,18 +4,18 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all(
+ [0] = LAYOUT_60_iso(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL
),
- [1] = LAYOUT_all(
+ [1] = LAYOUT_60_iso(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, RM_VALU,
- _______, _______, _______, _______, _______, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,
+ _______, _______, _______, _______, _______, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, RM_VALU, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, RM_VALD, _______,
_______, GU_TOGG, _______, _______, _______, _______, RM_HUEU, RM_NEXT
)
diff --git a/keyboards/silakka54/config.h b/keyboards/silakka54/config.h
new file mode 100644
index 0000000000..220b85cd08
--- /dev/null
+++ b/keyboards/silakka54/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2024 Juho T. (@Squalius-cephalus)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/silakka54/keyboard.json b/keyboards/silakka54/keyboard.json
new file mode 100644
index 0000000000..e1ad9aac9e
--- /dev/null
+++ b/keyboards/silakka54/keyboard.json
@@ -0,0 +1,102 @@
+{
+ "manufacturer": "Squalius-cephalus",
+ "keyboard_name": "silakka54",
+ "maintainer": "Squalius-cephalus",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "split": {
+ "enabled": true,
+ "serial": {
+ "driver": "vendor"
+ }
+ },
+ "matrix_pins": {
+ "cols": ["GP7", "GP8", "GP9", "GP10", "GP11", "GP12"],
+ "rows": ["GP2", "GP3", "GP4", "GP5","GP6"]
+ },
+ "processor": "RP2040",
+ "url": "https://github.com/Squalius-cephalus/silakka54",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x1212",
+ "vid": "0xFEED"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [5, 5], "x": 0, "y": 5},
+ {"matrix": [5, 4], "x": 1, "y": 5},
+ {"matrix": [5, 3], "x": 2, "y": 5},
+ {"matrix": [5, 2], "x": 3, "y": 5},
+ {"matrix": [5, 1], "x": 4, "y": 5},
+ {"matrix": [5, 0], "x": 5, "y": 5},
+
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 5], "x": 0, "y": 6},
+ {"matrix": [6, 4], "x": 1, "y": 6},
+ {"matrix": [6, 3], "x": 2, "y": 6},
+ {"matrix": [6, 2], "x": 3, "y": 6},
+ {"matrix": [6, 1], "x": 4, "y": 6},
+ {"matrix": [6, 0], "x": 5, "y": 6},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [7, 5], "x": 0, "y": 7},
+ {"matrix": [7, 4], "x": 1, "y": 7},
+ {"matrix": [7, 3], "x": 2, "y": 7},
+ {"matrix": [7, 2], "x": 3, "y": 7},
+ {"matrix": [7, 1], "x": 4, "y": 7},
+ {"matrix": [7, 0], "x": 5, "y": 7},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [8, 5], "x": 0, "y": 9},
+ {"matrix": [8, 4], "x": 1, "y": 9},
+ {"matrix": [8, 3], "x": 2, "y": 9},
+ {"matrix": [8, 2], "x": 3, "y": 9},
+ {"matrix": [8, 1], "x": 4, "y": 9},
+ {"matrix": [8, 0], "x": 5, "y": 9},
+
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [9, 5], "x": 3, "y": 9},
+ {"matrix": [9, 4], "x": 4, "y": 9},
+ {"matrix": [9, 3], "x": 5, "y": 9}
+
+
+ ]
+ }
+ }
+}
diff --git a/keyboards/silakka54/keymaps/default/keymap.c b/keyboards/silakka54/keymaps/default/keymap.c
new file mode 100644
index 0000000000..aa5e64efa3
--- /dev/null
+++ b/keyboards/silakka54/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LGUI, MO(1), KC_SPC, KC_ENT, KC_RCTL, KC_RALT
+ ),
+ [1] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_DEL, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/silakka54/readme.md b/keyboards/silakka54/readme.md
new file mode 100644
index 0000000000..08a38aa473
--- /dev/null
+++ b/keyboards/silakka54/readme.md
@@ -0,0 +1,26 @@
+# Silakka54
+
+![Silakka54](https://i.imgur.com/JrsS0kY.png)
+
+Silakka54 is a RP2040 Zero based 54-key column staggered split keyboard. PCB uses hotswap sockets. Design is inspired from REVIUNG41 and Corne keyboards.
+
+* Keyboard Maintainer: [Squalius-cephalus](https://github.com/Squalius-cephalus)
+* Hardware Supported: Silakka54 PCB
+* Hardware Availability: https://github.com/Squalius-cephalus/silakka54
+
+Make example for this keyboard (after setting up your build environment):
+
+ make silakka54:default
+
+Flashing example for this keyboard:
+
+ make silakka54:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical boot button**: Hold BOOT button down and connect MCU to the PC
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/skyloong/gk61/pro/config.h b/keyboards/skyloong/gk61/pro/config.h
index db02496f8b..aeea36e0bc 100644
--- a/keyboards/skyloong/gk61/pro/config.h
+++ b/keyboards/skyloong/gk61/pro/config.h
@@ -7,6 +7,3 @@
#define IS31FL3743A_SDB_PIN C1
#define CAPS_LOCK_INDEX 28
-#define WIN_MOD_INDEX 16
-#define MAC_MOD_INDEX 17
-#define WIN_LOCK_INDEX 54
diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c
index 2299977e0e..11411ba2b1 100644
--- a/keyboards/skyloong/gk61/pro/pro.c
+++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -1,11 +1,8 @@
// Copyright 2023 linlin012 (@linlin012)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "quantum.h"
-int FN_WIN = 0;
-int FN_MAC = 0;
-int L_WIN = 0;
-int L_MAC = 0;
+#if defined(RGB_MATRIX_ENABLE)
const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
@@ -83,7 +80,32 @@ const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
{0, SW10_CS13, SW10_CS14, SW10_CS15}
};
-#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+ if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+ return false;
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255);
+ } else {
+ if (!rgb_matrix_get_flags()) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0);
+ }
+ }
+
+ return false;
+}
+
+void suspend_power_down_kb(void) {
+ gpio_write_pin_low(IS31FL3743A_SDB_PIN);
+ suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+ gpio_write_pin_high(IS31FL3743A_SDB_PIN);
+ suspend_wakeup_init_user();
+}
+#endif
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) {
@@ -105,124 +127,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
}
return false;
# endif
- case TO(0):
- if (record->event.pressed) {
- L_WIN = 1;
- set_single_persistent_default_layer(0); // Save default layer 0 to eeprom
- } else {
- L_WIN = 0;
- }
- return true; // continue all further processing of this key
-
- case MO(2):
- if (record->event.pressed) {
- FN_WIN = 1;
- } else {
- FN_WIN = 0;
- }
- return true; // continue all further processing of this key
-
- case TO(1):
- if (record->event.pressed) {
- L_MAC = 1;
- set_single_persistent_default_layer(1); //Save default layer 1 to eeprom
- } else {
- L_MAC = 0;
- }
- return true; // continue all further processing of this key
-
- case MO(3):
- if (record->event.pressed) {
- FN_MAC = 1;
- } else {
- FN_MAC = 0;
- }
- return true; // continue all further processing of this key
- default:
- return true;
- }
-
-}
-
-bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
- if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
- return false;
- }
-
- if (host_keyboard_led_state().caps_lock) {
- RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255);
- } else {
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0);
- }
- }
-
- switch (get_highest_layer(layer_state)) {
- case 0:{
- if (L_WIN) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- }else{
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- }
- }
- } break;
-
- case 1:{
- if (L_MAC) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- }
- }else{
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- }
- } break;
-
-
- case 2:{
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- } break;
-
- case 3:{
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- }
- } break;
-
- default:{
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- }
}
- return false;
-}
-
-#endif
-void suspend_power_down_kb() {
-# ifdef RGB_MATRIX_ENABLE
- gpio_write_pin_low(IS31FL3743A_SDB_PIN);
-# endif
- suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb() {
-# ifdef RGB_MATRIX_ENABLE
- gpio_write_pin_high(IS31FL3743A_SDB_PIN);
-# endif
- suspend_wakeup_init_user();
+ return true;
}
void board_init(void) {
diff --git a/keyboards/skyloong/gk61/pro_48/config.h b/keyboards/skyloong/gk61/pro_48/config.h
index 5b4976e2da..7e45ac8354 100644
--- a/keyboards/skyloong/gk61/pro_48/config.h
+++ b/keyboards/skyloong/gk61/pro_48/config.h
@@ -7,7 +7,3 @@
#define IS31FL3743A_SDB_PIN A4
#define CAPS_LOCK_INDEX 28
-#define WIN_MOD_INDEX 16
-#define MAC_MOD_INDEX 17
-
-#define g_suspend_state rgb_matrix_get_suspend_state()
diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c
index 6da76a1767..11411ba2b1 100644
--- a/keyboards/skyloong/gk61/pro_48/pro_48.c
+++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -1,12 +1,8 @@
// Copyright 2023 linlin012 (@linlin012)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "quantum.h"
-_Bool FN_WIN = 0;
-_Bool FN_MAC = 0;
-_Bool L_WIN = 0;
-_Bool L_MAC = 0;
-#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/
+#if defined(RGB_MATRIX_ENABLE)
const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
@@ -97,57 +93,9 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
}
}
- switch (get_highest_layer(layer_state)) {
- case 2:{
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- } break;
- case 3:{
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- }
- } break;
-
- case 0:{
- if (L_WIN) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- }else{
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- }
- }
- } break;
-
- case 1:{
- if (L_MAC) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255);
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- }
- }else{
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- }
- } break;
-
- default:{
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0);
- RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0);
- }
- }
- }
return false;
}
-
void suspend_power_down_kb(void) {
gpio_write_pin_low(IS31FL3743A_SDB_PIN);
suspend_power_down_user();
@@ -177,44 +125,11 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
} break;
}
}
- return false;
+ return false;
# endif
- case TO(0):
- if (record->event.pressed) {
- L_WIN = 1;
- set_single_persistent_default_layer(0); // Save default layer 0 to eeprom
- } else {
- L_WIN = 0;
- }
- return true; // continue all further processing of this key
-
- case MO(2):
- if (record->event.pressed) {
- FN_WIN = 1;
- } else {
- FN_WIN = 0;
- }
- return true; // continue all further processing of this key
-
- case TO(1):
- if (record->event.pressed) {
- L_MAC = 1;
- set_single_persistent_default_layer(1); //Save default layer 1 to eeprom
- } else {
- L_MAC = 0;
- }
- return true; // continue all further processing of this key
-
- case MO(3):
- if (record->event.pressed) {
- FN_MAC = 1;
- } else {
- FN_MAC = 0;
- }
- return true; // continue all further processing of this key
- default:
- return true;
}
+
+ return true;
}
void board_init(void) {
diff --git a/keyboards/smoll/lefty/rules.mk b/keyboards/smoll/lefty/rules.mk
deleted file mode 100644
index 6bc5abbdc5..0000000000
--- a/keyboards/smoll/lefty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = smoll/lefty/rev2
diff --git a/keyboards/sofle/rules.mk b/keyboards/sofle/rules.mk
deleted file mode 100644
index a7307c3499..0000000000
--- a/keyboards/sofle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = sofle/rev1
diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
deleted file mode 100644
index 8fe37f83b3..0000000000
--- a/keyboards/spaceholdings/nebula68b/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = spaceholdings/nebula68b/solder
diff --git a/keyboards/spacetime/rules.mk b/keyboards/spacetime/rules.mk
deleted file mode 100644
index ac339c2cef..0000000000
--- a/keyboards/spacetime/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = spacetime/rev1
diff --git a/keyboards/splitkb/aurora/corne/rules.mk b/keyboards/splitkb/aurora/corne/rules.mk
deleted file mode 100644
index 9b4b90e972..0000000000
--- a/keyboards/splitkb/aurora/corne/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2022 splitkb.com <[email protected]>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-DEFAULT_FOLDER = splitkb/aurora/corne/rev1
diff --git a/keyboards/splitkb/aurora/helix/rules.mk b/keyboards/splitkb/aurora/helix/rules.mk
deleted file mode 100644
index 8130273c1f..0000000000
--- a/keyboards/splitkb/aurora/helix/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitkb/aurora/helix/rev1 \ No newline at end of file
diff --git a/keyboards/splitkb/aurora/lily58/rules.mk b/keyboards/splitkb/aurora/lily58/rules.mk
deleted file mode 100644
index 1f5b922836..0000000000
--- a/keyboards/splitkb/aurora/lily58/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2022 splitkb.com <[email protected]>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-DEFAULT_FOLDER = splitkb/aurora/lily58/rev1
diff --git a/keyboards/splitkb/aurora/sofle_v2/rules.mk b/keyboards/splitkb/aurora/sofle_v2/rules.mk
deleted file mode 100644
index 4a50c4dbb1..0000000000
--- a/keyboards/splitkb/aurora/sofle_v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitkb/aurora/sofle_v2/rev1 \ No newline at end of file
diff --git a/keyboards/splitkb/aurora/sweep/rules.mk b/keyboards/splitkb/aurora/sweep/rules.mk
deleted file mode 100644
index ec1e102039..0000000000
--- a/keyboards/splitkb/aurora/sweep/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2022 splitkb.com <[email protected]>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-DEFAULT_FOLDER = splitkb/aurora/sweep/rev1
diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk
deleted file mode 100644
index 3a8bfbe089..0000000000
--- a/keyboards/splitkb/kyria/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitkb/kyria/rev1/base
diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk
deleted file mode 100644
index fb808070bf..0000000000
--- a/keyboards/splitkb/kyria/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitkb/kyria/rev2/base
diff --git a/keyboards/splitkb/kyria/rules.mk b/keyboards/splitkb/kyria/rules.mk
deleted file mode 100644
index 1342089f56..0000000000
--- a/keyboards/splitkb/kyria/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitkb/kyria/rev3
diff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk
deleted file mode 100644
index 68b3198bfb..0000000000
--- a/keyboards/splitty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitty/rev1
diff --git a/keyboards/studiokestra/galatea/rules.mk b/keyboards/studiokestra/galatea/rules.mk
deleted file mode 100644
index b5b1db4238..0000000000
--- a/keyboards/studiokestra/galatea/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = studiokestra/galatea/rev1 \ No newline at end of file
diff --git a/keyboards/takashiski/hecomi/rules.mk b/keyboards/takashiski/hecomi/rules.mk
deleted file mode 100644
index 41002fe272..0000000000
--- a/keyboards/takashiski/hecomi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = takashiski/hecomi/alpha
diff --git a/keyboards/takashiski/namecard2x4/rules.mk b/keyboards/takashiski/namecard2x4/rules.mk
deleted file mode 100644
index f93cfc823d..0000000000
--- a/keyboards/takashiski/namecard2x4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = takashiski/namecard2x4/rev2
diff --git a/keyboards/teleport/native/ansi/rules.mk b/keyboards/teleport/native/ansi/rules.mk
new file mode 100644
index 0000000000..942ef4c5db
--- /dev/null
+++ b/keyboards/teleport/native/ansi/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/teleport/native/iso/rules.mk b/keyboards/teleport/native/iso/rules.mk
new file mode 100644
index 0000000000..942ef4c5db
--- /dev/null
+++ b/keyboards/teleport/native/iso/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
deleted file mode 100644
index 53dc2b1747..0000000000
--- a/keyboards/teleport/native/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_CUSTOM_KB = yes
-
-DEFAULT_FOLDER = teleport/native/iso
diff --git a/keyboards/tgr/tris/readme.md b/keyboards/tgr/tris/readme.md
index c9cc199069..e01e7decaa 100644
--- a/keyboards/tgr/tris/readme.md
+++ b/keyboards/tgr/tris/readme.md
@@ -1,7 +1,5 @@
# TGR Tris/Tris CE
-A short description of the keyboard/project
-
* Keyboard Maintainer: [poisonking](https://github.com/halfenergized)
* Hardware Supported: Tris PCB
* Hardware Availability: https://geekhack.org/index.php?topic=86221.0
diff --git a/keyboards/themadnoodle/noodlepad/rules.mk b/keyboards/themadnoodle/noodlepad/rules.mk
deleted file mode 100644
index 318832e121..0000000000
--- a/keyboards/themadnoodle/noodlepad/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default folder for noodlepad
-DEFAULT_FOLDER = themadnoodle/noodlepad/v1
-
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
deleted file mode 100644
index ab8aeff268..0000000000
--- a/keyboards/tkw/grandiceps/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
deleted file mode 100644
index 1a660af26c..0000000000
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tkw/stoutgat/v2/f411
diff --git a/keyboards/tominabox1/le_chiffre/rules.mk b/keyboards/tominabox1/le_chiffre/rules.mk
deleted file mode 100644
index 57b3d94eab..0000000000
--- a/keyboards/tominabox1/le_chiffre/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tominabox1/le_chiffre/rev1
diff --git a/keyboards/tominabox1/littlefoot_lx/rules.mk b/keyboards/tominabox1/littlefoot_lx/rules.mk
deleted file mode 100644
index 4756f7600f..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tominabox1/littlefoot_lx/rev1
diff --git a/keyboards/tominabox1/underscore33/rules.mk b/keyboards/tominabox1/underscore33/rules.mk
deleted file mode 100644
index b5e13fd420..0000000000
--- a/keyboards/tominabox1/underscore33/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tominabox1/underscore33/rev1
diff --git a/keyboards/trnthsn/e8ghty/rules.mk b/keyboards/trnthsn/e8ghty/rules.mk
deleted file mode 100644
index e06e8fe182..0000000000
--- a/keyboards/trnthsn/e8ghty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = trnthsn/e8ghty/stm32f103
diff --git a/keyboards/trnthsn/s6xty5neor2/rules.mk b/keyboards/trnthsn/s6xty5neor2/rules.mk
deleted file mode 100644
index 1fc77fba72..0000000000
--- a/keyboards/trnthsn/s6xty5neor2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = trnthsn/s6xty5neor2/stm32f103
diff --git a/keyboards/tweetydabird/lotus58/rules.mk b/keyboards/tweetydabird/lotus58/rules.mk
deleted file mode 100644
index 4cd2262cc7..0000000000
--- a/keyboards/tweetydabird/lotus58/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tweetydabird/lotus58/promicro \ No newline at end of file
diff --git a/keyboards/unison/rules.mk b/keyboards/unison/rules.mk
deleted file mode 100644
index 69c33d71a2..0000000000
--- a/keyboards/unison/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = unison/v04
diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk
deleted file mode 100644
index 277e74b715..0000000000
--- a/keyboards/uzu42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = uzu42/rev1
diff --git a/keyboards/vitamins_included/rules.mk b/keyboards/vitamins_included/rules.mk
deleted file mode 100644
index e3452d41db..0000000000
--- a/keyboards/vitamins_included/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = vitamins_included/rev2
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm68/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm68/rev2/rules.mk b/keyboards/westm/westm68/rev2/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm9/rev1/rules.mk b/keyboards/westm/westm9/rev1/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm9/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm9/rev2/rules.mk b/keyboards/westm/westm9/rev2/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm9/rev2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/whale/sk/rules.mk b/keyboards/whale/sk/rules.mk
deleted file mode 100644
index 1a4ddedfa7..0000000000
--- a/keyboards/whale/sk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = whale/sk/v3
diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
index 3437a35bdf..44ebb2c1fe 100644
--- a/keyboards/woodkeys/meira/featherble/rules.mk
+++ b/keyboards/woodkeys/meira/featherble/rules.mk
@@ -1,2 +1,5 @@
# Processor frequency
F_CPU = 8000000
+
+CUSTOM_MATRIX = yes
+SRC += matrix.c
diff --git a/keyboards/woodkeys/meira/promicro/rules.mk b/keyboards/woodkeys/meira/promicro/rules.mk
index 09057bea54..32a05accc5 100644
--- a/keyboards/woodkeys/meira/promicro/rules.mk
+++ b/keyboards/woodkeys/meira/promicro/rules.mk
@@ -1,3 +1,6 @@
+CUSTOM_MATRIX = yes
+SRC += matrix.c
+
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
deleted file mode 100644
index 423c14cfb7..0000000000
--- a/keyboards/woodkeys/meira/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CUSTOM_MATRIX = yes
-SRC += matrix.c
-
-DEFAULT_FOLDER = woodkeys/meira/promicro
diff --git a/keyboards/work_louder/loop/post_rules.mk b/keyboards/work_louder/loop/post_rules.mk
new file mode 100644
index 0000000000..e0822c009b
--- /dev/null
+++ b/keyboards/work_louder/loop/post_rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
deleted file mode 100644
index 53c3227972..0000000000
--- a/keyboards/work_louder/loop/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += rgb_functions.c
-
-DEFAULT_FOLDER = work_louder/loop/rev3
diff --git a/keyboards/work_louder/work_board/post_rules.mk b/keyboards/work_louder/work_board/post_rules.mk
new file mode 100644
index 0000000000..e0822c009b
--- /dev/null
+++ b/keyboards/work_louder/work_board/post_rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
deleted file mode 100644
index a4c45393c0..0000000000
--- a/keyboards/work_louder/work_board/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += rgb_functions.c
-
-DEFAULT_FOLDER = work_louder/work_board/rev3
diff --git a/keyboards/x16/readme.md b/keyboards/x16/readme.md
index 6434af99c7..cfe83905d7 100644
--- a/keyboards/x16/readme.md
+++ b/keyboards/x16/readme.md
@@ -3,7 +3,6 @@
A 16 key macropad, with USB C
* Keyboard Maintainer: QMK Community
-* Hardware Supported: The PCBs, controllers supported
* Hardware Availability: The x16 was discontinued by [x16](https://yinxianwei.github.io/x16/)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk
deleted file mode 100644
index 96852c8abf..0000000000
--- a/keyboards/yanghu/unicorne/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = yanghu/unicorne/f411
diff --git a/keyboards/ymdk/id75/board.h b/keyboards/ymdk/id75/f103/board.h
index 49270b36a0..49270b36a0 100644
--- a/keyboards/ymdk/id75/board.h
+++ b/keyboards/ymdk/id75/f103/board.h
diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/f103/config.h
index cb5ac78304..cb5ac78304 100644
--- a/keyboards/ymdk/id75/config.h
+++ b/keyboards/ymdk/id75/f103/config.h
diff --git a/keyboards/ymdk/id75/halconf.h b/keyboards/ymdk/id75/f103/halconf.h
index 612ce4fc4a..612ce4fc4a 100644
--- a/keyboards/ymdk/id75/halconf.h
+++ b/keyboards/ymdk/id75/f103/halconf.h
diff --git a/keyboards/ymdk/id75/f103/keyboard.json b/keyboards/ymdk/id75/f103/keyboard.json
new file mode 100644
index 0000000000..5b1974b3f2
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/keyboard.json
@@ -0,0 +1,13 @@
+{
+ "manufacturer": "YMDK",
+ "bootloader": "uf2boot",
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A5", "A6", "A4", "A3", "A2", "A1", "A0", "A15"],
+ "rows": ["B2", "B1", "B0", "A7", "B10"]
+ },
+ "processor": "STM32F103",
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "B9"
+ }
+}
diff --git a/keyboards/ymdk/id75/mcuconf.h b/keyboards/ymdk/id75/f103/mcuconf.h
index 0d3de3dad5..0d3de3dad5 100644
--- a/keyboards/ymdk/id75/mcuconf.h
+++ b/keyboards/ymdk/id75/f103/mcuconf.h
diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/f103/rules.mk
index dbee20ab05..dbee20ab05 100644
--- a/keyboards/ymdk/id75/rules.mk
+++ b/keyboards/ymdk/id75/f103/rules.mk
diff --git a/keyboards/ymdk/id75/keyboard.json b/keyboards/ymdk/id75/info.json
index db0c108542..bbe4d1c73e 100644
--- a/keyboards/ymdk/id75/keyboard.json
+++ b/keyboards/ymdk/id75/info.json
@@ -1,8 +1,6 @@
{
- "manufacturer": "YMDK",
"keyboard_name": "Idobao x YMDK ID75",
"maintainer": "qmk",
- "bootloader": "uf2boot",
"diode_direction": "ROW2COL",
"features": {
"bootmagic": true,
@@ -11,152 +9,143 @@
"nkro": true,
"rgb_matrix": true
},
- "matrix_pins": {
- "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A5", "A6", "A4", "A3", "A2", "A1", "A0", "A15"],
- "rows": ["B2", "B1", "B0", "A7", "B10"]
- },
- "processor": "STM32F103",
- "ws2812": {
- "driver": "pwm",
- "pin": "B9"
- },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
+ "band_sat": true,
"band_spiral_sat": true,
"band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
"cycle_all": true,
"cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
"dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
- "pixel_rain": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
"pixel_flow": true,
"pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_multisplash": true,
"solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
"solid_splash": true,
- "solid_multisplash": true
+ "splash": true,
+ "typing_heatmap": true
},
"driver": "ws2812",
"layout": [
- {"flags": 4, "matrix": [4, 14], "x": 224, "y": 64},
- {"flags": 4, "matrix": [4, 13], "x": 208, "y": 64},
- {"flags": 4, "matrix": [4, 12], "x": 192, "y": 64},
- {"flags": 4, "matrix": [4, 11], "x": 176, "y": 64},
- {"flags": 4, "matrix": [4, 10], "x": 160, "y": 64},
- {"flags": 4, "matrix": [4, 9], "x": 144, "y": 64},
- {"flags": 4, "matrix": [4, 8], "x": 128, "y": 64},
- {"flags": 4, "matrix": [4, 7], "x": 112, "y": 64},
- {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
- {"flags": 4, "matrix": [4, 5], "x": 80, "y": 64},
- {"flags": 4, "matrix": [4, 4], "x": 64, "y": 64},
- {"flags": 4, "matrix": [4, 3], "x": 48, "y": 64},
- {"flags": 4, "matrix": [4, 2], "x": 32, "y": 64},
- {"flags": 4, "matrix": [4, 1], "x": 16, "y": 64},
- {"flags": 4, "matrix": [4, 0], "x": 0, "y": 64},
- {"flags": 4, "matrix": [3, 14], "x": 224, "y": 48},
- {"flags": 4, "matrix": [3, 13], "x": 208, "y": 48},
- {"flags": 4, "matrix": [3, 12], "x": 192, "y": 48},
- {"flags": 4, "matrix": [3, 11], "x": 176, "y": 48},
- {"flags": 4, "matrix": [3, 10], "x": 160, "y": 48},
- {"flags": 4, "matrix": [3, 9], "x": 144, "y": 48},
- {"flags": 4, "matrix": [3, 8], "x": 128, "y": 48},
- {"flags": 4, "matrix": [3, 7], "x": 112, "y": 48},
- {"flags": 4, "matrix": [3, 6], "x": 96, "y": 48},
- {"flags": 4, "matrix": [3, 5], "x": 80, "y": 48},
- {"flags": 4, "matrix": [3, 4], "x": 64, "y": 48},
- {"flags": 4, "matrix": [3, 3], "x": 48, "y": 48},
- {"flags": 4, "matrix": [3, 2], "x": 32, "y": 48},
- {"flags": 4, "matrix": [3, 1], "x": 16, "y": 48},
- {"flags": 4, "matrix": [3, 0], "x": 0, "y": 48},
- {"flags": 4, "matrix": [2, 14], "x": 224, "y": 32},
- {"flags": 4, "matrix": [2, 13], "x": 208, "y": 32},
- {"flags": 4, "matrix": [2, 12], "x": 192, "y": 32},
- {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
- {"flags": 4, "matrix": [2, 10], "x": 160, "y": 32},
- {"flags": 4, "matrix": [2, 9], "x": 144, "y": 32},
- {"flags": 4, "matrix": [2, 8], "x": 128, "y": 32},
- {"flags": 4, "matrix": [2, 7], "x": 112, "y": 32},
- {"flags": 4, "matrix": [2, 6], "x": 96, "y": 32},
- {"flags": 4, "matrix": [2, 5], "x": 80, "y": 32},
- {"flags": 4, "matrix": [2, 4], "x": 64, "y": 32},
- {"flags": 4, "matrix": [2, 3], "x": 48, "y": 32},
- {"flags": 4, "matrix": [2, 2], "x": 32, "y": 32},
- {"flags": 4, "matrix": [2, 1], "x": 16, "y": 32},
- {"flags": 4, "matrix": [2, 0], "x": 0, "y": 32},
- {"flags": 4, "matrix": [1, 14], "x": 224, "y": 16},
- {"flags": 4, "matrix": [1, 13], "x": 208, "y": 16},
- {"flags": 4, "matrix": [1, 12], "x": 192, "y": 16},
- {"flags": 4, "matrix": [1, 11], "x": 176, "y": 16},
- {"flags": 4, "matrix": [1, 10], "x": 160, "y": 16},
- {"flags": 4, "matrix": [1, 9], "x": 144, "y": 16},
- {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16},
- {"flags": 4, "matrix": [1, 7], "x": 112, "y": 16},
- {"flags": 4, "matrix": [1, 6], "x": 96, "y": 16},
- {"flags": 4, "matrix": [1, 5], "x": 80, "y": 16},
- {"flags": 4, "matrix": [1, 4], "x": 64, "y": 16},
- {"flags": 4, "matrix": [1, 3], "x": 48, "y": 16},
- {"flags": 4, "matrix": [1, 2], "x": 32, "y": 16},
- {"flags": 4, "matrix": [1, 1], "x": 16, "y": 16},
- {"flags": 4, "matrix": [1, 0], "x": 0, "y": 16},
- {"flags": 4, "matrix": [0, 14], "x": 224, "y": 0},
- {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0},
- {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0},
- {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0},
- {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0},
- {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0},
- {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0},
- {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0},
- {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0},
- {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0},
- {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0},
- {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0},
- {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0},
- {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0},
- {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
- {"flags": 2, "x": 0, "y": 64},
- {"flags": 2, "x": 38, "y": 64},
- {"flags": 2, "x": 76, "y": 64},
- {"flags": 2, "x": 114, "y": 64},
- {"flags": 2, "x": 152, "y": 64},
- {"flags": 2, "x": 190, "y": 64},
- {"flags": 2, "x": 224, "y": 64},
- {"flags": 2, "x": 0, "y": 0},
- {"flags": 2, "x": 38, "y": 0},
- {"flags": 2, "x": 76, "y": 0},
- {"flags": 2, "x": 114, "y": 0},
- {"flags": 2, "x": 152, "y": 0},
- {"flags": 2, "x": 190, "y": 0},
- {"flags": 2, "x": 224, "y": 0}
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4},
+ {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4},
+ {"matrix": [4, 12], "x": 192, "y": 64, "flags": 4},
+ {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4},
+ {"matrix": [4, 10], "x": 160, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 144, "y": 64, "flags": 4},
+ {"matrix": [4, 8], "x": 128, "y": 64, "flags": 4},
+ {"matrix": [4, 7], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
+ {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4},
+ {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
+ {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 192, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4},
+ {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"x": 0, "y": 64, "flags": 2},
+ {"x": 38, "y": 64, "flags": 2},
+ {"x": 76, "y": 64, "flags": 2},
+ {"x": 114, "y": 64, "flags": 2},
+ {"x": 152, "y": 64, "flags": 2},
+ {"x": 190, "y": 64, "flags": 2},
+ {"x": 224, "y": 64, "flags": 2},
+ {"x": 0, "y": 0, "flags": 2},
+ {"x": 38, "y": 0, "flags": 2},
+ {"x": 76, "y": 0, "flags": 2},
+ {"x": 114, "y": 0, "flags": 2},
+ {"x": 152, "y": 0, "flags": 2},
+ {"x": 190, "y": 0, "flags": 2},
+ {"x": 224, "y": 0, "flags": 2}
],
"max_brightness": 128,
"sleep": true
diff --git a/keyboards/ymdk/id75/readme.md b/keyboards/ymdk/id75/readme.md
index 9315745f71..4f7e779458 100644
--- a/keyboards/ymdk/id75/readme.md
+++ b/keyboards/ymdk/id75/readme.md
@@ -5,17 +5,18 @@
A 75-key, 5-row ortholinear keyboard with per-key and underglow RGB LEDs.
* Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
-* Hardware Supported: [Idobao x YMDK ID75 PCB (APM32F103CBT6)](https://www.aliexpress.com/item/3256804537842097.html)
- * This PCB uses an ARM Cortex-M3 MCU with 128kb flash. **It is not the same as `idobao/id75` or `ymdk/ymd75`.**
+* Hardware Supported: [Idobao x YMDK ID75](https://www.aliexpress.com/item/3256804537842097.html). **This is not the same PCB as `idobao/id75` or `ymdk/ymd75`.**
+ This keyboard has had multiple PCB revisions, some of which may not work with the firmware in this repository. **Check your PCB before flashing.**
+ * `f103`: (Geehy APM32F103CBT6, uf2boot)
* Hardware Availability: [YMDK](https://ymdkey.com/products/id75-75-keys-ortholinear-layout-qmk-anodized-aluminum-case-plate-hot-swappable-hot-swap-type-c-pcb-mechanical-keyboard-kit), [AliExpress (YMDK Store)](https://www.aliexpress.com/item/2255800125183974.html), [Amazon](https://www.amazon.com/Ortholinear-Anodized-Aluminum-hot-swappable-Mechanical/dp/B07ZQ8CD88)
Make example for this keyboard (after setting up your build environment):
- make ymdk/id75:default
+ make ymdk/id75/f103:default
Flashing example for this keyboard:
- make ymdk/id75:default:flash
+ make ymdk/id75/f103:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -27,4 +28,5 @@ Enter the bootloader in 3 ways:
* **Physical reset button**: Press the button on the back of the PCB twice in quick succession.
* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, in the bottom-right corner.
-After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `MT.KEY`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+- `f103`: The volume name is `MT.KEY`.
diff --git a/keyboards/ymdk/melody96/rules.mk b/keyboards/ymdk/melody96/rules.mk
deleted file mode 100644
index 806543977b..0000000000
--- a/keyboards/ymdk/melody96/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ymdk/melody96/soldered
diff --git a/keyboards/ymdk/yd60mq/rules.mk b/keyboards/ymdk/yd60mq/rules.mk
deleted file mode 100644
index c37722c8bb..0000000000
--- a/keyboards/ymdk/yd60mq/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ymdk/yd60mq/12led
diff --git a/keyboards/yosino58/rules.mk b/keyboards/yosino58/rules.mk
deleted file mode 100644
index c700b6f5b5..0000000000
--- a/keyboards/yosino58/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = yosino58/rev1
diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk
deleted file mode 100644
index 32daeef814..0000000000
--- a/keyboards/yushakobo/navpad/10/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = yushakobo/navpad/10/rev1
diff --git a/keyboards/yynmt/acperience12/rules.mk b/keyboards/yynmt/acperience12/rules.mk
deleted file mode 100644
index cfe8b8ac18..0000000000
--- a/keyboards/yynmt/acperience12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = yynmt/acperience12/rev1
diff --git a/keyboards/zsa/planck_ez/base/rules.mk b/keyboards/zsa/planck_ez/base/rules.mk
new file mode 100644
index 0000000000..c0b951fba9
--- /dev/null
+++ b/keyboards/zsa/planck_ez/base/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/planck_ez/glow/rules.mk b/keyboards/zsa/planck_ez/glow/rules.mk
new file mode 100644
index 0000000000..c0b951fba9
--- /dev/null
+++ b/keyboards/zsa/planck_ez/glow/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/planck_ez/rules.mk b/keyboards/zsa/planck_ez/rules.mk
deleted file mode 100644
index 67921c96ed..0000000000
--- a/keyboards/zsa/planck_ez/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_SUPPORTED = no
-BAKCLIGHT_SUPPORTED = no
-
-DEFAULT_FOLDER = zsa/planck_ez/base
diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c
index 6d4f6c5f26..b7ca8f748f 100644
--- a/keyboards/zsa/voyager/voyager.c
+++ b/keyboards/zsa/voyager/voyager.c
@@ -121,7 +121,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
#ifdef RGB_MATRIX_ENABLE
// clang-format off
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location