From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: [PATCH] Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/0xc7/61key/info.json | 2 ++ keyboards/0xc7/61key/rules.mk | 6 ------ keyboards/0xcb/1337/info.json | 2 ++ keyboards/0xcb/1337/rules.mk | 6 ------ keyboards/0xcb/static/info.json | 2 ++ keyboards/0xcb/static/rules.mk | 6 ------ keyboards/0xcb/tutelpad/info.json | 2 ++ keyboards/0xcb/tutelpad/rules.mk | 6 ------ keyboards/10bleoledhub/info.json | 2 ++ keyboards/10bleoledhub/rules.mk | 6 ------ keyboards/1upkeyboards/1up60hse/info.json | 2 ++ keyboards/1upkeyboards/1up60hse/rules.mk | 6 ------ keyboards/1upkeyboards/1up60hte/info.json | 2 ++ keyboards/1upkeyboards/1up60hte/rules.mk | 6 ------ keyboards/1upkeyboards/1up60rgb/info.json | 2 ++ keyboards/1upkeyboards/1up60rgb/rules.mk | 6 ------ keyboards/1upkeyboards/pi40/info.json | 3 +++ keyboards/1upkeyboards/pi40/rules.mk | 5 ----- keyboards/1upkeyboards/super16/info.json | 2 ++ keyboards/1upkeyboards/super16/rules.mk | 6 ------ keyboards/1upkeyboards/super16v2/info.json | 2 ++ keyboards/1upkeyboards/super16v2/rules.mk | 6 ------ keyboards/1upkeyboards/sweet16/v1/info.json | 4 +++- keyboards/1upkeyboards/sweet16/v1/rules.mk | 6 ------ keyboards/25keys/aleth42/rev0/info.json | 4 +++- keyboards/25keys/aleth42/rev0/rules.mk | 6 ------ keyboards/25keys/aleth42/rev1/info.json | 4 +++- keyboards/25keys/aleth42/rev1/rules.mk | 6 ------ keyboards/25keys/cassette42/info.json | 2 ++ keyboards/25keys/cassette42/rules.mk | 6 ------ keyboards/25keys/zinc/info.json | 2 ++ keyboards/25keys/zinc/rules.mk | 6 ------ keyboards/2key2crawl/info.json | 2 ++ keyboards/2key2crawl/rules.mk | 6 ------ keyboards/30wer/info.json | 2 ++ keyboards/30wer/rules.mk | 6 ------ keyboards/3keyecosystem/2key2/info.json | 2 ++ keyboards/3keyecosystem/2key2/rules.mk | 6 ------ keyboards/3w6/rev1/info.json | 4 +++- keyboards/3w6/rev1/rules.mk | 6 ------ keyboards/3w6/rev2/info.json | 4 +++- keyboards/3w6/rev2/rules.mk | 6 ------ keyboards/40percentclub/25/info.json | 2 ++ keyboards/40percentclub/25/rules.mk | 6 ------ keyboards/40percentclub/4pack/info.json | 2 ++ keyboards/40percentclub/4pack/rules.mk | 6 ------ keyboards/40percentclub/4x4/info.json | 2 ++ keyboards/40percentclub/4x4/rules.mk | 6 ------ keyboards/40percentclub/5x5/info.json | 2 ++ keyboards/40percentclub/5x5/rules.mk | 6 ------ keyboards/40percentclub/6lit/info.json | 2 ++ keyboards/40percentclub/6lit/rules.mk | 6 ------ keyboards/40percentclub/foobar/info.json | 2 ++ keyboards/40percentclub/foobar/rules.mk | 6 ------ keyboards/40percentclub/gherkin/info.json | 2 ++ keyboards/40percentclub/gherkin/rules.mk | 6 ------ keyboards/40percentclub/half_n_half/info.json | 2 ++ keyboards/40percentclub/half_n_half/rules.mk | 6 ------ .../40percentclub/i75/promicro/info.json | 4 ++++ keyboards/40percentclub/i75/promicro/rules.mk | 5 ----- keyboards/40percentclub/i75/teensy2/info.json | 4 ++++ keyboards/40percentclub/i75/teensy2/rules.mk | 5 ----- keyboards/40percentclub/luddite/info.json | 2 ++ keyboards/40percentclub/luddite/rules.mk | 6 ------ keyboards/40percentclub/mf68/info.json | 2 ++ keyboards/40percentclub/mf68/rules.mk | 6 ------ keyboards/40percentclub/nano/info.json | 2 ++ keyboards/40percentclub/nano/rules.mk | 6 ------ keyboards/40percentclub/nein/info.json | 2 ++ keyboards/40percentclub/nein/rules.mk | 6 ------ keyboards/40percentclub/nori/info.json | 2 ++ keyboards/40percentclub/nori/rules.mk | 6 ------ .../polyandry/promicro/info.json | 4 ++++ .../40percentclub/polyandry/promicro/rules.mk | 5 ----- .../40percentclub/polyandry/teensy2/info.json | 4 ++++ .../40percentclub/polyandry/teensy2/rules.mk | 5 ----- keyboards/40percentclub/sixpack/info.json | 2 ++ keyboards/40percentclub/sixpack/rules.mk | 6 ------ keyboards/40percentclub/tomato/info.json | 2 ++ keyboards/40percentclub/tomato/rules.mk | 6 ------ keyboards/40percentclub/ut47/info.json | 2 ++ keyboards/40percentclub/ut47/rules.mk | 6 ------ keyboards/45_ats/info.json | 2 ++ keyboards/45_ats/rules.mk | 6 ------ keyboards/4by3/info.json | 2 ++ keyboards/4by3/rules.mk | 7 ------- keyboards/4pplet/aekiso60/rev_a/info.json | 2 ++ keyboards/4pplet/aekiso60/rev_a/rules.mk | 6 ------ keyboards/4pplet/aekiso60/rev_b/info.json | 2 ++ keyboards/4pplet/aekiso60/rev_b/rules.mk | 6 ------ keyboards/4pplet/bootleg/rev_a/info.json | 2 ++ keyboards/4pplet/bootleg/rev_a/rules.mk | 6 ------ .../4pplet/eagle_viper_rep/rev_a/info.json | 2 ++ .../4pplet/eagle_viper_rep/rev_a/rules.mk | 6 ------ .../4pplet/eagle_viper_rep/rev_b/info.json | 2 ++ .../4pplet/eagle_viper_rep/rev_b/rules.mk | 6 ------ keyboards/4pplet/perk60_iso/rev_a/info.json | 2 ++ keyboards/4pplet/perk60_iso/rev_a/rules.mk | 7 ------- keyboards/4pplet/steezy60/rev_a/info.json | 2 ++ keyboards/4pplet/steezy60/rev_a/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_a/info.json | 2 ++ keyboards/4pplet/waffling60/rev_a/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_b/info.json | 2 ++ keyboards/4pplet/waffling60/rev_b/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_c/info.json | 2 ++ keyboards/4pplet/waffling60/rev_c/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_d/info.json | 2 ++ keyboards/4pplet/waffling60/rev_d/rules.mk | 6 ------ .../4pplet/waffling60/rev_d_ansi/info.json | 2 ++ .../4pplet/waffling60/rev_d_ansi/rules.mk | 6 ------ .../4pplet/waffling60/rev_d_iso/info.json | 2 ++ .../4pplet/waffling60/rev_d_iso/rules.mk | 6 ------ keyboards/4pplet/waffling80/rev_a/info.json | 2 ++ keyboards/4pplet/waffling80/rev_a/rules.mk | 6 ------ keyboards/4pplet/waffling80/rev_b/info.json | 2 ++ keyboards/4pplet/waffling80/rev_b/rules.mk | 6 ------ keyboards/4pplet/yakiimo/rev_a/info.json | 2 ++ keyboards/4pplet/yakiimo/rev_a/rules.mk | 7 ------- keyboards/7c8/framework/info.json | 2 ++ keyboards/7c8/framework/rules.mk | 6 ------ keyboards/8pack/info.json | 2 ++ keyboards/8pack/rules.mk | 6 ------ keyboards/9key/info.json | 2 ++ keyboards/9key/rules.mk | 6 ------ keyboards/a_dux/info.json | 2 ++ keyboards/a_dux/rules.mk | 6 ------ keyboards/abacus/info.json | 2 ++ keyboards/abacus/rules.mk | 6 ------ keyboards/abatskeyboardclub/nayeon/info.json | 2 ++ keyboards/abatskeyboardclub/nayeon/rules.mk | 6 ------ keyboards/abstract/ellipse/rev1/info.json | 2 ++ keyboards/abstract/ellipse/rev1/rules.mk | 6 ------ keyboards/acekeyboard/titan60/info.json | 2 ++ keyboards/acekeyboard/titan60/rules.mk | 6 ------ keyboards/acheron/apollo/87h/delta/info.json | 4 +++- keyboards/acheron/apollo/87h/delta/rules.mk | 7 ------- keyboards/acheron/apollo/87h/gamma/info.json | 4 +++- keyboards/acheron/apollo/87h/gamma/rules.mk | 7 ------- keyboards/acheron/apollo/87htsc/info.json | 2 ++ keyboards/acheron/apollo/87htsc/rules.mk | 7 ------- keyboards/acheron/apollo/88htsc/info.json | 2 ++ keyboards/acheron/apollo/88htsc/rules.mk | 7 ------- keyboards/acheron/arctic/info.json | 2 ++ keyboards/acheron/arctic/rules.mk | 6 ------ keyboards/acheron/athena/alpha/info.json | 4 +++- keyboards/acheron/athena/alpha/rules.mk | 7 ------- keyboards/acheron/athena/beta/info.json | 4 +++- keyboards/acheron/athena/beta/rules.mk | 6 ------ keyboards/acheron/austin/info.json | 2 ++ keyboards/acheron/austin/rules.mk | 6 ------ keyboards/acheron/elongate/beta/info.json | 2 ++ keyboards/acheron/elongate/beta/rules.mk | 6 ------ keyboards/acheron/elongate/delta/info.json | 2 ++ keyboards/acheron/elongate/delta/rules.mk | 6 ------ keyboards/acheron/keebspcb/info.json | 2 ++ keyboards/acheron/keebspcb/rules.mk | 6 ------ keyboards/acheron/lasgweloth/info.json | 2 ++ keyboards/acheron/lasgweloth/rules.mk | 6 ------ keyboards/acheron/shark/alpha/info.json | 3 +++ keyboards/acheron/shark/alpha/rules.mk | 7 ------- keyboards/acheron/shark/beta/info.json | 4 +++- keyboards/acheron/shark/beta/rules.mk | 6 ------ keyboards/ada/ada1800mini/info.json | 2 ++ keyboards/ada/ada1800mini/rules.mk | 6 ------ keyboards/ada/infinity81/info.json | 2 ++ keyboards/ada/infinity81/rules.mk | 6 ------ keyboards/adafruit/macropad/info.json | 2 ++ keyboards/adafruit/macropad/rules.mk | 4 ---- keyboards/adelheid/info.json | 2 ++ keyboards/adelheid/rules.mk | 6 ------ keyboards/adkb96/info.json | 2 ++ keyboards/adkb96/rules.mk | 6 ------ keyboards/adm42/info.json | 2 ++ keyboards/adm42/rules.mk | 6 ------ keyboards/adpenrose/akemipad/info.json | 2 ++ keyboards/adpenrose/akemipad/rules.mk | 6 ------ keyboards/adpenrose/kintsugi/info.json | 2 ++ keyboards/adpenrose/kintsugi/rules.mk | 6 ------ keyboards/adpenrose/obi/info.json | 2 ++ keyboards/adpenrose/obi/rules.mk | 6 ------ keyboards/adpenrose/shisaku/info.json | 2 ++ keyboards/adpenrose/shisaku/rules.mk | 6 ------ keyboards/aeboards/aegis/info.json | 2 ++ keyboards/aeboards/aegis/rules.mk | 6 ------ .../aeboards/constellation/rev1/info.json | 2 ++ .../aeboards/constellation/rev1/rules.mk | 6 ------ .../aeboards/constellation/rev2/info.json | 2 ++ .../aeboards/constellation/rev2/rules.mk | 6 ------ .../aeboards/constellation/rev3/info.json | 2 ++ .../aeboards/constellation/rev3/rules.mk | 6 ------ keyboards/aeboards/ext65/rev1/info.json | 2 ++ keyboards/aeboards/ext65/rev1/rules.mk | 6 ------ keyboards/aeboards/ext65/rev2/info.json | 2 ++ keyboards/aeboards/ext65/rev2/rules.mk | 6 ------ keyboards/aeboards/ext65/rev3/info.json | 2 ++ keyboards/aeboards/ext65/rev3/rules.mk | 6 ------ keyboards/aeboards/satellite/rev1/info.json | 2 ++ keyboards/aeboards/satellite/rev1/rules.mk | 6 ------ keyboards/afternoonlabs/breeze/rev0/info.json | 2 ++ keyboards/afternoonlabs/breeze/rev0/rules.mk | 6 ------ keyboards/afternoonlabs/breeze/rev1/info.json | 2 ++ keyboards/afternoonlabs/breeze/rev1/rules.mk | 6 ------ keyboards/afternoonlabs/gust/rev1/info.json | 2 ++ keyboards/afternoonlabs/gust/rev1/rules.mk | 6 ------ .../afternoonlabs/oceanbreeze/rev1/info.json | 2 ++ .../afternoonlabs/oceanbreeze/rev1/rules.mk | 6 ------ .../southern_breeze/rev1/info.json | 2 ++ .../southern_breeze/rev1/rules.mk | 6 ------ .../summer_breeze/rev1/info.json | 2 ++ .../afternoonlabs/summer_breeze/rev1/rules.mk | 6 ------ keyboards/ai03/andromeda/info.json | 2 ++ keyboards/ai03/andromeda/rules.mk | 6 ------ keyboards/ai03/equinox/rev0/info.json | 4 ++++ keyboards/ai03/equinox/rev0/rules.mk | 6 ------ keyboards/ai03/equinox/rev1/info.json | 4 ++++ keyboards/ai03/equinox/rev1/rules.mk | 6 ------ keyboards/ai03/jp60/info.json | 2 ++ keyboards/ai03/jp60/rules.mk | 6 ------ keyboards/ai03/lunar/info.json | 2 ++ keyboards/ai03/lunar/rules.mk | 6 ------ keyboards/ai03/lunar_ii/info.json | 2 ++ keyboards/ai03/lunar_ii/rules.mk | 6 ------ keyboards/ai03/orbit/info.json | 2 ++ keyboards/ai03/orbit/rules.mk | 6 ------ keyboards/ai03/orbit_x/info.json | 2 ++ keyboards/ai03/orbit_x/rules.mk | 6 ------ keyboards/ai03/polaris/info.json | 2 ++ keyboards/ai03/polaris/rules.mk | 6 ------ keyboards/ai03/quasar/info.json | 2 ++ keyboards/ai03/quasar/rules.mk | 6 ------ keyboards/ai03/soyuz/info.json | 2 ++ keyboards/ai03/soyuz/rules.mk | 6 ------ keyboards/ai03/vega/info.json | 2 ++ keyboards/ai03/vega/rules.mk | 6 ------ keyboards/ai03/voyager60_alps/info.json | 2 ++ keyboards/ai03/voyager60_alps/rules.mk | 6 ------ keyboards/akb/eb46/info.json | 2 ++ keyboards/akb/eb46/rules.mk | 6 ------ keyboards/akb/raine/info.json | 2 ++ keyboards/akb/raine/rules.mk | 6 ------ keyboards/akegata_denki/device_one/info.json | 3 +++ keyboards/akegata_denki/device_one/rules.mk | 7 ------- keyboards/al1/info.json | 2 ++ keyboards/al1/rules.mk | 6 ------ keyboards/aleblazer/zodiark/info.json | 2 ++ keyboards/aleblazer/zodiark/rules.mk | 6 ------ keyboards/alf/dc60/info.json | 2 ++ keyboards/alf/dc60/rules.mk | 6 ------ keyboards/alf/x11/info.json | 2 ++ keyboards/alf/x11/rules.mk | 6 ------ keyboards/alf/x2/info.json | 2 ++ keyboards/alf/x2/rules.mk | 6 ------ .../alfredslab/swift65/hotswap/info.json | 2 ++ keyboards/alfredslab/swift65/hotswap/rules.mk | 7 ------- keyboards/alfredslab/swift65/solder/info.json | 2 ++ keyboards/alfredslab/swift65/solder/rules.mk | 6 ------ keyboards/aliceh66/pianoforte/info.json | 2 ++ keyboards/aliceh66/pianoforte/rules.mk | 6 ------ keyboards/aliceh66/pianoforte_hs/info.json | 2 ++ keyboards/aliceh66/pianoforte_hs/rules.mk | 6 ------ keyboards/alpha/info.json | 2 ++ keyboards/alpha/rules.mk | 6 ------ keyboards/alpine65/info.json | 2 ++ keyboards/alpine65/rules.mk | 6 ------ keyboards/alps64/info.json | 2 ++ keyboards/alps64/rules.mk | 6 ------ keyboards/alt34/rev1/info.json | 2 ++ keyboards/alt34/rev1/rules.mk | 6 ------ keyboards/amag23/info.json | 2 ++ keyboards/amag23/rules.mk | 6 ------ keyboards/amjkeyboard/amj40/info.json | 2 ++ keyboards/amjkeyboard/amj40/rules.mk | 6 ------ keyboards/amjkeyboard/amj60/info.json | 2 ++ keyboards/amjkeyboard/amj60/rules.mk | 6 ------ keyboards/amjkeyboard/amj66/info.json | 2 ++ keyboards/amjkeyboard/amj66/rules.mk | 6 ------ keyboards/amjkeyboard/amj84/info.json | 2 ++ keyboards/amjkeyboard/amj84/rules.mk | 6 ------ keyboards/amjkeyboard/amj96/info.json | 2 ++ keyboards/amjkeyboard/amj96/rules.mk | 6 ------ keyboards/amjkeyboard/amjpad/info.json | 2 ++ keyboards/amjkeyboard/amjpad/rules.mk | 6 ------ keyboards/anavi/macropad8/info.json | 2 ++ keyboards/anavi/macropad8/rules.mk | 6 ------ keyboards/ano/info.json | 2 ++ keyboards/ano/rules.mk | 6 ------ keyboards/anomalykb/a65i/info.json | 2 ++ keyboards/anomalykb/a65i/rules.mk | 6 ------ keyboards/aos/tkl/info.json | 2 ++ keyboards/aos/tkl/rules.mk | 6 ------ keyboards/aozora/info.json | 2 ++ keyboards/aozora/rules.mk | 6 ------ keyboards/aplyard/aplx6/rev1/info.json | 4 +++- keyboards/aplyard/aplx6/rev1/rules.mk | 6 ------ keyboards/aplyard/aplx6/rev2/info.json | 4 +++- keyboards/aplyard/aplx6/rev2/rules.mk | 6 ------ keyboards/arabica37/rev1/info.json | 2 ++ keyboards/arabica37/rev1/rules.mk | 6 ------ keyboards/ares/info.json | 2 ++ keyboards/ares/rules.mk | 6 ------ keyboards/arisu/info.json | 2 ++ keyboards/arisu/rules.mk | 6 ------ keyboards/arrayperipherals/1x4p1/info.json | 2 ++ keyboards/arrayperipherals/1x4p1/rules.mk | 6 ------ keyboards/ash1800/info.json | 2 ++ keyboards/ash1800/rules.mk | 6 ------ keyboards/ash_xiix/info.json | 2 ++ keyboards/ash_xiix/rules.mk | 6 ------ keyboards/ashpil/modelm_usbc/info.json | 2 ++ keyboards/ashpil/modelm_usbc/rules.mk | 6 ------ keyboards/at_at/660m/info.json | 2 ++ keyboards/at_at/660m/rules.mk | 7 ------- keyboards/atlantis/ak81_ve/info.json | 2 ++ keyboards/atlantis/ak81_ve/rules.mk | 6 ------ keyboards/atlas_65/info.json | 2 ++ keyboards/atlas_65/rules.mk | 6 ------ keyboards/atomic/info.json | 2 ++ keyboards/atomic/rules.mk | 6 ------ keyboards/atreus/astar/info.json | 4 ++++ keyboards/atreus/astar/rules.mk | 5 ----- keyboards/atreus/astar_mirrored/info.json | 4 ++++ keyboards/atreus/astar_mirrored/rules.mk | 5 ----- keyboards/atreus/f103/info.json | 4 ++++ keyboards/atreus/f103/rules.mk | 6 ------ keyboards/atreus/feather/info.json | 4 ++++ keyboards/atreus/feather/rules.mk | 6 ------ keyboards/atreus/promicro/info.json | 4 ++++ keyboards/atreus/promicro/rules.mk | 5 ----- keyboards/atreus/teensy2/info.json | 4 ++++ keyboards/atreus/teensy2/rules.mk | 5 ----- keyboards/atreus62/info.json | 2 ++ keyboards/atreus62/rules.mk | 6 ------ keyboards/atreyu/rev1/info.json | 2 ++ keyboards/atreyu/rev2/info.json | 2 ++ keyboards/atreyu/rules.mk | 6 ------ keyboards/atset/at1/info.json | 2 ++ keyboards/atset/at1/rules.mk | 6 ------ keyboards/atset/at12/info.json | 2 ++ keyboards/atset/at12/rules.mk | 6 ------ keyboards/atset/at16/info.json | 2 ++ keyboards/atset/at16/rules.mk | 6 ------ keyboards/atset/at3/info.json | 2 ++ keyboards/atset/at3/rules.mk | 6 ------ keyboards/atset/at6/info.json | 2 ++ keyboards/atset/at6/rules.mk | 6 ------ keyboards/atset/at9/info.json | 2 ++ keyboards/atset/at9/rules.mk | 6 ------ keyboards/atxkb/1894/info.json | 2 ++ keyboards/atxkb/1894/rules.mk | 6 ------ keyboards/aurora65/info.json | 2 ++ keyboards/aurora65/rules.mk | 6 ------ keyboards/avalanche/v1/info.json | 2 ++ keyboards/avalanche/v1/rules.mk | 6 ------ keyboards/avalanche/v2/info.json | 2 ++ keyboards/avalanche/v2/rules.mk | 6 ------ keyboards/avalanche/v3/info.json | 2 ++ keyboards/avalanche/v3/rules.mk | 6 ------ keyboards/avalanche/v4/info.json | 2 ++ keyboards/avalanche/v4/rules.mk | 6 ------ keyboards/aves60/info.json | 2 ++ keyboards/aves60/rules.mk | 6 ------ keyboards/aves65/info.json | 2 ++ keyboards/aves65/rules.mk | 6 ------ .../axolstudio/foundation_gamma/info.json | 2 ++ .../axolstudio/foundation_gamma/rules.mk | 6 ------ keyboards/axolstudio/helpo/info.json | 2 ++ keyboards/axolstudio/helpo/rules.mk | 6 ------ keyboards/axolstudio/yeti/hotswap/info.json | 2 ++ keyboards/axolstudio/yeti/hotswap/rules.mk | 6 ------ keyboards/axolstudio/yeti/soldered/info.json | 2 ++ keyboards/axolstudio/yeti/soldered/rules.mk | 6 ------ keyboards/aya/info.json | 2 ++ keyboards/aya/rules.mk | 6 ------ keyboards/b_sides/rev41lp/info.json | 2 ++ keyboards/b_sides/rev41lp/rules.mk | 6 ------ keyboards/bacca70/info.json | 2 ++ keyboards/bacca70/rules.mk | 6 ------ keyboards/baguette/info.json | 2 ++ keyboards/baguette/rules.mk | 6 ------ keyboards/bajjak/info.json | 2 ++ keyboards/bajjak/rules.mk | 6 ------ keyboards/bandominedoni/info.json | 2 ++ keyboards/bandominedoni/rules.mk | 6 ------ keyboards/bantam44/info.json | 2 ++ keyboards/bantam44/rules.mk | 6 ------ keyboards/barleycorn_smd/info.json | 2 ++ keyboards/barleycorn_smd/rules.mk | 6 ------ keyboards/barracuda/info.json | 2 ++ keyboards/barracuda/rules.mk | 6 ------ keyboards/basekeys/slice/rev1/info.json | 2 ++ keyboards/basekeys/slice/rev1/rules.mk | 6 ------ keyboards/basekeys/slice/rev1_rgb/info.json | 2 ++ keyboards/basekeys/slice/rev1_rgb/rules.mk | 6 ------ keyboards/basekeys/trifecta/info.json | 2 ++ keyboards/basekeys/trifecta/rules.mk | 6 ------ keyboards/basketweave/info.json | 2 ++ keyboards/basketweave/rules.mk | 6 ------ .../charybdis/3x5/blackpill/info.json | 5 ++++- .../charybdis/3x5/blackpill/rules.mk | 7 ------- .../charybdis/3x5/v1/elitec/info.json | 4 +++- .../charybdis/3x5/v1/elitec/rules.mk | 6 ------ .../charybdis/3x5/v2/elitec/info.json | 4 +++- .../charybdis/3x5/v2/elitec/rules.mk | 6 ------ .../charybdis/3x5/v2/splinky_2/info.json | 4 +++- .../charybdis/3x5/v2/splinky_2/rules.mk | 6 ------ .../charybdis/3x5/v2/splinky_3/info.json | 4 +++- .../charybdis/3x5/v2/splinky_3/rules.mk | 6 ------ .../charybdis/3x5/v2/stemcell/info.json | 4 +++- .../charybdis/3x5/v2/stemcell/rules.mk | 5 ----- .../charybdis/3x6/blackpill/info.json | 5 ++++- .../charybdis/3x6/blackpill/rules.mk | 7 ------- .../charybdis/3x6/v1/elitec/info.json | 4 +++- .../charybdis/3x6/v1/elitec/rules.mk | 6 ------ .../charybdis/3x6/v2/elitec/info.json | 4 +++- .../charybdis/3x6/v2/elitec/rules.mk | 6 ------ .../charybdis/3x6/v2/splinky_2/info.json | 4 +++- .../charybdis/3x6/v2/splinky_2/rules.mk | 6 ------ .../charybdis/3x6/v2/splinky_3/info.json | 4 +++- .../charybdis/3x6/v2/splinky_3/rules.mk | 6 ------ .../charybdis/3x6/v2/stemcell/info.json | 4 +++- .../charybdis/3x6/v2/stemcell/rules.mk | 5 ----- .../charybdis/4x6/blackpill/info.json | 5 ++++- .../charybdis/4x6/blackpill/rules.mk | 7 ------- .../charybdis/4x6/v1/elitec/info.json | 4 +++- .../charybdis/4x6/v1/elitec/rules.mk | 6 ------ .../charybdis/4x6/v2/elitec/info.json | 4 +++- .../charybdis/4x6/v2/elitec/rules.mk | 6 ------ .../charybdis/4x6/v2/splinky_2/info.json | 4 +++- .../charybdis/4x6/v2/splinky_2/rules.mk | 6 ------ .../charybdis/4x6/v2/splinky_3/info.json | 4 +++- .../charybdis/4x6/v2/splinky_3/rules.mk | 6 ------ .../charybdis/4x6/v2/stemcell/info.json | 4 +++- .../charybdis/4x6/v2/stemcell/rules.mk | 5 ----- .../dilemma/3x5_2/assembled/info.json | 4 +++- .../dilemma/3x5_2/assembled/rules.mk | 6 ------ .../bastardkb/dilemma/3x5_2/splinky/info.json | 4 +++- .../bastardkb/dilemma/3x5_2/splinky/rules.mk | 6 ------ keyboards/bastardkb/dilemma/3x5_3/info.json | 2 ++ keyboards/bastardkb/dilemma/3x5_3/rules.mk | 6 ------ .../bastardkb/scylla/blackpill/info.json | 5 ++++- keyboards/bastardkb/scylla/blackpill/rules.mk | 7 ------- .../bastardkb/scylla/v1/elitec/info.json | 4 +++- keyboards/bastardkb/scylla/v1/elitec/rules.mk | 6 ------ .../bastardkb/scylla/v2/elitec/info.json | 4 +++- keyboards/bastardkb/scylla/v2/elitec/rules.mk | 6 ------ .../bastardkb/scylla/v2/splinky_2/info.json | 4 +++- .../bastardkb/scylla/v2/splinky_2/rules.mk | 6 ------ .../bastardkb/scylla/v2/splinky_3/info.json | 4 +++- .../bastardkb/scylla/v2/splinky_3/rules.mk | 6 ------ .../bastardkb/scylla/v2/stemcell/info.json | 4 +++- .../bastardkb/scylla/v2/stemcell/rules.mk | 5 ----- .../bastardkb/skeletyl/blackpill/info.json | 5 ++++- .../bastardkb/skeletyl/blackpill/rules.mk | 7 ------- .../bastardkb/skeletyl/v1/elitec/info.json | 4 +++- .../bastardkb/skeletyl/v1/elitec/rules.mk | 6 ------ keyboards/bastardkb/skeletyl/v1/info.json | 5 ----- .../bastardkb/skeletyl/v2/elitec/info.json | 4 +++- .../bastardkb/skeletyl/v2/elitec/rules.mk | 6 ------ .../bastardkb/skeletyl/v2/splinky_2/info.json | 4 +++- .../bastardkb/skeletyl/v2/splinky_2/rules.mk | 6 ------ .../bastardkb/skeletyl/v2/splinky_3/info.json | 4 +++- .../bastardkb/skeletyl/v2/splinky_3/rules.mk | 6 ------ .../bastardkb/skeletyl/v2/stemcell/info.json | 4 +++- .../bastardkb/skeletyl/v2/stemcell/rules.mk | 5 ----- keyboards/bastardkb/tbk/info.json | 2 ++ keyboards/bastardkb/tbk/rules.mk | 6 ------ .../bastardkb/tbkmini/blackpill/info.json | 5 ++++- .../bastardkb/tbkmini/blackpill/rules.mk | 7 ------- .../bastardkb/tbkmini/v1/elitec/info.json | 4 +++- .../bastardkb/tbkmini/v1/elitec/rules.mk | 6 ------ .../bastardkb/tbkmini/v2/elitec/info.json | 4 +++- .../bastardkb/tbkmini/v2/elitec/rules.mk | 6 ------ .../bastardkb/tbkmini/v2/splinky_2/info.json | 4 +++- .../bastardkb/tbkmini/v2/splinky_2/rules.mk | 6 ------ .../bastardkb/tbkmini/v2/splinky_3/info.json | 4 +++- .../bastardkb/tbkmini/v2/splinky_3/rules.mk | 6 ------ .../bastardkb/tbkmini/v2/stemcell/info.json | 4 +++- .../bastardkb/tbkmini/v2/stemcell/rules.mk | 5 ----- keyboards/bbrfkr/dynamis/info.json | 2 ++ keyboards/bbrfkr/dynamis/rules.mk | 6 ------ keyboards/bear_face/info.json | 4 +++- keyboards/bear_face/rules.mk | 6 ------ keyboards/beatervan/info.json | 2 ++ keyboards/beatervan/rules.mk | 6 ------ keyboards/bemeier/bmek/rev1/info.json | 4 +++- keyboards/bemeier/bmek/rev1/rules.mk | 6 ------ keyboards/bemeier/bmek/rev2/info.json | 4 +++- keyboards/bemeier/bmek/rev2/rules.mk | 6 ------ keyboards/bemeier/bmek/rev3/info.json | 4 +++- keyboards/bemeier/bmek/rev3/rules.mk | 6 ------ keyboards/bfake/info.json | 2 ++ keyboards/bfake/rules.mk | 6 ------ keyboards/biacco42/ergo42/rev1/info.json | 2 ++ keyboards/biacco42/ergo42/rules.mk | 6 ------ keyboards/biacco42/meishi/info.json | 2 ++ keyboards/biacco42/meishi/rules.mk | 6 ------ keyboards/biacco42/meishi2/info.json | 2 ++ keyboards/biacco42/meishi2/rules.mk | 6 ------ keyboards/binepad/bn003/info.json | 2 ++ keyboards/binepad/bn003/rules.mk | 6 ------ keyboards/binepad/bn009/info.json | 2 ++ keyboards/binepad/bn009/rules.mk | 6 ------ keyboards/bioi/f60/info.json | 2 ++ keyboards/bioi/f60/rules.mk | 6 ------ keyboards/bioi/g60/info.json | 2 ++ keyboards/bioi/g60/rules.mk | 6 ------ keyboards/bioi/g60ble/info.json | 2 ++ keyboards/bioi/g60ble/rules.mk | 6 ------ keyboards/bioi/morgan65/info.json | 2 ++ keyboards/bioi/morgan65/rules.mk | 6 ------ keyboards/bioi/s65/info.json | 2 ++ keyboards/bioi/s65/rules.mk | 6 ------ keyboards/blackplum/info.json | 2 ++ keyboards/blackplum/rules.mk | 6 ------ keyboards/blank/blank01/info.json | 2 ++ keyboards/blank/blank01/rules.mk | 6 ------ keyboards/blank_tehnologii/manibus/info.json | 2 ++ keyboards/blank_tehnologii/manibus/rules.mk | 6 ------ keyboards/blaster75/info.json | 2 ++ keyboards/blaster75/rules.mk | 6 ------ keyboards/blockboy/ac980mini/rules.mk | 6 ------ keyboards/blockey/info.json | 2 ++ keyboards/blockey/rules.mk | 6 ------ keyboards/bluebell/swoop/info.json | 2 ++ keyboards/bluebell/swoop/rules.mk | 6 ------ keyboards/boardrun/bizarre/info.json | 2 ++ keyboards/boardrun/bizarre/rules.mk | 6 ------ keyboards/boardrun/classic/info.json | 2 ++ keyboards/boardrun/classic/rules.mk | 6 ------ keyboards/boardwalk/info.json | 2 ++ keyboards/boardwalk/rules.mk | 6 ------ keyboards/bobpad/info.json | 2 ++ keyboards/bobpad/rules.mk | 6 ------ keyboards/bolsa/bolsalice/info.json | 2 ++ keyboards/bolsa/bolsalice/rules.mk | 6 ------ keyboards/bolsa/damapad/info.json | 2 ++ keyboards/bolsa/damapad/rules.mk | 6 ------ keyboards/bop/info.json | 2 ++ keyboards/bop/rules.mk | 6 ------ keyboards/boston/info.json | 2 ++ keyboards/boston/rules.mk | 6 ------ keyboards/boston_meetup/2019/info.json | 3 +++ keyboards/boston_meetup/2019/rules.mk | 7 ------- keyboards/botanicalkeyboards/fm2u/info.json | 2 ++ keyboards/botanicalkeyboards/fm2u/rules.mk | 6 ------ keyboards/box75/info.json | 2 ++ keyboards/box75/rules.mk | 6 ------ keyboards/bpiphany/four_banger/info.json | 2 ++ keyboards/bpiphany/four_banger/rules.mk | 6 ------ .../bpiphany/frosty_flake/20130602/rules.mk | 6 ------ .../bpiphany/frosty_flake/20140521/rules.mk | 6 ------ keyboards/bpiphany/frosty_flake/info.json | 2 ++ keyboards/bpiphany/ghost_squid/info.json | 2 ++ keyboards/bpiphany/ghost_squid/rules.mk | 6 ------ keyboards/bpiphany/hid_liber/info.json | 2 ++ keyboards/bpiphany/hid_liber/rules.mk | 6 ------ keyboards/bpiphany/kitten_paw/info.json | 2 ++ keyboards/bpiphany/kitten_paw/rules.mk | 6 ------ keyboards/bpiphany/pegasushoof/info.json | 4 +++- keyboards/bpiphany/pegasushoof/rules.mk | 6 ------ keyboards/bpiphany/sixshooter/info.json | 2 ++ keyboards/bpiphany/sixshooter/rules.mk | 6 ------ keyboards/bpiphany/tiger_lily/info.json | 2 ++ keyboards/bpiphany/tiger_lily/rules.mk | 6 ------ keyboards/bpiphany/unloved_bastard/info.json | 2 ++ keyboards/bpiphany/unloved_bastard/rules.mk | 6 ------ keyboards/bt66tech/bt66tech60/info.json | 2 ++ keyboards/bt66tech/bt66tech60/rules.mk | 6 ------ keyboards/bthlabs/geekpad/info.json | 2 ++ keyboards/bthlabs/geekpad/rules.mk | 6 ------ keyboards/buildakb/potato65/info.json | 2 ++ keyboards/buildakb/potato65/rules.mk | 6 ------ keyboards/buildakb/potato65hs/info.json | 2 ++ keyboards/buildakb/potato65hs/rules.mk | 6 ------ keyboards/buildakb/potato65s/info.json | 2 ++ keyboards/buildakb/potato65s/rules.mk | 6 ------ keyboards/buzzard/rev1/info.json | 2 ++ keyboards/buzzard/rules.mk | 6 ------ .../cablecardesigns/cypher/rev6/info.json | 2 ++ .../cablecardesigns/cypher/rev6/rules.mk | 6 ------ keyboards/caffeinated/serpent65/info.json | 2 ++ keyboards/caffeinated/serpent65/rules.mk | 6 ------ keyboards/canary/canary60rgb/info.json | 2 ++ keyboards/canary/canary60rgb/v1/rules.mk | 6 ------ keyboards/cannonkeys/adelie/info.json | 2 ++ keyboards/cannonkeys/adelie/rules.mk | 6 ------ keyboards/cannonkeys/aella/info.json | 2 ++ keyboards/cannonkeys/aella/rules.mk | 6 ------ keyboards/cannonkeys/an_c/info.json | 2 ++ keyboards/cannonkeys/an_c/rules.mk | 6 ------ keyboards/cannonkeys/atlas/info.json | 2 ++ keyboards/cannonkeys/atlas/rules.mk | 6 ------ keyboards/cannonkeys/atlas_alps/info.json | 2 ++ keyboards/cannonkeys/atlas_alps/rules.mk | 6 ------ keyboards/cannonkeys/balance/info.json | 2 ++ keyboards/cannonkeys/balance/rules.mk | 6 ------ keyboards/cannonkeys/brutalv2_65/info.json | 2 ++ keyboards/cannonkeys/brutalv2_65/rules.mk | 6 ------ keyboards/cannonkeys/chimera65/info.json | 2 ++ keyboards/cannonkeys/chimera65/rules.mk | 6 ------ keyboards/cannonkeys/cloudline/info.json | 2 ++ keyboards/cannonkeys/cloudline/rules.mk | 6 ------ keyboards/cannonkeys/crin/info.json | 2 ++ keyboards/cannonkeys/crin/rules.mk | 6 ------ keyboards/cannonkeys/db60/info.json | 4 +++- keyboards/cannonkeys/db60/rules.mk | 6 ------ keyboards/cannonkeys/devastatingtkl/info.json | 2 ++ keyboards/cannonkeys/devastatingtkl/rules.mk | 6 ------ keyboards/cannonkeys/gentoo/info.json | 2 ++ keyboards/cannonkeys/gentoo/rules.mk | 6 ------ keyboards/cannonkeys/gentoo_hs/info.json | 2 ++ keyboards/cannonkeys/gentoo_hs/rules.mk | 6 ------ keyboards/cannonkeys/hoodrowg/info.json | 2 ++ keyboards/cannonkeys/hoodrowg/rules.mk | 6 ------ keyboards/cannonkeys/instant60/info.json | 2 ++ keyboards/cannonkeys/instant60/rules.mk | 6 ------ keyboards/cannonkeys/instant65/info.json | 2 ++ keyboards/cannonkeys/instant65/rules.mk | 6 ------ keyboards/cannonkeys/iron165/info.json | 2 ++ keyboards/cannonkeys/iron165/rules.mk | 6 ------ keyboards/cannonkeys/malicious_ergo/info.json | 2 ++ keyboards/cannonkeys/malicious_ergo/rules.mk | 6 ------ keyboards/cannonkeys/nearfield/info.json | 2 ++ keyboards/cannonkeys/nearfield/rules.mk | 6 ------ keyboards/cannonkeys/obliterated75/info.json | 2 ++ keyboards/cannonkeys/obliterated75/rules.mk | 6 ------ keyboards/cannonkeys/onyx/info.json | 2 ++ keyboards/cannonkeys/onyx/rules.mk | 6 ------ keyboards/cannonkeys/ortho48/info.json | 2 ++ keyboards/cannonkeys/ortho48/rules.mk | 6 ------ keyboards/cannonkeys/ortho60/info.json | 2 ++ keyboards/cannonkeys/ortho60/rules.mk | 6 ------ keyboards/cannonkeys/ortho75/info.json | 2 ++ keyboards/cannonkeys/ortho75/rules.mk | 6 ------ keyboards/cannonkeys/practice60/info.json | 2 ++ keyboards/cannonkeys/practice60/rules.mk | 6 ------ keyboards/cannonkeys/practice65/info.json | 2 ++ keyboards/cannonkeys/practice65/rules.mk | 6 ------ keyboards/cannonkeys/rekt1800/info.json | 2 ++ keyboards/cannonkeys/rekt1800/rules.mk | 6 ------ keyboards/cannonkeys/sagittarius/info.json | 2 ++ keyboards/cannonkeys/sagittarius/rules.mk | 6 ------ keyboards/cannonkeys/satisfaction75/info.json | 4 +++- keyboards/cannonkeys/satisfaction75/rules.mk | 7 ------- keyboards/cannonkeys/savage65/info.json | 2 ++ keyboards/cannonkeys/savage65/rules.mk | 6 ------ keyboards/cannonkeys/tmov2/info.json | 2 ++ keyboards/cannonkeys/tmov2/rules.mk | 6 ------ keyboards/cannonkeys/tsukuyomi/info.json | 2 ++ keyboards/cannonkeys/tsukuyomi/rules.mk | 6 ------ keyboards/cannonkeys/vicious40/info.json | 2 ++ keyboards/cannonkeys/vicious40/rules.mk | 6 ------ keyboards/capsunlocked/cu24/info.json | 2 ++ keyboards/capsunlocked/cu24/rules.mk | 6 ------ keyboards/capsunlocked/cu65/info.json | 2 ++ keyboards/capsunlocked/cu65/rules.mk | 6 ------ keyboards/capsunlocked/cu7/info.json | 2 ++ keyboards/capsunlocked/cu7/rules.mk | 6 ------ keyboards/capsunlocked/cu75/info.json | 2 ++ keyboards/capsunlocked/cu75/rules.mk | 6 ------ keyboards/capsunlocked/cu80/v1/info.json | 2 ++ keyboards/capsunlocked/cu80/v1/rules.mk | 6 ------ keyboards/carbo65/info.json | 2 ++ keyboards/carbo65/rules.mk | 6 ------ keyboards/catch22/info.json | 2 ++ keyboards/catch22/rules.mk | 6 ------ keyboards/centromere/info.json | 2 ++ keyboards/centromere/rules.mk | 6 ------ keyboards/cest73/tkm/info.json | 2 ++ keyboards/cest73/tkm/rules.mk | 6 ------ keyboards/chalice/info.json | 2 ++ keyboards/chalice/rules.mk | 6 ------ keyboards/chaos65/info.json | 2 ++ keyboards/chaos65/rules.mk | 6 ------ keyboards/charue/charon/info.json | 2 ++ keyboards/charue/charon/rules.mk | 6 ------ keyboards/charue/sunsetter/info.json | 2 ++ keyboards/charue/sunsetter/rules.mk | 6 ------ keyboards/charue/sunsetter_r2/info.json | 2 ++ keyboards/charue/sunsetter_r2/rules.mk | 6 ------ keyboards/chavdai40/rev1/info.json | 4 +++- keyboards/chavdai40/rev1/rules.mk | 6 ------ keyboards/chavdai40/rev2/info.json | 4 +++- keyboards/chavdai40/rev2/rules.mk | 6 ------ keyboards/checkerboards/axon40/info.json | 2 ++ keyboards/checkerboards/axon40/rules.mk | 6 ------ .../checkerboards/candybar_ortho/info.json | 2 ++ .../checkerboards/candybar_ortho/rules.mk | 6 ------ keyboards/checkerboards/g_idb60/info.json | 2 ++ keyboards/checkerboards/g_idb60/rules.mk | 6 ------ keyboards/checkerboards/nop60/info.json | 2 ++ keyboards/checkerboards/nop60/rules.mk | 6 ------ .../checkerboards/phoenix45_ortho/info.json | 2 ++ .../checkerboards/phoenix45_ortho/rules.mk | 6 ------ keyboards/checkerboards/plexus75/info.json | 2 ++ keyboards/checkerboards/plexus75/rules.mk | 6 ------ keyboards/checkerboards/plexus75_he/info.json | 2 ++ keyboards/checkerboards/plexus75_he/rules.mk | 6 ------ keyboards/checkerboards/pursuit40/info.json | 2 ++ keyboards/checkerboards/pursuit40/rules.mk | 6 ------ keyboards/checkerboards/quark/info.json | 2 ++ keyboards/checkerboards/quark/rules.mk | 6 ------ keyboards/checkerboards/quark_lp/info.json | 2 ++ keyboards/checkerboards/quark_lp/rules.mk | 6 ------ keyboards/checkerboards/quark_plus/info.json | 2 ++ keyboards/checkerboards/quark_plus/rules.mk | 6 ------ .../checkerboards/quark_squared/info.json | 2 ++ .../checkerboards/quark_squared/rules.mk | 6 ------ keyboards/checkerboards/snop60/info.json | 2 ++ keyboards/checkerboards/snop60/rules.mk | 6 ------ .../checkerboards/ud40_ortho_alt/info.json | 2 ++ .../checkerboards/ud40_ortho_alt/rules.mk | 6 ------ keyboards/cherrybstudio/cb1800/info.json | 2 ++ keyboards/cherrybstudio/cb1800/rules.mk | 6 ------ keyboards/cherrybstudio/cb65/info.json | 2 ++ keyboards/cherrybstudio/cb65/rules.mk | 6 ------ keyboards/cherrybstudio/cb87/info.json | 2 ++ keyboards/cherrybstudio/cb87/rules.mk | 6 ------ keyboards/cherrybstudio/cb87rgb/info.json | 2 ++ keyboards/cherrybstudio/cb87rgb/rules.mk | 6 ------ keyboards/cherrybstudio/cb87v2/info.json | 2 ++ keyboards/cherrybstudio/cb87v2/rules.mk | 6 ------ keyboards/cheshire/curiosity/info.json | 2 ++ keyboards/cheshire/curiosity/rules.mk | 6 ------ keyboards/chickenman/ciel/info.json | 2 ++ keyboards/chickenman/ciel/rules.mk | 6 ------ keyboards/chlx/merro60/info.json | 2 ++ keyboards/chlx/merro60/rules.mk | 6 ------ keyboards/chlx/str_merro60/info.json | 2 ++ keyboards/chlx/str_merro60/rules.mk | 6 ------ keyboards/chocofly/v1/info.json | 2 ++ keyboards/chocofly/v1/rules.mk | 6 ------ keyboards/chocv/info.json | 2 ++ keyboards/chocv/rules.mk | 6 ------ keyboards/cipulot/kallos/info.json | 2 ++ keyboards/cipulot/kallos/rules.mk | 6 ------ keyboards/cipulot/kawayo/info.json | 2 ++ keyboards/cipulot/kawayo/rules.mk | 8 ------- keyboards/ck60i/info.json | 2 ++ keyboards/ck60i/rules.mk | 6 ------ keyboards/ckeys/handwire_101/info.json | 2 ++ keyboards/ckeys/handwire_101/rules.mk | 6 ------ keyboards/ckeys/nakey/info.json | 2 ++ keyboards/ckeys/nakey/rules.mk | 6 ------ keyboards/ckeys/obelus/info.json | 2 ++ keyboards/ckeys/obelus/rules.mk | 6 ------ keyboards/ckeys/thedora/info.json | 3 +++ keyboards/ckeys/thedora/rules.mk | 7 ------- keyboards/ckeys/washington/info.json | 2 ++ keyboards/ckeys/washington/rules.mk | 6 ------ keyboards/clawsome/bookerboard/info.json | 2 ++ keyboards/clawsome/bookerboard/rules.mk | 6 ------ keyboards/clawsome/coupe/info.json | 2 ++ keyboards/clawsome/coupe/rules.mk | 6 ------ keyboards/clawsome/doodle/info.json | 2 ++ keyboards/clawsome/doodle/rules.mk | 6 ------ keyboards/clawsome/fightpad/info.json | 2 ++ keyboards/clawsome/fightpad/rules.mk | 6 ------ keyboards/clawsome/gamebuddy/v1_0/info.json | 2 ++ keyboards/clawsome/gamebuddy/v1_0/rules.mk | 6 ------ keyboards/clawsome/gamebuddy/v1_m/info.json | 2 ++ keyboards/clawsome/gamebuddy/v1_m/rules.mk | 6 ------ keyboards/clawsome/hatchback/info.json | 2 ++ keyboards/clawsome/hatchback/rules.mk | 6 ------ keyboards/clawsome/luggage_rack/info.json | 2 ++ keyboards/clawsome/luggage_rack/rules.mk | 6 ------ keyboards/clawsome/numeros/info.json | 2 ++ keyboards/clawsome/numeros/rules.mk | 6 ------ keyboards/clawsome/roadster/info.json | 2 ++ keyboards/clawsome/roadster/rules.mk | 6 ------ keyboards/clawsome/sedan/info.json | 2 ++ keyboards/clawsome/sedan/rules.mk | 6 ------ keyboards/clawsome/sidekick/info.json | 2 ++ keyboards/clawsome/sidekick/rules.mk | 6 ------ keyboards/clawsome/suv/info.json | 2 ++ keyboards/clawsome/suv/rules.mk | 6 ------ keyboards/clickety_split/leeloo/info.json | 2 ++ keyboards/clickety_split/leeloo/rules.mk | 6 ------ keyboards/cmm_studio/fuji65/info.json | 2 ++ keyboards/cmm_studio/fuji65/rules.mk | 6 ------ keyboards/cmm_studio/saka68/hotswap/info.json | 2 ++ keyboards/cmm_studio/saka68/hotswap/rules.mk | 6 ------ keyboards/cmm_studio/saka68/solder/info.json | 2 ++ keyboards/cmm_studio/saka68/solder/rules.mk | 6 ------ keyboards/coarse/cordillera/info.json | 2 ++ keyboards/coarse/cordillera/rules.mk | 6 ------ keyboards/coarse/ixora/info.json | 2 ++ keyboards/coarse/ixora/rules.mk | 6 ------ keyboards/coarse/vinta/info.json | 2 ++ keyboards/coarse/vinta/rules.mk | 6 ------ keyboards/compound/info.json | 2 ++ keyboards/compound/rules.mk | 6 ------ keyboards/contender/info.json | 2 ++ keyboards/contender/rules.mk | 6 ------ keyboards/contra/info.json | 2 ++ keyboards/contra/rules.mk | 6 ------ keyboards/converter/a1200/miss1200/info.json | 4 +++- keyboards/converter/a1200/miss1200/rules.mk | 6 ------ .../converter/a1200/mistress1200/info.json | 4 +++- .../converter/a1200/mistress1200/rules.mk | 6 ------ keyboards/converter/a1200/teensy2pp/info.json | 4 +++- keyboards/converter/a1200/teensy2pp/rules.mk | 6 ------ keyboards/converter/adb_usb/rev1/info.json | 4 ++++ keyboards/converter/adb_usb/rev1/rules.mk | 5 ----- keyboards/converter/adb_usb/rev2/info.json | 4 ++++ keyboards/converter/adb_usb/rev2/rules.mk | 5 ----- keyboards/converter/hp_46010a/info.json | 2 ++ keyboards/converter/hp_46010a/rules.mk | 6 ------ keyboards/converter/ibm_terminal/info.json | 2 ++ keyboards/converter/ibm_terminal/rules.mk | 6 ------ keyboards/converter/m0110_usb/info.json | 2 ++ keyboards/converter/m0110_usb/rules.mk | 6 ------ keyboards/converter/modelm101/info.json | 2 ++ keyboards/converter/modelm101/rules.mk | 6 ------ .../converter/modelm101_teensy2/info.json | 2 ++ .../converter/modelm101_teensy2/rules.mk | 6 ------ keyboards/converter/modelm_ssk/info.json | 2 ++ keyboards/converter/modelm_ssk/rules.mk | 6 ------ .../converter/numeric_keypad_iie/info.json | 2 ++ .../converter/numeric_keypad_iie/rules.mk | 6 ------ keyboards/converter/palm_usb/info.json | 4 +++- keyboards/converter/palm_usb/rules.mk | 6 ------ keyboards/converter/periboard_512/info.json | 2 ++ keyboards/converter/periboard_512/rules.mk | 6 ------ .../converter/siemens_tastatur/info.json | 2 ++ keyboards/converter/siemens_tastatur/rules.mk | 6 ------ keyboards/converter/sun_usb/info.json | 4 +++- keyboards/converter/sun_usb/rules.mk | 6 ------ keyboards/converter/usb_usb/ble/info.json | 3 +++ keyboards/converter/usb_usb/hasu/info.json | 3 +++ keyboards/converter/usb_usb/hasu/rules.mk | 3 --- keyboards/converter/usb_usb/info.json | 1 + .../converter/usb_usb/pro_micro/info.json | 3 +++ keyboards/converter/usb_usb/rules.mk | 6 ------ keyboards/converter/xt_usb/info.json | 2 ++ keyboards/converter/xt_usb/rules.mk | 6 ------ keyboards/cool836a/info.json | 2 ++ keyboards/cool836a/rules.mk | 6 ------ .../copenhagen_click/click_pad_v1/info.json | 2 ++ .../copenhagen_click/click_pad_v1/rules.mk | 6 ------ keyboards/coseyfannitutti/discipad/info.json | 2 ++ keyboards/coseyfannitutti/discipad/rules.mk | 6 ------ .../coseyfannitutti/discipline/info.json | 2 ++ keyboards/coseyfannitutti/discipline/rules.mk | 6 ------ keyboards/coseyfannitutti/mullet/info.json | 2 ++ keyboards/coseyfannitutti/mullet/rules.mk | 6 ------ keyboards/coseyfannitutti/mulletpad/info.json | 2 ++ keyboards/coseyfannitutti/mulletpad/rules.mk | 6 ------ keyboards/coseyfannitutti/mysterium/info.json | 2 ++ keyboards/coseyfannitutti/mysterium/rules.mk | 6 ------ keyboards/coseyfannitutti/romeo/info.json | 2 ++ keyboards/coseyfannitutti/romeo/rules.mk | 6 ------ keyboards/cosmo65/info.json | 2 ++ keyboards/cosmo65/rules.mk | 6 ------ keyboards/cozykeys/bloomer/v2/info.json | 2 ++ keyboards/cozykeys/bloomer/v2/rules.mk | 6 ------ keyboards/cozykeys/bloomer/v3/info.json | 2 ++ keyboards/cozykeys/bloomer/v3/rules.mk | 6 ------ keyboards/cozykeys/speedo/v2/info.json | 2 ++ keyboards/cozykeys/speedo/v2/rules.mk | 6 ------ keyboards/cozykeys/speedo/v3/info.json | 2 ++ keyboards/cozykeys/speedo/v3/rules.mk | 6 ------ keyboards/craftwalk/info.json | 2 ++ keyboards/craftwalk/rules.mk | 6 ------ keyboards/crawlpad/info.json | 2 ++ keyboards/crawlpad/rules.mk | 6 ------ keyboards/crazy_keyboard_68/info.json | 2 ++ keyboards/crazy_keyboard_68/rules.mk | 6 ------ keyboards/crbn/info.json | 2 ++ keyboards/crbn/rules.mk | 6 ------ keyboards/creatkeebs/glacier/info.json | 2 ++ keyboards/creatkeebs/glacier/rules.mk | 6 ------ keyboards/creatkeebs/thera/info.json | 2 ++ keyboards/creatkeebs/thera/rules.mk | 6 ------ .../crimsonkeyboards/resume1800/info.json | 2 ++ .../crimsonkeyboards/resume1800/rules.mk | 6 ------ keyboards/crin/info.json | 2 ++ keyboards/crin/rules.mk | 6 ------ keyboards/crkbd/info.json | 1 + keyboards/crkbd/r2g/info.json | 3 +++ keyboards/crkbd/r2g/rules.mk | 3 --- keyboards/crkbd/rev1/info.json | 3 +++ keyboards/crkbd/rules.mk | 6 ------ keyboards/crypt_macro/info.json | 2 ++ keyboards/crypt_macro/rules.mk | 6 ------ keyboards/custommk/evo70/info.json | 2 ++ keyboards/custommk/evo70/rules.mk | 6 ------ keyboards/custommk/genesis/rev1/info.json | 2 ++ keyboards/custommk/genesis/rev2/info.json | 2 ++ keyboards/custommk/genesis/rev2/rules.mk | 6 ------ keyboards/custommk/genesis/rules.mk | 6 ------ keyboards/cutie_club/borsdorf/info.json | 2 ++ keyboards/cutie_club/borsdorf/rules.mk | 6 ------ .../cutie_club/giant_macro_pad/info.json | 2 ++ keyboards/cutie_club/giant_macro_pad/rules.mk | 6 ------ keyboards/cutie_club/keebcats/denis/info.json | 2 ++ keyboards/cutie_club/keebcats/denis/rules.mk | 6 ------ .../cutie_club/keebcats/dougal/info.json | 2 ++ keyboards/cutie_club/keebcats/dougal/rules.mk | 6 ------ keyboards/cutie_club/novus/info.json | 2 ++ keyboards/cutie_club/novus/rules.mk | 6 ------ keyboards/cutie_club/wraith/info.json | 2 ++ keyboards/cutie_club/wraith/rules.mk | 6 ------ keyboards/cx60/info.json | 2 ++ keyboards/cx60/rules.mk | 6 ------ keyboards/cybergear/macro25/info.json | 2 ++ keyboards/cybergear/macro25/rules.mk | 6 ------ keyboards/dailycraft/bat43/info.json | 2 ++ keyboards/dailycraft/bat43/rules.mk | 6 ------ keyboards/dailycraft/claw44/rev1/info.json | 2 ++ keyboards/dailycraft/claw44/rules.mk | 6 ------ keyboards/dailycraft/owl8/info.json | 2 ++ keyboards/dailycraft/owl8/rules.mk | 6 ------ keyboards/dailycraft/sandbox/rev1/info.json | 2 ++ keyboards/dailycraft/sandbox/rev2/info.json | 2 ++ keyboards/dailycraft/sandbox/rules.mk | 6 ------ keyboards/dailycraft/stickey4/info.json | 4 +++- keyboards/dailycraft/stickey4/rules.mk | 6 ------ keyboards/dailycraft/wings42/rev1/info.json | 2 ++ .../dailycraft/wings42/rev1_extkeys/info.json | 2 ++ keyboards/dailycraft/wings42/rev2/info.json | 2 ++ keyboards/dailycraft/wings42/rules.mk | 6 ------ keyboards/daji/seis_cinco/info.json | 2 ++ keyboards/daji/seis_cinco/rules.mk | 7 ------- keyboards/db/db63/info.json | 2 ++ keyboards/db/db63/rules.mk | 6 ------ keyboards/dc01/arrow/info.json | 2 ++ keyboards/dc01/arrow/rules.mk | 6 ------ keyboards/dc01/left/info.json | 2 ++ keyboards/dc01/left/rules.mk | 6 ------ keyboards/dc01/numpad/info.json | 2 ++ keyboards/dc01/numpad/rules.mk | 6 ------ keyboards/dc01/right/info.json | 2 ++ keyboards/dc01/right/rules.mk | 6 ------ keyboards/dekunukem/duckypad/info.json | 2 ++ keyboards/dekunukem/duckypad/rules.mk | 6 ------ keyboards/delikeeb/flatbread60/info.json | 2 ++ keyboards/delikeeb/flatbread60/rules.mk | 6 ------ keyboards/delikeeb/vaguettelite/info.json | 2 ++ keyboards/delikeeb/vaguettelite/rules.mk | 6 ------ keyboards/delikeeb/vanana/info.json | 2 ++ keyboards/delikeeb/vanana/rules.mk | 6 ------ keyboards/delikeeb/vaneela/info.json | 2 ++ keyboards/delikeeb/vaneela/rules.mk | 6 ------ keyboards/delikeeb/vaneelaex/info.json | 2 ++ keyboards/delikeeb/vaneelaex/rules.mk | 6 ------ .../delikeeb/waaffle/rev3/elite_c/info.json | 4 ++++ .../delikeeb/waaffle/rev3/elite_c/rules.mk | 3 --- .../delikeeb/waaffle/rev3/pro_micro/info.json | 4 ++++ .../delikeeb/waaffle/rev3/pro_micro/rules.mk | 3 --- keyboards/delikeeb/waaffle/rev3/rules.mk | 6 ------ keyboards/deltapad/info.json | 2 ++ keyboards/deltapad/rules.mk | 6 ------ keyboards/deltasplit75/rules.mk | 6 ------ keyboards/deltasplit75/v2/info.json | 2 ++ keyboards/demiurge/info.json | 2 ++ keyboards/demiurge/rules.mk | 6 ------ keyboards/deng/djam/info.json | 2 ++ keyboards/deng/djam/rules.mk | 6 ------ keyboards/deng/thirty/info.json | 2 ++ keyboards/deng/thirty/rules.mk | 3 --- keyboards/dichotomy/info.json | 2 ++ keyboards/dichotomy/rules.mk | 6 ------ keyboards/dinofizz/fnrow/v1/info.json | 2 ++ keyboards/dinofizz/fnrow/v1/rules.mk | 6 ------ keyboards/dk60/info.json | 2 ++ keyboards/dk60/rules.mk | 6 ------ keyboards/dm9records/ergoinu/info.json | 2 ++ keyboards/dm9records/ergoinu/rules.mk | 6 ------ keyboards/dm9records/lain/info.json | 2 ++ keyboards/dm9records/lain/rules.mk | 6 ------ keyboards/dm9records/plaid/info.json | 2 ++ keyboards/dm9records/plaid/rules.mk | 6 ------ keyboards/dm9records/tartan/info.json | 2 ++ keyboards/dm9records/tartan/rules.mk | 6 ------ keyboards/dmqdesign/spin/info.json | 2 ++ keyboards/dmqdesign/spin/rules.mk | 6 ------ keyboards/do60/info.json | 2 ++ keyboards/do60/rules.mk | 6 ------ keyboards/doio/kb16/rev1/info.json | 2 ++ keyboards/doio/kb16/rev1/rules.mk | 6 ------ keyboards/doio/kb30/info.json | 2 ++ keyboards/doio/kb30/rules.mk | 6 ------ keyboards/donutcables/budget96/info.json | 2 ++ keyboards/donutcables/budget96/rules.mk | 6 ------ keyboards/donutcables/scrabblepad/info.json | 2 ++ keyboards/donutcables/scrabblepad/rules.mk | 6 ------ keyboards/doodboard/duckboard/info.json | 2 ++ keyboards/doodboard/duckboard/rules.mk | 6 ------ keyboards/doodboard/duckboard_r2/info.json | 2 ++ keyboards/doodboard/duckboard_r2/rules.mk | 6 ------ keyboards/doppelganger/info.json | 2 ++ keyboards/doppelganger/rules.mk | 6 ------ keyboards/doro67/multi/info.json | 2 ++ keyboards/doro67/multi/rules.mk | 6 ------ keyboards/doro67/regular/info.json | 2 ++ keyboards/doro67/regular/rules.mk | 6 ------ keyboards/doro67/rgb/info.json | 2 ++ keyboards/doro67/rgb/rules.mk | 6 ------ keyboards/dp60/info.json | 2 ++ keyboards/dp60/rules.mk | 6 ------ keyboards/draculad/info.json | 2 ++ keyboards/draculad/rules.mk | 6 ------ keyboards/draytronics/daisy/info.json | 2 ++ keyboards/draytronics/daisy/rules.mk | 6 ------ keyboards/draytronics/elise/info.json | 2 ++ keyboards/draytronics/elise/rules.mk | 6 ------ keyboards/draytronics/elise_v2/info.json | 2 ++ keyboards/draytronics/elise_v2/rules.mk | 6 ------ keyboards/draytronics/scarlet/info.json | 2 ++ keyboards/draytronics/scarlet/rules.mk | 6 ------ keyboards/drewkeys/iskar/info.json | 2 ++ keyboards/drewkeys/iskar/rules.mk | 6 ------ keyboards/drhigsby/bkf/info.json | 2 ++ keyboards/drhigsby/bkf/rules.mk | 6 ------ keyboards/drhigsby/dubba175/info.json | 2 ++ keyboards/drhigsby/dubba175/rules.mk | 6 ------ keyboards/drhigsby/ogurec/info.json | 2 ++ keyboards/drhigsby/ogurec/rules.mk | 6 ------ keyboards/drhigsby/packrat/info.json | 2 ++ keyboards/drhigsby/packrat/rules.mk | 6 ------ keyboards/dtisaac/cg108/info.json | 2 ++ keyboards/dtisaac/cg108/rules.mk | 6 ------ keyboards/dtisaac/dosa40rgb/info.json | 2 ++ keyboards/dtisaac/dosa40rgb/rules.mk | 6 ------ keyboards/dtisaac/dtisaac01/info.json | 2 ++ keyboards/dtisaac/dtisaac01/rules.mk | 6 ------ keyboards/duck/eagle_viper/v2/info.json | 2 ++ keyboards/duck/eagle_viper/v2/rules.mk | 6 ------ keyboards/duck/jetfire/info.json | 2 ++ keyboards/duck/jetfire/rules.mk | 6 ------ keyboards/duck/lightsaver/info.json | 2 ++ keyboards/duck/lightsaver/rules.mk | 6 ------ keyboards/duck/octagon/v1/info.json | 2 ++ keyboards/duck/octagon/v1/rules.mk | 6 ------ keyboards/duck/octagon/v2/info.json | 2 ++ keyboards/duck/octagon/v2/rules.mk | 6 ------ keyboards/duck/orion/v3/info.json | 2 ++ keyboards/duck/orion/v3/rules.mk | 6 ------ keyboards/duck/tcv3/info.json | 2 ++ keyboards/duck/tcv3/rules.mk | 6 ------ keyboards/dumbo/info.json | 2 ++ keyboards/dumbo/rules.mk | 6 ------ keyboards/dumbpad/v0x/info.json | 2 ++ keyboards/dumbpad/v0x/rules.mk | 6 ------ keyboards/dumbpad/v0x_dualencoder/info.json | 2 ++ keyboards/dumbpad/v0x_dualencoder/rules.mk | 6 ------ keyboards/dumbpad/v0x_right/info.json | 2 ++ keyboards/dumbpad/v0x_right/rules.mk | 6 ------ keyboards/dumbpad/v1x/info.json | 2 ++ keyboards/dumbpad/v1x/rules.mk | 6 ------ keyboards/dumbpad/v1x_dualencoder/info.json | 2 ++ keyboards/dumbpad/v1x_dualencoder/rules.mk | 6 ------ keyboards/dumbpad/v1x_oled/info.json | 2 ++ keyboards/dumbpad/v1x_oled/rules.mk | 6 ------ keyboards/dumbpad/v1x_right/info.json | 2 ++ keyboards/dumbpad/v1x_right/rules.mk | 6 ------ keyboards/dumbpad/v3x/info.json | 2 ++ keyboards/dumbpad/v3x/rules.mk | 6 ------ keyboards/durgod/dgk6x/info.json | 5 +++++ keyboards/durgod/dgk6x/rules.mk | 8 ------- keyboards/durgod/k310/base/info.json | 5 +++++ keyboards/durgod/k310/base/rules.mk | 8 ------- keyboards/durgod/k320/base/info.json | 5 +++++ keyboards/durgod/k320/base/rules.mk | 8 ------- keyboards/dyz/dyz40/info.json | 2 ++ keyboards/dyz/dyz40/rules.mk | 6 ------ keyboards/dyz/dyz60/info.json | 2 ++ keyboards/dyz/dyz60/rules.mk | 6 ------ keyboards/dyz/dyz60_hs/info.json | 2 ++ keyboards/dyz/dyz60_hs/rules.mk | 6 ------ keyboards/dyz/dyz_tkl/info.json | 2 ++ keyboards/dyz/dyz_tkl/rules.mk | 6 ------ keyboards/dyz/selka40/info.json | 2 ++ keyboards/dyz/selka40/rules.mk | 6 ------ keyboards/dyz/synthesis60/info.json | 2 ++ keyboards/dyz/synthesis60/rules.mk | 6 ------ keyboards/dz60/info.json | 2 ++ keyboards/dz60/rules.mk | 6 ------ keyboards/dztech/bocc/info.json | 2 ++ keyboards/dztech/bocc/rules.mk | 6 ------ keyboards/dztech/duo_s/info.json | 2 ++ keyboards/dztech/duo_s/rules.mk | 6 ------ keyboards/dztech/dz60rgb/v1/info.json | 3 +++ keyboards/dztech/dz60rgb/v2/info.json | 2 ++ keyboards/dztech/dz60rgb/v2/rules.mk | 6 ------ keyboards/dztech/dz60rgb/v2_1/info.json | 2 ++ keyboards/dztech/dz60rgb/v2_1/rules.mk | 5 ----- keyboards/dztech/dz60rgb_ansi/v1/info.json | 3 +++ keyboards/dztech/dz60rgb_ansi/v1/rules.mk | 7 ------- keyboards/dztech/dz60rgb_ansi/v2/info.json | 2 ++ keyboards/dztech/dz60rgb_ansi/v2/rules.mk | 6 ------ keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 2 ++ keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk | 5 ----- keyboards/dztech/dz60rgb_wkl/v1/info.json | 3 +++ keyboards/dztech/dz60rgb_wkl/v1/rules.mk | 7 ------- keyboards/dztech/dz60rgb_wkl/v2/info.json | 2 ++ keyboards/dztech/dz60rgb_wkl/v2/rules.mk | 6 ------ keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 2 ++ keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk | 5 ----- keyboards/dztech/dz64rgb/info.json | 2 ++ keyboards/dztech/dz64rgb/rules.mk | 6 ------ keyboards/dztech/dz65rgb/v1/info.json | 3 +++ keyboards/dztech/dz65rgb/v1/rules.mk | 7 ------- keyboards/dztech/dz65rgb/v2/info.json | 2 ++ keyboards/dztech/dz65rgb/v2/rules.mk | 6 ------ keyboards/dztech/dz65rgb/v3/info.json | 4 +++- keyboards/dztech/dz65rgb/v3/rules.mk | 5 ----- keyboards/dztech/dz96/info.json | 2 ++ keyboards/dztech/dz96/rules.mk | 6 ------ keyboards/dztech/endless80/info.json | 2 ++ keyboards/dztech/endless80/rules.mk | 6 ------ keyboards/e88/info.json | 2 ++ keyboards/e88/rules.mk | 6 ------ keyboards/ealdin/quadrant/info.json | 2 ++ keyboards/ealdin/quadrant/rules.mk | 6 ------ keyboards/earth_rover/info.json | 2 ++ keyboards/earth_rover/rules.mk | 6 ------ keyboards/eason/capsule65/info.json | 2 ++ keyboards/eason/capsule65/rules.mk | 6 ------ .../ebastler/isometria_75/rev1/info.json | 2 ++ keyboards/ebastler/isometria_75/rev1/rules.mk | 6 ------ keyboards/eco/info.json | 2 ++ keyboards/eco/rules.mk | 6 ------ keyboards/edc40/info.json | 2 ++ keyboards/edc40/rules.mk | 6 ------ keyboards/edda/info.json | 2 ++ keyboards/edda/rules.mk | 6 ------ keyboards/edi/hardlight/mk1/info.json | 2 ++ keyboards/edi/hardlight/mk1/rules.mk | 6 ------ keyboards/edi/hardlight/mk2/info.json | 2 ++ keyboards/edi/hardlight/mk2/rules.mk | 6 ------ keyboards/edi/standaside/info.json | 2 ++ keyboards/edi/standaside/rules.mk | 6 ------ keyboards/eek/info.json | 2 ++ keyboards/eek/rules.mk | 6 ------ keyboards/efreet/info.json | 2 ++ keyboards/efreet/rules.mk | 6 ------ keyboards/ein_60/info.json | 2 ++ keyboards/ein_60/rules.mk | 6 ------ keyboards/ekow/akira/info.json | 2 ++ keyboards/ekow/akira/rules.mk | 6 ------ keyboards/elephant42/info.json | 2 ++ keyboards/elephant42/rules.mk | 6 ------ keyboards/emajesty/eiri/info.json | 2 ++ keyboards/emajesty/eiri/rules.mk | 6 ------ keyboards/emery65/info.json | 2 ++ keyboards/emery65/rules.mk | 6 ------ keyboards/emi20/info.json | 2 ++ keyboards/emi20/rules.mk | 6 ------ keyboards/emptystring/nqg/info.json | 2 ++ keyboards/emptystring/nqg/rules.mk | 6 ------ keyboards/eniigmakeyboards/ek60/info.json | 2 ++ keyboards/eniigmakeyboards/ek60/rules.mk | 6 ------ keyboards/eniigmakeyboards/ek65/rules.mk | 6 ------ keyboards/eniigmakeyboards/ek87/info.json | 2 ++ keyboards/eniigmakeyboards/ek87/rules.mk | 6 ------ keyboards/ep/40/info.json | 2 ++ keyboards/ep/40/rules.mk | 6 ------ keyboards/ep/96/info.json | 2 ++ keyboards/ep/96/rules.mk | 6 ------ keyboards/ep/comsn/hs68/info.json | 2 ++ keyboards/ep/comsn/hs68/rules.mk | 6 ------ keyboards/ep/comsn/mollydooker/info.json | 2 ++ keyboards/ep/comsn/mollydooker/rules.mk | 6 ------ keyboards/ep/comsn/tf_longeboye/info.json | 2 ++ keyboards/ep/comsn/tf_longeboye/rules.mk | 6 ------ keyboards/epoch80/info.json | 2 ++ keyboards/epoch80/rules.mk | 6 ------ keyboards/ergodox_ez/info.json | 2 ++ keyboards/ergodox_ez/rules.mk | 6 ------ keyboards/ergoslab/rev1/info.json | 2 ++ keyboards/ergoslab/rules.mk | 6 ------ .../ericrlau/numdiscipline/rev1/info.json | 2 ++ .../ericrlau/numdiscipline/rev1/rules.mk | 6 ------ keyboards/esca/getawayvan/info.json | 2 ++ keyboards/esca/getawayvan/rules.mk | 6 ------ keyboards/esca/getawayvan_f042/info.json | 2 ++ keyboards/esca/getawayvan_f042/rules.mk | 6 ------ keyboards/eternal_keypad/info.json | 2 ++ keyboards/eternal_keypad/rules.mk | 6 ------ keyboards/eu_isolation/info.json | 2 ++ keyboards/eu_isolation/rules.mk | 6 ------ .../evancookaudio/sleepingdinosaur/info.json | 2 ++ .../evancookaudio/sleepingdinosaur/rules.mk | 6 ------ keyboards/evancookaudio/tenpad/info.json | 2 ++ keyboards/evancookaudio/tenpad/rules.mk | 6 ------ keyboards/eve/meteor/info.json | 2 ++ keyboards/eve/meteor/rules.mk | 6 ------ keyboards/evil80/info.json | 2 ++ keyboards/evil80/rules.mk | 6 ------ keyboards/evolv/info.json | 2 ++ keyboards/evolv/rules.mk | 6 ------ keyboards/evyd13/atom47/rev2/info.json | 2 ++ keyboards/evyd13/atom47/rev3/info.json | 2 ++ keyboards/evyd13/atom47/rev4/info.json | 2 ++ keyboards/evyd13/atom47/rev5/info.json | 2 ++ keyboards/evyd13/atom47/rules.mk | 6 ------ keyboards/evyd13/eon40/info.json | 2 ++ keyboards/evyd13/eon40/rules.mk | 6 ------ keyboards/evyd13/eon65/info.json | 2 ++ keyboards/evyd13/eon65/rules.mk | 6 ------ keyboards/evyd13/eon75/info.json | 2 ++ keyboards/evyd13/eon75/rules.mk | 6 ------ keyboards/evyd13/eon87/info.json | 2 ++ keyboards/evyd13/eon87/rules.mk | 6 ------ keyboards/evyd13/eon95/info.json | 2 ++ keyboards/evyd13/eon95/rules.mk | 6 ------ keyboards/evyd13/gh80_1800/info.json | 2 ++ keyboards/evyd13/gh80_1800/rules.mk | 6 ------ keyboards/evyd13/gh80_3700/info.json | 2 ++ keyboards/evyd13/gh80_3700/rules.mk | 6 ------ keyboards/evyd13/gud70/info.json | 2 ++ keyboards/evyd13/gud70/rules.mk | 6 ------ keyboards/evyd13/minitomic/info.json | 2 ++ keyboards/evyd13/minitomic/rules.mk | 6 ------ keyboards/evyd13/mx5160/info.json | 2 ++ keyboards/evyd13/mx5160/rules.mk | 6 ------ keyboards/evyd13/nt660/info.json | 2 ++ keyboards/evyd13/nt660/rules.mk | 6 ------ keyboards/evyd13/nt750/info.json | 2 ++ keyboards/evyd13/nt750/rules.mk | 6 ------ keyboards/evyd13/nt980/info.json | 2 ++ keyboards/evyd13/nt980/rules.mk | 6 ------ keyboards/evyd13/omrontkl/info.json | 2 ++ keyboards/evyd13/omrontkl/rules.mk | 6 ------ keyboards/evyd13/plain60/info.json | 2 ++ keyboards/evyd13/plain60/rules.mk | 6 ------ keyboards/evyd13/pockettype/info.json | 2 ++ keyboards/evyd13/pockettype/rules.mk | 6 ------ keyboards/evyd13/quackfire/info.json | 2 ++ keyboards/evyd13/quackfire/rules.mk | 6 ------ keyboards/evyd13/solheim68/info.json | 2 ++ keyboards/evyd13/solheim68/rules.mk | 6 ------ keyboards/evyd13/ta65/info.json | 2 ++ keyboards/evyd13/ta65/rules.mk | 6 ------ keyboards/evyd13/wasdat_code/info.json | 2 ++ keyboards/evyd13/wasdat_code/rules.mk | 6 ------ keyboards/evyd13/wonderland/info.json | 2 ++ keyboards/evyd13/wonderland/rules.mk | 6 ------ keyboards/exclusive/e65/info.json | 2 ++ keyboards/exclusive/e65/rules.mk | 6 ------ keyboards/exclusive/e6_rgb/info.json | 2 ++ keyboards/exclusive/e6_rgb/rules.mk | 6 ------ keyboards/exclusive/e6v2/le/info.json | 2 ++ keyboards/exclusive/e6v2/le/rules.mk | 6 ------ keyboards/exclusive/e6v2/le_bmc/info.json | 2 ++ keyboards/exclusive/e6v2/le_bmc/rules.mk | 6 ------ keyboards/exclusive/e6v2/oe/info.json | 2 ++ keyboards/exclusive/e6v2/oe/rules.mk | 6 ------ keyboards/exclusive/e6v2/oe_bmc/info.json | 2 ++ keyboards/exclusive/e6v2/oe_bmc/rules.mk | 6 ------ keyboards/exclusive/e7v1/info.json | 2 ++ keyboards/exclusive/e7v1/rules.mk | 6 ------ keyboards/exclusive/e7v1se/info.json | 2 ++ keyboards/exclusive/e7v1se/rules.mk | 6 ------ keyboards/exclusive/e85/hotswap/info.json | 2 ++ keyboards/exclusive/e85/rules.mk | 6 ------ keyboards/exclusive/e85/soldered/info.json | 2 ++ keyboards/exent/info.json | 2 ++ keyboards/exent/rules.mk | 6 ------ keyboards/eyeohdesigns/babyv/info.json | 2 ++ keyboards/eyeohdesigns/babyv/rules.mk | 6 ------ keyboards/eyeohdesigns/sprh/info.json | 2 ++ keyboards/eyeohdesigns/sprh/rules.mk | 6 ------ keyboards/eyeohdesigns/theboulevard/info.json | 2 ++ keyboards/eyeohdesigns/theboulevard/rules.mk | 6 ------ keyboards/facew/info.json | 2 ++ keyboards/facew/rules.mk | 6 ------ keyboards/fallacy/info.json | 2 ++ keyboards/fallacy/rules.mk | 6 ------ keyboards/fc660c/info.json | 2 ++ keyboards/fc660c/rules.mk | 6 ------ keyboards/fc980c/info.json | 2 ++ keyboards/fc980c/rules.mk | 6 ------ keyboards/feels/feels65/info.json | 2 ++ keyboards/feels/feels65/rules.mk | 6 ------ keyboards/feker/ik75/info.json | 2 ++ keyboards/feker/ik75/rules.mk | 6 ------ keyboards/ferris/0_1/info.json | 4 +++- keyboards/ferris/0_1/rules.mk | 6 ------ keyboards/ferris/0_2/info.json | 4 +++- keyboards/ferris/0_2/rules.mk | 6 ------ keyboards/ferris/sweep/info.json | 4 +++- keyboards/ferris/sweep/rules.mk | 6 ------ keyboards/ffkeebs/puca/info.json | 2 ++ keyboards/ffkeebs/puca/rules.mk | 6 ------ keyboards/ffkeebs/siris/info.json | 2 ++ keyboards/ffkeebs/siris/rules.mk | 6 ------ keyboards/fjlabs/7vhotswap/info.json | 2 ++ keyboards/fjlabs/7vhotswap/rules.mk | 6 ------ keyboards/fjlabs/ad65/info.json | 2 ++ keyboards/fjlabs/ad65/rules.mk | 6 ------ keyboards/fjlabs/avalon/info.json | 2 ++ keyboards/fjlabs/avalon/rules.mk | 6 ------ keyboards/fjlabs/bks65/info.json | 2 ++ keyboards/fjlabs/bks65/rules.mk | 6 ------ keyboards/fjlabs/bks65solder/info.json | 2 ++ keyboards/fjlabs/bks65solder/rules.mk | 6 ------ keyboards/fjlabs/bolsa65/info.json | 2 ++ keyboards/fjlabs/bolsa65/rules.mk | 6 ------ keyboards/fjlabs/kf87/info.json | 2 ++ keyboards/fjlabs/kf87/rules.mk | 6 ------ keyboards/fjlabs/kyuu/info.json | 2 ++ keyboards/fjlabs/kyuu/rules.mk | 6 ------ keyboards/fjlabs/ldk65/info.json | 2 ++ keyboards/fjlabs/ldk65/rules.mk | 6 ------ keyboards/fjlabs/midway60/info.json | 2 ++ keyboards/fjlabs/midway60/rules.mk | 6 ------ keyboards/fjlabs/mk61rgbansi/info.json | 2 ++ keyboards/fjlabs/mk61rgbansi/rules.mk | 6 ------ keyboards/fjlabs/peaker/info.json | 2 ++ keyboards/fjlabs/peaker/rules.mk | 6 ------ keyboards/fjlabs/polaris/info.json | 2 ++ keyboards/fjlabs/polaris/rules.mk | 6 ------ keyboards/fjlabs/ready100/info.json | 2 ++ keyboards/fjlabs/ready100/rules.mk | 6 ------ keyboards/fjlabs/sinanju/info.json | 2 ++ keyboards/fjlabs/sinanju/rules.mk | 6 ------ keyboards/fjlabs/sinanjuwk/info.json | 2 ++ keyboards/fjlabs/sinanjuwk/rules.mk | 6 ------ keyboards/fjlabs/solanis/info.json | 2 ++ keyboards/fjlabs/solanis/rules.mk | 6 ------ keyboards/fjlabs/swordfish/info.json | 2 ++ keyboards/fjlabs/swordfish/rules.mk | 6 ------ keyboards/fjlabs/tf60ansi/info.json | 2 ++ keyboards/fjlabs/tf60ansi/rules.mk | 6 ------ keyboards/fjlabs/tf60v2/info.json | 2 ++ keyboards/fjlabs/tf60v2/rules.mk | 6 ------ keyboards/fjlabs/tf65rgbv2/info.json | 2 ++ keyboards/fjlabs/tf65rgbv2/rules.mk | 6 ------ keyboards/flehrad/bigswitch/info.json | 2 ++ keyboards/flehrad/bigswitch/rules.mk | 6 ------ keyboards/flehrad/downbubble/info.json | 2 ++ keyboards/flehrad/downbubble/rules.mk | 6 ------ keyboards/flehrad/numbrero/info.json | 2 ++ keyboards/flehrad/numbrero/rules.mk | 6 ------ keyboards/flehrad/snagpad/info.json | 2 ++ keyboards/flehrad/snagpad/rules.mk | 6 ------ keyboards/flehrad/tradestation/info.json | 2 ++ keyboards/flehrad/tradestation/rules.mk | 6 ------ keyboards/fleuron/info.json | 2 ++ keyboards/fleuron/rules.mk | 6 ------ keyboards/fluorite/info.json | 2 ++ keyboards/fluorite/rules.mk | 6 ------ keyboards/flx/lodestone/info.json | 2 ++ keyboards/flx/lodestone/rules.mk | 6 ------ keyboards/flx/virgo/info.json | 2 ++ keyboards/flx/virgo/rules.mk | 6 ------ keyboards/flxlb/zplit/info.json | 2 ++ keyboards/flxlb/zplit/rules.mk | 6 ------ keyboards/flygone60/rev3/info.json | 2 ++ keyboards/flygone60/rev3/rules.mk | 6 ------ keyboards/foostan/cornelius/info.json | 2 ++ keyboards/foostan/cornelius/rules.mk | 6 ------ keyboards/for_science/info.json | 2 ++ keyboards/for_science/rules.mk | 6 ------ keyboards/fortitude60/rev1/info.json | 2 ++ keyboards/fortitude60/rules.mk | 6 ------ keyboards/foxlab/key65/hotswap/info.json | 2 ++ keyboards/foxlab/key65/hotswap/rules.mk | 6 ------ keyboards/foxlab/key65/universal/info.json | 2 ++ keyboards/foxlab/key65/universal/rules.mk | 6 ------ keyboards/foxlab/leaf60/hotswap/info.json | 2 ++ keyboards/foxlab/leaf60/hotswap/rules.mk | 6 ------ keyboards/foxlab/leaf60/universal/info.json | 2 ++ keyboards/foxlab/leaf60/universal/rules.mk | 6 ------ keyboards/foxlab/time80/info.json | 2 ++ keyboards/foxlab/time80/rules.mk | 6 ------ keyboards/foxlab/time_re/hotswap/info.json | 2 ++ keyboards/foxlab/time_re/hotswap/rules.mk | 6 ------ keyboards/foxlab/time_re/universal/info.json | 2 ++ keyboards/foxlab/time_re/universal/rules.mk | 6 ------ keyboards/fr4/southpaw75/info.json | 2 ++ keyboards/fr4/southpaw75/rules.mk | 6 ------ keyboards/fr4/unix60/info.json | 2 ++ keyboards/fr4/unix60/rules.mk | 6 ------ keyboards/fractal/info.json | 2 ++ keyboards/fractal/rules.mk | 6 ------ keyboards/free_willy/info.json | 2 ++ keyboards/free_willy/rules.mk | 6 ------ keyboards/friedrich/info.json | 2 ++ keyboards/friedrich/rules.mk | 6 ------ keyboards/frooastboard/nano/info.json | 4 +++- keyboards/frooastboard/nano/rules.mk | 6 ------ keyboards/ft/mars65/info.json | 2 ++ keyboards/ft/mars65/rules.mk | 6 ------ keyboards/ft/mars80/info.json | 2 ++ keyboards/ft/mars80/rules.mk | 6 ------ keyboards/function96/v1/info.json | 2 ++ keyboards/function96/v1/rules.mk | 6 ------ keyboards/function96/v2/info.json | 2 ++ keyboards/function96/v2/rules.mk | 6 ------ keyboards/fungo/rev1/info.json | 2 ++ keyboards/fungo/rev1/rules.mk | 9 -------- keyboards/funky40/info.json | 2 ++ keyboards/funky40/rules.mk | 6 ------ keyboards/gami_studio/lex60/info.json | 2 ++ keyboards/gami_studio/lex60/rules.mk | 6 ------ keyboards/gboards/butterstick/info.json | 2 ++ keyboards/gboards/butterstick/rules.mk | 6 ------ keyboards/gboards/ergotaco/info.json | 2 ++ keyboards/gboards/ergotaco/rules.mk | 6 ------ keyboards/gboards/georgi/info.json | 2 ++ keyboards/gboards/georgi/rules.mk | 6 ------ keyboards/gboards/gergo/info.json | 2 ++ keyboards/gboards/gergo/rules.mk | 6 ------ keyboards/gboards/gergoplex/info.json | 2 ++ keyboards/gboards/gergoplex/rules.mk | 6 ------ keyboards/geekboards/macropad_v2/info.json | 2 ++ keyboards/geekboards/macropad_v2/rules.mk | 6 ------ keyboards/geekboards/tester/info.json | 2 ++ keyboards/geekboards/tester/rules.mk | 6 ------ keyboards/generic_panda/panda65_01/info.json | 2 ++ keyboards/generic_panda/panda65_01/rules.mk | 6 ------ keyboards/genone/eclipse_65/info.json | 2 ++ keyboards/genone/eclipse_65/rules.mk | 6 ------ keyboards/genone/g1_65/info.json | 2 ++ keyboards/genone/g1_65/rules.mk | 6 ------ keyboards/geonworks/frogmini/fmh/info.json | 2 ++ keyboards/geonworks/frogmini/fmh/rules.mk | 6 ------ keyboards/geonworks/frogmini/fms/info.json | 2 ++ keyboards/geonworks/frogmini/fms/rules.mk | 6 ------ .../ggkeyboards/genesis/hotswap/info.json | 2 ++ .../ggkeyboards/genesis/hotswap/rules.mk | 6 ------ .../ggkeyboards/genesis/solder/info.json | 2 ++ keyboards/ggkeyboards/genesis/solder/rules.mk | 6 ------ keyboards/gh60/revc/info.json | 2 ++ keyboards/gh60/revc/rules.mk | 6 ------ keyboards/gh60/satan/info.json | 2 ++ keyboards/gh60/satan/rules.mk | 6 ------ keyboards/gh60/v1p3/info.json | 2 ++ keyboards/gh60/v1p3/rules.mk | 6 ------ keyboards/gh80_3000/info.json | 2 ++ keyboards/gh80_3000/rules.mk | 6 ------ keyboards/ghs/rar/info.json | 2 ++ keyboards/ghs/rar/rules.mk | 6 ------ keyboards/ghs/xls/info.json | 2 ++ keyboards/ghs/xls/rules.mk | 6 ------ keyboards/giabalanai/info.json | 2 ++ keyboards/giabalanai/rules.mk | 6 ------ keyboards/gizmo_engineering/gk6/info.json | 2 ++ keyboards/gizmo_engineering/gk6/rules.mk | 6 ------ keyboards/gkeyboard/gkb_m16/info.json | 2 ++ keyboards/gkeyboard/gkb_m16/rules.mk | 6 ------ keyboards/gl516/a52gl/info.json | 2 ++ keyboards/gl516/a52gl/rules.mk | 6 ------ keyboards/gl516/j73gl/info.json | 2 ++ keyboards/gl516/j73gl/rules.mk | 6 ------ keyboards/gl516/n51gl/info.json | 2 ++ keyboards/gl516/n51gl/rules.mk | 6 ------ keyboards/glenpickle/chimera_ergo/info.json | 2 ++ keyboards/glenpickle/chimera_ergo/rules.mk | 6 ------ keyboards/glenpickle/chimera_ls/info.json | 2 ++ keyboards/glenpickle/chimera_ls/rules.mk | 6 ------ keyboards/glenpickle/chimera_ortho/info.json | 2 ++ keyboards/glenpickle/chimera_ortho/rules.mk | 6 ------ .../glenpickle/chimera_ortho_plus/info.json | 2 ++ .../glenpickle/chimera_ortho_plus/rules.mk | 6 ------ keyboards/gmmk/gmmk2/p65/ansi/info.json | 2 ++ keyboards/gmmk/gmmk2/p65/ansi/rules.mk | 6 ------ keyboards/gmmk/gmmk2/p65/iso/info.json | 2 ++ keyboards/gmmk/gmmk2/p65/iso/rules.mk | 6 ------ keyboards/gmmk/gmmk2/p96/ansi/info.json | 2 ++ keyboards/gmmk/gmmk2/p96/ansi/rules.mk | 6 ------ keyboards/gmmk/gmmk2/p96/iso/info.json | 2 ++ keyboards/gmmk/gmmk2/p96/iso/rules.mk | 6 ------ keyboards/gmmk/pro/rev1/ansi/info.json | 2 ++ keyboards/gmmk/pro/rev1/ansi/rules.mk | 6 ------ keyboards/gmmk/pro/rev1/iso/info.json | 2 ++ keyboards/gmmk/pro/rev1/iso/rules.mk | 6 ------ keyboards/gmmk/pro/rev2/ansi/info.json | 2 ++ keyboards/gmmk/pro/rev2/ansi/rules.mk | 6 ------ keyboards/gmmk/pro/rev2/iso/info.json | 2 ++ keyboards/gmmk/pro/rev2/iso/rules.mk | 6 ------ keyboards/gon/nerd60/info.json | 2 ++ keyboards/gon/nerd60/rules.mk | 6 ------ keyboards/gon/nerdtkl/info.json | 2 ++ keyboards/gon/nerdtkl/rules.mk | 6 ------ keyboards/gopolar/gg86/info.json | 2 ++ keyboards/gopolar/gg86/rules.mk | 6 ------ keyboards/gorthage_truck/info.json | 2 ++ keyboards/gorthage_truck/rules.mk | 6 ------ keyboards/gowla/info.json | 2 ++ keyboards/gowla/rules.mk | 6 ------ keyboards/gray_studio/aero75/info.json | 2 ++ keyboards/gray_studio/aero75/rules.mk | 6 ------ keyboards/gray_studio/apollo80/info.json | 2 ++ keyboards/gray_studio/apollo80/rules.mk | 6 ------ keyboards/gray_studio/cod67/info.json | 2 ++ keyboards/gray_studio/cod67/rules.mk | 6 ------ keyboards/gray_studio/hb85/info.json | 2 ++ keyboards/gray_studio/hb85/rules.mk | 6 ------ keyboards/gray_studio/space65/info.json | 2 ++ keyboards/gray_studio/space65/rules.mk | 6 ------ keyboards/gray_studio/space65r3/info.json | 2 ++ keyboards/gray_studio/space65r3/rules.mk | 6 ------ .../gray_studio/think65/hotswap/info.json | 2 ++ .../gray_studio/think65/hotswap/rules.mk | 6 ------ .../gray_studio/think65/solder/info.json | 2 ++ keyboards/gray_studio/think65/solder/rules.mk | 6 ------ keyboards/grid600/press/info.json | 2 ++ keyboards/grid600/press/rules.mk | 6 ------ keyboards/gvalchca/ga150/info.json | 2 ++ keyboards/gvalchca/ga150/rules.mk | 6 ------ keyboards/gvalchca/spaccboard/info.json | 2 ++ keyboards/gvalchca/spaccboard/rules.mk | 6 ------ keyboards/h0oni/deskpad/info.json | 2 ++ keyboards/h0oni/deskpad/rules.mk | 6 ------ keyboards/h0oni/hotduck/info.json | 2 ++ keyboards/h0oni/hotduck/rules.mk | 6 ------ keyboards/hadron/ver2/info.json | 4 +++- keyboards/hadron/ver2/rules.mk | 6 ------ keyboards/hadron/ver3/info.json | 5 ++++- keyboards/hadron/ver3/rules.mk | 7 ------- keyboards/halfcliff/info.json | 2 ++ keyboards/halfcliff/rules.mk | 6 ------ keyboards/halokeys/elemental75/info.json | 3 +++ keyboards/halokeys/elemental75/rules.mk | 7 ------- keyboards/han60/info.json | 2 ++ keyboards/han60/rules.mk | 6 ------ keyboards/hand88/info.json | 2 ++ keyboards/hand88/rules.mk | 6 ------ .../handwired/108key_trackpoint/info.json | 2 ++ .../handwired/108key_trackpoint/rules.mk | 6 ------ keyboards/handwired/10k/info.json | 2 ++ keyboards/handwired/10k/rules.mk | 6 ------ keyboards/handwired/2x5keypad/info.json | 2 ++ keyboards/handwired/2x5keypad/rules.mk | 6 ------ keyboards/handwired/3dfoxc/info.json | 2 ++ keyboards/handwired/3dfoxc/rules.mk | 6 ------ keyboards/handwired/3dp660/info.json | 2 ++ keyboards/handwired/3dp660/rules.mk | 6 ------ keyboards/handwired/412_64/info.json | 2 ++ keyboards/handwired/412_64/rules.mk | 6 ------ keyboards/handwired/42/info.json | 2 ++ keyboards/handwired/42/rules.mk | 6 ------ keyboards/handwired/6key/info.json | 2 ++ keyboards/handwired/6key/rules.mk | 6 ------ keyboards/handwired/6macro/info.json | 2 ++ keyboards/handwired/6macro/rules.mk | 6 ------ keyboards/handwired/aball/info.json | 2 ++ keyboards/handwired/aball/rules.mk | 6 ------ keyboards/handwired/aek64/info.json | 2 ++ keyboards/handwired/aek64/rules.mk | 6 ------ keyboards/handwired/aim65/info.json | 2 ++ keyboards/handwired/aim65/rules.mk | 6 ------ keyboards/handwired/amigopunk/info.json | 2 ++ keyboards/handwired/amigopunk/rules.mk | 6 ------ keyboards/handwired/angel/info.json | 2 ++ keyboards/handwired/angel/rules.mk | 6 ------ keyboards/handwired/aplx2/info.json | 2 ++ keyboards/handwired/aplx2/rules.mk | 6 ------ keyboards/handwired/aranck/info.json | 2 ++ keyboards/handwired/aranck/rules.mk | 6 ------ keyboards/handwired/arrow_pad/info.json | 2 ++ keyboards/handwired/arrow_pad/rules.mk | 6 ------ keyboards/handwired/atreus50/info.json | 2 ++ keyboards/handwired/atreus50/rules.mk | 6 ------ keyboards/handwired/axon/info.json | 2 ++ keyboards/handwired/axon/rules.mk | 6 ------ .../handwired/battleship_gamepad/info.json | 2 ++ .../handwired/battleship_gamepad/rules.mk | 6 ------ keyboards/handwired/bdn9_ble/info.json | 2 ++ keyboards/handwired/bdn9_ble/rules.mk | 6 ------ keyboards/handwired/bento/rev1/info.json | 2 ++ keyboards/handwired/bento/rev1/rules.mk | 6 ------ keyboards/handwired/bigmac/info.json | 2 ++ keyboards/handwired/bigmac/rules.mk | 6 ------ keyboards/handwired/bolek/info.json | 2 ++ keyboards/handwired/bolek/rules.mk | 6 ------ .../boss566y/redragon_vara/info.json | 2 ++ .../handwired/boss566y/redragon_vara/rules.mk | 6 ------ keyboards/handwired/brain/info.json | 2 ++ keyboards/handwired/brain/rules.mk | 6 ------ keyboards/handwired/bstk100/info.json | 2 ++ keyboards/handwired/bstk100/rules.mk | 6 ------ keyboards/handwired/cans12er/info.json | 2 ++ keyboards/handwired/cans12er/rules.mk | 6 ------ keyboards/handwired/carpolly/info.json | 2 ++ keyboards/handwired/carpolly/rules.mk | 6 ------ keyboards/handwired/chiron/info.json | 2 ++ keyboards/handwired/chiron/rules.mk | 6 ------ keyboards/handwired/ck4x4/info.json | 2 ++ keyboards/handwired/ck4x4/rules.mk | 6 ------ keyboards/handwired/cmd60/info.json | 2 ++ keyboards/handwired/cmd60/rules.mk | 6 ------ keyboards/handwired/co60/rev1/info.json | 4 +++- keyboards/handwired/co60/rev1/rules.mk | 6 ------ keyboards/handwired/co60/rev6/info.json | 5 ++++- keyboards/handwired/co60/rev6/rules.mk | 7 ------- keyboards/handwired/co60/rev7/info.json | 5 ++++- keyboards/handwired/co60/rev7/rules.mk | 7 ------- keyboards/handwired/colorlice/info.json | 2 ++ keyboards/handwired/colorlice/rules.mk | 6 ------ .../handwired/concertina/64key/info.json | 2 ++ keyboards/handwired/concertina/64key/rules.mk | 7 ------- .../handwired/consolekeyboard/18key/info.json | 2 ++ .../handwired/consolekeyboard/18key/rules.mk | 6 ------ .../handwired/consolekeyboard/20key/info.json | 2 ++ .../handwired/consolekeyboard/20key/rules.mk | 6 ------ .../handwired/consolekeyboard/27key/info.json | 2 ++ .../handwired/consolekeyboard/27key/rules.mk | 6 ------ .../handwired/consolekeyboard/30key/info.json | 2 ++ .../handwired/consolekeyboard/30key/rules.mk | 6 ------ keyboards/handwired/croxsplit44/info.json | 2 ++ keyboards/handwired/croxsplit44/rules.mk | 6 ------ keyboards/handwired/curiosity/info.json | 2 ++ keyboards/handwired/curiosity/rules.mk | 6 ------ keyboards/handwired/cyberstar/info.json | 2 ++ keyboards/handwired/cyberstar/rules.mk | 6 ------ keyboards/handwired/d48/info.json | 3 +++ keyboards/handwired/d48/rules.mk | 7 ------- keyboards/handwired/dactyl/info.json | 2 ++ keyboards/handwired/dactyl/rules.mk | 6 ------ keyboards/handwired/dactyl_left/info.json | 2 ++ keyboards/handwired/dactyl_left/rules.mk | 6 ------ .../handwired/dactyl_manuform/3x5_3/info.json | 2 ++ .../handwired/dactyl_manuform/3x5_3/rules.mk | 6 ------ .../handwired/dactyl_manuform/4x5/info.json | 2 ++ .../handwired/dactyl_manuform/4x5/rules.mk | 6 ------ .../handwired/dactyl_manuform/4x5_5/info.json | 2 ++ .../handwired/dactyl_manuform/4x5_5/rules.mk | 9 -------- .../handwired/dactyl_manuform/4x6/info.json | 2 ++ .../handwired/dactyl_manuform/4x6/rules.mk | 6 ------ .../handwired/dactyl_manuform/4x6_5/info.json | 2 ++ .../handwired/dactyl_manuform/4x6_5/rules.mk | 6 ------ .../handwired/dactyl_manuform/5x6/info.json | 2 ++ .../handwired/dactyl_manuform/5x6/rules.mk | 6 ------ .../dactyl_manuform/5x6_2_5/info.json | 2 ++ .../dactyl_manuform/5x6_2_5/rules.mk | 6 ------ .../handwired/dactyl_manuform/5x6_5/info.json | 2 ++ .../handwired/dactyl_manuform/5x6_5/rules.mk | 6 ------ .../handwired/dactyl_manuform/5x6_6/info.json | 2 ++ .../handwired/dactyl_manuform/5x6_6/rules.mk | 6 ------ .../handwired/dactyl_manuform/5x7/info.json | 2 ++ .../handwired/dactyl_manuform/5x7/rules.mk | 6 ------ .../6x6/blackpill_f411/info.json | 5 +++++ .../6x6/blackpill_f411/rules.mk | 10 --------- .../dactyl_manuform/6x6/promicro/info.json | 4 ++++ .../dactyl_manuform/6x6/promicro/rules.mk | 8 ------- .../handwired/dactyl_manuform/6x6_4/info.json | 2 ++ .../handwired/dactyl_manuform/6x6_4/rules.mk | 6 ------ .../dactyl_manuform/6x6_kinesis/info.json | 2 ++ .../dactyl_manuform/6x6_kinesis/rules.mk | 6 ------ .../handwired/dactyl_manuform/6x7/info.json | 2 ++ .../handwired/dactyl_manuform/6x7/rules.mk | 6 ------ keyboards/handwired/dactyl_promicro/info.json | 2 ++ keyboards/handwired/dactyl_promicro/rules.mk | 6 ------ keyboards/handwired/dactyl_rah/info.json | 2 ++ keyboards/handwired/dactyl_rah/rules.mk | 6 ------ keyboards/handwired/daishi/info.json | 2 ++ keyboards/handwired/daishi/rules.mk | 6 ------ keyboards/handwired/datahand/info.json | 2 ++ keyboards/handwired/datahand/rules.mk | 6 ------ keyboards/handwired/dc/mc/001/info.json | 2 ++ keyboards/handwired/dc/mc/001/rules.mk | 6 ------ keyboards/handwired/ddg_56/info.json | 3 +++ keyboards/handwired/ddg_56/rules.mk | 7 ------- keyboards/handwired/dqz11n1g/info.json | 2 ++ keyboards/handwired/dqz11n1g/rules.mk | 6 ------ keyboards/handwired/dygma/raise/info.json | 3 +++ keyboards/handwired/dygma/raise/rules.mk | 7 ------- keyboards/handwired/eagleii/info.json | 2 ++ keyboards/handwired/eagleii/rules.mk | 6 ------ keyboards/handwired/elrgo_s/info.json | 2 ++ keyboards/handwired/elrgo_s/rules.mk | 6 ------ keyboards/handwired/ergocheap/info.json | 2 ++ keyboards/handwired/ergocheap/rules.mk | 6 ------ keyboards/handwired/evk/v1_3/info.json | 2 ++ keyboards/handwired/evk/v1_3/rules.mk | 6 ------ keyboards/handwired/fc200rt_qmk/info.json | 2 ++ keyboards/handwired/fc200rt_qmk/rules.mk | 6 ------ keyboards/handwired/fivethirteen/info.json | 2 ++ keyboards/handwired/fivethirteen/rules.mk | 6 ------ keyboards/handwired/floorboard/info.json | 3 +++ keyboards/handwired/floorboard/rules.mk | 7 ------- .../handwired/frankie_macropad/info.json | 2 ++ keyboards/handwired/frankie_macropad/rules.mk | 6 ------ keyboards/handwired/frenchdev/info.json | 2 ++ keyboards/handwired/frenchdev/rules.mk | 6 ------ keyboards/handwired/freoduo/info.json | 2 ++ keyboards/handwired/freoduo/rules.mk | 6 ------ keyboards/handwired/fruity60/info.json | 2 ++ keyboards/handwired/fruity60/rules.mk | 6 ------ keyboards/handwired/gamenum/info.json | 2 ++ keyboards/handwired/gamenum/rules.mk | 6 ------ .../handwired/hacked_motospeed/info.json | 2 ++ keyboards/handwired/hacked_motospeed/rules.mk | 6 ------ keyboards/handwired/heisenberg/info.json | 2 ++ keyboards/handwired/heisenberg/rules.mk | 6 ------ keyboards/handwired/hexon38/info.json | 2 ++ keyboards/handwired/hexon38/rules.mk | 6 ------ keyboards/handwired/hnah108/info.json | 2 ++ keyboards/handwired/hnah108/rules.mk | 6 ------ keyboards/handwired/hnah40/info.json | 2 ++ keyboards/handwired/hnah40/rules.mk | 6 ------ keyboards/handwired/hnah40rgb/info.json | 2 ++ keyboards/handwired/hnah40rgb/rules.mk | 6 ------ keyboards/handwired/hwpm87/info.json | 2 ++ keyboards/handwired/hwpm87/rules.mk | 6 ------ keyboards/handwired/ibm122m/info.json | 2 ++ keyboards/handwired/ibm122m/rules.mk | 6 ------ keyboards/handwired/ibm_wheelwriter/info.json | 2 ++ keyboards/handwired/ibm_wheelwriter/rules.mk | 6 ------ keyboards/handwired/jn68m/info.json | 1 + keyboards/handwired/jn68m/rules.mk | 6 ------ keyboards/handwired/jopr/info.json | 2 ++ keyboards/handwired/jopr/rules.mk | 6 ------ keyboards/handwired/jot50/info.json | 2 ++ keyboards/handwired/jot50/rules.mk | 6 ------ keyboards/handwired/jotanck/info.json | 2 ++ keyboards/handwired/jotanck/rules.mk | 6 ------ keyboards/handwired/jotpad16/info.json | 2 ++ keyboards/handwired/jotpad16/rules.mk | 6 ------ .../handwired/jtallbean/split_65/info.json | 2 ++ .../handwired/jtallbean/split_65/rules.mk | 6 ------ keyboards/handwired/juliet/info.json | 2 ++ keyboards/handwired/juliet/rules.mk | 6 ------ keyboards/handwired/k8split/info.json | 2 ++ keyboards/handwired/k8split/rules.mk | 6 ------ keyboards/handwired/k_numpad17/info.json | 2 ++ keyboards/handwired/k_numpad17/rules.mk | 6 ------ keyboards/handwired/kbod/info.json | 2 ++ keyboards/handwired/kbod/rules.mk | 6 ------ keyboards/handwired/ks63/info.json | 2 ++ keyboards/handwired/ks63/rules.mk | 6 ------ keyboards/handwired/lagrange/info.json | 2 ++ keyboards/handwired/lagrange/rules.mk | 6 ------ keyboards/handwired/leftynumpad/info.json | 2 ++ keyboards/handwired/leftynumpad/rules.mk | 6 ------ keyboards/handwired/lemonpad/info.json | 2 ++ keyboards/handwired/lemonpad/rules.mk | 6 ------ keyboards/handwired/lovelive9/info.json | 2 ++ keyboards/handwired/lovelive9/rules.mk | 6 ------ .../handwired/m40/5x5_macropad/info.json | 2 ++ keyboards/handwired/m40/5x5_macropad/rules.mk | 6 ------ keyboards/handwired/macroboard/f401/info.json | 5 +++++ keyboards/handwired/macroboard/f401/rules.mk | 7 ------- keyboards/handwired/macroboard/f411/info.json | 5 +++++ keyboards/handwired/macroboard/f411/rules.mk | 7 ------- keyboards/handwired/magicforce61/info.json | 2 ++ keyboards/handwired/magicforce61/rules.mk | 6 ------ keyboards/handwired/magicforce68/info.json | 2 ++ keyboards/handwired/magicforce68/rules.mk | 6 ------ keyboards/handwired/marauder/info.json | 2 ++ keyboards/handwired/marauder/rules.mk | 6 ------ .../handwired/mechboards_micropad/info.json | 2 ++ .../handwired/mechboards_micropad/rules.mk | 6 ------ .../meck_tkl/blackpill_f401/info.json | 5 +++++ .../meck_tkl/blackpill_f401/rules.mk | 7 ------- keyboards/handwired/minorca/info.json | 2 ++ keyboards/handwired/minorca/rules.mk | 6 ------ keyboards/handwired/misterdeck/info.json | 2 ++ keyboards/handwired/misterdeck/rules.mk | 6 ------ .../ms_sculpt_mobile/astar/info.json | 4 +++- .../handwired/ms_sculpt_mobile/astar/rules.mk | 5 ----- .../ms_sculpt_mobile/teensy2pp/info.json | 4 +++- .../ms_sculpt_mobile/teensy2pp/rules.mk | 5 ----- keyboards/handwired/mutepad/info.json | 2 ++ keyboards/handwired/mutepad/rules.mk | 6 ------ keyboards/handwired/myskeeb/info.json | 2 ++ keyboards/handwired/myskeeb/rules.mk | 6 ------ keyboards/handwired/nicekey/info.json | 2 ++ keyboards/handwired/nicekey/rules.mk | 6 ------ keyboards/handwired/not_so_minidox/info.json | 2 ++ keyboards/handwired/not_so_minidox/rules.mk | 6 ------ keyboards/handwired/novem/info.json | 2 ++ keyboards/handwired/novem/rules.mk | 6 ------ keyboards/handwired/nozbe_macro/info.json | 2 ++ keyboards/handwired/nozbe_macro/rules.mk | 6 ------ keyboards/handwired/numpad20/info.json | 2 ++ keyboards/handwired/numpad20/rules.mk | 6 ------ .../handwired/obuwunkunubi/spaget/info.json | 2 ++ .../handwired/obuwunkunubi/spaget/rules.mk | 6 ------ .../handwired/oem_ansi_fullsize/info.json | 2 ++ .../handwired/oem_ansi_fullsize/rules.mk | 6 ------ .../handwired/oem_iso_fullsize/info.json | 2 ++ keyboards/handwired/oem_iso_fullsize/rules.mk | 6 ------ keyboards/handwired/ortho5x13/info.json | 2 ++ keyboards/handwired/ortho5x13/rules.mk | 6 ------ keyboards/handwired/ortho5x14/info.json | 2 ++ keyboards/handwired/ortho5x14/rules.mk | 6 ------ keyboards/handwired/ortho_brass/info.json | 2 ++ keyboards/handwired/ortho_brass/rules.mk | 6 ------ keyboards/handwired/owlet60/info.json | 2 ++ keyboards/handwired/owlet60/rules.mk | 6 ------ keyboards/handwired/p65rgb/info.json | 2 ++ keyboards/handwired/p65rgb/rules.mk | 6 ------ keyboards/handwired/pilcrow/info.json | 2 ++ keyboards/handwired/pilcrow/rules.mk | 6 ------ .../handwired/pill60/blackpill_f401/info.json | 5 +++++ .../handwired/pill60/blackpill_f401/rules.mk | 7 ------- .../handwired/pill60/blackpill_f411/info.json | 5 +++++ .../handwired/pill60/blackpill_f411/rules.mk | 7 ------- keyboards/handwired/pill60/bluepill/info.json | 4 ++++ keyboards/handwired/pill60/bluepill/rules.mk | 6 ------ .../handwired/postageboard/mini/info.json | 4 +++- .../handwired/postageboard/mini/rules.mk | 6 ------ keyboards/handwired/postageboard/r1/info.json | 4 +++- keyboards/handwired/postageboard/r1/rules.mk | 6 ------ keyboards/handwired/prime_exl/info.json | 2 ++ keyboards/handwired/prime_exl/rules.mk | 6 ------ keyboards/handwired/prime_exl_plus/info.json | 2 ++ keyboards/handwired/prime_exl_plus/rules.mk | 6 ------ keyboards/handwired/prkl30/feather/rules.mk | 6 ------ keyboards/handwired/prkl30/info.json | 2 ++ keyboards/handwired/prkl30/promicro/rules.mk | 6 ------ keyboards/handwired/promethium/info.json | 2 ++ keyboards/handwired/promethium/rules.mk | 6 ------ keyboards/handwired/pterodactyl/info.json | 2 ++ keyboards/handwired/pterodactyl/rules.mk | 6 ------ keyboards/handwired/pteron/info.json | 2 ++ keyboards/handwired/pteron/rules.mk | 6 ------ keyboards/handwired/pteron38/info.json | 2 ++ keyboards/handwired/pteron38/rules.mk | 6 ------ keyboards/handwired/pteron44/info.json | 2 ++ keyboards/handwired/pteron44/rules.mk | 6 ------ keyboards/handwired/qc60/info.json | 2 ++ keyboards/handwired/qc60/rules.mk | 6 ------ keyboards/handwired/retro_refit/info.json | 2 ++ keyboards/handwired/retro_refit/rules.mk | 6 ------ keyboards/handwired/riblee_f401/info.json | 3 +++ keyboards/handwired/riblee_f401/rules.mk | 7 ------- keyboards/handwired/riblee_f411/info.json | 3 +++ keyboards/handwired/riblee_f411/rules.mk | 7 ------- keyboards/handwired/rs60/info.json | 2 ++ keyboards/handwired/rs60/rules.mk | 6 ------ keyboards/handwired/selene/info.json | 3 +++ keyboards/handwired/selene/rules.mk | 7 ------- keyboards/handwired/sick68/info.json | 2 ++ keyboards/handwired/sick68/rules.mk | 6 ------ keyboards/handwired/sick_pad/info.json | 3 +++ keyboards/handwired/sick_pad/rules.mk | 7 ------- keyboards/handwired/skakunm_dactyl/info.json | 2 ++ keyboards/handwired/skakunm_dactyl/rules.mk | 6 ------ keyboards/handwired/slash/info.json | 2 ++ keyboards/handwired/slash/rules.mk | 6 ------ keyboards/handwired/snatchpad/info.json | 2 ++ keyboards/handwired/snatchpad/rules.mk | 6 ------ keyboards/handwired/sono1/stm32f103/info.json | 4 +++- keyboards/handwired/sono1/stm32f103/rules.mk | 6 ------ keyboards/handwired/sono1/t2pp/info.json | 4 +++- keyboards/handwired/sono1/t2pp/rules.mk | 5 ----- keyboards/handwired/space_oddity/info.json | 2 ++ keyboards/handwired/space_oddity/rules.mk | 6 ------ .../handwired/split65/promicro/info.json | 4 ++++ keyboards/handwired/split65/promicro/rules.mk | 6 ------ keyboards/handwired/split65/stm32/info.json | 5 +++++ keyboards/handwired/split65/stm32/rules.mk | 7 ------- keyboards/handwired/split89/info.json | 2 ++ keyboards/handwired/split89/rules.mk | 6 ------ .../handwired/splittest/bluepill/info.json | 4 ++++ .../handwired/splittest/bluepill/rules.mk | 6 ------ .../handwired/splittest/promicro/info.json | 4 ++++ .../handwired/splittest/promicro/rules.mk | 5 ----- .../handwired/splittest/teensy_2/info.json | 4 ++++ .../handwired/splittest/teensy_2/rules.mk | 5 ----- keyboards/handwired/steamvan/rev1/info.json | 3 +++ keyboards/handwired/steamvan/rev1/rules.mk | 7 ------- .../handwired/stef9998/split_5x7/info.json | 2 ++ .../handwired/stef9998/split_5x7/rules.mk | 6 ------ keyboards/handwired/sticc14/info.json | 2 ++ keyboards/handwired/sticc14/rules.mk | 6 ------ .../handwired/stream_cheap/2x3/info.json | 2 ++ keyboards/handwired/stream_cheap/2x3/rules.mk | 6 ------ .../handwired/stream_cheap/2x4/info.json | 2 ++ keyboards/handwired/stream_cheap/2x4/rules.mk | 6 ------ .../handwired/stream_cheap/2x5/info.json | 2 ++ keyboards/handwired/stream_cheap/2x5/rules.mk | 6 ------ .../handwired/swiftrax/astro65/info.json | 2 ++ keyboards/handwired/swiftrax/astro65/rules.mk | 6 ------ keyboards/handwired/swiftrax/bebol/info.json | 2 ++ keyboards/handwired/swiftrax/bebol/rules.mk | 6 ------ .../handwired/swiftrax/beegboy/info.json | 2 ++ keyboards/handwired/swiftrax/beegboy/rules.mk | 6 ------ .../handwired/swiftrax/bumblebee/info.json | 2 ++ .../handwired/swiftrax/bumblebee/rules.mk | 6 ------ .../handwired/swiftrax/cowfish/info.json | 2 ++ keyboards/handwired/swiftrax/cowfish/rules.mk | 6 ------ .../handwired/swiftrax/digicarp65/info.json | 2 ++ .../handwired/swiftrax/digicarp65/rules.mk | 6 ------ .../handwired/swiftrax/digicarpice/info.json | 2 ++ .../handwired/swiftrax/digicarpice/rules.mk | 6 ------ .../handwired/swiftrax/equator/info.json | 2 ++ keyboards/handwired/swiftrax/equator/rules.mk | 6 ------ .../handwired/swiftrax/glacier/info.json | 2 ++ keyboards/handwired/swiftrax/glacier/rules.mk | 6 ------ keyboards/handwired/swiftrax/joypad/info.json | 2 ++ keyboards/handwired/swiftrax/joypad/rules.mk | 6 ------ .../swiftrax/koalafications/info.json | 2 ++ .../swiftrax/koalafications/rules.mk | 6 ------ keyboards/handwired/swiftrax/nodu/info.json | 2 ++ keyboards/handwired/swiftrax/nodu/rules.mk | 6 ------ .../handwired/swiftrax/pandamic/info.json | 2 ++ .../handwired/swiftrax/pandamic/rules.mk | 6 ------ .../handwired/swiftrax/the_galleon/info.json | 2 ++ .../handwired/swiftrax/the_galleon/rules.mk | 6 ------ .../handwired/swiftrax/unsplit/info.json | 2 ++ keyboards/handwired/swiftrax/unsplit/rules.mk | 6 ------ keyboards/handwired/swiftrax/walter/info.json | 2 ++ keyboards/handwired/swiftrax/walter/rules.mk | 6 ------ .../symmetric70_proto/promicro/info.json | 4 +++- .../symmetric70_proto/promicro/rules.mk | 6 ------ .../symmetric70_proto/proton_c/info.json | 5 ++++- .../symmetric70_proto/proton_c/rules.mk | 7 ------- keyboards/handwired/symmetry60/info.json | 2 ++ keyboards/handwired/symmetry60/rules.mk | 6 ------ keyboards/handwired/t111/info.json | 2 ++ keyboards/handwired/t111/rules.mk | 6 ------ keyboards/handwired/tennie/info.json | 2 ++ keyboards/handwired/tennie/rules.mk | 6 ------ keyboards/handwired/terminus_mini/info.json | 2 ++ keyboards/handwired/terminus_mini/rules.mk | 6 ------ keyboards/handwired/trackpoint/info.json | 2 ++ keyboards/handwired/trackpoint/rules.mk | 6 ------ .../tractyl_manuform/4x6_right/info.json | 2 ++ .../tractyl_manuform/4x6_right/rules.mk | 6 ------ .../5x6_right/arduinomicro/info.json | 4 +++- .../5x6_right/arduinomicro/rules.mk | 5 ----- .../5x6_right/elite_c/info.json | 4 +++- .../5x6_right/elite_c/rules.mk | 6 ------ .../tractyl_manuform/5x6_right/f303/info.json | 4 +++- .../tractyl_manuform/5x6_right/f303/rules.mk | 6 ------ .../tractyl_manuform/5x6_right/f411/info.json | 5 ++++- .../tractyl_manuform/5x6_right/f411/rules.mk | 7 ------- .../5x6_right/teensy2pp/info.json | 4 +++- .../5x6_right/teensy2pp/rules.mk | 5 ----- keyboards/handwired/traveller/info.json | 2 ++ keyboards/handwired/traveller/rules.mk | 6 ------ keyboards/handwired/tritium_numpad/info.json | 2 ++ keyboards/handwired/tritium_numpad/rules.mk | 6 ------ keyboards/handwired/twadlee/tp69/info.json | 2 ++ keyboards/handwired/twadlee/tp69/rules.mk | 6 ------ keyboards/handwired/twig/twig50/info.json | 3 +++ keyboards/handwired/twig/twig50/rules.mk | 7 ------- keyboards/handwired/unicomp_mini_m/info.json | 2 ++ keyboards/handwired/unicomp_mini_m/rules.mk | 6 ------ keyboards/handwired/unk/rev1/info.json | 2 ++ keyboards/handwired/unk/rules.mk | 6 ------ keyboards/handwired/uthol/rev1/info.json | 4 +++- keyboards/handwired/uthol/rev1/rules.mk | 6 ------ keyboards/handwired/uthol/rev2/info.json | 4 +++- keyboards/handwired/uthol/rev2/rules.mk | 6 ------ keyboards/handwired/uthol/rev3/info.json | 5 ++++- keyboards/handwired/uthol/rev3/rules.mk | 7 ------- keyboards/handwired/videowriter/info.json | 2 ++ keyboards/handwired/videowriter/rules.mk | 6 ------ keyboards/handwired/wabi/info.json | 2 ++ keyboards/handwired/wabi/rules.mk | 6 ------ keyboards/handwired/woodpad/info.json | 2 ++ keyboards/handwired/woodpad/rules.mk | 6 ------ keyboards/handwired/wulkan/info.json | 3 +++ keyboards/handwired/wulkan/rules.mk | 7 ------- keyboards/handwired/xealous/rev1/info.json | 2 ++ keyboards/handwired/xealous/rules.mk | 6 ------ keyboards/handwired/z150/info.json | 2 ++ keyboards/handwired/z150/rules.mk | 6 ------ keyboards/handwired/zergo/info.json | 2 ++ keyboards/handwired/zergo/rules.mk | 6 ------ keyboards/hardlineworks/otd_plus/info.json | 2 ++ keyboards/hardlineworks/otd_plus/rules.mk | 6 ------ keyboards/heliar/wm1_hotswap/info.json | 2 ++ keyboards/heliar/wm1_hotswap/rules.mk | 6 ------ keyboards/hhkb/jp/info.json | 2 ++ keyboards/hhkb/jp/rules.mk | 6 ------ keyboards/hhkb/yang/info.json | 2 ++ keyboards/hhkb/yang/rules.mk | 6 ------ keyboards/hhkb_lite_2/info.json | 2 ++ keyboards/hhkb_lite_2/rules.mk | 6 ------ keyboards/hidtech/bastyl/info.json | 2 ++ keyboards/hidtech/bastyl/rules.mk | 6 ------ keyboards/hifumi/info.json | 2 ++ keyboards/hifumi/rules.mk | 6 ------ keyboards/hineybush/h08_ocelot/info.json | 2 ++ keyboards/hineybush/h08_ocelot/rules.mk | 6 ------ keyboards/hineybush/h10/info.json | 2 ++ keyboards/hineybush/h10/rules.mk | 6 ------ keyboards/hineybush/h60/info.json | 2 ++ keyboards/hineybush/h60/rules.mk | 6 ------ keyboards/hineybush/h65/info.json | 2 ++ keyboards/hineybush/h65/rules.mk | 6 ------ keyboards/hineybush/h65_hotswap/info.json | 2 ++ keyboards/hineybush/h65_hotswap/rules.mk | 6 ------ keyboards/hineybush/h660s/info.json | 2 ++ keyboards/hineybush/h660s/rules.mk | 6 ------ keyboards/hineybush/h75_singa/info.json | 2 ++ keyboards/hineybush/h75_singa/rules.mk | 6 ------ keyboards/hineybush/h87a/info.json | 2 ++ keyboards/hineybush/h87a/rules.mk | 6 ------ keyboards/hineybush/h88/info.json | 2 ++ keyboards/hineybush/h88/rules.mk | 6 ------ keyboards/hineybush/hbcp/info.json | 2 ++ keyboards/hineybush/hbcp/rules.mk | 6 ------ keyboards/hineybush/hineyg80/info.json | 2 ++ keyboards/hineybush/hineyg80/rules.mk | 6 ------ keyboards/hineybush/physix/info.json | 2 ++ keyboards/hineybush/physix/rules.mk | 6 ------ keyboards/hineybush/sm68/info.json | 2 ++ keyboards/hineybush/sm68/rules.mk | 6 ------ keyboards/hnahkb/freyr/info.json | 2 ++ keyboards/hnahkb/freyr/rules.mk | 6 ------ keyboards/hnahkb/stella/info.json | 2 ++ keyboards/hnahkb/stella/rules.mk | 6 ------ keyboards/hnahkb/vn66/info.json | 2 ++ keyboards/hnahkb/vn66/rules.mk | 6 ------ keyboards/holyswitch/southpaw75/info.json | 2 ++ keyboards/holyswitch/southpaw75/rules.mk | 6 ------ keyboards/horizon/info.json | 2 ++ keyboards/horizon/rules.mk | 6 ------ .../caticorn/rev1/hotswap/info.json | 2 ++ .../caticorn/rev1/hotswap/rules.mk | 6 ------ .../caticorn/rev1/solder/info.json | 2 ++ .../horrortroll/caticorn/rev1/solder/rules.mk | 6 ------ .../chinese_pcb/black_e65/info.json | 2 ++ .../chinese_pcb/black_e65/rules.mk | 6 ------ .../chinese_pcb/devil68_pro/info.json | 2 ++ .../chinese_pcb/devil68_pro/rules.mk | 6 ------ keyboards/horrortroll/lemon40/info.json | 2 ++ keyboards/horrortroll/lemon40/rules.mk | 6 ------ keyboards/horrortroll/paws60/info.json | 2 ++ keyboards/horrortroll/paws60/rules.mk | 6 ------ keyboards/hotdox/info.json | 2 ++ keyboards/hotdox/rules.mk | 6 ------ keyboards/hp69/info.json | 3 +++ keyboards/hp69/rules.mk | 7 ------- keyboards/hs60/v1/info.json | 2 ++ keyboards/hs60/v1/rules.mk | 6 ------ keyboards/hs60/v2/ansi/info.json | 3 +++ keyboards/hs60/v2/ansi/rules.mk | 7 ------- keyboards/hs60/v2/hhkb/info.json | 3 +++ keyboards/hs60/v2/hhkb/rules.mk | 7 ------- keyboards/hs60/v2/iso/info.json | 3 +++ keyboards/hs60/v2/iso/rules.mk | 7 ------- keyboards/hub16/info.json | 2 ++ keyboards/hub16/rules.mk | 6 ------ keyboards/hub20/info.json | 2 ++ keyboards/hub20/rules.mk | 6 ------ keyboards/huytbt/h50/info.json | 2 ++ keyboards/huytbt/h50/rules.mk | 6 ------ keyboards/ianklug/grooveboard/info.json | 2 ++ keyboards/ianklug/grooveboard/rules.mk | 6 ------ .../model_m_4th_gen/overnumpad_1xb/info.json | 2 ++ .../model_m_4th_gen/overnumpad_1xb/rules.mk | 6 ------ keyboards/ibnuda/alicia_cook/info.json | 2 ++ keyboards/ibnuda/alicia_cook/rules.mk | 6 ------ keyboards/ibnuda/gurindam/info.json | 2 ++ keyboards/ibnuda/gurindam/rules.mk | 6 ------ keyboards/ibnuda/squiggle/rev1/info.json | 2 ++ keyboards/ibnuda/squiggle/rev1/rules.mk | 6 ------ keyboards/idb/idb_60/info.json | 2 ++ keyboards/idb/idb_60/rules.mk | 6 ------ keyboards/idobao/id75/v1/info.json | 2 ++ keyboards/idobao/id75/v1/rules.mk | 6 ------ keyboards/idobao/id75/v2/info.json | 2 ++ keyboards/idobao/id75/v2/rules.mk | 6 ------ keyboards/idobao/id87/v1/info.json | 2 ++ keyboards/idobao/id87/v1/rules.mk | 6 ------ keyboards/idobao/id96/info.json | 2 ++ keyboards/idobao/id96/rules.mk | 6 ------ keyboards/idobao/montex/v1/info.json | 2 ++ keyboards/idobao/montex/v1/rules.mk | 6 ------ keyboards/idobao/montex/v1rgb/info.json | 2 ++ keyboards/idobao/montex/v1rgb/rules.mk | 6 ------ keyboards/illuminati/is0/info.json | 2 ++ keyboards/illuminati/is0/rules.mk | 6 ------ keyboards/illusion/rosa/info.json | 2 ++ keyboards/illusion/rosa/rules.mk | 6 ------ keyboards/ilumkb/primus75/info.json | 2 ++ keyboards/ilumkb/primus75/rules.mk | 6 ------ keyboards/ilumkb/simpler61/info.json | 2 ++ keyboards/ilumkb/simpler61/rules.mk | 6 ------ keyboards/ilumkb/simpler64/info.json | 2 ++ keyboards/ilumkb/simpler64/rules.mk | 6 ------ keyboards/ilumkb/volcano660/info.json | 2 ++ keyboards/ilumkb/volcano660/rules.mk | 6 ------ keyboards/inett_studio/sqx/hotswap/info.json | 2 ++ keyboards/inett_studio/sqx/hotswap/rules.mk | 6 ------ .../inett_studio/sqx/universal/info.json | 2 ++ keyboards/inett_studio/sqx/universal/rules.mk | 6 ------ keyboards/ingrained/info.json | 2 ++ keyboards/ingrained/rules.mk | 6 ------ .../input_club/ergodox_infinity/info.json | 3 +++ .../input_club/ergodox_infinity/rules.mk | 13 ------------ keyboards/input_club/infinity60/info.json | 3 +++ keyboards/input_club/infinity60/rules.mk | 15 ------------- keyboards/input_club/k_type/info.json | 3 +++ keyboards/input_club/k_type/rules.mk | 13 ------------ keyboards/input_club/whitefox/info.json | 3 +++ keyboards/input_club/whitefox/rules.mk | 13 ------------ keyboards/io_mini1800/info.json | 2 ++ keyboards/io_mini1800/rules.mk | 6 ------ keyboards/irene/info.json | 2 ++ keyboards/irene/rules.mk | 6 ------ keyboards/iriskeyboards/info.json | 2 ++ keyboards/iriskeyboards/rules.mk | 6 ------ keyboards/iron180/info.json | 2 ++ keyboards/iron180/rules.mk | 6 ------ keyboards/j80/info.json | 2 ++ keyboards/j80/rules.mk | 6 ------ .../jacky_studio/s7_elephant/rev1/info.json | 2 ++ .../jacky_studio/s7_elephant/rev1/rules.mk | 6 ------ .../jacky_studio/s7_elephant/rev2/info.json | 2 ++ .../jacky_studio/s7_elephant/rev2/rules.mk | 6 ------ keyboards/jadookb/jkb2/info.json | 2 ++ keyboards/jadookb/jkb2/rules.mk | 6 ------ keyboards/jadookb/jkb65/info.json | 2 ++ keyboards/jadookb/jkb65/rules.mk | 6 ------ keyboards/jae/j01/info.json | 2 ++ keyboards/jae/j01/rules.mk | 6 ------ keyboards/jagdpietr/drakon/info.json | 2 ++ keyboards/jagdpietr/drakon/rules.mk | 6 ------ keyboards/jc65/v32a/info.json | 2 ++ keyboards/jc65/v32a/rules.mk | 6 ------ keyboards/jc65/v32u4/info.json | 2 ++ keyboards/jc65/v32u4/rules.mk | 6 ------ keyboards/jd40/info.json | 2 ++ keyboards/jd40/rules.mk | 6 ------ keyboards/jd45/info.json | 2 ++ keyboards/jd45/rules.mk | 6 ------ keyboards/jels/jels60/info.json | 2 ++ keyboards/jels/jels60/rules.mk | 6 ------ keyboards/jels/jels88/info.json | 2 ++ keyboards/jels/jels88/rules.mk | 6 ------ keyboards/jian/handwired/info.json | 4 +++- keyboards/jian/handwired/rules.mk | 6 ------ keyboards/jian/nsrev2/info.json | 4 +++- keyboards/jian/nsrev2/rules.mk | 6 ------ keyboards/jian/rev1/info.json | 4 +++- keyboards/jian/rev1/rules.mk | 6 ------ keyboards/jian/rev2/info.json | 4 +++- keyboards/jian/rev2/rules.mk | 6 ------ keyboards/jiran/info.json | 2 ++ keyboards/jiran/rules.mk | 6 ------ keyboards/jkdlab/binary_monkey/info.json | 2 ++ keyboards/jkdlab/binary_monkey/rules.mk | 6 ------ keyboards/jkeys_design/gentleman65/info.json | 2 ++ keyboards/jkeys_design/gentleman65/rules.mk | 6 ------ .../jkeys_design/gentleman65_se_s/info.json | 2 ++ .../jkeys_design/gentleman65_se_s/rules.mk | 6 ------ keyboards/jolofsor/denial75/info.json | 2 ++ keyboards/jolofsor/denial75/rules.mk | 6 ------ keyboards/jones/v03/info.json | 2 ++ keyboards/jones/v03/rules.mk | 6 ------ keyboards/jones/v03_1/info.json | 2 ++ keyboards/jones/v03_1/rules.mk | 6 ------ keyboards/jones/v1/info.json | 2 ++ keyboards/jones/v1/rules.mk | 6 ------ keyboards/jorne/rev1/info.json | 2 ++ keyboards/jorne/rules.mk | 6 ------ keyboards/k34/info.json | 2 ++ keyboards/k34/rules.mk | 6 ------ keyboards/kabedon/kabedon78s/info.json | 2 ++ keyboards/kabedon/kabedon78s/rules.mk | 6 ------ keyboards/kabedon/kabedon980/info.json | 2 ++ keyboards/kabedon/kabedon980/rules.mk | 6 ------ keyboards/kabedon/kabedon98e/info.json | 2 ++ keyboards/kabedon/kabedon98e/rules.mk | 6 ------ keyboards/kagizaraya/chidori/info.json | 2 ++ keyboards/kagizaraya/chidori/rules.mk | 6 ------ keyboards/kagizaraya/halberd/info.json | 2 ++ keyboards/kagizaraya/halberd/rules.mk | 6 ------ keyboards/kagizaraya/scythe/info.json | 2 ++ keyboards/kagizaraya/scythe/rules.mk | 6 ------ keyboards/kakunpc/angel17/alpha/rules.mk | 6 ------ keyboards/kakunpc/angel17/info.json | 2 ++ keyboards/kakunpc/angel17/rev1/rules.mk | 6 ------ keyboards/kakunpc/angel17/rules.mk | 6 ------ keyboards/kakunpc/angel64/alpha/info.json | 2 ++ keyboards/kakunpc/angel64/rev1/info.json | 2 ++ keyboards/kakunpc/angel64/rules.mk | 6 ------ .../kakunpc/business_card/alpha/info.json | 2 ++ .../kakunpc/business_card/alpha/rules.mk | 6 ------ .../kakunpc/business_card/beta/info.json | 2 ++ keyboards/kakunpc/business_card/beta/rules.mk | 6 ------ keyboards/kakunpc/business_card/rules.mk | 6 ------ keyboards/kakunpc/choc_taro/info.json | 2 ++ keyboards/kakunpc/choc_taro/rules.mk | 6 ------ .../kakunpc/rabbit_capture_plan/info.json | 2 ++ .../kakunpc/rabbit_capture_plan/rules.mk | 6 ------ keyboards/kakunpc/suihankey/alpha/info.json | 2 ++ keyboards/kakunpc/suihankey/rev1/info.json | 2 ++ keyboards/kakunpc/suihankey/rules.mk | 6 ------ keyboards/kakunpc/suihankey/split/info.json | 2 ++ keyboards/kakunpc/thedogkeyboard/info.json | 2 ++ keyboards/kakunpc/thedogkeyboard/rules.mk | 6 ------ keyboards/kapcave/arya/info.json | 2 ++ keyboards/kapcave/arya/rules.mk | 6 ------ keyboards/kapcave/gskt00/info.json | 2 ++ keyboards/kapcave/gskt00/rules.mk | 6 ------ keyboards/kapcave/paladin64/info.json | 2 ++ keyboards/kapcave/paladin64/rules.mk | 6 ------ keyboards/kapcave/paladinpad/info.json | 2 ++ keyboards/kapcave/paladinpad/rules.mk | 6 ------ keyboards/kapl/rev1/info.json | 2 ++ keyboards/kapl/rules.mk | 6 ------ keyboards/karlb/kbic65/info.json | 2 ++ keyboards/karlb/kbic65/rules.mk | 6 ------ keyboards/kb58/info.json | 2 ++ keyboards/kb58/rules.mk | 6 ------ keyboards/kb_elmo/67mk_e/info.json | 2 ++ keyboards/kb_elmo/67mk_e/rules.mk | 6 ------ keyboards/kb_elmo/aek2_usb/info.json | 2 ++ keyboards/kb_elmo/aek2_usb/rules.mk | 6 ------ keyboards/kb_elmo/elmopad/info.json | 2 ++ keyboards/kb_elmo/elmopad/rules.mk | 6 ------ keyboards/kb_elmo/isolation/info.json | 2 ++ keyboards/kb_elmo/isolation/rules.mk | 6 ------ keyboards/kb_elmo/m0110a_usb/info.json | 2 ++ keyboards/kb_elmo/m0110a_usb/rules.mk | 6 ------ keyboards/kb_elmo/m0116_usb/info.json | 2 ++ keyboards/kb_elmo/m0116_usb/rules.mk | 6 ------ keyboards/kb_elmo/noah_avr/info.json | 2 ++ keyboards/kb_elmo/noah_avr/rules.mk | 6 ------ keyboards/kb_elmo/qez/info.json | 2 ++ keyboards/kb_elmo/qez/rules.mk | 6 ------ keyboards/kb_elmo/sesame/info.json | 2 ++ keyboards/kb_elmo/sesame/rules.mk | 6 ------ keyboards/kb_elmo/twelvekey/info.json | 2 ++ keyboards/kb_elmo/twelvekey/rules.mk | 6 ------ keyboards/kb_elmo/vertex/info.json | 2 ++ keyboards/kb_elmo/vertex/rules.mk | 6 ------ keyboards/kbdclack/kaishi65/info.json | 2 ++ keyboards/kbdclack/kaishi65/rules.mk | 6 ------ keyboards/kbdfans/baguette66/rgb/info.json | 2 ++ keyboards/kbdfans/baguette66/rgb/rules.mk | 6 ------ .../kbdfans/baguette66/soldered/info.json | 2 ++ .../kbdfans/baguette66/soldered/rules.mk | 6 ------ keyboards/kbdfans/bella/rgb/info.json | 2 ++ keyboards/kbdfans/bella/rgb/rules.mk | 6 ------ keyboards/kbdfans/bella/rgb_iso/info.json | 2 ++ keyboards/kbdfans/bella/rgb_iso/rules.mk | 6 ------ keyboards/kbdfans/bella/soldered/info.json | 2 ++ keyboards/kbdfans/bella/soldered/rules.mk | 6 ------ keyboards/kbdfans/boop65/rgb/info.json | 2 ++ keyboards/kbdfans/boop65/rgb/rules.mk | 6 ------ keyboards/kbdfans/bounce/75/hotswap/info.json | 2 ++ keyboards/kbdfans/bounce/75/hotswap/rules.mk | 6 ------ .../kbdfans/bounce/75/soldered/info.json | 2 ++ keyboards/kbdfans/bounce/75/soldered/rules.mk | 6 ------ keyboards/kbdfans/bounce/pad/info.json | 2 ++ keyboards/kbdfans/bounce/pad/rules.mk | 6 ------ keyboards/kbdfans/kbd19x/info.json | 2 ++ keyboards/kbdfans/kbd19x/rules.mk | 6 ------ keyboards/kbdfans/kbd4x/info.json | 2 ++ keyboards/kbdfans/kbd4x/rules.mk | 6 ------ keyboards/kbdfans/kbd66/info.json | 2 ++ keyboards/kbdfans/kbd66/rules.mk | 6 ------ keyboards/kbdfans/kbd67/hotswap/info.json | 2 ++ keyboards/kbdfans/kbd67/hotswap/rules.mk | 6 ------ .../kbdfans/kbd67/mkii_soldered/info.json | 2 ++ .../kbdfans/kbd67/mkii_soldered/rules.mk | 6 ------ keyboards/kbdfans/kbd67/mkiirgb/v1/info.json | 3 +++ keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk | 7 ------- keyboards/kbdfans/kbd67/mkiirgb/v2/info.json | 2 ++ keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk | 6 ------ keyboards/kbdfans/kbd67/mkiirgb/v3/info.json | 4 +++- keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk | 5 ----- keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 4 +++- keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk | 6 ------ keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 2 ++ keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk | 5 ----- keyboards/kbdfans/kbd67/rev1/info.json | 2 ++ keyboards/kbdfans/kbd67/rev1/rules.mk | 6 ------ keyboards/kbdfans/kbd67/rev2/info.json | 2 ++ keyboards/kbdfans/kbd67/rev2/rules.mk | 6 ------ keyboards/kbdfans/kbd6x/info.json | 2 ++ keyboards/kbdfans/kbd6x/rules.mk | 6 ------ keyboards/kbdfans/kbd75/rev1/info.json | 2 ++ keyboards/kbdfans/kbd75/rev1/rules.mk | 6 ------ keyboards/kbdfans/kbd75/rev2/info.json | 2 ++ keyboards/kbdfans/kbd75/rev2/rules.mk | 6 ------ keyboards/kbdfans/kbd75hs/info.json | 2 ++ keyboards/kbdfans/kbd75hs/rules.mk | 6 ------ keyboards/kbdfans/kbd75rgb/info.json | 2 ++ keyboards/kbdfans/kbd75rgb/rules.mk | 5 ----- keyboards/kbdfans/kbd8x/info.json | 2 ++ keyboards/kbdfans/kbd8x/rules.mk | 6 ------ keyboards/kbdfans/kbd8x_mk2/info.json | 2 ++ keyboards/kbdfans/kbd8x_mk2/rules.mk | 6 ------ keyboards/kbdfans/kbdmini/info.json | 2 ++ keyboards/kbdfans/kbdmini/rules.mk | 6 ------ keyboards/kbdfans/kbdpad/mk1/info.json | 2 ++ keyboards/kbdfans/kbdpad/mk1/rules.mk | 6 ------ keyboards/kbdfans/kbdpad/mk2/info.json | 2 ++ keyboards/kbdfans/kbdpad/mk2/rules.mk | 6 ------ keyboards/kbdfans/maja/info.json | 2 ++ keyboards/kbdfans/maja/rules.mk | 6 ------ keyboards/kbdfans/maja_soldered/info.json | 2 ++ keyboards/kbdfans/maja_soldered/rules.mk | 6 ------ keyboards/kbdfans/niu_mini/info.json | 2 ++ keyboards/kbdfans/niu_mini/rules.mk | 6 ------ keyboards/kbdfans/odin/rgb/info.json | 2 ++ keyboards/kbdfans/odin/rgb/rules.mk | 6 ------ keyboards/kbdfans/odin/soldered/info.json | 2 ++ keyboards/kbdfans/odin/soldered/rules.mk | 6 ------ keyboards/kbdfans/odin/v2/info.json | 2 ++ keyboards/kbdfans/odin/v2/rules.mk | 6 ------ keyboards/kbdfans/phaseone/info.json | 2 ++ keyboards/kbdfans/phaseone/rules.mk | 6 ------ keyboards/kbdfans/tiger80/info.json | 2 ++ keyboards/kbdfans/tiger80/rules.mk | 6 ------ keyboards/kbnordic/nordic60/rev_a/info.json | 2 ++ keyboards/kbnordic/nordic60/rev_a/rules.mk | 6 ------ keyboards/kc60/info.json | 2 ++ keyboards/kc60/rules.mk | 6 ------ keyboards/kc60se/info.json | 2 ++ keyboards/kc60se/rules.mk | 6 ------ keyboards/keebio/bamfk1/info.json | 2 ++ keyboards/keebio/bamfk1/rules.mk | 6 ------ keyboards/keebio/bamfk4/info.json | 2 ++ keyboards/keebio/bamfk4/rules.mk | 6 ------ keyboards/keebio/bdn9/rev1/info.json | 4 +++- keyboards/keebio/bdn9/rev1/rules.mk | 6 ------ keyboards/keebio/bdn9/rev2/info.json | 4 +++- keyboards/keebio/bdn9/rev2/rules.mk | 6 ------ keyboards/keebio/bfo9000/info.json | 2 ++ keyboards/keebio/bfo9000/rules.mk | 6 ------ keyboards/keebio/bigswitchseat/info.json | 2 ++ keyboards/keebio/bigswitchseat/rules.mk | 6 ------ keyboards/keebio/choconum/info.json | 2 ++ keyboards/keebio/choconum/rules.mk | 6 ------ keyboards/keebio/chocopad/info.json | 2 ++ keyboards/keebio/chocopad/rules.mk | 6 ------ keyboards/keebio/dilly/info.json | 2 ++ keyboards/keebio/dilly/rules.mk | 6 ------ keyboards/keebio/dsp40/rev1/info.json | 2 ++ keyboards/keebio/dsp40/rev1/rules.mk | 6 ------ keyboards/keebio/ergodicity/info.json | 2 ++ keyboards/keebio/ergodicity/rules.mk | 6 ------ keyboards/keebio/foldkb/rev1/info.json | 2 ++ keyboards/keebio/foldkb/rules.mk | 6 ------ keyboards/keebio/fourier/info.json | 2 ++ keyboards/keebio/fourier/rules.mk | 6 ------ keyboards/keebio/iris/rev1/info.json | 4 +++- keyboards/keebio/iris/rev1/rules.mk | 6 ------ keyboards/keebio/iris/rev1_led/info.json | 4 +++- keyboards/keebio/iris/rev1_led/rules.mk | 6 ------ keyboards/keebio/iris/rev2/info.json | 4 +++- keyboards/keebio/iris/rev2/rules.mk | 6 ------ keyboards/keebio/iris/rev3/info.json | 4 +++- keyboards/keebio/iris/rev3/rules.mk | 6 ------ keyboards/keebio/iris/rev4/info.json | 4 +++- keyboards/keebio/iris/rev4/rules.mk | 6 ------ keyboards/keebio/iris/rev5/info.json | 4 +++- keyboards/keebio/iris/rev5/rules.mk | 6 ------ keyboards/keebio/iris/rev6/info.json | 4 +++- keyboards/keebio/iris/rev6/rules.mk | 6 ------ keyboards/keebio/iris/rev6a/info.json | 4 +++- keyboards/keebio/iris/rev6a/rules.mk | 6 ------ keyboards/keebio/iris/rev6b/info.json | 4 +++- keyboards/keebio/iris/rev6b/rules.mk | 6 ------ keyboards/keebio/iris/rev7/info.json | 4 +++- keyboards/keebio/iris/rev7/rules.mk | 6 ------ keyboards/keebio/kbo5000/rev1/info.json | 2 ++ keyboards/keebio/kbo5000/rules.mk | 6 ------ keyboards/keebio/laplace/info.json | 2 ++ keyboards/keebio/laplace/rules.mk | 6 ------ keyboards/keebio/levinson/info.json | 2 ++ keyboards/keebio/levinson/rules.mk | 6 ------ keyboards/keebio/nyquist/rev1/info.json | 4 +++- keyboards/keebio/nyquist/rev1/rules.mk | 6 ------ keyboards/keebio/nyquist/rev2/info.json | 4 +++- keyboards/keebio/nyquist/rev2/rules.mk | 6 ------ keyboards/keebio/nyquist/rev3/info.json | 4 +++- keyboards/keebio/nyquist/rev3/rules.mk | 6 ------ keyboards/keebio/quefrency/rev1/info.json | 2 ++ keyboards/keebio/quefrency/rev1/rules.mk | 2 -- keyboards/keebio/quefrency/rev2/info.json | 2 ++ keyboards/keebio/quefrency/rev2/rules.mk | 1 - keyboards/keebio/quefrency/rev3/info.json | 2 ++ keyboards/keebio/quefrency/rev3/rules.mk | 1 - keyboards/keebio/quefrency/rev4/info.json | 2 ++ keyboards/keebio/quefrency/rev4/rules.mk | 1 - keyboards/keebio/quefrency/rev5/info.json | 2 ++ keyboards/keebio/quefrency/rev5/rules.mk | 1 - keyboards/keebio/quefrency/rules.mk | 3 --- keyboards/keebio/rorschach/rev1/info.json | 2 ++ keyboards/keebio/rorschach/rules.mk | 6 ------ keyboards/keebio/stick/info.json | 2 ++ keyboards/keebio/stick/rules.mk | 6 ------ keyboards/keebio/tragicforce68/info.json | 2 ++ keyboards/keebio/tragicforce68/rules.mk | 6 ------ keyboards/keebio/tukey/info.json | 2 ++ keyboards/keebio/tukey/rules.mk | 6 ------ keyboards/keebio/viterbi/info.json | 2 ++ keyboards/keebio/viterbi/rules.mk | 6 ------ keyboards/keebio/wavelet/info.json | 2 ++ keyboards/keebio/wavelet/rules.mk | 6 ------ keyboards/keebio/wtf60/info.json | 2 ++ keyboards/keebio/wtf60/rules.mk | 6 ------ keyboards/keebmonkey/kbmg68/info.json | 2 ++ keyboards/keebmonkey/kbmg68/rules.mk | 6 ------ keyboards/keebsforall/coarse60/info.json | 2 ++ keyboards/keebsforall/coarse60/rules.mk | 6 ------ keyboards/keebsforall/freebird60/info.json | 2 ++ keyboards/keebsforall/freebird60/rules.mk | 6 ------ .../keebsforall/freebirdnp/lite/info.json | 2 ++ .../keebsforall/freebirdnp/lite/rules.mk | 6 ------ .../keebsforall/freebirdnp/pro/info.json | 2 ++ keyboards/keebsforall/freebirdnp/pro/rules.mk | 6 ------ keyboards/keebsforall/freebirdtkl/info.json | 2 ++ keyboards/keebsforall/freebirdtkl/rules.mk | 6 ------ keyboards/keebwerk/mega/ansi/info.json | 2 ++ keyboards/keebwerk/mega/ansi/rules.mk | 6 ------ keyboards/keebwerk/nano_slider/info.json | 2 ++ keyboards/keebwerk/nano_slider/rules.mk | 6 ------ keyboards/keebzdotnet/fme/info.json | 2 ++ keyboards/keebzdotnet/fme/rules.mk | 6 ------ keyboards/keebzdotnet/wazowski/info.json | 2 ++ keyboards/keebzdotnet/wazowski/rules.mk | 6 ------ keyboards/kegen/gboy/info.json | 2 ++ keyboards/kegen/gboy/rules.mk | 6 ------ keyboards/keybage/radpad/info.json | 2 ++ keyboards/keybage/radpad/rules.mk | 6 ------ keyboards/keybee/keybee65/info.json | 2 ++ keyboards/keybee/keybee65/rules.mk | 6 ------ keyboards/keyboardio/atreus/info.json | 2 ++ keyboards/keyboardio/atreus/rules.mk | 6 ------ keyboards/keyboardio/model01/info.json | 2 ++ keyboards/keyboardio/model01/rules.mk | 6 ------ keyboards/keycapsss/kimiko/rev1/info.json | 2 ++ keyboards/keycapsss/kimiko/rules.mk | 6 ------ keyboards/keycapsss/o4l_5x12/info.json | 2 ++ keyboards/keycapsss/o4l_5x12/rules.mk | 6 ------ keyboards/keycapsss/plaid_pad/info.json | 2 ++ keyboards/keycapsss/plaid_pad/rules.mk | 6 ------ keyboards/keychron/q0/rev_0130/info.json | 2 ++ keyboards/keychron/q0/rev_0130/rules.mk | 6 ------ keyboards/keychron/q1/ansi/info.json | 2 ++ keyboards/keychron/q1/ansi/rules.mk | 6 ------ keyboards/keychron/q1/ansi_encoder/info.json | 2 ++ keyboards/keychron/q1/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q1/iso/info.json | 2 ++ keyboards/keychron/q1/iso/rules.mk | 6 ------ keyboards/keychron/q1/iso_encoder/info.json | 2 ++ keyboards/keychron/q1/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q10/ansi_encoder/info.json | 2 ++ keyboards/keychron/q10/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q10/iso_encoder/info.json | 2 ++ keyboards/keychron/q10/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q2/ansi/info.json | 2 ++ keyboards/keychron/q2/ansi/rules.mk | 6 ------ keyboards/keychron/q2/ansi_encoder/info.json | 2 ++ keyboards/keychron/q2/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q2/iso/info.json | 2 ++ keyboards/keychron/q2/iso/rules.mk | 6 ------ keyboards/keychron/q2/iso_encoder/info.json | 2 ++ keyboards/keychron/q2/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q3/ansi/info.json | 2 ++ keyboards/keychron/q3/ansi/rules.mk | 6 ------ keyboards/keychron/q3/ansi_encoder/info.json | 2 ++ keyboards/keychron/q3/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q3/iso/info.json | 2 ++ keyboards/keychron/q3/iso/rules.mk | 6 ------ keyboards/keychron/q3/iso_encoder/info.json | 2 ++ keyboards/keychron/q3/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q3/jis/info.json | 2 ++ keyboards/keychron/q3/jis/rules.mk | 6 ------ keyboards/keychron/q3/jis_encoder/info.json | 2 ++ keyboards/keychron/q3/jis_encoder/rules.mk | 6 ------ keyboards/keychron/q4/ansi_v1/info.json | 2 ++ keyboards/keychron/q4/ansi_v1/rules.mk | 6 ------ keyboards/keychron/q4/ansi_v2/info.json | 2 ++ keyboards/keychron/q4/ansi_v2/rules.mk | 6 ------ keyboards/keychron/q4/iso/info.json | 2 ++ keyboards/keychron/q4/iso/rules.mk | 6 ------ keyboards/keychron/q5/ansi/info.json | 2 ++ keyboards/keychron/q5/ansi/rules.mk | 6 ------ keyboards/keychron/q5/ansi_encoder/info.json | 2 ++ keyboards/keychron/q5/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q5/iso/info.json | 2 ++ keyboards/keychron/q5/iso/rules.mk | 6 ------ keyboards/keychron/q5/iso_encoder/info.json | 2 ++ keyboards/keychron/q5/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q6/ansi/info.json | 2 ++ keyboards/keychron/q6/ansi/rules.mk | 6 ------ keyboards/keychron/q6/ansi_encoder/info.json | 2 ++ keyboards/keychron/q6/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q6/iso/info.json | 2 ++ keyboards/keychron/q6/iso/rules.mk | 6 ------ keyboards/keychron/q6/iso_encoder/info.json | 2 ++ keyboards/keychron/q6/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q60/ansi/info.json | 2 ++ keyboards/keychron/q60/ansi/rules.mk | 6 ------ keyboards/keychron/q65/ansi_encoder/info.json | 2 ++ keyboards/keychron/q65/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q7/ansi/info.json | 2 ++ keyboards/keychron/q7/ansi/rules.mk | 6 ------ keyboards/keychron/q7/iso/info.json | 2 ++ keyboards/keychron/q7/iso/rules.mk | 6 ------ keyboards/keychron/q8/ansi/info.json | 2 ++ keyboards/keychron/q8/ansi/rules.mk | 6 ------ keyboards/keychron/q8/ansi_encoder/info.json | 2 ++ keyboards/keychron/q8/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q8/iso/info.json | 2 ++ keyboards/keychron/q8/iso/rules.mk | 6 ------ keyboards/keychron/q8/iso_encoder/info.json | 2 ++ keyboards/keychron/q8/iso_encoder/rules.mk | 6 ------ keyboards/keychron/q9/ansi/info.json | 2 ++ keyboards/keychron/q9/ansi/rules.mk | 6 ------ keyboards/keychron/q9/ansi_encoder/info.json | 2 ++ keyboards/keychron/q9/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q9/iso/info.json | 2 ++ keyboards/keychron/q9/iso/rules.mk | 6 ------ keyboards/keychron/q9/iso_encoder/info.json | 2 ++ keyboards/keychron/q9/iso_encoder/rules.mk | 6 ------ keyboards/keychron/s1/ansi/rgb/info.json | 2 ++ keyboards/keychron/s1/ansi/rgb/rules.mk | 6 ------ keyboards/keychron/s1/ansi/white/info.json | 2 ++ keyboards/keychron/s1/ansi/white/rules.mk | 6 ------ keyboards/keychron/v1/ansi/info.json | 2 ++ keyboards/keychron/v1/ansi/rules.mk | 6 ------ keyboards/keychron/v1/ansi_encoder/info.json | 2 ++ keyboards/keychron/v1/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/v1/iso/info.json | 2 ++ keyboards/keychron/v1/iso/rules.mk | 6 ------ keyboards/keychron/v1/iso_encoder/info.json | 2 ++ keyboards/keychron/v1/iso_encoder/rules.mk | 6 ------ keyboards/keychron/v1/jis/info.json | 2 ++ keyboards/keychron/v1/jis/rules.mk | 6 ------ keyboards/keychron/v1/jis_encoder/info.json | 2 ++ keyboards/keychron/v1/jis_encoder/rules.mk | 6 ------ keyboards/keychron/v2/ansi/info.json | 2 ++ keyboards/keychron/v2/ansi/rules.mk | 6 ------ keyboards/keychron/v2/ansi_encoder/info.json | 2 ++ keyboards/keychron/v2/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/v2/iso/info.json | 2 ++ keyboards/keychron/v2/iso/rules.mk | 6 ------ keyboards/keychron/v2/iso_encoder/info.json | 2 ++ keyboards/keychron/v2/iso_encoder/rules.mk | 6 ------ keyboards/keychron/v2/jis/info.json | 2 ++ keyboards/keychron/v2/jis/rules.mk | 6 ------ keyboards/keychron/v2/jis_encoder/info.json | 2 ++ keyboards/keychron/v2/jis_encoder/rules.mk | 6 ------ keyboards/keychron/v3/ansi/info.json | 2 ++ keyboards/keychron/v3/ansi/rules.mk | 6 ------ keyboards/keychron/v3/ansi_encoder/info.json | 2 ++ keyboards/keychron/v3/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/v3/iso/info.json | 2 ++ keyboards/keychron/v3/iso/rules.mk | 6 ------ keyboards/keychron/v3/iso_encoder/info.json | 2 ++ keyboards/keychron/v3/iso_encoder/rules.mk | 6 ------ keyboards/keychron/v3/jis/info.json | 2 ++ keyboards/keychron/v3/jis/rules.mk | 6 ------ keyboards/keychron/v3/jis_encoder/info.json | 2 ++ keyboards/keychron/v3/jis_encoder/rules.mk | 6 ------ keyboards/keychron/v4/ansi/info.json | 2 ++ keyboards/keychron/v4/ansi/rules.mk | 6 ------ keyboards/keychron/v4/iso/info.json | 2 ++ keyboards/keychron/v4/iso/rules.mk | 6 ------ keyboards/keychron/v5/ansi/info.json | 2 ++ keyboards/keychron/v5/ansi/rules.mk | 6 ------ keyboards/keychron/v5/ansi_encoder/info.json | 2 ++ keyboards/keychron/v5/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/v5/iso/info.json | 2 ++ keyboards/keychron/v5/iso/rules.mk | 6 ------ keyboards/keychron/v5/iso_encoder/info.json | 2 ++ keyboards/keychron/v5/iso_encoder/rules.mk | 6 ------ keyboards/keychron/v7/ansi/info.json | 2 ++ keyboards/keychron/v7/ansi/rules.mk | 6 ------ keyboards/keychron/v7/iso/info.json | 2 ++ keyboards/keychron/v7/iso/rules.mk | 6 ------ keyboards/keychron/v8/ansi/info.json | 2 ++ keyboards/keychron/v8/ansi/rules.mk | 6 ------ keyboards/keychron/v8/ansi_encoder/info.json | 2 ++ keyboards/keychron/v8/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/v8/iso/info.json | 2 ++ keyboards/keychron/v8/iso/rules.mk | 6 ------ keyboards/keychron/v8/iso_encoder/info.json | 2 ++ keyboards/keychron/v8/iso_encoder/rules.mk | 6 ------ keyboards/keygem/kg60ansi/info.json | 2 ++ keyboards/keygem/kg60ansi/rules.mk | 6 ------ keyboards/keygem/kg65rgbv2/info.json | 2 ++ keyboards/keygem/kg65rgbv2/rules.mk | 6 ------ keyboards/keyhive/absinthe/info.json | 2 ++ keyboards/keyhive/absinthe/rules.mk | 6 ------ keyboards/keyhive/ergosaurus/info.json | 2 ++ keyboards/keyhive/ergosaurus/rules.mk | 6 ------ keyboards/keyhive/honeycomb/info.json | 2 ++ keyboards/keyhive/honeycomb/rules.mk | 6 ------ keyboards/keyhive/lattice60/info.json | 2 ++ keyboards/keyhive/lattice60/rules.mk | 6 ------ keyboards/keyhive/maypad/info.json | 2 ++ keyboards/keyhive/maypad/rules.mk | 6 ------ keyboards/keyhive/navi10/rev0/info.json | 4 +++- keyboards/keyhive/navi10/rev0/rules.mk | 6 ------ keyboards/keyhive/navi10/rev2/info.json | 4 +++- keyboards/keyhive/navi10/rev2/rules.mk | 6 ------ keyboards/keyhive/navi10/rev3/info.json | 4 +++- keyboards/keyhive/navi10/rev3/rules.mk | 6 ------ keyboards/keyhive/opus/info.json | 2 ++ keyboards/keyhive/opus/rules.mk | 6 ------ keyboards/keyhive/smallice/info.json | 2 ++ keyboards/keyhive/smallice/rules.mk | 6 ------ keyboards/keyhive/southpole/info.json | 2 ++ keyboards/keyhive/southpole/rules.mk | 6 ------ keyboards/keyhive/uno/rev1/info.json | 4 +++- keyboards/keyhive/uno/rev1/rules.mk | 6 ------ keyboards/keyhive/uno/rev2/info.json | 4 +++- keyboards/keyhive/uno/rev2/rules.mk | 6 ------ keyboards/keyhive/ut472/info.json | 2 ++ keyboards/keyhive/ut472/rules.mk | 6 ------ keyboards/keyprez/bison/info.json | 2 ++ keyboards/keyprez/bison/rules.mk | 6 ------ keyboards/keyprez/corgi/info.json | 2 ++ keyboards/keyprez/corgi/rules.mk | 6 ------ keyboards/keyprez/rhino/info.json | 2 ++ keyboards/keyprez/rhino/rules.mk | 6 ------ keyboards/keyprez/unicorn/info.json | 2 ++ keyboards/keyprez/unicorn/rules.mk | 6 ------ keyboards/keyquest/enclave/info.json | 2 ++ keyboards/keyquest/enclave/rules.mk | 6 ------ keyboards/keysofkings/twokey/info.json | 2 ++ keyboards/keysofkings/twokey/rules.mk | 6 ------ .../keystonecaps/gameroyadvance/info.json | 2 ++ .../keystonecaps/gameroyadvance/rules.mk | 7 ------- keyboards/keyten/aperture/info.json | 2 ++ keyboards/keyten/aperture/rules.mk | 6 ------ keyboards/keyten/kt60_m/info.json | 2 ++ keyboards/keyten/kt60_m/rules.mk | 6 ------ keyboards/kikkou/info.json | 2 ++ keyboards/kikkou/rules.mk | 6 ------ keyboards/kikoslab/ellora65/info.json | 2 ++ keyboards/kikoslab/ellora65/rules.mk | 6 ------ keyboards/kikoslab/kl90/info.json | 2 ++ keyboards/kikoslab/kl90/rules.mk | 6 ------ keyboards/kin80/blackpill103/info.json | 4 +++- keyboards/kin80/blackpill103/rules.mk | 6 ------ keyboards/kin80/blackpill401/info.json | 5 ++++- keyboards/kin80/blackpill401/rules.mk | 7 ------- keyboards/kin80/blackpill411/info.json | 5 ++++- keyboards/kin80/blackpill411/rules.mk | 7 ------- keyboards/kin80/micro/info.json | 4 +++- keyboards/kin80/micro/rules.mk | 5 ----- keyboards/kindakeyboards/conone65/info.json | 2 ++ keyboards/kindakeyboards/conone65/rules.mk | 6 ------ keyboards/kinesis/alvicstep/info.json | 4 +++- keyboards/kinesis/kint2pp/info.json | 2 ++ keyboards/kinesis/kint36/info.json | 2 ++ keyboards/kinesis/kint36/rules.mk | 3 --- keyboards/kinesis/kint41/rules.mk | 5 +++-- keyboards/kinesis/kintlc/info.json | 2 ++ keyboards/kinesis/kintlc/rules.mk | 2 -- keyboards/kinesis/nguyenvietyen/info.json | 4 +++- keyboards/kinesis/nguyenvietyen/rules.mk | 6 ------ keyboards/kinesis/rules.mk | 6 ------ keyboards/kinesis/stapelberg/info.json | 4 +++- keyboards/kineticlabs/emu/hotswap/info.json | 2 ++ keyboards/kineticlabs/emu/hotswap/rules.mk | 6 ------ keyboards/kineticlabs/emu/soldered/info.json | 2 ++ keyboards/kineticlabs/emu/soldered/rules.mk | 6 ------ keyboards/kingly_keys/ave/ortho/info.json | 2 ++ keyboards/kingly_keys/ave/ortho/rules.mk | 6 ------ keyboards/kingly_keys/ave/staggered/info.json | 2 ++ keyboards/kingly_keys/ave/staggered/rules.mk | 6 ------ keyboards/kingly_keys/little_foot/info.json | 2 ++ keyboards/kingly_keys/little_foot/rules.mk | 6 ------ keyboards/kingly_keys/romac/info.json | 2 ++ keyboards/kingly_keys/romac/rules.mk | 6 ------ keyboards/kingly_keys/romac_plus/info.json | 2 ++ keyboards/kingly_keys/romac_plus/rules.mk | 6 ------ keyboards/kingly_keys/ropro/info.json | 2 ++ keyboards/kingly_keys/ropro/rules.mk | 6 ------ keyboards/kingly_keys/smd_milk/info.json | 2 ++ keyboards/kingly_keys/smd_milk/rules.mk | 6 ------ keyboards/kingly_keys/soap/info.json | 2 ++ keyboards/kingly_keys/soap/rules.mk | 6 ------ keyboards/kira75/info.json | 2 ++ keyboards/kira75/rules.mk | 6 ------ keyboards/kira80/info.json | 2 ++ keyboards/kira80/rules.mk | 6 ------ keyboards/kiwikeebs/macro/info.json | 2 ++ keyboards/kiwikeebs/macro/rules.mk | 6 ------ keyboards/kiwikeebs/macro_v2/info.json | 2 ++ keyboards/kiwikeebs/macro_v2/rules.mk | 6 ------ keyboards/kiwikey/borderland/info.json | 2 ++ keyboards/kiwikey/borderland/rules.mk | 6 ------ keyboards/kiwikey/kawii9/info.json | 2 ++ keyboards/kiwikey/kawii9/rules.mk | 6 ------ keyboards/kiwikey/wanderland/info.json | 2 ++ keyboards/kiwikey/wanderland/rules.mk | 6 ------ keyboards/kkatano/bakeneko60/info.json | 2 ++ keyboards/kkatano/bakeneko60/rules.mk | 6 ------ keyboards/kkatano/bakeneko65/rev2/info.json | 2 ++ keyboards/kkatano/bakeneko65/rev2/rules.mk | 6 ------ keyboards/kkatano/bakeneko65/rev3/info.json | 2 ++ keyboards/kkatano/bakeneko65/rev3/rules.mk | 6 ------ keyboards/kkatano/bakeneko80/info.json | 2 ++ keyboards/kkatano/bakeneko80/rules.mk | 6 ------ keyboards/kkatano/wallaby/info.json | 2 ++ keyboards/kkatano/wallaby/rules.mk | 6 ------ keyboards/kkatano/yurei/info.json | 2 ++ keyboards/kkatano/yurei/rules.mk | 6 ------ keyboards/kmac/info.json | 2 ++ keyboards/kmac/rules.mk | 6 ------ keyboards/kmac_pad/info.json | 2 ++ keyboards/kmac_pad/rules.mk | 6 ------ keyboards/kmini/info.json | 2 ++ keyboards/kmini/rules.mk | 6 ------ keyboards/knobgoblin/info.json | 2 ++ keyboards/knobgoblin/rules.mk | 6 ------ keyboards/knops/mini/info.json | 2 ++ keyboards/knops/mini/rules.mk | 6 ------ keyboards/kona_classic/info.json | 2 ++ keyboards/kona_classic/rules.mk | 6 ------ keyboards/kopibeng/mnk65/info.json | 2 ++ keyboards/kopibeng/mnk65/rules.mk | 6 ------ keyboards/kopibeng/mnk65_stm32/info.json | 2 ++ keyboards/kopibeng/mnk65_stm32/rules.mk | 6 ------ keyboards/kopibeng/mnk88/info.json | 2 ++ keyboards/kopibeng/mnk88/rules.mk | 6 ------ keyboards/kopibeng/typ65/info.json | 2 ++ keyboards/kopibeng/typ65/rules.mk | 6 ------ keyboards/kopibeng/xt60/info.json | 2 ++ keyboards/kopibeng/xt60/rules.mk | 6 ------ keyboards/kopibeng/xt60_singa/info.json | 2 ++ keyboards/kopibeng/xt60_singa/rules.mk | 6 ------ keyboards/kopibeng/xt65/info.json | 2 ++ keyboards/kopibeng/xt65/rules.mk | 6 ------ keyboards/kopibeng/xt8x/info.json | 2 ++ keyboards/kopibeng/xt8x/rules.mk | 6 ------ keyboards/kprepublic/bm16s/info.json | 2 ++ keyboards/kprepublic/bm16s/rules.mk | 6 ------ keyboards/kprepublic/bm40hsrgb/info.json | 2 ++ keyboards/kprepublic/bm40hsrgb/rules.mk | 6 ------ keyboards/kprepublic/bm43a/info.json | 2 ++ keyboards/kprepublic/bm43a/rules.mk | 6 ------ keyboards/kprepublic/bm43hsrgb/info.json | 2 ++ keyboards/kprepublic/bm43hsrgb/rules.mk | 6 ------ keyboards/kprepublic/bm60hsrgb/rev1/info.json | 2 ++ keyboards/kprepublic/bm60hsrgb/rev1/rules.mk | 6 ------ keyboards/kprepublic/bm60hsrgb/rev2/info.json | 2 ++ keyboards/kprepublic/bm60hsrgb/rev2/rules.mk | 6 ------ .../kprepublic/bm60hsrgb_ec/rev1/info.json | 2 ++ .../kprepublic/bm60hsrgb_ec/rev1/rules.mk | 6 ------ .../kprepublic/bm60hsrgb_ec/rev2/info.json | 2 ++ .../kprepublic/bm60hsrgb_ec/rev2/rules.mk | 6 ------ .../kprepublic/bm60hsrgb_iso/rev1/info.json | 2 ++ .../kprepublic/bm60hsrgb_iso/rev1/rules.mk | 6 ------ .../kprepublic/bm60hsrgb_iso/rev2/info.json | 2 ++ .../kprepublic/bm60hsrgb_iso/rev2/rules.mk | 6 ------ .../kprepublic/bm60hsrgb_poker/rev1/info.json | 2 ++ .../kprepublic/bm60hsrgb_poker/rev1/rules.mk | 6 ------ .../kprepublic/bm60hsrgb_poker/rev2/info.json | 2 ++ .../kprepublic/bm60hsrgb_poker/rev2/rules.mk | 6 ------ keyboards/kprepublic/bm65hsrgb/rev1/info.json | 2 ++ keyboards/kprepublic/bm65hsrgb/rev1/rules.mk | 6 ------ .../kprepublic/bm65hsrgb_iso/rev1/info.json | 2 ++ .../kprepublic/bm65hsrgb_iso/rev1/rules.mk | 6 ------ keyboards/kprepublic/bm68hsrgb/rev1/info.json | 2 ++ keyboards/kprepublic/bm68hsrgb/rev1/rules.mk | 6 ------ keyboards/kprepublic/bm68hsrgb/rev2/info.json | 2 ++ keyboards/kprepublic/bm68hsrgb/rev2/rules.mk | 6 ------ keyboards/kprepublic/bm80hsrgb/info.json | 2 ++ keyboards/kprepublic/bm80hsrgb/rules.mk | 6 ------ keyboards/kprepublic/bm80v2/info.json | 2 ++ keyboards/kprepublic/bm80v2/rules.mk | 6 ------ keyboards/kprepublic/bm80v2_iso/info.json | 2 ++ keyboards/kprepublic/bm80v2_iso/rules.mk | 6 ------ keyboards/kprepublic/bm980hsrgb/info.json | 2 ++ keyboards/kprepublic/bm980hsrgb/rules.mk | 6 ------ keyboards/kprepublic/cospad/info.json | 2 ++ keyboards/kprepublic/cospad/rules.mk | 6 ------ keyboards/kprepublic/jj40/info.json | 2 ++ keyboards/kprepublic/jj40/rules.mk | 6 ------ keyboards/kprepublic/jj4x4/info.json | 2 ++ keyboards/kprepublic/jj4x4/rules.mk | 6 ------ keyboards/kprepublic/jj50/info.json | 2 ++ keyboards/kprepublic/jj50/rules.mk | 6 ------ keyboards/ktec/daisy/info.json | 2 ++ keyboards/ktec/daisy/rules.mk | 6 ------ keyboards/ktec/staryu/info.json | 2 ++ keyboards/ktec/staryu/rules.mk | 6 ------ keyboards/kudox/columner/info.json | 2 ++ keyboards/kudox/rev1/info.json | 2 ++ keyboards/kudox/rev2/info.json | 2 ++ keyboards/kudox/rev3/info.json | 2 ++ keyboards/kudox/rules.mk | 6 ------ keyboards/kudox_full/rev1/info.json | 2 ++ keyboards/kudox_full/rules.mk | 6 ------ keyboards/kudox_game/info.json | 2 ++ keyboards/kudox_game/rules.mk | 6 ------ keyboards/kv/revt/info.json | 3 +++ keyboards/kv/revt/rules.mk | 7 ------- keyboards/kwub/bloop/info.json | 2 ++ keyboards/kwub/bloop/rules.mk | 6 ------ keyboards/ky01/info.json | 2 ++ keyboards/ky01/rules.mk | 6 ------ keyboards/labbe/labbeminiv1/info.json | 2 ++ keyboards/labbe/labbeminiv1/rules.mk | 6 ------ keyboards/labyrinth75/info.json | 2 ++ keyboards/labyrinth75/rules.mk | 6 ------ keyboards/late9/rev1/info.json | 2 ++ keyboards/late9/rev1/rules.mk | 6 ------ keyboards/latincompass/latin17rgb/info.json | 2 ++ keyboards/latincompass/latin17rgb/rules.mk | 6 ------ keyboards/latincompass/latin47ble/info.json | 2 ++ keyboards/latincompass/latin47ble/rules.mk | 6 ------ keyboards/latincompass/latin60rgb/info.json | 2 ++ keyboards/latincompass/latin60rgb/rules.mk | 7 ------- keyboards/latincompass/latin64ble/info.json | 2 ++ keyboards/latincompass/latin64ble/rules.mk | 6 ------ keyboards/latincompass/latin6rgb/info.json | 2 ++ keyboards/latincompass/latin6rgb/rules.mk | 6 ------ keyboards/latincompass/latinpad/info.json | 2 ++ keyboards/latincompass/latinpad/rules.mk | 6 ------ keyboards/latincompass/latinpadble/info.json | 2 ++ keyboards/latincompass/latinpadble/rules.mk | 6 ------ keyboards/lazydesigners/bolt/info.json | 2 ++ keyboards/lazydesigners/bolt/rules.mk | 6 ------ keyboards/lazydesigners/cassette8/info.json | 2 ++ keyboards/lazydesigners/cassette8/rules.mk | 6 ------ .../lazydesigners/dimple/ortho/info.json | 2 ++ keyboards/lazydesigners/dimple/rules.mk | 6 ------ .../lazydesigners/dimple/staggered/info.json | 4 +++- keyboards/lazydesigners/dimpleplus/info.json | 2 ++ keyboards/lazydesigners/dimpleplus/rules.mk | 6 ------ keyboards/lazydesigners/the30/info.json | 2 ++ keyboards/lazydesigners/the30/rules.mk | 6 ------ keyboards/lazydesigners/the40/info.json | 2 ++ keyboards/lazydesigners/the40/rules.mk | 6 ------ keyboards/lazydesigners/the50/info.json | 2 ++ keyboards/lazydesigners/the50/rules.mk | 6 ------ keyboards/lazydesigners/the60/rev1/info.json | 2 ++ keyboards/lazydesigners/the60/rev1/rules.mk | 6 ------ keyboards/lazydesigners/the60/rev2/info.json | 2 ++ keyboards/lazydesigners/the60/rev2/rules.mk | 6 ------ keyboards/leafcutterlabs/bigknob/info.json | 2 ++ keyboards/leafcutterlabs/bigknob/rules.mk | 6 ------ keyboards/leeku/finger65/info.json | 2 ++ keyboards/leeku/finger65/rules.mk | 6 ------ keyboards/lefty/info.json | 2 ++ keyboards/lefty/rules.mk | 6 ------ keyboards/lets_split/info.json | 2 ++ keyboards/lets_split/rules.mk | 6 ------ keyboards/lfkeyboards/lfk65_hs/info.json | 2 ++ keyboards/lfkeyboards/lfk65_hs/rules.mk | 3 --- keyboards/lfkeyboards/lfk78/revb/info.json | 2 ++ keyboards/lfkeyboards/lfk78/revb/rules.mk | 2 -- keyboards/lfkeyboards/lfk78/revc/info.json | 2 ++ keyboards/lfkeyboards/lfk78/revc/rules.mk | 2 -- keyboards/lfkeyboards/lfk78/revj/info.json | 2 ++ keyboards/lfkeyboards/lfk78/revj/rules.mk | 3 --- keyboards/lfkeyboards/lfk78/rules.mk | 3 --- keyboards/lfkeyboards/lfkpad/info.json | 2 ++ keyboards/lfkeyboards/lfkpad/rules.mk | 6 ------ keyboards/lfkeyboards/mini1800/reva/info.json | 4 ++++ keyboards/lfkeyboards/mini1800/reva/rules.mk | 6 ------ keyboards/lfkeyboards/mini1800/revc/info.json | 4 ++++ keyboards/lfkeyboards/mini1800/revc/rules.mk | 6 ------ keyboards/lfkeyboards/smk65/revb/info.json | 4 +++- keyboards/lfkeyboards/smk65/revb/rules.mk | 6 ------ keyboards/lfkeyboards/smk65/revf/info.json | 4 +++- keyboards/lfkeyboards/smk65/revf/rules.mk | 6 ------ keyboards/lily58/glow_enc/info.json | 2 ++ keyboards/lily58/light/info.json | 2 ++ keyboards/lily58/rev1/info.json | 2 ++ keyboards/lily58/rules.mk | 6 ------ keyboards/lime/rev1/info.json | 2 ++ keyboards/lime/rules.mk | 6 ------ keyboards/linworks/dolice/info.json | 2 ++ keyboards/linworks/dolice/rules.mk | 6 ------ keyboards/linworks/fave104/info.json | 2 ++ keyboards/linworks/fave104/rules.mk | 6 ------ keyboards/linworks/fave65h/info.json | 2 ++ keyboards/linworks/fave65h/rules.mk | 6 ------ keyboards/linworks/fave84h/info.json | 2 ++ keyboards/linworks/fave84h/rules.mk | 6 ------ keyboards/linworks/fave87/info.json | 2 ++ keyboards/linworks/fave87/rules.mk | 6 ------ keyboards/linworks/fave87h/info.json | 2 ++ keyboards/linworks/fave87h/rules.mk | 6 ------ keyboards/linworks/whale75/info.json | 3 +++ keyboards/linworks/whale75/rules.mk | 7 ------- keyboards/littlealby/mute/info.json | 2 ++ keyboards/littlealby/mute/rules.mk | 6 ------ .../lizard_trick/tenkey_plusplus/info.json | 2 ++ .../lizard_trick/tenkey_plusplus/rules.mk | 6 ------ keyboards/ll3macorn/bongopad/info.json | 2 ++ keyboards/ll3macorn/bongopad/rules.mk | 6 ------ keyboards/lm_keyboard/lm60n/info.json | 2 ++ keyboards/lm_keyboard/lm60n/rules.mk | 6 ------ keyboards/loki65/info.json | 2 ++ keyboards/loki65/rules.mk | 6 ------ keyboards/longnald/corin/info.json | 2 ++ keyboards/longnald/corin/rules.mk | 6 ------ keyboards/lucid/alexa/info.json | 2 ++ keyboards/lucid/alexa/rules.mk | 6 ------ keyboards/lucid/alexa_solder/info.json | 2 ++ keyboards/lucid/alexa_solder/rules.mk | 6 ------ keyboards/lucid/kbd8x_hs/info.json | 2 ++ keyboards/lucid/kbd8x_hs/rules.mk | 6 ------ keyboards/lucid/phantom_hs/info.json | 2 ++ keyboards/lucid/phantom_hs/rules.mk | 6 ------ keyboards/lucid/phantom_solder/info.json | 2 ++ keyboards/lucid/phantom_solder/rules.mk | 6 ------ keyboards/lucid/scarlet/info.json | 2 ++ keyboards/lucid/scarlet/rules.mk | 6 ------ keyboards/lw67/info.json | 2 ++ keyboards/lw67/rules.mk | 6 ------ keyboards/lyso1/lck75/info.json | 2 ++ keyboards/lyso1/lck75/rules.mk | 6 ------ keyboards/lyso1/lefishe/info.json | 2 ++ keyboards/lyso1/lefishe/rules.mk | 6 ------ keyboards/lz/erghost/info.json | 2 ++ keyboards/lz/erghost/rules.mk | 6 ------ keyboards/m10a/info.json | 2 ++ keyboards/m10a/rules.mk | 6 ------ keyboards/machine_industries/m4_a/info.json | 2 ++ keyboards/machine_industries/m4_a/rules.mk | 6 ------ keyboards/machkeyboards/mach3/info.json | 2 ++ keyboards/machkeyboards/mach3/rules.mk | 6 ------ keyboards/macro1/info.json | 2 ++ keyboards/macro1/rules.mk | 6 ------ keyboards/macro3/info.json | 2 ++ keyboards/macro3/rules.mk | 6 ------ keyboards/majistic/info.json | 2 ++ keyboards/majistic/rules.mk | 6 ------ keyboards/makeymakey/info.json | 2 ++ keyboards/makeymakey/rules.mk | 6 ------ keyboards/makrosu/info.json | 2 ++ keyboards/makrosu/rules.mk | 6 ------ keyboards/malevolti/lyra/rev1/info.json | 2 ++ keyboards/malevolti/lyra/rev1/rules.mk | 6 ------ keyboards/malevolti/superlyra/rev1/info.json | 2 ++ keyboards/malevolti/superlyra/rev1/rules.mk | 6 ------ keyboards/manta60/info.json | 2 ++ keyboards/manta60/rules.mk | 6 ------ keyboards/manyboard/macro/info.json | 2 ++ keyboards/manyboard/macro/rules.mk | 6 ------ keyboards/maple_computing/6ball/info.json | 2 ++ keyboards/maple_computing/6ball/rules.mk | 6 ------ keyboards/maple_computing/c39/info.json | 2 ++ keyboards/maple_computing/c39/rules.mk | 6 ------ .../maple_computing/christmas_tree/info.json | 2 ++ .../maple_computing/christmas_tree/rules.mk | 6 ------ keyboards/maple_computing/ivy/rev1/info.json | 2 ++ keyboards/maple_computing/ivy/rules.mk | 6 ------ keyboards/maple_computing/jnao/info.json | 2 ++ keyboards/maple_computing/jnao/rules.mk | 6 ------ .../maple_computing/launchpad/rev1/info.json | 2 ++ keyboards/maple_computing/launchpad/rules.mk | 6 ------ .../lets_split_eh/eh/info.json | 2 ++ .../maple_computing/lets_split_eh/rules.mk | 6 ------ .../maple_computing/minidox/rev1/info.json | 2 ++ keyboards/maple_computing/minidox/rules.mk | 6 ------ keyboards/maple_computing/the_ruler/info.json | 2 ++ keyboards/maple_computing/the_ruler/rules.mk | 6 ------ keyboards/marksard/leftover30/info.json | 2 ++ keyboards/marksard/leftover30/rules.mk | 6 ------ keyboards/marksard/rhymestone/rev1/info.json | 2 ++ keyboards/marksard/rhymestone/rules.mk | 6 ------ .../marksard/treadstone32/lite/info.json | 4 +++- keyboards/marksard/treadstone32/lite/rules.mk | 2 -- .../marksard/treadstone32/rev1/info.json | 4 +++- keyboards/marksard/treadstone32/rev1/rules.mk | 2 -- keyboards/marksard/treadstone32/rules.mk | 3 --- .../marksard/treadstone48/rev1/info.json | 2 ++ .../marksard/treadstone48/rev2/info.json | 2 ++ keyboards/marksard/treadstone48/rules.mk | 6 ------ keyboards/massdrop/thekey/info.json | 2 ++ keyboards/massdrop/thekey/rules.mk | 6 ------ keyboards/massdrop/thekey_v2/info.json | 2 ++ keyboards/massdrop/thekey_v2/rules.mk | 6 ------ .../masterworks/classy_tkl/rev_a/info.json | 2 ++ .../masterworks/classy_tkl/rev_a/rules.mk | 6 ------ keyboards/matchstickworks/southpad/info.json | 2 ++ keyboards/matchstickworks/southpad/rules.mk | 6 ------ keyboards/matrix/cain_re/info.json | 2 ++ keyboards/matrix/cain_re/rules.mk | 6 ------ keyboards/matrix/falcon/info.json | 2 ++ keyboards/matrix/falcon/rules.mk | 6 ------ keyboards/matrix/m12og/rev2/info.json | 2 ++ keyboards/matrix/m12og/rev2/rules.mk | 6 ------ keyboards/matrix/me/info.json | 2 ++ keyboards/matrix/me/rules.mk | 6 ------ keyboards/matthewdias/m3n3van/info.json | 2 ++ keyboards/matthewdias/m3n3van/rules.mk | 6 ------ keyboards/matthewdias/minim/info.json | 2 ++ keyboards/matthewdias/minim/rules.mk | 6 ------ keyboards/matthewdias/model_v/info.json | 2 ++ keyboards/matthewdias/model_v/rules.mk | 6 ------ keyboards/matthewdias/txuu/info.json | 2 ++ keyboards/matthewdias/txuu/rules.mk | 6 ------ keyboards/maxipad/promicro/info.json | 4 ++++ keyboards/maxipad/promicro/rules.mk | 5 ----- keyboards/maxipad/teensy2/info.json | 4 ++++ keyboards/maxipad/teensy2/rules.mk | 5 ----- keyboards/maxr1998/pulse4k/info.json | 2 ++ keyboards/maxr1998/pulse4k/rules.mk | 6 ------ keyboards/mb44/info.json | 2 ++ keyboards/mb44/rules.mk | 6 ------ keyboards/mc_76k/info.json | 2 ++ keyboards/mc_76k/rules.mk | 6 ------ keyboards/mechanickeys/miniashen40/info.json | 2 ++ keyboards/mechanickeys/miniashen40/rules.mk | 6 ------ keyboards/mechanickeys/undead60m/info.json | 2 ++ keyboards/mechanickeys/undead60m/rules.mk | 6 ------ keyboards/mechbrewery/mb65h/info.json | 2 ++ keyboards/mechbrewery/mb65h/rules.mk | 6 ------ keyboards/mechbrewery/mb65s/info.json | 2 ++ keyboards/mechbrewery/mb65s/rules.mk | 6 ------ keyboards/mechkeys/acr60/info.json | 2 ++ keyboards/mechkeys/acr60/rules.mk | 6 ------ keyboards/mechkeys/alu84/info.json | 2 ++ keyboards/mechkeys/alu84/rules.mk | 6 ------ keyboards/mechkeys/espectro/info.json | 2 ++ keyboards/mechkeys/espectro/rules.mk | 6 ------ keyboards/mechkeys/mechmini/v1/info.json | 2 ++ keyboards/mechkeys/mechmini/v1/rules.mk | 6 ------ keyboards/mechkeys/mechmini/v2/info.json | 2 ++ keyboards/mechkeys/mechmini/v2/rules.mk | 6 ------ keyboards/mechkeys/mk60/info.json | 2 ++ keyboards/mechkeys/mk60/rules.mk | 6 ------ keyboards/mechllama/g35/info.json | 2 ++ keyboards/mechllama/g35/rules.mk | 6 ------ keyboards/mechlovin/delphine/info.json | 2 ++ keyboards/mechlovin/delphine/rules.mk | 6 ------ keyboards/mechlovin/foundation/info.json | 2 ++ keyboards/mechlovin/foundation/rules.mk | 7 ------- .../mechlovin/hannah60rgb/rev1/info.json | 3 +++ .../mechlovin/hannah60rgb/rev2/info.json | 3 +++ keyboards/mechlovin/hannah60rgb/rules.mk | 7 ------- keyboards/mechlovin/hannah65/info.json | 5 +++++ keyboards/mechlovin/hannah65/rules.mk | 7 ------- keyboards/mechlovin/hannah910/rev1/info.json | 2 ++ keyboards/mechlovin/hannah910/rev1/rules.mk | 6 ------ keyboards/mechlovin/hannah910/rev2/info.json | 2 ++ keyboards/mechlovin/hannah910/rev2/rules.mk | 6 ------ keyboards/mechlovin/hannah910/rev3/info.json | 2 ++ keyboards/mechlovin/hannah910/rev3/rules.mk | 6 ------ keyboards/mechlovin/hex4b/rev1/info.json | 4 +++- keyboards/mechlovin/hex4b/rev1/rules.mk | 6 ------ keyboards/mechlovin/hex4b/rev2/info.json | 4 +++- keyboards/mechlovin/hex4b/rev2/rules.mk | 6 ------ keyboards/mechlovin/hex6c/info.json | 3 +++ keyboards/mechlovin/hex6c/rules.mk | 7 ------- keyboards/mechlovin/infinity87/rev1/info.json | 5 +++++ keyboards/mechlovin/infinity87/rev1/rules.mk | 7 ------- keyboards/mechlovin/infinity87/rev2/info.json | 2 ++ keyboards/mechlovin/infinity87/rev2/rules.mk | 6 ------ .../mechlovin/infinity87/rgb_rev1/info.json | 3 +++ .../mechlovin/infinity87/rgb_rev1/rules.mk | 7 ------- keyboards/mechlovin/infinity875/info.json | 2 ++ keyboards/mechlovin/infinity875/rules.mk | 6 ------ keyboards/mechlovin/infinity88/info.json | 3 +++ keyboards/mechlovin/infinity88/rules.mk | 7 ------- keyboards/mechlovin/infinityce/info.json | 2 ++ keyboards/mechlovin/infinityce/rules.mk | 6 ------ keyboards/mechlovin/jay60/info.json | 2 ++ keyboards/mechlovin/jay60/rules.mk | 6 ------ keyboards/mechlovin/kanu/info.json | 2 ++ keyboards/mechlovin/kanu/rules.mk | 6 ------ keyboards/mechlovin/kay60/info.json | 2 ++ keyboards/mechlovin/kay60/rules.mk | 6 ------ keyboards/mechlovin/kay65/info.json | 2 ++ keyboards/mechlovin/kay65/rules.mk | 6 ------ keyboards/mechlovin/mechlovin9/rev1/info.json | 5 ++++- keyboards/mechlovin/mechlovin9/rev1/rules.mk | 7 ------- keyboards/mechlovin/mechlovin9/rev2/info.json | 4 +++- keyboards/mechlovin/mechlovin9/rev2/rules.mk | 6 ------ keyboards/mechlovin/olly/bb/info.json | 2 ++ keyboards/mechlovin/olly/bb/rules.mk | 6 ------ keyboards/mechlovin/olly/jf/info.json | 2 ++ keyboards/mechlovin/olly/jf/rules.mk | 6 ------ keyboards/mechlovin/olly/octagon/info.json | 2 ++ keyboards/mechlovin/olly/octagon/rules.mk | 6 ------ keyboards/mechlovin/olly/orion/info.json | 2 ++ keyboards/mechlovin/olly/orion/rules.mk | 7 ------- keyboards/mechlovin/pisces/info.json | 2 ++ keyboards/mechlovin/pisces/rules.mk | 6 ------ keyboards/mechlovin/serratus/info.json | 2 ++ keyboards/mechlovin/serratus/rules.mk | 6 ------ keyboards/mechlovin/th1800/info.json | 2 ++ keyboards/mechlovin/th1800/rules.mk | 6 ------ keyboards/mechlovin/tmkl/info.json | 3 +++ keyboards/mechlovin/tmkl/rules.mk | 7 ------- keyboards/mechlovin/zed60/info.json | 2 ++ keyboards/mechlovin/zed60/rules.mk | 7 ------- keyboards/mechlovin/zed65/info.json | 4 ++++ keyboards/mechlovin/zed65/rules.mk | 7 ------- keyboards/mechstudio/dawn/info.json | 2 ++ keyboards/mechstudio/dawn/rules.mk | 6 ------ keyboards/mechstudio/ud_40_ortho/info.json | 2 ++ keyboards/mechstudio/ud_40_ortho/rules.mk | 6 ------ keyboards/mechwild/bbs/info.json | 3 +++ keyboards/mechwild/bbs/rules.mk | 7 ------- keyboards/mechwild/mercutio/info.json | 2 ++ keyboards/mechwild/mercutio/rules.mk | 6 ------ keyboards/mechwild/mokulua/mirrored/info.json | 2 ++ keyboards/mechwild/mokulua/mirrored/rules.mk | 6 ------ keyboards/mechwild/mokulua/standard/info.json | 2 ++ keyboards/mechwild/mokulua/standard/rules.mk | 6 ------ keyboards/mechwild/murphpad/info.json | 2 ++ keyboards/mechwild/murphpad/rules.mk | 6 ------ keyboards/mechwild/obe/f401/eeprom/rules.mk | 7 ------- keyboards/mechwild/obe/f401/info.json | 5 +++++ keyboards/mechwild/obe/f401/rules.mk | 6 ------ keyboards/mechwild/obe/f411/eeprom/rules.mk | 7 ------- keyboards/mechwild/obe/f411/info.json | 5 +++++ keyboards/mechwild/obe/f411/rules.mk | 6 ------ keyboards/mechwild/puckbuddy/info.json | 3 +++ keyboards/mechwild/puckbuddy/rules.mk | 7 ------- .../mechwild/waka60/f401/eeprom/rules.mk | 7 ------- keyboards/mechwild/waka60/f401/info.json | 5 +++++ keyboards/mechwild/waka60/f401/rules.mk | 6 ------ .../mechwild/waka60/f411/eeprom/rules.mk | 7 ------- keyboards/mechwild/waka60/f411/info.json | 5 +++++ keyboards/mechwild/waka60/f411/rules.mk | 6 ------ keyboards/mehkee96/info.json | 2 ++ keyboards/mehkee96/rules.mk | 6 ------ keyboards/meletrix/zoom65/info.json | 2 ++ keyboards/meletrix/zoom65/rules.mk | 6 ------ keyboards/meletrix/zoom65_lite/info.json | 2 ++ keyboards/meletrix/zoom65_lite/rules.mk | 6 ------ keyboards/meletrix/zoom87/info.json | 2 ++ keyboards/meletrix/zoom87/rules.mk | 6 ------ keyboards/melgeek/mach80/info.json | 2 ++ keyboards/melgeek/mach80/rev1/rules.mk | 6 ------ keyboards/melgeek/mach80/rev2/rules.mk | 6 ------ keyboards/melgeek/mj61/info.json | 3 +++ keyboards/melgeek/mj61/rev1/rules.mk | 7 ------- keyboards/melgeek/mj61/rev2/rules.mk | 7 ------- keyboards/melgeek/mj63/info.json | 3 +++ keyboards/melgeek/mj63/rev1/rules.mk | 7 ------- keyboards/melgeek/mj63/rev2/rules.mk | 7 ------- keyboards/melgeek/mj64/info.json | 3 +++ keyboards/melgeek/mj64/rev1/rules.mk | 7 ------- keyboards/melgeek/mj64/rev2/rules.mk | 7 ------- keyboards/melgeek/mj64/rev3/rules.mk | 7 ------- keyboards/melgeek/mj65/info.json | 3 +++ keyboards/melgeek/mj65/rev3/rules.mk | 7 ------- keyboards/melgeek/mj6xy/info.json | 2 ++ keyboards/melgeek/mj6xy/rev3/rules.mk | 6 ------ keyboards/melgeek/mojo68/info.json | 2 ++ keyboards/melgeek/mojo68/rev1/rules.mk | 6 ------ keyboards/melgeek/mojo75/info.json | 3 +++ keyboards/melgeek/mojo75/rev1/rules.mk | 7 ------- keyboards/melgeek/tegic/info.json | 2 ++ keyboards/melgeek/tegic/rev1/rules.mk | 6 ------ keyboards/melgeek/z70ultra/info.json | 3 +++ keyboards/melgeek/z70ultra/rev1/rules.mk | 7 ------- keyboards/meme/info.json | 2 ++ keyboards/meme/rules.mk | 6 ------ keyboards/meow48/info.json | 2 ++ keyboards/meow48/rules.mk | 6 ------ keyboards/meow65/info.json | 2 ++ keyboards/meow65/rules.mk | 6 ------ keyboards/merge/iso_macro/info.json | 2 ++ keyboards/merge/iso_macro/rules.mk | 6 ------ keyboards/merge/uc1/info.json | 2 ++ keyboards/merge/uc1/rules.mk | 6 ------ keyboards/merge/um70/info.json | 2 ++ keyboards/merge/um70/rules.mk | 6 ------ keyboards/merge/um80/info.json | 2 ++ keyboards/merge/um80/rules.mk | 6 ------ keyboards/merge/uma/info.json | 2 ++ keyboards/merge/uma/rules.mk | 6 ------ keyboards/mesa/mesa_tkl/info.json | 2 ++ keyboards/mesa/mesa_tkl/rules.mk | 6 ------ keyboards/meson/info.json | 2 ++ keyboards/meson/rules.mk | 6 ------ keyboards/metamechs/timberwolf/info.json | 2 ++ keyboards/metamechs/timberwolf/rules.mk | 6 ------ keyboards/mexsistor/ludmila/info.json | 2 ++ keyboards/mexsistor/ludmila/rules.mk | 6 ------ keyboards/mikeneko65/info.json | 2 ++ keyboards/mikeneko65/rules.mk | 6 ------ keyboards/miller/gm862/info.json | 2 ++ keyboards/miller/gm862/rules.mk | 6 ------ keyboards/millipad/info.json | 2 ++ keyboards/millipad/rules.mk | 6 ------ keyboards/mini_elixivy/info.json | 2 ++ keyboards/mini_elixivy/rules.mk | 6 ------ keyboards/mini_ten_key_plus/info.json | 2 ++ keyboards/mini_ten_key_plus/rules.mk | 6 ------ keyboards/miniaxe/info.json | 2 ++ keyboards/miniaxe/rules.mk | 6 ------ keyboards/minimacro5/info.json | 2 ++ keyboards/minimacro5/rules.mk | 6 ------ keyboards/minimon/index_tab/info.json | 2 ++ keyboards/minimon/index_tab/rules.mk | 6 ------ keyboards/mino/hotswap/info.json | 2 ++ keyboards/mino/hotswap/rules.mk | 6 ------ keyboards/mint60/info.json | 2 ++ keyboards/mint60/rules.mk | 6 ------ keyboards/misonoworks/chocolatebar/info.json | 2 ++ keyboards/misonoworks/chocolatebar/rules.mk | 6 ------ keyboards/misonoworks/karina/info.json | 2 ++ keyboards/misonoworks/karina/rules.mk | 6 ------ keyboards/misterknife/knife66/info.json | 2 ++ keyboards/misterknife/knife66/rules.mk | 6 ------ keyboards/misterknife/knife66_iso/info.json | 2 ++ keyboards/misterknife/knife66_iso/rules.mk | 6 ------ keyboards/mitosis/info.json | 2 ++ keyboards/mitosis/rules.mk | 6 ------ keyboards/miuni32/info.json | 2 ++ keyboards/miuni32/rules.mk | 6 ------ keyboards/mixi/info.json | 2 ++ keyboards/mixi/rules.mk | 6 ------ keyboards/ml/gas75/info.json | 2 ++ keyboards/ml/gas75/rules.mk | 6 ------ keyboards/mlego/m48/rev1/info.json | 5 ++++- keyboards/mlego/m48/rev1/rules.mk | 8 ------- keyboards/mlego/m60/rev1/info.json | 5 ++++- keyboards/mlego/m60/rev1/rules.mk | 8 ------- keyboards/mlego/m60_split/rev1/info.json | 5 ++++- keyboards/mlego/m60_split/rev1/rules.mk | 8 ------- keyboards/mlego/m60_split/rev2/info.json | 5 ++++- keyboards/mlego/m60_split/rev2/rules.mk | 7 ------- keyboards/mlego/m65/rev1/info.json | 4 +++- keyboards/mlego/m65/rev1/rules.mk | 6 ------ keyboards/mlego/m65/rev2/info.json | 4 +++- keyboards/mlego/m65/rev2/rules.mk | 6 ------ keyboards/mlego/m65/rev3/info.json | 5 ++++- keyboards/mlego/m65/rev3/rules.mk | 8 ------- keyboards/mlego/m65/rev4/info.json | 5 ++++- keyboards/mlego/m65/rev4/rules.mk | 8 ------- keyboards/mmkzoo65/info.json | 2 ++ keyboards/mmkzoo65/rules.mk | 6 ------ keyboards/mnk1800s/info.json | 2 ++ keyboards/mnk1800s/rules.mk | 6 ------ keyboards/mnk50/info.json | 2 ++ keyboards/mnk50/rules.mk | 6 ------ keyboards/mnk75/info.json | 2 ++ keyboards/mnk75/rules.mk | 6 ------ keyboards/mntre/info.json | 2 ++ keyboards/mntre/rules.mk | 6 ------ keyboards/mode/m65ha_alpha/info.json | 2 ++ keyboards/mode/m65ha_alpha/rules.mk | 7 ------- keyboards/mode/m65hi_alpha/info.json | 2 ++ keyboards/mode/m65hi_alpha/rules.mk | 7 ------- keyboards/mode/m65s/info.json | 2 ++ keyboards/mode/m65s/rules.mk | 7 ------- keyboards/mode/m75h/info.json | 2 ++ keyboards/mode/m75h/rules.mk | 7 ------- keyboards/mode/m75s/info.json | 2 ++ keyboards/mode/m75s/rules.mk | 7 ------- keyboards/mode/m80v1/m80h/info.json | 2 ++ keyboards/mode/m80v1/m80h/rules.mk | 6 ------ keyboards/mode/m80v1/m80s/info.json | 2 ++ keyboards/mode/m80v1/m80s/rules.mk | 6 ------ keyboards/mode/m80v2/m80v2h/info.json | 2 ++ keyboards/mode/m80v2/m80v2h/rules.mk | 6 ------ keyboards/mode/m80v2/m80v2s/info.json | 2 ++ keyboards/mode/m80v2/m80v2s/rules.mk | 6 ------ keyboards/mokey/ginkgo65/info.json | 2 ++ keyboards/mokey/ginkgo65/rules.mk | 6 ------ keyboards/mokey/ginkgo65hot/info.json | 2 ++ keyboards/mokey/ginkgo65hot/rules.mk | 6 ------ keyboards/mokey/ibis80/info.json | 2 ++ keyboards/mokey/ibis80/rules.mk | 6 ------ keyboards/mokey/mokey63/info.json | 2 ++ keyboards/mokey/mokey63/rules.mk | 6 ------ keyboards/mokey/mokey64/info.json | 2 ++ keyboards/mokey/mokey64/rules.mk | 6 ------ keyboards/mokey/xox70/info.json | 2 ++ keyboards/mokey/xox70/rules.mk | 6 ------ keyboards/mokey/xox70hot/info.json | 2 ++ keyboards/mokey/xox70hot/rules.mk | 6 ------ keyboards/molecule/info.json | 2 ++ keyboards/molecule/rules.mk | 6 ------ keyboards/momoka_ergo/info.json | 2 ++ keyboards/momoka_ergo/rules.mk | 6 ------ keyboards/momokai/tap_duo/info.json | 2 ++ keyboards/momokai/tap_duo/rules.mk | 6 ------ keyboards/momokai/tap_trio/info.json | 2 ++ keyboards/momokai/tap_trio/rules.mk | 6 ------ keyboards/monarch/info.json | 2 ++ keyboards/monarch/rules.mk | 6 ------ keyboards/monoflex60/info.json | 2 ++ keyboards/monoflex60/rules.mk | 6 ------ keyboards/monstargear/xo87/rgb/info.json | 2 ++ keyboards/monstargear/xo87/rgb/rules.mk | 6 ------ .../monstargear/xo87/solderable/info.json | 2 ++ .../monstargear/xo87/solderable/rules.mk | 6 ------ keyboards/montsinger/rebound/rev1/info.json | 2 ++ keyboards/montsinger/rebound/rev1/rules.mk | 6 ------ keyboards/montsinger/rebound/rev2/info.json | 2 ++ keyboards/montsinger/rebound/rev2/rules.mk | 6 ------ keyboards/montsinger/rebound/rev3/info.json | 2 ++ keyboards/montsinger/rebound/rev3/rules.mk | 6 ------ keyboards/montsinger/rebound/rev4/info.json | 2 ++ keyboards/montsinger/rebound/rev4/rules.mk | 6 ------ keyboards/montsinger/rewind/info.json | 2 ++ keyboards/montsinger/rewind/rules.mk | 6 ------ keyboards/moon/info.json | 2 ++ keyboards/moon/rules.mk | 6 ------ keyboards/moonlander/info.json | 2 ++ keyboards/moonlander/rules.mk | 6 ------ keyboards/morizon/info.json | 2 ++ keyboards/morizon/rules.mk | 6 ------ keyboards/mountainblocks/mb17/info.json | 2 ++ keyboards/mountainblocks/mb17/rules.mk | 6 ------ keyboards/mschwingen/modelm/info.json | 2 ++ keyboards/mschwingen/modelm/rules.mk | 6 ------ keyboards/mss_studio/m63_rgb/info.json | 2 ++ keyboards/mss_studio/m63_rgb/rules.mk | 6 ------ keyboards/mss_studio/m64_rgb/info.json | 2 ++ keyboards/mss_studio/m64_rgb/rules.mk | 6 ------ keyboards/mt/blocked65/info.json | 2 ++ keyboards/mt/blocked65/rules.mk | 6 ------ keyboards/mt/mt40/info.json | 2 ++ keyboards/mt/mt40/rules.mk | 6 ------ keyboards/mt/mt64rgb/info.json | 2 ++ keyboards/mt/mt64rgb/rules.mk | 6 ------ keyboards/mt/mt84/info.json | 2 ++ keyboards/mt/mt84/rules.mk | 6 ------ keyboards/mt/mt980/info.json | 2 ++ keyboards/mt/mt980/rules.mk | 6 ------ keyboards/mt/ncr80/hotswap/info.json | 2 ++ keyboards/mt/ncr80/hotswap/rules.mk | 6 ------ keyboards/mt/ncr80/solder/info.json | 2 ++ keyboards/mt/ncr80/solder/rules.mk | 6 ------ keyboards/mt/split75/info.json | 2 ++ keyboards/mt/split75/rules.mk | 6 ------ keyboards/mtbkeys/mtb60/hotswap/info.json | 2 ++ keyboards/mtbkeys/mtb60/hotswap/rules.mk | 6 ------ keyboards/mtbkeys/mtb60/solder/info.json | 2 ++ keyboards/mtbkeys/mtb60/solder/rules.mk | 6 ------ keyboards/murcielago/info.json | 2 ++ keyboards/murcielago/rev1/rules.mk | 6 ------ keyboards/mwstudio/alicekk/info.json | 4 +++- keyboards/mwstudio/alicekk/rules.mk | 6 ------ keyboards/mwstudio/mw65_black/info.json | 2 ++ keyboards/mwstudio/mw65_black/rules.mk | 6 ------ keyboards/mwstudio/mw65_rgb/info.json | 2 ++ keyboards/mwstudio/mw65_rgb/rules.mk | 6 ------ keyboards/mwstudio/mw75/info.json | 2 ++ keyboards/mwstudio/mw75/rules.mk | 6 ------ keyboards/mwstudio/mw75r2/info.json | 2 ++ keyboards/mwstudio/mw75r2/rules.mk | 6 ------ keyboards/mxss/info.json | 2 ++ keyboards/mxss/rules.mk | 6 ------ keyboards/mysticworks/wyvern/info.json | 2 ++ keyboards/mysticworks/wyvern/rules.mk | 6 ------ keyboards/nack/info.json | 3 +++ keyboards/nack/rules.mk | 7 ------- keyboards/nacly/sodium42/info.json | 2 ++ keyboards/nacly/sodium42/rules.mk | 6 ------ keyboards/nacly/sodium50/info.json | 2 ++ keyboards/nacly/sodium50/rules.mk | 6 ------ keyboards/nacly/sodium62/info.json | 2 ++ keyboards/nacly/sodium62/rules.mk | 6 ------ keyboards/nacly/splitreus62/info.json | 2 ++ keyboards/nacly/splitreus62/rules.mk | 6 ------ keyboards/nacly/ua62/info.json | 2 ++ keyboards/nacly/ua62/rules.mk | 6 ------ keyboards/nasu/info.json | 2 ++ keyboards/nasu/rules.mk | 6 ------ keyboards/ncc1701kb/info.json | 2 ++ keyboards/ncc1701kb/rules.mk | 6 ------ keyboards/neito/info.json | 2 ++ keyboards/neito/rules.mk | 6 ------ keyboards/nek_type_a/info.json | 2 ++ keyboards/nek_type_a/rules.mk | 6 ------ keyboards/nemui/info.json | 2 ++ keyboards/nemui/rules.mk | 6 ------ keyboards/neokeys/g67/element_hs/info.json | 2 ++ keyboards/neokeys/g67/element_hs/rules.mk | 6 ------ keyboards/neokeys/g67/hotswap/info.json | 2 ++ keyboards/neokeys/g67/hotswap/rules.mk | 6 ------ keyboards/neokeys/g67/soldered/info.json | 2 ++ keyboards/neokeys/g67/soldered/rules.mk | 6 ------ keyboards/neopad/rev1/info.json | 2 ++ keyboards/neopad/rev1/rules.mk | 6 ------ keyboards/neson_design/700e/info.json | 2 ++ keyboards/neson_design/700e/rules.mk | 6 ------ keyboards/neson_design/n6/info.json | 2 ++ keyboards/neson_design/n6/rules.mk | 6 ------ keyboards/newgame40/info.json | 2 ++ keyboards/newgame40/rules.mk | 6 ------ keyboards/nibiria/stream15/info.json | 2 ++ keyboards/nibiria/stream15/rules.mk | 6 ------ .../nightingale_studios/hailey/info.json | 2 ++ keyboards/nightingale_studios/hailey/rules.mk | 6 ------ keyboards/nightly_boards/adellein/info.json | 2 ++ keyboards/nightly_boards/adellein/rules.mk | 6 ------ keyboards/nightly_boards/alter/rev1/info.json | 2 ++ keyboards/nightly_boards/alter/rev1/rules.mk | 6 ------ keyboards/nightly_boards/alter_lite/info.json | 2 ++ keyboards/nightly_boards/alter_lite/rules.mk | 6 ------ keyboards/nightly_boards/conde60/info.json | 2 ++ keyboards/nightly_boards/conde60/rules.mk | 6 ------ keyboards/nightly_boards/daily60/info.json | 2 ++ keyboards/nightly_boards/daily60/rules.mk | 6 ------ keyboards/nightly_boards/jisoo/info.json | 2 ++ keyboards/nightly_boards/jisoo/rules.mk | 6 ------ keyboards/nightly_boards/n2/info.json | 2 ++ keyboards/nightly_boards/n2/rules.mk | 6 ------ keyboards/nightly_boards/n40_o/info.json | 2 ++ keyboards/nightly_boards/n40_o/rules.mk | 6 ------ keyboards/nightly_boards/n60_s/info.json | 2 ++ keyboards/nightly_boards/n60_s/rules.mk | 6 ------ keyboards/nightly_boards/n87/info.json | 2 ++ keyboards/nightly_boards/n87/rules.mk | 6 ------ keyboards/nightly_boards/n9/info.json | 2 ++ keyboards/nightly_boards/n9/rules.mk | 6 ------ keyboards/nightly_boards/octopad/info.json | 2 ++ keyboards/nightly_boards/octopad/rules.mk | 6 ------ .../nightly_boards/octopadplus/info.json | 2 ++ keyboards/nightly_boards/octopadplus/rules.mk | 6 ------ keyboards/nightly_boards/paraluman/info.json | 2 ++ keyboards/nightly_boards/paraluman/rules.mk | 6 ------ keyboards/nightly_boards/ph_arisu/info.json | 2 ++ keyboards/nightly_boards/ph_arisu/rules.mk | 6 ------ keyboards/nightmare/info.json | 2 ++ keyboards/nightmare/rules.mk | 6 ------ keyboards/nimrod/info.json | 2 ++ keyboards/nimrod/rules.mk | 6 ------ keyboards/nix_studio/n60_a/info.json | 2 ++ keyboards/nix_studio/n60_a/rules.mk | 6 ------ keyboards/nix_studio/oxalys80/info.json | 2 ++ keyboards/nix_studio/oxalys80/rules.mk | 6 ------ keyboards/nixkeyboards/day_off/info.json | 2 ++ keyboards/nixkeyboards/day_off/rules.mk | 6 ------ .../nopunin10did/jabberwocky/v1/info.json | 2 ++ .../nopunin10did/jabberwocky/v1/rules.mk | 6 ------ .../nopunin10did/jabberwocky/v2/info.json | 2 ++ .../nopunin10did/jabberwocky/v2/rules.mk | 6 ------ .../nopunin10did/kastenwagen1840/info.json | 2 ++ .../nopunin10did/kastenwagen1840/rules.mk | 6 ------ .../nopunin10did/kastenwagen48/info.json | 2 ++ keyboards/nopunin10did/kastenwagen48/rules.mk | 6 ------ .../nopunin10did/railroad/rev0/info.json | 2 ++ keyboards/nopunin10did/railroad/rev0/rules.mk | 6 ------ keyboards/novelkeys/nk1/info.json | 2 ++ keyboards/novelkeys/nk1/rules.mk | 6 ------ keyboards/novelkeys/nk20/info.json | 2 ++ keyboards/novelkeys/nk20/rules.mk | 6 ------ keyboards/novelkeys/nk65/info.json | 3 +++ keyboards/novelkeys/nk65/rules.mk | 7 ------- keyboards/novelkeys/nk65b/info.json | 2 ++ keyboards/novelkeys/nk65b/rules.mk | 6 ------ keyboards/novelkeys/nk87/info.json | 3 +++ keyboards/novelkeys/nk87/rules.mk | 7 ------- keyboards/novelkeys/nk87b/info.json | 2 ++ keyboards/novelkeys/nk87b/rules.mk | 6 ------ keyboards/novelkeys/novelpad/info.json | 2 ++ keyboards/novelkeys/novelpad/rules.mk | 6 ------ keyboards/noxary/220/info.json | 2 ++ keyboards/noxary/220/rules.mk | 6 ------ keyboards/noxary/260/info.json | 2 ++ keyboards/noxary/260/rules.mk | 6 ------ keyboards/noxary/268/info.json | 2 ++ keyboards/noxary/268/rules.mk | 6 ------ keyboards/noxary/268_2/info.json | 2 ++ keyboards/noxary/268_2/rules.mk | 6 ------ keyboards/noxary/268_2_rgb/info.json | 2 ++ keyboards/noxary/268_2_rgb/rules.mk | 6 ------ keyboards/noxary/280/info.json | 2 ++ keyboards/noxary/280/rules.mk | 6 ------ keyboards/noxary/378/info.json | 2 ++ keyboards/noxary/378/rules.mk | 6 ------ keyboards/noxary/valhalla/info.json | 2 ++ keyboards/noxary/valhalla/rules.mk | 6 ------ keyboards/noxary/vulcan/info.json | 2 ++ keyboards/noxary/vulcan/rules.mk | 6 ------ keyboards/noxary/x268/info.json | 2 ++ keyboards/noxary/x268/rules.mk | 6 ------ keyboards/np12/info.json | 2 ++ keyboards/np12/rules.mk | 6 ------ keyboards/nullbitsco/nibble/info.json | 2 ++ keyboards/nullbitsco/nibble/rules.mk | 6 ------ keyboards/nullbitsco/scramble/v1/info.json | 4 ++++ keyboards/nullbitsco/scramble/v1/rules.mk | 8 ------- keyboards/nullbitsco/scramble/v2/info.json | 4 ++++ keyboards/nullbitsco/scramble/v2/rules.mk | 8 ------- keyboards/nullbitsco/tidbit/info.json | 2 ++ keyboards/nullbitsco/tidbit/rules.mk | 6 ------ keyboards/numatreus/info.json | 2 ++ keyboards/numatreus/rules.mk | 6 ------ keyboards/nyhxis/nfr_70/info.json | 2 ++ keyboards/nyhxis/nfr_70/rules.mk | 7 ------- keyboards/obosob/arch_36/info.json | 2 ++ keyboards/obosob/arch_36/rules.mk | 6 ------ .../obosob/steal_this_keyboard/info.json | 2 ++ keyboards/obosob/steal_this_keyboard/rules.mk | 6 ------ keyboards/ocean/addon/info.json | 2 ++ keyboards/ocean/addon/rules.mk | 6 ------ keyboards/ocean/gin_v2/info.json | 2 ++ keyboards/ocean/gin_v2/rules.mk | 6 ------ keyboards/ocean/slamz/info.json | 2 ++ keyboards/ocean/slamz/rules.mk | 6 ------ keyboards/ocean/stealth/info.json | 2 ++ keyboards/ocean/stealth/rules.mk | 6 ------ keyboards/ocean/sus/info.json | 2 ++ keyboards/ocean/sus/rules.mk | 6 ------ keyboards/ocean/wang_ergo/info.json | 2 ++ keyboards/ocean/wang_ergo/rules.mk | 6 ------ keyboards/ocean/wang_v2/info.json | 2 ++ keyboards/ocean/wang_v2/rules.mk | 6 ------ keyboards/ocean/yuri/info.json | 2 ++ keyboards/ocean/yuri/rules.mk | 6 ------ keyboards/oddball/info.json | 1 + keyboards/oddball/rules.mk | 3 --- keyboards/oddball/v1/info.json | 3 +++ keyboards/oddball/v1/rules.mk | 2 -- keyboards/oddball/v2/info.json | 3 +++ keyboards/oddball/v2/rules.mk | 2 -- keyboards/oddball/v2_1/info.json | 3 +++ keyboards/oddball/v2_1/rules.mk | 2 -- keyboards/oddforge/vea/info.json | 2 ++ keyboards/oddforge/vea/rules.mk | 6 ------ keyboards/odelia/info.json | 2 ++ keyboards/odelia/rules.mk | 6 ------ keyboards/ogre/ergo_single/info.json | 2 ++ keyboards/ogre/ergo_single/rules.mk | 6 ------ keyboards/ogre/ergo_split/info.json | 2 ++ keyboards/ogre/ergo_split/rules.mk | 6 ------ keyboards/ok60/info.json | 2 ++ keyboards/ok60/rules.mk | 6 ------ keyboards/om60/info.json | 2 ++ keyboards/om60/rules.mk | 6 ------ keyboards/omkbd/ergodash/info.json | 4 ++++ keyboards/omkbd/ergodash/rules.mk | 6 ------ keyboards/omkbd/runner3680/info.json | 4 ++++ keyboards/omkbd/runner3680/rules.mk | 6 ------ keyboards/omnikeyish/info.json | 2 ++ keyboards/omnikeyish/rules.mk | 6 ------ keyboards/onekeyco/dango40/info.json | 2 ++ keyboards/onekeyco/dango40/rules.mk | 6 ------ keyboards/opendeck/32/rev1/info.json | 4 ++++ keyboards/opendeck/32/rev1/rules.mk | 6 ------ keyboards/orange75/info.json | 2 ++ keyboards/orange75/rules.mk | 6 ------ keyboards/org60/info.json | 2 ++ keyboards/org60/rules.mk | 6 ------ keyboards/ortho5by12/info.json | 2 ++ keyboards/ortho5by12/rules.mk | 6 ------ keyboards/orthocode/info.json | 2 ++ keyboards/orthocode/rules.mk | 6 ------ keyboards/orthodox/rev1/info.json | 2 ++ keyboards/orthodox/rev1/rules.mk | 3 --- keyboards/orthodox/rev3/info.json | 2 ++ keyboards/orthodox/rev3/rules.mk | 3 --- keyboards/orthodox/rev3_teensy/info.json | 2 ++ keyboards/orthodox/rev3_teensy/rules.mk | 3 --- keyboards/orthodox/rules.mk | 3 --- keyboards/owlab/jelly_epoch/hotswap/info.json | 2 ++ keyboards/owlab/jelly_epoch/hotswap/rules.mk | 6 ------ .../owlab/jelly_epoch/soldered/info.json | 2 ++ keyboards/owlab/jelly_epoch/soldered/rules.mk | 6 ------ keyboards/owlab/spring/info.json | 2 ++ keyboards/owlab/spring/rules.mk | 6 ------ keyboards/owlab/suit80/ansi/info.json | 2 ++ keyboards/owlab/suit80/ansi/rules.mk | 6 ------ keyboards/owlab/suit80/iso/info.json | 2 ++ keyboards/owlab/suit80/iso/rules.mk | 6 ------ keyboards/owlab/voice65/hotswap/info.json | 2 ++ keyboards/owlab/voice65/hotswap/rules.mk | 6 ------ keyboards/owlab/voice65/soldered/info.json | 2 ++ keyboards/owlab/voice65/soldered/rules.mk | 6 ------ keyboards/p3d/glitch/info.json | 2 ++ keyboards/p3d/glitch/rules.mk | 6 ------ keyboards/pabile/p18/info.json | 2 ++ keyboards/pabile/p18/rules.mk | 6 ------ keyboards/pabile/p20/ver1/info.json | 4 +++- keyboards/pabile/p20/ver1/rules.mk | 6 ------ keyboards/pabile/p20/ver2/info.json | 4 +++- keyboards/pabile/p20/ver2/rules.mk | 6 ------ keyboards/pabile/p40/info.json | 2 ++ keyboards/pabile/p40/rules.mk | 6 ------ keyboards/pabile/p40_ortho/info.json | 2 ++ keyboards/pabile/p40_ortho/rules.mk | 6 ------ keyboards/pabile/p42/info.json | 2 ++ keyboards/pabile/p42/rules.mk | 6 ------ keyboards/palette1202/info.json | 2 ++ keyboards/palette1202/rules.mk | 6 ------ keyboards/panc40/info.json | 2 ++ keyboards/panc40/rules.mk | 6 ------ keyboards/panc60/info.json | 2 ++ keyboards/panc60/rules.mk | 6 ------ .../papercranekeyboards/gerald65/info.json | 2 ++ .../papercranekeyboards/gerald65/rules.mk | 6 ------ keyboards/paprikman/albacore/info.json | 2 ++ keyboards/paprikman/albacore/rules.mk | 6 ------ .../parallel/parallel_65/hotswap/info.json | 2 ++ .../parallel/parallel_65/hotswap/rules.mk | 6 ------ .../parallel/parallel_65/soldered/info.json | 2 ++ .../parallel/parallel_65/soldered/rules.mk | 6 ------ keyboards/pdxkbc/info.json | 2 ++ keyboards/pdxkbc/rules.mk | 6 ------ keyboards/pearl/info.json | 2 ++ keyboards/pearl/rules.mk | 6 ------ keyboards/pearlboards/atlas/info.json | 2 ++ keyboards/pearlboards/atlas/rules.mk | 6 ------ keyboards/pearlboards/pandora/info.json | 2 ++ keyboards/pearlboards/pandora/rules.mk | 6 ------ keyboards/pearlboards/pearl/info.json | 2 ++ keyboards/pearlboards/pearl/rules.mk | 6 ------ keyboards/pearlboards/zeus/info.json | 2 ++ keyboards/pearlboards/zeus/rules.mk | 6 ------ keyboards/pearlboards/zeuspad/info.json | 2 ++ keyboards/pearlboards/zeuspad/rules.mk | 6 ------ keyboards/peej/lumberjack/info.json | 2 ++ keyboards/peej/lumberjack/rules.mk | 6 ------ keyboards/peej/rosaline/ortho/info.json | 2 ++ keyboards/peej/rosaline/ortho/rules.mk | 6 ------ keyboards/peej/rosaline/staggered/info.json | 2 ++ keyboards/peej/rosaline/staggered/rules.mk | 6 ------ keyboards/peej/tripel/info.json | 2 ++ keyboards/peej/tripel/rules.mk | 6 ------ keyboards/pegasus/info.json | 2 ++ keyboards/pegasus/rules.mk | 6 ------ keyboards/peranekofactory/tone/rev1/info.json | 2 ++ keyboards/peranekofactory/tone/rev1/rules.mk | 6 ------ keyboards/peranekofactory/tone/rev2/info.json | 2 ++ keyboards/peranekofactory/tone/rev2/rules.mk | 6 ------ keyboards/percent/booster/info.json | 2 ++ keyboards/percent/booster/rules.mk | 6 ------ keyboards/percent/canoe/info.json | 2 ++ keyboards/percent/canoe/rules.mk | 6 ------ keyboards/percent/canoe_gen2/info.json | 2 ++ keyboards/percent/canoe_gen2/rules.mk | 6 ------ keyboards/percent/skog/info.json | 2 ++ keyboards/percent/skog/rules.mk | 6 ------ keyboards/percent/skog_lite/info.json | 2 ++ keyboards/percent/skog_lite/rules.mk | 6 ------ keyboards/phantom/info.json | 2 ++ keyboards/phantom/rules.mk | 6 ------ .../phase_studio/titan65/hotswap/info.json | 2 ++ .../phase_studio/titan65/hotswap/rules.mk | 6 ------ .../phase_studio/titan65/soldered/info.json | 2 ++ .../phase_studio/titan65/soldered/rules.mk | 6 ------ keyboards/phoenix/info.json | 3 +++ keyboards/phoenix/rules.mk | 7 ------- keyboards/phrygian/ph100/info.json | 2 ++ keyboards/phrygian/ph100/rules.mk | 6 ------ keyboards/pico/65keys/info.json | 2 ++ keyboards/pico/70keys/info.json | 2 ++ keyboards/pico/rules.mk | 6 ------ .../picolab/frusta_fundamental/info.json | 2 ++ keyboards/picolab/frusta_fundamental/rules.mk | 6 ------ keyboards/pierce/info.json | 2 ++ keyboards/pierce/rules.mk | 6 ------ keyboards/pimentoso/paddino02/rev1/info.json | 2 ++ keyboards/pimentoso/paddino02/rev1/rules.mk | 6 ------ .../pimentoso/paddino02/rev2/left/info.json | 2 ++ .../pimentoso/paddino02/rev2/left/rules.mk | 6 ------ .../pimentoso/paddino02/rev2/right/info.json | 2 ++ .../pimentoso/paddino02/rev2/right/rules.mk | 6 ------ keyboards/pimentoso/touhoupad/info.json | 2 ++ keyboards/pimentoso/touhoupad/rules.mk | 6 ------ keyboards/pinky/3/info.json | 2 ++ keyboards/pinky/4/info.json | 2 ++ keyboards/pinky/rules.mk | 6 ------ keyboards/pisces/info.json | 2 ++ keyboards/pisces/rules.mk | 6 ------ keyboards/pixelspace/capsule65i/info.json | 2 ++ keyboards/pixelspace/capsule65i/rules.mk | 6 ------ keyboards/pizzakeyboards/pizza65/info.json | 2 ++ keyboards/pizzakeyboards/pizza65/rules.mk | 6 ------ keyboards/pjb/eros/info.json | 2 ++ keyboards/pjb/eros/rules.mk | 6 ------ keyboards/pkb65/info.json | 2 ++ keyboards/pkb65/rules.mk | 6 ------ keyboards/planck/ez/info.json | 2 ++ keyboards/planck/ez/rules.mk | 6 ------ keyboards/planck/light/info.json | 2 ++ keyboards/planck/light/rules.mk | 6 ------ keyboards/planck/rev1/info.json | 2 ++ keyboards/planck/rev1/rules.mk | 6 ------ keyboards/planck/rev2/info.json | 2 ++ keyboards/planck/rev2/rules.mk | 6 ------ keyboards/planck/rev3/info.json | 2 ++ keyboards/planck/rev3/rules.mk | 6 ------ keyboards/planck/rev4/info.json | 2 ++ keyboards/planck/rev4/rules.mk | 6 ------ keyboards/planck/rev5/info.json | 2 ++ keyboards/planck/rev5/rules.mk | 6 ------ keyboards/planck/rev6/info.json | 3 +++ keyboards/planck/rev6/rules.mk | 7 ------- keyboards/planck/rev6_drop/info.json | 2 ++ keyboards/planck/rev6_drop/rules.mk | 6 ------ keyboards/planck/thk/info.json | 2 ++ keyboards/planck/thk/rules.mk | 21 ------------------- keyboards/playkbtw/ca66/info.json | 2 ++ keyboards/playkbtw/ca66/rules.mk | 6 ------ keyboards/playkbtw/helen80/info.json | 2 ++ keyboards/playkbtw/helen80/rules.mk | 6 ------ keyboards/playkbtw/pk60/info.json | 2 ++ keyboards/playkbtw/pk60/rules.mk | 6 ------ keyboards/playkbtw/pk64rgb/info.json | 2 ++ keyboards/playkbtw/pk64rgb/rules.mk | 6 ------ keyboards/ploopyco/mouse/info.json | 2 ++ keyboards/ploopyco/mouse/rules.mk | 6 ------ keyboards/ploopyco/trackball/rev1/info.json | 4 ++++ keyboards/ploopyco/trackball/rev1/rules.mk | 2 -- .../ploopyco/trackball/rev1_005/info.json | 4 ++++ .../ploopyco/trackball/rev1_005/rules.mk | 2 -- keyboards/ploopyco/trackball/rules.mk | 3 --- keyboards/ploopyco/trackball_mini/info.json | 2 ++ keyboards/ploopyco/trackball_mini/rules.mk | 6 ------ keyboards/ploopyco/trackball_nano/info.json | 2 ++ keyboards/ploopyco/trackball_nano/rules.mk | 6 ------ keyboards/pluckey/info.json | 2 ++ keyboards/pluckey/rules.mk | 6 ------ keyboards/plume/plume65/info.json | 2 ++ keyboards/plume/plume65/rules.mk | 6 ------ keyboards/plut0nium/0x3e/info.json | 2 ++ keyboards/plut0nium/0x3e/rules.mk | 6 ------ keyboards/plx/info.json | 2 ++ keyboards/plx/rules.mk | 6 ------ keyboards/plywrks/ahgase/info.json | 2 ++ keyboards/plywrks/ahgase/rules.mk | 6 ------ keyboards/plywrks/lune/info.json | 2 ++ keyboards/plywrks/lune/rules.mk | 6 ------ keyboards/pohjolaworks/louhi/info.json | 2 ++ keyboards/pohjolaworks/louhi/rules.mk | 6 ------ keyboards/poker87c/info.json | 2 ++ keyboards/poker87c/rules.mk | 6 ------ keyboards/poker87d/info.json | 2 ++ keyboards/poker87d/rules.mk | 6 ------ keyboards/polilla/info.json | 2 ++ keyboards/polilla/rev1/rules.mk | 6 ------ keyboards/polycarbdiet/s20/info.json | 2 ++ keyboards/polycarbdiet/s20/rules.mk | 6 ------ keyboards/pom_keyboards/tnln95/info.json | 2 ++ keyboards/pom_keyboards/tnln95/rules.mk | 6 ------ keyboards/portal_66/hotswap/info.json | 2 ++ keyboards/portal_66/hotswap/rules.mk | 6 ------ keyboards/portal_66/soldered/info.json | 2 ++ keyboards/portal_66/soldered/rules.mk | 6 ------ keyboards/pos78/info.json | 2 ++ keyboards/pos78/rules.mk | 6 ------ keyboards/preonic/rev1/info.json | 2 ++ keyboards/preonic/rev1/rules.mk | 6 ------ keyboards/preonic/rev2/info.json | 2 ++ keyboards/preonic/rev2/rules.mk | 6 ------ keyboards/preonic/rev3/info.json | 3 +++ keyboards/preonic/rev3/rules.mk | 7 ------- keyboards/preonic/rev3_drop/info.json | 2 ++ keyboards/preonic/rev3_drop/rules.mk | 6 ------ keyboards/primekb/meridian/info.json | 2 ++ keyboards/primekb/meridian/rules.mk | 6 ------ keyboards/primekb/meridian_rgb/info.json | 2 ++ keyboards/primekb/meridian_rgb/rules.mk | 6 ------ keyboards/primekb/prime_e/info.json | 2 ++ keyboards/primekb/prime_e/rules.mk | 6 ------ keyboards/primekb/prime_l/info.json | 2 ++ keyboards/primekb/prime_l/rules.mk | 6 ------ keyboards/primekb/prime_m/info.json | 2 ++ keyboards/primekb/prime_m/rules.mk | 6 ------ keyboards/primekb/prime_o/info.json | 2 ++ keyboards/primekb/prime_o/rules.mk | 6 ------ keyboards/primekb/prime_r/info.json | 2 ++ keyboards/primekb/prime_r/rules.mk | 6 ------ keyboards/program_yoink/ortho/info.json | 2 ++ keyboards/program_yoink/rules.mk | 6 ------ keyboards/program_yoink/staggered/info.json | 2 ++ keyboards/projectcain/relic/info.json | 2 ++ keyboards/projectcain/relic/rules.mk | 6 ------ keyboards/projectcain/vault35/info.json | 2 ++ keyboards/projectcain/vault35/rules.mk | 6 ------ keyboards/projectcain/vault45/info.json | 2 ++ keyboards/projectcain/vault45/rules.mk | 6 ------ keyboards/projectkb/alice/info.json | 2 ++ keyboards/projectkb/alice/rev1/rules.mk | 6 ------ keyboards/projectkb/alice/rev2/rules.mk | 6 ------ keyboards/projectkb/signature65/info.json | 2 ++ keyboards/projectkb/signature65/rules.mk | 6 ------ keyboards/projectkb/signature87/info.json | 2 ++ keyboards/projectkb/signature87/rules.mk | 6 ------ keyboards/prototypist/allison/info.json | 2 ++ keyboards/prototypist/allison/rules.mk | 6 ------ .../prototypist/allison_numpad/info.json | 2 ++ keyboards/prototypist/allison_numpad/rules.mk | 6 ------ keyboards/prototypist/j01/info.json | 2 ++ keyboards/prototypist/j01/rules.mk | 6 ------ keyboards/protozoa/cassini/info.json | 2 ++ keyboards/protozoa/cassini/rules.mk | 6 ------ keyboards/protozoa/p01/info.json | 2 ++ keyboards/protozoa/p01/rules.mk | 6 ------ keyboards/psuieee/pluto12/info.json | 2 ++ keyboards/psuieee/pluto12/rules.mk | 6 ------ keyboards/pteron36/info.json | 2 ++ keyboards/pteron36/rules.mk | 6 ------ keyboards/puck/info.json | 2 ++ keyboards/puck/rules.mk | 6 ------ keyboards/punk75/info.json | 2 ++ keyboards/punk75/rules.mk | 6 ------ keyboards/q4z/info.json | 2 ++ keyboards/q4z/rules.mk | 6 ------ keyboards/qpockets/eggman/info.json | 2 ++ keyboards/qpockets/eggman/rules.mk | 6 ------ keyboards/qpockets/space_space/rev1/info.json | 2 ++ keyboards/qpockets/space_space/rev1/rules.mk | 6 ------ keyboards/qpockets/space_space/rev2/info.json | 2 ++ keyboards/qpockets/space_space/rev2/rules.mk | 6 ------ keyboards/qpockets/wanten/info.json | 2 ++ keyboards/qpockets/wanten/rules.mk | 6 ------ keyboards/quad_h/lb75/info.json | 2 ++ keyboards/quad_h/lb75/rules.mk | 6 ------ keyboards/quantrik/kyuu/info.json | 2 ++ keyboards/quantrik/kyuu/rules.mk | 6 ------ keyboards/quarkeys/z60/hotswap/info.json | 2 ++ keyboards/quarkeys/z60/hotswap/rules.mk | 6 ------ keyboards/quarkeys/z60/solder/info.json | 2 ++ keyboards/quarkeys/z60/solder/rules.mk | 6 ------ keyboards/qvex/lynepad/info.json | 2 ++ keyboards/qvex/lynepad/rules.mk | 6 ------ keyboards/qwertlekeys/calice/info.json | 2 ++ keyboards/qwertlekeys/calice/rules.mk | 6 ------ keyboards/qwertykeys/qk65/hotswap/info.json | 2 ++ keyboards/qwertykeys/qk65/hotswap/rules.mk | 6 ------ keyboards/qwertykeys/qk65/solder/info.json | 2 ++ keyboards/qwertykeys/qk65/solder/rules.mk | 6 ------ keyboards/rabbit/rabbit68/info.json | 2 ++ keyboards/rabbit/rabbit68/rules.mk | 6 ------ keyboards/rad/info.json | 2 ++ keyboards/rad/rules.mk | 6 ------ keyboards/rainkeebs/delilah/info.json | 2 ++ keyboards/rainkeebs/delilah/rules.mk | 6 ------ keyboards/rainkeebs/rainkeeb/info.json | 2 ++ keyboards/rainkeebs/rainkeeb/rules.mk | 6 ------ keyboards/rainkeebs/yasui/info.json | 2 ++ keyboards/rainkeebs/yasui/rules.mk | 6 ------ keyboards/ramonimbao/aelith/info.json | 2 ++ keyboards/ramonimbao/aelith/rules.mk | 6 ------ keyboards/ramonimbao/chevron/info.json | 2 ++ keyboards/ramonimbao/chevron/rules.mk | 6 ------ .../ramonimbao/herringbone/pro/info.json | 2 ++ keyboards/ramonimbao/herringbone/pro/rules.mk | 6 ------ keyboards/ramonimbao/herringbone/v1/info.json | 2 ++ keyboards/ramonimbao/herringbone/v1/rules.mk | 6 ------ keyboards/ramonimbao/mona/v1/info.json | 2 ++ keyboards/ramonimbao/mona/v1/rules.mk | 6 ------ keyboards/ramonimbao/mona/v1_1/info.json | 2 ++ keyboards/ramonimbao/mona/v1_1/rules.mk | 6 ------ keyboards/ramonimbao/mona/v32a/info.json | 2 ++ keyboards/ramonimbao/mona/v32a/rules.mk | 6 ------ keyboards/ramonimbao/squishy65/info.json | 2 ++ keyboards/ramonimbao/squishy65/rules.mk | 6 ------ keyboards/ramonimbao/squishyfrl/info.json | 2 ++ keyboards/ramonimbao/squishyfrl/rules.mk | 6 ------ keyboards/ramonimbao/squishytkl/info.json | 2 ++ keyboards/ramonimbao/squishytkl/rules.mk | 6 ------ keyboards/ramonimbao/tkl_ff/info.json | 2 ++ keyboards/ramonimbao/tkl_ff/rules.mk | 6 ------ keyboards/ramonimbao/wete/v1/info.json | 2 ++ keyboards/ramonimbao/wete/v1/rules.mk | 6 ------ keyboards/ramonimbao/wete/v2/info.json | 2 ++ keyboards/ramonimbao/wete/v2/rules.mk | 6 ------ keyboards/rart/rart45/info.json | 2 ++ keyboards/rart/rart45/rules.mk | 6 ------ keyboards/rart/rart4x4/info.json | 2 ++ keyboards/rart/rart4x4/rules.mk | 6 ------ keyboards/rart/rart67/info.json | 2 ++ keyboards/rart/rart67/rules.mk | 6 ------ keyboards/rart/rart67m/info.json | 2 ++ keyboards/rart/rart67m/rules.mk | 6 ------ keyboards/rart/rart75/info.json | 2 ++ keyboards/rart/rart75/rules.mk | 6 ------ keyboards/rart/rart75hs/info.json | 2 ++ keyboards/rart/rart75hs/rules.mk | 6 ------ keyboards/rart/rart75m/info.json | 2 ++ keyboards/rart/rart75m/rules.mk | 6 ------ keyboards/rart/rart80/info.json | 2 ++ keyboards/rart/rart80/rules.mk | 6 ------ keyboards/rart/rartand/info.json | 2 ++ keyboards/rart/rartand/rules.mk | 6 ------ keyboards/rart/rartland/info.json | 2 ++ keyboards/rart/rartland/rules.mk | 6 ------ keyboards/rart/rartlice/info.json | 2 ++ keyboards/rart/rartlice/rules.mk | 6 ------ keyboards/rart/rartlite/info.json | 2 ++ keyboards/rart/rartlite/rules.mk | 6 ------ keyboards/rart/rartpad/info.json | 2 ++ keyboards/rart/rartpad/rules.mk | 6 ------ keyboards/rate/pistachio/info.json | 2 ++ keyboards/rate/pistachio/rev1/rules.mk | 6 ------ keyboards/rate/pistachio/rev2/rules.mk | 6 ------ keyboards/rate/pistachio_mp/info.json | 2 ++ keyboards/rate/pistachio_mp/rules.mk | 6 ------ keyboards/rate/pistachio_pro/info.json | 2 ++ keyboards/rate/pistachio_pro/rules.mk | 6 ------ .../ratio65_hotswap/rev_a/info.json | 2 ++ .../ratio65_hotswap/rev_a/rules.mk | 6 ------ .../ratio65_solder/rev_a/info.json | 2 ++ .../rationalist/ratio65_solder/rev_a/rules.mk | 6 ------ .../recompile_keys/choco60/rev1/info.json | 4 ++++ .../recompile_keys/choco60/rev1/rules.mk | 6 ------ .../recompile_keys/choco60/rev2/info.json | 4 ++++ .../recompile_keys/choco60/rev2/rules.mk | 6 ------ keyboards/recompile_keys/cocoa40/info.json | 2 ++ keyboards/recompile_keys/cocoa40/rules.mk | 6 ------ keyboards/recompile_keys/mio/info.json | 2 ++ keyboards/recompile_keys/mio/rules.mk | 6 ------ .../recompile_keys/nomu30/rev1/info.json | 4 ++++ keyboards/recompile_keys/nomu30/rev1/rules.mk | 6 ------ .../recompile_keys/nomu30/rev2/info.json | 4 ++++ keyboards/recompile_keys/nomu30/rev2/rules.mk | 6 ------ keyboards/rect44/info.json | 2 ++ keyboards/rect44/rules.mk | 6 ------ keyboards/redox/rev1/base/info.json | 4 +++- keyboards/redox/rev1/proton_c/info.json | 5 ++++- keyboards/redox/rev1/proton_c/rules.mk | 5 ----- keyboards/redox/rules.mk | 6 ------ keyboards/redox_media/info.json | 2 ++ keyboards/redox_media/rules.mk | 6 ------ keyboards/redox_w/info.json | 2 ++ keyboards/redox_w/rules.mk | 6 ------ keyboards/redscarf_i/info.json | 2 ++ keyboards/redscarf_i/rules.mk | 6 ------ keyboards/redscarf_iiplus/verb/info.json | 2 ++ keyboards/redscarf_iiplus/verb/rules.mk | 6 ------ keyboards/redscarf_iiplus/verc/info.json | 2 ++ keyboards/redscarf_iiplus/verc/rules.mk | 6 ------ keyboards/redscarf_iiplus/verd/info.json | 2 ++ keyboards/redscarf_iiplus/verd/rules.mk | 6 ------ keyboards/retro_75/info.json | 2 ++ keyboards/retro_75/rules.mk | 6 ------ keyboards/reversestudio/decadepad/info.json | 2 ++ keyboards/reversestudio/decadepad/rules.mk | 6 ------ keyboards/reviung/reviung33/info.json | 2 ++ keyboards/reviung/reviung33/rules.mk | 6 ------ keyboards/reviung/reviung34/info.json | 2 ++ keyboards/reviung/reviung34/rules.mk | 6 ------ keyboards/reviung/reviung39/info.json | 2 ++ keyboards/reviung/reviung39/rules.mk | 6 ------ keyboards/reviung/reviung41/info.json | 2 ++ keyboards/reviung/reviung41/rules.mk | 6 ------ keyboards/reviung/reviung5/info.json | 2 ++ keyboards/reviung/reviung5/rules.mk | 6 ------ keyboards/reviung/reviung53/info.json | 2 ++ keyboards/reviung/reviung53/rules.mk | 6 ------ keyboards/reviung/reviung61/info.json | 2 ++ keyboards/reviung/reviung61/rules.mk | 6 ------ keyboards/rgbkb/mun/rev1/info.json | 2 ++ keyboards/rgbkb/mun/rules.mk | 6 ------ keyboards/rgbkb/pan/rev1/32a/info.json | 4 ++++ keyboards/rgbkb/pan/rev1/32a/rules.mk | 6 ------ keyboards/rgbkb/pan/rev1/proton_c/info.json | 5 +++++ keyboards/rgbkb/pan/rev1/proton_c/rules.mk | 6 ------ keyboards/rgbkb/sol/rev1/info.json | 2 ++ keyboards/rgbkb/sol/rev2/info.json | 2 ++ keyboards/rgbkb/sol/rules.mk | 6 ------ keyboards/rgbkb/sol3/rev1/info.json | 2 ++ keyboards/rgbkb/sol3/rules.mk | 6 ------ keyboards/rgbkb/zen/rev1/info.json | 2 ++ keyboards/rgbkb/zen/rev2/info.json | 2 ++ keyboards/rgbkb/zen/rules.mk | 6 ------ keyboards/rgbkb/zygomorph/rev1/info.json | 2 ++ keyboards/rgbkb/zygomorph/rules.mk | 6 ------ keyboards/ristretto/info.json | 2 ++ keyboards/ristretto/rules.mk | 6 ------ keyboards/rmkeebs/rm_numpad/info.json | 2 ++ keyboards/rmkeebs/rm_numpad/rules.mk | 6 ------ keyboards/rominronin/katana60/rev1/info.json | 2 ++ keyboards/rominronin/katana60/rev1/rules.mk | 6 ------ keyboards/rominronin/katana60/rev2/info.json | 2 ++ keyboards/rominronin/katana60/rev2/rules.mk | 6 ------ keyboards/roseslite/info.json | 2 ++ keyboards/roseslite/rules.mk | 6 ------ keyboards/rotor/info.json | 2 ++ keyboards/rotor/rules.mk | 6 ------ keyboards/rotr/info.json | 2 ++ keyboards/rotr/rules.mk | 6 ------ keyboards/rpiguy9907/southpaw66/info.json | 2 ++ keyboards/rpiguy9907/southpaw66/rules.mk | 6 ------ keyboards/rubi/info.json | 2 ++ keyboards/rubi/rules.mk | 6 ------ keyboards/runes/skjoldr/info.json | 2 ++ keyboards/runes/skjoldr/rules.mk | 6 ------ keyboards/runes/vaengr/info.json | 2 ++ keyboards/runes/vaengr/rules.mk | 6 ------ keyboards/rura66/rev1/info.json | 2 ++ keyboards/rura66/rules.mk | 6 ------ keyboards/ryanbaekr/rb1/info.json | 2 ++ keyboards/ryanbaekr/rb18/info.json | 2 ++ keyboards/ryanbaekr/rb69/info.json | 2 ++ keyboards/ryanbaekr/rb86/info.json | 2 ++ keyboards/ryanskidmore/rskeys100/info.json | 2 ++ keyboards/ryanskidmore/rskeys100/rules.mk | 6 ------ keyboards/ryloo_studio/m0110/info.json | 2 ++ keyboards/ryloo_studio/m0110/rules.mk | 6 ------ keyboards/s_ol/0xc_pad/info.json | 4 +++- keyboards/s_ol/0xc_pad/rules.mk | 6 ------ keyboards/salicylic_acid3/7skb/rev1/info.json | 2 ++ keyboards/salicylic_acid3/7skb/rules.mk | 6 ------ keyboards/salicylic_acid3/7splus/info.json | 2 ++ keyboards/salicylic_acid3/7splus/rules.mk | 6 ------ keyboards/salicylic_acid3/ajisai74/info.json | 2 ++ keyboards/salicylic_acid3/ajisai74/rules.mk | 6 ------ .../salicylic_acid3/ergoarrows/info.json | 2 ++ keyboards/salicylic_acid3/ergoarrows/rules.mk | 6 ------ .../salicylic_acid3/getta25/rev1/info.json | 2 ++ keyboards/salicylic_acid3/getta25/rules.mk | 6 ------ .../salicylic_acid3/jisplit89/rev1/info.json | 2 ++ keyboards/salicylic_acid3/jisplit89/rules.mk | 6 ------ keyboards/salicylic_acid3/nafuda/info.json | 2 ++ keyboards/salicylic_acid3/nafuda/rules.mk | 6 ------ .../salicylic_acid3/naked48/rev1/info.json | 2 ++ keyboards/salicylic_acid3/naked48/rules.mk | 6 ------ .../salicylic_acid3/naked60/rev1/info.json | 2 ++ keyboards/salicylic_acid3/naked60/rules.mk | 6 ------ .../salicylic_acid3/naked64/rev1/info.json | 2 ++ keyboards/salicylic_acid3/naked64/rules.mk | 6 ------ keyboards/salicylic_acid3/nknl7en/info.json | 2 ++ keyboards/salicylic_acid3/nknl7en/rules.mk | 6 ------ keyboards/salicylic_acid3/nknl7jp/info.json | 2 ++ keyboards/salicylic_acid3/nknl7jp/rules.mk | 6 ------ .../salicylic_acid3/setta21/rev1/info.json | 2 ++ keyboards/salicylic_acid3/setta21/rules.mk | 6 ------ keyboards/sam/s80/info.json | 2 ++ keyboards/sam/s80/rules.mk | 6 ------ keyboards/sam/sg81m/info.json | 2 ++ keyboards/sam/sg81m/rules.mk | 6 ------ keyboards/sanctified/dystopia/info.json | 2 ++ keyboards/sanctified/dystopia/rules.mk | 6 ------ keyboards/sandwich/keeb68/info.json | 2 ++ keyboards/sandwich/keeb68/rules.mk | 6 ------ keyboards/satt/comet46/info.json | 2 ++ keyboards/satt/comet46/rules.mk | 6 ------ keyboards/satt/vision/info.json | 2 ++ keyboards/satt/vision/rules.mk | 6 ------ keyboards/sauce/mild/info.json | 2 ++ keyboards/sauce/mild/rules.mk | 6 ------ .../sawnsprojects/amber80/solder/info.json | 2 ++ .../sawnsprojects/amber80/solder/rules.mk | 6 ------ .../krush/krush60/solder/info.json | 2 ++ .../krush/krush60/solder/rules.mk | 6 ------ .../krush/krush65/hotswap/info.json | 2 ++ .../krush/krush65/hotswap/rules.mk | 6 ------ .../krush/krush65/solder/info.json | 2 ++ .../krush/krush65/solder/rules.mk | 6 ------ keyboards/sawnsprojects/satxri6key/info.json | 2 ++ keyboards/sawnsprojects/satxri6key/rules.mk | 6 ------ .../sawnsprojects/vcl65/solder/info.json | 2 ++ keyboards/sawnsprojects/vcl65/solder/rules.mk | 6 ------ keyboards/scatter42/info.json | 2 ++ keyboards/scatter42/rules.mk | 6 ------ keyboards/sck/gtm/info.json | 2 ++ keyboards/sck/gtm/rules.mk | 6 ------ keyboards/sck/m0116b/info.json | 2 ++ keyboards/sck/m0116b/rules.mk | 6 ------ keyboards/sck/neiso/info.json | 2 ++ keyboards/sck/neiso/rules.mk | 6 ------ keyboards/sck/osa/info.json | 2 ++ keyboards/sck/osa/rules.mk | 6 ------ keyboards/sekigon/grs_70ec/info.json | 2 ++ keyboards/sekigon/grs_70ec/rules.mk | 6 ------ keyboards/sendyyeah/75pixels/info.json | 2 ++ keyboards/sendyyeah/75pixels/rules.mk | 6 ------ keyboards/sendyyeah/bevi/info.json | 2 ++ keyboards/sendyyeah/bevi/rules.mk | 6 ------ keyboards/sendyyeah/pix/info.json | 2 ++ keyboards/sendyyeah/pix/rules.mk | 6 ------ keyboards/senselessclay/ck60/info.json | 2 ++ keyboards/senselessclay/ck60/rules.mk | 6 ------ keyboards/senselessclay/ck65/info.json | 2 ++ keyboards/senselessclay/ck65/rules.mk | 6 ------ keyboards/senselessclay/gos65/info.json | 2 ++ keyboards/senselessclay/gos65/rules.mk | 6 ------ keyboards/senselessclay/had60/info.json | 2 ++ keyboards/senselessclay/had60/rules.mk | 6 ------ keyboards/sentraq/number_pad/info.json | 2 ++ keyboards/sentraq/number_pad/rules.mk | 6 ------ keyboards/sentraq/s60_x/default/info.json | 4 +++- keyboards/sentraq/s60_x/default/rules.mk | 6 ------ keyboards/sentraq/s60_x/rgb/info.json | 4 +++- keyboards/sentraq/s60_x/rgb/rules.mk | 6 ------ keyboards/sentraq/s65_plus/info.json | 2 ++ keyboards/sentraq/s65_plus/rules.mk | 6 ------ keyboards/sentraq/s65_x/info.json | 2 ++ keyboards/sentraq/s65_x/rules.mk | 6 ------ .../sergiopoverony/creator_pro/info.json | 2 ++ keyboards/sergiopoverony/creator_pro/rules.mk | 6 ------ keyboards/sets3n/kk980/info.json | 2 ++ keyboards/sets3n/kk980/rules.mk | 6 ------ keyboards/shambles/info.json | 2 ++ keyboards/shambles/rules.mk | 6 ------ keyboards/shapeshifter4060/info.json | 2 ++ keyboards/shapeshifter4060/rules.mk | 6 ------ keyboards/shiro/info.json | 2 ++ keyboards/shiro/rules.mk | 6 ------ keyboards/shk9/info.json | 2 ++ keyboards/shk9/rules.mk | 6 ------ keyboards/sidderskb/majbritt/rev1/info.json | 2 ++ keyboards/sidderskb/majbritt/rev1/rules.mk | 6 ------ keyboards/sidderskb/majbritt/rev2/info.json | 2 ++ keyboards/sidderskb/majbritt/rev2/rules.mk | 6 ------ keyboards/signum/3_0/info.json | 2 ++ keyboards/signum/3_0/rules.mk | 6 ------ keyboards/silverbullet44/info.json | 2 ++ keyboards/silverbullet44/rules.mk | 6 ------ keyboards/singa/info.json | 2 ++ keyboards/singa/rules.mk | 6 ------ keyboards/sirius/uni660/rev1/info.json | 2 ++ keyboards/sirius/uni660/rev1/rules.mk | 6 ------ keyboards/sirius/uni660/rev2/ansi/info.json | 2 ++ keyboards/sirius/uni660/rev2/iso/info.json | 2 ++ keyboards/sirius/uni660/rev2/rules.mk | 6 ------ keyboards/sirius/unigo66/info.json | 2 ++ keyboards/sirius/unigo66/rules.mk | 6 ------ keyboards/sixkeyboard/info.json | 2 ++ keyboards/sixkeyboard/rules.mk | 6 ------ keyboards/skeletn87/hotswap/info.json | 2 ++ keyboards/skeletn87/hotswap/rules.mk | 6 ------ keyboards/skeletn87/soldered/info.json | 2 ++ keyboards/skeletn87/soldered/rules.mk | 6 ------ .../skeletonkbd/skeletonnumpad/info.json | 2 ++ keyboards/skeletonkbd/skeletonnumpad/rules.mk | 6 ------ keyboards/skergo/info.json | 2 ++ keyboards/skergo/rules.mk | 6 ------ .../skippys_custom_pcs/rooboard65/info.json | 2 ++ .../skippys_custom_pcs/rooboard65/rules.mk | 6 ------ keyboards/skippys_custom_pcs/roopad/info.json | 2 ++ keyboards/skippys_custom_pcs/roopad/rules.mk | 6 ------ keyboards/skme/zeno/info.json | 2 ++ keyboards/skme/zeno/rules.mk | 6 ------ keyboards/slz40/info.json | 2 ++ keyboards/slz40/rules.mk | 6 ------ keyboards/smallkeyboard/info.json | 2 ++ keyboards/smallkeyboard/rules.mk | 6 ------ keyboards/smithrune/iron165r2/f072/info.json | 4 ++++ keyboards/smithrune/iron165r2/f072/rules.mk | 6 ------ keyboards/smithrune/iron165r2/f411/info.json | 4 ++++ keyboards/smithrune/iron165r2/f411/rules.mk | 7 ------- keyboards/smithrune/iron180/info.json | 2 ++ keyboards/smithrune/iron180/rules.mk | 6 ------ keyboards/smk60/info.json | 2 ++ keyboards/smk60/rules.mk | 6 ------ keyboards/snampad/info.json | 2 ++ keyboards/snampad/rules.mk | 6 ------ keyboards/sneakbox/aliceclone/info.json | 2 ++ keyboards/sneakbox/aliceclone/rules.mk | 6 ------ keyboards/sneakbox/aliceclonergb/info.json | 2 ++ keyboards/sneakbox/aliceclonergb/rules.mk | 6 ------ keyboards/sneakbox/ava/info.json | 2 ++ keyboards/sneakbox/ava/rules.mk | 6 ------ keyboards/sneakbox/disarray/ortho/info.json | 2 ++ keyboards/sneakbox/disarray/ortho/rules.mk | 6 ------ .../sneakbox/disarray/staggered/info.json | 2 ++ .../sneakbox/disarray/staggered/rules.mk | 6 ------ keyboards/soda/cherish/info.json | 2 ++ keyboards/soda/cherish/rules.mk | 6 ------ keyboards/sofle/keyhive/info.json | 2 ++ keyboards/sofle/keyhive/rules.mk | 6 ------ keyboards/sofle/rev1/info.json | 2 ++ keyboards/sofle/rules.mk | 6 ------ keyboards/soup10/info.json | 2 ++ keyboards/soup10/rules.mk | 6 ------ keyboards/sowbug/68keys/info.json | 2 ++ keyboards/sowbug/68keys/rules.mk | 6 ------ keyboards/sowbug/ansi_tkl/info.json | 2 ++ keyboards/sowbug/ansi_tkl/rules.mk | 6 ------ keyboards/soy20/info.json | 2 ++ keyboards/soy20/rules.mk | 6 ------ keyboards/spaceholdings/nebula12/info.json | 2 ++ keyboards/spaceholdings/nebula12/rules.mk | 7 ------- keyboards/spaceholdings/nebula12b/info.json | 2 ++ keyboards/spaceholdings/nebula12b/rules.mk | 6 ------ keyboards/spaceholdings/nebula68/info.json | 3 +++ keyboards/spaceholdings/nebula68/rules.mk | 7 ------- keyboards/spaceholdings/nebula68b/info.json | 2 ++ keyboards/spaceholdings/nebula68b/rules.mk | 6 ------ keyboards/spaceman/2_milk/info.json | 2 ++ keyboards/spaceman/2_milk/rules.mk | 6 ------ .../spaceman/pancake/rev1/feather/rules.mk | 6 ------ keyboards/spaceman/pancake/rev1/info.json | 2 ++ .../spaceman/pancake/rev1/promicro/rules.mk | 6 ------ keyboards/spaceman/pancake/rev2/info.json | 2 ++ keyboards/spaceman/pancake/rev2/rules.mk | 6 ------ keyboards/spaceman/yun65/info.json | 2 ++ keyboards/spaceman/yun65/rules.mk | 6 ------ keyboards/spacetime/info.json | 2 ++ keyboards/spacetime/rules.mk | 6 ------ keyboards/spacey/info.json | 2 ++ keyboards/spacey/rules.mk | 6 ------ keyboards/sparrow62/info.json | 2 ++ keyboards/sparrow62/rules.mk | 6 ------ keyboards/specskeys/info.json | 2 ++ keyboards/specskeys/rules.mk | 6 ------ keyboards/spiderisland/split78/info.json | 2 ++ keyboards/spiderisland/split78/rules.mk | 6 ------ keyboards/splitish/info.json | 2 ++ keyboards/splitish/rules.mk | 6 ------ keyboards/splitkb/zima/info.json | 2 ++ keyboards/splitkb/zima/rules.mk | 6 ------ keyboards/splitography/info.json | 2 ++ keyboards/splitography/rules.mk | 5 ----- keyboards/splitty/info.json | 2 ++ keyboards/splitty/rules.mk | 6 ------ keyboards/sporewoh/banime40/info.json | 4 +++- keyboards/sporewoh/banime40/rules.mk | 6 ------ keyboards/star75/info.json | 2 ++ keyboards/star75/rules.mk | 6 ------ keyboards/stello65/beta/info.json | 2 ++ keyboards/stello65/beta/rules.mk | 6 ------ keyboards/stello65/hs_rev1/info.json | 2 ++ keyboards/stello65/hs_rev1/rules.mk | 6 ------ keyboards/stello65/sl_rev1/info.json | 2 ++ keyboards/stello65/sl_rev1/rules.mk | 6 ------ .../the_uni/pro_micro/info.json | 4 +++- .../stenokeyboards/the_uni/pro_micro/rules.mk | 6 ------ .../stenokeyboards/the_uni/rp_2040/info.json | 4 +++- .../stenokeyboards/the_uni/rp_2040/rules.mk | 6 ------ .../stenokeyboards/the_uni/usb_c/info.json | 4 +++- .../stenokeyboards/the_uni/usb_c/rules.mk | 6 ------ keyboards/stratos/info.json | 2 ++ keyboards/stratos/rules.mk | 6 ------ keyboards/studiokestra/bourgeau/info.json | 2 ++ keyboards/studiokestra/bourgeau/rules.mk | 6 ------ keyboards/studiokestra/cascade/info.json | 2 ++ keyboards/studiokestra/cascade/rules.mk | 6 ------ keyboards/studiokestra/galatea/rev1/info.json | 2 ++ keyboards/studiokestra/galatea/rev1/rules.mk | 6 ------ keyboards/studiokestra/galatea/rev2/info.json | 2 ++ keyboards/studiokestra/galatea/rev2/rules.mk | 6 ------ keyboards/studiokestra/nascent/info.json | 2 ++ keyboards/studiokestra/nascent/rules.mk | 6 ------ keyboards/studiokestra/nue/info.json | 2 ++ keyboards/studiokestra/nue/rules.mk | 6 ------ keyboards/suavity/ehan/info.json | 2 ++ keyboards/suavity/ehan/rules.mk | 6 ------ keyboards/subatomic/info.json | 2 ++ keyboards/subatomic/rules.mk | 6 ------ keyboards/subrezon/la_nc/info.json | 2 ++ keyboards/subrezon/la_nc/rules.mk | 6 ------ keyboards/superuser/ext/info.json | 2 ++ keyboards/superuser/ext/rules.mk | 6 ------ keyboards/superuser/frl/info.json | 2 ++ keyboards/superuser/frl/rules.mk | 6 ------ keyboards/superuser/tkl/info.json | 2 ++ keyboards/superuser/tkl/rules.mk | 6 ------ keyboards/swiftrax/retropad/info.json | 2 ++ keyboards/swiftrax/retropad/rules.mk | 6 ------ keyboards/switchplate/southpaw_65/info.json | 2 ++ keyboards/switchplate/southpaw_65/rules.mk | 6 ------ .../switchplate/southpaw_fullsize/info.json | 2 ++ .../switchplate/southpaw_fullsize/rules.mk | 6 ------ .../switchplate/switchplate910/info.json | 2 ++ keyboards/switchplate/switchplate910/rules.mk | 6 ------ keyboards/sx60/info.json | 2 ++ keyboards/sx60/rules.mk | 6 ------ keyboards/synapse/info.json | 2 ++ keyboards/synapse/rules.mk | 6 ------ keyboards/system76/launch_1/info.json | 2 ++ keyboards/system76/launch_1/rules.mk | 6 ------ keyboards/tada68/info.json | 2 ++ keyboards/tada68/rules.mk | 6 ------ .../takashicompany/center_enter/info.json | 2 ++ .../takashicompany/center_enter/rules.mk | 6 ------ keyboards/takashicompany/compacx/info.json | 2 ++ keyboards/takashicompany/compacx/rules.mk | 6 ------ keyboards/takashicompany/dogtag/info.json | 2 ++ keyboards/takashicompany/dogtag/rules.mk | 6 ------ keyboards/takashicompany/endzone34/info.json | 2 ++ keyboards/takashicompany/endzone34/rules.mk | 6 ------ keyboards/takashicompany/heavy_left/info.json | 2 ++ keyboards/takashicompany/heavy_left/rules.mk | 6 ------ keyboards/takashicompany/minizone/info.json | 2 ++ keyboards/takashicompany/minizone/rules.mk | 6 ------ keyboards/takashicompany/qoolee/info.json | 2 ++ keyboards/takashicompany/qoolee/rules.mk | 6 ------ keyboards/takashicompany/radialex/info.json | 2 ++ keyboards/takashicompany/radialex/rules.mk | 6 ------ keyboards/takashiski/hecomi/alpha/info.json | 2 ++ keyboards/takashiski/hecomi/alpha/rules.mk | 6 ------ keyboards/takashiski/hecomi/rules.mk | 20 ------------------ keyboards/takashiski/namecard2x4/info.json | 3 ++- keyboards/takashiski/namecard2x4/rules.mk | 6 ------ .../takashiski/otaku_split/rev0/info.json | 2 ++ .../takashiski/otaku_split/rev0/rules.mk | 6 ------ .../takashiski/otaku_split/rev1/info.json | 2 ++ .../takashiski/otaku_split/rev1/rules.mk | 6 ------ keyboards/taleguers/taleguers75/info.json | 2 ++ keyboards/taleguers/taleguers75/rules.mk | 6 ------ keyboards/tanuki/info.json | 2 ++ keyboards/tanuki/rules.mk | 6 ------ keyboards/team0110/p1800fl/info.json | 2 ++ keyboards/team0110/p1800fl/rules.mk | 6 ------ keyboards/technika/info.json | 2 ++ keyboards/technika/rules.mk | 6 ------ keyboards/teleport/numpad/info.json | 2 ++ keyboards/teleport/numpad/rules.mk | 6 ------ keyboards/telophase/info.json | 2 ++ keyboards/telophase/rules.mk | 6 ------ keyboards/tempo_turtle/bradpad/info.json | 2 ++ keyboards/tempo_turtle/bradpad/rules.mk | 6 ------ keyboards/tender/macrowo_pad/info.json | 2 ++ keyboards/tender/macrowo_pad/rules.mk | 6 ------ keyboards/tenki/info.json | 2 ++ keyboards/tenki/rules.mk | 6 ------ keyboards/terrazzo/info.json | 2 ++ keyboards/terrazzo/rules.mk | 6 ------ keyboards/tetris/info.json | 2 ++ keyboards/tetris/rules.mk | 6 ------ keyboards/tg4x/info.json | 2 ++ keyboards/tg4x/rules.mk | 6 ------ keyboards/tgr/910/info.json | 2 ++ keyboards/tgr/910/rules.mk | 6 ------ keyboards/tgr/910ce/info.json | 2 ++ keyboards/tgr/910ce/rules.mk | 6 ------ keyboards/tgr/alice/info.json | 2 ++ keyboards/tgr/alice/rules.mk | 6 ------ keyboards/tgr/jane/v2/info.json | 2 ++ keyboards/tgr/jane/v2/rules.mk | 6 ------ keyboards/tgr/jane/v2ce/info.json | 2 ++ keyboards/tgr/jane/v2ce/rules.mk | 6 ------ keyboards/tgr/tris/info.json | 2 ++ keyboards/tgr/tris/rules.mk | 6 ------ keyboards/the_royal/liminal/info.json | 2 ++ keyboards/the_royal/liminal/rules.mk | 6 ------ keyboards/the_royal/schwann/info.json | 2 ++ keyboards/the_royal/schwann/rules.mk | 6 ------ keyboards/themadnoodle/ncc1701kb/v2/info.json | 2 ++ keyboards/themadnoodle/ncc1701kb/v2/rules.mk | 6 ------ keyboards/themadnoodle/noodlepad/info.json | 2 ++ keyboards/themadnoodle/noodlepad/rules.mk | 6 ------ .../thevankeyboards/bananasplit/info.json | 2 ++ .../thevankeyboards/bananasplit/rules.mk | 6 ------ keyboards/thevankeyboards/caravan/info.json | 2 ++ keyboards/thevankeyboards/caravan/rules.mk | 6 ------ keyboards/thevankeyboards/jetvan/info.json | 2 ++ keyboards/thevankeyboards/jetvan/rules.mk | 6 ------ keyboards/thevankeyboards/minivan/info.json | 2 ++ keyboards/thevankeyboards/minivan/rules.mk | 6 ------ keyboards/thevankeyboards/roadkit/info.json | 2 ++ keyboards/thevankeyboards/roadkit/rules.mk | 6 ------ keyboards/tkc/california/info.json | 2 ++ keyboards/tkc/california/rules.mk | 6 ------ keyboards/tkc/candybar/lefty/info.json | 2 ++ keyboards/tkc/candybar/lefty/rules.mk | 6 ------ keyboards/tkc/candybar/lefty_r3/info.json | 2 ++ keyboards/tkc/candybar/lefty_r3/rules.mk | 6 ------ keyboards/tkc/candybar/righty/info.json | 2 ++ keyboards/tkc/candybar/righty/rules.mk | 6 ------ keyboards/tkc/candybar/righty_r3/info.json | 2 ++ keyboards/tkc/candybar/righty_r3/rules.mk | 6 ------ keyboards/tkc/godspeed75/info.json | 2 ++ keyboards/tkc/godspeed75/rules.mk | 6 ------ keyboards/tkc/m0lly/info.json | 2 ++ keyboards/tkc/m0lly/rules.mk | 6 ------ keyboards/tkc/osav2/info.json | 2 ++ keyboards/tkc/osav2/rules.mk | 6 ------ keyboards/tkc/portico/info.json | 2 ++ keyboards/tkc/portico/rules.mk | 6 ------ keyboards/tkc/portico68v2/info.json | 2 ++ keyboards/tkc/portico68v2/rules.mk | 6 ------ keyboards/tkc/portico75/info.json | 2 ++ keyboards/tkc/portico75/rules.mk | 6 ------ keyboards/tkc/tkc1800/info.json | 2 ++ keyboards/tkc/tkc1800/rules.mk | 6 ------ keyboards/tkc/tkl_ab87/info.json | 2 ++ keyboards/tkc/tkl_ab87/rules.mk | 6 ------ keyboards/tkw/grandiceps/info.json | 3 +++ keyboards/tkw/grandiceps/rules.mk | 7 ------- keyboards/tkw/stoutgat/v1/info.json | 2 ++ keyboards/tkw/stoutgat/v1/rules.mk | 6 ------ keyboards/tkw/stoutgat/v2/f411/info.json | 5 +++++ keyboards/tkw/stoutgat/v2/f411/rules.mk | 6 ------ keyboards/tmo50/info.json | 2 ++ keyboards/tmo50/rules.mk | 6 ------ keyboards/toad/info.json | 2 ++ keyboards/toad/rules.mk | 6 ------ keyboards/tokyokeyboard/alix40/info.json | 2 ++ keyboards/tokyokeyboard/alix40/rules.mk | 6 ------ keyboards/tokyokeyboard/tokyo60/info.json | 2 ++ keyboards/tokyokeyboard/tokyo60/rules.mk | 6 ------ keyboards/tominabox1/adalyn/info.json | 2 ++ keyboards/tominabox1/adalyn/rules.mk | 6 ------ keyboards/tominabox1/bigboy/info.json | 2 ++ keyboards/tominabox1/bigboy/rules.mk | 6 ------ keyboards/tominabox1/le_chiffre/he/info.json | 4 +++- keyboards/tominabox1/le_chiffre/he/rules.mk | 6 ------ .../tominabox1/le_chiffre/rev1/info.json | 4 +++- keyboards/tominabox1/le_chiffre/rev1/rules.mk | 6 ------ .../tominabox1/le_chiffre/rev2/info.json | 4 +++- keyboards/tominabox1/le_chiffre/rev2/rules.mk | 6 ------ .../tominabox1/littlefoot_lx/rev1/info.json | 2 ++ .../tominabox1/littlefoot_lx/rev1/rules.mk | 6 ------ .../tominabox1/littlefoot_lx/rev2/info.json | 2 ++ .../tominabox1/littlefoot_lx/rev2/rules.mk | 6 ------ keyboards/tominabox1/qaz/info.json | 2 ++ keyboards/tominabox1/qaz/rules.mk | 6 ------ .../tominabox1/underscore33/rev1/info.json | 2 ++ .../tominabox1/underscore33/rev1/rules.mk | 6 ------ .../tominabox1/underscore33/rev2/info.json | 2 ++ .../tominabox1/underscore33/rev2/rules.mk | 6 ------ keyboards/torn/info.json | 2 ++ keyboards/torn/rules.mk | 6 ------ keyboards/touchpad/info.json | 2 ++ keyboards/touchpad/rules.mk | 6 ------ keyboards/tr60w/info.json | 2 ++ keyboards/tr60w/rules.mk | 6 ------ keyboards/trashman/ketch/info.json | 2 ++ keyboards/trashman/ketch/rules.mk | 6 ------ keyboards/treasure/type9/info.json | 2 ++ keyboards/treasure/type9/rules.mk | 6 ------ keyboards/treasure/type9s2/info.json | 2 ++ keyboards/treasure/type9s2/rules.mk | 6 ------ .../tronguylabs/m122_3270/blackpill/info.json | 5 ++++- .../tronguylabs/m122_3270/blackpill/rules.mk | 7 ------- .../tronguylabs/m122_3270/bluepill/info.json | 4 +++- .../tronguylabs/m122_3270/bluepill/rules.mk | 7 ------- .../tronguylabs/m122_3270/teensy/info.json | 4 +++- .../tronguylabs/m122_3270/teensy/rules.mk | 6 ------ keyboards/tszaboo/ortho4exent/info.json | 2 ++ keyboards/tszaboo/ortho4exent/rules.mk | 6 ------ keyboards/tunks/ergo33/info.json | 2 ++ keyboards/tunks/ergo33/rules.mk | 6 ------ keyboards/tw40/info.json | 2 ++ keyboards/tw40/rules.mk | 6 ------ keyboards/ubest/vn/info.json | 2 ++ keyboards/ubest/vn/rules.mk | 6 ------ keyboards/uk78/info.json | 2 ++ keyboards/uk78/rules.mk | 6 ------ keyboards/ungodly/launch_pad/info.json | 2 ++ keyboards/ungodly/launch_pad/rules.mk | 6 ------ keyboards/ungodly/nines/info.json | 2 ++ keyboards/ungodly/nines/rules.mk | 6 ------ .../classic_ultracl_post_2013/info.json | 2 ++ .../overnumpad_1xb/rules.mk | 6 ------ .../classic_ultracl_pre_2013/info.json | 2 ++ .../overnumpad_1xb/rules.mk | 6 ------ keyboards/unicomp/pc122/info.json | 2 ++ .../unicomp/pc122/overnumpad_1xb/rules.mk | 6 ------ .../unicomp/spacesaver_m_post_2013/info.json | 2 ++ .../overnumpad_1xb/rules.mk | 6 ------ .../unicomp/spacesaver_m_pre_2013/info.json | 2 ++ .../overnumpad_1xb/rules.mk | 6 ------ keyboards/unikeyboard/diverge3/info.json | 2 ++ keyboards/unikeyboard/diverge3/rules.mk | 6 ------ keyboards/unikeyboard/divergetm2/info.json | 2 ++ keyboards/unikeyboard/divergetm2/rules.mk | 6 ------ keyboards/unikeyboard/felix/info.json | 2 ++ keyboards/unikeyboard/felix/rules.mk | 6 ------ keyboards/unikorn/info.json | 2 ++ keyboards/unikorn/rules.mk | 6 ------ keyboards/unison/v04/info.json | 2 ++ keyboards/unison/v04/rules.mk | 6 ------ keyboards/uranuma/info.json | 2 ++ keyboards/uranuma/rules.mk | 6 ------ keyboards/utd80/info.json | 2 ++ keyboards/utd80/rules.mk | 6 ------ keyboards/uzu42/rev1/info.json | 2 ++ keyboards/uzu42/rules.mk | 6 ------ keyboards/v4n4g0rth0n/v1/info.json | 4 +++- keyboards/v4n4g0rth0n/v1/rules.mk | 6 ------ keyboards/v4n4g0rth0n/v2/info.json | 4 +++- keyboards/v4n4g0rth0n/v2/rules.mk | 6 ------ keyboards/v60_type_r/info.json | 2 ++ keyboards/v60_type_r/rules.mk | 6 ------ keyboards/vagrant_10/info.json | 2 ++ keyboards/vagrant_10/rules.mk | 6 ------ keyboards/vertex/angler2/info.json | 2 ++ keyboards/vertex/angler2/rules.mk | 6 ------ keyboards/vertex/arc60/info.json | 2 ++ keyboards/vertex/arc60/rules.mk | 6 ------ keyboards/viendi8l/info.json | 2 ++ keyboards/viendi8l/rules.mk | 8 ------- keyboards/viktus/at101_bh/info.json | 2 ++ keyboards/viktus/at101_bh/rules.mk | 6 ------ keyboards/viktus/omnikey_bh/info.json | 2 ++ keyboards/viktus/omnikey_bh/rules.mk | 6 ------ keyboards/viktus/smolka/info.json | 2 ++ keyboards/viktus/smolka/rules.mk | 6 ------ keyboards/viktus/sp111/info.json | 2 ++ keyboards/viktus/sp111/rules.mk | 6 ------ keyboards/viktus/sp_mini/info.json | 2 ++ keyboards/viktus/sp_mini/rules.mk | 6 ------ keyboards/viktus/styrka/info.json | 2 ++ keyboards/viktus/styrka/rules.mk | 6 ------ keyboards/viktus/z150_bh/info.json | 2 ++ keyboards/viktus/z150_bh/rules.mk | 6 ------ keyboards/vitamins_included/info.json | 1 + keyboards/vitamins_included/rev1/info.json | 3 ++- keyboards/vitamins_included/rev1/rules.mk | 3 --- keyboards/vitamins_included/rev2/info.json | 3 ++- keyboards/vitamins_included/rev2/rules.mk | 3 --- keyboards/vitamins_included/rules.mk | 3 --- keyboards/w1_at/info.json | 2 ++ keyboards/w1_at/rules.mk | 6 ------ keyboards/waldo/info.json | 2 ++ keyboards/waldo/rules.mk | 6 ------ keyboards/walletburner/cajal/info.json | 2 ++ keyboards/walletburner/cajal/rules.mk | 6 ------ keyboards/walletburner/neuron/info.json | 2 ++ keyboards/walletburner/neuron/rules.mk | 6 ------ keyboards/waterfowl/info.json | 2 ++ keyboards/waterfowl/rules.mk | 6 ------ keyboards/wavtype/foundation/info.json | 2 ++ keyboards/wavtype/foundation/rules.mk | 6 ------ keyboards/wavtype/p01_ultra/info.json | 2 ++ keyboards/wavtype/p01_ultra/rules.mk | 6 ------ keyboards/weirdo/geminate60/info.json | 3 +++ keyboards/weirdo/geminate60/rules.mk | 7 ------- keyboards/weirdo/kelowna/rgb64/info.json | 3 +++ keyboards/weirdo/kelowna/rgb64/rules.mk | 7 ------- keyboards/weirdo/ls_60/info.json | 3 +++ keyboards/weirdo/ls_60/rules.mk | 7 ------- keyboards/weirdo/naiping/np64/info.json | 3 +++ keyboards/weirdo/naiping/np64/rules.mk | 7 ------- keyboards/weirdo/naiping/nphhkb/info.json | 3 +++ keyboards/weirdo/naiping/nphhkb/rules.mk | 7 ------- keyboards/weirdo/naiping/npminila/info.json | 3 +++ keyboards/weirdo/naiping/npminila/rules.mk | 7 ------- keyboards/weirdo/tiger910/info.json | 2 ++ keyboards/weirdo/tiger910/rules.mk | 6 ------ keyboards/wekey/polaris/info.json | 2 ++ keyboards/wekey/polaris/rules.mk | 6 ------ keyboards/wekey/we27/info.json | 2 ++ keyboards/wekey/we27/rules.mk | 6 ------ keyboards/westfoxtrot/aanzee/info.json | 2 ++ keyboards/westfoxtrot/aanzee/rules.mk | 6 ------ keyboards/westfoxtrot/cyclops/info.json | 2 ++ keyboards/westfoxtrot/cyclops/rules.mk | 6 ------ keyboards/westfoxtrot/cypher/rev1/info.json | 2 ++ keyboards/westfoxtrot/cypher/rev1/rules.mk | 6 ------ keyboards/westfoxtrot/cypher/rev5/info.json | 2 ++ keyboards/westfoxtrot/cypher/rev5/rules.mk | 6 ------ keyboards/westfoxtrot/prophet/info.json | 2 ++ keyboards/westfoxtrot/prophet/rules.mk | 6 ------ keyboards/westm/westm68/info.json | 2 ++ keyboards/westm/westm68/rules.mk | 6 ------ keyboards/westm/westm9/info.json | 2 ++ keyboards/westm/westm9/rules.mk | 6 ------ keyboards/westm/westmergo/info.json | 2 ++ keyboards/westm/westmergo/rules.mk | 6 ------ keyboards/whale/sk/v3/info.json | 2 ++ keyboards/whale/sk/v3/rules.mk | 6 ------ .../wilba_tech/rama_works_kara/info.json | 2 ++ keyboards/wilba_tech/rama_works_kara/rules.mk | 6 ------ .../wilba_tech/rama_works_koyu/info.json | 2 ++ keyboards/wilba_tech/rama_works_koyu/rules.mk | 6 ------ .../wilba_tech/rama_works_m10_b/info.json | 2 ++ .../wilba_tech/rama_works_m10_b/rules.mk | 6 ------ .../wilba_tech/rama_works_m10_c/info.json | 2 ++ .../wilba_tech/rama_works_m10_c/rules.mk | 6 ------ .../wilba_tech/rama_works_m50_a/info.json | 2 ++ .../wilba_tech/rama_works_m50_a/rules.mk | 6 ------ .../wilba_tech/rama_works_m50_ax/info.json | 2 ++ .../wilba_tech/rama_works_m50_ax/rules.mk | 6 ------ .../wilba_tech/rama_works_m60_a/info.json | 2 ++ .../wilba_tech/rama_works_m60_a/rules.mk | 6 ------ .../wilba_tech/rama_works_m65_b/info.json | 2 ++ .../wilba_tech/rama_works_m65_b/rules.mk | 6 ------ .../wilba_tech/rama_works_m65_bx/info.json | 2 ++ .../wilba_tech/rama_works_m65_bx/rules.mk | 6 ------ .../wilba_tech/rama_works_m6_a/info.json | 2 ++ keyboards/wilba_tech/rama_works_m6_a/rules.mk | 6 ------ .../wilba_tech/rama_works_m6_b/info.json | 2 ++ keyboards/wilba_tech/rama_works_m6_b/rules.mk | 6 ------ .../wilba_tech/rama_works_u80_a/info.json | 2 ++ .../wilba_tech/rama_works_u80_a/rules.mk | 6 ------ keyboards/wilba_tech/wt60_a/info.json | 2 ++ keyboards/wilba_tech/wt60_a/rules.mk | 6 ------ keyboards/wilba_tech/wt60_b/info.json | 2 ++ keyboards/wilba_tech/wt60_b/rules.mk | 6 ------ keyboards/wilba_tech/wt60_bx/info.json | 2 ++ keyboards/wilba_tech/wt60_bx/rules.mk | 6 ------ keyboards/wilba_tech/wt60_c/info.json | 2 ++ keyboards/wilba_tech/wt60_c/rules.mk | 6 ------ keyboards/wilba_tech/wt60_d/info.json | 2 ++ keyboards/wilba_tech/wt60_d/rules.mk | 6 ------ keyboards/wilba_tech/wt60_g/info.json | 2 ++ keyboards/wilba_tech/wt60_g/rules.mk | 6 ------ keyboards/wilba_tech/wt60_g2/info.json | 2 ++ keyboards/wilba_tech/wt60_g2/rules.mk | 6 ------ keyboards/wilba_tech/wt60_h1/info.json | 2 ++ keyboards/wilba_tech/wt60_h1/rules.mk | 6 ------ keyboards/wilba_tech/wt60_h2/info.json | 2 ++ keyboards/wilba_tech/wt60_h2/rules.mk | 6 ------ keyboards/wilba_tech/wt60_h3/info.json | 2 ++ keyboards/wilba_tech/wt60_h3/rules.mk | 6 ------ keyboards/wilba_tech/wt60_xt/info.json | 2 ++ keyboards/wilba_tech/wt60_xt/rules.mk | 6 ------ keyboards/wilba_tech/wt65_a/info.json | 2 ++ keyboards/wilba_tech/wt65_a/rules.mk | 6 ------ keyboards/wilba_tech/wt65_b/info.json | 2 ++ keyboards/wilba_tech/wt65_b/rules.mk | 6 ------ keyboards/wilba_tech/wt65_d/info.json | 2 ++ keyboards/wilba_tech/wt65_d/rules.mk | 6 ------ keyboards/wilba_tech/wt65_f/info.json | 2 ++ keyboards/wilba_tech/wt65_f/rules.mk | 6 ------ keyboards/wilba_tech/wt65_fx/info.json | 2 ++ keyboards/wilba_tech/wt65_fx/rules.mk | 6 ------ keyboards/wilba_tech/wt65_g/info.json | 2 ++ keyboards/wilba_tech/wt65_g/rules.mk | 6 ------ keyboards/wilba_tech/wt65_g2/info.json | 2 ++ keyboards/wilba_tech/wt65_g2/rules.mk | 6 ------ keyboards/wilba_tech/wt65_h1/info.json | 2 ++ keyboards/wilba_tech/wt65_h1/rules.mk | 6 ------ keyboards/wilba_tech/wt65_xt/info.json | 2 ++ keyboards/wilba_tech/wt65_xt/rules.mk | 6 ------ keyboards/wilba_tech/wt65_xtx/info.json | 2 ++ keyboards/wilba_tech/wt65_xtx/rules.mk | 6 ------ keyboards/wilba_tech/wt69_a/info.json | 2 ++ keyboards/wilba_tech/wt69_a/rules.mk | 6 ------ keyboards/wilba_tech/wt70_jb/info.json | 2 ++ keyboards/wilba_tech/wt70_jb/rules.mk | 6 ------ keyboards/wilba_tech/wt75_a/info.json | 2 ++ keyboards/wilba_tech/wt75_a/rules.mk | 6 ------ keyboards/wilba_tech/wt75_b/info.json | 2 ++ keyboards/wilba_tech/wt75_b/rules.mk | 6 ------ keyboards/wilba_tech/wt75_c/info.json | 2 ++ keyboards/wilba_tech/wt75_c/rules.mk | 6 ------ keyboards/wilba_tech/wt80_a/info.json | 2 ++ keyboards/wilba_tech/wt80_a/rules.mk | 6 ------ keyboards/wilba_tech/wt80_bc/info.json | 2 ++ keyboards/wilba_tech/wt80_bc/rules.mk | 6 ------ keyboards/wilba_tech/wt80_g/info.json | 2 ++ keyboards/wilba_tech/wt80_g/rules.mk | 6 ------ keyboards/wilba_tech/wt8_a/info.json | 2 ++ keyboards/wilba_tech/wt8_a/rules.mk | 6 ------ keyboards/wilba_tech/zeal60/info.json | 2 ++ keyboards/wilba_tech/zeal60/rules.mk | 6 ------ keyboards/wilba_tech/zeal65/info.json | 2 ++ keyboards/wilba_tech/zeal65/rules.mk | 6 ------ keyboards/winkeyless/b87/info.json | 2 ++ keyboards/winkeyless/b87/rules.mk | 6 ------ keyboards/winkeyless/bface/info.json | 2 ++ keyboards/winkeyless/bface/rules.mk | 6 ------ keyboards/winkeyless/bmini/info.json | 2 ++ keyboards/winkeyless/bmini/rules.mk | 6 ------ keyboards/winkeyless/bminiex/info.json | 2 ++ keyboards/winkeyless/bminiex/rules.mk | 6 ------ keyboards/winkeys/mini_winni/info.json | 2 ++ keyboards/winkeys/mini_winni/rules.mk | 6 ------ keyboards/winry/winry25tc/info.json | 2 ++ keyboards/winry/winry25tc/rules.mk | 6 ------ keyboards/winry/winry315/info.json | 2 ++ keyboards/winry/winry315/rules.mk | 6 ------ keyboards/wolf/kuku65/info.json | 2 ++ keyboards/wolf/kuku65/rules.mk | 6 ------ keyboards/wolf/ryujin/info.json | 2 ++ keyboards/wolf/ryujin/rules.mk | 6 ------ keyboards/wolf/sabre/info.json | 2 ++ keyboards/wolf/sabre/rules.mk | 6 ------ keyboards/wolf/ts60/info.json | 2 ++ keyboards/wolf/ts60/rules.mk | 6 ------ keyboards/woodkeys/bigseries/1key/info.json | 2 ++ keyboards/woodkeys/bigseries/1key/rules.mk | 6 ------ keyboards/woodkeys/bigseries/2key/info.json | 2 ++ keyboards/woodkeys/bigseries/2key/rules.mk | 6 ------ keyboards/woodkeys/bigseries/3key/info.json | 2 ++ keyboards/woodkeys/bigseries/3key/rules.mk | 6 ------ keyboards/woodkeys/bigseries/4key/info.json | 2 ++ keyboards/woodkeys/bigseries/4key/rules.mk | 6 ------ keyboards/woodkeys/meira/info.json | 2 ++ keyboards/woodkeys/meira/rules.mk | 6 ------ keyboards/woodkeys/scarletbandana/info.json | 2 ++ keyboards/woodkeys/scarletbandana/rules.mk | 6 ------ keyboards/work_louder/loop/info.json | 2 ++ keyboards/work_louder/loop/rules.mk | 6 ------ keyboards/work_louder/nano/info.json | 2 ++ keyboards/work_louder/nano/rules.mk | 6 ------ keyboards/work_louder/work_board/info.json | 2 ++ keyboards/work_louder/work_board/rules.mk | 6 ------ keyboards/wren/info.json | 2 ++ keyboards/wren/rules.mk | 6 ------ keyboards/wsk/alpha9/info.json | 2 ++ keyboards/wsk/alpha9/rules.mk | 6 ------ keyboards/wsk/g4m3ralpha/info.json | 2 ++ keyboards/wsk/g4m3ralpha/rules.mk | 6 ------ keyboards/wsk/gothic50/info.json | 2 ++ keyboards/wsk/gothic50/rules.mk | 6 ------ keyboards/wsk/gothic70/info.json | 2 ++ keyboards/wsk/gothic70/rules.mk | 6 ------ keyboards/wsk/houndstooth/info.json | 2 ++ keyboards/wsk/houndstooth/rules.mk | 6 ------ keyboards/wsk/jerkin/info.json | 2 ++ keyboards/wsk/jerkin/rules.mk | 6 ------ keyboards/wsk/kodachi50/info.json | 2 ++ keyboards/wsk/kodachi50/rules.mk | 6 ------ keyboards/wsk/pain27/info.json | 2 ++ keyboards/wsk/pain27/rules.mk | 6 ------ keyboards/wsk/sl40/info.json | 2 ++ keyboards/wsk/sl40/rules.mk | 6 ------ keyboards/wsk/tkl30/info.json | 2 ++ keyboards/wsk/tkl30/rules.mk | 6 ------ keyboards/wuque/ikki68/info.json | 2 ++ keyboards/wuque/ikki68/rules.mk | 6 ------ keyboards/wuque/ikki68_aurora/info.json | 2 ++ keyboards/wuque/ikki68_aurora/rules.mk | 6 ------ keyboards/wuque/mammoth20x/info.json | 2 ++ keyboards/wuque/mammoth20x/rules.mk | 6 ------ keyboards/wuque/mammoth75x/info.json | 2 ++ keyboards/wuque/mammoth75x/rules.mk | 6 ------ keyboards/wuque/promise87/ansi/info.json | 2 ++ keyboards/wuque/promise87/ansi/rules.mk | 6 ------ keyboards/wuque/promise87/wkl/info.json | 2 ++ keyboards/wuque/promise87/wkl/rules.mk | 6 ------ keyboards/wuque/serneity65/info.json | 2 ++ keyboards/wuque/serneity65/rules.mk | 6 ------ keyboards/x16/info.json | 2 ++ keyboards/x16/rules.mk | 6 ------ keyboards/xbows/knight/info.json | 2 ++ keyboards/xbows/knight/rules.mk | 6 ------ keyboards/xbows/knight_plus/info.json | 2 ++ keyboards/xbows/knight_plus/rules.mk | 6 ------ keyboards/xbows/nature/info.json | 2 ++ keyboards/xbows/nature/rules.mk | 6 ------ keyboards/xbows/numpad/info.json | 2 ++ keyboards/xbows/numpad/rules.mk | 6 ------ keyboards/xbows/ranger/info.json | 2 ++ keyboards/xbows/ranger/rules.mk | 6 ------ keyboards/xbows/woody/info.json | 2 ++ keyboards/xbows/woody/rules.mk | 6 ------ keyboards/xelus/akis/info.json | 2 ++ keyboards/xelus/akis/rules.mk | 6 ------ keyboards/xelus/dawn60/info.json | 2 ++ keyboards/xelus/dawn60/rev1/rules.mk | 6 ------ keyboards/xelus/dawn60/rev1_qmk/rules.mk | 6 ------ keyboards/xelus/dharma/info.json | 2 ++ keyboards/xelus/dharma/rules.mk | 6 ------ keyboards/xelus/kangaroo/rev1/info.json | 4 +++- keyboards/xelus/kangaroo/rev1/rules.mk | 6 ------ keyboards/xelus/kangaroo/rev2/info.json | 4 +++- keyboards/xelus/kangaroo/rev2/rules.mk | 6 ------ keyboards/xelus/la_plus/info.json | 2 ++ keyboards/xelus/la_plus/rules.mk | 6 ------ keyboards/xelus/ninjin/info.json | 2 ++ keyboards/xelus/ninjin/rules.mk | 6 ------ keyboards/xelus/pachi/mini_32u4/info.json | 2 ++ keyboards/xelus/pachi/mini_32u4/rules.mk | 6 ------ keyboards/xelus/pachi/rev1/info.json | 2 ++ keyboards/xelus/pachi/rev1/rules.mk | 6 ------ keyboards/xelus/pachi/rgb/rev1/info.json | 2 ++ keyboards/xelus/pachi/rgb/rev1/rules.mk | 6 ------ keyboards/xelus/pachi/rgb/rev2/info.json | 2 ++ keyboards/xelus/pachi/rgb/rev2/rules.mk | 6 ------ keyboards/xelus/rs108/info.json | 2 ++ keyboards/xelus/rs108/rules.mk | 7 ------- keyboards/xelus/rs60/rev1/info.json | 4 +++- keyboards/xelus/rs60/rev1/rules.mk | 6 ------ keyboards/xelus/rs60/rev2_0/info.json | 4 +++- keyboards/xelus/rs60/rev2_0/rules.mk | 7 ------- keyboards/xelus/rs60/rev2_1/info.json | 4 +++- keyboards/xelus/rs60/rev2_1/rules.mk | 6 ------ keyboards/xelus/snap96/info.json | 2 ++ keyboards/xelus/snap96/rules.mk | 6 ------ keyboards/xelus/trinityxttkl/info.json | 2 ++ keyboards/xelus/trinityxttkl/rules.mk | 6 ------ keyboards/xelus/valor/rev1/info.json | 2 ++ keyboards/xelus/valor/rev1/rules.mk | 6 ------ keyboards/xelus/valor/rev2/info.json | 2 ++ keyboards/xelus/valor/rev2/rules.mk | 6 ------ keyboards/xelus/valor_frl_tkl/rev1/info.json | 4 +++- keyboards/xelus/valor_frl_tkl/rev1/rules.mk | 6 ------ .../xelus/valor_frl_tkl/rev2_0/info.json | 4 +++- keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk | 7 ------- .../xelus/valor_frl_tkl/rev2_1/info.json | 4 +++- keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk | 7 ------- keyboards/xelus/xs108/info.json | 2 ++ keyboards/xelus/xs108/rules.mk | 6 ------ keyboards/xelus/xs60/hotswap/info.json | 2 ++ keyboards/xelus/xs60/hotswap/rules.mk | 6 ------ keyboards/xelus/xs60/soldered/info.json | 2 ++ keyboards/xelus/xs60/soldered/rules.mk | 6 ------ keyboards/xenon/info.json | 2 ++ keyboards/xenon/rules.mk | 6 ------ keyboards/xiudi/xd004/info.json | 2 ++ keyboards/xiudi/xd004/v1/rules.mk | 6 ------ keyboards/xiudi/xd60/rev2/info.json | 4 +++- keyboards/xiudi/xd60/rev2/rules.mk | 6 ------ keyboards/xiudi/xd60/rev3/info.json | 4 +++- keyboards/xiudi/xd60/rev3/rules.mk | 6 ------ keyboards/xiudi/xd68/info.json | 2 ++ keyboards/xiudi/xd68/rules.mk | 6 ------ keyboards/xiudi/xd75/info.json | 2 ++ keyboards/xiudi/xd75/rules.mk | 6 ------ keyboards/xiudi/xd84/info.json | 2 ++ keyboards/xiudi/xd84/rules.mk | 6 ------ keyboards/xiudi/xd84pro/info.json | 2 ++ keyboards/xiudi/xd84pro/rules.mk | 6 ------ keyboards/xiudi/xd87/info.json | 2 ++ keyboards/xiudi/xd87/rules.mk | 6 ------ keyboards/xiudi/xd96/info.json | 2 ++ keyboards/xiudi/xd96/rules.mk | 6 ------ keyboards/xmmx/info.json | 2 ++ keyboards/xmmx/rules.mk | 6 ------ keyboards/xw60/info.json | 2 ++ keyboards/xw60/rules.mk | 6 ------ keyboards/yampad/info.json | 2 ++ keyboards/yampad/rules.mk | 6 ------ keyboards/yandrstudio/nz64/info.json | 2 ++ keyboards/yandrstudio/nz64/rules.mk | 7 ------- keyboards/yandrstudio/zhou65/info.json | 2 ++ keyboards/yandrstudio/zhou65/rules.mk | 7 ------- keyboards/yanghu/unicorne/f411/info.json | 5 +++++ keyboards/yanghu/unicorne/f411/rules.mk | 6 ------ keyboards/yatara/drink_me/info.json | 2 ++ keyboards/yatara/drink_me/rules.mk | 6 ------ keyboards/ydkb/chili/info.json | 2 ++ keyboards/ydkb/chili/rules.mk | 6 ------ keyboards/ydkb/grape/info.json | 2 ++ keyboards/ydkb/grape/rules.mk | 6 ------ keyboards/ydkb/just60/info.json | 2 ++ keyboards/ydkb/just60/rules.mk | 6 ------ keyboards/ydkb/yd68/info.json | 2 ++ keyboards/ydkb/yd68/rules.mk | 6 ------ keyboards/yeehaw/info.json | 2 ++ keyboards/yeehaw/rules.mk | 6 ------ keyboards/yiancardesigns/barleycorn/info.json | 2 ++ keyboards/yiancardesigns/barleycorn/rules.mk | 6 ------ keyboards/yiancardesigns/gingham/info.json | 2 ++ keyboards/yiancardesigns/gingham/rules.mk | 6 ------ keyboards/yiancardesigns/seigaiha/info.json | 2 ++ keyboards/yiancardesigns/seigaiha/rules.mk | 6 ------ keyboards/ymdk/bface/info.json | 2 ++ keyboards/ymdk/bface/rules.mk | 6 ------ keyboards/ymdk/melody96/info.json | 2 ++ keyboards/ymdk/melody96/rules.mk | 6 ------ keyboards/ymdk/np21/info.json | 2 ++ keyboards/ymdk/np21/rules.mk | 6 ------ keyboards/ymdk/np24/u4rgb6/info.json | 2 ++ keyboards/ymdk/np24/u4rgb6/rules.mk | 6 ------ keyboards/ymdk/sp64/info.json | 2 ++ keyboards/ymdk/sp64/rules.mk | 6 ------ keyboards/ymdk/wings/info.json | 2 ++ keyboards/ymdk/wings/rules.mk | 6 ------ keyboards/ymdk/wingshs/info.json | 2 ++ keyboards/ymdk/wingshs/rules.mk | 6 ------ keyboards/ymdk/yd60mq/info.json | 2 ++ keyboards/ymdk/yd60mq/rules.mk | 6 ------ keyboards/ymdk/ym68/info.json | 2 ++ keyboards/ymdk/ym68/rules.mk | 6 ------ keyboards/ymdk/ymd09/info.json | 2 ++ keyboards/ymdk/ymd09/rules.mk | 6 ------ keyboards/ymdk/ymd21/v2/info.json | 2 ++ keyboards/ymdk/ymd21/v2/rules.mk | 6 ------ keyboards/ymdk/ymd40/v2/info.json | 2 ++ keyboards/ymdk/ymd40/v2/rules.mk | 6 ------ keyboards/ymdk/ymd67/info.json | 2 ++ keyboards/ymdk/ymd67/rules.mk | 6 ------ keyboards/ymdk/ymd75/rev1/info.json | 4 +++- keyboards/ymdk/ymd75/rev1/rules.mk | 6 ------ keyboards/ymdk/ymd75/rev2/info.json | 4 +++- keyboards/ymdk/ymd75/rev2/rules.mk | 6 ------ keyboards/ymdk/ymd75/rev3/info.json | 4 +++- keyboards/ymdk/ymd75/rev3/rules.mk | 6 ------ keyboards/ymdk/ymd96/info.json | 2 ++ keyboards/ymdk/ymd96/rules.mk | 6 ------ keyboards/yncognito/batpad/info.json | 2 ++ keyboards/yncognito/batpad/rules.mk | 6 ------ keyboards/yoichiro/lunakey_macro/info.json | 2 ++ keyboards/yoichiro/lunakey_macro/rules.mk | 6 ------ keyboards/yoichiro/lunakey_mini/info.json | 2 ++ keyboards/yoichiro/lunakey_mini/rules.mk | 6 ------ keyboards/yosino58/rev1/info.json | 2 ++ keyboards/yosino58/rev1/rules.mk | 6 ------ keyboards/yugo_m/model_m_101/info.json | 3 +++ keyboards/yugo_m/model_m_101/rules.mk | 7 ------- keyboards/yushakobo/navpad/10/info.json | 2 ++ keyboards/yushakobo/navpad/10/rules.mk | 6 ------ .../yushakobo/navpad/10_helix_r/info.json | 2 ++ .../yushakobo/navpad/10_helix_r/rules.mk | 6 ------ keyboards/yushakobo/quick17/info.json | 2 ++ keyboards/yushakobo/quick17/rules.mk | 6 ------ keyboards/yushakobo/quick7/info.json | 2 ++ keyboards/yushakobo/quick7/rules.mk | 6 ------ keyboards/yynmt/acperience12/rev1/info.json | 2 ++ keyboards/yynmt/acperience12/rev1/rules.mk | 5 ----- keyboards/yynmt/dozen0/info.json | 2 ++ keyboards/yynmt/dozen0/rules.mk | 6 ------ keyboards/yynmt/kagamidget/info.json | 2 ++ keyboards/yynmt/kagamidget/rules.mk | 6 ------ keyboards/z12/info.json | 2 ++ keyboards/z12/rules.mk | 6 ------ keyboards/z34/info.json | 2 ++ keyboards/z34/rules.mk | 6 ------ keyboards/zfrontier/big_switch/info.json | 2 ++ keyboards/zfrontier/big_switch/rules.mk | 6 ------ keyboards/ziggurat/info.json | 2 ++ keyboards/ziggurat/rules.mk | 6 ------ keyboards/zj68/info.json | 2 ++ keyboards/zj68/rules.mk | 6 ------ keyboards/zlant/info.json | 2 ++ keyboards/zlant/rules.mk | 6 ------ keyboards/zoo/wampus/info.json | 2 ++ keyboards/zoo/wampus/rules.mk | 6 ------ keyboards/ztboards/after/info.json | 2 ++ keyboards/ztboards/after/rules.mk | 6 ------ keyboards/ztboards/noon/info.json | 2 ++ keyboards/ztboards/noon/rules.mk | 6 ------ keyboards/zvecr/split_blackpill/info.json | 2 ++ keyboards/zvecr/split_blackpill/rules.mk | 6 ------ keyboards/zvecr/zv48/f401/info.json | 5 +++++ keyboards/zvecr/zv48/f401/rules.mk | 7 ------- keyboards/zvecr/zv48/f411/info.json | 5 +++++ keyboards/zvecr/zv48/f411/rules.mk | 6 ------ 4886 files changed, 5301 insertions(+), 14866 deletions(-) create mode 100644 keyboards/40percentclub/i75/promicro/info.json create mode 100644 keyboards/40percentclub/i75/teensy2/info.json create mode 100644 keyboards/40percentclub/polyandry/promicro/info.json create mode 100644 keyboards/40percentclub/polyandry/teensy2/info.json create mode 100644 keyboards/ai03/equinox/rev0/info.json create mode 100644 keyboards/ai03/equinox/rev1/info.json create mode 100644 keyboards/atreus/astar/info.json create mode 100644 keyboards/atreus/astar_mirrored/info.json create mode 100644 keyboards/atreus/f103/info.json create mode 100644 keyboards/atreus/feather/info.json create mode 100644 keyboards/atreus/promicro/info.json create mode 100644 keyboards/atreus/teensy2/info.json delete mode 100644 keyboards/bastardkb/skeletyl/v1/info.json create mode 100644 keyboards/converter/adb_usb/rev1/info.json create mode 100644 keyboards/converter/adb_usb/rev2/info.json create mode 100644 keyboards/converter/usb_usb/ble/info.json create mode 100644 keyboards/converter/usb_usb/hasu/info.json create mode 100644 keyboards/converter/usb_usb/pro_micro/info.json create mode 100644 keyboards/crkbd/r2g/info.json create mode 100644 keyboards/crkbd/rev1/info.json create mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/info.json create mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/info.json create mode 100644 keyboards/durgod/dgk6x/info.json create mode 100644 keyboards/durgod/k310/base/info.json create mode 100644 keyboards/durgod/k320/base/info.json mode change 100755 => 100644 keyboards/gizmo_engineering/gk6/info.json create mode 100644 keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json create mode 100644 keyboards/handwired/dactyl_manuform/6x6/promicro/info.json create mode 100644 keyboards/handwired/macroboard/f401/info.json create mode 100644 keyboards/handwired/macroboard/f411/info.json create mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/info.json create mode 100644 keyboards/handwired/pill60/blackpill_f401/info.json create mode 100644 keyboards/handwired/pill60/blackpill_f411/info.json create mode 100644 keyboards/handwired/pill60/bluepill/info.json create mode 100644 keyboards/handwired/split65/promicro/info.json create mode 100644 keyboards/handwired/split65/stm32/info.json create mode 100644 keyboards/handwired/splittest/bluepill/info.json create mode 100644 keyboards/handwired/splittest/promicro/info.json create mode 100644 keyboards/handwired/splittest/teensy_2/info.json create mode 100644 keyboards/lfkeyboards/mini1800/reva/info.json create mode 100644 keyboards/lfkeyboards/mini1800/revc/info.json create mode 100644 keyboards/maxipad/promicro/info.json create mode 100644 keyboards/maxipad/teensy2/info.json create mode 100644 keyboards/mechlovin/hannah65/info.json create mode 100644 keyboards/mechlovin/infinity87/rev1/info.json create mode 100644 keyboards/mechlovin/zed65/info.json create mode 100644 keyboards/mechwild/obe/f401/info.json create mode 100644 keyboards/mechwild/obe/f411/info.json create mode 100644 keyboards/mechwild/waka60/f401/info.json create mode 100644 keyboards/mechwild/waka60/f411/info.json mode change 100755 => 100644 keyboards/melgeek/tegic/info.json create mode 100644 keyboards/nullbitsco/scramble/v1/info.json create mode 100644 keyboards/nullbitsco/scramble/v2/info.json create mode 100644 keyboards/oddball/v1/info.json create mode 100644 keyboards/oddball/v2/info.json create mode 100644 keyboards/oddball/v2_1/info.json create mode 100644 keyboards/omkbd/ergodash/info.json create mode 100644 keyboards/omkbd/runner3680/info.json create mode 100644 keyboards/opendeck/32/rev1/info.json create mode 100644 keyboards/ploopyco/trackball/rev1/info.json create mode 100644 keyboards/ploopyco/trackball/rev1_005/info.json create mode 100644 keyboards/recompile_keys/choco60/rev1/info.json create mode 100644 keyboards/recompile_keys/choco60/rev2/info.json create mode 100644 keyboards/recompile_keys/nomu30/rev1/info.json create mode 100644 keyboards/recompile_keys/nomu30/rev2/info.json create mode 100644 keyboards/rgbkb/pan/rev1/32a/info.json create mode 100644 keyboards/rgbkb/pan/rev1/proton_c/info.json create mode 100644 keyboards/smithrune/iron165r2/f072/info.json create mode 100644 keyboards/smithrune/iron165r2/f411/info.json create mode 100644 keyboards/tkw/stoutgat/v2/f411/info.json create mode 100644 keyboards/yanghu/unicorne/f411/info.json create mode 100644 keyboards/zvecr/zv48/f401/info.json create mode 100644 keyboards/zvecr/zv48/f411/info.json diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json index 9ed798c93bc..76b525a99e4 100644 --- a/keyboards/0xc7/61key/info.json +++ b/keyboards/0xc7/61key/info.json @@ -8,6 +8,8 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi" }, diff --git a/keyboards/0xc7/61key/rules.mk b/keyboards/0xc7/61key/rules.mk index 361d8928abb..bad6a45f5f1 100644 --- a/keyboards/0xc7/61key/rules.mk +++ b/keyboards/0xc7/61key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index cd5993ee0d5..3da716aa373 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk index 267c4d09ae2..77dd67f53f8 100644 --- a/keyboards/0xcb/1337/rules.mk +++ b/keyboards/0xcb/1337/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index 4a6232abad4..b6e5f01b272 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -8,6 +8,8 @@ "pid": "0xA455", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk index a06dda50ba0..24ff2f2cfd1 100644 --- a/keyboards/0xcb/static/rules.mk +++ b/keyboards/0xcb/static/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json index 00261daad35..96e61924b9f 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/info.json @@ -8,6 +8,8 @@ "pid": "0xF09F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk index e022c905cd0..9cc3b02a227 100644 --- a/keyboards/0xcb/tutelpad/rules.mk +++ b/keyboards/0xcb/tutelpad/rules.mk @@ -1,9 +1,3 @@ -## MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json index ec468454b13..84dea67c3ad 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/info.json @@ -8,6 +8,8 @@ "pid": "0x7C99", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk index bd10e11022f..e30794f68e6 100644 --- a/keyboards/10bleoledhub/rules.mk +++ b/keyboards/10bleoledhub/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json index f918fb26346..53df29c7263 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/info.json @@ -8,6 +8,8 @@ "pid": "0x6873", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/1upkeyboards/1up60hse/rules.mk b/keyboards/1upkeyboards/1up60hse/rules.mk index c88b2d01bb9..11ed55a6f87 100644 --- a/keyboards/1upkeyboards/1up60hse/rules.mk +++ b/keyboards/1upkeyboards/1up60hse/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json index 40b50f00da5..1c82ab9e996 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/info.json @@ -8,6 +8,8 @@ "pid": "0x6874", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/1upkeyboards/1up60hte/rules.mk b/keyboards/1upkeyboards/1up60hte/rules.mk index ffe2e843fbe..aaea8522f64 100644 --- a/keyboards/1upkeyboards/1up60hte/rules.mk +++ b/keyboards/1upkeyboards/1up60hte/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 178aad62a2b..64dc9e9cd35 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x7267", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk index 9ccce6abf4d..32e82925ccf 100644 --- a/keyboards/1upkeyboards/1up60rgb/rules.mk +++ b/keyboards/1upkeyboards/1up60rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json index 69f95e3be3a..0f8bee6efe8 100644 --- a/keyboards/1upkeyboards/pi40/info.json +++ b/keyboards/1upkeyboards/pi40/info.json @@ -6,6 +6,9 @@ "pid": "0x5600", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk index ecf7a9ce3ad..017a3fe1cf5 100644 --- a/keyboards/1upkeyboards/pi40/rules.mk +++ b/keyboards/1upkeyboards/pi40/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = RP2040 -BOOTLOADER = rp2040 -BOARD = GENERIC_RP_RP2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json index a3b4d827955..d648c32f3e3 100644 --- a/keyboards/1upkeyboards/super16/info.json +++ b/keyboards/1upkeyboards/super16/info.json @@ -8,6 +8,8 @@ "pid": "0x5516", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4", "numpad_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk index 18f7d788c0e..373bf88ecfb 100644 --- a/keyboards/1upkeyboards/super16/rules.mk +++ b/keyboards/1upkeyboards/super16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json index 891eaf316b4..7886ce228e6 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -8,6 +8,8 @@ "pid": "0x5517", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}] diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk index 3e20247dff2..2653d876b5e 100644 --- a/keyboards/1upkeyboards/super16v2/rules.mk +++ b/keyboards/1upkeyboards/super16v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json index 11a0d97d896..d5493389880 100644 --- a/keyboards/1upkeyboards/sweet16/v1/info.json +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x0161", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/1upkeyboards/sweet16/v1/rules.mk b/keyboards/1upkeyboards/sweet16/v1/rules.mk index 817f02aa235..0912a1b4a60 100644 --- a/keyboards/1upkeyboards/sweet16/v1/rules.mk +++ b/keyboards/1upkeyboards/sweet16/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json index 5baab67dbad..acb5cc58550 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.0" - } + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu" } diff --git a/keyboards/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk index fd5789116d1..e0954e7355b 100644 --- a/keyboards/25keys/aleth42/rev0/rules.mk +++ b/keyboards/25keys/aleth42/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index 90ac25f360b..dab37baf045 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk index 5ff179b0ebe..683b2498022 100644 --- a/keyboards/25keys/aleth42/rev1/rules.mk +++ b/keyboards/25keys/aleth42/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json index 4fe088f9e6b..5150c28422a 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/info.json @@ -8,6 +8,8 @@ "pid": "0xCA42", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}] diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk index 756fb8ec922..eaeebeff07f 100644 --- a/keyboards/25keys/cassette42/rules.mk +++ b/keyboards/25keys/cassette42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json index 3d9c898841e..d667ca186cb 100644 --- a/keyboards/25keys/zinc/info.json +++ b/keyboards/25keys/zinc/info.json @@ -7,6 +7,8 @@ "pid": "0xEA3B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk index 2fd608c56c6..21bd83b6091 100644 --- a/keyboards/25keys/zinc/rules.mk +++ b/keyboards/25keys/zinc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json index c2cad984705..a50d646244c 100644 --- a/keyboards/2key2crawl/info.json +++ b/keyboards/2key2crawl/info.json @@ -8,6 +8,8 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/2key2crawl/rules.mk b/keyboards/2key2crawl/rules.mk index 182637c7b7f..5e715569bca 100644 --- a/keyboards/2key2crawl/rules.mk +++ b/keyboards/2key2crawl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json index 62fee361a07..bbaa61f6ba4 100644 --- a/keyboards/30wer/info.json +++ b/keyboards/30wer/info.json @@ -8,6 +8,8 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/30wer/rules.mk b/keyboards/30wer/rules.mk index aad55a7dfa8..0048c643519 100644 --- a/keyboards/30wer/rules.mk +++ b/keyboards/30wer/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json index 79e999cc160..0c1afce9103 100644 --- a/keyboards/3keyecosystem/2key2/info.json +++ b/keyboards/3keyecosystem/2key2/info.json @@ -8,6 +8,8 @@ "pid": "0x3304", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/3keyecosystem/2key2/rules.mk b/keyboards/3keyecosystem/2key2/rules.mk index 6322b40faf9..12466832907 100644 --- a/keyboards/3keyecosystem/2key2/rules.mk +++ b/keyboards/3keyecosystem/2key2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json index 90ac25f360b..dab37baf045 100644 --- a/keyboards/3w6/rev1/info.json +++ b/keyboards/3w6/rev1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/3w6/rev1/rules.mk b/keyboards/3w6/rev1/rules.mk index 8f2613f9d35..2194870d6b9 100644 --- a/keyboards/3w6/rev1/rules.mk +++ b/keyboards/3w6/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json index e557e4d3076..65be217368d 100644 --- a/keyboards/3w6/rev2/info.json +++ b/keyboards/3w6/rev2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/3w6/rev2/rules.mk b/keyboards/3w6/rev2/rules.mk index 8f2613f9d35..2194870d6b9 100644 --- a/keyboards/3w6/rev2/rules.mk +++ b/keyboards/3w6/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json index 262dff34766..4d7a239cd03 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/info.json @@ -8,6 +8,8 @@ "pid": "0x0F25", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x5", "ortho_5x10"], "layouts": { "LAYOUT_ortho_5x5": { diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk index d2e5d56c073..25d4c400516 100644 --- a/keyboards/40percentclub/25/rules.mk +++ b/keyboards/40percentclub/25/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json index e8e0463ab6d..91c6171dff3 100644 --- a/keyboards/40percentclub/4pack/info.json +++ b/keyboards/40percentclub/4pack/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}] diff --git a/keyboards/40percentclub/4pack/rules.mk b/keyboards/40percentclub/4pack/rules.mk index 4b4bcf851fd..ffd7289e96a 100644 --- a/keyboards/40percentclub/4pack/rules.mk +++ b/keyboards/40percentclub/4pack/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json index f14f542d68e..78648324846 100644 --- a/keyboards/40percentclub/4x4/info.json +++ b/keyboards/40percentclub/4x4/info.json @@ -8,6 +8,8 @@ "pid": "0x0A0C", "device_version": "44.4.4" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/40percentclub/4x4/rules.mk b/keyboards/40percentclub/4x4/rules.mk index 99137b91711..dfb1a682dcb 100644 --- a/keyboards/40percentclub/4x4/rules.mk +++ b/keyboards/40percentclub/4x4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json index 88767e9952f..76554d54e47 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/info.json @@ -8,6 +8,8 @@ "pid": "0x05B5", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"], "layouts": { "LAYOUT_ortho_5x5": { diff --git a/keyboards/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk index 4a307836394..cb3f21e8240 100644 --- a/keyboards/40percentclub/5x5/rules.mk +++ b/keyboards/40percentclub/5x5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json index 6569a5c1225..dc73699454e 100644 --- a/keyboards/40percentclub/6lit/info.json +++ b/keyboards/40percentclub/6lit/info.json @@ -8,6 +8,8 @@ "pid": "0x0F61", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_2x3", "ortho_2x6"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk index d2e5d56c073..25d4c400516 100644 --- a/keyboards/40percentclub/6lit/rules.mk +++ b/keyboards/40percentclub/6lit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json index 536800f461c..cf550b4402e 100644 --- a/keyboards/40percentclub/foobar/info.json +++ b/keyboards/40percentclub/foobar/info.json @@ -8,6 +8,8 @@ "pid": "0x0F00", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x5": { diff --git a/keyboards/40percentclub/foobar/rules.mk b/keyboards/40percentclub/foobar/rules.mk index d2e5d56c073..25d4c400516 100644 --- a/keyboards/40percentclub/foobar/rules.mk +++ b/keyboards/40percentclub/foobar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index 218dfb7a704..c93e8734e89 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk index 891c322ee1e..e47c1c65726 100644 --- a/keyboards/40percentclub/gherkin/rules.mk +++ b/keyboards/40percentclub/gherkin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json index 1b7f1294012..334ec37fe70 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/info.json @@ -8,6 +8,8 @@ "pid": "0x4A1F", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/40percentclub/half_n_half/rules.mk b/keyboards/40percentclub/half_n_half/rules.mk index 9e0c8117996..8ee80d039b8 100644 --- a/keyboards/40percentclub/half_n_half/rules.mk +++ b/keyboards/40percentclub/half_n_half/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/40percentclub/i75/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/40percentclub/i75/promicro/rules.mk b/keyboards/40percentclub/i75/promicro/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/40percentclub/i75/promicro/rules.mk +++ b/keyboards/40percentclub/i75/promicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json new file mode 100644 index 00000000000..0b2db81c11e --- /dev/null +++ b/keyboards/40percentclub/i75/teensy2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/40percentclub/i75/teensy2/rules.mk b/keyboards/40percentclub/i75/teensy2/rules.mk index 320633f80f3..e69de29bb2d 100644 --- a/keyboards/40percentclub/i75/teensy2/rules.mk +++ b/keyboards/40percentclub/i75/teensy2/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json index 5e04d08cdc7..704b30479be 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/info.json @@ -8,6 +8,8 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk index 186c241514d..ca7b02cbdd2 100644 --- a/keyboards/40percentclub/luddite/rules.mk +++ b/keyboards/40percentclub/luddite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json index 6aa24d2e57a..89df2e19580 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/info.json @@ -8,6 +8,8 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/40percentclub/mf68/rules.mk b/keyboards/40percentclub/mf68/rules.mk index c2e40b55c50..b325f3f0c79 100644 --- a/keyboards/40percentclub/mf68/rules.mk +++ b/keyboards/40percentclub/mf68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json index 914b32aaa44..1821a684ac8 100644 --- a/keyboards/40percentclub/nano/info.json +++ b/keyboards/40percentclub/nano/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_2x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/40percentclub/nano/rules.mk b/keyboards/40percentclub/nano/rules.mk index bb1a873d645..a73f2bd6931 100644 --- a/keyboards/40percentclub/nano/rules.mk +++ b/keyboards/40percentclub/nano/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json index 09d25e30dec..82d03395d8a 100644 --- a/keyboards/40percentclub/nein/info.json +++ b/keyboards/40percentclub/nein/info.json @@ -8,6 +8,8 @@ "pid": "0x9999", "device_version": "99.9.9" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/40percentclub/nein/rules.mk b/keyboards/40percentclub/nein/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/40percentclub/nein/rules.mk +++ b/keyboards/40percentclub/nein/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index 94059d8c54e..5bb4a0bf088 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -8,6 +8,8 @@ "pid": "0x0A0C", "device_version": "4.4.4" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk index fee43890194..926fffda128 100644 --- a/keyboards/40percentclub/nori/rules.mk +++ b/keyboards/40percentclub/nori/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/40percentclub/polyandry/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/40percentclub/polyandry/promicro/rules.mk b/keyboards/40percentclub/polyandry/promicro/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/40percentclub/polyandry/promicro/rules.mk +++ b/keyboards/40percentclub/polyandry/promicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json new file mode 100644 index 00000000000..0b2db81c11e --- /dev/null +++ b/keyboards/40percentclub/polyandry/teensy2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/40percentclub/polyandry/teensy2/rules.mk b/keyboards/40percentclub/polyandry/teensy2/rules.mk index 320633f80f3..e69de29bb2d 100644 --- a/keyboards/40percentclub/polyandry/teensy2/rules.mk +++ b/keyboards/40percentclub/polyandry/teensy2/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json index 487b7b7fb23..78ca5bda58a 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/info.json @@ -8,6 +8,8 @@ "pid": "0x5350", "device_version": "10.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/rules.mk index 484276c46b1..254b0bc7bd1 100644 --- a/keyboards/40percentclub/sixpack/rules.mk +++ b/keyboards/40percentclub/sixpack/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json index ab0e11f6dc8..cbaefde2bdf 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/info.json @@ -8,6 +8,8 @@ "pid": "0x546F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/rules.mk index 62975827e81..d781d36d3b4 100644 --- a/keyboards/40percentclub/tomato/rules.mk +++ b/keyboards/40percentclub/tomato/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json index e0bd0264cb4..055db804710 100644 --- a/keyboards/40percentclub/ut47/info.json +++ b/keyboards/40percentclub/ut47/info.json @@ -8,6 +8,8 @@ "pid": "0x7574", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}] diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk index 6c9805e0fc4..3b1b719e142 100644 --- a/keyboards/40percentclub/ut47/rules.mk +++ b/keyboards/40percentclub/ut47/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json index 268af942fea..530c2f3031a 100644 --- a/keyboards/45_ats/info.json +++ b/keyboards/45_ats/info.json @@ -8,6 +8,8 @@ "pid": "0x4511", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/45_ats/rules.mk b/keyboards/45_ats/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/45_ats/rules.mk +++ b/keyboards/45_ats/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json index 24a2b3d34a3..0ed57ce2f66 100644 --- a/keyboards/4by3/info.json +++ b/keyboards/4by3/info.json @@ -8,6 +8,8 @@ "pid": "0x2019", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_horizontal": { "layout": [ diff --git a/keyboards/4by3/rules.mk b/keyboards/4by3/rules.mk index 9610b90efd1..e7d97d60d35 100644 --- a/keyboards/4by3/rules.mk +++ b/keyboards/4by3/rules.mk @@ -1,11 +1,4 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - EXTRAKEY_ENABLE = yes NKRO_ENABLE = yes # Enable N-Key Rollover CONSOLE_ENABLE = yes COMMAND_ENABLE = yes - diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index f838933c08e..e43265fcdda 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk index 43eb792fc16..6fe874e748b 100644 --- a/keyboards/4pplet/aekiso60/rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index 948c6f65151..ecaa326e519 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk index 8dc60fa527c..041df45ecaa 100644 --- a/keyboards/4pplet/aekiso60/rev_b/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 007ba9fef4e..5654de5fa9e 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk index 43eb792fc16..6fe874e748b 100644 --- a/keyboards/4pplet/bootleg/rev_a/rules.mk +++ b/keyboards/4pplet/bootleg/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 110e1cce92c..b896f02ad95 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk index 35f765bc835..70dd3e445a8 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index 0a86c6fab9f..f97a4bab9a8 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"1,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"1,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"1,6", "x":13, "y":0}, {"label":"3,6", "x":14, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":6.5, "y":1}, {"label":"3,3", "x":7.5, "y":1}, {"label":"2,4", "x":8.5, "y":1}, {"label":"3,4", "x":9.5, "y":1}, {"label":"2,5", "x":10.5, "y":1}, {"label":"3,5", "x":11.5, "y":1}, {"label":"2,6", "x":12.5, "y":1}, {"label":"5,6", "x":13.5, "y":1, "w":1.5}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":6.75, "y":2}, {"label":"5,3", "x":7.75, "y":2}, {"label":"4,4", "x":8.75, "y":2}, {"label":"5,4", "x":9.75, "y":2}, {"label":"4,5", "x":10.75, "y":2}, {"label":"5,5", "x":11.75, "y":2}, {"label":"4,6", "x":12.75, "y":2}, {"label":"7,6", "x":13.75, "y":2, "w":1.25}, {"label":"6,0", "x":0, "y":3, "w":1.25}, {"label":"7,0", "x":1.25, "y":3}, {"label":"6,1", "x":2.25, "y":3}, {"label":"7,1", "x":3.25, "y":3}, {"label":"6,2", "x":4.25, "y":3}, {"label":"7,2", "x":5.25, "y":3}, {"label":"6,3", "x":6.25, "y":3}, {"label":"7,3", "x":7.25, "y":3}, {"label":"6,4", "x":8.25, "y":3}, {"label":"7,4", "x":9.25, "y":3}, {"label":"6,5", "x":10.25, "y":3}, {"label":"7,5", "x":11.25, "y":3}, {"label":"6,6", "x":12.25, "y":3, "w":1.75}, {"label":"9,6", "x":14, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.25}, {"label":"9,0", "x":1.25, "y":4, "w":1.25}, {"label":"9,1", "x":2.5, "y":4, "w":1.25}, {"label":"9,2", "x":3.75, "y":4, "w":2.25}, {"label":"9,3", "x":6, "y":4, "w":1.25}, {"label":"9,4", "x":10, "y":4, "w":1.25}, {"label":"8,5", "x":11.25, "y":4, "w":1.25}, {"label":"9,5", "x":12.5, "y":4, "w":1.25}, {"label":"8,6", "x":13.75, "y":4, "w":1.25}, {"label":"8,4", "x":7, "y":9, "w":2.75}] diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk index 877f1939f24..09e14f7540b 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json index 711dfb9bdf4..07bd69f22ef 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", "community_layouts": ["60_iso"], "layouts": { "LAYOUT_60_iso": { diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk index bf1ca7b1b87..dbdd70b9073 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk +++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index ba16d348b93..d2c271ba63b 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/steezy60/rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk index 43eb792fc16..6fe874e748b 100644 --- a/keyboards/4pplet/steezy60/rev_a/rules.mk +++ b/keyboards/4pplet/steezy60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index ecbffb1e177..872b9a8116e 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk index 43eb792fc16..6fe874e748b 100644 --- a/keyboards/4pplet/waffling60/rev_a/rules.mk +++ b/keyboards/4pplet/waffling60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 1c2af5598f8..4a1cf0180c5 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk index 88173a40c20..a927de843cb 100644 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 1e464574a1d..20e4445b2a2 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk index 88173a40c20..a927de843cb 100644 --- a/keyboards/4pplet/waffling60/rev_c/rules.mk +++ b/keyboards/4pplet/waffling60/rev_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json index ea5b142c257..7b09f0a0d3a 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/info.json @@ -8,6 +8,8 @@ "pid": "0x000E", "device_version": "0.0.4" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"ISO", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk index 8dc60fa527c..041df45ecaa 100644 --- a/keyboards/4pplet/waffling60/rev_d/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json index ba198ef935b..dc3ea424bb7 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json +++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x000D", "device_version": "0.0.4" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"3U", "x":4, "y":4, "w":3}, {"label":"1U", "x":7, "y":4}, {"label":"3U", "x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk index df10992a489..51920656446 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json index 3712a5c0552..8f9c34b5639 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/info.json +++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json @@ -8,6 +8,8 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk index d9584ba09d7..e8184d57aba 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 16ff5f8cefb..1f334dcb63f 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/4pplet/waffling80/rev_a/rules.mk b/keyboards/4pplet/waffling80/rev_a/rules.mk index 7bc59aaef68..ceea2d612c4 100644 --- a/keyboards/4pplet/waffling80/rev_a/rules.mk +++ b/keyboards/4pplet/waffling80/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json index 88a5cdf0a94..f6a835652f2 100644 --- a/keyboards/4pplet/waffling80/rev_b/info.json +++ b/keyboards/4pplet/waffling80/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x000F", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk index 8dc60fa527c..041df45ecaa 100644 --- a/keyboards/4pplet/waffling80/rev_b/rules.mk +++ b/keyboards/4pplet/waffling80/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json index f4eeba747f6..e271095e667 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.2" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":2.75, "y":0}, {"label":"F1", "x":4.75, "y":0}, {"label":"F2", "x":5.75, "y":0}, {"label":"F3", "x":6.75, "y":0}, {"label":"F4", "x":7.75, "y":0}, {"label":"F5", "x":9.25, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":2.75, "y":1.5}, {"label":"!", "x":3.75, "y":1.5}, {"label":"@", "x":4.75, "y":1.5}, {"label":"#", "x":5.75, "y":1.5}, {"label":"$", "x":6.75, "y":1.5}, {"label":"%", "x":7.75, "y":1.5}, {"label":"^", "x":8.75, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"|", "x":15.75, "y":1.5}, {"label":"~", "x":16.75, "y":1.5}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":2.75, "y":2.5, "w":1.5}, {"label":"Q", "x":4.25, "y":2.5}, {"label":"W", "x":5.25, "y":2.5}, {"label":"E", "x":6.25, "y":2.5}, {"label":"R", "x":7.25, "y":2.5}, {"label":"T", "x":8.25, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":2.75, "y":3.5, "w":1.75}, {"label":"A", "x":4.5, "y":3.5}, {"label":"S", "x":5.5, "y":3.5}, {"label":"D", "x":6.5, "y":3.5}, {"label":"F", "x":7.5, "y":3.5}, {"label":"G", "x":8.5, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"~", "x":15.5, "y":3.5}, {"label":"Enter", "x":16.5, "y":3.5, "w":1.25}, {"label":"Shift", "x":2.75, "y":4.5, "w":1.25}, {"label":"|", "x":4, "y":4.5}, {"label":"Z", "x":5, "y":4.5}, {"label":"X", "x":6, "y":4.5}, {"label":"C", "x":7, "y":4.5}, {"label":"V", "x":8, "y":4.5}, {"label":"B", "x":9, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":1.75}, {"label":"Fn", "x":16.75, "y":4.5}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":2.75, "y":5.5, "w":1.5}, {"label":"Win", "x":4.25, "y":5.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"x":9.75, "y":5.5}, {"x":10.75, "y":5.5, "w":3}, {"label":"AltGr", "x":13.75, "y":5.5, "w":1.5}, {"label":"Win", "x":15.25, "y":5.5}, {"label":"Ctrl", "x":16.25, "y":5.5, "w":1.5}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}] diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/rules.mk index 2f1c4fc78b0..9e42693cb69 100644 --- a/keyboards/4pplet/yakiimo/rev_a/rules.mk +++ b/keyboards/4pplet/yakiimo/rev_a/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json index 1a2c0b300bb..a9871f77455 100644 --- a/keyboards/7c8/framework/info.json +++ b/keyboards/7c8/framework/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk index 797b8072caa..8e856a53360 100644 --- a/keyboards/7c8/framework/rules.mk +++ b/keyboards/7c8/framework/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index f36f4c9dc33..4520540642d 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -7,6 +7,8 @@ "vid": "0xFEED", "pid": "0x2171" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/8pack/rules.mk b/keyboards/8pack/rules.mk index 1d62765274f..ee446482598 100644 --- a/keyboards/8pack/rules.mk +++ b/keyboards/8pack/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json index 5508697df65..fa74573e3e6 100644 --- a/keyboards/9key/info.json +++ b/keyboards/9key/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] diff --git a/keyboards/9key/rules.mk b/keyboards/9key/rules.mk index 003c95c69ac..02054dd0236 100644 --- a/keyboards/9key/rules.mk +++ b/keyboards/9key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json index f8eb7ff8bd2..d5a8365279f 100644 --- a/keyboards/a_dux/info.json +++ b/keyboards/a_dux/info.json @@ -8,6 +8,8 @@ "pid": "0x3939", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_2"], "layouts": { "LAYOUT_split_3x5_2": { diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk index 7038526dc1b..935483d8392 100644 --- a/keyboards/a_dux/rules.mk +++ b/keyboards/a_dux/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 858c6949b50..17cd35aba8b 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/abacus/rules.mk b/keyboards/abacus/rules.mk index 96fe1ab97a9..ae582d61308 100644 --- a/keyboards/abacus/rules.mk +++ b/keyboards/abacus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json index 0d5b2ea8f09..99c64034e5f 100644 --- a/keyboards/abatskeyboardclub/nayeon/info.json +++ b/keyboards/abatskeyboardclub/nayeon/info.json @@ -20,6 +20,8 @@ "pid": "0x0001", "device_version": "2.0.0" }, + "processor": "RP2040", + "bootloader": "rp2040", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP5"], diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk index 51b33e5b913..ae3dec41326 100644 --- a/keyboards/abatskeyboardclub/nayeon/rules.mk +++ b/keyboards/abatskeyboardclub/nayeon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RGB Matrix RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json index 0037719e120..664cae1902d 100644 --- a/keyboards/abstract/ellipse/rev1/info.json +++ b/keyboards/abstract/ellipse/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}] diff --git a/keyboards/abstract/ellipse/rev1/rules.mk b/keyboards/abstract/ellipse/rev1/rules.mk index c3d7b416301..e0bcc619523 100644 --- a/keyboards/abstract/ellipse/rev1/rules.mk +++ b/keyboards/abstract/ellipse/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json index 08676395159..17747b5cb1d 100644 --- a/keyboards/acekeyboard/titan60/info.json +++ b/keyboards/acekeyboard/titan60/info.json @@ -8,6 +8,8 @@ "pid": "0x5449", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/acekeyboard/titan60/rules.mk b/keyboards/acekeyboard/titan60/rules.mk index f50e2970510..63a5839b10b 100644 --- a/keyboards/acekeyboard/titan60/rules.mk +++ b/keyboards/acekeyboard/titan60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json index 8f501970a5a..4e14f51df03 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x8775", "device_version": "0.0.4" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk index 4fa4db54503..0f7a9e78f74 100644 --- a/keyboards/acheron/apollo/87h/delta/rules.mk +++ b/keyboards/acheron/apollo/87h/delta/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json index 6a7a382eaae..4a93afd70c2 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x8774", "device_version": "0.0.3" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk index 5b419929d5a..419a95fe023 100644 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ b/keyboards/acheron/apollo/87h/gamma/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index b2a9cf16433..68fc1b018a1 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -8,6 +8,8 @@ "pid": "0x8776", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk index 4fa4db54503..0f7a9e78f74 100644 --- a/keyboards/acheron/apollo/87htsc/rules.mk +++ b/keyboards/acheron/apollo/87htsc/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json index 4d695faf70d..92dd8018268 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/info.json @@ -8,6 +8,8 @@ "pid": "0x8873", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk index 4fa4db54503..0f7a9e78f74 100644 --- a/keyboards/acheron/apollo/88htsc/rules.mk +++ b/keyboards/acheron/apollo/88htsc/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json index a0102aaaab8..42a7bb7b42b 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/info.json @@ -8,6 +8,8 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_60_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/arctic/rules.mk b/keyboards/acheron/arctic/rules.mk index fd449807869..0aeca0dd9f3 100644 --- a/keyboards/acheron/arctic/rules.mk +++ b/keyboards/acheron/arctic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index 03640fd01d5..10d720983c7 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6584", "device_version": "0.0.1" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk index 7711254bbe3..962a27694f9 100644 --- a/keyboards/acheron/athena/alpha/rules.mk +++ b/keyboards/acheron/athena/alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 7db7665fe20..237c783866e 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6585", "device_version": "0.0.2" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk index 81bbce68c19..962a27694f9 100644 --- a/keyboards/acheron/athena/beta/rules.mk +++ b/keyboards/acheron/athena/beta/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index 6fda03534ec..3f76e22f0cf 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -8,6 +8,8 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/austin/rules.mk b/keyboards/acheron/austin/rules.mk index 89a416941f8..295d6960eed 100644 --- a/keyboards/acheron/austin/rules.mk +++ b/keyboards/acheron/austin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index 7eb1de3c170..f381712a0c7 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -8,6 +8,8 @@ "pid": "0x454C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/acheron/elongate/beta/rules.mk b/keyboards/acheron/elongate/beta/rules.mk index 976f6aecc11..2aff52b20aa 100644 --- a/keyboards/acheron/elongate/beta/rules.mk +++ b/keyboards/acheron/elongate/beta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index 54e58deb92a..d7630239267 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -8,6 +8,8 @@ "pid": "0x454D", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/elongate/delta/rules.mk b/keyboards/acheron/elongate/delta/rules.mk index 20a0bab85e9..f84ab5d6023 100755 --- a/keyboards/acheron/elongate/delta/rules.mk +++ b/keyboards/acheron/elongate/delta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index 9a2d8ca84a9..9c96a011918 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -8,6 +8,8 @@ "pid": "0x4B45", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["60_ansi_tsangan"], "layouts": { "LAYOUT_60_ansi_tsangan": { diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk index 12d787ae8c6..f94f12cb84a 100644 --- a/keyboards/acheron/keebspcb/rules.mk +++ b/keyboards/acheron/keebspcb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json index d1f01d1dced..b97521e48ee 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/info.json @@ -8,6 +8,8 @@ "pid": "0x7641", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk index 0427bb23fd7..93f25a13d8d 100644 --- a/keyboards/acheron/lasgweloth/rules.mk +++ b/keyboards/acheron/lasgweloth/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 94b8834fb25..0db6134e0bc 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,9 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk index e3efc0c371a..27db06a0448 100644 --- a/keyboards/acheron/shark/alpha/rules.mk +++ b/keyboards/acheron/shark/alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index e167619485b..615e9a91b99 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,7 +4,9 @@ "pid": "0x5369", "device_version": "0.0.2" }, - "community_layouts": ["ortho_4x12"] + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index 428522a65a3..b4a94395c6d 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json index a7cf7986bd1..e3f97c6706a 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/info.json @@ -8,6 +8,8 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ada/ada1800mini/rules.mk b/keyboards/ada/ada1800mini/rules.mk index de0a7a06294..7d5bd18e35a 100644 --- a/keyboards/ada/ada1800mini/rules.mk +++ b/keyboards/ada/ada1800mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json index b2d465fdf9b..5c32cd06394 100644 --- a/keyboards/ada/infinity81/info.json +++ b/keyboards/ada/infinity81/info.json @@ -8,6 +8,8 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ada/infinity81/rules.mk b/keyboards/ada/infinity81/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/ada/infinity81/rules.mk +++ b/keyboards/ada/infinity81/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index e9bd7d85b19..adb82407ec6 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -8,6 +8,8 @@ "pid": "0x0108", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk index 3636424a714..0d1e17dde1b 100644 --- a/keyboards/adafruit/macropad/rules.mk +++ b/keyboards/adafruit/macropad/rules.mk @@ -1,7 +1,3 @@ -# MCU name -MCU = RP2040 -# Bootloader selection -BOOTLOADER = rp2040 # Build Options # change yes to no to disable # diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json index c00755d4033..b8684e37ac5 100644 --- a/keyboards/adelheid/info.json +++ b/keyboards/adelheid/info.json @@ -8,6 +8,8 @@ "pid": "0xAD78", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/adelheid/rules.mk b/keyboards/adelheid/rules.mk index 9fa10e8fbf3..a1d35866e5c 100644 --- a/keyboards/adelheid/rules.mk +++ b/keyboards/adelheid/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json index 13fc7e8ccf3..d98827856b0 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/info.json @@ -8,6 +8,8 @@ "pid": "0xAD96", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_6x16": { "layout": [ diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk index 723dc134c94..2b74eb41834 100644 --- a/keyboards/adkb96/rules.mk +++ b/keyboards/adkb96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json index 7b9aa826618..3596cdb446d 100644 --- a/keyboards/adm42/info.json +++ b/keyboards/adm42/info.json @@ -9,6 +9,8 @@ "pid": "0xE873", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_adm42_3x12_6": "LAYOUT" }, diff --git a/keyboards/adm42/rules.mk b/keyboards/adm42/rules.mk index c075aa134d1..73e4d46c59c 100644 --- a/keyboards/adm42/rules.mk +++ b/keyboards/adm42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index ba12f0ace46..2e3f7851643 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -7,6 +7,8 @@ "pid": "0x0004", "vid": "0x4450" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/adpenrose/akemipad/rules.mk b/keyboards/adpenrose/akemipad/rules.mk index 9c75c3f01cb..98861649876 100644 --- a/keyboards/adpenrose/akemipad/rules.mk +++ b/keyboards/adpenrose/akemipad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index c305d871ea3..8c6258f020a 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk index 6a0aca4700a..4704a3487dc 100644 --- a/keyboards/adpenrose/kintsugi/rules.mk +++ b/keyboards/adpenrose/kintsugi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index b1afa0bc0df..544b4fc5d4a 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -7,6 +7,8 @@ "pid": "0x0002", "vid": "0x4450" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/adpenrose/obi/rules.mk b/keyboards/adpenrose/obi/rules.mk index 94ce0d7a665..eef937e03ad 100644 --- a/keyboards/adpenrose/obi/rules.mk +++ b/keyboards/adpenrose/obi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json index a93898c33b0..dd1aaf540a2 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/adpenrose/shisaku/rules.mk b/keyboards/adpenrose/shisaku/rules.mk index ef08ed4a06c..0fa77115165 100644 --- a/keyboards/adpenrose/shisaku/rules.mk +++ b/keyboards/adpenrose/shisaku/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json index 00e03f76851..b3817db4524 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/info.json @@ -8,6 +8,8 @@ "pid": "0x0807", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_aegis": { "layout": [ diff --git a/keyboards/aeboards/aegis/rules.mk b/keyboards/aeboards/aegis/rules.mk index 2e24be64bad..29eb5c8fbe8 100644 --- a/keyboards/aeboards/aegis/rules.mk +++ b/keyboards/aeboards/aegis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json index 7539c9bf45e..6f82ab71f5e 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/constellation/rev1/rules.mk b/keyboards/aeboards/constellation/rev1/rules.mk index d2950ac2b28..bc5a3a3498a 100755 --- a/keyboards/aeboards/constellation/rev1/rules.mk +++ b/keyboards/aeboards/constellation/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json index 95da6851c4b..1009cca20dd 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "processor": "STM32L422", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/constellation/rev2/rules.mk b/keyboards/aeboards/constellation/rev2/rules.mk index 6751ce2c275..0fa89d45d2d 100755 --- a/keyboards/aeboards/constellation/rev2/rules.mk +++ b/keyboards/aeboards/constellation/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L422 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json index d6fbbac789b..514fcb778ea 100644 --- a/keyboards/aeboards/constellation/rev3/info.json +++ b/keyboards/aeboards/constellation/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x065D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/constellation/rev3/rules.mk b/keyboards/aeboards/constellation/rev3/rules.mk index d2950ac2b28..bc5a3a3498a 100755 --- a/keyboards/aeboards/constellation/rev3/rules.mk +++ b/keyboards/aeboards/constellation/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json index 250521412b5..d56d3902c2b 100644 --- a/keyboards/aeboards/ext65/rev1/info.json +++ b/keyboards/aeboards/ext65/rev1/info.json @@ -7,6 +7,8 @@ "pid": "0xAE65", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B2", "B3", "B1", "B0", "F7", "F0", "F1", "F4", "F5", "F6"], diff --git a/keyboards/aeboards/ext65/rev1/rules.mk b/keyboards/aeboards/ext65/rev1/rules.mk index 2e24be64bad..29eb5c8fbe8 100644 --- a/keyboards/aeboards/ext65/rev1/rules.mk +++ b/keyboards/aeboards/ext65/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json index 8ef7f8d7483..7fbe7c2847d 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -7,6 +7,8 @@ "pid": "0xA652", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B14", "B6", "A0", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk index b2f7139899d..06567366084 100644 --- a/keyboards/aeboards/ext65/rev2/rules.mk +++ b/keyboards/aeboards/ext65/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json index e07f51f8172..42f2248cbc9 100644 --- a/keyboards/aeboards/ext65/rev3/info.json +++ b/keyboards/aeboards/ext65/rev3/info.json @@ -7,6 +7,8 @@ "pid": "0xA653", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "D5", "D3", "D2", "D1", "D0"], diff --git a/keyboards/aeboards/ext65/rev3/rules.mk b/keyboards/aeboards/ext65/rev3/rules.mk index cc07ce5924d..f1ec6515067 100644 --- a/keyboards/aeboards/ext65/rev3/rules.mk +++ b/keyboards/aeboards/ext65/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json index 4af84ee055f..ae952396375 100644 --- a/keyboards/aeboards/satellite/rev1/info.json +++ b/keyboards/aeboards/satellite/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6553", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["E6", "D5", "B2", "B3", "B7", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk index f59ff578716..125682bac3a 100644 --- a/keyboards/aeboards/satellite/rev1/rules.mk +++ b/keyboards/aeboards/satellite/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json index b53227a50d0..11e05ca08ae 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/breeze/rev0/rules.mk b/keyboards/afternoonlabs/breeze/rev0/rules.mk index 29c562ba0a4..7b63c0c2988 100644 --- a/keyboards/afternoonlabs/breeze/rev0/rules.mk +++ b/keyboards/afternoonlabs/breeze/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json index e69c88510a2..302b8eb7bdb 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/breeze/rev1/rules.mk b/keyboards/afternoonlabs/breeze/rev1/rules.mk index 7f174335f6c..151c93f7796 100644 --- a/keyboards/afternoonlabs/breeze/rev1/rules.mk +++ b/keyboards/afternoonlabs/breeze/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json index 643e9fbf257..a07fab20e29 100644 --- a/keyboards/afternoonlabs/gust/rev1/info.json +++ b/keyboards/afternoonlabs/gust/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/gust/rev1/rules.mk b/keyboards/afternoonlabs/gust/rev1/rules.mk index b33e485f99f..b48a43e89fc 100644 --- a/keyboards/afternoonlabs/gust/rev1/rules.mk +++ b/keyboards/afternoonlabs/gust/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json index 166548d154b..97e1a0f98ee 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk index bad16e02370..904c6b60cbd 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json index cb86c899ae1..33ff4b27f48 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk b/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk index 29c562ba0a4..7b63c0c2988 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk +++ b/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json index 5d555fadcf1..0b80bb9ac24 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk b/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk index 29c562ba0a4..7b63c0c2988 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk +++ b/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json index 8e77bc59fda..59eb7be5790 100644 --- a/keyboards/ai03/andromeda/info.json +++ b/keyboards/ai03/andromeda/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_ansi_wkl": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/ai03/andromeda/rules.mk b/keyboards/ai03/andromeda/rules.mk index fd449807869..0aeca0dd9f3 100644 --- a/keyboards/ai03/andromeda/rules.mk +++ b/keyboards/ai03/andromeda/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json new file mode 100644 index 00000000000..dd190d18ee0 --- /dev/null +++ b/keyboards/ai03/equinox/rev0/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/ai03/equinox/rev0/rules.mk b/keyboards/ai03/equinox/rev0/rules.mk index 9d7635000ac..5e28d2cc453 100644 --- a/keyboards/ai03/equinox/rev0/rules.mk +++ b/keyboards/ai03/equinox/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json new file mode 100644 index 00000000000..dd190d18ee0 --- /dev/null +++ b/keyboards/ai03/equinox/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/ai03/equinox/rev1/rules.mk b/keyboards/ai03/equinox/rev1/rules.mk index 9d7635000ac..5e28d2cc453 100644 --- a/keyboards/ai03/equinox/rev1/rules.mk +++ b/keyboards/ai03/equinox/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index a5428270f97..3a07c7224c3 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -8,6 +8,8 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/jp60/rules.mk b/keyboards/ai03/jp60/rules.mk index c37bcf9b2f0..d07172dd2d7 100644 --- a/keyboards/ai03/jp60/rules.mk +++ b/keyboards/ai03/jp60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json index f65d21ab803..6c069207e13 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/lunar/rules.mk b/keyboards/ai03/lunar/rules.mk index 3305f83bb56..0a85fffb85c 100644 --- a/keyboards/ai03/lunar/rules.mk +++ b/keyboards/ai03/lunar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json index d276e7fa2fa..6eed9347391 100644 --- a/keyboards/ai03/lunar_ii/info.json +++ b/keyboards/ai03/lunar_ii/info.json @@ -8,6 +8,8 @@ "pid": "0x0016", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "rows": [ "D0", "D1", "D2", "F0", "F1" ], diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk index 1a29d22700d..1448dc35c3c 100644 --- a/keyboards/ai03/lunar_ii/rules.mk +++ b/keyboards/ai03/lunar_ii/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index 9deccb9a307..5690c56e852 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk index a0f1ab94a94..c95da2740d8 100644 --- a/keyboards/ai03/orbit/rules.mk +++ b/keyboards/ai03/orbit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json index 19ae38fcdf0..ccf4c484d9f 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -8,6 +8,8 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/orbit_x/rules.mk b/keyboards/ai03/orbit_x/rules.mk index 3a4ae980b07..66711e46132 100644 --- a/keyboards/ai03/orbit_x/rules.mk +++ b/keyboards/ai03/orbit_x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json index f25c6f2dd22..64fb65aaeef 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/ai03/polaris/rules.mk b/keyboards/ai03/polaris/rules.mk index 63a57dcadb9..45377383806 100644 --- a/keyboards/ai03/polaris/rules.mk +++ b/keyboards/ai03/polaris/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json index d404e644a0c..c29799484dc 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/quasar/rules.mk b/keyboards/ai03/quasar/rules.mk index 0a33c7213cb..3f2eac5940c 100644 --- a/keyboards/ai03/quasar/rules.mk +++ b/keyboards/ai03/quasar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json index 90e2254046e..b008ef45b6c 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/info.json @@ -8,6 +8,8 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/ai03/soyuz/rules.mk b/keyboards/ai03/soyuz/rules.mk index 70a092a64e1..ed40609648d 100644 --- a/keyboards/ai03/soyuz/rules.mk +++ b/keyboards/ai03/soyuz/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/vega/info.json b/keyboards/ai03/vega/info.json index ee66f539c93..7b3c16cb526 100644 --- a/keyboards/ai03/vega/info.json +++ b/keyboards/ai03/vega/info.json @@ -8,6 +8,8 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ai03/vega/rules.mk b/keyboards/ai03/vega/rules.mk index fd449807869..0aeca0dd9f3 100644 --- a/keyboards/ai03/vega/rules.mk +++ b/keyboards/ai03/vega/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index 25c142f7958..a7a68e43b03 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -8,6 +8,8 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/ai03/voyager60_alps/rules.mk b/keyboards/ai03/voyager60_alps/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/ai03/voyager60_alps/rules.mk +++ b/keyboards/ai03/voyager60_alps/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json index d2cae832b5e..ad1f03501a7 100644 --- a/keyboards/akb/eb46/info.json +++ b/keyboards/akb/eb46/info.json @@ -7,6 +7,8 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/akb/eb46/rules.mk b/keyboards/akb/eb46/rules.mk index 717cc07b4b7..c58df49ea8f 100644 --- a/keyboards/akb/eb46/rules.mk +++ b/keyboards/akb/eb46/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/akb/raine/info.json b/keyboards/akb/raine/info.json index 2efbba3fe15..f6f648e137e 100644 --- a/keyboards/akb/raine/info.json +++ b/keyboards/akb/raine/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/akb/raine/rules.mk b/keyboards/akb/raine/rules.mk index 717cc07b4b7..c58df49ea8f 100644 --- a/keyboards/akb/raine/rules.mk +++ b/keyboards/akb/raine/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json index faee1850a37..a00144adf7a 100644 --- a/keyboards/akegata_denki/device_one/info.json +++ b/keyboards/akegata_denki/device_one/info.json @@ -7,6 +7,9 @@ "pid": "0xADD0", "device_version": "0.0.1" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", + "board": "ST_NUCLEO32_F042K6", "maintainer": "qmk", "community_layouts": ["60_ansi", "60_iso"], "layouts": { diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk index 8c05f6f5b51..6ac6abcf567 100644 --- a/keyboards/akegata_denki/device_one/rules.mk +++ b/keyboards/akegata_denki/device_one/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F042 -BOARD = ST_NUCLEO32_F042K6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index bbb928a3ea6..2dce0456c20 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json @@ -8,6 +8,8 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk index 1f8e81de20f..ca917bc5480 100644 --- a/keyboards/al1/rules.mk +++ b/keyboards/al1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index a42819b3a1a..8839fe8fc2a 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -8,6 +8,8 @@ "pid": "0xF902", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk index 5f68f998d3d..402cbe3fbbf 100644 --- a/keyboards/aleblazer/zodiark/rules.mk +++ b/keyboards/aleblazer/zodiark/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index 81b8613e5bd..f95b2f38920 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/alf/dc60/rules.mk b/keyboards/alf/dc60/rules.mk index 8434db38dd4..16be45209b4 100644 --- a/keyboards/alf/dc60/rules.mk +++ b/keyboards/alf/dc60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index eb78204fc7d..28275c46844 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk index d1f8584cb96..2eed748d1f0 100644 --- a/keyboards/alf/x11/rules.mk +++ b/keyboards/alf/x11/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index 7bb69d15e6a..2dbf4dcdc88 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/alf/x2/rules.mk +++ b/keyboards/alf/x2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 21895a1b2de..89ac7c7b17c 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xD4C4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_7u_space", "LAYOUT_all": "LAYOUT_7u_space" diff --git a/keyboards/alfredslab/swift65/hotswap/rules.mk b/keyboards/alfredslab/swift65/hotswap/rules.mk index a6a5692999d..bb40a3ee66c 100644 --- a/keyboards/alfredslab/swift65/hotswap/rules.mk +++ b/keyboards/alfredslab/swift65/hotswap/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - - # Build Options # change yes to no to disable # diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 154747b588d..0f1d9c428e4 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -8,6 +8,8 @@ "pid": "0xD4C3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_625u_space_split_bs", "LAYOUT_all": "LAYOUT_625u_space_split_bs" diff --git a/keyboards/alfredslab/swift65/solder/rules.mk b/keyboards/alfredslab/swift65/solder/rules.mk index 374b6c8b4a6..2697ebc6d5d 100644 --- a/keyboards/alfredslab/swift65/solder/rules.mk +++ b/keyboards/alfredslab/swift65/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json index 844b20d8820..56e2bf2cdfc 100644 --- a/keyboards/aliceh66/pianoforte/info.json +++ b/keyboards/aliceh66/pianoforte/info.json @@ -8,6 +8,8 @@ "pid": "0x7066", "vid": "0x6168" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk index 651f6df2249..2f9cd4eea95 100644 --- a/keyboards/aliceh66/pianoforte/rules.mk +++ b/keyboards/aliceh66/pianoforte/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor Frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json index c1a99905ba5..d6e7fa34e8e 100644 --- a/keyboards/aliceh66/pianoforte_hs/info.json +++ b/keyboards/aliceh66/pianoforte_hs/info.json @@ -8,6 +8,8 @@ "pid": "0x7068", "vid": "0x6168" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/aliceh66/pianoforte_hs/rules.mk b/keyboards/aliceh66/pianoforte_hs/rules.mk index 173f16ffe76..3488ea0dd24 100644 --- a/keyboards/aliceh66/pianoforte_hs/rules.mk +++ b/keyboards/aliceh66/pianoforte_hs/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor Frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index eb6144bdbfc..472bedb1faf 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2, "w":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}] diff --git a/keyboards/alpha/rules.mk b/keyboards/alpha/rules.mk index e1a53a1521a..ec53f47e70e 100755 --- a/keyboards/alpha/rules.mk +++ b/keyboards/alpha/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json index 51006056c92..1c1407b45b7 100644 --- a/keyboards/alpine65/info.json +++ b/keyboards/alpine65/info.json @@ -8,6 +8,8 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/alpine65/rules.mk b/keyboards/alpine65/rules.mk index 5b7d4e4de40..8e1200c9f50 100644 --- a/keyboards/alpine65/rules.mk +++ b/keyboards/alpine65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/alps64/info.json b/keyboards/alps64/info.json index 3bae33d9f8b..6c8a51fc272 100644 --- a/keyboards/alps64/info.json +++ b/keyboards/alps64/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/alps64/rules.mk b/keyboards/alps64/rules.mk index f328c3440c1..b07ffbcaaa7 100644 --- a/keyboards/alps64/rules.mk +++ b/keyboards/alps64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json index 791f60c2f86..ce9e5388d7e 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_2"], "layouts": { "LAYOUT_split_3x5_2": { diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk index d0e5ecd313c..99541b285bd 100644 --- a/keyboards/alt34/rev1/rules.mk +++ b/keyboards/alt34/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change to "no" to disable the options # diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json index 7eb9aed9829..822f18c906b 100644 --- a/keyboards/amag23/info.json +++ b/keyboards/amag23/info.json @@ -8,6 +8,8 @@ "pid": "0x2323", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/amag23/rules.mk b/keyboards/amag23/rules.mk index 517e4cd38d8..6cab98a6404 100644 --- a/keyboards/amag23/rules.mk +++ b/keyboards/amag23/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index cb7c274f109..81b0f08ef89 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -8,6 +8,8 @@ "pid": "0x6072", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/amjkeyboard/amj40/rules.mk b/keyboards/amjkeyboard/amj40/rules.mk index b27013f8630..3d5cb57ad50 100755 --- a/keyboards/amjkeyboard/amj40/rules.mk +++ b/keyboards/amjkeyboard/amj40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index e8f18ad4784..e0cc144cb87 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,8 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/amjkeyboard/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk index 77fe1ed6e16..262dfb657d1 100644 --- a/keyboards/amjkeyboard/amj60/rules.mk +++ b/keyboards/amjkeyboard/amj60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index 1135b3ed58b..f22677e20a0 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -8,6 +8,8 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/amjkeyboard/amj66/rules.mk b/keyboards/amjkeyboard/amj66/rules.mk index 23779c09665..cb4a880111b 100644 --- a/keyboards/amjkeyboard/amj66/rules.mk +++ b/keyboards/amjkeyboard/amj66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json index 3d565306865..402dac7a42f 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/info.json @@ -8,6 +8,8 @@ "pid": "0x6068", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/amjkeyboard/amj84/rules.mk b/keyboards/amjkeyboard/amj84/rules.mk index 8649486da66..254b0bc7bd1 100644 --- a/keyboards/amjkeyboard/amj84/rules.mk +++ b/keyboards/amjkeyboard/amj84/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json index 329232293e1..eacc4902213 100644 --- a/keyboards/amjkeyboard/amj96/info.json +++ b/keyboards/amjkeyboard/amj96/info.json @@ -8,6 +8,8 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/amjkeyboard/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk index 9e9f03f764c..dfe1d12b556 100644 --- a/keyboards/amjkeyboard/amj96/rules.mk +++ b/keyboards/amjkeyboard/amj96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 1b447027ef2..406bd992b28 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/amjkeyboard/amjpad/rules.mk b/keyboards/amjkeyboard/amjpad/rules.mk index 503f5fac8dd..cd5d6b66ea5 100644 --- a/keyboards/amjkeyboard/amjpad/rules.mk +++ b/keyboards/amjkeyboard/amjpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index fd6d3bd0a1f..979f4368104 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_2x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/anavi/macropad8/rules.mk b/keyboards/anavi/macropad8/rules.mk index c0f0e7f8575..f5e38fc8cbc 100644 --- a/keyboards/anavi/macropad8/rules.mk +++ b/keyboards/anavi/macropad8/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ano/info.json b/keyboards/ano/info.json index d5ac34a1bc5..94e1f828cc4 100644 --- a/keyboards/ano/info.json +++ b/keyboards/ano/info.json @@ -8,6 +8,8 @@ "pid": "0x0651", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ano/rules.mk b/keyboards/ano/rules.mk index 151f0cd8bc6..f0a88209b69 100644 --- a/keyboards/ano/rules.mk +++ b/keyboards/ano/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/anomalykb/a65i/info.json b/keyboards/anomalykb/a65i/info.json index ae249db7ef5..d3307d7964b 100644 --- a/keyboards/anomalykb/a65i/info.json +++ b/keyboards/anomalykb/a65i/info.json @@ -7,6 +7,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi": "LAYOUT_65_ansi_blocker", "LAYOUT_ansi_splitbs": "LAYOUT_65_ansi_blocker_split_bs", diff --git a/keyboards/anomalykb/a65i/rules.mk b/keyboards/anomalykb/a65i/rules.mk index 557477e9294..0df1feb1812 100644 --- a/keyboards/anomalykb/a65i/rules.mk +++ b/keyboards/anomalykb/a65i/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json index 32aaba37a19..c6d37930a4a 100644 --- a/keyboards/aos/tkl/info.json +++ b/keyboards/aos/tkl/info.json @@ -7,6 +7,8 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_iso_wkl": { "layout": [ diff --git a/keyboards/aos/tkl/rules.mk b/keyboards/aos/tkl/rules.mk index a0a1e94e36d..a927de843cb 100644 --- a/keyboards/aos/tkl/rules.mk +++ b/keyboards/aos/tkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json index 414565ce1c0..b385261282c 100644 --- a/keyboards/aozora/info.json +++ b/keyboards/aozora/info.json @@ -8,6 +8,8 @@ "pid": "0xE86A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/aozora/rules.mk b/keyboards/aozora/rules.mk index fab20c6c973..67d4dee2c76 100644 --- a/keyboards/aozora/rules.mk +++ b/keyboards/aozora/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json index 3eb12dda153..6a1ac3071b6 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x0030", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/aplyard/aplx6/rev1/rules.mk b/keyboards/aplyard/aplx6/rev1/rules.mk index 2f485606c24..879e2c47a37 100644 --- a/keyboards/aplyard/aplx6/rev1/rules.mk +++ b/keyboards/aplyard/aplx6/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 06fc50187a4..314d52dc8de 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x0040", "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/aplyard/aplx6/rev2/rules.mk b/keyboards/aplyard/aplx6/rev2/rules.mk index 22ada747ff9..90decf0341c 100644 --- a/keyboards/aplyard/aplx6/rev2/rules.mk +++ b/keyboards/aplyard/aplx6/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json index 00d29b54a01..f9ce9a8c82c 100644 --- a/keyboards/arabica37/rev1/info.json +++ b/keyboards/arabica37/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/arabica37/rev1/rules.mk b/keyboards/arabica37/rev1/rules.mk index 7997604e235..822a7cf01cb 100644 --- a/keyboards/arabica37/rev1/rules.mk +++ b/keyboards/arabica37/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index 57a3852a787..4be38bd497d 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk index c5f136bd156..2b6885bba1c 100644 --- a/keyboards/ares/rules.mk +++ b/keyboards/ares/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/arisu/info.json b/keyboards/arisu/info.json index bb7ce228c40..1fe2eadbe3e 100644 --- a/keyboards/arisu/info.json +++ b/keyboards/arisu/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/arisu/rules.mk b/keyboards/arisu/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/arisu/rules.mk +++ b/keyboards/arisu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index 6a2e1efd1fb..b224d3d5a6f 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -8,6 +8,8 @@ "pid": "0x4F46", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_1x5": { "layout": [ diff --git a/keyboards/arrayperipherals/1x4p1/rules.mk b/keyboards/arrayperipherals/1x4p1/rules.mk index 04c446ae157..125977e0276 100644 --- a/keyboards/arrayperipherals/1x4p1/rules.mk +++ b/keyboards/arrayperipherals/1x4p1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ash1800/info.json b/keyboards/ash1800/info.json index 3c7272d8848..2c9338b2f6f 100644 --- a/keyboards/ash1800/info.json +++ b/keyboards/ash1800/info.json @@ -7,6 +7,8 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ash1800/rules.mk b/keyboards/ash1800/rules.mk index 475f2666990..d1322df0ab6 100644 --- a/keyboards/ash1800/rules.mk +++ b/keyboards/ash1800/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json index 05b926cda0c..4bc7fb1987f 100644 --- a/keyboards/ash_xiix/info.json +++ b/keyboards/ash_xiix/info.json @@ -8,6 +8,8 @@ "pid": "0x14BC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ash_xiix/rules.mk b/keyboards/ash_xiix/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/ash_xiix/rules.mk +++ b/keyboards/ash_xiix/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json index 9838025ce5d..7a378871c7c 100644 --- a/keyboards/ashpil/modelm_usbc/info.json +++ b/keyboards/ashpil/modelm_usbc/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_fullsize_iso_wkl": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/ashpil/modelm_usbc/rules.mk b/keyboards/ashpil/modelm_usbc/rules.mk index bfa55a3d39b..6fe874e748b 100644 --- a/keyboards/ashpil/modelm_usbc/rules.mk +++ b/keyboards/ashpil/modelm_usbc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json index 1558e2d0583..8e5e511aa2f 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/info.json @@ -8,6 +8,8 @@ "pid": "0x6600", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk index 46b3df66bcb..0495864be4c 100644 --- a/keyboards/at_at/660m/rules.mk +++ b/keyboards/at_at/660m/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F072 -BOARD = GENERIC_STM32_F072XB - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json index 95011de4921..8c3f42d6d6b 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/info.json @@ -7,6 +7,8 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk index f0a3589a4b9..3a7c70a1024 100644 --- a/keyboards/atlantis/ak81_ve/rules.mk +++ b/keyboards/atlantis/ak81_ve/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atlas_65/info.json b/keyboards/atlas_65/info.json index 266e71118a2..7d755c37bfa 100644 --- a/keyboards/atlas_65/info.json +++ b/keyboards/atlas_65/info.json @@ -8,6 +8,8 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atlas_65/rules.mk b/keyboards/atlas_65/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/atlas_65/rules.mk +++ b/keyboards/atlas_65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json index 9a07a6dce0a..a4c0c18bf2f 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_grid": "LAYOUT_ortho_5x15" }, diff --git a/keyboards/atomic/rules.mk b/keyboards/atomic/rules.mk index d201f6232ad..2b1de65bb47 100644 --- a/keyboards/atomic/rules.mk +++ b/keyboards/atomic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/atreus/astar/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/atreus/astar/rules.mk b/keyboards/atreus/astar/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/atreus/astar/rules.mk +++ b/keyboards/atreus/astar/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/atreus/astar_mirrored/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/atreus/astar_mirrored/rules.mk b/keyboards/atreus/astar_mirrored/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/atreus/astar_mirrored/rules.mk +++ b/keyboards/atreus/astar_mirrored/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json new file mode 100644 index 00000000000..cf993be2471 --- /dev/null +++ b/keyboards/atreus/f103/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F103", + "bootloader": "stm32duino" +} diff --git a/keyboards/atreus/f103/rules.mk b/keyboards/atreus/f103/rules.mk index a18b4fa2316..9755a4a3c26 100644 --- a/keyboards/atreus/f103/rules.mk +++ b/keyboards/atreus/f103/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/atreus/feather/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk index 6280275c1e5..5e7d24b055b 100644 --- a/keyboards/atreus/feather/rules.mk +++ b/keyboards/atreus/feather/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/atreus/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/atreus/promicro/rules.mk b/keyboards/atreus/promicro/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/atreus/promicro/rules.mk +++ b/keyboards/atreus/promicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/info.json new file mode 100644 index 00000000000..0b2db81c11e --- /dev/null +++ b/keyboards/atreus/teensy2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/atreus/teensy2/rules.mk b/keyboards/atreus/teensy2/rules.mk index 320633f80f3..e69de29bb2d 100644 --- a/keyboards/atreus/teensy2/rules.mk +++ b/keyboards/atreus/teensy2/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json index 4bcde69be58..9818475ace0 100644 --- a/keyboards/atreus62/info.json +++ b/keyboards/atreus62/info.json @@ -8,6 +8,8 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] diff --git a/keyboards/atreus62/rules.mk b/keyboards/atreus62/rules.mk index 5e80a7e5df6..d1f7ba08156 100644 --- a/keyboards/atreus62/rules.mk +++ b/keyboards/atreus62/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json index 27a5bc2a821..a9522acd5dc 100644 --- a/keyboards/atreyu/rev1/info.json +++ b/keyboards/atreyu/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json index 45324ce73ea..5c74a40c92c 100644 --- a/keyboards/atreyu/rev2/info.json +++ b/keyboards/atreyu/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk index 1e05f827de5..23ebd8ba330 100644 --- a/keyboards/atreyu/rules.mk +++ b/keyboards/atreyu/rules.mk @@ -1,11 +1,5 @@ DEFAULT_FOLDER = atreyu/rev1 -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json index b73f4de3ae9..15dad625191 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}] diff --git a/keyboards/atset/at1/rules.mk b/keyboards/atset/at1/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/atset/at1/rules.mk +++ b/keyboards/atset/at1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json index 28a535db483..75945900e94 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}] diff --git a/keyboards/atset/at12/rules.mk b/keyboards/atset/at12/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/atset/at12/rules.mk +++ b/keyboards/atset/at12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json index e0a151da603..073d153474c 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/atset/at16/rules.mk b/keyboards/atset/at16/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/atset/at16/rules.mk +++ b/keyboards/atset/at16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json index 6f8eab5e62d..10c007aef16 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}] diff --git a/keyboards/atset/at3/rules.mk b/keyboards/atset/at3/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/atset/at3/rules.mk +++ b/keyboards/atset/at3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at6/info.json b/keyboards/atset/at6/info.json index abdaf10b9f2..47c5c1dbd90 100644 --- a/keyboards/atset/at6/info.json +++ b/keyboards/atset/at6/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] diff --git a/keyboards/atset/at6/rules.mk b/keyboards/atset/at6/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/atset/at6/rules.mk +++ b/keyboards/atset/at6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at9/info.json b/keyboards/atset/at9/info.json index b550240ce70..1efa4f5d487 100644 --- a/keyboards/atset/at9/info.json +++ b/keyboards/atset/at9/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] diff --git a/keyboards/atset/at9/rules.mk b/keyboards/atset/at9/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/atset/at9/rules.mk +++ b/keyboards/atset/at9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json index 34fdbadb33a..d3966d51856 100644 --- a/keyboards/atxkb/1894/info.json +++ b/keyboards/atxkb/1894/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/atxkb/1894/rules.mk b/keyboards/atxkb/1894/rules.mk index 777b8af1b39..c84da725191 100644 --- a/keyboards/atxkb/1894/rules.mk +++ b/keyboards/atxkb/1894/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json index 4c8e540720c..28adec5eab0 100644 --- a/keyboards/aurora65/info.json +++ b/keyboards/aurora65/info.json @@ -8,6 +8,8 @@ "pid": "0x4136", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk index a53d7daeb0f..f430af42f41 100644 --- a/keyboards/aurora65/rules.mk +++ b/keyboards/aurora65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index d753cce4bc7..5fdc54ca6cf 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v1/rules.mk b/keyboards/avalanche/v1/rules.mk index 9bb578594b1..ef90e04bc1d 100644 --- a/keyboards/avalanche/v1/rules.mk +++ b/keyboards/avalanche/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index 52c03b57a35..cbee32e690d 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk index 3b645daf9b9..8e241b2dfd6 100644 --- a/keyboards/avalanche/v2/rules.mk +++ b/keyboards/avalanche/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 1869c0165f0..1e004e2bf44 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v3/rules.mk b/keyboards/avalanche/v3/rules.mk index fbf76c7ae5f..5a35722be4e 100644 --- a/keyboards/avalanche/v3/rules.mk +++ b/keyboards/avalanche/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index b96cdc5ea78..f9bb00650e7 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk index 370dc1a6a8b..da4886f7d77 100644 --- a/keyboards/avalanche/v4/rules.mk +++ b/keyboards/avalanche/v4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json index 6d1c7f4e370..4a5f26325a7 100644 --- a/keyboards/aves60/info.json +++ b/keyboards/aves60/info.json @@ -8,6 +8,8 @@ "pid": "0xD408", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aves60/rules.mk b/keyboards/aves60/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/aves60/rules.mk +++ b/keyboards/aves60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json index eabd177533e..5938e1b07de 100644 --- a/keyboards/aves65/info.json +++ b/keyboards/aves65/info.json @@ -8,6 +8,8 @@ "pid": "0x9038", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/aves65/rules.mk b/keyboards/aves65/rules.mk index b95b0b5039f..951dd07d6e0 100644 --- a/keyboards/aves65/rules.mk +++ b/keyboards/aves65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json index 2d37eab6ff0..49b2069bcf8 100644 --- a/keyboards/axolstudio/foundation_gamma/info.json +++ b/keyboards/axolstudio/foundation_gamma/info.json @@ -8,6 +8,8 @@ "pid": "0xE3EB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi_tsangan": "LAYOUT_tkl_f13_ansi_tsangan", "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift" diff --git a/keyboards/axolstudio/foundation_gamma/rules.mk b/keyboards/axolstudio/foundation_gamma/rules.mk index a95ad7bcc0f..f84fabb7665 100644 --- a/keyboards/axolstudio/foundation_gamma/rules.mk +++ b/keyboards/axolstudio/foundation_gamma/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index 5c25c7df05e..1174a32d05b 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -8,6 +8,8 @@ "pid": "0xC89F", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/axolstudio/helpo/rules.mk b/keyboards/axolstudio/helpo/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/axolstudio/helpo/rules.mk +++ b/keyboards/axolstudio/helpo/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json index eef82fa2dd1..40aa7b8b704 100644 --- a/keyboards/axolstudio/yeti/hotswap/info.json +++ b/keyboards/axolstudio/yeti/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x9F9E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/axolstudio/yeti/hotswap/rules.mk b/keyboards/axolstudio/yeti/hotswap/rules.mk index 52474311b13..9a194e37240 100644 --- a/keyboards/axolstudio/yeti/hotswap/rules.mk +++ b/keyboards/axolstudio/yeti/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json index 0d7b5f2b097..7bd5d8e0953 100644 --- a/keyboards/axolstudio/yeti/soldered/info.json +++ b/keyboards/axolstudio/yeti/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x9F9F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice": { diff --git a/keyboards/axolstudio/yeti/soldered/rules.mk b/keyboards/axolstudio/yeti/soldered/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/axolstudio/yeti/soldered/rules.mk +++ b/keyboards/axolstudio/yeti/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json index d8093bad72a..325ab9d7215 100644 --- a/keyboards/aya/info.json +++ b/keyboards/aya/info.json @@ -8,6 +8,8 @@ "pid": "0x2925", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] diff --git a/keyboards/aya/rules.mk b/keyboards/aya/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/aya/rules.mk +++ b/keyboards/aya/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json index da3eb62a2f6..a587172d041 100644 --- a/keyboards/b_sides/rev41lp/info.json +++ b/keyboards/b_sides/rev41lp/info.json @@ -8,6 +8,8 @@ "pid": "0x5F10", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_rev41lp": "LAYOUT" }, diff --git a/keyboards/b_sides/rev41lp/rules.mk b/keyboards/b_sides/rev41lp/rules.mk index 27d9decbbfb..a2444417d6c 100644 --- a/keyboards/b_sides/rev41lp/rules.mk +++ b/keyboards/b_sides/rev41lp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json index 57840b4e12f..8cff2b90605 100644 --- a/keyboards/bacca70/info.json +++ b/keyboards/bacca70/info.json @@ -8,6 +8,8 @@ "pid": "0x6970", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/bacca70/rules.mk b/keyboards/bacca70/rules.mk index a0b213f847a..718a1e8d099 100644 --- a/keyboards/bacca70/rules.mk +++ b/keyboards/bacca70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json index 3fc5221f71a..4fed73eab9a 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/info.json @@ -9,6 +9,8 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/baguette/rules.mk b/keyboards/baguette/rules.mk index 6c3cc413f9e..a949e5d4d9a 100644 --- a/keyboards/baguette/rules.mk +++ b/keyboards/baguette/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json index fadf279596f..ee519b01f63 100644 --- a/keyboards/bajjak/info.json +++ b/keyboards/bajjak/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_6x7": { "layout": [ diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk index 6bbe7e3b289..9a93aea27fe 100644 --- a/keyboards/bajjak/rules.mk +++ b/keyboards/bajjak/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # If you have Left LEDs (see # https://geekhack.org/index.php?topic=22780.msg873819#msg873819 for # details), include the following define: diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index f78621ec412..c9af481eb06 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -8,6 +8,8 @@ "pid": "0xF4B5", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk index 29599b32466..18ccf846ecc 100644 --- a/keyboards/bandominedoni/rules.mk +++ b/keyboards/bandominedoni/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/bantam44/info.json b/keyboards/bantam44/info.json index 4531a7e28ea..aadd885f6ad 100644 --- a/keyboards/bantam44/info.json +++ b/keyboards/bantam44/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3, "w":1.25}, {"label":"K32", "x":2.5, "y":3, "w":1.25}, {"label":"K33", "x":3.75, "y":3, "w":1.25}, {"label":"K34", "x":5, "y":3, "w":2.75}, {"label":"K35", "x":7.75, "y":3, "w":1.25}, {"label":"K36", "x":9, "y":3}, {"label":"K37", "x":10, "y":3}, {"label":"K38", "x":11, "y":3}] diff --git a/keyboards/bantam44/rules.mk b/keyboards/bantam44/rules.mk index eee48d6ef96..34dd06e002a 100644 --- a/keyboards/bantam44/rules.mk +++ b/keyboards/bantam44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json index caa0af6213c..f21e03ddbaf 100644 --- a/keyboards/barleycorn_smd/info.json +++ b/keyboards/barleycorn_smd/info.json @@ -7,6 +7,8 @@ "pid": "0x4749", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/barleycorn_smd/rules.mk b/keyboards/barleycorn_smd/rules.mk index f0549470080..173368a047c 100644 --- a/keyboards/barleycorn_smd/rules.mk +++ b/keyboards/barleycorn_smd/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/info.json index aad3ac3bb23..d0909322c98 100644 --- a/keyboards/barracuda/info.json +++ b/keyboards/barracuda/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x11": { "layout": [ diff --git a/keyboards/barracuda/rules.mk b/keyboards/barracuda/rules.mk index 781cebc8f03..3b6a1809db1 100644 --- a/keyboards/barracuda/rules.mk +++ b/keyboards/barracuda/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json index 614b8ecac71..559aac9046b 100644 --- a/keyboards/basekeys/slice/rev1/info.json +++ b/keyboards/basekeys/slice/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEC17", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk index 01089b45293..992af66fa22 100644 --- a/keyboards/basekeys/slice/rev1/rules.mk +++ b/keyboards/basekeys/slice/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # this is split keyboard. SPLIT_KEYBOARD = yes diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json index ece3b725618..aeddee6188a 100644 --- a/keyboards/basekeys/slice/rev1_rgb/info.json +++ b/keyboards/basekeys/slice/rev1_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0xEC15", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk index d4dade7602a..e9d1e52c166 100644 --- a/keyboards/basekeys/slice/rev1_rgb/rules.mk +++ b/keyboards/basekeys/slice/rev1_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # this is split keyboard. SPLIT_KEYBOARD = yes diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index f8819e51e46..fa3ceb40674 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -8,6 +8,8 @@ "pid": "0xEAF3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}] diff --git a/keyboards/basekeys/trifecta/rules.mk b/keyboards/basekeys/trifecta/rules.mk index d82233c7504..3989cc05ff0 100644 --- a/keyboards/basekeys/trifecta/rules.mk +++ b/keyboards/basekeys/trifecta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json index c26fecaf1ba..d976a2811cd 100644 --- a/keyboards/basketweave/info.json +++ b/keyboards/basketweave/info.json @@ -8,6 +8,8 @@ "pid": "0x8989", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk index 138ccfe3e22..b43c5121f47 100644 --- a/keyboards/basketweave/rules.mk +++ b/keyboards/basketweave/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index c2ff6d458a9..cbe8ac12e72 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis Nano (3x5) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index 72d82bdf50e..5196e2f5e96 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index b83dc6c3f81..9e25f2efe7c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Nano (3x5) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index a40b3a62373..1176b482aea 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 78453c44ffc..536d622c0d6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Nano (3x5) Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index a40b3a62373..1176b482aea 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 98f436f52b8..b89c90736d6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Nano (3x5) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 13c1b399610..b67408f28ed 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 98f436f52b8..b89c90736d6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Nano (3x5) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 13c1b399610..b67408f28ed 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index b344c1cbfcb..b2a9b06147d 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Nano (3x5) STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 0847e9ce1fa..3895209c6ab 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 54eda1eadf9..9fa70f3ca14 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis Mini (3x6) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index 72d82bdf50e..5196e2f5e96 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 7edaf111a96..6a03ec9a3ab 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Mini (3x6) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index c3f278c003d..7e5e593915d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index 02fe2e9ef31..7186cb2c049 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Mini (3x6) Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index c3f278c003d..7e5e593915d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 64c663c7c9d..17dc0c1222d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Mini (3x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 13c1b399610..b67408f28ed 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 64c663c7c9d..17dc0c1222d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Mini (3x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 13c1b399610..b67408f28ed 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 8aa7bf24c93..b041972cfef 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Mini (3x6) STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 0847e9ce1fa..3895209c6ab 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index a42035157b1..ec2b0cbad0a 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis (4x6) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index 9015f3a8b2c..f9e94a34dff 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index e3924b49b25..c63ceac72cf 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis (4x6) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index fa5fe80405c..f643c2d0826 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index 3acba65a6b8..6d0300de2e0 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis (4x6) Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index fa5fe80405c..f643c2d0826 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 928a850860d..a9a58400e9d 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis (4x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 13c1b399610..b67408f28ed 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 928a850860d..a9a58400e9d 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis (4x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 13c1b399610..b67408f28ed 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 932bf09a320..e869d194662 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis (4x6) STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 0847e9ce1fa..3895209c6ab 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json index 59f3b0d0710..eec856a51f1 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Dilemma (3x5+2) Assembled" + "keyboard_name": "Dilemma (3x5+2) Assembled", + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk index ac660f9af84..5db74a9d847 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json index 38ce4738f9a..4944cc2090b 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Dilemma (3x5+2) Splinky" + "keyboard_name": "Dilemma (3x5+2) Splinky", + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk index 6b41bad2726..1e33cc10865 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 2dda30b7cae..0b7332e2361 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -4,6 +4,8 @@ "device_version": "2.0.0", "pid": "0x1835" }, + "processor": "RP2040", + "bootloader": "rp2040", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index f50350a869d..5ab695a6c24 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index 8e09212116a..a701797dc06 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Scylla Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index cf2041ea1c7..b68437c19e4 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json index a4949aaf5f1..fe099a811d2 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Scylla Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index 0c131a2eafd..985f9489c2b 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json index 8488a2e337d..087fce82802 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Scylla Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index 0c131a2eafd..985f9489c2b 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json index e6bcc6ca2f5..dcd638efa39 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Scylla Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index 8dfc0256ab5..8e2235ee9f9 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json index e6bcc6ca2f5..dcd638efa39 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Scylla Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index 8dfc0256ab5..8e2235ee9f9 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index 7963834a797..42d6b6c5207 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Scylla STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 39fc183e1dd..70f7784de60 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index 2e0f7587047..b058d2424a8 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Skeletyl Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index cf2041ea1c7..b68437c19e4 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json index 0d20c14c3dd..91bb069a756 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Skeletyl Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index 0c131a2eafd..985f9489c2b 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/skeletyl/v1/info.json b/keyboards/bastardkb/skeletyl/v1/info.json deleted file mode 100644 index ad889c23048..00000000000 --- a/keyboards/bastardkb/skeletyl/v1/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usb": { - "device_version": "1.0.0" - } -} diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json index b339ca877c2..a0d6611bf39 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Skeletyl Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index 0c131a2eafd..985f9489c2b 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json index cdcf967c354..7b89748f813 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Skeletyl Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index 8dfc0256ab5..8e2235ee9f9 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json index cdcf967c354..7b89748f813 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Skeletyl Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index 8dfc0256ab5..8e2235ee9f9 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index 34e40c9b387..2713d23e589 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Skeletyl STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index 39fc183e1dd..70f7784de60 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 9529c1305bd..53fd952c8c1 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -5,6 +5,8 @@ "device_version": "0.0.1", "pid": "0x1828" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_4x6_5": { "layout": [ diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk index 070c6b27adb..323b24ba201 100644 --- a/keyboards/bastardkb/tbk/rules.mk +++ b/keyboards/bastardkb/tbk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 24664f13ef1..025b4424682 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "TBK Mini Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index cf2041ea1c7..b68437c19e4 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index f9ebb180692..51fc9a9a549 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index 0c131a2eafd..985f9489c2b 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index a0ef2767f90..83964b727fb 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index 0c131a2eafd..985f9489c2b 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index b0b05fba8a0..63b44040aef 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index 8dfc0256ab5..8e2235ee9f9 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index b0b05fba8a0..63b44040aef 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index 8dfc0256ab5..8e2235ee9f9 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index 7595dab4365..a07d65bdd36 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 39fc183e1dd..70f7784de60 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json index 90877125565..5574bf6da4f 100644 --- a/keyboards/bbrfkr/dynamis/info.json +++ b/keyboards/bbrfkr/dynamis/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/bbrfkr/dynamis/rules.mk b/keyboards/bbrfkr/dynamis/rules.mk index 6fa6562d9e7..aef3d2a28a0 100644 --- a/keyboards/bbrfkr/dynamis/rules.mk +++ b/keyboards/bbrfkr/dynamis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json index 5d9f1cac76c..39f16ab6c94 100644 --- a/keyboards/bear_face/info.json +++ b/keyboards/bear_face/info.json @@ -7,5 +7,7 @@ "usb": { "vid": "0xFEED", "pid": "0x09F5" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bear_face/rules.mk b/keyboards/bear_face/rules.mk index f198cf7cc2d..3c6f2691442 100644 --- a/keyboards/bear_face/rules.mk +++ b/keyboards/bear_face/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/beatervan/info.json b/keyboards/beatervan/info.json index beeffae7a50..8218fa78fcc 100644 --- a/keyboards/beatervan/info.json +++ b/keyboards/beatervan/info.json @@ -8,6 +8,8 @@ "pid": "0x6276", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/beatervan/rules.mk b/keyboards/beatervan/rules.mk index 1f2745a03a3..5cc6e14a93b 100644 --- a/keyboards/beatervan/rules.mk +++ b/keyboards/beatervan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json index 90ac25f360b..dab37baf045 100644 --- a/keyboards/bemeier/bmek/rev1/info.json +++ b/keyboards/bemeier/bmek/rev1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev1/rules.mk b/keyboards/bemeier/bmek/rev1/rules.mk index 770446f52ac..e9b89a01e1c 100755 --- a/keyboards/bemeier/bmek/rev1/rules.mk +++ b/keyboards/bemeier/bmek/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json index e557e4d3076..65be217368d 100644 --- a/keyboards/bemeier/bmek/rev2/info.json +++ b/keyboards/bemeier/bmek/rev2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev2/rules.mk b/keyboards/bemeier/bmek/rev2/rules.mk index 770446f52ac..e9b89a01e1c 100755 --- a/keyboards/bemeier/bmek/rev2/rules.mk +++ b/keyboards/bemeier/bmek/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json index b377cdff008..14c0e6d7cb3 100644 --- a/keyboards/bemeier/bmek/rev3/info.json +++ b/keyboards/bemeier/bmek/rev3/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev3/rules.mk b/keyboards/bemeier/bmek/rev3/rules.mk index 770446f52ac..e9b89a01e1c 100755 --- a/keyboards/bemeier/bmek/rev3/rules.mk +++ b/keyboards/bemeier/bmek/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json index be03a2da1ae..ff27d60a063 100644 --- a/keyboards/bfake/info.json +++ b/keyboards/bfake/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk index eb4db8cd618..c7e6d3a3bb2 100644 --- a/keyboards/bfake/rules.mk +++ b/keyboards/bfake/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json index 3c21ef1b463..e9bbf28b0c3 100644 --- a/keyboards/biacco42/ergo42/rev1/info.json +++ b/keyboards/biacco42/ergo42/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0042", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_4x14": { "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"L06", "x":6, "y":0}, {"label":"R00", "x":8, "y":0}, {"label":"R01", "x":9, "y":0}, {"label":"R02", "x":10, "y":0}, {"label":"R03", "x":11, "y":0}, {"label":"R04", "x":12, "y":0}, {"label":"R05", "x":13, "y":0}, {"label":"R06", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"L16", "x":6, "y":1}, {"label":"R10", "x":8, "y":1}, {"label":"R11", "x":9, "y":1}, {"label":"R12", "x":10, "y":1}, {"label":"R13", "x":11, "y":1}, {"label":"R14", "x":12, "y":1}, {"label":"R15", "x":13, "y":1}, {"label":"R16", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"L26", "x":6, "y":2}, {"label":"R20", "x":8, "y":2}, {"label":"R21", "x":9, "y":2}, {"label":"R22", "x":10, "y":2}, {"label":"R23", "x":11, "y":2}, {"label":"R24", "x":12, "y":2}, {"label":"R25", "x":13, "y":2}, {"label":"R26", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"L36", "x":6, "y":3}, {"label":"R30", "x":8, "y":3}, {"label":"R31", "x":9, "y":3}, {"label":"R32", "x":10, "y":3}, {"label":"R33", "x":11, "y":3}, {"label":"R34", "x":12, "y":3}, {"label":"R35", "x":13, "y":3}, {"label":"R36", "x":14, "y":3}] diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk index 9420c9b4eb9..62044b6c13a 100644 --- a/keyboards/biacco42/ergo42/rules.mk +++ b/keyboards/biacco42/ergo42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json index cc7bb4f713f..629bbd139e6 100644 --- a/keyboards/biacco42/meishi/info.json +++ b/keyboards/biacco42/meishi/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/biacco42/meishi/rules.mk b/keyboards/biacco42/meishi/rules.mk index 63aadefc79d..b6e2a5f9a41 100644 --- a/keyboards/biacco42/meishi/rules.mk +++ b/keyboards/biacco42/meishi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json index e63b586b69f..ebdfc390281 100644 --- a/keyboards/biacco42/meishi2/info.json +++ b/keyboards/biacco42/meishi2/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/biacco42/meishi2/rules.mk b/keyboards/biacco42/meishi2/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/biacco42/meishi2/rules.mk +++ b/keyboards/biacco42/meishi2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/binepad/bn003/info.json b/keyboards/binepad/bn003/info.json index aeff56fb015..3dd85b2fe6a 100644 --- a/keyboards/binepad/bn003/info.json +++ b/keyboards/binepad/bn003/info.json @@ -8,6 +8,8 @@ "pid": "0x4287", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/binepad/bn003/rules.mk b/keyboards/binepad/bn003/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/binepad/bn003/rules.mk +++ b/keyboards/binepad/bn003/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json index 528cf570169..36e90dd10c9 100644 --- a/keyboards/binepad/bn009/info.json +++ b/keyboards/binepad/bn009/info.json @@ -8,6 +8,8 @@ "pid": "0x4295", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] diff --git a/keyboards/binepad/bn009/rules.mk b/keyboards/binepad/bn009/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/binepad/bn009/rules.mk +++ b/keyboards/binepad/bn009/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 62f610fd7eb..09513eedb3f 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,8 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb", "60_ansi_arrow", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/bioi/f60/rules.mk b/keyboards/bioi/f60/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/bioi/f60/rules.mk +++ b/keyboards/bioi/f60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index a171f68c136..bdc8e9b5965 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -8,6 +8,8 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk index 3cbf7621f21..d6c97aa974c 100644 --- a/keyboards/bioi/g60/rules.mk +++ b/keyboards/bioi/g60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = qmk-dfu - SRC += usart.c \ ble.c \ main.c diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index 01736b37f08..d8ef72cbb89 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,8 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk index 7aabe3c7cf0..e3420b4a28a 100644 --- a/keyboards/bioi/g60ble/rules.mk +++ b/keyboards/bioi/g60ble/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 8ed769c6166..c71f000e2fb 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -8,6 +8,8 @@ "pid": "0x6581", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk index 3cbf7621f21..d6c97aa974c 100644 --- a/keyboards/bioi/morgan65/rules.mk +++ b/keyboards/bioi/morgan65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = qmk-dfu - SRC += usart.c \ ble.c \ main.c diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index fba9940ffb7..8de355ee4be 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -8,6 +8,8 @@ "pid": "0x5365", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/s65/rules.mk b/keyboards/bioi/s65/rules.mk index aaead314e97..332501b7748 100644 --- a/keyboards/bioi/s65/rules.mk +++ b/keyboards/bioi/s65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json index c4265ce6adf..c869fcbef52 100644 --- a/keyboards/blackplum/info.json +++ b/keyboards/blackplum/info.json @@ -8,6 +8,8 @@ "pid": "0x4250", "device_version": "10.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/blackplum/rules.mk b/keyboards/blackplum/rules.mk index 5637ac60071..817d092c27c 100644 --- a/keyboards/blackplum/rules.mk +++ b/keyboards/blackplum/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/blank/blank01/info.json b/keyboards/blank/blank01/info.json index e03421d82b7..10cf77f7a03 100644 --- a/keyboards/blank/blank01/info.json +++ b/keyboards/blank/blank01/info.json @@ -8,6 +8,8 @@ "pid": "0x4B01", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/blank/blank01/rules.mk b/keyboards/blank/blank01/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/blank/blank01/rules.mk +++ b/keyboards/blank/blank01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json index aec3bfcbd3c..6d4a446bc5f 100644 --- a/keyboards/blank_tehnologii/manibus/info.json +++ b/keyboards/blank_tehnologii/manibus/info.json @@ -9,6 +9,8 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/blank_tehnologii/manibus/rules.mk b/keyboards/blank_tehnologii/manibus/rules.mk index 3ad1939d715..1321ae0d173 100644 --- a/keyboards/blank_tehnologii/manibus/rules.mk +++ b/keyboards/blank_tehnologii/manibus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 332c5a5f128..47561bc286a 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -8,6 +8,8 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/blaster75/rules.mk b/keyboards/blaster75/rules.mk index d851baa2c4d..997fedb0b17 100644 --- a/keyboards/blaster75/rules.mk +++ b/keyboards/blaster75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/blockboy/ac980mini/rules.mk b/keyboards/blockboy/ac980mini/rules.mk index ab93d62afd8..e564d512dad 100644 --- a/keyboards/blockboy/ac980mini/rules.mk +++ b/keyboards/blockboy/ac980mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json index 4e584d24bbc..404614fd99b 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0}, {"label":"Tab", "x":0.16, "y":1}, {"label":"Q", "x":1.16, "y":1}, {"label":"W", "x":2.16, "y":1}, {"label":"E", "x":3.16, "y":1}, {"label":"R", "x":4.16, "y":1}, {"label":"T", "x":5.16, "y":1}, {"label":"Y", "x":6.16, "y":1}, {"label":"U", "x":7.16, "y":1}, {"label":"I", "x":8.16, "y":1}, {"label":"O", "x":9.16, "y":1}, {"label":"P", "x":10.16, "y":1}, {"label":"[", "x":11.16, "y":1}, {"label":"]", "x":12.16, "y":1}, {"label":"\\", "x":13.16, "y":1}, {"label":"LCtrl", "x":0.33, "y":2}, {"label":"A", "x":1.33, "y":2}, {"label":"S", "x":2.33, "y":2}, {"label":"D", "x":3.33, "y":2}, {"label":"F", "x":4.33, "y":2}, {"label":"G", "x":5.33, "y":2}, {"label":"H", "x":6.33, "y":2}, {"label":"J", "x":7.33, "y":2}, {"label":"K", "x":8.33, "y":2}, {"label":"L", "x":9.33, "y":2}, {"label":";", "x":10.33, "y":2}, {"label":"\"", "x":11.33, "y":2}, {"label":"Enter", "x":12.66, "y":2}, {"label":"LShift", "x":0.5, "y":3}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":",", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"Up", "x":11.5, "y":3}, {"label":"Fn", "x":12.83, "y":3}, {"label":"Esc", "x":0, "y":4}, {"label":"Caps Lock", "x":1, "y":4}, {"label":"LAlt", "x":2, "y":4}, {"label":"LGUI", "x":3, "y":4}, {"label":"Space", "x":4, "y":4, "w":6}, {"label":"Left", "x":10.5, "y":4}, {"label":"Down", "x":11.5, "y":4}, {"label":"Right", "x":12.5, "y":4}] diff --git a/keyboards/blockey/rules.mk b/keyboards/blockey/rules.mk index 7afe6055f03..08022075e7f 100644 --- a/keyboards/blockey/rules.mk +++ b/keyboards/blockey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index c15bf19f368..8cdf8f24d16 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json @@ -8,6 +8,8 @@ "pid": "0x3046", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/bluebell/swoop/rules.mk b/keyboards/bluebell/swoop/rules.mk index 5b69caf9e1b..fc87c614046 100644 --- a/keyboards/bluebell/swoop/rules.mk +++ b/keyboards/bluebell/swoop/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json index 9a76a13e93e..49d67451cb6 100644 --- a/keyboards/boardrun/bizarre/info.json +++ b/keyboards/boardrun/bizarre/info.json @@ -9,6 +9,8 @@ "pid": "0x5339", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/boardrun/bizarre/rules.mk b/keyboards/boardrun/bizarre/rules.mk index 42e7cc3f2e9..e027898b626 100644 --- a/keyboards/boardrun/bizarre/rules.mk +++ b/keyboards/boardrun/bizarre/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json index 8add28d0dad..60839d5ef08 100644 --- a/keyboards/boardrun/classic/info.json +++ b/keyboards/boardrun/classic/info.json @@ -9,6 +9,8 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_classic": { "layout": [ diff --git a/keyboards/boardrun/classic/rules.mk b/keyboards/boardrun/classic/rules.mk index b5761555d40..3c777809b4a 100644 --- a/keyboards/boardrun/classic/rules.mk +++ b/keyboards/boardrun/classic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json index 409ecde6804..76fea555e4c 100644 --- a/keyboards/boardwalk/info.json +++ b/keyboards/boardwalk/info.json @@ -8,6 +8,8 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT_ortho_5x14": { diff --git a/keyboards/boardwalk/rules.mk b/keyboards/boardwalk/rules.mk index 39b19a9377a..bca0082d2ed 100644 --- a/keyboards/boardwalk/rules.mk +++ b/keyboards/boardwalk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json index 1b939755dfd..35511b2ab99 100644 --- a/keyboards/bobpad/info.json +++ b/keyboards/bobpad/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/bobpad/rules.mk b/keyboards/bobpad/rules.mk index fc1e69e1988..453f0a34d38 100644 --- a/keyboards/bobpad/rules.mk +++ b/keyboards/bobpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json index 966c9cdae44..7e32e74a56e 100644 --- a/keyboards/bolsa/bolsalice/info.json +++ b/keyboards/bolsa/bolsalice/info.json @@ -6,6 +6,8 @@ "vid": "0x4253", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "url": "", "maintainer": "qmk", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/bolsa/bolsalice/rules.mk b/keyboards/bolsa/bolsalice/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/bolsa/bolsalice/rules.mk +++ b/keyboards/bolsa/bolsalice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json index 00e11799fec..3db2ab2e111 100644 --- a/keyboards/bolsa/damapad/info.json +++ b/keyboards/bolsa/damapad/info.json @@ -8,6 +8,8 @@ "pid": "0x6470", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_wkl": { "layout": [{ diff --git a/keyboards/bolsa/damapad/rules.mk b/keyboards/bolsa/damapad/rules.mk index 48717046e46..395f25f859e 100644 --- a/keyboards/bolsa/damapad/rules.mk +++ b/keyboards/bolsa/damapad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bop/info.json b/keyboards/bop/info.json index 874e797763c..a10de48d68f 100644 --- a/keyboards/bop/info.json +++ b/keyboards/bop/info.json @@ -8,6 +8,8 @@ "pid": "0x626F", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bop/rules.mk b/keyboards/bop/rules.mk index df76d69d122..1eca777d610 100644 --- a/keyboards/bop/rules.mk +++ b/keyboards/bop/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json index f0d832afbf4..b51552a9766 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/info.json @@ -8,6 +8,8 @@ "pid": "0x4176", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk index 5a00322c466..8d99a6cd0bc 100644 --- a/keyboards/boston/rules.mk +++ b/keyboards/boston/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json index 1279dc66857..5ce23750625 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/info.json @@ -2,5 +2,8 @@ "usb": { "device_version": "20.1.9" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 6 } diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk index 69919a16c6c..a32fadf0b0e 100644 --- a/keyboards/boston_meetup/2019/rules.mk +++ b/keyboards/boston_meetup/2019/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json index d6b521f24d9..c0ea4c9b8a6 100644 --- a/keyboards/botanicalkeyboards/fm2u/info.json +++ b/keyboards/botanicalkeyboards/fm2u/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_1u": { "layout": [ diff --git a/keyboards/botanicalkeyboards/fm2u/rules.mk b/keyboards/botanicalkeyboards/fm2u/rules.mk index d998f558168..6ff9b4e02ba 100644 --- a/keyboards/botanicalkeyboards/fm2u/rules.mk +++ b/keyboards/botanicalkeyboards/fm2u/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/box75/info.json b/keyboards/box75/info.json index af7e75360ba..fabf306730d 100644 --- a/keyboards/box75/info.json +++ b/keyboards/box75/info.json @@ -8,6 +8,8 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/box75/rules.mk b/keyboards/box75/rules.mk index 0427bb23fd7..93f25a13d8d 100644 --- a/keyboards/box75/rules.mk +++ b/keyboards/box75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json index 5750b19a6b7..cb9b7d148d2 100644 --- a/keyboards/bpiphany/four_banger/info.json +++ b/keyboards/bpiphany/four_banger/info.json @@ -8,6 +8,8 @@ "pid": "0x2004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_2x2": { "layout": [ diff --git a/keyboards/bpiphany/four_banger/rules.mk b/keyboards/bpiphany/four_banger/rules.mk index 8f9b670fd9c..21fd8f40ee0 100644 --- a/keyboards/bpiphany/four_banger/rules.mk +++ b/keyboards/bpiphany/four_banger/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/frosty_flake/20130602/rules.mk b/keyboards/bpiphany/frosty_flake/20130602/rules.mk index bd7ed92a612..0e2690e65e2 100644 --- a/keyboards/bpiphany/frosty_flake/20130602/rules.mk +++ b/keyboards/bpiphany/frosty_flake/20130602/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/frosty_flake/20140521/rules.mk b/keyboards/bpiphany/frosty_flake/20140521/rules.mk index bf3dab52673..6b5ffd3fc8e 100644 --- a/keyboards/bpiphany/frosty_flake/20140521/rules.mk +++ b/keyboards/bpiphany/frosty_flake/20140521/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json index 551145239bb..021bac2ddd0 100644 --- a/keyboards/bpiphany/frosty_flake/info.json +++ b/keyboards/bpiphany/frosty_flake/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json index 2938b1b6eb0..9dcba8091ad 100644 --- a/keyboards/bpiphany/ghost_squid/info.json +++ b/keyboards/bpiphany/ghost_squid/info.json @@ -8,6 +8,8 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": [ "fullsize_ansi", "fullsize_iso" diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk index b4b4c1ef3e0..2f6a5a7346e 100644 --- a/keyboards/bpiphany/ghost_squid/rules.mk +++ b/keyboards/bpiphany/ghost_squid/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json index 0caa64e525b..d368b1b8860 100644 --- a/keyboards/bpiphany/hid_liber/info.json +++ b/keyboards/bpiphany/hid_liber/info.json @@ -8,6 +8,8 @@ "pid": "0xB919", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk index ecdc53dad14..fc98be5c123 100755 --- a/keyboards/bpiphany/hid_liber/rules.mk +++ b/keyboards/bpiphany/hid_liber/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json index f8d855de88d..13de5a5fd6e 100644 --- a/keyboards/bpiphany/kitten_paw/info.json +++ b/keyboards/bpiphany/kitten_paw/info.json @@ -8,6 +8,8 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["fullsize_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk index 947b6a1d0dc..43ebddd3574 100644 --- a/keyboards/bpiphany/kitten_paw/rules.mk +++ b/keyboards/bpiphany/kitten_paw/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/pegasushoof/info.json b/keyboards/bpiphany/pegasushoof/info.json index 7b8a2abe404..5e096015cbb 100644 --- a/keyboards/bpiphany/pegasushoof/info.json +++ b/keyboards/bpiphany/pegasushoof/info.json @@ -6,5 +6,7 @@ "vid": "0x4245", "pid": "0x6050", "device_version": "1.0.4" - } + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk index 77210cfe7d5..df85bc03755 100644 --- a/keyboards/bpiphany/pegasushoof/rules.mk +++ b/keyboards/bpiphany/pegasushoof/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json index 016568067e0..94059d0c2b6 100644 --- a/keyboards/bpiphany/sixshooter/info.json +++ b/keyboards/bpiphany/sixshooter/info.json @@ -8,6 +8,8 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}] diff --git a/keyboards/bpiphany/sixshooter/rules.mk b/keyboards/bpiphany/sixshooter/rules.mk index 66e1907f5af..315dc5de534 100644 --- a/keyboards/bpiphany/sixshooter/rules.mk +++ b/keyboards/bpiphany/sixshooter/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json index d31f2e002de..8b2e19671e4 100644 --- a/keyboards/bpiphany/tiger_lily/info.json +++ b/keyboards/bpiphany/tiger_lily/info.json @@ -8,6 +8,8 @@ "pid": "0x544C", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["fullsize_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk index 947b6a1d0dc..43ebddd3574 100644 --- a/keyboards/bpiphany/tiger_lily/rules.mk +++ b/keyboards/bpiphany/tiger_lily/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json index 50a3769f101..c67802caf50 100644 --- a/keyboards/bpiphany/unloved_bastard/info.json +++ b/keyboards/bpiphany/unloved_bastard/info.json @@ -7,6 +7,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk index b247fc9144a..7a32c860327 100644 --- a/keyboards/bpiphany/unloved_bastard/rules.mk +++ b/keyboards/bpiphany/unloved_bastard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json index f18834d0a2e..d3c6d1c4e96 100644 --- a/keyboards/bt66tech/bt66tech60/info.json +++ b/keyboards/bt66tech/bt66tech60/info.json @@ -8,6 +8,8 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/bt66tech/bt66tech60/rules.mk b/keyboards/bt66tech/bt66tech60/rules.mk index aea8e42cfc5..5989895b846 100644 --- a/keyboards/bt66tech/bt66tech60/rules.mk +++ b/keyboards/bt66tech/bt66tech60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json index 270ce3a567a..d68530dadf4 100644 --- a/keyboards/bthlabs/geekpad/info.json +++ b/keyboards/bthlabs/geekpad/info.json @@ -8,6 +8,8 @@ "pid": "0x4257", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bthlabs/geekpad/rules.mk b/keyboards/bthlabs/geekpad/rules.mk index 5d3b05abd2b..4d82dff69aa 100644 --- a/keyboards/bthlabs/geekpad/rules.mk +++ b/keyboards/bthlabs/geekpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json index 450c93e15cc..505eb72b114 100644 --- a/keyboards/buildakb/potato65/info.json +++ b/keyboards/buildakb/potato65/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi_split_bs": { diff --git a/keyboards/buildakb/potato65/rules.mk b/keyboards/buildakb/potato65/rules.mk index a9bdd6ed1fc..abd8c0135a9 100644 --- a/keyboards/buildakb/potato65/rules.mk +++ b/keyboards/buildakb/potato65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json index 24fdd62d277..8d41e422e42 100644 --- a/keyboards/buildakb/potato65hs/info.json +++ b/keyboards/buildakb/potato65hs/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/buildakb/potato65hs/rules.mk b/keyboards/buildakb/potato65hs/rules.mk index 10f8503ecfe..0ce88ac19eb 100644 --- a/keyboards/buildakb/potato65hs/rules.mk +++ b/keyboards/buildakb/potato65hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json index 19208619463..47e6690389a 100644 --- a/keyboards/buildakb/potato65s/info.json +++ b/keyboards/buildakb/potato65s/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/buildakb/potato65s/rules.mk b/keyboards/buildakb/potato65s/rules.mk index 10f8503ecfe..0ce88ac19eb 100644 --- a/keyboards/buildakb/potato65s/rules.mk +++ b/keyboards/buildakb/potato65s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json index 6ee2226758f..fb70e92c133 100644 --- a/keyboards/buzzard/rev1/info.json +++ b/keyboards/buzzard/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xB077", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk index 6450813074e..c0b4e9943d2 100644 --- a/keyboards/buzzard/rules.mk +++ b/keyboards/buzzard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json index 86fb72bb243..6f3d97443fa 100644 --- a/keyboards/cablecardesigns/cypher/rev6/info.json +++ b/keyboards/cablecardesigns/cypher/rev6/info.json @@ -6,6 +6,8 @@ "pid": "0xAA99", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cablecardesigns/cypher/rev6/rules.mk b/keyboards/cablecardesigns/cypher/rev6/rules.mk index 374d3f8e0c7..d9c776a9b1d 100644 --- a/keyboards/cablecardesigns/cypher/rev6/rules.mk +++ b/keyboards/cablecardesigns/cypher/rev6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/caffeinated/serpent65/info.json b/keyboards/caffeinated/serpent65/info.json index 18088694384..de52e1776e4 100644 --- a/keyboards/caffeinated/serpent65/info.json +++ b/keyboards/caffeinated/serpent65/info.json @@ -8,6 +8,8 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/caffeinated/serpent65/rules.mk b/keyboards/caffeinated/serpent65/rules.mk index a0b213f847a..718a1e8d099 100644 --- a/keyboards/caffeinated/serpent65/rules.mk +++ b/keyboards/caffeinated/serpent65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index 4dd97319b34..069d812665a 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0621", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk index 16e33f820ff..66e5cfa2ae0 100644 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ b/keyboards/canary/canary60rgb/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json index d6f0abc952e..d075dc199a2 100644 --- a/keyboards/cannonkeys/adelie/info.json +++ b/keyboards/cannonkeys/adelie/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/adelie/rules.mk b/keyboards/cannonkeys/adelie/rules.mk index 3a2f2feb74a..6d85e16f920 100644 --- a/keyboards/cannonkeys/adelie/rules.mk +++ b/keyboards/cannonkeys/adelie/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json index edce8f88a6e..1fc2da7d64f 100644 --- a/keyboards/cannonkeys/aella/info.json +++ b/keyboards/cannonkeys/aella/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2, "w":1.5}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.75}, {"x":1.75, "y":3}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3, "w":1.25}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":3.25, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.75}, {"x":14, "y":4}, {"x":15, "y":4}, {"x":0, "y":5, "w":1.5}, {"x":2.25, "y":5, "w":1.25}, {"x":3.5, "y":5, "w":6.25}, {"x":9.75, "y":5, "w":1.25}, {"x":11, "y":5, "w":1.25}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":15, "y":5}] diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk index 7b44b402d11..f56120695ac 100644 --- a/keyboards/cannonkeys/aella/rules.mk +++ b/keyboards/cannonkeys/aella/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json index 89906ae56e2..e3c6fb0b6a6 100644 --- a/keyboards/cannonkeys/an_c/info.json +++ b/keyboards/cannonkeys/an_c/info.json @@ -8,6 +8,8 @@ "pid": "0xA00C", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk index 440b77bd26c..8b825561309 100644 --- a/keyboards/cannonkeys/an_c/rules.mk +++ b/keyboards/cannonkeys/an_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json index 70d8af6230c..fbc4e94d830 100644 --- a/keyboards/cannonkeys/atlas/info.json +++ b/keyboards/cannonkeys/atlas/info.json @@ -8,6 +8,8 @@ "pid": "0xA7A5", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/cannonkeys/atlas/rules.mk b/keyboards/cannonkeys/atlas/rules.mk index b14bde0fb58..fa596a2fb8a 100644 --- a/keyboards/cannonkeys/atlas/rules.mk +++ b/keyboards/cannonkeys/atlas/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json index 79b7e7f7fcc..e1831be72a0 100644 --- a/keyboards/cannonkeys/atlas_alps/info.json +++ b/keyboards/cannonkeys/atlas_alps/info.json @@ -8,6 +8,8 @@ "pid": "0xA7A5", "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/cannonkeys/atlas_alps/rules.mk b/keyboards/cannonkeys/atlas_alps/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/cannonkeys/atlas_alps/rules.mk +++ b/keyboards/cannonkeys/atlas_alps/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json index 3587ab7ea5d..ea4daaad014 100644 --- a/keyboards/cannonkeys/balance/info.json +++ b/keyboards/cannonkeys/balance/info.json @@ -8,6 +8,8 @@ "pid": "0xBA77", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk index e651d67c1ef..aa1b707d431 100644 --- a/keyboards/cannonkeys/balance/rules.mk +++ b/keyboards/cannonkeys/balance/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json index 7edbbdf05cd..54b6f40618e 100644 --- a/keyboards/cannonkeys/brutalv2_65/info.json +++ b/keyboards/cannonkeys/brutalv2_65/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Bksp", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"End", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk index 7b44b402d11..f56120695ac 100644 --- a/keyboards/cannonkeys/brutalv2_65/rules.mk +++ b/keyboards/cannonkeys/brutalv2_65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/info.json index 3d68ba84d8c..5e182b470c3 100644 --- a/keyboards/cannonkeys/chimera65/info.json +++ b/keyboards/cannonkeys/chimera65/info.json @@ -8,6 +8,8 @@ "pid": "0xC024", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk index c2cb86cc7de..09c801a8491 100644 --- a/keyboards/cannonkeys/chimera65/rules.mk +++ b/keyboards/cannonkeys/chimera65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index 04624aa3b05..62cbb402a06 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Fn", "x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk index 0d99007c16f..2eaae2dc9b1 100644 --- a/keyboards/cannonkeys/cloudline/rules.mk +++ b/keyboards/cannonkeys/cloudline/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index e3b70c34bc0..27eaa226d72 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk index 36c7523cb9b..e58c5114355 100644 --- a/keyboards/cannonkeys/crin/rules.mk +++ b/keyboards/cannonkeys/crin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 9acffd83eda..d6c11eb08b4 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -5,5 +5,7 @@ "usb": { "vid": "0xCA04", "device_version": "0.0.1" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk index 91a8974c0c5..56e7b05c524 100644 --- a/keyboards/cannonkeys/db60/rules.mk +++ b/keyboards/cannonkeys/db60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index 2c7c2eeb0bf..6d4172e7b27 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -8,6 +8,8 @@ "pid": "0xDE57", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":13.75, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Fn", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk index 440b77bd26c..8b825561309 100644 --- a/keyboards/cannonkeys/devastatingtkl/rules.mk +++ b/keyboards/cannonkeys/devastatingtkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json index 357554d9fc9..c67484efdcd 100644 --- a/keyboards/cannonkeys/gentoo/info.json +++ b/keyboards/cannonkeys/gentoo/info.json @@ -8,6 +8,8 @@ "pid": "0x000F", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/gentoo/rules.mk b/keyboards/cannonkeys/gentoo/rules.mk index 7b44b402d11..f56120695ac 100644 --- a/keyboards/cannonkeys/gentoo/rules.mk +++ b/keyboards/cannonkeys/gentoo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json index e20f6e6e39a..a9c0e2a66f1 100644 --- a/keyboards/cannonkeys/gentoo_hs/info.json +++ b/keyboards/cannonkeys/gentoo_hs/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/gentoo_hs/rules.mk b/keyboards/cannonkeys/gentoo_hs/rules.mk index b34d15f4b5e..5b983f1f260 100644 --- a/keyboards/cannonkeys/gentoo_hs/rules.mk +++ b/keyboards/cannonkeys/gentoo_hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json index 10fed32dbfd..45e5c0b9b2c 100644 --- a/keyboards/cannonkeys/hoodrowg/info.json +++ b/keyboards/cannonkeys/hoodrowg/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/hoodrowg/rules.mk b/keyboards/cannonkeys/hoodrowg/rules.mk index e25598e1d7f..b483118606d 100644 --- a/keyboards/cannonkeys/hoodrowg/rules.mk +++ b/keyboards/cannonkeys/hoodrowg/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json index c973aed4a8f..2ad358727b1 100644 --- a/keyboards/cannonkeys/instant60/info.json +++ b/keyboards/cannonkeys/instant60/info.json @@ -8,6 +8,8 @@ "pid": "0x1600", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk index 440b77bd26c..8b825561309 100644 --- a/keyboards/cannonkeys/instant60/rules.mk +++ b/keyboards/cannonkeys/instant60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json index 8274aacce11..27ae86b94c8 100644 --- a/keyboards/cannonkeys/instant65/info.json +++ b/keyboards/cannonkeys/instant65/info.json @@ -8,6 +8,8 @@ "pid": "0x1565", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk index 0d99007c16f..2eaae2dc9b1 100644 --- a/keyboards/cannonkeys/instant65/rules.mk +++ b/keyboards/cannonkeys/instant65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/info.json index 843302efd23..bd552f0938a 100644 --- a/keyboards/cannonkeys/iron165/info.json +++ b/keyboards/cannonkeys/iron165/info.json @@ -8,6 +8,8 @@ "pid": "0x5165", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk index c2cb86cc7de..09c801a8491 100644 --- a/keyboards/cannonkeys/iron165/rules.mk +++ b/keyboards/cannonkeys/iron165/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index b6ec4589179..b2600e866ca 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"x":0.5, "y":0}, {"x":1.75, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":18, "y":0}, {"x":0.25, "y":1}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, {"x":18.25, "y":1}, {"x":0, "y":2}, {"x":1.375, "y":2, "w":1.75}, {"x":3.125, "y":2}, {"x":4.13, "y":2}, {"x":5.13, "y":2}, {"x":6.13, "y":2}, {"x":7.13, "y":2}, {"x":9.88, "y":2}, {"x":10.88, "y":2}, {"x":11.88, "y":2}, {"x":12.88, "y":2}, {"x":13.88, "y":2}, {"x":14.88, "y":2}, {"x":15.88, "y":2, "w":2.25}, {"x":18.5, "y":2}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":14.25, "y":4, "w":1.5}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}] diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk index 0d99007c16f..2eaae2dc9b1 100644 --- a/keyboards/cannonkeys/malicious_ergo/rules.mk +++ b/keyboards/cannonkeys/malicious_ergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json index 07985ea8939..83550cbd368 100644 --- a/keyboards/cannonkeys/nearfield/info.json +++ b/keyboards/cannonkeys/nearfield/info.json @@ -8,6 +8,8 @@ "pid":"0x0002", "device_version":"0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts":{ "LAYOUT_all":{ diff --git a/keyboards/cannonkeys/nearfield/rules.mk b/keyboards/cannonkeys/nearfield/rules.mk index 476cf49f278..3b6a1809db1 100755 --- a/keyboards/cannonkeys/nearfield/rules.mk +++ b/keyboards/cannonkeys/nearfield/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index beda41b9a06..b4be81c8350 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -8,6 +8,8 @@ "pid": "0x0B75", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"x":15, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"x":13, "y":5.25}, {"x":14, "y":5.25}, {"x":15, "y":5.25}] diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk index 0d99007c16f..2eaae2dc9b1 100644 --- a/keyboards/cannonkeys/obliterated75/rules.mk +++ b/keyboards/cannonkeys/obliterated75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json index 2b60c7f15f9..c2708cc4ebb 100644 --- a/keyboards/cannonkeys/onyx/info.json +++ b/keyboards/cannonkeys/onyx/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/onyx/rules.mk b/keyboards/cannonkeys/onyx/rules.mk index 36c7523cb9b..e58c5114355 100644 --- a/keyboards/cannonkeys/onyx/rules.mk +++ b/keyboards/cannonkeys/onyx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json index 25c5cdc09aa..0e022d240ca 100644 --- a/keyboards/cannonkeys/ortho48/info.json +++ b/keyboards/cannonkeys/ortho48/info.json @@ -8,6 +8,8 @@ "pid": "0x4F48", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk index a644ef6371c..f7dee7ff203 100644 --- a/keyboards/cannonkeys/ortho48/rules.mk +++ b/keyboards/cannonkeys/ortho48/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 4c8bcdcc3b5..7db3ee9f04e 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -8,6 +8,8 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk index a644ef6371c..f7dee7ff203 100644 --- a/keyboards/cannonkeys/ortho60/rules.mk +++ b/keyboards/cannonkeys/ortho60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json index c50a774c9b5..c529181e4f8 100644 --- a/keyboards/cannonkeys/ortho75/info.json +++ b/keyboards/cannonkeys/ortho75/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk index 3c35dd428f0..ee4421ed3a1 100644 --- a/keyboards/cannonkeys/ortho75/rules.mk +++ b/keyboards/cannonkeys/ortho75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json index 87929469a91..16ec3a2a910 100644 --- a/keyboards/cannonkeys/practice60/info.json +++ b/keyboards/cannonkeys/practice60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk index ee61de36683..07f7d949d99 100644 --- a/keyboards/cannonkeys/practice60/rules.mk +++ b/keyboards/cannonkeys/practice60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json index 95fdd751904..de009fc870b 100644 --- a/keyboards/cannonkeys/practice65/info.json +++ b/keyboards/cannonkeys/practice65/info.json @@ -8,6 +8,8 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_default": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk index a644ef6371c..f7dee7ff203 100644 --- a/keyboards/cannonkeys/practice65/rules.mk +++ b/keyboards/cannonkeys/practice65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json index 7e9202a81da..2a98bb85e7e 100644 --- a/keyboards/cannonkeys/rekt1800/info.json +++ b/keyboards/cannonkeys/rekt1800/info.json @@ -8,6 +8,8 @@ "pid": "0x2377", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"x":14, "y":0}, {"label":"PrtSc", "x":15.5, "y":0}, {"label":"Scroll Lock", "x":16.5, "y":0}, {"label":"Pause", "x":17.5, "y":0}, {"x":18.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"label":"Insert", "x":15.5, "y":1.25}, {"label":"Home", "x":16.5, "y":1.25}, {"label":"PgUp", "x":17.5, "y":1.25}, {"x":18.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.5, "y":2.25}, {"label":"End", "x":16.5, "y":2.25}, {"label":"PgDn", "x":17.5, "y":2.25}, {"x":18.5, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"x":15.5, "y":3.25}, {"x":16.5, "y":3.25}, {"x":17.5, "y":3.25}, {"x":18.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}, {"x":18.5, "y":4.25, "h":2}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}, {"x":16.5, "y":5.25}, {"x":17.5, "y":5.25}] diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk index b983f36c85d..32e7be7370a 100644 --- a/keyboards/cannonkeys/rekt1800/rules.mk +++ b/keyboards/cannonkeys/rekt1800/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json index 64db3c34e0e..17423c0fbe0 100644 --- a/keyboards/cannonkeys/sagittarius/info.json +++ b/keyboards/cannonkeys/sagittarius/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":0, "y":1}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2, "w":1.25}, {"x":19.25, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":1.25}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3, "w":1.25}, {"x":17.25, "y":3}, {"x":18.25, "y":3}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.75}, {"x":12.75, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}] diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk index 0d99007c16f..2eaae2dc9b1 100644 --- a/keyboards/cannonkeys/sagittarius/rules.mk +++ b/keyboards/cannonkeys/sagittarius/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json index 692715124d3..44c96b3f3ed 100644 --- a/keyboards/cannonkeys/satisfaction75/info.json +++ b/keyboards/cannonkeys/satisfaction75/info.json @@ -7,5 +7,7 @@ "vid": "0xCA04", "pid": "0x57F5", "device_version": "0.0.1" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk index 4cf5e4b1571..9f6480ee0e4 100644 --- a/keyboards/cannonkeys/satisfaction75/rules.mk +++ b/keyboards/cannonkeys/satisfaction75/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F072 -BOARD = GENERIC_STM32_F072XB - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json index e821fb334ca..5d7630c0afc 100644 --- a/keyboards/cannonkeys/savage65/info.json +++ b/keyboards/cannonkeys/savage65/info.json @@ -8,6 +8,8 @@ "pid": "0x5A65", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk index 440b77bd26c..8b825561309 100644 --- a/keyboards/cannonkeys/savage65/rules.mk +++ b/keyboards/cannonkeys/savage65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json index 4552b612d03..d2309f26819 100644 --- a/keyboards/cannonkeys/tmov2/info.json +++ b/keyboards/cannonkeys/tmov2/info.json @@ -8,6 +8,8 @@ "pid": "0x70F2", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"x":0, "y":0}, {"label":"Tab", "x":1.25, "y":0, "w":1.5}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"{", "x":12.75, "y":0}, {"label":"}", "x":13.75, "y":0}, {"label":"Backspace", "x":14.75, "y":0}, {"x":0, "y":1}, {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, {"label":"A", "x":3, "y":1}, {"label":"S", "x":4, "y":1}, {"label":"D", "x":5, "y":1}, {"label":"F", "x":6, "y":1}, {"label":"G", "x":7, "y":1}, {"label":"H", "x":8, "y":1}, {"label":"J", "x":9, "y":1}, {"label":"K", "x":10, "y":1}, {"label":"L", "x":11, "y":1}, {"label":":", "x":12, "y":1}, {"label":"\"", "x":13, "y":1}, {"label":"Enter", "x":14, "y":1, "w":1.75}, {"x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.25}, {"label":"ISO \\", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"?", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"x":14.75, "y":2}, {"x":0, "y":3}, {"label":"Win", "x":3.25, "y":3}, {"label":"Alt", "x":4.25, "y":3, "w":1.5}, {"x":5.75, "y":3, "w":2.25}, {"x":8, "y":3, "w":2.75}, {"label":"Alt", "x":10.75, "y":3, "w":1.5}, {"label":"Menu", "x":12.25, "y":3}] diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk index 440b77bd26c..8b825561309 100644 --- a/keyboards/cannonkeys/tmov2/rules.mk +++ b/keyboards/cannonkeys/tmov2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json index 1a4e74539a8..d1a7f4d6ba3 100644 --- a/keyboards/cannonkeys/tsukuyomi/info.json +++ b/keyboards/cannonkeys/tsukuyomi/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":8.25, "y":0}, {"label":"*", "x":9.25, "y":0}, {"label":"(", "x":10.25, "y":0}, {"label":")", "x":11.25, "y":0}, {"label":"_", "x":12.25, "y":0}, {"label":"+", "x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":7.75, "y":1}, {"label":"U", "x":8.75, "y":1}, {"label":"I", "x":9.75, "y":1}, {"label":"O", "x":10.75, "y":1}, {"label":"P", "x":11.75, "y":1}, {"label":"{", "x":12.75, "y":1}, {"label":"}", "x":13.75, "y":1}, {"label":"|", "x":14.75, "y":1, "w":1.5}, {"x":16.25, "y":1}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":8, "y":2}, {"label":"J", "x":9, "y":2}, {"label":"K", "x":10, "y":2}, {"label":"L", "x":11, "y":2}, {"label":":", "x":12, "y":2}, {"label":"\"", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":1.25}, {"x":16.25, "y":2}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":8.5, "y":3}, {"label":"M", "x":9.5, "y":3}, {"label":"<", "x":10.5, "y":3}, {"label":">", "x":11.5, "y":3}, {"label":"?", "x":12.5, "y":3}, {"label":"Shift", "x":13.5, "y":3, "w":1.75}, {"x":15.25, "y":3}, {"x":16.25, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":6.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}] diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk index 0d99007c16f..2eaae2dc9b1 100644 --- a/keyboards/cannonkeys/tsukuyomi/rules.mk +++ b/keyboards/cannonkeys/tsukuyomi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json index db6081773bf..32dc1fff4af 100644 --- a/keyboards/cannonkeys/vicious40/info.json +++ b/keyboards/cannonkeys/vicious40/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Up", "x":10.75, "y":2}, {"label":"?", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Space", "x":3, "y":3, "w":2.25}, {"label":"Space", "x":5.25, "y":3, "w":1.25}, {"label":"Space", "x":6.5, "y":3, "w":2.75}, {"label":"Left", "x":9.75, "y":3}, {"label":"Down", "x":10.75, "y":3}, {"label":"Right", "x":11.75, "y":3}] diff --git a/keyboards/cannonkeys/vicious40/rules.mk b/keyboards/cannonkeys/vicious40/rules.mk index c78e8a1e7b3..df232017195 100644 --- a/keyboards/cannonkeys/vicious40/rules.mk +++ b/keyboards/cannonkeys/vicious40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json index e9a77c119ab..03e87e6da61 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_grid": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"x":1, "y":4}, {"label":".", "x":2, "y":4}, {"x":3, "y":4}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}] diff --git a/keyboards/capsunlocked/cu24/rules.mk b/keyboards/capsunlocked/cu24/rules.mk index 87e6fffce00..0dc735b9cd9 100644 --- a/keyboards/capsunlocked/cu24/rules.mk +++ b/keyboards/capsunlocked/cu24/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/capsunlocked/cu65/info.json b/keyboards/capsunlocked/cu65/info.json index fafae6d3d01..8f91a349748 100644 --- a/keyboards/capsunlocked/cu65/info.json +++ b/keyboards/capsunlocked/cu65/info.json @@ -8,6 +8,8 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/capsunlocked/cu65/rules.mk b/keyboards/capsunlocked/cu65/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/capsunlocked/cu65/rules.mk +++ b/keyboards/capsunlocked/cu65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json index b9d9671b979..64416b02646 100644 --- a/keyboards/capsunlocked/cu7/info.json +++ b/keyboards/capsunlocked/cu7/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/capsunlocked/cu7/rules.mk b/keyboards/capsunlocked/cu7/rules.mk index 6dfedb28b85..c5c4d8f35f1 100644 --- a/keyboards/capsunlocked/cu7/rules.mk +++ b/keyboards/capsunlocked/cu7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json index 3ab7427b6c5..c6a6fe8be80 100644 --- a/keyboards/capsunlocked/cu75/info.json +++ b/keyboards/capsunlocked/cu75/info.json @@ -8,6 +8,8 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":2.75}, {"x":6.5, "y":5}, {"x":7.5, "y":5, "w":2.5}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk index d3979a91491..e48941c949f 100644 --- a/keyboards/capsunlocked/cu75/rules.mk +++ b/keyboards/capsunlocked/cu75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json index 91b7d318532..72b2e681c90 100644 --- a/keyboards/capsunlocked/cu80/v1/info.json +++ b/keyboards/capsunlocked/cu80/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_iso", "tkl_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/capsunlocked/cu80/v1/rules.mk b/keyboards/capsunlocked/cu80/v1/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/capsunlocked/cu80/v1/rules.mk +++ b/keyboards/capsunlocked/cu80/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/carbo65/info.json b/keyboards/carbo65/info.json index 354ed0e7678..749f7eeb9b3 100644 --- a/keyboards/carbo65/info.json +++ b/keyboards/carbo65/info.json @@ -8,6 +8,8 @@ "pid": "0x4336", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/carbo65/rules.mk b/keyboards/carbo65/rules.mk index ae185b030bc..d6ed15acc72 100644 --- a/keyboards/carbo65/rules.mk +++ b/keyboards/carbo65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json index c77a0f53945..dcdf23f9531 100644 --- a/keyboards/catch22/info.json +++ b/keyboards/catch22/info.json @@ -6,6 +6,8 @@ "pid": "0xCA22", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"A", "x":1, "y":0}, {"label":"B", "x":2, "y":0}, {"label":"C", "x":3, "y":0}, {"label":"D", "x":4, "y":0}, {"label":"E", "x":1, "y":1}, {"label":"F", "x":2, "y":1}, {"label":"G", "x":3, "y":1}, {"label":"H", "x":4, "y":1}, {"label":"I", "x":0, "y":2}, {"label":"J", "x":1, "y":2}, {"label":"K", "x":2, "y":2}, {"label":"L", "x":3, "y":2}, {"label":"M", "x":4, "y":2}, {"label":"1", "x":0, "y":3, "h":2}, {"label":"N", "x":1, "y":3}, {"label":"O", "x":2, "y":3}, {"label":"P", "x":3, "y":3}, {"label":"Q", "x":4, "y":3}, {"label":"R", "x":1, "y":4}, {"label":"S", "x":2, "y":4}, {"label":"T", "x":3, "y":4}, {"label":"U", "x":4, "y":4}] diff --git a/keyboards/catch22/rules.mk b/keyboards/catch22/rules.mk index b5f690c8051..f258c568578 100644 --- a/keyboards/catch22/rules.mk +++ b/keyboards/catch22/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json index 2f41f20dfa4..cd1c07c67c4 100644 --- a/keyboards/centromere/info.json +++ b/keyboards/centromere/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3" "split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk index 736df6414dd..2171d801e54 100644 --- a/keyboards/centromere/rules.mk +++ b/keyboards/centromere/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json index 98d691bf13c..03693b7ba6a 100644 --- a/keyboards/cest73/tkm/info.json +++ b/keyboards/cest73/tkm/info.json @@ -8,6 +8,8 @@ "pid": "0xAA55", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cest73/tkm/rules.mk b/keyboards/cest73/tkm/rules.mk index b0a19fd405a..cb644340504 100644 --- a/keyboards/cest73/tkm/rules.mk +++ b/keyboards/cest73/tkm/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json index f738f60325b..35f5c5fb1e9 100644 --- a/keyboards/chalice/info.json +++ b/keyboards/chalice/info.json @@ -8,6 +8,8 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/chalice/rules.mk b/keyboards/chalice/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/chalice/rules.mk +++ b/keyboards/chalice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chaos65/info.json b/keyboards/chaos65/info.json index 21a8d41b613..3243967c03e 100644 --- a/keyboards/chaos65/info.json +++ b/keyboards/chaos65/info.json @@ -8,6 +8,8 @@ "pid": "0x1688", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/chaos65/rules.mk b/keyboards/chaos65/rules.mk index 7575609fdb1..48888d45c99 100644 --- a/keyboards/chaos65/rules.mk +++ b/keyboards/chaos65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json index cd8b7d1ba57..44eb547b096 100644 --- a/keyboards/charue/charon/info.json +++ b/keyboards/charue/charon/info.json @@ -8,6 +8,8 @@ "pid": "0x4348", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/charue/charon/rules.mk b/keyboards/charue/charon/rules.mk index d6d12ae0dbf..3f6eff7f550 100644 --- a/keyboards/charue/charon/rules.mk +++ b/keyboards/charue/charon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json index a761fd792f0..21fab05f17a 100644 --- a/keyboards/charue/sunsetter/info.json +++ b/keyboards/charue/sunsetter/info.json @@ -8,6 +8,8 @@ "pid": "0x5353", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/charue/sunsetter/rules.mk b/keyboards/charue/sunsetter/rules.mk index fd449807869..0aeca0dd9f3 100644 --- a/keyboards/charue/sunsetter/rules.mk +++ b/keyboards/charue/sunsetter/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json index 836d9ca6a1d..fd3038356f9 100644 --- a/keyboards/charue/sunsetter_r2/info.json +++ b/keyboards/charue/sunsetter_r2/info.json @@ -8,6 +8,8 @@ "pid": "0x5335", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/charue/sunsetter_r2/rules.mk b/keyboards/charue/sunsetter_r2/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/charue/sunsetter_r2/rules.mk +++ b/keyboards/charue/sunsetter_r2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json index c69c0e34600..9f345a3ae72 100644 --- a/keyboards/chavdai40/rev1/info.json +++ b/keyboards/chavdai40/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Chavdai40", "usb": { "device_version": "0.0.1" - } + }, + "processor": "STM32F042", + "bootloader": "stm32-dfu" } diff --git a/keyboards/chavdai40/rev1/rules.mk b/keyboards/chavdai40/rev1/rules.mk index f1995764b9d..ab2c49da70e 100644 --- a/keyboards/chavdai40/rev1/rules.mk +++ b/keyboards/chavdai40/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json index 458bcacf380..5ffacfd3035 100644 --- a/keyboards/chavdai40/rev2/info.json +++ b/keyboards/chavdai40/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Chavdai40 rev2", "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F042", + "bootloader": "stm32-dfu" } diff --git a/keyboards/chavdai40/rev2/rules.mk b/keyboards/chavdai40/rev2/rules.mk index f1995764b9d..ab2c49da70e 100644 --- a/keyboards/chavdai40/rev2/rules.mk +++ b/keyboards/chavdai40/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json index 780f0e2bed8..d3c6c1cb708 100644 --- a/keyboards/checkerboards/axon40/info.json +++ b/keyboards/checkerboards/axon40/info.json @@ -8,6 +8,8 @@ "pid": "0x1119", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":1, "y":3}, {"x":2, "y":3, "w":1.5}, {"x":3.5, "y":3, "w":2.25}, {"x":5.75, "y":3, "w":2.75}, {"x":8.5, "y":3, "w":1.5}, {"x":10, "y":3}] diff --git a/keyboards/checkerboards/axon40/rules.mk b/keyboards/checkerboards/axon40/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/checkerboards/axon40/rules.mk +++ b/keyboards/checkerboards/axon40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json index 96fd73bbe31..a254f9ef6eb 100644 --- a/keyboards/checkerboards/candybar_ortho/info.json +++ b/keyboards/checkerboards/candybar_ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x3215", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_grid": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"8", "x":7, "y":3}, {"x":8, "y":3}, {"label":"10", "x":9, "y":3}, {"label":"11", "x":10, "y":3}, {"label":"12", "x":11, "y":3}, {"label":"⇑", "x":12, "y":3}, {"label":"←", "x":13, "y":3}, {"label":"15", "x":14, "y":3}, {"label":"↑", "x":15, "y":3}, {"label":"→", "x":16, "y":3}] diff --git a/keyboards/checkerboards/candybar_ortho/rules.mk b/keyboards/checkerboards/candybar_ortho/rules.mk index d0bc92c43cf..28c29a3b4dc 100644 --- a/keyboards/checkerboards/candybar_ortho/rules.mk +++ b/keyboards/checkerboards/candybar_ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/g_idb60/info.json b/keyboards/checkerboards/g_idb60/info.json index 81f7081aba7..ff4cc80b5ed 100644 --- a/keyboards/checkerboards/g_idb60/info.json +++ b/keyboards/checkerboards/g_idb60/info.json @@ -8,6 +8,8 @@ "pid": "0x3508", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/checkerboards/g_idb60/rules.mk b/keyboards/checkerboards/g_idb60/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/checkerboards/g_idb60/rules.mk +++ b/keyboards/checkerboards/g_idb60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json index 4e88eece960..4ed4b82cb58 100644 --- a/keyboards/checkerboards/nop60/info.json +++ b/keyboards/checkerboards/nop60/info.json @@ -8,6 +8,8 @@ "pid": "0x1416", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_2x3u": "LAYOUT_60_tsangan_hhkb_split_space", "LAYOUT_7u": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/checkerboards/nop60/rules.mk b/keyboards/checkerboards/nop60/rules.mk index 8e4763a18a9..ec647701401 100644 --- a/keyboards/checkerboards/nop60/rules.mk +++ b/keyboards/checkerboards/nop60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json index 76a8a9b16de..ed976903e8d 100644 --- a/keyboards/checkerboards/phoenix45_ortho/info.json +++ b/keyboards/checkerboards/phoenix45_ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x1849", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_2x225u": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"x":11, "y":2}, {"label":"Return", "x":12, "y":2}, {"label":"Hyper", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3}, {"label":"Meta", "x":2.25, "y":3, "w":1.5}, {"x":3.75, "y":3, "w":2.25}, {"label":"Fn", "x":6, "y":3}, {"x":7, "y":3, "w":2.25}, {"label":"Meta", "x":9.25, "y":3, "w":1.5}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.75, "y":3, "w":1.25}] diff --git a/keyboards/checkerboards/phoenix45_ortho/rules.mk b/keyboards/checkerboards/phoenix45_ortho/rules.mk index efede3f9edb..634fd79c1de 100644 --- a/keyboards/checkerboards/phoenix45_ortho/rules.mk +++ b/keyboards/checkerboards/phoenix45_ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json index b25f7f2535e..87d2e74deb8 100644 --- a/keyboards/checkerboards/plexus75/info.json +++ b/keyboards/checkerboards/plexus75/info.json @@ -8,6 +8,8 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_2x2u": { "layout": [{"label":"=", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"Back Space", "x":14, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":";", "x":13, "y":2}, {"label":"'", "x":14, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":8, "y":4, "w":2}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/checkerboards/plexus75/rules.mk b/keyboards/checkerboards/plexus75/rules.mk index 77e054b15c5..4f1bd7941bc 100644 --- a/keyboards/checkerboards/plexus75/rules.mk +++ b/keyboards/checkerboards/plexus75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json index d4e64f0a7a5..dbac1f2f6a5 100644 --- a/keyboards/checkerboards/plexus75_he/info.json +++ b/keyboards/checkerboards/plexus75_he/info.json @@ -8,6 +8,8 @@ "pid": "0x5339", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_2x3u": { "layout": [{"label":"=", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"Back Space", "x":14, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":";", "x":13, "y":2}, {"label":"'", "x":14, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/checkerboards/plexus75_he/rules.mk b/keyboards/checkerboards/plexus75_he/rules.mk index 95964a1fa5d..5046e297d0e 100644 --- a/keyboards/checkerboards/plexus75_he/rules.mk +++ b/keyboards/checkerboards/plexus75_he/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json index c37285cfb9b..f9915cdf192 100644 --- a/keyboards/checkerboards/pursuit40/info.json +++ b/keyboards/checkerboards/pursuit40/info.json @@ -8,6 +8,8 @@ "pid": "0x1620", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"x":8, "y":3, "w":1.25}, {"x":9.25, "y":3, "w":1.5}, {"x":10.75, "y":3, "w":1.25}] diff --git a/keyboards/checkerboards/pursuit40/rules.mk b/keyboards/checkerboards/pursuit40/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/checkerboards/pursuit40/rules.mk +++ b/keyboards/checkerboards/pursuit40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json index 3eef623d365..f7016ac048b 100644 --- a/keyboards/checkerboards/quark/info.json +++ b/keyboards/checkerboards/quark/info.json @@ -8,6 +8,8 @@ "pid": "0x5340", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_5x12_2x225u": { diff --git a/keyboards/checkerboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk index 2104ee04faa..2dd2e10d801 100644 --- a/keyboards/checkerboards/quark/rules.mk +++ b/keyboards/checkerboards/quark/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json index 74e7439bcf1..6cd764fa803 100644 --- a/keyboards/checkerboards/quark_lp/info.json +++ b/keyboards/checkerboards/quark_lp/info.json @@ -8,6 +8,8 @@ "pid": "0x5354", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}] diff --git a/keyboards/checkerboards/quark_lp/rules.mk b/keyboards/checkerboards/quark_lp/rules.mk index 37ede7c3d3d..b1d915ebb53 100644 --- a/keyboards/checkerboards/quark_lp/rules.mk +++ b/keyboards/checkerboards/quark_lp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json index b6647dfcefc..6685b842241 100644 --- a/keyboards/checkerboards/quark_plus/info.json +++ b/keyboards/checkerboards/quark_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_grid": { "layout": diff --git a/keyboards/checkerboards/quark_plus/rules.mk b/keyboards/checkerboards/quark_plus/rules.mk index 8ffb43e2527..10772de5474 100644 --- a/keyboards/checkerboards/quark_plus/rules.mk +++ b/keyboards/checkerboards/quark_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json index a7188c27e67..699300a3a6e 100644 --- a/keyboards/checkerboards/quark_squared/info.json +++ b/keyboards/checkerboards/quark_squared/info.json @@ -8,6 +8,8 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_4_2x225u": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Super", "x":9.5, "y":3, "w":1.25}, {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}] diff --git a/keyboards/checkerboards/quark_squared/rules.mk b/keyboards/checkerboards/quark_squared/rules.mk index df6bcc2d310..88b0022c5fd 100644 --- a/keyboards/checkerboards/quark_squared/rules.mk +++ b/keyboards/checkerboards/quark_squared/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json index 8d3d9e0358b..8866a2728e3 100644 --- a/keyboards/checkerboards/snop60/info.json +++ b/keyboards/checkerboards/snop60/info.json @@ -8,6 +8,8 @@ "pid": "0x2416", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift", "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space" diff --git a/keyboards/checkerboards/snop60/rules.mk b/keyboards/checkerboards/snop60/rules.mk index bd813688ff0..851dd43d3bd 100644 --- a/keyboards/checkerboards/snop60/rules.mk +++ b/keyboards/checkerboards/snop60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json index 8ddf466681f..fa72a206d3e 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/info.json +++ b/keyboards/checkerboards/ud40_ortho_alt/info.json @@ -8,6 +8,8 @@ "pid": "0x7030", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.25}, {"x":10.75, "y":3, "w":1.25}] diff --git a/keyboards/checkerboards/ud40_ortho_alt/rules.mk b/keyboards/checkerboards/ud40_ortho_alt/rules.mk index d6f90b59177..653e1ef309c 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/rules.mk +++ b/keyboards/checkerboards/ud40_ortho_alt/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json index 1caf876a61e..c14c05558ab 100644 --- a/keyboards/cherrybstudio/cb1800/info.json +++ b/keyboards/cherrybstudio/cb1800/info.json @@ -8,6 +8,8 @@ "pid": "0x1818", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cherrybstudio/cb1800/rules.mk b/keyboards/cherrybstudio/cb1800/rules.mk index 65540808e49..95093e241aa 100644 --- a/keyboards/cherrybstudio/cb1800/rules.mk +++ b/keyboards/cherrybstudio/cb1800/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 976b0b2e33d..eee8faed6fb 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -8,6 +8,8 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cherrybstudio/cb65/rules.mk b/keyboards/cherrybstudio/cb65/rules.mk index e5386c142da..b5dd02b992c 100644 --- a/keyboards/cherrybstudio/cb65/rules.mk +++ b/keyboards/cherrybstudio/cb65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json index 2522d502797..a0f229995b1 100644 --- a/keyboards/cherrybstudio/cb87/info.json +++ b/keyboards/cherrybstudio/cb87/info.json @@ -8,6 +8,8 @@ "pid": "0x8787", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/cherrybstudio/cb87/rules.mk b/keyboards/cherrybstudio/cb87/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/cherrybstudio/cb87/rules.mk +++ b/keyboards/cherrybstudio/cb87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 36b43f57422..059b6d61d4a 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x8785", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cherrybstudio/cb87rgb/rules.mk b/keyboards/cherrybstudio/cb87rgb/rules.mk index 9f610c8a90a..02c7c58f153 100644 --- a/keyboards/cherrybstudio/cb87rgb/rules.mk +++ b/keyboards/cherrybstudio/cb87rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 6cb3f5fbe36..1d4b373263f 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -8,6 +8,8 @@ "pid": "0x8788", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cherrybstudio/cb87v2/rules.mk b/keyboards/cherrybstudio/cb87v2/rules.mk index 3bd45154f4e..cdde6d344ba 100644 --- a/keyboards/cherrybstudio/cb87v2/rules.mk +++ b/keyboards/cherrybstudio/cb87v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json index 1ccd9001af9..0e63e3b6600 100644 --- a/keyboards/cheshire/curiosity/info.json +++ b/keyboards/cheshire/curiosity/info.json @@ -7,6 +7,8 @@ "pid": "0x0FAD", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/cheshire/curiosity/rules.mk b/keyboards/cheshire/curiosity/rules.mk index ed24117bdfd..5937fde2872 100644 --- a/keyboards/cheshire/curiosity/rules.mk +++ b/keyboards/cheshire/curiosity/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chickenman/ciel/info.json b/keyboards/chickenman/ciel/info.json index 6ee0ffb71b2..b6a4f5e8f7e 100644 --- a/keyboards/chickenman/ciel/info.json +++ b/keyboards/chickenman/ciel/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { diff --git a/keyboards/chickenman/ciel/rules.mk b/keyboards/chickenman/ciel/rules.mk index 5ce64a46c30..59c896dbff6 100644 --- a/keyboards/chickenman/ciel/rules.mk +++ b/keyboards/chickenman/ciel/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json index 99dc6a484a0..bbb3124868d 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/info.json @@ -8,6 +8,8 @@ "pid": "0x0601", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", diff --git a/keyboards/chlx/merro60/rules.mk b/keyboards/chlx/merro60/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/chlx/merro60/rules.mk +++ b/keyboards/chlx/merro60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json index 444d2d76e65..e9ab25aedbb 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/info.json @@ -8,6 +8,8 @@ "pid": "0x0602", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", diff --git a/keyboards/chlx/str_merro60/rules.mk b/keyboards/chlx/str_merro60/rules.mk index d66c197e4da..9cceab1f746 100644 --- a/keyboards/chlx/str_merro60/rules.mk +++ b/keyboards/chlx/str_merro60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chocofly/v1/info.json b/keyboards/chocofly/v1/info.json index 1372ce62f96..f0b5f7b21dc 100644 --- a/keyboards/chocofly/v1/info.json +++ b/keyboards/chocofly/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x1001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/chocofly/v1/rules.mk b/keyboards/chocofly/v1/rules.mk index 777b9b9872c..70f23a97a50 100644 --- a/keyboards/chocofly/v1/rules.mk +++ b/keyboards/chocofly/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/chocv/info.json b/keyboards/chocv/info.json index 39b47f8febd..ce82fd6e444 100644 --- a/keyboards/chocv/info.json +++ b/keyboards/chocv/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/chocv/rules.mk b/keyboards/chocv/rules.mk index f8d166a6cce..3b6a1809db1 100644 --- a/keyboards/chocv/rules.mk +++ b/keyboards/chocv/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json index a32ae0da4f3..1295d76e7f4 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/info.json @@ -8,6 +8,8 @@ "pid": "0x6B7A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cipulot/kallos/rules.mk b/keyboards/cipulot/kallos/rules.mk index 1ad33bb5144..f574845eef7 100644 --- a/keyboards/cipulot/kallos/rules.mk +++ b/keyboards/cipulot/kallos/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json index b5f9f6415ae..f335b2b76c6 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/info.json @@ -8,6 +8,8 @@ "pid": "0x6B7F", "device_version": "0.0.1" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/cipulot/kawayo/rules.mk b/keyboards/cipulot/kawayo/rules.mk index 2deb4d731c8..fbab9885cdb 100644 --- a/keyboards/cipulot/kawayo/rules.mk +++ b/keyboards/cipulot/kawayo/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F411 - -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - KEYBOARD_SHARED_EP = yes # Build Options diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json index dd5230e5ebe..87b22f29ebb 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/info.json @@ -8,6 +8,8 @@ "pid": "0x6049", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ck60i/rules.mk b/keyboards/ck60i/rules.mk index 1f4aeed422c..2e8924f3c35 100644 --- a/keyboards/ck60i/rules.mk +++ b/keyboards/ck60i/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ckeys/handwire_101/info.json b/keyboards/ckeys/handwire_101/info.json index 344c34e5d8b..3d270685c5f 100644 --- a/keyboards/ckeys/handwire_101/info.json +++ b/keyboards/ckeys/handwire_101/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x4" }, diff --git a/keyboards/ckeys/handwire_101/rules.mk b/keyboards/ckeys/handwire_101/rules.mk index 3131bb405aa..4cbb58307a2 100755 --- a/keyboards/ckeys/handwire_101/rules.mk +++ b/keyboards/ckeys/handwire_101/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ckeys/nakey/info.json b/keyboards/ckeys/nakey/info.json index cf68981f0c6..453ad39b132 100644 --- a/keyboards/ckeys/nakey/info.json +++ b/keyboards/ckeys/nakey/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/ckeys/nakey/rules.mk b/keyboards/ckeys/nakey/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/ckeys/nakey/rules.mk +++ b/keyboards/ckeys/nakey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/ckeys/obelus/info.json b/keyboards/ckeys/obelus/info.json index 17e869887cc..36d31c14bd5 100644 --- a/keyboards/ckeys/obelus/info.json +++ b/keyboards/ckeys/obelus/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/ckeys/obelus/rules.mk b/keyboards/ckeys/obelus/rules.mk index 9a1e2b26e4c..08744b16baa 100644 --- a/keyboards/ckeys/obelus/rules.mk +++ b/keyboards/ckeys/obelus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json index 311ccec8439..66b2e378453 100644 --- a/keyboards/ckeys/thedora/info.json +++ b/keyboards/ckeys/thedora/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ckeys/thedora/rules.mk b/keyboards/ckeys/thedora/rules.mk index ea0154859b4..ac8d5677b2c 100755 --- a/keyboards/ckeys/thedora/rules.mk +++ b/keyboards/ckeys/thedora/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json index 20e83faf2be..6c364dff1c2 100644 --- a/keyboards/ckeys/washington/info.json +++ b/keyboards/ckeys/washington/info.json @@ -8,6 +8,8 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}] diff --git a/keyboards/ckeys/washington/rules.mk b/keyboards/ckeys/washington/rules.mk index f5b9339de7f..87154d95c9a 100644 --- a/keyboards/ckeys/washington/rules.mk +++ b/keyboards/ckeys/washington/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json index e278685f968..2e153f567dd 100644 --- a/keyboards/clawsome/bookerboard/info.json +++ b/keyboards/clawsome/bookerboard/info.json @@ -8,6 +8,8 @@ "pid": "0x41CE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/bookerboard/rules.mk b/keyboards/clawsome/bookerboard/rules.mk index 71fd5a7621c..afdf78fc5f6 100644 --- a/keyboards/clawsome/bookerboard/rules.mk +++ b/keyboards/clawsome/bookerboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/coupe/info.json b/keyboards/clawsome/coupe/info.json index 060da5dc9fd..be50f5c13e0 100644 --- a/keyboards/clawsome/coupe/info.json +++ b/keyboards/clawsome/coupe/info.json @@ -8,6 +8,8 @@ "pid": "0x7E94", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/clawsome/coupe/rules.mk b/keyboards/clawsome/coupe/rules.mk index acdc45d40ab..afdf78fc5f6 100644 --- a/keyboards/clawsome/coupe/rules.mk +++ b/keyboards/clawsome/coupe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/doodle/info.json b/keyboards/clawsome/doodle/info.json index 7d1dcb4b609..6c40392ec89 100644 --- a/keyboards/clawsome/doodle/info.json +++ b/keyboards/clawsome/doodle/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/doodle/rules.mk b/keyboards/clawsome/doodle/rules.mk index 71122e62b2c..1ac8624bb1e 100644 --- a/keyboards/clawsome/doodle/rules.mk +++ b/keyboards/clawsome/doodle/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/info.json index f6389e06c7c..df9c6216271 100644 --- a/keyboards/clawsome/fightpad/info.json +++ b/keyboards/clawsome/fightpad/info.json @@ -8,6 +8,8 @@ "pid": "0x481C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/fightpad/rules.mk b/keyboards/clawsome/fightpad/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/clawsome/fightpad/rules.mk +++ b/keyboards/clawsome/fightpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json index 0d52501930b..273755e62cb 100644 --- a/keyboards/clawsome/gamebuddy/v1_0/info.json +++ b/keyboards/clawsome/gamebuddy/v1_0/info.json @@ -8,6 +8,8 @@ "pid": "0x17B9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/gamebuddy/v1_0/rules.mk b/keyboards/clawsome/gamebuddy/v1_0/rules.mk index acdc45d40ab..afdf78fc5f6 100644 --- a/keyboards/clawsome/gamebuddy/v1_0/rules.mk +++ b/keyboards/clawsome/gamebuddy/v1_0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json index ee7f1e1ae87..9c9ee3938b9 100644 --- a/keyboards/clawsome/gamebuddy/v1_m/info.json +++ b/keyboards/clawsome/gamebuddy/v1_m/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/gamebuddy/v1_m/rules.mk b/keyboards/clawsome/gamebuddy/v1_m/rules.mk index 71122e62b2c..1ac8624bb1e 100644 --- a/keyboards/clawsome/gamebuddy/v1_m/rules.mk +++ b/keyboards/clawsome/gamebuddy/v1_m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/info.json index 75fbd34ec75..63cd7a80d77 100644 --- a/keyboards/clawsome/hatchback/info.json +++ b/keyboards/clawsome/hatchback/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/hatchback/rules.mk b/keyboards/clawsome/hatchback/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/clawsome/hatchback/rules.mk +++ b/keyboards/clawsome/hatchback/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json index f9150a2a7e8..e9038901222 100644 --- a/keyboards/clawsome/luggage_rack/info.json +++ b/keyboards/clawsome/luggage_rack/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/luggage_rack/rules.mk b/keyboards/clawsome/luggage_rack/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/clawsome/luggage_rack/rules.mk +++ b/keyboards/clawsome/luggage_rack/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/numeros/info.json b/keyboards/clawsome/numeros/info.json index 6907e103234..06e9ba97512 100644 --- a/keyboards/clawsome/numeros/info.json +++ b/keyboards/clawsome/numeros/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/clawsome/numeros/rules.mk b/keyboards/clawsome/numeros/rules.mk index acdc45d40ab..afdf78fc5f6 100644 --- a/keyboards/clawsome/numeros/rules.mk +++ b/keyboards/clawsome/numeros/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/roadster/info.json b/keyboards/clawsome/roadster/info.json index f76620cd77a..4e486b037e5 100644 --- a/keyboards/clawsome/roadster/info.json +++ b/keyboards/clawsome/roadster/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/roadster/rules.mk b/keyboards/clawsome/roadster/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/clawsome/roadster/rules.mk +++ b/keyboards/clawsome/roadster/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/sedan/info.json b/keyboards/clawsome/sedan/info.json index 253fad389f0..fc6ddd8a78a 100644 --- a/keyboards/clawsome/sedan/info.json +++ b/keyboards/clawsome/sedan/info.json @@ -8,6 +8,8 @@ "pid": "0x8C78", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/clawsome/sedan/rules.mk b/keyboards/clawsome/sedan/rules.mk index acdc45d40ab..afdf78fc5f6 100644 --- a/keyboards/clawsome/sedan/rules.mk +++ b/keyboards/clawsome/sedan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json index 790f99a7eb6..93e170a09a3 100644 --- a/keyboards/clawsome/sidekick/info.json +++ b/keyboards/clawsome/sidekick/info.json @@ -8,6 +8,8 @@ "pid": "0xDB9F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/sidekick/rules.mk b/keyboards/clawsome/sidekick/rules.mk index 71fd5a7621c..afdf78fc5f6 100644 --- a/keyboards/clawsome/sidekick/rules.mk +++ b/keyboards/clawsome/sidekick/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/clawsome/suv/info.json b/keyboards/clawsome/suv/info.json index b1d3a926a09..2dadb4f79d2 100644 --- a/keyboards/clawsome/suv/info.json +++ b/keyboards/clawsome/suv/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clawsome/suv/rules.mk b/keyboards/clawsome/suv/rules.mk index 71122e62b2c..1ac8624bb1e 100644 --- a/keyboards/clawsome/suv/rules.mk +++ b/keyboards/clawsome/suv/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json index b9168663883..a1dcf881807 100644 --- a/keyboards/clickety_split/leeloo/info.json +++ b/keyboards/clickety_split/leeloo/info.json @@ -8,6 +8,8 @@ "pid": "0x2022", "device_version": "0.1.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/clickety_split/leeloo/rules.mk b/keyboards/clickety_split/leeloo/rules.mk index c82e083a7f9..e99b3e15ed4 100644 --- a/keyboards/clickety_split/leeloo/rules.mk +++ b/keyboards/clickety_split/leeloo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json index f1258aea8e6..9f47befd54c 100644 --- a/keyboards/cmm_studio/fuji65/info.json +++ b/keyboards/cmm_studio/fuji65/info.json @@ -8,6 +8,8 @@ "pid": "0x364D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cmm_studio/fuji65/rules.mk b/keyboards/cmm_studio/fuji65/rules.mk index bf28e776462..7db37f02821 100644 --- a/keyboards/cmm_studio/fuji65/rules.mk +++ b/keyboards/cmm_studio/fuji65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json index f1e57c33fce..ee91cf527f8 100644 --- a/keyboards/cmm_studio/saka68/hotswap/info.json +++ b/keyboards/cmm_studio/saka68/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x5348", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_68_ansi" }, diff --git a/keyboards/cmm_studio/saka68/hotswap/rules.mk b/keyboards/cmm_studio/saka68/hotswap/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/cmm_studio/saka68/hotswap/rules.mk +++ b/keyboards/cmm_studio/saka68/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/info.json index 6fb0cd2f97f..8612ead7ae3 100644 --- a/keyboards/cmm_studio/saka68/solder/info.json +++ b/keyboards/cmm_studio/saka68/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_68_ansi" }, diff --git a/keyboards/cmm_studio/saka68/solder/rules.mk b/keyboards/cmm_studio/saka68/solder/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/cmm_studio/saka68/solder/rules.mk +++ b/keyboards/cmm_studio/saka68/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json index 976e26ad50b..53187917a13 100644 --- a/keyboards/coarse/cordillera/info.json +++ b/keyboards/coarse/cordillera/info.json @@ -8,6 +8,8 @@ "pid": "0x1401", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice": { diff --git a/keyboards/coarse/cordillera/rules.mk b/keyboards/coarse/cordillera/rules.mk index 5622896124d..6e8451b10cd 100644 --- a/keyboards/coarse/cordillera/rules.mk +++ b/keyboards/coarse/cordillera/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json index cd3104f424c..a408b6127f8 100644 --- a/keyboards/coarse/ixora/info.json +++ b/keyboards/coarse/ixora/info.json @@ -8,6 +8,8 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "debounce": 0, "layouts": { "LAYOUT_full": { diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk index 559be109a9e..ff4c3156fed 100644 --- a/keyboards/coarse/ixora/rules.mk +++ b/keyboards/coarse/ixora/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json index 43ae1b9dbac..8a615aac0d0 100644 --- a/keyboards/coarse/vinta/info.json +++ b/keyboards/coarse/vinta/info.json @@ -8,6 +8,8 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "debounce": 0, "community_layouts": ["65_ansi_blocker"], "layouts": { diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk index ae486caf1d9..88f853eb44d 100644 --- a/keyboards/coarse/vinta/rules.mk +++ b/keyboards/coarse/vinta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/compound/info.json b/keyboards/compound/info.json index b6963c07216..ea280b386ba 100644 --- a/keyboards/compound/info.json +++ b/keyboards/compound/info.json @@ -8,6 +8,8 @@ "pid": "0xB0BA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/compound/rules.mk b/keyboards/compound/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/compound/rules.mk +++ b/keyboards/compound/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json index 945fce08356..942963aaeef 100644 --- a/keyboards/contender/info.json +++ b/keyboards/contender/info.json @@ -8,6 +8,8 @@ "pid": "0xC010", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/contender/rules.mk b/keyboards/contender/rules.mk index 155e14ca685..951dd07d6e0 100644 --- a/keyboards/contender/rules.mk +++ b/keyboards/contender/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json index a73d2477a50..ce1c9a86dcd 100644 --- a/keyboards/contra/info.json +++ b/keyboards/contra/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["planck_mit", "ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/contra/rules.mk b/keyboards/contra/rules.mk index 4ed6c61a98f..6beb2824318 100755 --- a/keyboards/contra/rules.mk +++ b/keyboards/contra/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json index 3c97119dbd1..c9795552931 100644 --- a/keyboards/converter/a1200/miss1200/info.json +++ b/keyboards/converter/a1200/miss1200/info.json @@ -5,5 +5,7 @@ "vid": "0xFFFF", "pid": "0x0000", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/converter/a1200/miss1200/rules.mk b/keyboards/converter/a1200/miss1200/rules.mk index 0d74c964815..ac2c4626d98 100644 --- a/keyboards/converter/a1200/miss1200/rules.mk +++ b/keyboards/converter/a1200/miss1200/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json index 1cdecf736ee..1ea4e27b467 100644 --- a/keyboards/converter/a1200/mistress1200/info.json +++ b/keyboards/converter/a1200/mistress1200/info.json @@ -5,5 +5,7 @@ "vid": "0xFFFF", "pid": "0x0000", "device_version": "0.0.1" - } + }, + "processor": "atmega16u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/converter/a1200/mistress1200/rules.mk b/keyboards/converter/a1200/mistress1200/rules.mk index 90c20bafc92..18ddf68b03c 100644 --- a/keyboards/converter/a1200/mistress1200/rules.mk +++ b/keyboards/converter/a1200/mistress1200/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega16u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json index 243b586c9f2..9979c39b73c 100644 --- a/keyboards/converter/a1200/teensy2pp/info.json +++ b/keyboards/converter/a1200/teensy2pp/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/converter/a1200/teensy2pp/rules.mk b/keyboards/converter/a1200/teensy2pp/rules.mk index f229897f1e1..b8f2be564de 100644 --- a/keyboards/converter/a1200/teensy2pp/rules.mk +++ b/keyboards/converter/a1200/teensy2pp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/adb_usb/rev1/info.json b/keyboards/converter/adb_usb/rev1/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/converter/adb_usb/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/converter/adb_usb/rev1/rules.mk b/keyboards/converter/adb_usb/rev1/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/converter/adb_usb/rev1/rules.mk +++ b/keyboards/converter/adb_usb/rev1/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/converter/adb_usb/rev2/info.json b/keyboards/converter/adb_usb/rev2/info.json new file mode 100644 index 00000000000..dd190d18ee0 --- /dev/null +++ b/keyboards/converter/adb_usb/rev2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/converter/adb_usb/rev2/rules.mk b/keyboards/converter/adb_usb/rev2/rules.mk index 6ab81f6b120..e69de29bb2d 100644 --- a/keyboards/converter/adb_usb/rev2/rules.mk +++ b/keyboards/converter/adb_usb/rev2/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index aa49bf11df3..8492d5f2009 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk index 1beb767f990..d4e702622a8 100644 --- a/keyboards/converter/hp_46010a/rules.mk +++ b/keyboards/converter/hp_46010a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json index 9854d2759e7..51bc208c9c3 100644 --- a/keyboards/converter/ibm_terminal/info.json +++ b/keyboards/converter/ibm_terminal/info.json @@ -8,6 +8,8 @@ "pid": "0x6535", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk index 6304e20fb46..c04e7e01a47 100644 --- a/keyboards/converter/ibm_terminal/rules.mk +++ b/keyboards/converter/ibm_terminal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json index f1db7083ded..86aae250dff 100644 --- a/keyboards/converter/m0110_usb/info.json +++ b/keyboards/converter/m0110_usb/info.json @@ -8,6 +8,8 @@ "pid": "0x0110", "device_version": "1.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk index 20733dcd72e..a9dc1a9e499 100644 --- a/keyboards/converter/m0110_usb/rules.mk +++ b/keyboards/converter/m0110_usb/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index b769ec25394..9bffe2e242f 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/converter/modelm101/rules.mk b/keyboards/converter/modelm101/rules.mk index 9a928c73e67..1eeda920b40 100644 --- a/keyboards/converter/modelm101/rules.mk +++ b/keyboards/converter/modelm101/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index 617f8932423..8bb6a372625 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/converter/modelm101_teensy2/rules.mk b/keyboards/converter/modelm101_teensy2/rules.mk index c1c611e5777..6fe874e748b 100644 --- a/keyboards/converter/modelm101_teensy2/rules.mk +++ b/keyboards/converter/modelm101_teensy2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json index 22d29819439..7b474ec3718 100644 --- a/keyboards/converter/modelm_ssk/info.json +++ b/keyboards/converter/modelm_ssk/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": diff --git a/keyboards/converter/modelm_ssk/rules.mk b/keyboards/converter/modelm_ssk/rules.mk index 90c1c013155..2904475d7dc 100644 --- a/keyboards/converter/modelm_ssk/rules.mk +++ b/keyboards/converter/modelm_ssk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index 77b3c382270..41b75f69b93 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}] diff --git a/keyboards/converter/numeric_keypad_iie/rules.mk b/keyboards/converter/numeric_keypad_iie/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/converter/numeric_keypad_iie/rules.mk +++ b/keyboards/converter/numeric_keypad_iie/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json index ed4895ecfd3..2fe66720ec7 100644 --- a/keyboards/converter/palm_usb/info.json +++ b/keyboards/converter/palm_usb/info.json @@ -7,5 +7,7 @@ "vid": "0xFEED", "pid": "0x0001", "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index a1d2e39b233..e02b683d3bc 100644 --- a/keyboards/converter/palm_usb/rules.mk +++ b/keyboards/converter/palm_usb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/info.json index 78dfbd7e1f1..b21e21abdff 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "diode_direction": "ROW2COL", "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], diff --git a/keyboards/converter/periboard_512/rules.mk b/keyboards/converter/periboard_512/rules.mk index 9a928c73e67..1eeda920b40 100644 --- a/keyboards/converter/periboard_512/rules.mk +++ b/keyboards/converter/periboard_512/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json index 2e537b78d40..db6560a03ad 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/info.json @@ -8,6 +8,8 @@ "pid": "0x4353", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk index 2a119a9bab5..bd42622805a 100644 --- a/keyboards/converter/siemens_tastatur/rules.mk +++ b/keyboards/converter/siemens_tastatur/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - SRC = matrix.c # Build Options diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json index 691d0d1953e..a243a64da25 100644 --- a/keyboards/converter/sun_usb/info.json +++ b/keyboards/converter/sun_usb/info.json @@ -7,5 +7,7 @@ "vid": "0xFEED", "pid": "0x3333", "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "lufa-dfu" } diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk index d25bcc7ffa7..ee54c6cf11f 100644 --- a/keyboards/converter/sun_usb/rules.mk +++ b/keyboards/converter/sun_usb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/info.json new file mode 100644 index 00000000000..56062f7ad37 --- /dev/null +++ b/keyboards/converter/usb_usb/ble/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "caterina" +} diff --git a/keyboards/converter/usb_usb/hasu/info.json b/keyboards/converter/usb_usb/hasu/info.json new file mode 100644 index 00000000000..606784570c7 --- /dev/null +++ b/keyboards/converter/usb_usb/hasu/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "atmel-dfu" +} diff --git a/keyboards/converter/usb_usb/hasu/rules.mk b/keyboards/converter/usb_usb/hasu/rules.mk index 2538a0edd9f..c2ee0bc86f9 100644 --- a/keyboards/converter/usb_usb/hasu/rules.mk +++ b/keyboards/converter/usb_usb/hasu/rules.mk @@ -1,5 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 7292f2f3e9a..8e4a28ab464 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -8,6 +8,7 @@ "pid": "0x005B", "device_version": "0.0.1" }, + "processor": "atmega32u4", "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/converter/usb_usb/pro_micro/info.json b/keyboards/converter/usb_usb/pro_micro/info.json new file mode 100644 index 00000000000..56062f7ad37 --- /dev/null +++ b/keyboards/converter/usb_usb/pro_micro/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "caterina" +} diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index a33c0aaa54a..97aebc9349b 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json index c6ea00cc099..d266a1d3c14 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/info.json @@ -8,6 +8,8 @@ "pid": "0x6512", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_xt": { "layout": [ diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk index 9ea342a71dc..f98bdcc5d35 100644 --- a/keyboards/converter/xt_usb/rules.mk +++ b/keyboards/converter/xt_usb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/cool836a/info.json b/keyboards/cool836a/info.json index e413d134345..e2488c43e06 100644 --- a/keyboards/cool836a/info.json +++ b/keyboards/cool836a/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cool836a/rules.mk b/keyboards/cool836a/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/cool836a/rules.mk +++ b/keyboards/cool836a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json index 96dcb150ffd..757a404d1e8 100755 --- a/keyboards/copenhagen_click/click_pad_v1/info.json +++ b/keyboards/copenhagen_click/click_pad_v1/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}] diff --git a/keyboards/copenhagen_click/click_pad_v1/rules.mk b/keyboards/copenhagen_click/click_pad_v1/rules.mk index e0c847d1411..8a6570c496a 100755 --- a/keyboards/copenhagen_click/click_pad_v1/rules.mk +++ b/keyboards/copenhagen_click/click_pad_v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json index d11120c0dd5..ac3d9a07c52 100644 --- a/keyboards/coseyfannitutti/discipad/info.json +++ b/keyboards/coseyfannitutti/discipad/info.json @@ -8,6 +8,8 @@ "pid": "0x1769", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_numpad_5x4": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}] diff --git a/keyboards/coseyfannitutti/discipad/rules.mk b/keyboards/coseyfannitutti/discipad/rules.mk index 4ff6a67eaf6..6e0404820cd 100644 --- a/keyboards/coseyfannitutti/discipad/rules.mk +++ b/keyboards/coseyfannitutti/discipad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json index f58656c1562..aa1afd9fcc4 100644 --- a/keyboards/coseyfannitutti/discipline/info.json +++ b/keyboards/coseyfannitutti/discipline/info.json @@ -8,6 +8,8 @@ "pid": "0x6869", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker", "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker", diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk index 9493018f5c8..18550f0a64d 100644 --- a/keyboards/coseyfannitutti/discipline/rules.mk +++ b/keyboards/coseyfannitutti/discipline/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json index 29a2be6a4d9..8bdb22f18db 100644 --- a/keyboards/coseyfannitutti/mullet/info.json +++ b/keyboards/coseyfannitutti/mullet/info.json @@ -8,6 +8,8 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/coseyfannitutti/mullet/rules.mk b/keyboards/coseyfannitutti/mullet/rules.mk index 16389b153aa..b0ffb80ff38 100644 --- a/keyboards/coseyfannitutti/mullet/rules.mk +++ b/keyboards/coseyfannitutti/mullet/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/coseyfannitutti/mulletpad/info.json b/keyboards/coseyfannitutti/mulletpad/info.json index fbbd1df24d2..be3ef711cc8 100644 --- a/keyboards/coseyfannitutti/mulletpad/info.json +++ b/keyboards/coseyfannitutti/mulletpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/coseyfannitutti/mulletpad/rules.mk b/keyboards/coseyfannitutti/mulletpad/rules.mk index d69504a9de8..7829a2753bb 100644 --- a/keyboards/coseyfannitutti/mulletpad/rules.mk +++ b/keyboards/coseyfannitutti/mulletpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json index e41692db3bd..f89161a596d 100644 --- a/keyboards/coseyfannitutti/mysterium/info.json +++ b/keyboards/coseyfannitutti/mysterium/info.json @@ -8,6 +8,8 @@ "pid": "0x8769", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk index f2b20252f7b..b6082e107ce 100644 --- a/keyboards/coseyfannitutti/mysterium/rules.mk +++ b/keyboards/coseyfannitutti/mysterium/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/coseyfannitutti/romeo/info.json b/keyboards/coseyfannitutti/romeo/info.json index 3f8c9a616da..a2dbb614860 100644 --- a/keyboards/coseyfannitutti/romeo/info.json +++ b/keyboards/coseyfannitutti/romeo/info.json @@ -8,6 +8,8 @@ "pid": "0x4069", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"1.25u", "x":0, "y":2, "w":1.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1.25u", "x":2.25, "y":3, "w":1.25}, {"label":"2.25u", "x":3.5, "y":3, "w":2.25}, {"label":"1u", "x":5.75, "y":3}, {"label":"2.75u", "x":6.75, "y":3, "w":2.75}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}] diff --git a/keyboards/coseyfannitutti/romeo/rules.mk b/keyboards/coseyfannitutti/romeo/rules.mk index d1dde8af62f..ab2c49da70e 100644 --- a/keyboards/coseyfannitutti/romeo/rules.mk +++ b/keyboards/coseyfannitutti/romeo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json index da4317de804..a0bd7ed6e46 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/info.json @@ -8,6 +8,8 @@ "pid": "0x6331", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cosmo65/rules.mk b/keyboards/cosmo65/rules.mk index 909885ec6fa..940a788addd 100644 --- a/keyboards/cosmo65/rules.mk +++ b/keyboards/cosmo65/rules.mk @@ -1,9 +1,3 @@ -# MCU Name -MCU = atmega32u4 - -# Bootloader -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json index 9cd8e532cf4..e1963db0401 100644 --- a/keyboards/cozykeys/bloomer/v2/info.json +++ b/keyboards/cozykeys/bloomer/v2/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/bloomer/v2/rules.mk b/keyboards/cozykeys/bloomer/v2/rules.mk index ebbb7bc613c..951dd07d6e0 100644 --- a/keyboards/cozykeys/bloomer/v2/rules.mk +++ b/keyboards/cozykeys/bloomer/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json index 6b782663d8f..8540b0878ea 100644 --- a/keyboards/cozykeys/bloomer/v3/info.json +++ b/keyboards/cozykeys/bloomer/v3/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/bloomer/v3/rules.mk b/keyboards/cozykeys/bloomer/v3/rules.mk index 7d2cea91dfe..aa4c817d2a2 100644 --- a/keyboards/cozykeys/bloomer/v3/rules.mk +++ b/keyboards/cozykeys/bloomer/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json index 8de425ede12..6527ed1257a 100644 --- a/keyboards/cozykeys/speedo/v2/info.json +++ b/keyboards/cozykeys/speedo/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x1192", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/speedo/v2/rules.mk b/keyboards/cozykeys/speedo/v2/rules.mk index f5e3305af5d..59c896dbff6 100644 --- a/keyboards/cozykeys/speedo/v2/rules.mk +++ b/keyboards/cozykeys/speedo/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index 49a5b94f066..2aa0d944854 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -8,6 +8,8 @@ "pid": "0x1192", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk index 8b77971b7e5..78ff4d5d60e 100644 --- a/keyboards/cozykeys/speedo/v3/rules.mk +++ b/keyboards/cozykeys/speedo/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - PIN_COMPATIBLE = elite_c # Build Options diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json index ac6324efba2..6fd1b7cea6d 100644 --- a/keyboards/craftwalk/info.json +++ b/keyboards/craftwalk/info.json @@ -8,6 +8,8 @@ "pid": "0x2E8F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/craftwalk/rules.mk b/keyboards/craftwalk/rules.mk index 11d0a238165..2ce5bcb2bb6 100644 --- a/keyboards/craftwalk/rules.mk +++ b/keyboards/craftwalk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json index 10c2f73fa7f..0cdc5ef29a2 100644 --- a/keyboards/crawlpad/info.json +++ b/keyboards/crawlpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6070", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/crawlpad/rules.mk b/keyboards/crawlpad/rules.mk index 0eac88d761d..516dd414797 100755 --- a/keyboards/crawlpad/rules.mk +++ b/keyboards/crawlpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json index 8f34710df43..5b8cbcacb70 100644 --- a/keyboards/crazy_keyboard_68/info.json +++ b/keyboards/crazy_keyboard_68/info.json @@ -8,6 +8,8 @@ "pid": "0x13DE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/crazy_keyboard_68/rules.mk b/keyboards/crazy_keyboard_68/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/crazy_keyboard_68/rules.mk +++ b/keyboards/crazy_keyboard_68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json index 9c6894a74db..e2860676ccf 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": [ "ortho_4x12", "planck_mit" ], "layout_aliases": { "LAYOUT_crbn_1x2u": "LAYOUT_1x2u", diff --git a/keyboards/crbn/rules.mk b/keyboards/crbn/rules.mk index 1a63bd74b10..131aa72aeb5 100644 --- a/keyboards/crbn/rules.mk +++ b/keyboards/crbn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json index d43fd377932..227adcbea20 100644 --- a/keyboards/creatkeebs/glacier/info.json +++ b/keyboards/creatkeebs/glacier/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan" }, diff --git a/keyboards/creatkeebs/glacier/rules.mk b/keyboards/creatkeebs/glacier/rules.mk index 7c9fb95020e..241d1099ca1 100644 --- a/keyboards/creatkeebs/glacier/rules.mk +++ b/keyboards/creatkeebs/glacier/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/creatkeebs/thera/info.json b/keyboards/creatkeebs/thera/info.json index 388fc448e0c..d30721658f1 100644 --- a/keyboards/creatkeebs/thera/info.json +++ b/keyboards/creatkeebs/thera/info.json @@ -8,6 +8,8 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_ansi" }, diff --git a/keyboards/creatkeebs/thera/rules.mk b/keyboards/creatkeebs/thera/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/creatkeebs/thera/rules.mk +++ b/keyboards/creatkeebs/thera/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json index b53be64e9d6..9f67d355443 100644 --- a/keyboards/crimsonkeyboards/resume1800/info.json +++ b/keyboards/crimsonkeyboards/resume1800/info.json @@ -8,6 +8,8 @@ "pid": "0xC18B", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_resume1800_ansi_all": { "layout": [ diff --git a/keyboards/crimsonkeyboards/resume1800/rules.mk b/keyboards/crimsonkeyboards/resume1800/rules.mk index 9493018f5c8..18550f0a64d 100644 --- a/keyboards/crimsonkeyboards/resume1800/rules.mk +++ b/keyboards/crimsonkeyboards/resume1800/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/crin/info.json b/keyboards/crin/info.json index 9ce4fbfafb1..748e64c4379 100644 --- a/keyboards/crin/info.json +++ b/keyboards/crin/info.json @@ -8,6 +8,8 @@ "pid": "0xCC11", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_tsangan": "LAYOUT_ansi_tsangan" diff --git a/keyboards/crin/rules.mk b/keyboards/crin/rules.mk index 82ad8cdd02b..0aeca0dd9f3 100644 --- a/keyboards/crin/rules.mk +++ b/keyboards/crin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json index fedc37b61c0..778b33c565d 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json @@ -8,6 +8,7 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", "community_layouts": ["split_3x5_3", "split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json new file mode 100644 index 00000000000..606784570c7 --- /dev/null +++ b/keyboards/crkbd/r2g/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "atmel-dfu" +} diff --git a/keyboards/crkbd/r2g/rules.mk b/keyboards/crkbd/r2g/rules.mk index a3ee1b46b36..7cf008d0038 100644 --- a/keyboards/crkbd/r2g/rules.mk +++ b/keyboards/crkbd/r2g/rules.mk @@ -1,9 +1,6 @@ -BOOTLOADER = atmel-dfu OLED_ENABLE = yes OLED_DRIVER = SSD1306 LTO_ENABLE = yes RGBLIGHT_ENABLE = yes - SPLIT_KEYBOARD = yes - diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json new file mode 100644 index 00000000000..56062f7ad37 --- /dev/null +++ b/keyboards/crkbd/rev1/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "caterina" +} diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk index ba7d68ad925..8feaf50a078 100644 --- a/keyboards/crkbd/rules.mk +++ b/keyboards/crkbd/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index f423ffade20..6945fe7391e 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -8,6 +8,8 @@ "pid": "0x434D", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}] diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk index a53d7daeb0f..f430af42f41 100644 --- a/keyboards/crypt_macro/rules.mk +++ b/keyboards/crypt_macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index 36f708828c5..63c448d5c84 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -9,6 +9,8 @@ "pid": "0xFAB5", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["F1", "F4", "E6", "B1", "B7", "B0", "E2", "D4", "D6", "D7", "B4", "B3", "B6", "C6"], diff --git a/keyboards/custommk/evo70/rules.mk b/keyboards/custommk/evo70/rules.mk index 5676d945f92..1f9083a1826 100644 --- a/keyboards/custommk/evo70/rules.mk +++ b/keyboards/custommk/evo70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index ef7838af56f..3ff1d77904f 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xFAB0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}] diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json index 8c94f48eabd..6ba57648cb1 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0xFAB1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { "layout": [{"label":"MO(1)", "x":0, "y":0}, diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk index 00195cec93f..212c267b251 100644 --- a/keyboards/custommk/genesis/rev2/rules.mk +++ b/keyboards/custommk/genesis/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk index dabe21110b3..cb164c1a89f 100644 --- a/keyboards/custommk/genesis/rules.mk +++ b/keyboards/custommk/genesis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cutie_club/borsdorf/info.json b/keyboards/cutie_club/borsdorf/info.json index b7fca0f3400..5e435a1ceaa 100644 --- a/keyboards/cutie_club/borsdorf/info.json +++ b/keyboards/cutie_club/borsdorf/info.json @@ -8,6 +8,8 @@ "pid": "0x6D8A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cutie_club/borsdorf/rules.mk b/keyboards/cutie_club/borsdorf/rules.mk index bb9ab9fc3bf..ab2c49da70e 100644 --- a/keyboards/cutie_club/borsdorf/rules.mk +++ b/keyboards/cutie_club/borsdorf/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json index c85bda93f33..d68b8aa4d40 100644 --- a/keyboards/cutie_club/giant_macro_pad/info.json +++ b/keyboards/cutie_club/giant_macro_pad/info.json @@ -8,6 +8,8 @@ "pid": "0x74B6", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_ortho_20x20" }, diff --git a/keyboards/cutie_club/giant_macro_pad/rules.mk b/keyboards/cutie_club/giant_macro_pad/rules.mk index bb9ab9fc3bf..ab2c49da70e 100755 --- a/keyboards/cutie_club/giant_macro_pad/rules.mk +++ b/keyboards/cutie_club/giant_macro_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/info.json index 842d85f69c5..3ae5b4a6679 100644 --- a/keyboards/cutie_club/keebcats/denis/info.json +++ b/keyboards/cutie_club/keebcats/denis/info.json @@ -8,6 +8,8 @@ "pid": "0xB260", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_iso_tsangan", "60_iso_split_bs_rshift", "60_iso", "60_tsangan_hhkb", "60_hhkb", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/cutie_club/keebcats/denis/rules.mk b/keyboards/cutie_club/keebcats/denis/rules.mk index e6e97b011a9..b306c637e9d 100644 --- a/keyboards/cutie_club/keebcats/denis/rules.mk +++ b/keyboards/cutie_club/keebcats/denis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json index 2ed09a9e49e..fd768d704fc 100644 --- a/keyboards/cutie_club/keebcats/dougal/info.json +++ b/keyboards/cutie_club/keebcats/dougal/info.json @@ -8,6 +8,8 @@ "pid": "0xB265", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cutie_club/keebcats/dougal/rules.mk b/keyboards/cutie_club/keebcats/dougal/rules.mk index b3494d4caeb..8048c29cc0c 100644 --- a/keyboards/cutie_club/keebcats/dougal/rules.mk +++ b/keyboards/cutie_club/keebcats/dougal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cutie_club/novus/info.json b/keyboards/cutie_club/novus/info.json index 84f5211e0ba..834021416a2 100644 --- a/keyboards/cutie_club/novus/info.json +++ b/keyboards/cutie_club/novus/info.json @@ -8,6 +8,8 @@ "pid": "0x3F42", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, diff --git a/keyboards/cutie_club/novus/rules.mk b/keyboards/cutie_club/novus/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/cutie_club/novus/rules.mk +++ b/keyboards/cutie_club/novus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json index f3f35d56cea..a5a83cc64de 100644 --- a/keyboards/cutie_club/wraith/info.json +++ b/keyboards/cutie_club/wraith/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/cutie_club/wraith/rules.mk b/keyboards/cutie_club/wraith/rules.mk index bcd815acf5f..8d97e04e77d 100644 --- a/keyboards/cutie_club/wraith/rules.mk +++ b/keyboards/cutie_club/wraith/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json index 4672a3e09f1..b030e1223ae 100644 --- a/keyboards/cx60/info.json +++ b/keyboards/cx60/info.json @@ -8,6 +8,8 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"Up", "x":13, "y":3}, {"label":"Del", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Left", "x":12, "y":4}, {"label":"Down", "x":13, "y":4}, {"label":"Right", "x":14, "y":4}] diff --git a/keyboards/cx60/rules.mk b/keyboards/cx60/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/cx60/rules.mk +++ b/keyboards/cx60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/cybergear/macro25/info.json b/keyboards/cybergear/macro25/info.json index adb0030b8ef..8d0701104ca 100644 --- a/keyboards/cybergear/macro25/info.json +++ b/keyboards/cybergear/macro25/info.json @@ -8,6 +8,8 @@ "pid": "0x69A1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "diode_direction": "COL2ROW", "layouts": { "LAYOUT_ortho_2x5": { diff --git a/keyboards/cybergear/macro25/rules.mk b/keyboards/cybergear/macro25/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/cybergear/macro25/rules.mk +++ b/keyboards/cybergear/macro25/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json index ce05fe8a5a0..e60001252db 100644 --- a/keyboards/dailycraft/bat43/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/bat43/rules.mk b/keyboards/dailycraft/bat43/rules.mk index c2e1c5755f0..87c069dd2eb 100644 --- a/keyboards/dailycraft/bat43/rules.mk +++ b/keyboards/dailycraft/bat43/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 88a02370326..a9116dbed8c 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk index 69c59f28e6a..6bc66a514a3 100644 --- a/keyboards/dailycraft/claw44/rules.mk +++ b/keyboards/dailycraft/claw44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json index 88b8ee94da3..de88c712a77 100644 --- a/keyboards/dailycraft/owl8/info.json +++ b/keyboards/dailycraft/owl8/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/owl8/rules.mk b/keyboards/dailycraft/owl8/rules.mk index 284ea23e781..453f0a34d38 100644 --- a/keyboards/dailycraft/owl8/rules.mk +++ b/keyboards/dailycraft/owl8/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json index c94f88bd30f..9dcf9889976 100644 --- a/keyboards/dailycraft/sandbox/rev1/info.json +++ b/keyboards/dailycraft/sandbox/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index ce1574a0e15..62fee1cf8c4 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk index f33c50e3527..2afb4624d12 100644 --- a/keyboards/dailycraft/sandbox/rules.mk +++ b/keyboards/dailycraft/sandbox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json index 94f57674b43..7e5578fc77e 100644 --- a/keyboards/dailycraft/stickey4/info.json +++ b/keyboards/dailycraft/stickey4/info.json @@ -7,5 +7,7 @@ "vid": "0x5946", "pid": "0x0010", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/dailycraft/stickey4/rules.mk b/keyboards/dailycraft/stickey4/rules.mk index 284ea23e781..453f0a34d38 100644 --- a/keyboards/dailycraft/stickey4/rules.mk +++ b/keyboards/dailycraft/stickey4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index a2fb5ddcf4c..53b699e96ae 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": [ "split_3x6_3" ], diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json index 440df65dbf9..b06d5655300 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index 67a642b425a..fa92d298c51 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_3x6_3_2": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk index 94459dbcc55..9e762b19074 100644 --- a/keyboards/dailycraft/wings42/rules.mk +++ b/keyboards/dailycraft/wings42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/daji/seis_cinco/info.json b/keyboards/daji/seis_cinco/info.json index c155d3e2385..686415247e3 100644 --- a/keyboards/daji/seis_cinco/info.json +++ b/keyboards/daji/seis_cinco/info.json @@ -8,6 +8,8 @@ "pid": "0xBF22", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/daji/seis_cinco/rules.mk b/keyboards/daji/seis_cinco/rules.mk index 255f225985c..9e42693cb69 100644 --- a/keyboards/daji/seis_cinco/rules.mk +++ b/keyboards/daji/seis_cinco/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F072 -BOARD = GENERIC_STM32_F072XB - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json index 99d71762fa9..96693bfb9ea 100644 --- a/keyboards/db/db63/info.json +++ b/keyboards/db/db63/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/db/db63/rules.mk b/keyboards/db/db63/rules.mk index 4dcdfe886af..03a618b76dc 100644 --- a/keyboards/db/db63/rules.mk +++ b/keyboards/db/db63/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/info.json index 007e83d5cf9..ab35d7e6154 100644 --- a/keyboards/dc01/arrow/info.json +++ b/keyboards/dc01/arrow/info.json @@ -8,6 +8,8 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Insert", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Delete", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"\u2191", "x":1, "y":3}, {"label":"\u2190", "x":0, "y":4}, {"label":"\u2193", "x":1, "y":4}, {"label":"\u2192", "x":2, "y":4}] diff --git a/keyboards/dc01/arrow/rules.mk b/keyboards/dc01/arrow/rules.mk index 8d8884e59de..b2c66861ea5 100644 --- a/keyboards/dc01/arrow/rules.mk +++ b/keyboards/dc01/arrow/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/info.json index 4b30dc36cf5..7d5c657989b 100644 --- a/keyboards/dc01/left/info.json +++ b/keyboards/dc01/left/info.json @@ -8,6 +8,8 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/dc01/left/rules.mk b/keyboards/dc01/left/rules.mk index 1c180d54b7c..72485a3dd68 100644 --- a/keyboards/dc01/left/rules.mk +++ b/keyboards/dc01/left/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json index 47b3770fb0c..ab48b9a09c2 100644 --- a/keyboards/dc01/numpad/info.json +++ b/keyboards/dc01/numpad/info.json @@ -8,6 +8,8 @@ "pid": "0x1013", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk index 8d8884e59de..b2c66861ea5 100644 --- a/keyboards/dc01/numpad/rules.mk +++ b/keyboards/dc01/numpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/info.json index 059eddad209..3736b3bcd99 100644 --- a/keyboards/dc01/right/info.json +++ b/keyboards/dc01/right/info.json @@ -8,6 +8,8 @@ "pid": "0x1011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"&", "x":0.5, "y":0}, {"label":"*", "x":1.5, "y":0}, {"label":"(", "x":2.5, "y":0}, {"label":")", "x":3.5, "y":0}, {"label":"_", "x":4.5, "y":0}, {"label":"+", "x":5.5, "y":0}, {"label":"Back", "x":6.5, "y":0}, {"label":"Del", "x":7.5, "y":0}, {"label":"Y", "x":0, "y":1}, {"label":"U", "x":1, "y":1}, {"label":"I", "x":2, "y":1}, {"label":"O", "x":3, "y":1}, {"label":"P", "x":4, "y":1}, {"label":"{", "x":5, "y":1}, {"label":"}", "x":6, "y":1}, {"label":"|", "x":7, "y":1, "w":1.5}, {"label":"H", "x":0.25, "y":2}, {"label":"J", "x":1.25, "y":2}, {"label":"K", "x":2.25, "y":2}, {"label":"L", "x":3.25, "y":2}, {"label":":", "x":4.25, "y":2}, {"label":"@", "x":5.25, "y":2}, {"label":"~", "x":6.25, "y":2}, {"label":"Enter", "x":7.25, "y":2, "w":1.25}, {"label":"N", "x":0.75, "y":3}, {"label":"M", "x":1.75, "y":3}, {"label":"<", "x":2.75, "y":3}, {"label":">", "x":3.75, "y":3}, {"label":"?", "x":4.75, "y":3}, {"label":"Shift", "x":5.75, "y":3, "w":1.75}, {"label":"Shift", "x":7.5, "y":3}, {"label":"Fn", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":2.25}, {"label":"AltGr", "x":3.5, "y":4, "w":1.25}, {"label":"Win", "x":4.75, "y":4, "w":1.25}, {"label":"Menu", "x":6, "y":4, "w":1.25}, {"label":"Ctrl", "x":7.25, "y":4, "w":1.25}] diff --git a/keyboards/dc01/right/rules.mk b/keyboards/dc01/right/rules.mk index 8d8884e59de..b2c66861ea5 100644 --- a/keyboards/dc01/right/rules.mk +++ b/keyboards/dc01/right/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json index aaf68af2b29..fa31c1df22d 100644 --- a/keyboards/dekunukem/duckypad/info.json +++ b/keyboards/dekunukem/duckypad/info.json @@ -8,6 +8,8 @@ "pid": "0x4450", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dekunukem/duckypad/rules.mk b/keyboards/dekunukem/duckypad/rules.mk index 9ef7d664dbf..3a30a056613 100644 --- a/keyboards/dekunukem/duckypad/rules.mk +++ b/keyboards/dekunukem/duckypad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json index 0bb06feb9c7..09f1bcd78fb 100644 --- a/keyboards/delikeeb/flatbread60/info.json +++ b/keyboards/delikeeb/flatbread60/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/delikeeb/flatbread60/rules.mk b/keyboards/delikeeb/flatbread60/rules.mk index 6f52ecfc7a6..2eba275490a 100644 --- a/keyboards/delikeeb/flatbread60/rules.mk +++ b/keyboards/delikeeb/flatbread60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json index 7aa5dee3f23..5558cac96fd 100644 --- a/keyboards/delikeeb/vaguettelite/info.json +++ b/keyboards/delikeeb/vaguettelite/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1, "w":1.5}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3, "w":1.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4}, {"x":4.5, "y":4, "w":1.25}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4, "w":1.25}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/delikeeb/vaguettelite/rules.mk b/keyboards/delikeeb/vaguettelite/rules.mk index 6dfedb28b85..c5c4d8f35f1 100644 --- a/keyboards/delikeeb/vaguettelite/rules.mk +++ b/keyboards/delikeeb/vaguettelite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index b8a5f78cf89..3f650277467 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -6,6 +6,8 @@ "vid": "0x9906", "pid": "0x0013" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] diff --git a/keyboards/delikeeb/vanana/rules.mk b/keyboards/delikeeb/vanana/rules.mk index ae0d105d92a..b2dedaeb01d 100644 --- a/keyboards/delikeeb/vanana/rules.mk +++ b/keyboards/delikeeb/vanana/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json index 6b4ca022f7f..42265876503 100644 --- a/keyboards/delikeeb/vaneela/info.json +++ b/keyboards/delikeeb/vaneela/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/delikeeb/vaneela/rules.mk b/keyboards/delikeeb/vaneela/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/delikeeb/vaneela/rules.mk +++ b/keyboards/delikeeb/vaneela/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json index d7f1e75673b..fb0b1a87c24 100644 --- a/keyboards/delikeeb/vaneelaex/info.json +++ b/keyboards/delikeeb/vaneelaex/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ss_6x12": { "layout": [ diff --git a/keyboards/delikeeb/vaneelaex/rules.mk b/keyboards/delikeeb/vaneelaex/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/delikeeb/vaneelaex/rules.mk +++ b/keyboards/delikeeb/vaneelaex/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json new file mode 100644 index 00000000000..042c41f34d6 --- /dev/null +++ b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk index 8b5026cb035..307296b1bae 100644 --- a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk @@ -1,6 +1,3 @@ -# Bootloader selection -BOOTLOADER = atmel-dfu - # supported on Elite-C controllers RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow ENCODER_ENABLE = yes # Enable Rotary Encoder diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk index bdc4842c578..17c9907319d 100644 --- a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk @@ -1,6 +1,3 @@ -# Bootloader selection -BOOTLOADER = caterina - # not supported on Pro Micro controllers RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow ENCODER_ENABLE = no # Enable Rotary Encoder diff --git a/keyboards/delikeeb/waaffle/rev3/rules.mk b/keyboards/delikeeb/waaffle/rev3/rules.mk index 7467b612c14..f00d165fbfb 100644 --- a/keyboards/delikeeb/waaffle/rev3/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/deltapad/info.json b/keyboards/deltapad/info.json index abd6df5558d..bef25e63504 100644 --- a/keyboards/deltapad/info.json +++ b/keyboards/deltapad/info.json @@ -8,6 +8,8 @@ "pid": "0x0123", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}] diff --git a/keyboards/deltapad/rules.mk b/keyboards/deltapad/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/deltapad/rules.mk +++ b/keyboards/deltapad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk index 4f96bfc52a3..8285c29cb78 100644 --- a/keyboards/deltasplit75/rules.mk +++ b/keyboards/deltasplit75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json index f6326d96ca8..e287a4ee55e 100644 --- a/keyboards/deltasplit75/v2/info.json +++ b/keyboards/deltasplit75/v2/info.json @@ -7,6 +7,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_v2": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Print", "x":14, "y":0}, {"label":"Scroll", "x":15, "y":0}, {"label":"Pause", "x":16, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Back", "x":14, "y":1}, {"label":"Trns", "x":15, "y":1}, {"label":"Home", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"PgUp", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Trns", "x":13.75, "y":3}, {"label":"Enter", "x":14.75, "y":3, "w":1.25}, {"label":"PgDn", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"Trns", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"End", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}] diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json index 7e0435856b1..92b0c7243ca 100644 --- a/keyboards/demiurge/info.json +++ b/keyboards/demiurge/info.json @@ -8,6 +8,8 @@ "pid": "0x6475", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/demiurge/rules.mk b/keyboards/demiurge/rules.mk index 672ec13b0c0..135b7958b67 100755 --- a/keyboards/demiurge/rules.mk +++ b/keyboards/demiurge/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index 3e871ae85b9..dcf209a6d02 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,8 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk index 9685c1ce763..0473525d1ed 100644 --- a/keyboards/deng/djam/rules.mk +++ b/keyboards/deng/djam/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 9d3fbc6426e..26dcc5f0b8e 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -8,6 +8,8 @@ "pid": "0x7342", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_ortho_3x10": { "layout": [ diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk index da3b2989404..90bd050f7c7 100644 --- a/keyboards/deng/thirty/rules.mk +++ b/keyboards/deng/thirty/rules.mk @@ -1,6 +1,3 @@ -MCU = STM32F103 -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json index 094ccd67b3d..bd37a0a2c71 100644 --- a/keyboards/dichotomy/info.json +++ b/keyboards/dichotomy/info.json @@ -8,6 +8,8 @@ "pid": "0xACC7", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0.5}, {"label":"k01", "x":1, "y":0.5}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.5}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.5}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k0A", "x":11, "y":0.5}, {"label":"k0B", "x":12, "y":0.5}, {"label":"k10", "x":0, "y":1.5}, {"label":"k11", "x":1, "y":1.5}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1.5}, {"label":"k15", "x":5, "y":1.5}, {"label":"k16", "x":7, "y":1.5}, {"label":"k17", "x":8, "y":1.5}, {"label":"k18", "x":9, "y":1}, {"label":"k19", "x":10, "y":1.25}, {"label":"k1A", "x":11, "y":1.5}, {"label":"k1B", "x":12, "y":1.5}, {"label":"k20", "x":0, "y":2.5}, {"label":"k21", "x":1, "y":2.5}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2.5}, {"label":"k25", "x":5, "y":2.5}, {"label":"k26", "x":7, "y":2.5}, {"label":"k27", "x":8, "y":2.5}, {"label":"k28", "x":9, "y":2}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2A", "x":11, "y":2.5}, {"label":"k2B", "x":12, "y":2.5}, {"label":"k33", "x":3, "y":4}, {"label":"k34", "x":4, "y":4}, {"label":"k35", "x":5, "y":4}, {"label":"k36", "x":7, "y":4}, {"label":"k37", "x":8, "y":4}, {"label":"k38", "x":9, "y":4}, {"label":"k42", "x":2, "y":5}, {"label":"k43", "x":3, "y":5}, {"label":"k44", "x":4, "y":5}, {"label":"k45", "x":5, "y":5}, {"label":"k46", "x":7, "y":5}, {"label":"k47", "x":8, "y":5}, {"label":"k48", "x":9, "y":5}, {"label":"k49", "x":10, "y":5}] diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk index 420e409e439..040710a460d 100755 --- a/keyboards/dichotomy/rules.mk +++ b/keyboards/dichotomy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dinofizz/fnrow/v1/info.json b/keyboards/dinofizz/fnrow/v1/info.json index de21492393c..c031e4c1631 100644 --- a/keyboards/dinofizz/fnrow/v1/info.json +++ b/keyboards/dinofizz/fnrow/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0100", "device_version": "0.0.1" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_fn_row": { "layout": [ diff --git a/keyboards/dinofizz/fnrow/v1/rules.mk b/keyboards/dinofizz/fnrow/v1/rules.mk index fa45f109664..2f7ef9fbe89 100644 --- a/keyboards/dinofizz/fnrow/v1/rules.mk +++ b/keyboards/dinofizz/fnrow/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dk60/info.json b/keyboards/dk60/info.json index 7d7cf4a7b03..5e37593039e 100644 --- a/keyboards/dk60/info.json +++ b/keyboards/dk60/info.json @@ -8,6 +8,8 @@ "pid": "0x56C2", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dk60/rules.mk b/keyboards/dk60/rules.mk index 3830d60187d..99c7eb0fa2e 100644 --- a/keyboards/dk60/rules.mk +++ b/keyboards/dk60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index 10f67b05acd..24dbc2b744c 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -8,6 +8,8 @@ "pid": "0xEE60", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk index aba3644c9ed..a876de5b539 100644 --- a/keyboards/dm9records/ergoinu/rules.mk +++ b/keyboards/dm9records/ergoinu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json index fd39c977fd5..6ef0d21391b 100644 --- a/keyboards/dm9records/lain/info.json +++ b/keyboards/dm9records/lain/info.json @@ -8,6 +8,8 @@ "pid": "0xE8F4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dm9records/lain/rules.mk b/keyboards/dm9records/lain/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/dm9records/lain/rules.mk +++ b/keyboards/dm9records/lain/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index d8e4f57e082..f0e3577e5f1 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk index 0fa5688ca42..c8391483dda 100644 --- a/keyboards/dm9records/plaid/rules.mk +++ b/keyboards/dm9records/plaid/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index 75045935bec..24fad8a9fff 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk index a90a23a5532..66ded37adf6 100644 --- a/keyboards/dm9records/tartan/rules.mk +++ b/keyboards/dm9records/tartan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json index 14db65cc650..2e5148236e2 100644 --- a/keyboards/dmqdesign/spin/info.json +++ b/keyboards/dmqdesign/spin/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dmqdesign/spin/rules.mk b/keyboards/dmqdesign/spin/rules.mk index c5b0b32b509..e77cf66617e 100644 --- a/keyboards/dmqdesign/spin/rules.mk +++ b/keyboards/dmqdesign/spin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json index 4b46e8ccd7f..781186d1ed3 100644 --- a/keyboards/do60/info.json +++ b/keyboards/do60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/do60/rules.mk b/keyboards/do60/rules.mk index 6deca35cd9a..d22d1cd2f42 100644 --- a/keyboards/do60/rules.mk +++ b/keyboards/do60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index 9bb19482e3a..d8bf6e8b739 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1601", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk index 07ca8da9ea7..475b3b9a52d 100644 --- a/keyboards/doio/kb16/rev1/rules.mk +++ b/keyboards/doio/kb16/rev1/rules.mk @@ -1,12 +1,6 @@ SRC += ./lib/layer_status/layer_status.c SRC += ./lib/logo.c -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json index c8307ce80b1..47ed0c3f429 100644 --- a/keyboards/doio/kb30/info.json +++ b/keyboards/doio/kb30/info.json @@ -8,6 +8,8 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk index 7d16bb3a10e..a50872f0d5c 100644 --- a/keyboards/doio/kb30/rules.mk +++ b/keyboards/doio/kb30/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json index 338b3c24518..5285e7ee8bb 100644 --- a/keyboards/donutcables/budget96/info.json +++ b/keyboards/donutcables/budget96/info.json @@ -8,6 +8,8 @@ "pid": "0xB960", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2, "w":1.5}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":0, "y":3, "w":1.75}, {"x":1.75, "y":3}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3, "w":1.25}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":3.25, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.75}, {"x":14, "y":4}, {"x":15, "y":4}, {"x":16, "y":4}, {"x":17, "y":4}, {"x":18, "y":4}, {"x":0, "y":5, "w":1.25}, {"x":1.25, "y":5, "w":1.25}, {"x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":15, "y":5}, {"x":16, "y":5}, {"x":17, "y":5}, {"x":18, "y":5}] diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk index 4dcdfe886af..03a618b76dc 100644 --- a/keyboards/donutcables/budget96/rules.mk +++ b/keyboards/donutcables/budget96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/info.json index 513aea53aa4..0f805c70577 100644 --- a/keyboards/donutcables/scrabblepad/info.json +++ b/keyboards/donutcables/scrabblepad/info.json @@ -8,6 +8,8 @@ "pid": "0x21D7", "device_version": "1.0.0" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, {"x":14, "y":6}, {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":8, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, {"x":14, "y":7}, {"x":0, "y":8}, {"x":1, "y":8}, {"x":2, "y":8}, {"x":3, "y":8}, {"x":4, "y":8}, {"x":5, "y":8}, {"x":6, "y":8}, {"x":7, "y":8}, {"x":8, "y":8}, {"x":9, "y":8}, {"x":10, "y":8}, {"x":11, "y":8}, {"x":12, "y":8}, {"x":13, "y":8}, {"x":14, "y":8}, {"x":0, "y":9}, {"x":1, "y":9}, {"x":2, "y":9}, {"x":3, "y":9}, {"x":4, "y":9}, {"x":5, "y":9}, {"x":6, "y":9}, {"x":7, "y":9}, {"x":8, "y":9}, {"x":9, "y":9}, {"x":10, "y":9}, {"x":11, "y":9}, {"x":12, "y":9}, {"x":13, "y":9}, {"x":14, "y":9}, {"x":0, "y":10}, {"x":1, "y":10}, {"x":2, "y":10}, {"x":3, "y":10}, {"x":4, "y":10}, {"x":5, "y":10}, {"x":6, "y":10}, {"x":7, "y":10}, {"x":8, "y":10}, {"x":9, "y":10}, {"x":10, "y":10}, {"x":11, "y":10}, {"x":12, "y":10}, {"x":13, "y":10}, {"x":14, "y":10}, {"x":0, "y":11}, {"x":1, "y":11}, {"x":2, "y":11}, {"x":3, "y":11}, {"x":4, "y":11}, {"x":5, "y":11}, {"x":6, "y":11}, {"x":7, "y":11}, {"x":8, "y":11}, {"x":9, "y":11}, {"x":10, "y":11}, {"x":11, "y":11}, {"x":12, "y":11}, {"x":13, "y":11}, {"x":14, "y":11}, {"x":0, "y":12}, {"x":1, "y":12}, {"x":2, "y":12}, {"x":3, "y":12}, {"x":4, "y":12}, {"x":5, "y":12}, {"x":6, "y":12}, {"x":7, "y":12}, {"x":8, "y":12}, {"x":9, "y":12}, {"x":10, "y":12}, {"x":11, "y":12}, {"x":12, "y":12}, {"x":13, "y":12}, {"x":14, "y":12}, {"x":0, "y":13}, {"x":1, "y":13}, {"x":2, "y":13}, {"x":3, "y":13}, {"x":4, "y":13}, {"x":5, "y":13}, {"x":6, "y":13}, {"x":7, "y":13}, {"x":8, "y":13}, {"x":9, "y":13}, {"x":10, "y":13}, {"x":11, "y":13}, {"x":12, "y":13}, {"x":13, "y":13}, {"x":14, "y":13}, {"x":0, "y":14}, {"x":1, "y":14}, {"x":2, "y":14}, {"x":3, "y":14}, {"x":4, "y":14}, {"x":5, "y":14}, {"x":6, "y":14}, {"x":7, "y":14}, {"x":8, "y":14}, {"x":9, "y":14}, {"x":10, "y":14}, {"x":11, "y":14}, {"x":12, "y":14}, {"x":13, "y":14}, {"x":14, "y":14}] diff --git a/keyboards/donutcables/scrabblepad/rules.mk b/keyboards/donutcables/scrabblepad/rules.mk index 9365ea7c650..84ab7f32b2b 100644 --- a/keyboards/donutcables/scrabblepad/rules.mk +++ b/keyboards/donutcables/scrabblepad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json index 465dcec611e..52915ac2224 100644 --- a/keyboards/doodboard/duckboard/info.json +++ b/keyboards/doodboard/duckboard/info.json @@ -8,6 +8,8 @@ "pid": "0xFF44", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk index 3aaae9d193a..4ddaccda461 100644 --- a/keyboards/doodboard/duckboard/rules.mk +++ b/keyboards/doodboard/duckboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json index f877a63a0cf..8146af8bac6 100644 --- a/keyboards/doodboard/duckboard_r2/info.json +++ b/keyboards/doodboard/duckboard_r2/info.json @@ -8,6 +8,8 @@ "pid": "0x6462", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doodboard/duckboard_r2/rules.mk b/keyboards/doodboard/duckboard_r2/rules.mk index 3aaae9d193a..4ddaccda461 100644 --- a/keyboards/doodboard/duckboard_r2/rules.mk +++ b/keyboards/doodboard/duckboard_r2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index e1edf3d77d2..7c513539dad 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -8,6 +8,8 @@ "pid": "0x4447", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"1", "x":3.5, "y":0}, {"label":"2", "x":4.5, "y":0}, {"label":"3", "x":5.5, "y":0}, {"label":"4", "x":6.5, "y":0}, {"label":"5", "x":7.5, "y":0}, {"label":"6", "x":8.5, "y":0}, {"label":"7", "x":10.5, "y":0}, {"label":"8", "x":11.5, "y":0}, {"label":"9", "x":12.5, "y":0}, {"label":"0", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"F3", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Pg Up", "x":19, "y":1}, {"label":"F4", "x":0, "y":2}, {"label":"F5", "x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"~", "x":16.25, "y":2}, {"label":"Enter", "x":17.25, "y":2, "w":1.25}, {"label":"Pg Dn", "x":19, "y":2}, {"label":"F6", "x":0, "y":3}, {"label":"F7", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":1.25}, {"label":"|", "x":3.75, "y":3}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"Up", "x":17.75, "y":3.25}, {"label":"Fn", "x":19, "y":3}, {"label":"F8", "x":0, "y":4}, {"label":"F9", "x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, {"label":"Win", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"x":8.25, "y":4}, {"x":10.25, "y":4, "w":2.75}, {"label":"Alt", "x":13, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Left", "x":16.75, "y":4.25}, {"label":"Down", "x":17.75, "y":4.25}, {"label":"Right", "x":18.75, "y":4.25}] diff --git a/keyboards/doppelganger/rules.mk b/keyboards/doppelganger/rules.mk index 1ca40bc93dd..f1a07bd25ef 100644 --- a/keyboards/doppelganger/rules.mk +++ b/keyboards/doppelganger/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json index dc55c93a708..0f784cc7d69 100644 --- a/keyboards/doro67/multi/info.json +++ b/keyboards/doro67/multi/info.json @@ -8,6 +8,8 @@ "pid": "0x4D4C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/doro67/multi/rules.mk b/keyboards/doro67/multi/rules.mk index b9a2a511340..f89945313a8 100644 --- a/keyboards/doro67/multi/rules.mk +++ b/keyboards/doro67/multi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json index 3bf54a2b9af..32b197f9424 100644 --- a/keyboards/doro67/regular/info.json +++ b/keyboards/doro67/regular/info.json @@ -7,6 +7,8 @@ "pid": "0x5245", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/doro67/regular/rules.mk b/keyboards/doro67/regular/rules.mk index 44a5dee9c2b..e70cd601e74 100644 --- a/keyboards/doro67/regular/rules.mk +++ b/keyboards/doro67/regular/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json index 55b8627b5e9..3141873c2ac 100644 --- a/keyboards/doro67/rgb/info.json +++ b/keyboards/doro67/rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x5247", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/doro67/rgb/rules.mk b/keyboards/doro67/rgb/rules.mk index 5c174d8e4da..7bd80b9503c 100644 --- a/keyboards/doro67/rgb/rules.mk +++ b/keyboards/doro67/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index fd97cf38fec..605c66bb0db 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -8,6 +8,8 @@ "pid": "0x00BE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 3d162925f23..491e8e34a71 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json index 177092d5a3e..55265639297 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/info.json @@ -8,6 +8,8 @@ "pid": "0x1B1E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk index d3b69705a0f..453d3b26b1d 100644 --- a/keyboards/draculad/rules.mk +++ b/keyboards/draculad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json index 80f9da0e596..8b39ae5ba1e 100644 --- a/keyboards/draytronics/daisy/info.json +++ b/keyboards/draytronics/daisy/info.json @@ -8,6 +8,8 @@ "pid": "0x4441", "device_version": "1.0.0" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT_daisy": "LAYOUT" }, diff --git a/keyboards/draytronics/daisy/rules.mk b/keyboards/draytronics/daisy/rules.mk index 7bf0a866675..09169eaf7f0 100644 --- a/keyboards/draytronics/daisy/rules.mk +++ b/keyboards/draytronics/daisy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json index 0c27bc86f21..9772e6d8722 100644 --- a/keyboards/draytronics/elise/info.json +++ b/keyboards/draytronics/elise/info.json @@ -8,6 +8,8 @@ "pid": "0x454C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_right_lrg": "LAYOUT_65_ansi_rwkl", "LAYOUT_65_ansi_left_lrg": "LAYOUT_65_ansi_lwkl", diff --git a/keyboards/draytronics/elise/rules.mk b/keyboards/draytronics/elise/rules.mk index d0bc92c43cf..28c29a3b4dc 100644 --- a/keyboards/draytronics/elise/rules.mk +++ b/keyboards/draytronics/elise/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json index c57e0059158..d04e1374ed8 100644 --- a/keyboards/draytronics/elise_v2/info.json +++ b/keyboards/draytronics/elise_v2/info.json @@ -8,6 +8,8 @@ "pid": "0x454C", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_right_lrg": "LAYOUT_65_ansi_rwkl", "LAYOUT_65_ansi_left_lrg": "LAYOUT_65_ansi_lwkl", diff --git a/keyboards/draytronics/elise_v2/rules.mk b/keyboards/draytronics/elise_v2/rules.mk index d0bc92c43cf..28c29a3b4dc 100644 --- a/keyboards/draytronics/elise_v2/rules.mk +++ b/keyboards/draytronics/elise_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json index 7d353ef36e7..af0894ce3dc 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/info.json @@ -8,6 +8,8 @@ "pid": "0x5343", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/draytronics/scarlet/rules.mk +++ b/keyboards/draytronics/scarlet/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json index 431b38b3452..f3c3896969c 100644 --- a/keyboards/drewkeys/iskar/info.json +++ b/keyboards/drewkeys/iskar/info.json @@ -8,6 +8,8 @@ "pid": "0x1284", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk index 9591f732c49..db678d6eadf 100644 --- a/keyboards/drewkeys/iskar/rules.mk +++ b/keyboards/drewkeys/iskar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/info.json index 920877f28d2..20f2edd54f9 100644 --- a/keyboards/drhigsby/bkf/info.json +++ b/keyboards/drhigsby/bkf/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_625uC": { "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":6.25}, {"label":"Alt", "x":10, "y":3, "w":1.25}, {"label":"Win", "x":11.25, "y":3}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}] diff --git a/keyboards/drhigsby/bkf/rules.mk b/keyboards/drhigsby/bkf/rules.mk index 9861cf0ad64..89c72050b80 100644 --- a/keyboards/drhigsby/bkf/rules.mk +++ b/keyboards/drhigsby/bkf/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json index af62239030e..e9ea824c5f5 100644 --- a/keyboards/drhigsby/dubba175/info.json +++ b/keyboards/drhigsby/dubba175/info.json @@ -8,6 +8,8 @@ "pid": "0x0420", "device_version": "4.2.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"", "x":0, "y":0}, {"label":"", "x":1, "y":0}, {"label":"", "x":2, "y":0}, {"label":"", "x":3, "y":0}, {"label":"", "x":4, "y":0}, {"label":"", "x":5, "y":0}, {"label":"", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":0, "y":1}, {"label":"", "x":1, "y":1}, {"label":"", "x":2, "y":1}, {"label":"", "x":3, "y":1}, {"label":"", "x":4, "y":1}, {"label":"", "x":5, "y":1}, {"label":"", "x":6, "y":1}, {"label":"", "x":7, "y":1}, {"label":"", "x":8, "y":1}, {"label":"", "x":9, "y":1}, {"label":"", "x":0, "y":2}, {"label":"", "x":1, "y":2}, {"label":"", "x":2, "y":2}, {"label":"", "x":3, "y":2}, {"label":"", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"", "x":9, "y":2}, {"label":"", "x":1.25, "y":3}, {"label":"", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":1.75}, {"x":5, "y":3, "w":1.75}, {"label":"", "x":6.75, "y":3}, {"label":"", "x":7.75, "y":3}] diff --git a/keyboards/drhigsby/dubba175/rules.mk b/keyboards/drhigsby/dubba175/rules.mk index a51132838a1..f8e989aa3cf 100644 --- a/keyboards/drhigsby/dubba175/rules.mk +++ b/keyboards/drhigsby/dubba175/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index f6cda513fb2..31e8816a460 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_3x12": { "layout": [ diff --git a/keyboards/drhigsby/ogurec/rules.mk b/keyboards/drhigsby/ogurec/rules.mk index 11587edf86e..9c26313b5be 100644 --- a/keyboards/drhigsby/ogurec/rules.mk +++ b/keyboards/drhigsby/ogurec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/drhigsby/packrat/info.json b/keyboards/drhigsby/packrat/info.json index 43ed4e432cf..02d1e1e4c3c 100644 --- a/keyboards/drhigsby/packrat/info.json +++ b/keyboards/drhigsby/packrat/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_3uc": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"KNOB!", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.25}, {"label":"Alt", "x":1.75, "y":3, "w":1.25}, {"label":"Raise", "x":3, "y":3}, {"label":"", "x":4, "y":3, "w":3}, {"label":"Lower", "x":7, "y":3}, {"label":"Win", "x":8, "y":3, "w":1.25}, {"label":"Fn", "x":9.25, "y":3, "w":1.25}] diff --git a/keyboards/drhigsby/packrat/rules.mk b/keyboards/drhigsby/packrat/rules.mk index fc0608c07f3..f82f47b09ae 100644 --- a/keyboards/drhigsby/packrat/rules.mk +++ b/keyboards/drhigsby/packrat/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json index eb6189088c2..7a33c90cb11 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/info.json @@ -8,6 +8,8 @@ "pid": "0x4973", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/cg108/rules.mk b/keyboards/dtisaac/cg108/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/dtisaac/cg108/rules.mk +++ b/keyboards/dtisaac/cg108/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index d24975ca8bd..286396776ef 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x4973", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "lufa-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk index caecba365e4..c3b1c4ef118 100644 --- a/keyboards/dtisaac/dosa40rgb/rules.mk +++ b/keyboards/dtisaac/dosa40rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index 790648d64b3..913092f0c88 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -8,6 +8,8 @@ "pid": "0x4973", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/dtisaac01/rules.mk b/keyboards/dtisaac/dtisaac01/rules.mk index dfb44b1bf9d..e2a6fcff00f 100644 --- a/keyboards/dtisaac/dtisaac01/rules.mk +++ b/keyboards/dtisaac/dtisaac01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json index 6a258fedd1a..c4d9ffa8697 100644 --- a/keyboards/duck/eagle_viper/v2/info.json +++ b/keyboards/duck/eagle_viper/v2/info.json @@ -6,6 +6,8 @@ "pid": "0x4556", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_eagle": "LAYOUT_60_ansi", "LAYOUT_viper": "LAYOUT_60_hhkb", diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk index f613788c13a..ffea1dd7319 100644 --- a/keyboards/duck/eagle_viper/v2/rules.mk +++ b/keyboards/duck/eagle_viper/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json index 3205556d8e7..ae158863a01 100644 --- a/keyboards/duck/jetfire/info.json +++ b/keyboards/duck/jetfire/info.json @@ -8,6 +8,8 @@ "pid": "0x4A46", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"x":15.25, "y":0}, {"label":"PrtSc", "x":16.5, "y":0}, {"label":"Scroll Lock", "x":17.5, "y":0}, {"label":"Pause", "x":18.5, "y":0}, {"x":19.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Back Space", "x":13, "y":1.25}, {"x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Num Lock", "x":16.5, "y":1.25}, {"label":"/", "x":17.5, "y":1.25}, {"label":"*", "x":18.5, "y":1.25}, {"label":"-", "x":19.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"7", "x":16.5, "y":2.25}, {"label":"8", "x":17.5, "y":2.25}, {"label":"9", "x":18.5, "y":2.25}, {"label":"+", "x":19.5, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"4", "x":16.5, "y":3.25}, {"label":"5", "x":17.5, "y":3.25}, {"label":"6", "x":18.5, "y":3.25}, {"x":19.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"ISO \\", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"label":"\u2191", "x":15.25, "y":4.5}, {"label":"1", "x":16.5, "y":4.25}, {"label":"2", "x":17.5, "y":4.25}, {"label":"3", "x":18.5, "y":4.25}, {"label":"Enter", "x":19.5, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":6.25}, {"label":"Alt", "x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":12.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":14.25, "y":5.5}, {"label":"\u2193", "x":15.25, "y":5.5}, {"label":"\u2192", "x":16.25, "y":5.5}, {"label":"0", "x":17.5, "y":5.25}, {"label":".", "x":18.5, "y":5.25}, {"x":19.5, "y":5.25}] diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk index 30c22841afa..bfbd2aa6d76 100644 --- a/keyboards/duck/jetfire/rules.mk +++ b/keyboards/duck/jetfire/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index 39f62f0fe1c..9067ca8f60d 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -8,6 +8,8 @@ "pid": "0x4C53", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Num
Lock", "x":14, "y":0}, {"label":"Insert", "x":15, "y":0}, {"label":"Home", "x":16, "y":0}, {"label":"PgUp", "x":17, "y":0}, {"label":"/", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Bkspc", "x":13, "y":1, "w":2}, {"label":"Delete", "x":15, "y":1}, {"label":"End", "x":16, "y":1}, {"label":"PgDn", "x":17, "y":1}, {"label":"*", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"-", "x":18, "y":2}, {"label":"CapsLock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}] diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk index d9cbdb83394..044fb77f5aa 100644 --- a/keyboards/duck/lightsaver/rules.mk +++ b/keyboards/duck/lightsaver/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index 005d0db0a7e..c8208f06972 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x4F31", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk index 577fe2a3b00..8d7b854ec09 100644 --- a/keyboards/duck/octagon/v1/rules.mk +++ b/keyboards/duck/octagon/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index 074a67d4a4e..95f8886a38e 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4F32", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk index 05d340ed01c..dc181b289d8 100644 --- a/keyboards/duck/octagon/v2/rules.mk +++ b/keyboards/duck/octagon/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index a8d4d84e9bd..576c4945e52 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -8,6 +8,8 @@ "pid": "0x4F52", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk index fde35224aa3..d29d166083c 100644 --- a/keyboards/duck/orion/v3/rules.mk +++ b/keyboards/duck/orion/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json index f90d994cd0e..8cb7bfa08e1 100644 --- a/keyboards/duck/tcv3/info.json +++ b/keyboards/duck/tcv3/info.json @@ -8,6 +8,8 @@ "pid": "0x5443", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.5, "y":1.25}, {"x":18.5, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2.25, "y":2.25, "w":1.5}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25, "w":1.5}, {"x":17.5, "y":2.25}, {"x":18.5, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2.25, "y":3.25, "w":1.75}, {"x":4, "y":3.25}, {"x":5, "y":3.25}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25, "w":1.25}, {"x":17.5, "y":3.25}, {"x":18.5, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2.25, "y":4.25, "w":1.25}, {"x":3.5, "y":4.25}, {"x":4.5, "y":4.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25, "w":1.75}, {"x":16.25, "y":4.25}, {"x":17.5, "y":4.5}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25}, {"x":4.75, "y":5.25, "w":1.5}, {"x":6.25, "y":5.25, "w":6}, {"x":12.25, "y":5.25, "w":1.5}, {"x":13.75, "y":5.25}, {"x":14.75, "y":5.25, "w":1.5}, {"x":16.5, "y":5.5}, {"x":17.5, "y":5.5}, {"x":18.5, "y":5.5}] diff --git a/keyboards/duck/tcv3/rules.mk b/keyboards/duck/tcv3/rules.mk index 3fef0ce5420..b13684d8fd9 100644 --- a/keyboards/duck/tcv3/rules.mk +++ b/keyboards/duck/tcv3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json index caf466509a1..97100fa1f8c 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/info.json @@ -8,6 +8,8 @@ "pid": "0x25E3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/dumbo/rules.mk b/keyboards/dumbo/rules.mk index 6348457b640..6364de07d9b 100644 --- a/keyboards/dumbo/rules.mk +++ b/keyboards/dumbo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json index 5e5feb42ba4..676860caaed 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.0.7" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x/rules.mk b/keyboards/dumbpad/v0x/rules.mk index af192561367..7816aab001a 100644 --- a/keyboards/dumbpad/v0x/rules.mk +++ b/keyboards/dumbpad/v0x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json index 150a82f3739..d5fc6d69481 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.0.6" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_dualencoder/rules.mk b/keyboards/dumbpad/v0x_dualencoder/rules.mk index af192561367..7816aab001a 100644 --- a/keyboards/dumbpad/v0x_dualencoder/rules.mk +++ b/keyboards/dumbpad/v0x_dualencoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json index 657a85542d0..d5589ddbd67 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.0.7" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_right/rules.mk b/keyboards/dumbpad/v0x_right/rules.mk index af192561367..7816aab001a 100644 --- a/keyboards/dumbpad/v0x_right/rules.mk +++ b/keyboards/dumbpad/v0x_right/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json index 6355245982a..ae6734b006e 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x/rules.mk b/keyboards/dumbpad/v1x/rules.mk index af192561367..7816aab001a 100644 --- a/keyboards/dumbpad/v1x/rules.mk +++ b/keyboards/dumbpad/v1x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json index 6355245982a..ae6734b006e 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_dualencoder/rules.mk b/keyboards/dumbpad/v1x_dualencoder/rules.mk index af192561367..7816aab001a 100644 --- a/keyboards/dumbpad/v1x_dualencoder/rules.mk +++ b/keyboards/dumbpad/v1x_dualencoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json index d124c76e143..a20f41682eb 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk index 110bfc8eafa..073a351a03c 100644 --- a/keyboards/dumbpad/v1x_oled/rules.mk +++ b/keyboards/dumbpad/v1x_oled/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json index 44b7abacffc..1f7eee9a16f 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/info.json @@ -2,6 +2,8 @@ "usb": { "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_right/rules.mk b/keyboards/dumbpad/v1x_right/rules.mk index af192561367..7816aab001a 100644 --- a/keyboards/dumbpad/v1x_right/rules.mk +++ b/keyboards/dumbpad/v1x_right/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json index f29108fb391..5aaf2a95642 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/info.json @@ -5,6 +5,8 @@ "usb": { "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk index 832bd6d67f1..fb6e41a9c5c 100644 --- a/keyboards/dumbpad/v3x/rules.mk +++ b/keyboards/dumbpad/v3x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json new file mode 100644 index 00000000000..25d2b3ba76a --- /dev/null +++ b/keyboards/durgod/dgk6x/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F072", // F070 + "bootloader": "stm32-dfu", + "board": "DURGOD_STM32_F070" +} diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk index 660719104da..c82ce44bac9 100644 --- a/keyboards/durgod/dgk6x/rules.mk +++ b/keyboards/durgod/dgk6x/rules.mk @@ -1,11 +1,3 @@ -# MCU name -# Actually F070, but close enough -MCU = STM32F072 -BOARD = DURGOD_STM32_F070 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json new file mode 100644 index 00000000000..25d2b3ba76a --- /dev/null +++ b/keyboards/durgod/k310/base/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F072", // F070 + "bootloader": "stm32-dfu", + "board": "DURGOD_STM32_F070" +} diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk index d507d240cc0..92e817504f9 100644 --- a/keyboards/durgod/k310/base/rules.mk +++ b/keyboards/durgod/k310/base/rules.mk @@ -1,11 +1,3 @@ -# MCU name -# Actually F070, but close enough -MCU = STM32F072 -BOARD = DURGOD_STM32_F070 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/info.json new file mode 100644 index 00000000000..25d2b3ba76a --- /dev/null +++ b/keyboards/durgod/k320/base/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F072", // F070 + "bootloader": "stm32-dfu", + "board": "DURGOD_STM32_F070" +} diff --git a/keyboards/durgod/k320/base/rules.mk b/keyboards/durgod/k320/base/rules.mk index d507d240cc0..92e817504f9 100644 --- a/keyboards/durgod/k320/base/rules.mk +++ b/keyboards/durgod/k320/base/rules.mk @@ -1,11 +1,3 @@ -# MCU name -# Actually F070, but close enough -MCU = STM32F072 -BOARD = DURGOD_STM32_F070 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json index 98b9aa54273..7043ccc98d4 100644 --- a/keyboards/dyz/dyz40/info.json +++ b/keyboards/dyz/dyz40/info.json @@ -32,6 +32,8 @@ "pid": "0x000B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dyz/dyz40/rules.mk b/keyboards/dyz/dyz40/rules.mk index 5afe617b1dc..e3c4a42def8 100644 --- a/keyboards/dyz/dyz40/rules.mk +++ b/keyboards/dyz/dyz40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json index 18f4d8f4f44..5f01941441f 100644 --- a/keyboards/dyz/dyz60/info.json +++ b/keyboards/dyz/dyz60/info.json @@ -32,6 +32,8 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dyz/dyz60/rules.mk b/keyboards/dyz/dyz60/rules.mk index 5afe617b1dc..e3c4a42def8 100644 --- a/keyboards/dyz/dyz60/rules.mk +++ b/keyboards/dyz/dyz60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json index 701f09a9846..77e194c4c7e 100644 --- a/keyboards/dyz/dyz60_hs/info.json +++ b/keyboards/dyz/dyz60_hs/info.json @@ -35,6 +35,8 @@ "pid": "0x001A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/dyz/dyz60_hs/rules.mk b/keyboards/dyz/dyz60_hs/rules.mk index dfe72bbfb7f..d8668fc8312 100644 --- a/keyboards/dyz/dyz60_hs/rules.mk +++ b/keyboards/dyz/dyz60_hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json index 0281e94fb16..a3787a80cc1 100644 --- a/keyboards/dyz/dyz_tkl/info.json +++ b/keyboards/dyz/dyz_tkl/info.json @@ -29,6 +29,8 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/dyz/dyz_tkl/rules.mk b/keyboards/dyz/dyz_tkl/rules.mk index b5761555d40..3c777809b4a 100644 --- a/keyboards/dyz/dyz_tkl/rules.mk +++ b/keyboards/dyz/dyz_tkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json index d1a1b54cfc1..d5efd048118 100644 --- a/keyboards/dyz/selka40/info.json +++ b/keyboards/dyz/selka40/info.json @@ -32,6 +32,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dyz/selka40/rules.mk b/keyboards/dyz/selka40/rules.mk index 5afe617b1dc..e3c4a42def8 100644 --- a/keyboards/dyz/selka40/rules.mk +++ b/keyboards/dyz/selka40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json index edf49806c3c..c76fe96f870 100644 --- a/keyboards/dyz/synthesis60/info.json +++ b/keyboards/dyz/synthesis60/info.json @@ -47,6 +47,8 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dyz/synthesis60/rules.mk b/keyboards/dyz/synthesis60/rules.mk index fe65a2143cd..f5d7b73330d 100644 --- a/keyboards/dyz/synthesis60/rules.mk +++ b/keyboards/dyz/synthesis60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json index 968561c3c32..5678d5724c2 100644 --- a/keyboards/dz60/info.json +++ b/keyboards/dz60/info.json @@ -8,6 +8,8 @@ "pid": "0x2260", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"], "layouts": { "LAYOUT": { diff --git a/keyboards/dz60/rules.mk b/keyboards/dz60/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/dz60/rules.mk +++ b/keyboards/dz60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index aca74e0405e..638df11bdb9 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -8,6 +8,8 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"~", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"label":"Home", "x":17.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"Page Up", "x":17.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2.25}, {"label":"Page Down", "x":17.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"label":"Shift", "x":3.75, "y":3}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.75}, {"label":"\u2191", "x":16.5, "y":3}, {"label":"End", "x":17.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, {"label":"Win", "x":3.75, "y":4, "w":1.25}, {"label":"Alt", "x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"label":"Alt", "x":12.5, "y":4, "w":1.25}, {"label":"Fn", "x":13.75, "y":4, "w":1.25}, {"label":"\u2190", "x":15.5, "y":4}, {"label":"\u2193", "x":16.5, "y":4}, {"label":"\u2192", "x":17.5, "y":4}] diff --git a/keyboards/dztech/bocc/rules.mk b/keyboards/dztech/bocc/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/dztech/bocc/rules.mk +++ b/keyboards/dztech/bocc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index cce242109d0..54672e21ae2 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -8,6 +8,8 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/dztech/duo_s/rules.mk b/keyboards/dztech/duo_s/rules.mk index 23c94bb7560..b851d0ab392 100644 --- a/keyboards/dztech/duo_s/rules.mk +++ b/keyboards/dztech/duo_s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json index 3c2c0fd5b6e..d693e44ecb5 100644 --- a/keyboards/dztech/dz60rgb/v1/info.json +++ b/keyboards/dztech/dz60rgb/v1/info.json @@ -3,5 +3,8 @@ "pid": "0x1120", "device_version": "1.0.0" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json index 9c549ea990a..ddd9fadd3ab 100644 --- a/keyboards/dztech/dz60rgb/v2/info.json +++ b/keyboards/dztech/dz60rgb/v2/info.json @@ -3,5 +3,7 @@ "pid": "0x1121", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk index 036987413e1..c1fb17d02d6 100644 --- a/keyboards/dztech/dz60rgb/v2/rules.mk +++ b/keyboards/dztech/dz60rgb/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json index 6888f7af078..88618d3745c 100644 --- a/keyboards/dztech/dz60rgb/v2_1/info.json +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -3,5 +3,7 @@ "pid": "0x1121", "device_version": "2.1.0" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk index b9fce504f2b..126a0c0d0bc 100644 --- a/keyboards/dztech/dz60rgb/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms BOOTLOADER_SIZE = 6144 # Build Options diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json index 6b243b95d9a..5dcb042f965 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json @@ -3,5 +3,8 @@ "pid": "0x1220", "device_version": "1.0.0" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk index 22ecf071a72..c1fb17d02d6 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json index 3b5f657cd73..42d21e89314 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json @@ -3,5 +3,7 @@ "pid": "0x1221", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk index d538e324f35..5ea934ec9a6 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json index 249f968b9b5..4bdb295eca5 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -3,5 +3,7 @@ "pid": "0x1221", "device_version": "2.1.0" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk index 800fb472561..78145d796d6 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms BOOTLOADER_SIZE = 6144 # Build Options diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json index 89f117e6320..511a797a5c7 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json @@ -3,5 +3,8 @@ "pid": "0x1320", "device_version": "1.0.0" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk index 22ecf071a72..c1fb17d02d6 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json index bbb23fc0916..3bd3a96b8e6 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json @@ -3,5 +3,7 @@ "pid": "0x1321", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk index 036987413e1..c1fb17d02d6 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json index a1be9c33cae..4eb2b1eca08 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -3,5 +3,7 @@ "pid": "0x1321", "device_version": "2.1.0" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk index 800fb472561..78145d796d6 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms BOOTLOADER_SIZE = 6144 # Build Options diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json index c119e5cc4d8..efae138c1e0 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x1013", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk index f4982e7fd26..04451b76a71 100644 --- a/keyboards/dztech/dz64rgb/rules.mk +++ b/keyboards/dztech/dz64rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json index 3dfd21093d2..9e88a65fe4f 100644 --- a/keyboards/dztech/dz65rgb/v1/info.json +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -3,5 +3,8 @@ "pid": "0x1420", "device_version": "1.0.0" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz65rgb/v1/rules.mk b/keyboards/dztech/dz65rgb/v1/rules.mk index 4367d513554..7d73c4db84a 100644 --- a/keyboards/dztech/dz65rgb/v1/rules.mk +++ b/keyboards/dztech/dz65rgb/v1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json index db3a55c20c5..502b498e926 100644 --- a/keyboards/dztech/dz65rgb/v2/info.json +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -3,5 +3,7 @@ "pid": "0x1421", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3 } diff --git a/keyboards/dztech/dz65rgb/v2/rules.mk b/keyboards/dztech/dz65rgb/v2/rules.mk index 2170fbdabea..7d73c4db84a 100644 --- a/keyboards/dztech/dz65rgb/v2/rules.mk +++ b/keyboards/dztech/dz65rgb/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index f2c2236031a..4d46faea482 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x1424", "device_version": "3.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "lufa-ms" } diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk index 8f6dee4c8a2..67366c7a000 100755 --- a/keyboards/dztech/dz65rgb/v3/rules.mk +++ b/keyboards/dztech/dz65rgb/v3/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms BOOTLOADER_SIZE = 6144 # Build Options diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json index 1ce43d6d185..afb69f12aae 100644 --- a/keyboards/dztech/dz96/info.json +++ b/keyboards/dztech/dz96/info.json @@ -8,6 +8,8 @@ "pid": "0xDB96", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/dztech/dz96/rules.mk b/keyboards/dztech/dz96/rules.mk index 02fbe725257..14e80e7106b 100644 --- a/keyboards/dztech/dz96/rules.mk +++ b/keyboards/dztech/dz96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index a7399990846..28daf1b97ee 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -8,6 +8,8 @@ "pid": "0x1015", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/dztech/endless80/rules.mk b/keyboards/dztech/endless80/rules.mk index 533eacc989c..4ae26a099a5 100644 --- a/keyboards/dztech/endless80/rules.mk +++ b/keyboards/dztech/endless80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/e88/info.json b/keyboards/e88/info.json index 3f2bd18f29f..0c1e2126545 100644 --- a/keyboards/e88/info.json +++ b/keyboards/e88/info.json @@ -8,6 +8,8 @@ "pid": "0x0187", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/e88/rules.mk b/keyboards/e88/rules.mk index 1c5d9aa0f59..6ff9b4e02ba 100644 --- a/keyboards/e88/rules.mk +++ b/keyboards/e88/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json index 14230d45572..e62de3f54f0 100644 --- a/keyboards/ealdin/quadrant/info.json +++ b/keyboards/ealdin/quadrant/info.json @@ -8,6 +8,8 @@ "pid": "0x5154", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT_ortho_5x14": { diff --git a/keyboards/ealdin/quadrant/rules.mk b/keyboards/ealdin/quadrant/rules.mk index f19d05cb1d4..a8ce2452a8c 100644 --- a/keyboards/ealdin/quadrant/rules.mk +++ b/keyboards/ealdin/quadrant/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json index 8a6ab27b359..429c9b1cbd3 100644 --- a/keyboards/earth_rover/info.json +++ b/keyboards/earth_rover/info.json @@ -8,6 +8,8 @@ "pid": "0xEE11", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/earth_rover/rules.mk b/keyboards/earth_rover/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/earth_rover/rules.mk +++ b/keyboards/earth_rover/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json index 5ea0450b0d9..327b9934e86 100644 --- a/keyboards/eason/capsule65/info.json +++ b/keyboards/eason/capsule65/info.json @@ -8,6 +8,8 @@ "pid": "0x6E6E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/eason/capsule65/rules.mk b/keyboards/eason/capsule65/rules.mk index 583c5e314c5..b96c8ddbec0 100644 --- a/keyboards/eason/capsule65/rules.mk +++ b/keyboards/eason/capsule65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json index ffc847a1d4b..37898f48466 100644 --- a/keyboards/ebastler/isometria_75/rev1/info.json +++ b/keyboards/ebastler/isometria_75/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso": { "layout": [ diff --git a/keyboards/ebastler/isometria_75/rev1/rules.mk b/keyboards/ebastler/isometria_75/rev1/rules.mk index b755e9eb2df..bd6499b2396 100644 --- a/keyboards/ebastler/isometria_75/rev1/rules.mk +++ b/keyboards/ebastler/isometria_75/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 36710f9996c..24c153341cc 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -7,6 +7,8 @@ "vid": "0x1337", "pid": "0x6006" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}] diff --git a/keyboards/eco/rules.mk b/keyboards/eco/rules.mk index aec1299db44..6e28ce6bbb2 100644 --- a/keyboards/eco/rules.mk +++ b/keyboards/eco/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json index 43b79f6a903..43314e1d825 100644 --- a/keyboards/edc40/info.json +++ b/keyboards/edc40/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/edc40/rules.mk b/keyboards/edc40/rules.mk index da3defc0d16..11a655da353 100644 --- a/keyboards/edc40/rules.mk +++ b/keyboards/edc40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json index 54cde72e367..9b3c6c733a8 100644 --- a/keyboards/edda/info.json +++ b/keyboards/edda/info.json @@ -8,6 +8,8 @@ "pid": "0x4544", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/edda/rules.mk b/keyboards/edda/rules.mk index 8f4134d0b59..ab2c49da70e 100644 --- a/keyboards/edda/rules.mk +++ b/keyboards/edda/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json index e8daa42a1c8..7849eae7cac 100644 --- a/keyboards/edi/hardlight/mk1/info.json +++ b/keyboards/edi/hardlight/mk1/info.json @@ -6,6 +6,8 @@ "pid": "0x2401", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" "layouts": { "LAYOUT_ortho_4x16": { "layout": [ diff --git a/keyboards/edi/hardlight/mk1/rules.mk b/keyboards/edi/hardlight/mk1/rules.mk index cb90be7699f..1763386b87e 100644 --- a/keyboards/edi/hardlight/mk1/rules.mk +++ b/keyboards/edi/hardlight/mk1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json index bcd3b4945c6..aff84f1e322 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/info.json @@ -6,6 +6,8 @@ "pid": "0x2408", "device_version": "0.0.7" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x16"], "layouts": { "LAYOUT_ortho_4x16": { diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk index 20fc317802e..aad4915dd63 100644 --- a/keyboards/edi/hardlight/mk2/rules.mk +++ b/keyboards/edi/hardlight/mk2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json index 464b5b1c84c..95d3e6d6ee7 100644 --- a/keyboards/edi/standaside/info.json +++ b/keyboards/edi/standaside/info.json @@ -8,6 +8,8 @@ "pid": "0x0412", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x16": { "layout": [ diff --git a/keyboards/edi/standaside/rules.mk b/keyboards/edi/standaside/rules.mk index 8e4bcc5f9be..8dd3faf689b 100644 --- a/keyboards/edi/standaside/rules.mk +++ b/keyboards/edi/standaside/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json index e1c6f5eb09a..df7884ce422 100644 --- a/keyboards/eek/info.json +++ b/keyboards/eek/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/eek/rules.mk b/keyboards/eek/rules.mk index 90a1da19935..d12dc9e031a 100644 --- a/keyboards/eek/rules.mk +++ b/keyboards/eek/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json index 2dc7da9b33b..4a62e674214 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/efreet/rules.mk b/keyboards/efreet/rules.mk index 042583e936e..f82a86f3e3a 100644 --- a/keyboards/efreet/rules.mk +++ b/keyboards/efreet/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json index d7b2c529e16..676915d9e63 100644 --- a/keyboards/ein_60/info.json +++ b/keyboards/ein_60/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk index c4dbb872028..869c3051849 100644 --- a/keyboards/ein_60/rules.mk +++ b/keyboards/ein_60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/info.json index 96f13922239..f60f319e858 100644 --- a/keyboards/ekow/akira/info.json +++ b/keyboards/ekow/akira/info.json @@ -8,6 +8,8 @@ "pid": "0x414B", "device_version": "0.0.1" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "debounce": 3, "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/ekow/akira/rules.mk b/keyboards/ekow/akira/rules.mk index 6653c66b160..5356b24d77c 100644 --- a/keyboards/ekow/akira/rules.mk +++ b/keyboards/ekow/akira/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json index cbc7b78378e..7dd1656d1c7 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/info.json @@ -8,6 +8,8 @@ "pid": "0x0721", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk index 642314b9c28..66270aae472 100644 --- a/keyboards/elephant42/rules.mk +++ b/keyboards/elephant42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/info.json index b2717418804..7b654b9ee9d 100644 --- a/keyboards/emajesty/eiri/info.json +++ b/keyboards/emajesty/eiri/info.json @@ -8,6 +8,8 @@ "pid": "0x9372", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/emajesty/eiri/rules.mk b/keyboards/emajesty/eiri/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/emajesty/eiri/rules.mk +++ b/keyboards/emajesty/eiri/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json index aba98209286..b0d25a56b05 100644 --- a/keyboards/emery65/info.json +++ b/keyboards/emery65/info.json @@ -8,6 +8,8 @@ "pid": "0x4536", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/emery65/rules.mk b/keyboards/emery65/rules.mk index 169c45b479d..7000bb65710 100644 --- a/keyboards/emery65/rules.mk +++ b/keyboards/emery65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index 79f5359e01d..093b3e5b451 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/emi20/rules.mk b/keyboards/emi20/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/emi20/rules.mk +++ b/keyboards/emi20/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/emptystring/nqg/info.json b/keyboards/emptystring/nqg/info.json index 6ccbc013708..37c11551f7d 100644 --- a/keyboards/emptystring/nqg/info.json +++ b/keyboards/emptystring/nqg/info.json @@ -8,6 +8,8 @@ "pid": "0x0037", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/emptystring/nqg/rules.mk b/keyboards/emptystring/nqg/rules.mk index e61c7dbfd05..ca64cddccd2 100644 --- a/keyboards/emptystring/nqg/rules.mk +++ b/keyboards/emptystring/nqg/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/eniigmakeyboards/ek60/info.json b/keyboards/eniigmakeyboards/ek60/info.json index 2963c5de59e..ded33b156bd 100644 --- a/keyboards/eniigmakeyboards/ek60/info.json +++ b/keyboards/eniigmakeyboards/ek60/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/eniigmakeyboards/ek60/rules.mk b/keyboards/eniigmakeyboards/ek60/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/eniigmakeyboards/ek60/rules.mk +++ b/keyboards/eniigmakeyboards/ek60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eniigmakeyboards/ek65/rules.mk b/keyboards/eniigmakeyboards/ek65/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/eniigmakeyboards/ek65/rules.mk +++ b/keyboards/eniigmakeyboards/ek65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eniigmakeyboards/ek87/info.json b/keyboards/eniigmakeyboards/ek87/info.json index c05ca3bcd91..af5eb06bad4 100644 --- a/keyboards/eniigmakeyboards/ek87/info.json +++ b/keyboards/eniigmakeyboards/ek87/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout":[ diff --git a/keyboards/eniigmakeyboards/ek87/rules.mk b/keyboards/eniigmakeyboards/ek87/rules.mk index 1df819bb087..9e8f5833179 100644 --- a/keyboards/eniigmakeyboards/ek87/rules.mk +++ b/keyboards/eniigmakeyboards/ek87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/info.json index 3c482198d58..ca679e0685a 100644 --- a/keyboards/ep/40/info.json +++ b/keyboards/ep/40/info.json @@ -7,6 +7,8 @@ "pid": "0x4040", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":2.25}, {"x":5.25, "y":3, "w":2.75}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/ep/40/rules.mk b/keyboards/ep/40/rules.mk index d69504a9de8..7829a2753bb 100644 --- a/keyboards/ep/40/rules.mk +++ b/keyboards/ep/40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ep/96/info.json b/keyboards/ep/96/info.json index 8f964f670c3..2721b1bd5ef 100644 --- a/keyboards/ep/96/info.json +++ b/keyboards/ep/96/info.json @@ -7,6 +7,8 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/96/rules.mk b/keyboards/ep/96/rules.mk index d69504a9de8..7829a2753bb 100644 --- a/keyboards/ep/96/rules.mk +++ b/keyboards/ep/96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ep/comsn/hs68/info.json b/keyboards/ep/comsn/hs68/info.json index 631afb029bb..718cbe9d886 100644 --- a/keyboards/ep/comsn/hs68/info.json +++ b/keyboards/ep/comsn/hs68/info.json @@ -7,6 +7,8 @@ "pid": "0x6868", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/comsn/hs68/rules.mk b/keyboards/ep/comsn/hs68/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/ep/comsn/hs68/rules.mk +++ b/keyboards/ep/comsn/hs68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json index 58d7bb288ce..69641b24b83 100644 --- a/keyboards/ep/comsn/mollydooker/info.json +++ b/keyboards/ep/comsn/mollydooker/info.json @@ -7,6 +7,8 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/comsn/mollydooker/rules.mk b/keyboards/ep/comsn/mollydooker/rules.mk index 81074884fef..7cc66e743d4 100644 --- a/keyboards/ep/comsn/mollydooker/rules.mk +++ b/keyboards/ep/comsn/mollydooker/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ep/comsn/tf_longeboye/info.json b/keyboards/ep/comsn/tf_longeboye/info.json index 3fa58d61c1b..227cc54a2ef 100644 --- a/keyboards/ep/comsn/tf_longeboye/info.json +++ b/keyboards/ep/comsn/tf_longeboye/info.json @@ -7,6 +7,8 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/comsn/tf_longeboye/rules.mk b/keyboards/ep/comsn/tf_longeboye/rules.mk index 717cc07b4b7..c58df49ea8f 100644 --- a/keyboards/ep/comsn/tf_longeboye/rules.mk +++ b/keyboards/ep/comsn/tf_longeboye/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/epoch80/info.json b/keyboards/epoch80/info.json index 6cd82d1ae32..63d9a5eb0f8 100644 --- a/keyboards/epoch80/info.json +++ b/keyboards/epoch80/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/epoch80/rules.mk b/keyboards/epoch80/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/epoch80/rules.mk +++ b/keyboards/epoch80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index b8e8d213375..cfef8426170 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -6,6 +6,8 @@ "vid": "0x3297", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "debounce": 30, "community_layouts": ["ergodox"], "layouts": { diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index 20c6b2529b9..e421ae778d4 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # If you have Left LEDs (see # https://geekhack.org/index.php?topic=22780.msg873819#msg873819 for # details), include the following define: diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json index 38530960a5d..681d8631ffb 100644 --- a/keyboards/ergoslab/rev1/info.json +++ b/keyboards/ergoslab/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x5148", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ergoslab": { "layout": [ diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk index 57c06b8c118..503f274a9f3 100644 --- a/keyboards/ergoslab/rules.mk +++ b/keyboards/ergoslab/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json index cdaa9be0390..f979293e571 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"BackSpace", "x":13, "y":0, "w":2}, {"label":"Del", "x":15.5, "y":0}, {"label":"", "x":16.5, "y":0}, {"label":"", "x":17.5, "y":0}, {"label":"", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1, "h":2}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"Left Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Right Shift", "x":12.25, "y":3, "w":1.75}, {"label":"", "x":14.25, "y":3.25}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3, "h":2}, {"label":"Left Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Left Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":6.25}, {"label":"Right Alt", "x":10, "y":4}, {"label":"Right Ctrl", "x":11, "y":4}, {"label":"Func", "x":12, "y":4}, {"label":"", "x":13.25, "y":4.25}, {"label":"", "x":14.25, "y":4.25}, {"label":"", "x":15.25, "y":4.25}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}] diff --git a/keyboards/ericrlau/numdiscipline/rev1/rules.mk b/keyboards/ericrlau/numdiscipline/rev1/rules.mk index 9493018f5c8..18550f0a64d 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk +++ b/keyboards/ericrlau/numdiscipline/rev1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json index 2d793203f38..c9ed1ff7d50 100644 --- a/keyboards/esca/getawayvan/info.json +++ b/keyboards/esca/getawayvan/info.json @@ -8,6 +8,8 @@ "pid": "0x0401", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}] diff --git a/keyboards/esca/getawayvan/rules.mk b/keyboards/esca/getawayvan/rules.mk index 0200ce9daee..f574845eef7 100644 --- a/keyboards/esca/getawayvan/rules.mk +++ b/keyboards/esca/getawayvan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json index 2d793203f38..d93fe2f1a1b 100644 --- a/keyboards/esca/getawayvan_f042/info.json +++ b/keyboards/esca/getawayvan_f042/info.json @@ -8,6 +8,8 @@ "pid": "0x0401", "device_version": "0.0.1" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}] diff --git a/keyboards/esca/getawayvan_f042/rules.mk b/keyboards/esca/getawayvan_f042/rules.mk index 575ffbdd017..4d4b05c6745 100644 --- a/keyboards/esca/getawayvan_f042/rules.mk +++ b/keyboards/esca/getawayvan_f042/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json index 55c4d67bed7..d0aa3728d28 100644 --- a/keyboards/eternal_keypad/info.json +++ b/keyboards/eternal_keypad/info.json @@ -8,6 +8,8 @@ "pid": "0xDB00", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eternal_keypad/rules.mk b/keyboards/eternal_keypad/rules.mk index 4d1d6e2d056..0855a8f38f8 100644 --- a/keyboards/eternal_keypad/rules.mk +++ b/keyboards/eternal_keypad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eu_isolation/info.json b/keyboards/eu_isolation/info.json index 5d82ca333b6..60af69d1eb1 100644 --- a/keyboards/eu_isolation/info.json +++ b/keyboards/eu_isolation/info.json @@ -8,6 +8,8 @@ "pid": "0x4373", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_euiso_ortho": { "layout": [ diff --git a/keyboards/eu_isolation/rules.mk b/keyboards/eu_isolation/rules.mk index 12500f49f47..20825c8cfa6 100644 --- a/keyboards/eu_isolation/rules.mk +++ b/keyboards/eu_isolation/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json index de5cab5eb4b..bc75243e8b4 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/info.json +++ b/keyboards/evancookaudio/sleepingdinosaur/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/evancookaudio/sleepingdinosaur/rules.mk b/keyboards/evancookaudio/sleepingdinosaur/rules.mk index 94d6846c6c7..6ff9b4e02ba 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/rules.mk +++ b/keyboards/evancookaudio/sleepingdinosaur/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/info.json index 02ba27ccf36..09c48979ddb 100644 --- a/keyboards/evancookaudio/tenpad/info.json +++ b/keyboards/evancookaudio/tenpad/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_2x5": { diff --git a/keyboards/evancookaudio/tenpad/rules.mk b/keyboards/evancookaudio/tenpad/rules.mk index 6cf6d9358b2..e10edc34f25 100644 --- a/keyboards/evancookaudio/tenpad/rules.mk +++ b/keyboards/evancookaudio/tenpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json index 4ec84888895..d2b65ed3705 100644 --- a/keyboards/eve/meteor/info.json +++ b/keyboards/eve/meteor/info.json @@ -8,6 +8,8 @@ "pid": "0x4D54", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5}, {"x":11, "y":5.5}, {"x":12, "y":5.5}, {"x":13, "y":5.5}, {"x":14, "y":5.5}] diff --git a/keyboards/eve/meteor/rules.mk b/keyboards/eve/meteor/rules.mk index 7bc9adda6b1..4ba23862208 100644 --- a/keyboards/eve/meteor/rules.mk +++ b/keyboards/eve/meteor/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/evil80/info.json b/keyboards/evil80/info.json index 25d0dea712e..18be417d0ce 100644 --- a/keyboards/evil80/info.json +++ b/keyboards/evil80/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/evil80/rules.mk b/keyboards/evil80/rules.mk index f5e84cd3e39..21fa7badffb 100644 --- a/keyboards/evil80/rules.mk +++ b/keyboards/evil80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json index 2eaf92e7d4d..b3b8a77a027 100644 --- a/keyboards/evolv/info.json +++ b/keyboards/evolv/info.json @@ -8,6 +8,8 @@ "pid": "0x0E75", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_evolv_ansi": { "layout": [ diff --git a/keyboards/evolv/rules.mk b/keyboards/evolv/rules.mk index 5b705106b81..e6378f4a599 100644 --- a/keyboards/evolv/rules.mk +++ b/keyboards/evolv/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 6a57c77d641..cde77bee0ce 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x8E66", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index bbeaea667e3..95d8b998b98 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x0E6D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index 8e117850cb4..afccbb73b7c 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -8,6 +8,8 @@ "pid": "0x8446", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json index 4ecc240182f..847cac0b733 100644 --- a/keyboards/evyd13/atom47/rev5/info.json +++ b/keyboards/evyd13/atom47/rev5/info.json @@ -8,6 +8,8 @@ "pid": "0x92EA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rules.mk b/keyboards/evyd13/atom47/rules.mk index 1ba88ed80b4..ab8264de7c2 100644 --- a/keyboards/evyd13/atom47/rules.mk +++ b/keyboards/evyd13/atom47/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index 0e3ce6cc040..350fa019dd9 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -8,6 +8,8 @@ "pid": "0x0140", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/eon40/rules.mk b/keyboards/evyd13/eon40/rules.mk index 2ff7298e9ae..4223fc83ccf 100644 --- a/keyboards/evyd13/eon40/rules.mk +++ b/keyboards/evyd13/eon40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json index 4c7806986c4..9f1a67689f2 100644 --- a/keyboards/evyd13/eon65/info.json +++ b/keyboards/evyd13/eon65/info.json @@ -8,6 +8,8 @@ "pid": "0xAEB4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_iso", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/eon65/rules.mk b/keyboards/evyd13/eon65/rules.mk index 083d411b318..8eee1b53bbe 100644 --- a/keyboards/evyd13/eon65/rules.mk +++ b/keyboards/evyd13/eon65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json index 4fe35a90907..aa0ee3f6054 100644 --- a/keyboards/evyd13/eon75/info.json +++ b/keyboards/evyd13/eon75/info.json @@ -8,6 +8,8 @@ "pid": "0x5C62", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon75/rules.mk b/keyboards/evyd13/eon75/rules.mk index 30e86c01902..6ff9b4e02ba 100644 --- a/keyboards/evyd13/eon75/rules.mk +++ b/keyboards/evyd13/eon75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json index 4752f18f880..2dcdea0dd81 100644 --- a/keyboards/evyd13/eon87/info.json +++ b/keyboards/evyd13/eon87/info.json @@ -8,6 +8,8 @@ "pid": "0xAA6B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/eon87/rules.mk b/keyboards/evyd13/eon87/rules.mk index bc79aa1a454..008b63b24e0 100644 --- a/keyboards/evyd13/eon87/rules.mk +++ b/keyboards/evyd13/eon87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json index c1650889974..2f5c0a55181 100644 --- a/keyboards/evyd13/eon95/info.json +++ b/keyboards/evyd13/eon95/info.json @@ -8,6 +8,8 @@ "pid": "0x8A18", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon95/rules.mk b/keyboards/evyd13/eon95/rules.mk index 30e86c01902..6ff9b4e02ba 100644 --- a/keyboards/evyd13/eon95/rules.mk +++ b/keyboards/evyd13/eon95/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json index d85a412c99b..10f9d1c5934 100644 --- a/keyboards/evyd13/gh80_1800/info.json +++ b/keyboards/evyd13/gh80_1800/info.json @@ -8,6 +8,8 @@ "pid": "0x8B23", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/gh80_1800/rules.mk b/keyboards/evyd13/gh80_1800/rules.mk index 0fb6b613386..1d7a3a739f2 100644 --- a/keyboards/evyd13/gh80_1800/rules.mk +++ b/keyboards/evyd13/gh80_1800/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json index 6c49cdcc8f2..9a92b02d6ef 100644 --- a/keyboards/evyd13/gh80_3700/info.json +++ b/keyboards/evyd13/gh80_3700/info.json @@ -8,6 +8,8 @@ "pid": "0x633A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/evyd13/gh80_3700/rules.mk b/keyboards/evyd13/gh80_3700/rules.mk index 5e9bf37a1e6..f41f81105e4 100644 --- a/keyboards/evyd13/gh80_3700/rules.mk +++ b/keyboards/evyd13/gh80_3700/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json index c7d94c93a89..824634027fd 100644 --- a/keyboards/evyd13/gud70/info.json +++ b/keyboards/evyd13/gud70/info.json @@ -8,6 +8,8 @@ "pid": "0x198B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/gud70/rules.mk b/keyboards/evyd13/gud70/rules.mk index 0200e4799ac..6fe874e748b 100644 --- a/keyboards/evyd13/gud70/rules.mk +++ b/keyboards/evyd13/gud70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json index 650442a7369..b4d84849a8a 100644 --- a/keyboards/evyd13/minitomic/info.json +++ b/keyboards/evyd13/minitomic/info.json @@ -8,6 +8,8 @@ "pid": "0x0145", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_split_space": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.75}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3, "w":1.25}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}] diff --git a/keyboards/evyd13/minitomic/rules.mk b/keyboards/evyd13/minitomic/rules.mk index bb01468a007..27b0a2549ed 100644 --- a/keyboards/evyd13/minitomic/rules.mk +++ b/keyboards/evyd13/minitomic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json index c1d70680482..7fe13e618bf 100644 --- a/keyboards/evyd13/mx5160/info.json +++ b/keyboards/evyd13/mx5160/info.json @@ -8,6 +8,8 @@ "pid": "0x5160", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":19, "y":0}, {"x":20, "y":0}, {"x":21, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":19, "y":1}, {"x":20, "y":1}, {"x":21, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, {"x":16.25, "y":2, "w":1.25}, {"x":18, "y":2}, {"x":19, "y":2}, {"x":20, "y":2}, {"x":21, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":18, "y":3}, {"x":19, "y":3}, {"x":20, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"x":13.5, "y":4, "w":1.5}, {"x":16, "y":4, "w":1.5}, {"x":18, "y":4}, {"x":19, "y":4}, {"x":20, "y":4}, {"x":21, "y":3, "h":2}] diff --git a/keyboards/evyd13/mx5160/rules.mk b/keyboards/evyd13/mx5160/rules.mk index 9603d89f82a..1ffb0c55b90 100644 --- a/keyboards/evyd13/mx5160/rules.mk +++ b/keyboards/evyd13/mx5160/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index 9a0cfb4e022..47fe1d64d12 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -8,6 +8,8 @@ "pid": "0x1F02", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/nt660/rules.mk b/keyboards/evyd13/nt660/rules.mk index 01cc5548ee2..f8c29ddc982 100644 --- a/keyboards/evyd13/nt660/rules.mk +++ b/keyboards/evyd13/nt660/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json index 414d1f8ba1d..84d0a75c16d 100644 --- a/keyboards/evyd13/nt750/info.json +++ b/keyboards/evyd13/nt750/info.json @@ -8,6 +8,8 @@ "pid": "0x3320", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/nt750/rules.mk b/keyboards/evyd13/nt750/rules.mk index f1b1f19b4e9..bb5eab12a15 100644 --- a/keyboards/evyd13/nt750/rules.mk +++ b/keyboards/evyd13/nt750/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json index c8c1060d42c..9f33ce17e51 100644 --- a/keyboards/evyd13/nt980/info.json +++ b/keyboards/evyd13/nt980/info.json @@ -8,6 +8,8 @@ "pid": "0xAAF8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/nt980/rules.mk b/keyboards/evyd13/nt980/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/evyd13/nt980/rules.mk +++ b/keyboards/evyd13/nt980/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/info.json index 6e9b2423f6e..b76faa7952e 100644 --- a/keyboards/evyd13/omrontkl/info.json +++ b/keyboards/evyd13/omrontkl/info.json @@ -8,6 +8,8 @@ "pid": "0xEA78", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/omrontkl/rules.mk b/keyboards/evyd13/omrontkl/rules.mk index d26b5d2e078..3f6eff7f550 100644 --- a/keyboards/evyd13/omrontkl/rules.mk +++ b/keyboards/evyd13/omrontkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json index 060f1a9b605..5a03e1a91c0 100644 --- a/keyboards/evyd13/plain60/info.json +++ b/keyboards/evyd13/plain60/info.json @@ -8,6 +8,8 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"], "layouts": { "LAYOUT": { diff --git a/keyboards/evyd13/plain60/rules.mk b/keyboards/evyd13/plain60/rules.mk index 551cb427d77..6eb8e9eb37a 100644 --- a/keyboards/evyd13/plain60/rules.mk +++ b/keyboards/evyd13/plain60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index de38119dfc1..e515b82b568 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -8,6 +8,8 @@ "pid": "0xFA7D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/pockettype/rules.mk b/keyboards/evyd13/pockettype/rules.mk index da69c3073f3..f8c29ddc982 100644 --- a/keyboards/evyd13/pockettype/rules.mk +++ b/keyboards/evyd13/pockettype/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json index 97f24d41750..3e8a4124c9f 100644 --- a/keyboards/evyd13/quackfire/info.json +++ b/keyboards/evyd13/quackfire/info.json @@ -8,6 +8,8 @@ "pid": "0x87C9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/evyd13/quackfire/rules.mk b/keyboards/evyd13/quackfire/rules.mk index 91521dd9094..718a1e8d099 100644 --- a/keyboards/evyd13/quackfire/rules.mk +++ b/keyboards/evyd13/quackfire/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json index 1cadeeb9fa6..b2f831c9eee 100644 --- a/keyboards/evyd13/solheim68/info.json +++ b/keyboards/evyd13/solheim68/info.json @@ -8,6 +8,8 @@ "pid": "0x7BFF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/solheim68/rules.mk b/keyboards/evyd13/solheim68/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/evyd13/solheim68/rules.mk +++ b/keyboards/evyd13/solheim68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json index 1bb13fbee39..34030c32c5f 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/info.json @@ -8,6 +8,8 @@ "pid": "0x7465", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/ta65/rules.mk b/keyboards/evyd13/ta65/rules.mk index 3e0064071a2..27132e67478 100644 --- a/keyboards/evyd13/ta65/rules.mk +++ b/keyboards/evyd13/ta65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json index 17e9ad990a0..3eddd79adc5 100644 --- a/keyboards/evyd13/wasdat_code/info.json +++ b/keyboards/evyd13/wasdat_code/info.json @@ -8,6 +8,8 @@ "pid": "0xB00E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_fullsize_ansi": { diff --git a/keyboards/evyd13/wasdat_code/rules.mk b/keyboards/evyd13/wasdat_code/rules.mk index 9b51a8b7181..00967d18474 100644 --- a/keyboards/evyd13/wasdat_code/rules.mk +++ b/keyboards/evyd13/wasdat_code/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index 27f393458cb..34aee4c6c93 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json @@ -8,6 +8,8 @@ "pid": "0xA71C", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/evyd13/wonderland/rules.mk b/keyboards/evyd13/wonderland/rules.mk index 659498136c0..5cf8a3ec50f 100644 --- a/keyboards/evyd13/wonderland/rules.mk +++ b/keyboards/evyd13/wonderland/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json index bc42425c32e..7b3d5102d7e 100644 --- a/keyboards/exclusive/e65/info.json +++ b/keyboards/exclusive/e65/info.json @@ -8,6 +8,8 @@ "pid": "0xE605", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/exclusive/e65/rules.mk b/keyboards/exclusive/e65/rules.mk index efb00a6ba1e..363aa021cbe 100644 --- a/keyboards/exclusive/e65/rules.mk +++ b/keyboards/exclusive/e65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json index c03a878d0fa..076ff4a5055 100644 --- a/keyboards/exclusive/e6_rgb/info.json +++ b/keyboards/exclusive/e6_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x4536", "device_version": "0.6.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/exclusive/e6_rgb/rules.mk b/keyboards/exclusive/e6_rgb/rules.mk index 4ad81d908b9..fb1b6986b2f 100644 --- a/keyboards/exclusive/e6_rgb/rules.mk +++ b/keyboards/exclusive/e6_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json index e65009833c1..ee88febe1d4 100644 --- a/keyboards/exclusive/e6v2/le/info.json +++ b/keyboards/exclusive/e6v2/le/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/exclusive/e6v2/le/rules.mk b/keyboards/exclusive/e6v2/le/rules.mk index 4551e3c3650..854004ccf73 100644 --- a/keyboards/exclusive/e6v2/le/rules.mk +++ b/keyboards/exclusive/e6v2/le/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json index 2d493afad3a..b88cf360040 100644 --- a/keyboards/exclusive/e6v2/le_bmc/info.json +++ b/keyboards/exclusive/e6v2/le_bmc/info.json @@ -7,6 +7,8 @@ "pid": "0xE62D", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/exclusive/e6v2/le_bmc/rules.mk b/keyboards/exclusive/e6v2/le_bmc/rules.mk index 9650691b5f4..48cc2acea7c 100644 --- a/keyboards/exclusive/e6v2/le_bmc/rules.mk +++ b/keyboards/exclusive/e6v2/le_bmc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json index 7275f203570..e93376b8673 100644 --- a/keyboards/exclusive/e6v2/oe/info.json +++ b/keyboards/exclusive/e6v2/oe/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/exclusive/e6v2/oe/rules.mk b/keyboards/exclusive/e6v2/oe/rules.mk index 4551e3c3650..854004ccf73 100644 --- a/keyboards/exclusive/e6v2/oe/rules.mk +++ b/keyboards/exclusive/e6v2/oe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json index 6dadde916a2..9b0330730b6 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/info.json +++ b/keyboards/exclusive/e6v2/oe_bmc/info.json @@ -7,6 +7,8 @@ "pid": "0xE62B", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/exclusive/e6v2/oe_bmc/rules.mk b/keyboards/exclusive/e6v2/oe_bmc/rules.mk index 9650691b5f4..48cc2acea7c 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/rules.mk +++ b/keyboards/exclusive/e6v2/oe_bmc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json index 2d1f6a19d04..e9bab645035 100644 --- a/keyboards/exclusive/e7v1/info.json +++ b/keyboards/exclusive/e7v1/info.json @@ -8,6 +8,8 @@ "pid": "0xE701", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"Z", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5}, {"label":"Win", "x":11, "y":5.5}, {"x":12, "y":5.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}] diff --git a/keyboards/exclusive/e7v1/rules.mk b/keyboards/exclusive/e7v1/rules.mk index efb00a6ba1e..363aa021cbe 100644 --- a/keyboards/exclusive/e7v1/rules.mk +++ b/keyboards/exclusive/e7v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index 43a8cba0fec..92acc0c8b3b 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/info.json @@ -8,6 +8,8 @@ "pid": "0x7051", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/exclusive/e7v1se/rules.mk b/keyboards/exclusive/e7v1se/rules.mk index a7d70049c20..5681a9b5977 100644 --- a/keyboards/exclusive/e7v1se/rules.mk +++ b/keyboards/exclusive/e7v1se/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json index 53ca1e3759f..cd1d07fed52 100644 --- a/keyboards/exclusive/e85/hotswap/info.json +++ b/keyboards/exclusive/e85/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xE851", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi_standard": { "layout": [ diff --git a/keyboards/exclusive/e85/rules.mk b/keyboards/exclusive/e85/rules.mk index 7cbb5f8cb39..4251159d944 100644 --- a/keyboards/exclusive/e85/rules.mk +++ b/keyboards/exclusive/e85/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json index 937c2ad245f..1ba7d22f732 100644 --- a/keyboards/exclusive/e85/soldered/info.json +++ b/keyboards/exclusive/e85/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0xE852", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/exent/info.json b/keyboards/exent/info.json index 522119af981..3afe2458a1a 100644 --- a/keyboards/exent/info.json +++ b/keyboards/exent/info.json @@ -8,6 +8,8 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/exent/rules.mk b/keyboards/exent/rules.mk index 59bcceb639a..4ff1bd90d50 100644 --- a/keyboards/exent/rules.mk +++ b/keyboards/exent/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json index ec9c66cec85..59e7142adb9 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_2u": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"label":"Ctl", "x":0, "y":3}, {"label":"Alt", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"label":"Fn", "x":9, "y":3}, {"label":"OS", "x":12, "y":3}] diff --git a/keyboards/eyeohdesigns/babyv/rules.mk b/keyboards/eyeohdesigns/babyv/rules.mk index a2e74804655..5b9cc80e47a 100644 --- a/keyboards/eyeohdesigns/babyv/rules.mk +++ b/keyboards/eyeohdesigns/babyv/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json index ed26433daf0..b61d4c95d5b 100644 --- a/keyboards/eyeohdesigns/sprh/info.json +++ b/keyboards/eyeohdesigns/sprh/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ac5": { "layout": [ diff --git a/keyboards/eyeohdesigns/sprh/rules.mk b/keyboards/eyeohdesigns/sprh/rules.mk index 0727dc5a838..3e97617a39e 100644 --- a/keyboards/eyeohdesigns/sprh/rules.mk +++ b/keyboards/eyeohdesigns/sprh/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json index 439cf7ed1d0..3fc238b3b90 100644 --- a/keyboards/eyeohdesigns/theboulevard/info.json +++ b/keyboards/eyeohdesigns/theboulevard/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho1": { "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5}, {"x":6.5, "y":4.5, "w":2}, {"x":8.5, "y":4.5}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}] diff --git a/keyboards/eyeohdesigns/theboulevard/rules.mk b/keyboards/eyeohdesigns/theboulevard/rules.mk index 824dd0089f6..8561958b642 100644 --- a/keyboards/eyeohdesigns/theboulevard/rules.mk +++ b/keyboards/eyeohdesigns/theboulevard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/facew/info.json b/keyboards/facew/info.json index e95b40e0ec5..32ea264adc4 100644 --- a/keyboards/facew/info.json +++ b/keyboards/facew/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/facew/rules.mk b/keyboards/facew/rules.mk index 4dcdfe886af..03a618b76dc 100644 --- a/keyboards/facew/rules.mk +++ b/keyboards/facew/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index 62c89dc9856..65007a2ce97 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json @@ -7,6 +7,8 @@ "pid": "0xBFFA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk index 37876abe677..704204983c4 100755 --- a/keyboards/fallacy/rules.mk +++ b/keyboards/fallacy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json index 42b045bedb6..23d13df0d60 100644 --- a/keyboards/fc660c/info.json +++ b/keyboards/fc660c/info.json @@ -8,6 +8,8 @@ "pid": "0x660C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk index b1b11676bb2..ed4a7ca66d1 100644 --- a/keyboards/fc660c/rules.mk +++ b/keyboards/fc660c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json index 147b1683e13..7cd3a51b10f 100644 --- a/keyboards/fc980c/info.json +++ b/keyboards/fc980c/info.json @@ -8,6 +8,8 @@ "pid": "0x980C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk index b1b11676bb2..ed4a7ca66d1 100644 --- a/keyboards/fc980c/rules.mk +++ b/keyboards/fc980c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/feels/feels65/info.json b/keyboards/feels/feels65/info.json index 4b31f5ec892..3ccc6eca984 100644 --- a/keyboards/feels/feels65/info.json +++ b/keyboards/feels/feels65/info.json @@ -8,6 +8,8 @@ "pid": "0xE965", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/feels/feels65/rules.mk b/keyboards/feels/feels65/rules.mk index 168a6177547..c6b71a4aaa6 100644 --- a/keyboards/feels/feels65/rules.mk +++ b/keyboards/feels/feels65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json index bdba79703ea..0fec2c9d4c0 100644 --- a/keyboards/feker/ik75/info.json +++ b/keyboards/feker/ik75/info.json @@ -8,6 +8,8 @@ "pid": "0x1226", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/feker/ik75/rules.mk b/keyboards/feker/ik75/rules.mk index 97a872d23e1..0bce6837a40 100644 --- a/keyboards/feker/ik75/rules.mk +++ b/keyboards/feker/ik75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 354545b3bd5..c3a9971bae5 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -5,5 +5,7 @@ "vid": "0xC2AB", "pid": "0x0000", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk index 86db6e4d12a..487375928e0 100644 --- a/keyboards/ferris/0_1/rules.mk +++ b/keyboards/ferris/0_1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index 9ab2ffbdfb1..c0f7b92dfa0 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -3,5 +3,7 @@ "usb": { "vid": "0xC2AB", "device_version": "0.0.2" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index 3573b574593..f3760b7b62c 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json index fc53028c340..b906014d6fd 100644 --- a/keyboards/ferris/sweep/info.json +++ b/keyboards/ferris/sweep/info.json @@ -5,5 +5,7 @@ "vid": "0xC2AB", "pid": "0x3939", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk index 93998387338..ebc2feb78ec 100644 --- a/keyboards/ferris/sweep/rules.mk +++ b/keyboards/ferris/sweep/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json index 14f71ffee7c..764daf87882 100644 --- a/keyboards/ffkeebs/puca/info.json +++ b/keyboards/ffkeebs/puca/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/ffkeebs/puca/rules.mk b/keyboards/ffkeebs/puca/rules.mk index 1d3a66c7978..3e5ac0433fe 100644 --- a/keyboards/ffkeebs/puca/rules.mk +++ b/keyboards/ffkeebs/puca/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json index fc4d7f7f220..335f80f65cc 100644 --- a/keyboards/ffkeebs/siris/info.json +++ b/keyboards/ffkeebs/siris/info.json @@ -8,6 +8,8 @@ "pid": "0xE96C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ffkeebs/siris/rules.mk b/keyboards/ffkeebs/siris/rules.mk index 20114254e42..b9cfa98be04 100644 --- a/keyboards/ffkeebs/siris/rules.mk +++ b/keyboards/ffkeebs/siris/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json index b577a68bd2f..fa8becc8156 100644 --- a/keyboards/fjlabs/7vhotswap/info.json +++ b/keyboards/fjlabs/7vhotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_75_all": { "layout": [ diff --git a/keyboards/fjlabs/7vhotswap/rules.mk b/keyboards/fjlabs/7vhotswap/rules.mk index 82e9a04fa50..8bb5a64bff4 100644 --- a/keyboards/fjlabs/7vhotswap/rules.mk +++ b/keyboards/fjlabs/7vhotswap/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json index 81a65cc2623..68a671fc935 100644 --- a/keyboards/fjlabs/ad65/info.json +++ b/keyboards/fjlabs/ad65/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/ad65/rules.mk b/keyboards/fjlabs/ad65/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/ad65/rules.mk +++ b/keyboards/fjlabs/ad65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json index 040db5f1978..c689e71fc59 100644 --- a/keyboards/fjlabs/avalon/info.json +++ b/keyboards/fjlabs/avalon/info.json @@ -8,6 +8,8 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk index f54595dd648..dca4b0aabb4 100644 --- a/keyboards/fjlabs/avalon/rules.mk +++ b/keyboards/fjlabs/avalon/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json index 787807179b8..c096ceda5d9 100644 --- a/keyboards/fjlabs/bks65/info.json +++ b/keyboards/fjlabs/bks65/info.json @@ -8,6 +8,8 @@ "pid": "0x1001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/bks65/rules.mk b/keyboards/fjlabs/bks65/rules.mk index f54595dd648..dca4b0aabb4 100644 --- a/keyboards/fjlabs/bks65/rules.mk +++ b/keyboards/fjlabs/bks65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json index c5522d3b66f..1c20963164c 100644 --- a/keyboards/fjlabs/bks65solder/info.json +++ b/keyboards/fjlabs/bks65solder/info.json @@ -8,6 +8,8 @@ "pid": "0x0099", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/fjlabs/bks65solder/rules.mk b/keyboards/fjlabs/bks65solder/rules.mk index f54595dd648..dca4b0aabb4 100644 --- a/keyboards/fjlabs/bks65solder/rules.mk +++ b/keyboards/fjlabs/bks65solder/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json index cf516c22889..023cbeb5927 100644 --- a/keyboards/fjlabs/bolsa65/info.json +++ b/keyboards/fjlabs/bolsa65/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/fjlabs/bolsa65/rules.mk b/keyboards/fjlabs/bolsa65/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/bolsa65/rules.mk +++ b/keyboards/fjlabs/bolsa65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json index 736bc2b991f..db77a1f0885 100644 --- a/keyboards/fjlabs/kf87/info.json +++ b/keyboards/fjlabs/kf87/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/kf87/rules.mk b/keyboards/fjlabs/kf87/rules.mk index a5745c34909..52a18008f4a 100644 --- a/keyboards/fjlabs/kf87/rules.mk +++ b/keyboards/fjlabs/kf87/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = at90usb646 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json index c1581574189..50f60e805e2 100644 --- a/keyboards/fjlabs/kyuu/info.json +++ b/keyboards/fjlabs/kyuu/info.json @@ -8,6 +8,8 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi_blocker_badge": { "layout": [ diff --git a/keyboards/fjlabs/kyuu/rules.mk b/keyboards/fjlabs/kyuu/rules.mk index 3bbcce8b855..a140b3b2525 100644 --- a/keyboards/fjlabs/kyuu/rules.mk +++ b/keyboards/fjlabs/kyuu/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json index abb1cc792fb..ac7d24c54b0 100644 --- a/keyboards/fjlabs/ldk65/info.json +++ b/keyboards/fjlabs/ldk65/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/ldk65/rules.mk b/keyboards/fjlabs/ldk65/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/ldk65/rules.mk +++ b/keyboards/fjlabs/ldk65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json index 885b74cc5b5..6304edb1df7 100644 --- a/keyboards/fjlabs/midway60/info.json +++ b/keyboards/fjlabs/midway60/info.json @@ -8,6 +8,8 @@ "pid": "0x1002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/midway60/rules.mk b/keyboards/fjlabs/midway60/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/midway60/rules.mk +++ b/keyboards/fjlabs/midway60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json index a3dbbb10d25..649afd6e36a 100644 --- a/keyboards/fjlabs/mk61rgbansi/info.json +++ b/keyboards/fjlabs/mk61rgbansi/info.json @@ -8,6 +8,8 @@ "pid": "0x1011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/mk61rgbansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/fjlabs/mk61rgbansi/rules.mk +++ b/keyboards/fjlabs/mk61rgbansi/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json index 92e622725cd..fc4bb596f7e 100644 --- a/keyboards/fjlabs/peaker/info.json +++ b/keyboards/fjlabs/peaker/info.json @@ -8,6 +8,8 @@ "pid": "0x0020", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/peaker/rules.mk b/keyboards/fjlabs/peaker/rules.mk index aed2d80b8b8..f117516ecce 100644 --- a/keyboards/fjlabs/peaker/rules.mk +++ b/keyboards/fjlabs/peaker/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = at90usb646 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json index 011776dc40f..59eb5995101 100644 --- a/keyboards/fjlabs/polaris/info.json +++ b/keyboards/fjlabs/polaris/info.json @@ -8,6 +8,8 @@ "pid": "0x9001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/polaris/rules.mk b/keyboards/fjlabs/polaris/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/polaris/rules.mk +++ b/keyboards/fjlabs/polaris/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json index 939d178ba5a..b53457010f1 100644 --- a/keyboards/fjlabs/ready100/info.json +++ b/keyboards/fjlabs/ready100/info.json @@ -8,6 +8,8 @@ "pid": "0x1003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_64key": "LAYOUT_64_ansi" }, diff --git a/keyboards/fjlabs/ready100/rules.mk b/keyboards/fjlabs/ready100/rules.mk index f54595dd648..dca4b0aabb4 100644 --- a/keyboards/fjlabs/ready100/rules.mk +++ b/keyboards/fjlabs/ready100/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json index c458b9fd79c..ded3ab705e2 100644 --- a/keyboards/fjlabs/sinanju/info.json +++ b/keyboards/fjlabs/sinanju/info.json @@ -8,6 +8,8 @@ "pid": "0x1022", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi_wkl": { "layout": [ diff --git a/keyboards/fjlabs/sinanju/rules.mk b/keyboards/fjlabs/sinanju/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/sinanju/rules.mk +++ b/keyboards/fjlabs/sinanju/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json index 53bbd3f0262..ccefe4877e5 100644 --- a/keyboards/fjlabs/sinanjuwk/info.json +++ b/keyboards/fjlabs/sinanjuwk/info.json @@ -8,6 +8,8 @@ "pid": "0x1023", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/sinanjuwk/rules.mk b/keyboards/fjlabs/sinanjuwk/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/fjlabs/sinanjuwk/rules.mk +++ b/keyboards/fjlabs/sinanjuwk/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json index 6fb66c65742..f4df560aed3 100644 --- a/keyboards/fjlabs/solanis/info.json +++ b/keyboards/fjlabs/solanis/info.json @@ -8,6 +8,8 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/solanis/rules.mk b/keyboards/fjlabs/solanis/rules.mk index a5745c34909..52a18008f4a 100644 --- a/keyboards/fjlabs/solanis/rules.mk +++ b/keyboards/fjlabs/solanis/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = at90usb646 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json index bdb2e3a2c39..4d9bffdf2f4 100644 --- a/keyboards/fjlabs/swordfish/info.json +++ b/keyboards/fjlabs/swordfish/info.json @@ -8,6 +8,8 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_alice_all": { "layout": [{"x":18.33, "y":0.142}, {"x":2.37, "y":0.27}, {"x":3.37, "y":0.27}, {"x":14.13, "y":0.27}, {"x":15.13, "y":0.27}, {"x":17.13, "y":0.27}, {"x":16.13, "y":0.27}, {"x":18.45, "y":1.142}, {"x":2.24, "y":1.28, "w":1.5}, {"x":3.74, "y":1.28}, {"x":13.75, "y":1.28}, {"x":14.75, "y":1.28}, {"x":15.75, "y":1.28}, {"x":16.75, "y":1.28, "w":1.5}, {"x":18.61, "y":2.142}, {"x":2.1, "y":2.28, "w":1.75}, {"x":3.85, "y":2.28}, {"x":14.16, "y":2.28}, {"x":15.16, "y":2.28}, {"x":16.16, "y":2.28, "w":2.25}, {"x":1.95, "y":3.28, "w":2.25}, {"x":4.2, "y":3.28}, {"x":13.81, "y":3.28}, {"x":14.81, "y":3.28}, {"x":15.81, "y":3.28, "w":1.75}, {"x":17.77, "y":3.48}, {"x":1.95, "y":4.28, "w":1.25}, {"x":3.2, "y":4.28, "w":1.25}, {"x":14.06, "y":4.28, "w":1.25}, {"x":15.31, "y":4.28, "w":1.25}, {"x":16.77, "y":4.475}, {"x":17.77, "y":4.475}, {"x":18.77, "y":4.475}, {"x":0, "y":5.28}, {"x":1, "y":5.28}, {"x":2, "y":5.28}, {"x":3, "y":5.28}, {"x":4, "y":5.28}, {"x":0.5, "y":6.28}, {"x":1.5, "y":6.28}, {"x":2.5, "y":6.28}, {"x":3.5, "y":6.28}, {"x":0.75, "y":7.28}, {"x":1.75, "y":7.28}, {"x":2.75, "y":7.28}, {"x":3.75, "y":7.28}, {"x":1.25, "y":8.28}, {"x":2.25, "y":8.28}, {"x":3.25, "y":8.28}, {"x":4.25, "y":8.28}, {"x":1.25, "y":9.28, "w":1.25}, {"x":2.5, "y":9.28, "w":2.75}, {"x":-4.5, "y":10.08}, {"x":-3.5, "y":10.08}, {"x":-2.5, "y":10.08}, {"x":-1.5, "y":10.08}, {"x":-5.0, "y":11.08}, {"x":-4, "y":11.08}, {"x":-3.0, "y":11.08}, {"x":-2, "y":11.08}, {"x":-4.75, "y":12.08}, {"x":-3.75, "y":12.08}, {"x":-2.75, "y":12.08}, {"x":-1.75, "y":12.08}, {"x":-5.25, "y":13.08}, {"x":-4.25, "y":13.08}, {"x":-3.25, "y":13.08}, {"x":-2.25, "y":13.08}, {"x":-5.25, "y":14.08, "w":2.25}, {"x":-3.0, "y":14.08, "w":1.25}] diff --git a/keyboards/fjlabs/swordfish/rules.mk b/keyboards/fjlabs/swordfish/rules.mk index 82e9a04fa50..8bb5a64bff4 100644 --- a/keyboards/fjlabs/swordfish/rules.mk +++ b/keyboards/fjlabs/swordfish/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json index 10886adad54..ad1452f7f81 100644 --- a/keyboards/fjlabs/tf60ansi/info.json +++ b/keyboards/fjlabs/tf60ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x1004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/tf60ansi/rules.mk b/keyboards/fjlabs/tf60ansi/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/fjlabs/tf60ansi/rules.mk +++ b/keyboards/fjlabs/tf60ansi/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json index aa9027423ef..4604425dca3 100644 --- a/keyboards/fjlabs/tf60v2/info.json +++ b/keyboards/fjlabs/tf60v2/info.json @@ -8,6 +8,8 @@ "pid": "0x1005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/fjlabs/tf60v2/rules.mk b/keyboards/fjlabs/tf60v2/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/fjlabs/tf60v2/rules.mk +++ b/keyboards/fjlabs/tf60v2/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json index 8ef113ec991..d7e54e5cf63 100644 --- a/keyboards/fjlabs/tf65rgbv2/info.json +++ b/keyboards/fjlabs/tf65rgbv2/info.json @@ -8,6 +8,8 @@ "pid": "0x1007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/tf65rgbv2/rules.mk b/keyboards/fjlabs/tf65rgbv2/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/fjlabs/tf65rgbv2/rules.mk +++ b/keyboards/fjlabs/tf65rgbv2/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json index 930dd6b0df5..851672c35cf 100644 --- a/keyboards/flehrad/bigswitch/info.json +++ b/keyboards/flehrad/bigswitch/info.json @@ -7,6 +7,8 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/flehrad/bigswitch/rules.mk b/keyboards/flehrad/bigswitch/rules.mk index 84bf0aa2203..e39d118e931 100644 --- a/keyboards/flehrad/bigswitch/rules.mk +++ b/keyboards/flehrad/bigswitch/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json index 4e3ab26bb65..e4547261245 100644 --- a/keyboards/flehrad/downbubble/info.json +++ b/keyboards/flehrad/downbubble/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_standard": { "layout": [ diff --git a/keyboards/flehrad/downbubble/rules.mk b/keyboards/flehrad/downbubble/rules.mk index d26afafd10a..fce764c22d4 100644 --- a/keyboards/flehrad/downbubble/rules.mk +++ b/keyboards/flehrad/downbubble/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json index b900919920d..5f8dde8e8f8 100644 --- a/keyboards/flehrad/numbrero/info.json +++ b/keyboards/flehrad/numbrero/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_numbrero_numpad": "LAYOUT_numpad", "LAYOUT_numbrero_ortho": "LAYOUT_ortho" diff --git a/keyboards/flehrad/numbrero/rules.mk b/keyboards/flehrad/numbrero/rules.mk index bab0fd28371..06845b8e21c 100644 --- a/keyboards/flehrad/numbrero/rules.mk +++ b/keyboards/flehrad/numbrero/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json index f838cd7b9c9..74f54c8f550 100644 --- a/keyboards/flehrad/snagpad/info.json +++ b/keyboards/flehrad/snagpad/info.json @@ -8,6 +8,8 @@ "pid": "0x5350", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { diff --git a/keyboards/flehrad/snagpad/rules.mk b/keyboards/flehrad/snagpad/rules.mk index bab0fd28371..06845b8e21c 100644 --- a/keyboards/flehrad/snagpad/rules.mk +++ b/keyboards/flehrad/snagpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json index dc430384fee..6d4d7c17b53 100644 --- a/keyboards/flehrad/tradestation/info.json +++ b/keyboards/flehrad/tradestation/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_tradestation": { diff --git a/keyboards/flehrad/tradestation/rules.mk b/keyboards/flehrad/tradestation/rules.mk index bab0fd28371..06845b8e21c 100644 --- a/keyboards/flehrad/tradestation/rules.mk +++ b/keyboards/flehrad/tradestation/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index 106c3eba5e6..72c744987fb 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_6x16": { "layout": [ diff --git a/keyboards/fleuron/rules.mk b/keyboards/fleuron/rules.mk index 4fdf0779ade..b59c21b0333 100644 --- a/keyboards/fleuron/rules.mk +++ b/keyboards/fleuron/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json index 04d3fa5c537..6f7a77437f3 100644 --- a/keyboards/fluorite/info.json +++ b/keyboards/fluorite/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/fluorite/rules.mk b/keyboards/fluorite/rules.mk index 67ae0300410..139055a96bd 100644 --- a/keyboards/fluorite/rules.mk +++ b/keyboards/fluorite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/info.json index 1161c06e60b..e4b19ca8cd4 100644 --- a/keyboards/flx/lodestone/info.json +++ b/keyboards/flx/lodestone/info.json @@ -8,6 +8,8 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/flx/lodestone/rules.mk b/keyboards/flx/lodestone/rules.mk index 5229bacd06a..dcdd2221bc1 100644 --- a/keyboards/flx/lodestone/rules.mk +++ b/keyboards/flx/lodestone/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json index 6ae793eefbf..c65f9c7c621 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/info.json @@ -8,6 +8,8 @@ "pid": "0x5647", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/flx/virgo/rules.mk b/keyboards/flx/virgo/rules.mk index 1daeed7bd79..cafe30d9293 100644 --- a/keyboards/flx/virgo/rules.mk +++ b/keyboards/flx/virgo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json index 4687f16513d..7503c8c6f90 100644 --- a/keyboards/flxlb/zplit/info.json +++ b/keyboards/flxlb/zplit/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/flxlb/zplit/rules.mk b/keyboards/flxlb/zplit/rules.mk index cca31bca403..7b181ca73e5 100644 --- a/keyboards/flxlb/zplit/rules.mk +++ b/keyboards/flxlb/zplit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/flygone60/rev3/info.json b/keyboards/flygone60/rev3/info.json index 8af582e220b..782352d2937 100644 --- a/keyboards/flygone60/rev3/info.json +++ b/keyboards/flygone60/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/flygone60/rev3/rules.mk b/keyboards/flygone60/rev3/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/flygone60/rev3/rules.mk +++ b/keyboards/flygone60/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/foostan/cornelius/info.json b/keyboards/foostan/cornelius/info.json index fa7a40b5aa1..2359940dc6d 100644 --- a/keyboards/foostan/cornelius/info.json +++ b/keyboards/foostan/cornelius/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts":{ "LAYOUT":{ "layout":[ diff --git a/keyboards/foostan/cornelius/rules.mk b/keyboards/foostan/cornelius/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/foostan/cornelius/rules.mk +++ b/keyboards/foostan/cornelius/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/for_science/info.json b/keyboards/for_science/info.json index 9d2808c9c51..e16056f6355 100644 --- a/keyboards/for_science/info.json +++ b/keyboards/for_science/info.json @@ -8,6 +8,8 @@ "pid": "0xF22C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_4x5_3": { "layout": [ diff --git a/keyboards/for_science/rules.mk b/keyboards/for_science/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/for_science/rules.mk +++ b/keyboards/for_science/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json index f8c7f0a9958..765d4dbee95 100644 --- a/keyboards/fortitude60/rev1/info.json +++ b/keyboards/fortitude60/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1156", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"R00", "x":9, "y":0}, {"label":"R01", "x":10, "y":0}, {"label":"R02", "x":11, "y":0}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0}, {"label":"R05", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"R10", "x":9, "y":1}, {"label":"R11", "x":10, "y":1}, {"label":"R12", "x":11, "y":1}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1}, {"label":"R15", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"R20", "x":9, "y":2}, {"label":"R21", "x":10, "y":2}, {"label":"R22", "x":11, "y":2}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2}, {"label":"R25", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"LT5", "x":6, "y":3}, {"label":"RT5", "x":8, "y":3}, {"label":"R30", "x":9, "y":3}, {"label":"R31", "x":10, "y":3}, {"label":"R32", "x":11, "y":3}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3}, {"label":"R35", "x":14, "y":3}, {"label":"LT0", "x":2, "y":4}, {"label":"LT1", "x":3, "y":4}, {"label":"LT2", "x":4, "y":4}, {"label":"LT3", "x":5, "y":4}, {"label":"LT4", "x":6, "y":4}, {"label":"RT4", "x":8, "y":4}, {"label":"RT3", "x":9, "y":4}, {"label":"RT2", "x":10, "y":4}, {"label":"RT1", "x":11, "y":4}, {"label":"RT0", "x":12, "y":4}] diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk index afa77eb88ba..9302b674251 100644 --- a/keyboards/fortitude60/rules.mk +++ b/keyboards/fortitude60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json index e6615681efa..b54374fa0ad 100644 --- a/keyboards/foxlab/key65/hotswap/info.json +++ b/keyboards/foxlab/key65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/foxlab/key65/hotswap/rules.mk b/keyboards/foxlab/key65/hotswap/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/foxlab/key65/hotswap/rules.mk +++ b/keyboards/foxlab/key65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json index b0f5c9fe09c..bb970bbb813 100644 --- a/keyboards/foxlab/key65/universal/info.json +++ b/keyboards/foxlab/key65/universal/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/foxlab/key65/universal/rules.mk b/keyboards/foxlab/key65/universal/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/foxlab/key65/universal/rules.mk +++ b/keyboards/foxlab/key65/universal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json index b577d864dd5..a93938973e5 100644 --- a/keyboards/foxlab/leaf60/hotswap/info.json +++ b/keyboards/foxlab/leaf60/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/foxlab/leaf60/hotswap/rules.mk b/keyboards/foxlab/leaf60/hotswap/rules.mk index 3ca912f6ecb..0922d3d5112 100644 --- a/keyboards/foxlab/leaf60/hotswap/rules.mk +++ b/keyboards/foxlab/leaf60/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json index ee03b7f9649..4aa6b72d624 100644 --- a/keyboards/foxlab/leaf60/universal/info.json +++ b/keyboards/foxlab/leaf60/universal/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/foxlab/leaf60/universal/rules.mk b/keyboards/foxlab/leaf60/universal/rules.mk index 3ca912f6ecb..0922d3d5112 100644 --- a/keyboards/foxlab/leaf60/universal/rules.mk +++ b/keyboards/foxlab/leaf60/universal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json index 5173c152b22..7b8d4603c6c 100644 --- a/keyboards/foxlab/time80/info.json +++ b/keyboards/foxlab/time80/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/foxlab/time80/rules.mk b/keyboards/foxlab/time80/rules.mk index 1bbfa8fa0ec..a3ca698e0b4 100644 --- a/keyboards/foxlab/time80/rules.mk +++ b/keyboards/foxlab/time80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json index 3479c1e33e7..300775a3775 100644 --- a/keyboards/foxlab/time_re/hotswap/info.json +++ b/keyboards/foxlab/time_re/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/foxlab/time_re/hotswap/rules.mk b/keyboards/foxlab/time_re/hotswap/rules.mk index b03288f7aea..d96164b489f 100644 --- a/keyboards/foxlab/time_re/hotswap/rules.mk +++ b/keyboards/foxlab/time_re/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json index 3479c1e33e7..300775a3775 100644 --- a/keyboards/foxlab/time_re/universal/info.json +++ b/keyboards/foxlab/time_re/universal/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/foxlab/time_re/universal/rules.mk b/keyboards/foxlab/time_re/universal/rules.mk index 3c2afd0583f..37ab2ebad17 100644 --- a/keyboards/foxlab/time_re/universal/rules.mk +++ b/keyboards/foxlab/time_re/universal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json index 11d4031769a..466e0edab52 100644 --- a/keyboards/fr4/southpaw75/info.json +++ b/keyboards/fr4/southpaw75/info.json @@ -8,6 +8,8 @@ "pid": "0x350C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"~", "x":4, "y":0}, {"label":"!", "x":5, "y":0}, {"label":"@", "x":6, "y":0}, {"label":"#", "x":7, "y":0}, {"label":"$", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"^", "x":10, "y":0}, {"label":"&", "x":11, "y":0}, {"label":"*", "x":12, "y":0}, {"label":"(", "x":13, "y":0}, {"label":")", "x":14, "y":0}, {"label":"_", "x":15, "y":0}, {"label":"+", "x":16, "y":0}, {"label":"Backspace", "x":17, "y":0, "w":2}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"Tab", "x":4, "y":1, "w":1.5}, {"label":"Q", "x":5.5, "y":1}, {"label":"W", "x":6.5, "y":1}, {"label":"E", "x":7.5, "y":1}, {"label":"R", "x":8.5, "y":1}, {"label":"T", "x":9.5, "y":1}, {"label":"Y", "x":10.5, "y":1}, {"label":"U", "x":11.5, "y":1}, {"label":"I", "x":12.5, "y":1}, {"label":"O", "x":13.5, "y":1}, {"label":"P", "x":14.5, "y":1}, {"label":"{", "x":15.5, "y":1}, {"label":"}", "x":16.5, "y":1}, {"label":"|", "x":17.5, "y":1, "w":1.5}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Caps Lock", "x":4, "y":2, "w":1.75}, {"label":"A", "x":5.75, "y":2}, {"label":"S", "x":6.75, "y":2}, {"label":"D", "x":7.75, "y":2}, {"label":"F", "x":8.75, "y":2}, {"label":"G", "x":9.75, "y":2}, {"label":"H", "x":10.75, "y":2}, {"label":"J", "x":11.75, "y":2}, {"label":"K", "x":12.75, "y":2}, {"label":"L", "x":13.75, "y":2}, {"label":":", "x":14.75, "y":2}, {"label":"\"", "x":15.75, "y":2}, {"label":"Enter", "x":16.75, "y":2, "w":2.25}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"Shift", "x":4, "y":3, "w":2.25}, {"label":"Z", "x":6.25, "y":3}, {"label":"X", "x":7.25, "y":3}, {"label":"C", "x":8.25, "y":3}, {"label":"V", "x":9.25, "y":3}, {"label":"B", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":2.75}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Ctrl", "x":4, "y":4, "w":1.25}, {"label":"Win", "x":5.25, "y":4, "w":1.25}, {"label":"Alt", "x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":6.25}, {"label":"Alt", "x":14, "y":4, "w":1.25}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Menu", "x":16.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":17.75, "y":4, "w":1.25}] diff --git a/keyboards/fr4/southpaw75/rules.mk b/keyboards/fr4/southpaw75/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/fr4/southpaw75/rules.mk +++ b/keyboards/fr4/southpaw75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index 19a04e8cedb..2356702b485 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -8,6 +8,8 @@ "pid": "0x5558", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":0.6}, {"x":13.6, "y":0, "w":0.8}, {"x":14.4, "y":0, "w":0.6}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}] diff --git a/keyboards/fr4/unix60/rules.mk b/keyboards/fr4/unix60/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/fr4/unix60/rules.mk +++ b/keyboards/fr4/unix60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json index 92cae41d25c..4b98a751e4d 100644 --- a/keyboards/fractal/info.json +++ b/keyboards/fractal/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk index 4ed6c61a98f..6beb2824318 100755 --- a/keyboards/fractal/rules.mk +++ b/keyboards/fractal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/free_willy/info.json b/keyboards/free_willy/info.json index 61a707b2453..51108e11927 100644 --- a/keyboards/free_willy/info.json +++ b/keyboards/free_willy/info.json @@ -8,6 +8,8 @@ "pid": "0x4657", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/free_willy/rules.mk b/keyboards/free_willy/rules.mk index 1ea0b3fdfb9..1ffb0c55b90 100644 --- a/keyboards/free_willy/rules.mk +++ b/keyboards/free_willy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/friedrich/info.json b/keyboards/friedrich/info.json index ccaaf2753e3..297540f03a8 100644 --- a/keyboards/friedrich/info.json +++ b/keyboards/friedrich/info.json @@ -8,6 +8,8 @@ "pid": "0xB4A2", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, diff --git a/keyboards/friedrich/rules.mk b/keyboards/friedrich/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/friedrich/rules.mk +++ b/keyboards/friedrich/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json index d573fb5b77c..edd23d85560 100644 --- a/keyboards/frooastboard/nano/info.json +++ b/keyboards/frooastboard/nano/info.json @@ -38,5 +38,7 @@ "vid": "0x4642", "pid": "0x6F21", "device_version": "0.0.1" - } + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu" } diff --git a/keyboards/frooastboard/nano/rules.mk b/keyboards/frooastboard/nano/rules.mk index bef90c50acd..c4f25d88037 100644 --- a/keyboards/frooastboard/nano/rules.mk +++ b/keyboards/frooastboard/nano/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json index f2307b60c15..c8ce0864cc4 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/info.json @@ -8,6 +8,8 @@ "pid": "0x422F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/ft/mars65/rules.mk b/keyboards/ft/mars65/rules.mk index f3e472d0cda..9e327f9e3c8 100644 --- a/keyboards/ft/mars65/rules.mk +++ b/keyboards/ft/mars65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index b9dfbc71a27..ff8760f955a 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk index 9a2e1da0ded..9a00928ea84 100644 --- a/keyboards/ft/mars80/rules.mk +++ b/keyboards/ft/mars80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/function96/v1/info.json b/keyboards/function96/v1/info.json index 92b016c1650..0b937baada8 100644 --- a/keyboards/function96/v1/info.json +++ b/keyboards/function96/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x672A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2, "h":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":2.25}, {"x":6, "y":5, "w":1.25}, {"x":7.25, "y":5, "w":2.75}, {"x":10, "y":5, "w":1.25}, {"x":11.25, "y":5, "w":1.25}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"x":17, "y":5}] diff --git a/keyboards/function96/v1/rules.mk b/keyboards/function96/v1/rules.mk index f1409914dfe..9dc5131823e 100644 --- a/keyboards/function96/v1/rules.mk +++ b/keyboards/function96/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/function96/v2/info.json b/keyboards/function96/v2/info.json index 7bb6adfcadf..c0753043669 100644 --- a/keyboards/function96/v2/info.json +++ b/keyboards/function96/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x672B", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/function96/v2/rules.mk b/keyboards/function96/v2/rules.mk index f1409914dfe..9dc5131823e 100644 --- a/keyboards/function96/v2/rules.mk +++ b/keyboards/function96/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json index 80edfb5b91a..3c5e731abfa 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1233", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 3, "layout_aliases": { "LAYOUT_fungo_split_num": "LAYOUT" diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index 4cfaca9bc3f..731941b437a 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -1,12 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina # controller pro micro -# BOOTLOADER = atmel-dfu # controller Elite-C - - - # Build Options # change yes to no to disable # diff --git a/keyboards/funky40/info.json b/keyboards/funky40/info.json index 9faf90c2301..e4ac27a84fc 100644 --- a/keyboards/funky40/info.json +++ b/keyboards/funky40/info.json @@ -8,6 +8,8 @@ "pid": "0xC4B5", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back
Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"\"", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Shift", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"x":3, "y":3, "w":2}, {"label":"Del", "x":5, "y":3}, {"x":6, "y":3, "w":2}, {"label":"Left", "x":8, "y":3}, {"label":"Up", "x":9, "y":3}, {"label":"Down", "x":10, "y":3}, {"label":"Right", "x":11, "y":3}] diff --git a/keyboards/funky40/rules.mk b/keyboards/funky40/rules.mk index e54b18efd8e..d963880594e 100644 --- a/keyboards/funky40/rules.mk +++ b/keyboards/funky40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index 7422287bd63..c47a0ab4743 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -8,6 +8,8 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gami_studio/lex60/rules.mk b/keyboards/gami_studio/lex60/rules.mk index 6cc11b68959..f2e6e3b073e 100644 --- a/keyboards/gami_studio/lex60/rules.mk +++ b/keyboards/gami_studio/lex60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 158769dbd11..085d56f91ef 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_butter": { "layout": [ diff --git a/keyboards/gboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk index e05ccd047c9..b4de1a53932 100644 --- a/keyboards/gboards/butterstick/rules.mk +++ b/keyboards/gboards/butterstick/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index bd1863288e3..163b76db196 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk index db236477b0f..2df8900c2d6 100644 --- a/keyboards/gboards/ergotaco/rules.mk +++ b/keyboards/gboards/ergotaco/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - CUSTOM_MATRIX = yes EXTRAKEY_ENABLE = yes CONSOLE_ENABLE = yes diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 619fa4af5d4..3f1c69b7f55 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_georgi": "LAYOUT" }, diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk index 9f66bb0d5b3..5980342669e 100644 --- a/keyboards/gboards/georgi/rules.mk +++ b/keyboards/gboards/georgi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index 753a5e2e735..e1ab1d52026 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -8,6 +8,8 @@ "pid": "0x1307", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_gergo": "LAYOUT" }, diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk index 0f877e2d4b4..95e12cc36c1 100644 --- a/keyboards/gboards/gergo/rules.mk +++ b/keyboards/gboards/gergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index eb305c5e8e9..914832aacfb 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk index 4cf1e7624ec..6887c869b9a 100644 --- a/keyboards/gboards/gergoplex/rules.mk +++ b/keyboards/gboards/gergoplex/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index 4671440fef7..2a18038e4f8 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -8,6 +8,8 @@ "pid": "0xA372", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "debounce": 3, "layouts": { "LAYOUT_ortho_2x4": { diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk index 4aa4ccfdefc..f81c11eb7dc 100644 --- a/keyboards/geekboards/macropad_v2/rules.mk +++ b/keyboards/geekboards/macropad_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index 9da0d0edb6f..fdc0463e417 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -8,6 +8,8 @@ "pid": "0x1319", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk index 923f1f383c0..e17c577cc4a 100644 --- a/keyboards/geekboards/tester/rules.mk +++ b/keyboards/geekboards/tester/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json index 83daae66312..57fe2ea1330 100644 --- a/keyboards/generic_panda/panda65_01/info.json +++ b/keyboards/generic_panda/panda65_01/info.json @@ -8,6 +8,8 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_split_bs": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"LShift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"FN", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/generic_panda/panda65_01/rules.mk b/keyboards/generic_panda/panda65_01/rules.mk index 72615cd64c1..6fe874e748b 100644 --- a/keyboards/generic_panda/panda65_01/rules.mk +++ b/keyboards/generic_panda/panda65_01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/info.json index 8f3d1be32cb..b17bc2bf682 100644 --- a/keyboards/genone/eclipse_65/info.json +++ b/keyboards/genone/eclipse_65/info.json @@ -8,6 +8,8 @@ "pid": "0x2222", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk index 1f93c50d0da..2155cba5650 100644 --- a/keyboards/genone/eclipse_65/rules.mk +++ b/keyboards/genone/eclipse_65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/genone/g1_65/info.json b/keyboards/genone/g1_65/info.json index 2da21be347a..da5a1df03ad 100644 --- a/keyboards/genone/g1_65/info.json +++ b/keyboards/genone/g1_65/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/genone/g1_65/rules.mk b/keyboards/genone/g1_65/rules.mk index 1f93c50d0da..2155cba5650 100644 --- a/keyboards/genone/g1_65/rules.mk +++ b/keyboards/genone/g1_65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/info.json index 3961df2fc9b..856705b4f11 100644 --- a/keyboards/geonworks/frogmini/fmh/info.json +++ b/keyboards/geonworks/frogmini/fmh/info.json @@ -8,6 +8,8 @@ "pid": "0x2D28", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/geonworks/frogmini/fmh/rules.mk b/keyboards/geonworks/frogmini/fmh/rules.mk index bb5f9341d26..683a20e5c05 100644 --- a/keyboards/geonworks/frogmini/fmh/rules.mk +++ b/keyboards/geonworks/frogmini/fmh/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/info.json index 34f7f63251b..1442ceb8b42 100644 --- a/keyboards/geonworks/frogmini/fms/info.json +++ b/keyboards/geonworks/frogmini/fms/info.json @@ -8,6 +8,8 @@ "pid": "0x2D33", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/geonworks/frogmini/fms/rules.mk b/keyboards/geonworks/frogmini/fms/rules.mk index b58f583fea7..82ca995e250 100644 --- a/keyboards/geonworks/frogmini/fms/rules.mk +++ b/keyboards/geonworks/frogmini/fms/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json index 22d1f8a6b11..35b52cb9c4d 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xD4D3", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_ansi" }, diff --git a/keyboards/ggkeyboards/genesis/hotswap/rules.mk b/keyboards/ggkeyboards/genesis/hotswap/rules.mk index d5fdfffef40..309e55c9f4c 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/rules.mk +++ b/keyboards/ggkeyboards/genesis/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json index 780e22e869e..ebc309987c0 100644 --- a/keyboards/ggkeyboards/genesis/solder/info.json +++ b/keyboards/ggkeyboards/genesis/solder/info.json @@ -8,6 +8,8 @@ "pid": "0xD4D2", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/ggkeyboards/genesis/solder/rules.mk b/keyboards/ggkeyboards/genesis/solder/rules.mk index d5fdfffef40..309e55c9f4c 100644 --- a/keyboards/ggkeyboards/genesis/solder/rules.mk +++ b/keyboards/ggkeyboards/genesis/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json index c381450138b..9c9d96b7917 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gh60/revc/rules.mk b/keyboards/gh60/revc/rules.mk index a813fab66c9..53acbde1062 100644 --- a/keyboards/gh60/revc/rules.mk +++ b/keyboards/gh60/revc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 97a07356b12..706d3ed4ceb 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gh60/satan/rules.mk b/keyboards/gh60/satan/rules.mk index cb5a0c61a60..4680ba6e6f0 100644 --- a/keyboards/gh60/satan/rules.mk +++ b/keyboards/gh60/satan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json index f1b12ac4d87..052446ea426 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_hhkb", "64_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gh60/v1p3/rules.mk b/keyboards/gh60/v1p3/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/gh60/v1p3/rules.mk +++ b/keyboards/gh60/v1p3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json index 0c84d933770..b03ea8f6a3a 100644 --- a/keyboards/gh80_3000/info.json +++ b/keyboards/gh80_3000/info.json @@ -8,6 +8,8 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { "LAYOUT": { diff --git a/keyboards/gh80_3000/rules.mk b/keyboards/gh80_3000/rules.mk index 82694737e60..51c80ed6cf1 100644 --- a/keyboards/gh80_3000/rules.mk +++ b/keyboards/gh80_3000/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index 2f5a75a4f41..1a8b534e56b 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ghs/rar/rules.mk b/keyboards/ghs/rar/rules.mk index 4c9451f9a15..8288dff3765 100644 --- a/keyboards/ghs/rar/rules.mk +++ b/keyboards/ghs/rar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ghs/xls/info.json b/keyboards/ghs/xls/info.json index 65308932291..87ed3765006 100644 --- a/keyboards/ghs/xls/info.json +++ b/keyboards/ghs/xls/info.json @@ -25,6 +25,8 @@ "pid": "0x0002", "vid": "0x0645" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "encoder": { "rotary": [ { "pin_a": "B3", "pin_b": "A15" }, diff --git a/keyboards/ghs/xls/rules.mk b/keyboards/ghs/xls/rules.mk index 6b379283278..a92b0993283 100644 --- a/keyboards/ghs/xls/rules.mk +++ b/keyboards/ghs/xls/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index b0b52b4ab8d..b5361eb4f34 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -8,6 +8,8 @@ "pid": "0xF4B0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk index b642aa9aa3a..b676b1da462 100644 --- a/keyboards/giabalanai/rules.mk +++ b/keyboards/giabalanai/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json old mode 100755 new mode 100644 index 4573c3f5610..a8c0e5b05d2 --- a/keyboards/gizmo_engineering/gk6/info.json +++ b/keyboards/gizmo_engineering/gk6/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "30.3.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_gk6_2x2u": "LAYOUT_2x2u", "LAYOUT_gk6_1x2u": "LAYOUT_1x2u" diff --git a/keyboards/gizmo_engineering/gk6/rules.mk b/keyboards/gizmo_engineering/gk6/rules.mk index c70d2ea88dc..c3d99b1e57d 100755 --- a/keyboards/gizmo_engineering/gk6/rules.mk +++ b/keyboards/gizmo_engineering/gk6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index ff299c5b890..ca200a1485e 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -8,6 +8,8 @@ "pid": "0x4201", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/gkeyboard/gkb_m16/rules.mk b/keyboards/gkeyboard/gkb_m16/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/gkeyboard/gkb_m16/rules.mk +++ b/keyboards/gkeyboard/gkb_m16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json index 39f872e5cfa..45b2dd74230 100644 --- a/keyboards/gl516/a52gl/info.json +++ b/keyboards/gl516/a52gl/info.json @@ -8,6 +8,8 @@ "pid": "0xE8D1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk index 37fe9349c67..109f8bc976d 100644 --- a/keyboards/gl516/a52gl/rules.mk +++ b/keyboards/gl516/a52gl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index 4ef656f2305..42f6d368bb5 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -8,6 +8,8 @@ "pid": "0xE8D0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk index a7521a0e408..3ea771b6701 100644 --- a/keyboards/gl516/j73gl/rules.mk +++ b/keyboards/gl516/j73gl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json index 99ae8d764f7..50607c3f8f1 100644 --- a/keyboards/gl516/n51gl/info.json +++ b/keyboards/gl516/n51gl/info.json @@ -8,6 +8,8 @@ "pid": "0xE8CF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk index 6279bfb0e0d..c5b4f3e3764 100644 --- a/keyboards/gl516/n51gl/rules.mk +++ b/keyboards/gl516/n51gl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json index 26faa0343aa..6e758aff0d5 100644 --- a/keyboards/glenpickle/chimera_ergo/info.json +++ b/keyboards/glenpickle/chimera_ergo/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":1}, {"label":"k01", "x":1, "y":0.75}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.25}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.25}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k10", "x":11, "y":0.75}, {"label":"k11", "x":12, "y":1}, {"label":"k12", "x":0, "y":2}, {"label":"k13", "x":1, "y":1.75}, {"label":"k14", "x":2, "y":1.25}, {"label":"k15", "x":3, "y":1}, {"label":"k16", "x":4, "y":1.25}, {"label":"k17", "x":5, "y":1.5}, {"label":"k18", "x":7, "y":1.5}, {"label":"k19", "x":8, "y":1.25}, {"label":"k20", "x":9, "y":1}, {"label":"k21", "x":10, "y":1.25}, {"label":"k22", "x":11, "y":1.75}, {"label":"k23", "x":12, "y":2}, {"label":"k24", "x":0, "y":3}, {"label":"k25", "x":1, "y":2.75}, {"label":"k26", "x":2, "y":2.25}, {"label":"k27", "x":3, "y":2}, {"label":"k28", "x":4, "y":2.25}, {"label":"k29", "x":5, "y":2.5}, {"label":"k30", "x":7, "y":2.5}, {"label":"k31", "x":8, "y":2.25}, {"label":"k32", "x":9, "y":2}, {"label":"k33", "x":10, "y":2.25}, {"label":"k34", "x":11, "y":2.75}, {"label":"k35", "x":12, "y":3}, {"label":"k36", "x":0, "y":4}, {"label":"k37", "x":1, "y":3.75}, {"label":"k38", "x":2, "y":3.25}, {"label":"k39", "x":3, "y":3}, {"label":"k40", "x":4, "y":3.25}, {"label":"k41", "x":5, "y":3.5}, {"label":"k42", "x":7, "y":3.5}, {"label":"k43", "x":8, "y":3.25}, {"label":"k44", "x":9, "y":3}, {"label":"k45", "x":10, "y":3.25}, {"label":"k46", "x":11, "y":3.75}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":4, "y":4.75}, {"label":"k49", "x":5, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k51", "x":8, "y":4.75}] diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk index 8cb17361471..32eca4db314 100644 --- a/keyboards/glenpickle/chimera_ergo/rules.mk +++ b/keyboards/glenpickle/chimera_ergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json index c0fae9dc06a..97a654981cc 100644 --- a/keyboards/glenpickle/chimera_ls/info.json +++ b/keyboards/glenpickle/chimera_ls/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/glenpickle/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk index f6cc685e504..1ee3fc58f95 100644 --- a/keyboards/glenpickle/chimera_ls/rules.mk +++ b/keyboards/glenpickle/chimera_ls/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json index ac4ecfb2016..cf51575b3df 100644 --- a/keyboards/glenpickle/chimera_ortho/info.json +++ b/keyboards/glenpickle/chimera_ortho/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk index 8cb17361471..32eca4db314 100644 --- a/keyboards/glenpickle/chimera_ortho/rules.mk +++ b/keyboards/glenpickle/chimera_ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json index fb7dfbbf6c2..a5d7b8855b4 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/info.json +++ b/keyboards/glenpickle/chimera_ortho_plus/info.json @@ -7,6 +7,8 @@ "pid": "0xDE1D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk index 0a8a31e7dd7..6b1876f87ca 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/rules.mk +++ b/keyboards/glenpickle/chimera_ortho_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index 8aedd894aee..f8d8f19245e 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x5045", "device_version": "0.0.1" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk index 1cf9d7a7094..ed301944f47 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk +++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json index 9f0285abbbd..29dc2955be0 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x504A", "device_version": "0.0.1" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk index 1cf9d7a7094..ed301944f47 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/rules.mk +++ b/keyboards/gmmk/gmmk2/p65/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index a5a1d6c3d55..f5b05748c7e 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x504B", "device_version": "0.0.1" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk index ba78129495a..4230665e7c7 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk +++ b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index df30007a010..a2f377615b1 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x505A", "device_version": "0.0.1" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk index ba78129495a..4230665e7c7 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/rules.mk +++ b/keyboards/gmmk/gmmk2/p96/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json index 64f63e9593c..49830909bc4 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev1/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk index d3afa4d4323..43949aa054c 100644 --- a/keyboards/gmmk/pro/rev1/ansi/rules.mk +++ b/keyboards/gmmk/pro/rev1/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json index 3638e9d6847..2a578484659 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev1/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk index d3afa4d4323..43949aa054c 100644 --- a/keyboards/gmmk/pro/rev1/iso/rules.mk +++ b/keyboards/gmmk/pro/rev1/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index a78e608f2f1..11882e8af02 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk index 8d81af0fdf0..1672a47804b 100644 --- a/keyboards/gmmk/pro/rev2/ansi/rules.mk +++ b/keyboards/gmmk/pro/rev2/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index afec8e275bb..4ffe92e4d85 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk index cf6373ae46b..7f154b74c11 100644 --- a/keyboards/gmmk/pro/rev2/iso/rules.mk +++ b/keyboards/gmmk/pro/rev2/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index a23145c0ef4..6d83a2336ee 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -8,6 +8,8 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk index 0a88d500be4..e0782ddcb51 100644 --- a/keyboards/gon/nerd60/rules.mk +++ b/keyboards/gon/nerd60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index 1af13bf2379..21c1e0775f6 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -8,6 +8,8 @@ "pid": "0x5244", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl": { "layout": [ diff --git a/keyboards/gon/nerdtkl/rules.mk b/keyboards/gon/nerdtkl/rules.mk index 0a88d500be4..e0782ddcb51 100644 --- a/keyboards/gon/nerdtkl/rules.mk +++ b/keyboards/gon/nerdtkl/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index 6659127976a..dc017f23c41 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk index 0f0bdec2b6d..24c3d42112c 100644 --- a/keyboards/gopolar/gg86/rules.mk +++ b/keyboards/gopolar/gg86/rules.mk @@ -1,11 +1,5 @@ SRC += lib/logo.c -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json index 8b083b32290..527557002d9 100644 --- a/keyboards/gorthage_truck/info.json +++ b/keyboards/gorthage_truck/info.json @@ -8,6 +8,8 @@ "pid": "0x58E4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_3u": { "layout": [ diff --git a/keyboards/gorthage_truck/rules.mk b/keyboards/gorthage_truck/rules.mk index 284ea23e781..453f0a34d38 100644 --- a/keyboards/gorthage_truck/rules.mk +++ b/keyboards/gorthage_truck/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gowla/info.json b/keyboards/gowla/info.json index bf9f17e4adf..8393d1c82d3 100644 --- a/keyboards/gowla/info.json +++ b/keyboards/gowla/info.json @@ -8,6 +8,8 @@ "pid": "0xE9B6", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/gowla/rules.mk b/keyboards/gowla/rules.mk index a89938be01f..84ab7f32b2b 100644 --- a/keyboards/gowla/rules.mk +++ b/keyboards/gowla/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index 733ba2ae44b..37376a90e91 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json @@ -8,6 +8,8 @@ "pid": "0x3075", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":14, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Fn", "x":11.25, "y":5.25, "w":1.25}, {"label":"Left", "x":13, "y":5.25}, {"label":"Down", "x":14, "y":5.25}, {"label":"Right", "x":15, "y":5.25}] diff --git a/keyboards/gray_studio/aero75/rules.mk b/keyboards/gray_studio/aero75/rules.mk index c369290cf92..ecfd4b5b959 100644 --- a/keyboards/gray_studio/aero75/rules.mk +++ b/keyboards/gray_studio/aero75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index 32d36d766de..0d90a72912c 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -8,6 +8,8 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gray_studio/apollo80/rules.mk b/keyboards/gray_studio/apollo80/rules.mk index cb5238f27dc..bb40a3ee66c 100644 --- a/keyboards/gray_studio/apollo80/rules.mk +++ b/keyboards/gray_studio/apollo80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index c75d4786a5e..8c5c4bd7dba 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -8,6 +8,8 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"Shift", "x":11.25, "y":3, "w":1.75}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Win", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4, "w":2}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk index cb0ee6abcdf..c8d3337cb38 100644 --- a/keyboards/gray_studio/cod67/rules.mk +++ b/keyboards/gray_studio/cod67/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms - # This board uses the older unsafe 6k version of lufa-ms BOOTLOADER_SIZE = 6144 diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index a2895c1ee6c..62f03444cce 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -8,6 +8,8 @@ "pid": "0x2000", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":1.5, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15, "y":1.25}, {"x":16, "y":1.25}, {"x":17, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"x":16, "y":2.25}, {"x":17, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13, "y":5.25}, {"x":14, "y":5.25}, {"x":15, "y":5.25}, {"x":16, "y":5.25}] diff --git a/keyboards/gray_studio/hb85/rules.mk b/keyboards/gray_studio/hb85/rules.mk index 9a2e1da0ded..9a00928ea84 100644 --- a/keyboards/gray_studio/hb85/rules.mk +++ b/keyboards/gray_studio/hb85/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index b8dd8407d5b..f6b9c2ea97d 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json @@ -8,6 +8,8 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], "layouts": { "LAYOUT": { diff --git a/keyboards/gray_studio/space65/rules.mk b/keyboards/gray_studio/space65/rules.mk index 3ca912f6ecb..0922d3d5112 100644 --- a/keyboards/gray_studio/space65/rules.mk +++ b/keyboards/gray_studio/space65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json index 2f34920b06e..b514a2886bf 100644 --- a/keyboards/gray_studio/space65r3/info.json +++ b/keyboards/gray_studio/space65r3/info.json @@ -8,6 +8,8 @@ "pid":"0x3003", "device_version": "0.0.3", }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], "layouts": { "LAYOUT": { diff --git a/keyboards/gray_studio/space65r3/rules.mk b/keyboards/gray_studio/space65r3/rules.mk index d345d2d3f97..703a4ac4e13 100644 --- a/keyboards/gray_studio/space65r3/rules.mk +++ b/keyboards/gray_studio/space65r3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json index 6207f479c8c..252a34a286e 100644 --- a/keyboards/gray_studio/think65/hotswap/info.json +++ b/keyboards/gray_studio/think65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x4001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/gray_studio/think65/hotswap/rules.mk b/keyboards/gray_studio/think65/hotswap/rules.mk index 841d91aa423..582545a8ce4 100644 --- a/keyboards/gray_studio/think65/hotswap/rules.mk +++ b/keyboards/gray_studio/think65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json index 408d65f3690..5374b4619da 100644 --- a/keyboards/gray_studio/think65/solder/info.json +++ b/keyboards/gray_studio/think65/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/gray_studio/think65/solder/rules.mk b/keyboards/gray_studio/think65/solder/rules.mk index 841d91aa423..582545a8ce4 100644 --- a/keyboards/gray_studio/think65/solder/rules.mk +++ b/keyboards/gray_studio/think65/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index e1ed976dc05..6fb7c8d5b04 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -8,6 +8,8 @@ "pid": "0x7539", "device_version": "0.0.5" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}] diff --git a/keyboards/grid600/press/rules.mk b/keyboards/grid600/press/rules.mk index 05d79250574..cae8f12b1b7 100644 --- a/keyboards/grid600/press/rules.mk +++ b/keyboards/grid600/press/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json index b2c52085589..955d7a5d04b 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/info.json @@ -8,6 +8,8 @@ "pid": "0x6135", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gvalchca/ga150/rules.mk b/keyboards/gvalchca/ga150/rules.mk index dc48de0a7ef..96682fe5ccd 100644 --- a/keyboards/gvalchca/ga150/rules.mk +++ b/keyboards/gvalchca/ga150/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json index 468dd972abb..2bd0744f4c5 100644 --- a/keyboards/gvalchca/spaccboard/info.json +++ b/keyboards/gvalchca/spaccboard/info.json @@ -8,6 +8,8 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gvalchca/spaccboard/rules.mk b/keyboards/gvalchca/spaccboard/rules.mk index d4622ab90c7..b4f292ed8d7 100644 --- a/keyboards/gvalchca/spaccboard/rules.mk +++ b/keyboards/gvalchca/spaccboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json index b5b7daa2f6f..30d3e3d32ea 100644 --- a/keyboards/h0oni/deskpad/info.json +++ b/keyboards/h0oni/deskpad/info.json @@ -8,6 +8,8 @@ "pid": "0x4450", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_all": { diff --git a/keyboards/h0oni/deskpad/rules.mk b/keyboards/h0oni/deskpad/rules.mk index f28bef72baa..3f362330c96 100644 --- a/keyboards/h0oni/deskpad/rules.mk +++ b/keyboards/h0oni/deskpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json index 29f64716009..6ca8cfcde71 100644 --- a/keyboards/h0oni/hotduck/info.json +++ b/keyboards/h0oni/hotduck/info.json @@ -8,6 +8,8 @@ "pid": "0x6844", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, diff --git a/keyboards/h0oni/hotduck/rules.mk b/keyboards/h0oni/hotduck/rules.mk index cb5238f27dc..bb40a3ee66c 100644 --- a/keyboards/h0oni/hotduck/rules.mk +++ b/keyboards/h0oni/hotduck/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json index e557e4d3076..23af3e77efb 100644 --- a/keyboards/hadron/ver2/info.json +++ b/keyboards/hadron/ver2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "halfkay" } diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk index f7aeba68916..d07da3fca08 100644 --- a/keyboards/hadron/ver2/rules.mk +++ b/keyboards/hadron/ver2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json index b377cdff008..ec89f322536 100644 --- a/keyboards/hadron/ver3/info.json +++ b/keyboards/hadron/ver3/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk index da70b2a9bf1..5d37686760c 100644 --- a/keyboards/hadron/ver3/rules.mk +++ b/keyboards/hadron/ver3/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index fa189c10563..a6da034879a 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -8,6 +8,8 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk index 85755081ed9..004db2a6d71 100644 --- a/keyboards/halfcliff/rules.mk +++ b/keyboards/halfcliff/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json index 84febe2cab1..50ae0900fbe 100644 --- a/keyboards/halokeys/elemental75/info.json +++ b/keyboards/halokeys/elemental75/info.json @@ -8,6 +8,9 @@ "pid": "0xEA75", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/halokeys/elemental75/rules.mk b/keyboards/halokeys/elemental75/rules.mk index 226c430d25e..c5c4d8f35f1 100644 --- a/keyboards/halokeys/elemental75/rules.mk +++ b/keyboards/halokeys/elemental75/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/han60/info.json b/keyboards/han60/info.json index bbc60791f74..5f7cb9cb033 100644 --- a/keyboards/han60/info.json +++ b/keyboards/han60/info.json @@ -8,6 +8,8 @@ "pid": "0xFB60", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_tsangan": "LAYOUT_60_ansi_tsangan", "LAYOUT_tsangan_arrowkeys": "LAYOUT_60_ansi_arrow_tsangan" diff --git a/keyboards/han60/rules.mk b/keyboards/han60/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/han60/rules.mk +++ b/keyboards/han60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hand88/info.json b/keyboards/hand88/info.json index 05cef0d06c7..26390f614cd 100755 --- a/keyboards/hand88/info.json +++ b/keyboards/hand88/info.json @@ -8,6 +8,8 @@ "pid": "0x3838", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}] diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk index adc15fb5fcc..266889cfe70 100755 --- a/keyboards/hand88/rules.mk +++ b/keyboards/hand88/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json index a652ee74a93..54233290e55 100644 --- a/keyboards/handwired/108key_trackpoint/info.json +++ b/keyboards/handwired/108key_trackpoint/info.json @@ -8,6 +8,8 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk index 24f1d9b652a..acdf7bf3932 100644 --- a/keyboards/handwired/108key_trackpoint/rules.mk +++ b/keyboards/handwired/108key_trackpoint/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json index 8b580eafbe7..4b35ab4df90 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -23,6 +23,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT": "LAYOUT_split_1x5" }, diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk index af5f432a635..b4310ab72a6 100644 --- a/keyboards/handwired/10k/rules.mk +++ b/keyboards/handwired/10k/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - SPLIT_KEYBOARD = yes LTO_ENABLE = yes diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json index 72b5e185b7a..7267d486728 100644 --- a/keyboards/handwired/2x5keypad/info.json +++ b/keyboards/handwired/2x5keypad/info.json @@ -8,6 +8,8 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/2x5keypad/rules.mk b/keyboards/handwired/2x5keypad/rules.mk index 08870622a16..81d4ba4f3b5 100644 --- a/keyboards/handwired/2x5keypad/rules.mk +++ b/keyboards/handwired/2x5keypad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json index aa8875e0dd0..dfd4e8d4f09 100644 --- a/keyboards/handwired/3dfoxc/info.json +++ b/keyboards/handwired/3dfoxc/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/3dfoxc/rules.mk b/keyboards/handwired/3dfoxc/rules.mk index 168a6177547..c6b71a4aaa6 100644 --- a/keyboards/handwired/3dfoxc/rules.mk +++ b/keyboards/handwired/3dfoxc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/info.json index d3bfd245506..bfe19819fe1 100644 --- a/keyboards/handwired/3dp660/info.json +++ b/keyboards/handwired/3dp660/info.json @@ -8,6 +8,8 @@ "pid": "0x3660", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_66_ansi": { diff --git a/keyboards/handwired/3dp660/rules.mk b/keyboards/handwired/3dp660/rules.mk index a8ac9f9320f..f5b61e673cf 100644 --- a/keyboards/handwired/3dp660/rules.mk +++ b/keyboards/handwired/3dp660/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/412_64/info.json b/keyboards/handwired/412_64/info.json index cbf068c36a2..2e8ead29508 100644 --- a/keyboards/handwired/412_64/info.json +++ b/keyboards/handwired/412_64/info.json @@ -8,6 +8,8 @@ "pid": "0x0412", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x16": { "layout": [ diff --git a/keyboards/handwired/412_64/rules.mk b/keyboards/handwired/412_64/rules.mk index 52d23b3122b..0ad8161240c 100644 --- a/keyboards/handwired/412_64/rules.mk +++ b/keyboards/handwired/412_64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json index 8174c0d2306..16d3af16675 100644 --- a/keyboards/handwired/42/info.json +++ b/keyboards/handwired/42/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk index 655ce00befd..15cf817e7e3 100644 --- a/keyboards/handwired/42/rules.mk +++ b/keyboards/handwired/42/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json index b069f067c5f..7d7e17b64cf 100644 --- a/keyboards/handwired/6key/info.json +++ b/keyboards/handwired/6key/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/6key/rules.mk b/keyboards/handwired/6key/rules.mk index 3cb12386cc9..64e4af7ab76 100644 --- a/keyboards/handwired/6key/rules.mk +++ b/keyboards/handwired/6key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json index 2fd8e24a5b6..1d1aac48ad3 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/info.json @@ -8,6 +8,8 @@ "pid": "0x0037", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk index 73fc9f4951f..8c51d38be38 100644 --- a/keyboards/handwired/6macro/rules.mk +++ b/keyboards/handwired/6macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json index 60f40d19359..cb34aa70345 100644 --- a/keyboards/handwired/aball/info.json +++ b/keyboards/handwired/aball/info.json @@ -8,6 +8,8 @@ "pid": "0xC2F0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk index 9063957737e..d5e8e6ab985 100644 --- a/keyboards/handwired/aball/rules.mk +++ b/keyboards/handwired/aball/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json index d0e2474d1d5..42349632e2d 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0, "w":1.25}, {"label":"1", "x":1.25, "y":0}, {"label":"2", "x":2.25, "y":0}, {"label":"3", "x":3.25, "y":0}, {"label":"4", "x":4.25, "y":0}, {"label":"5", "x":5.25, "y":0}, {"label":"6", "x":6.25, "y":0}, {"label":"7", "x":7.25, "y":0}, {"label":"8", "x":8.25, "y":0}, {"label":"9", "x":9.25, "y":0}, {"label":"0", "x":10.25, "y":0}, {"label":"\u00b0", "x":11.25, "y":0}, {"label":"+", "x":12.25, "y":0}, {"label":"Backspace", "x":13.25, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"Z", "x":2.75, "y":1}, {"label":"E", "x":3.75, "y":1}, {"label":"R", "x":4.75, "y":1}, {"label":"T", "x":5.75, "y":1}, {"label":"Y", "x":6.75, "y":1}, {"label":"U", "x":7.75, "y":1}, {"label":"I", "x":8.75, "y":1}, {"label":"O", "x":9.75, "y":1}, {"label":"P", "x":10.75, "y":1}, {"label":"{", "x":11.75, "y":1}, {"label":"}", "x":12.75, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"Q", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":"M", "x":11, "y":2}, {"label":"%", "x":12, "y":2}, {"label":"µ", "x":13, "y":2}, {"label":"Enter", "x":14, "y":1, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":">", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"?", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"§", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Opt", "x":1.5, "y":4, "w":1.25}, {"label":"Cmd", "x":2.75, "y":4, "w":1.5}, {"label":"Space", "x":4.25, "y":4, "w":6.5}, {"label":"Cmd", "x":10.75, "y":4, "w":1.5}, {"label":"Opt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk index 03ca07fc443..1295dc41baf 100644 --- a/keyboards/handwired/aek64/rules.mk +++ b/keyboards/handwired/aek64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json index adb446d3cb5..f7671ea318b 100644 --- a/keyboards/handwired/aim65/info.json +++ b/keyboards/handwired/aim65/info.json @@ -8,6 +8,8 @@ "pid": "0x0F34", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/aim65/rules.mk b/keyboards/handwired/aim65/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/handwired/aim65/rules.mk +++ b/keyboards/handwired/aim65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json index c5ff09f8316..2f98f2c7557 100644 --- a/keyboards/handwired/amigopunk/info.json +++ b/keyboards/handwired/amigopunk/info.json @@ -8,6 +8,8 @@ "pid": "0x1805", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/amigopunk/rules.mk b/keyboards/handwired/amigopunk/rules.mk index be512530656..395f25f859e 100644 --- a/keyboards/handwired/amigopunk/rules.mk +++ b/keyboards/handwired/amigopunk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json index 8e932c9a476..004d30d93a8 100644 --- a/keyboards/handwired/angel/info.json +++ b/keyboards/handwired/angel/info.json @@ -8,6 +8,8 @@ "pid": "0x0805", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.25}, {"x":5.75, "y":3, "w":1.5}, {"x":7.25, "y":3, "w":1.25}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}] diff --git a/keyboards/handwired/angel/rules.mk b/keyboards/handwired/angel/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/handwired/angel/rules.mk +++ b/keyboards/handwired/angel/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json index d1a6a32c262..dc1dd86e630 100644 --- a/keyboards/handwired/aplx2/info.json +++ b/keyboards/handwired/aplx2/info.json @@ -8,6 +8,8 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/aplx2/rules.mk b/keyboards/handwired/aplx2/rules.mk index ae1cce7c8d8..3e66b069b36 100644 --- a/keyboards/handwired/aplx2/rules.mk +++ b/keyboards/handwired/aplx2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json index 8480cc92738..dd48558b140 100644 --- a/keyboards/handwired/aranck/info.json +++ b/keyboards/handwired/aranck/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/handwired/aranck/rules.mk b/keyboards/handwired/aranck/rules.mk index 88af9291552..63666f07d75 100644 --- a/keyboards/handwired/aranck/rules.mk +++ b/keyboards/handwired/aranck/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index d4c31377356..9adac5b74d5 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/info.json @@ -8,6 +8,8 @@ "pid": "0x4096", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/arrow_pad/rules.mk b/keyboards/handwired/arrow_pad/rules.mk index a58b7669ffb..df4dea661be 100644 --- a/keyboards/handwired/arrow_pad/rules.mk +++ b/keyboards/handwired/arrow_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json index 640c6331574..2ef04b31f4e 100644 --- a/keyboards/handwired/atreus50/info.json +++ b/keyboards/handwired/atreus50/info.json @@ -8,6 +8,8 @@ "pid": "0x040D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/atreus50/rules.mk b/keyboards/handwired/atreus50/rules.mk index 4b2ea2d5815..d9e13747733 100644 --- a/keyboards/handwired/atreus50/rules.mk +++ b/keyboards/handwired/atreus50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/info.json index e74f63e74fa..0bf0deaaf3e 100644 --- a/keyboards/handwired/axon/info.json +++ b/keyboards/handwired/axon/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/handwired/axon/rules.mk b/keyboards/handwired/axon/rules.mk index d1dde8af62f..ab2c49da70e 100644 --- a/keyboards/handwired/axon/rules.mk +++ b/keyboards/handwired/axon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json index b2278a79acc..ec5fc02da46 100644 --- a/keyboards/handwired/battleship_gamepad/info.json +++ b/keyboards/handwired/battleship_gamepad/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk index a7a44c3988a..7422e738735 100644 --- a/keyboards/handwired/battleship_gamepad/rules.mk +++ b/keyboards/handwired/battleship_gamepad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - SRC += analog.c # Build Options diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index 8d3bdf9d982..3d37d12d756 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -8,6 +8,8 @@ "pid": "0x1134", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk index a3082cf3642..c9d3996b93e 100644 --- a/keyboards/handwired/bdn9_ble/rules.mk +++ b/keyboards/handwired/bdn9_ble/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json index 26aab3813aa..2f09b8820c4 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xDAD3", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk index 83fe2fb0877..6a4a0677378 100644 --- a/keyboards/handwired/bento/rev1/rules.mk +++ b/keyboards/handwired/bento/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json index d8ee9837f28..853bd946ad1 100644 --- a/keyboards/handwired/bigmac/info.json +++ b/keyboards/handwired/bigmac/info.json @@ -8,6 +8,8 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bigmac/rules.mk b/keyboards/handwired/bigmac/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/handwired/bigmac/rules.mk +++ b/keyboards/handwired/bigmac/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json index dcbfdb236e6..410ed8b9338 100644 --- a/keyboards/handwired/bolek/info.json +++ b/keyboards/handwired/bolek/info.json @@ -8,6 +8,8 @@ "pid": "0x3708", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bolek/rules.mk b/keyboards/handwired/bolek/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/handwired/bolek/rules.mk +++ b/keyboards/handwired/bolek/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json index aebc2cf2941..697cfac2262 100644 --- a/keyboards/handwired/boss566y/redragon_vara/info.json +++ b/keyboards/handwired/boss566y/redragon_vara/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "community_layouts": ["fullsize_ansi"], "layouts": { "LAYOUT_fullsize_ansi": { diff --git a/keyboards/handwired/boss566y/redragon_vara/rules.mk b/keyboards/handwired/boss566y/redragon_vara/rules.mk index 13dc9d43500..42dce570241 100644 --- a/keyboards/handwired/boss566y/redragon_vara/rules.mk +++ b/keyboards/handwired/boss566y/redragon_vara/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index 89af8116547..7b9260f2d2f 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk index d42aa827066..df7d719da16 100644 --- a/keyboards/handwired/brain/rules.mk +++ b/keyboards/handwired/brain/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json index 05d1ad212f8..093fde872cb 100644 --- a/keyboards/handwired/bstk100/info.json +++ b/keyboards/handwired/bstk100/info.json @@ -8,6 +8,8 @@ "pid": "0xB100", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bstk100/rules.mk b/keyboards/handwired/bstk100/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/bstk100/rules.mk +++ b/keyboards/handwired/bstk100/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/cans12er/info.json b/keyboards/handwired/cans12er/info.json index 28d6d2c83ef..37dd4242996 100644 --- a/keyboards/handwired/cans12er/info.json +++ b/keyboards/handwired/cans12er/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x4": { "layout": [ diff --git a/keyboards/handwired/cans12er/rules.mk b/keyboards/handwired/cans12er/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/handwired/cans12er/rules.mk +++ b/keyboards/handwired/cans12er/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json index 5648033aca4..482af57cc1a 100644 --- a/keyboards/handwired/carpolly/info.json +++ b/keyboards/handwired/carpolly/info.json @@ -8,6 +8,8 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/carpolly/rules.mk b/keyboards/handwired/carpolly/rules.mk index 0cc90c11607..c71e41438f5 100644 --- a/keyboards/handwired/carpolly/rules.mk +++ b/keyboards/handwired/carpolly/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index 92f650c6f85..6ed4f8d9d0e 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk index 5a329467ec6..9ca8ab3ebc9 100644 --- a/keyboards/handwired/chiron/rules.mk +++ b/keyboards/handwired/chiron/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json index ff165e75f72..17541e918f3 100644 --- a/keyboards/handwired/ck4x4/info.json +++ b/keyboards/handwired/ck4x4/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk index b234297ed36..9a1946bb60f 100644 --- a/keyboards/handwired/ck4x4/rules.mk +++ b/keyboards/handwired/ck4x4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/cmd60/info.json b/keyboards/handwired/cmd60/info.json index 077fdbce674..635bead9001 100644 --- a/keyboards/handwired/cmd60/info.json +++ b/keyboards/handwired/cmd60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/cmd60/rules.mk b/keyboards/handwired/cmd60/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/handwired/cmd60/rules.mk +++ b/keyboards/handwired/cmd60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/info.json index 0b24f1e8052..d48f322f872 100644 --- a/keyboards/handwired/co60/rev1/info.json +++ b/keyboards/handwired/co60/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "CO60 rev 1", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/co60/rev1/rules.mk b/keyboards/handwired/co60/rev1/rules.mk index 42f8d2f2229..3d0b53a5dd4 100644 --- a/keyboards/handwired/co60/rev1/rules.mk +++ b/keyboards/handwired/co60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/info.json index f24eaa40e2b..48bc08982bb 100644 --- a/keyboards/handwired/co60/rev6/info.json +++ b/keyboards/handwired/co60/rev6/info.json @@ -2,5 +2,8 @@ "keyboard_name": "CO60 rev 6", "usb": { "device_version": "6.0.0" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk index ed188b0674b..ca3fc91ea5a 100644 --- a/keyboards/handwired/co60/rev6/rules.mk +++ b/keyboards/handwired/co60/rev6/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json index 8befb8663c6..1c2c38f0fe9 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/info.json @@ -2,5 +2,8 @@ "keyboard_name": "CO60 rev 7", "usb": { "device_version": "7.0.0" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk index 18a4dfdaa0d..4bd09df6a4c 100644 --- a/keyboards/handwired/co60/rev7/rules.mk +++ b/keyboards/handwired/co60/rev7/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Use SPI for RGB underglow: WS2812_DRIVER = spi diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index e0ad137ce18..9a884c67183 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -8,6 +8,8 @@ "pid": "0x0302", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk index f58ee60751b..972181a4b4f 100644 --- a/keyboards/handwired/colorlice/rules.mk +++ b/keyboards/handwired/colorlice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json index d826f460319..39db7106735 100644 --- a/keyboards/handwired/concertina/64key/info.json +++ b/keyboards/handwired/concertina/64key/info.json @@ -8,6 +8,8 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_64key": { "layout": [ diff --git a/keyboards/handwired/concertina/64key/rules.mk b/keyboards/handwired/concertina/64key/rules.mk index 1152adcc951..ab2c49da70e 100644 --- a/keyboards/handwired/concertina/64key/rules.mk +++ b/keyboards/handwired/concertina/64key/rules.mk @@ -1,10 +1,3 @@ -# Written for a Pro Micro. The keyboard case is compatible with much else. -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json index 8ab498b4e3e..9fb64bcf210 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/info.json @@ -8,6 +8,8 @@ "pid": "0x3332", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/consolekeyboard/18key/rules.mk b/keyboards/handwired/consolekeyboard/18key/rules.mk index 77d7e04c72f..d4b9c78d5e7 100644 --- a/keyboards/handwired/consolekeyboard/18key/rules.mk +++ b/keyboards/handwired/consolekeyboard/18key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json index 6ac860de2a1..085815f58a7 100644 --- a/keyboards/handwired/consolekeyboard/20key/info.json +++ b/keyboards/handwired/consolekeyboard/20key/info.json @@ -8,6 +8,8 @@ "pid": "0x3432", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/consolekeyboard/20key/rules.mk b/keyboards/handwired/consolekeyboard/20key/rules.mk index 77d7e04c72f..d4b9c78d5e7 100644 --- a/keyboards/handwired/consolekeyboard/20key/rules.mk +++ b/keyboards/handwired/consolekeyboard/20key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json index 48c0ef5cff1..37124c01960 100644 --- a/keyboards/handwired/consolekeyboard/27key/info.json +++ b/keyboards/handwired/consolekeyboard/27key/info.json @@ -8,6 +8,8 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/consolekeyboard/27key/rules.mk b/keyboards/handwired/consolekeyboard/27key/rules.mk index 77d7e04c72f..d4b9c78d5e7 100644 --- a/keyboards/handwired/consolekeyboard/27key/rules.mk +++ b/keyboards/handwired/consolekeyboard/27key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json index 604093b1432..e8f51b2c79a 100644 --- a/keyboards/handwired/consolekeyboard/30key/info.json +++ b/keyboards/handwired/consolekeyboard/30key/info.json @@ -8,6 +8,8 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/consolekeyboard/30key/rules.mk b/keyboards/handwired/consolekeyboard/30key/rules.mk index 77d7e04c72f..d4b9c78d5e7 100644 --- a/keyboards/handwired/consolekeyboard/30key/rules.mk +++ b/keyboards/handwired/consolekeyboard/30key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json index 032da273d20..7e5eaca944b 100644 --- a/keyboards/handwired/croxsplit44/info.json +++ b/keyboards/handwired/croxsplit44/info.json @@ -8,6 +8,8 @@ "pid": "0x6146", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/croxsplit44/rules.mk b/keyboards/handwired/croxsplit44/rules.mk index 87f77b103ae..951dd07d6e0 100644 --- a/keyboards/handwired/croxsplit44/rules.mk +++ b/keyboards/handwired/croxsplit44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json index 738056625c5..6e796c4d8c2 100644 --- a/keyboards/handwired/curiosity/info.json +++ b/keyboards/handwired/curiosity/info.json @@ -8,6 +8,8 @@ "pid": "0x4355", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_small_mods": { "layout": [ diff --git a/keyboards/handwired/curiosity/rules.mk b/keyboards/handwired/curiosity/rules.mk index b7593aec9c3..40f895a51bc 100644 --- a/keyboards/handwired/curiosity/rules.mk +++ b/keyboards/handwired/curiosity/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index c680e6b4181..e14b964e212 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -8,6 +8,8 @@ "pid": "0x432A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1, "w":1.5}, {"x":16.5, "y":1}, {"x":17.5, "y":1}, {"x":18.5, "y":1}, {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3, "w":1.75}, {"x":15.25, "y":3}, {"x":17.5, "y":3}, {"x":3.25, "y":4}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":12.25, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}, {"x":18.5, "y":4}] diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk index a53d7daeb0f..f430af42f41 100644 --- a/keyboards/handwired/cyberstar/rules.mk +++ b/keyboards/handwired/cyberstar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index 3329c4c599a..9da51d59593 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk index c9fc60c1305..411362b652f 100644 --- a/keyboards/handwired/d48/rules.mk +++ b/keyboards/handwired/d48/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json index 8dc13cc17f5..3883c165ee6 100644 --- a/keyboards/handwired/dactyl/info.json +++ b/keyboards/handwired/dactyl/info.json @@ -8,6 +8,8 @@ "pid": "0x1308", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "debounce": 15, "layouts": { "LAYOUT_dactyl": { diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk index fdc8b2e5efa..830812f79ad 100644 --- a/keyboards/handwired/dactyl/rules.mk +++ b/keyboards/handwired/dactyl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json index e8ab5e04c6e..122b5ddf25a 100644 --- a/keyboards/handwired/dactyl_left/info.json +++ b/keyboards/handwired/dactyl_left/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, {"x":6, "y":4.75}, {"x":7, "y":4.75}, {"x":5, "y":5.75, "h":2}, {"x":6, "y":5.75, "h":2}, {"x":7, "y":5.75}, {"x":7, "y":6.75}] diff --git a/keyboards/handwired/dactyl_left/rules.mk b/keyboards/handwired/dactyl_left/rules.mk index ad5f5465e8e..fce764c22d4 100644 --- a/keyboards/handwired/dactyl_left/rules.mk +++ b/keyboards/handwired/dactyl_left/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index 15b6dfa512a..3427f835272 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -8,6 +8,8 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk index 312805a2550..275ece3219e 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk +++ b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json index 7dfe18c06e8..98df75cfdf3 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/info.json @@ -8,6 +8,8 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json index 18f7d0cd3de..5b5b3747bbf 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json @@ -8,6 +8,8 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk index 3da6aa269a1..4240679233b 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk @@ -1,12 +1,3 @@ - -# MCU for Elite-C/Pro Micro -MCU = atmega32u4 - -# BOOTLOADER for Elite-C -BOOTLOADER = atmel-dfu -# BOOTLOADER for Pro Micro -# BOOTLOADER = caterina - # Build Options BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index f2c26516eb3..b8c2136d7b0 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -8,6 +8,8 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index e62f9f5b071..fb7a77309df 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -8,6 +8,8 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index 81bf8b19e8e..d0515e02288 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json @@ -8,6 +8,8 @@ "pid": "0x3536", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_5x6": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json index efb791d63a3..9ca8136ede4 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json @@ -8,6 +8,8 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_5x6_2_5": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk index c5b46aa48e5..04b1fc01b7f 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json index 82885646ebc..c99a1cd8ffe 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json @@ -8,6 +8,8 @@ "pid": "0x3536", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_5x6_5": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk index 1a7e6a8f941..c397f50ab5c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index dc2a78f4db7..3000185d7e0 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json @@ -8,6 +8,8 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_5x6_6": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk index 1d413868d40..59ada7958fa 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index 6a0b8f21ae4..292bbcd12fe 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json @@ -8,6 +8,8 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_5x7": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk index d929a3516d7..9be91100437 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk @@ -1,13 +1,3 @@ -# Copyright 2021 Bartosz Nowak (@dumam) -# SPDX-License-Identifier: GPL-2.0-or-later - -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = tinyuf2 - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk index d47d8e75f42..e69de29bb2d 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk @@ -1,8 +0,0 @@ -# Copyright 2021 Bartosz Nowak (@dumam) -# SPDX-License-Identifier: GPL-2.0-or-later - -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json index 1ee5e566be7..aa9b1ae3d5a 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json @@ -8,6 +8,8 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_6x6_4": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json index a78fe14fcd2..76d5d2c5c44 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json @@ -8,6 +8,8 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_6x6_kinesis": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index 89548923b63..c52089f6540 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -8,6 +8,8 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_6x7": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json index c923591309d..580932c5857 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_6x6": { "layout": [ diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk index f5e44b43f33..d3768185db4 100644 --- a/keyboards/handwired/dactyl_promicro/rules.mk +++ b/keyboards/handwired/dactyl_promicro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json index 4612b3a9b18..9844abc88bb 100644 --- a/keyboards/handwired/dactyl_rah/info.json +++ b/keyboards/handwired/dactyl_rah/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_6x6": { "layout": [ diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk index 04153798278..b893863bb52 100644 --- a/keyboards/handwired/dactyl_rah/rules.mk +++ b/keyboards/handwired/dactyl_rah/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json index 96afaa6a5bf..a28c8855373 100644 --- a/keyboards/handwired/daishi/info.json +++ b/keyboards/handwired/daishi/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/daishi/rules.mk b/keyboards/handwired/daishi/rules.mk index bc5f2b1d0fd..41a36f4cca9 100644 --- a/keyboards/handwired/daishi/rules.mk +++ b/keyboards/handwired/daishi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json index 6ffd2915050..61d95aa12a6 100644 --- a/keyboards/handwired/datahand/info.json +++ b/keyboards/handwired/datahand/info.json @@ -8,6 +8,8 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk index 06bc1c50404..447e7fdc02c 100644 --- a/keyboards/handwired/datahand/rules.mk +++ b/keyboards/handwired/datahand/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json index fa8a90de2a5..114c0f2f35d 100644 --- a/keyboards/handwired/dc/mc/001/info.json +++ b/keyboards/handwired/dc/mc/001/info.json @@ -8,6 +8,8 @@ "pid": "0x4D43", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dc/mc/001/rules.mk b/keyboards/handwired/dc/mc/001/rules.mk index ce162edf456..c94a511d8be 100644 --- a/keyboards/handwired/dc/mc/001/rules.mk +++ b/keyboards/handwired/dc/mc/001/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/info.json index 697f6c77625..2b7a8cfc438 100644 --- a/keyboards/handwired/ddg_56/info.json +++ b/keyboards/handwired/ddg_56/info.json @@ -8,6 +8,9 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ddg_56/rules.mk b/keyboards/handwired/ddg_56/rules.mk index 38329b85dab..93900acf532 100644 --- a/keyboards/handwired/ddg_56/rules.mk +++ b/keyboards/handwired/ddg_56/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json index 24605b34d24..039362f5b86 100644 --- a/keyboards/handwired/dqz11n1g/info.json +++ b/keyboards/handwired/dqz11n1g/info.json @@ -8,6 +8,8 @@ "pid": "0x4451", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk index db8a809da99..23f6b89cc2a 100644 --- a/keyboards/handwired/dqz11n1g/rules.mk +++ b/keyboards/handwired/dqz11n1g/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Keyboard matrix uses shift-registers read via SPI CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index b0e77db9e3c..312a0693a99 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -8,5 +8,8 @@ "pid": "0x2201", "device_version": "0.0.1" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411", "debounce": 0 } diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index ce7a89af8e0..362a47d7da0 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json index 7a221e8224f..23730b8af65 100644 --- a/keyboards/handwired/eagleii/info.json +++ b/keyboards/handwired/eagleii/info.json @@ -8,6 +8,8 @@ "pid": "0x9789", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/eagleii/rules.mk b/keyboards/handwired/eagleii/rules.mk index 4350774cd11..694c2ccd384 100644 --- a/keyboards/handwired/eagleii/rules.mk +++ b/keyboards/handwired/eagleii/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index a176872fbff..f8f76fe6016 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json @@ -8,6 +8,8 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_3x6_5": { "layout": [ diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk index c5b46aa48e5..04b1fc01b7f 100644 --- a/keyboards/handwired/elrgo_s/rules.mk +++ b/keyboards/handwired/elrgo_s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json index 4e2853cd850..959a4299f58 100644 --- a/keyboards/handwired/ergocheap/info.json +++ b/keyboards/handwired/ergocheap/info.json @@ -8,6 +8,8 @@ "pid": "0x6942", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ergocheap/rules.mk b/keyboards/handwired/ergocheap/rules.mk index 6a7bda4aef3..2c8f1f42bf1 100644 --- a/keyboards/handwired/ergocheap/rules.mk +++ b/keyboards/handwired/ergocheap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json index 99f72565221..8ac987e2db5 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/evk/v1_3/rules.mk b/keyboards/handwired/evk/v1_3/rules.mk index ad5f5465e8e..fce764c22d4 100644 --- a/keyboards/handwired/evk/v1_3/rules.mk +++ b/keyboards/handwired/evk/v1_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json index 261692012e4..ebbd75ee7ec 100644 --- a/keyboards/handwired/fc200rt_qmk/info.json +++ b/keyboards/handwired/fc200rt_qmk/info.json @@ -8,6 +8,8 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/handwired/fc200rt_qmk/rules.mk b/keyboards/handwired/fc200rt_qmk/rules.mk index 0a8f3c27400..5356b24d77c 100644 --- a/keyboards/handwired/fc200rt_qmk/rules.mk +++ b/keyboards/handwired/fc200rt_qmk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/info.json index 51dd52faa6a..0a23ba02a28 100644 --- a/keyboards/handwired/fivethirteen/info.json +++ b/keyboards/handwired/fivethirteen/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/fivethirteen/rules.mk b/keyboards/handwired/fivethirteen/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/handwired/fivethirteen/rules.mk +++ b/keyboards/handwired/fivethirteen/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/info.json index 800086b4acd..226041e40d2 100644 --- a/keyboards/handwired/floorboard/info.json +++ b/keyboards/handwired/floorboard/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/handwired/floorboard/rules.mk b/keyboards/handwired/floorboard/rules.mk index b6de09ecc6e..fce764c22d4 100644 --- a/keyboards/handwired/floorboard/rules.mk +++ b/keyboards/handwired/floorboard/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json index 00a0d176154..f206c366a54 100644 --- a/keyboards/handwired/frankie_macropad/info.json +++ b/keyboards/handwired/frankie_macropad/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega16u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/frankie_macropad/rules.mk b/keyboards/handwired/frankie_macropad/rules.mk index 46e261ffcb2..6587f1f6983 100644 --- a/keyboards/handwired/frankie_macropad/rules.mk +++ b/keyboards/handwired/frankie_macropad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega16u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json index 48725f37acb..a179dde73fb 100644 --- a/keyboards/handwired/frenchdev/info.json +++ b/keyboards/handwired/frenchdev/info.json @@ -7,6 +7,8 @@ "pid": "0x1307", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk index 88a48968f1a..c310966f1dc 100644 --- a/keyboards/handwired/frenchdev/rules.mk +++ b/keyboards/handwired/frenchdev/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json index 5d3d3817324..c1333831893 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/info.json @@ -8,6 +8,8 @@ "pid": "0x0602", "device_version": "0.0.1" }, +"processor": "atmega32u4", +"bootloader": "caterina", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk index a214cbef1f9..ed940647bba 100644 --- a/keyboards/handwired/freoduo/rules.mk +++ b/keyboards/handwired/freoduo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json index f56992f488e..0cffe5b5b2c 100644 --- a/keyboards/handwired/fruity60/info.json +++ b/keyboards/handwired/fruity60/info.json @@ -8,6 +8,8 @@ "pid": "0xB170", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk index f6eb3f85464..61260f5e398 100644 --- a/keyboards/handwired/fruity60/rules.mk +++ b/keyboards/handwired/fruity60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json index a2d4bb3ce4d..daf77d1784f 100644 --- a/keyboards/handwired/gamenum/info.json +++ b/keyboards/handwired/gamenum/info.json @@ -8,6 +8,8 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/gamenum/rules.mk b/keyboards/handwired/gamenum/rules.mk index 63aadefc79d..b6e2a5f9a41 100644 --- a/keyboards/handwired/gamenum/rules.mk +++ b/keyboards/handwired/gamenum/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json index a0fcd930c31..e0c8c42566e 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/info.json @@ -8,6 +8,8 @@ "pid": "0x0690", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"ESC", "x":0, "y":0, "h":2}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Z", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0, "w":2}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":"(", "x":11, "y":1}, {"label":")", "x":12, "y":1}, {"label":"=", "x":0, "y":2}, {"label":"Y", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"Fn", "x":0, "y":3, "w":2}, {"label":"Num", "x":2, "y":3}, {"label":"Bksp", "x":3, "y":3}, {"label":"Enter", "x":4, "y":3}, {"label":"Spc", "x":5, "y":3}, {"label":"LShift", "x":7, "y":3}, {"label":"LCtrl", "x":8, "y":3}, {"label":"LAlt", "x":9, "y":3}, {"label":"RAlt", "x":10, "y":3}, {"label":"Meta", "x":11, "y":3}, {"label":"Fn", "x":12, "y":2, "h":2}] diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk index 2dbbeb11883..50716e356f8 100644 --- a/keyboards/handwired/hacked_motospeed/rules.mk +++ b/keyboards/handwired/hacked_motospeed/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json index 87f98b839cc..2ad37b00c6f 100644 --- a/keyboards/handwired/heisenberg/info.json +++ b/keyboards/handwired/heisenberg/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/handwired/heisenberg/rules.mk b/keyboards/handwired/heisenberg/rules.mk index 0c8df1c16b4..bf4e1231535 100644 --- a/keyboards/handwired/heisenberg/rules.mk +++ b/keyboards/handwired/heisenberg/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/info.json index d993e33a377..a0ea12aae5c 100644 --- a/keyboards/handwired/hexon38/info.json +++ b/keyboards/handwired/hexon38/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/hexon38/rules.mk b/keyboards/handwired/hexon38/rules.mk index b0921560245..fb9061cbb5a 100644 --- a/keyboards/handwired/hexon38/rules.mk +++ b/keyboards/handwired/hexon38/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 5671ad4a7ec..257fcf279cd 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk index 1b9d6c699db..ae9acc534f7 100644 --- a/keyboards/handwired/hnah108/rules.mk +++ b/keyboards/handwired/hnah108/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json index e4ca3fbb84d..d01cdbd00d8 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/hnah40/rules.mk b/keyboards/handwired/hnah40/rules.mk index cd1aba4f8e7..d4acd7ecd13 100644 --- a/keyboards/handwired/hnah40/rules.mk +++ b/keyboards/handwired/hnah40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index d00935ec26f..ab8ec811c3f 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk index 2991d294778..cab4eea9651 100644 --- a/keyboards/handwired/hnah40rgb/rules.mk +++ b/keyboards/handwired/hnah40rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index 90d8ad397cf..3560bac95fc 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk index 7f42dae592e..90f47aeb931 100644 --- a/keyboards/handwired/hwpm87/rules.mk +++ b/keyboards/handwired/hwpm87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json index 9644baeba32..aa423f0ecef 100644 --- a/keyboards/handwired/ibm122m/info.json +++ b/keyboards/handwired/ibm122m/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "debounce": 15, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/ibm122m/rules.mk b/keyboards/handwired/ibm122m/rules.mk index 317e8a5ae80..3b2469ecc8f 100644 --- a/keyboards/handwired/ibm122m/rules.mk +++ b/keyboards/handwired/ibm122m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json index 35e1e8c404a..d75336e0b63 100644 --- a/keyboards/handwired/ibm_wheelwriter/info.json +++ b/keyboards/handwired/ibm_wheelwriter/info.json @@ -8,6 +8,8 @@ "pid": "0x5F89", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ibm_wheelwriter/rules.mk b/keyboards/handwired/ibm_wheelwriter/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/handwired/ibm_wheelwriter/rules.mk +++ b/keyboards/handwired/ibm_wheelwriter/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json index d244bbbb4e6..5ea575525a8 100644 --- a/keyboards/handwired/jn68m/info.json +++ b/keyboards/handwired/jn68m/info.json @@ -8,6 +8,7 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/jn68m/rules.mk b/keyboards/handwired/jn68m/rules.mk index 5bbac480b2e..d4acd7ecd13 100644 --- a/keyboards/handwired/jn68m/rules.mk +++ b/keyboards/handwired/jn68m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json index 7da42ae0f49..f9bb248aeed 100644 --- a/keyboards/handwired/jopr/info.json +++ b/keyboards/handwired/jopr/info.json @@ -8,6 +8,8 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/jopr/rules.mk b/keyboards/handwired/jopr/rules.mk index 6157d25454f..5bb5e8e0dc0 100644 --- a/keyboards/handwired/jopr/rules.mk +++ b/keyboards/handwired/jopr/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json index 992fa8464c4..db08eef195e 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/handwired/jot50/rules.mk b/keyboards/handwired/jot50/rules.mk index 0d8d20abf9a..8135e806711 100644 --- a/keyboards/handwired/jot50/rules.mk +++ b/keyboards/handwired/jot50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json index be0d5ba87e8..57e41a0f8be 100644 --- a/keyboards/handwired/jotanck/info.json +++ b/keyboards/handwired/jotanck/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk index 998669136e6..696f3387241 100644 --- a/keyboards/handwired/jotanck/rules.mk +++ b/keyboards/handwired/jotanck/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json index c56d17e22a9..7ec8f9aa97a 100644 --- a/keyboards/handwired/jotpad16/info.json +++ b/keyboards/handwired/jotpad16/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 0, "community_layouts": ["ortho_4x4"], "layouts": { diff --git a/keyboards/handwired/jotpad16/rules.mk b/keyboards/handwired/jotpad16/rules.mk index 6daeabfb669..39356ef6f6d 100644 --- a/keyboards/handwired/jotpad16/rules.mk +++ b/keyboards/handwired/jotpad16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json index 0cc04c93dc6..5a9b9751438 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk index 898951758fc..c644dd59ee1 100644 --- a/keyboards/handwired/jtallbean/split_65/rules.mk +++ b/keyboards/handwired/jtallbean/split_65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/juliet/info.json b/keyboards/handwired/juliet/info.json index 053b662e4d3..0fc7f4726f2 100644 --- a/keyboards/handwired/juliet/info.json +++ b/keyboards/handwired/juliet/info.json @@ -8,6 +8,8 @@ "pid": "0x4069", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"1.25u", "x":0, "y":2, "w":1.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1.25u", "x":2.25, "y":3, "w":1.25}, {"label":"2.25u", "x":3.5, "y":3, "w":2.25}, {"label":"1u", "x":5.75, "y":3}, {"label":"2.75u", "x":6.75, "y":3, "w":2.75}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}] diff --git a/keyboards/handwired/juliet/rules.mk b/keyboards/handwired/juliet/rules.mk index 35dd7076453..fa6fbf34d9f 100644 --- a/keyboards/handwired/juliet/rules.mk +++ b/keyboards/handwired/juliet/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/info.json index c4da6abfb44..900871f88a8 100644 --- a/keyboards/handwired/k8split/info.json +++ b/keyboards/handwired/k8split/info.json @@ -8,6 +8,8 @@ "pid": "0xC868", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/k8split/rules.mk b/keyboards/handwired/k8split/rules.mk index 172f6cbeca6..3e66b069b36 100644 --- a/keyboards/handwired/k8split/rules.mk +++ b/keyboards/handwired/k8split/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json index 6b6b9a591a0..1ea003178b2 100644 --- a/keyboards/handwired/k_numpad17/info.json +++ b/keyboards/handwired/k_numpad17/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/handwired/k_numpad17/rules.mk b/keyboards/handwired/k_numpad17/rules.mk index 2d0eb371ba9..d0901838085 100644 --- a/keyboards/handwired/k_numpad17/rules.mk +++ b/keyboards/handwired/k_numpad17/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json index 3c62ad9f74e..398dbcd5ed4 100644 --- a/keyboards/handwired/kbod/info.json +++ b/keyboards/handwired/kbod/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/kbod/rules.mk b/keyboards/handwired/kbod/rules.mk index 8d562b0bd1b..14ece75f470 100644 --- a/keyboards/handwired/kbod/rules.mk +++ b/keyboards/handwired/kbod/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json index 600bd2252d1..5c000f5fd9a 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/info.json @@ -8,6 +8,8 @@ "pid": "0x3061", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk index c54f041bc37..12dd064c625 100644 --- a/keyboards/handwired/ks63/rules.mk +++ b/keyboards/handwired/ks63/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 9dd3891ebc2..9eb68abdf3f 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -8,6 +8,8 @@ "pid": "0x2718", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk index 574caf2395d..61bfdfa4d31 100644 --- a/keyboards/handwired/lagrange/rules.mk +++ b/keyboards/handwired/lagrange/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/info.json index 7206e92e61f..ffa7915a7dd 100644 --- a/keyboards/handwired/leftynumpad/info.json +++ b/keyboards/handwired/leftynumpad/info.json @@ -8,6 +8,8 @@ "pid": "0xBEEF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 10, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/leftynumpad/rules.mk b/keyboards/handwired/leftynumpad/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/leftynumpad/rules.mk +++ b/keyboards/handwired/leftynumpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/info.json index e2824f8fa7e..40e3296fd29 100644 --- a/keyboards/handwired/lemonpad/info.json +++ b/keyboards/handwired/lemonpad/info.json @@ -8,6 +8,8 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/lemonpad/rules.mk b/keyboards/handwired/lemonpad/rules.mk index 6174b9bd666..1b7b1b36a45 100644 --- a/keyboards/handwired/lemonpad/rules.mk +++ b/keyboards/handwired/lemonpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json index 7f8bd65fae5..13931f8f450 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/lovelive9/rules.mk b/keyboards/handwired/lovelive9/rules.mk index d835456fe5c..f99fed15e7f 100644 --- a/keyboards/handwired/lovelive9/rules.mk +++ b/keyboards/handwired/lovelive9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index 1b0d95bf2d9..3e9138af274 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_5x5": { "layout": [ diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk index d43ced4ed42..fe66abc8493 100644 --- a/keyboards/handwired/m40/5x5_macropad/rules.mk +++ b/keyboards/handwired/m40/5x5_macropad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json new file mode 100644 index 00000000000..acd7e83f77d --- /dev/null +++ b/keyboards/handwired/macroboard/f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk index 3ce53701da5..65dc4b89cde 100644 --- a/keyboards/handwired/macroboard/f401/rules.mk +++ b/keyboards/handwired/macroboard/f401/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/handwired/macroboard/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk index 0a580be07a1..2c7c409197f 100644 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ b/keyboards/handwired/macroboard/f411/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/info.json index 2a69b22e2fb..9652a35ba50 100644 --- a/keyboards/handwired/magicforce61/info.json +++ b/keyboards/handwired/magicforce61/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/magicforce61/rules.mk b/keyboards/handwired/magicforce61/rules.mk index b521ebe7dd6..b6e2a5f9a41 100644 --- a/keyboards/handwired/magicforce61/rules.mk +++ b/keyboards/handwired/magicforce61/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json index 82f329e29df..c1df42eed83 100644 --- a/keyboards/handwired/magicforce68/info.json +++ b/keyboards/handwired/magicforce68/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/magicforce68/rules.mk b/keyboards/handwired/magicforce68/rules.mk index 63aadefc79d..b6e2a5f9a41 100644 --- a/keyboards/handwired/magicforce68/rules.mk +++ b/keyboards/handwired/magicforce68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json index 8c0e23fafbe..16fdc30e260 100644 --- a/keyboards/handwired/marauder/info.json +++ b/keyboards/handwired/marauder/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/marauder/rules.mk b/keyboards/handwired/marauder/rules.mk index 8fa2de12bac..a14973e3ef4 100644 --- a/keyboards/handwired/marauder/rules.mk +++ b/keyboards/handwired/marauder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json index aefc0b89c0d..e5e848fd711 100644 --- a/keyboards/handwired/mechboards_micropad/info.json +++ b/keyboards/handwired/mechboards_micropad/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"4", "x":3, "y":0}] diff --git a/keyboards/handwired/mechboards_micropad/rules.mk b/keyboards/handwired/mechboards_micropad/rules.mk index 339bf624d03..d4acd7ecd13 100644 --- a/keyboards/handwired/mechboards_micropad/rules.mk +++ b/keyboards/handwired/mechboards_micropad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json new file mode 100644 index 00000000000..acd7e83f77d --- /dev/null +++ b/keyboards/handwired/meck_tkl/blackpill_f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk index d2eae19dfb9..b5f27c93eab 100644 --- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk +++ b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json index 34b2539a114..b91e59ca67e 100644 --- a/keyboards/handwired/minorca/info.json +++ b/keyboards/handwired/minorca/info.json @@ -8,6 +8,8 @@ "pid": "0x6660", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/minorca/rules.mk b/keyboards/handwired/minorca/rules.mk index ec925a763ef..283a46b6ae1 100644 --- a/keyboards/handwired/minorca/rules.mk +++ b/keyboards/handwired/minorca/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json index 20d74d8e3c7..94fb2130254 100644 --- a/keyboards/handwired/misterdeck/info.json +++ b/keyboards/handwired/misterdeck/info.json @@ -8,6 +8,8 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "diode_direction": "ROW2COL", "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk index 7479d0121f4..20825c8cfa6 100644 --- a/keyboards/handwired/misterdeck/rules.mk +++ b/keyboards/handwired/misterdeck/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/info.json index bbdfe24cf35..6f6786e9ada 100644 --- a/keyboards/handwired/ms_sculpt_mobile/astar/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/astar/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "sculpt mobile astar" + "keyboard_name": "sculpt mobile astar", + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk +++ b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json index e94752a82d8..08fc09e4b10 100644 --- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "sculpt mobile teensypp" + "keyboard_name": "sculpt mobile teensypp", + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk index 149471682df..e69de29bb2d 100644 --- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk +++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json index 1ae80088eb6..408ecffc51e 100644 --- a/keyboards/handwired/mutepad/info.json +++ b/keyboards/handwired/mutepad/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/mutepad/rules.mk b/keyboards/handwired/mutepad/rules.mk index 1a63bd74b10..131aa72aeb5 100644 --- a/keyboards/handwired/mutepad/rules.mk +++ b/keyboards/handwired/mutepad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json index 4d756d63592..9fe850cd092 100644 --- a/keyboards/handwired/myskeeb/info.json +++ b/keyboards/handwired/myskeeb/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk index d694be736f1..a67d345674e 100644 --- a/keyboards/handwired/myskeeb/rules.mk +++ b/keyboards/handwired/myskeeb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/nicekey/info.json b/keyboards/handwired/nicekey/info.json index 3f965bf1b26..24872ad800d 100644 --- a/keyboards/handwired/nicekey/info.json +++ b/keyboards/handwired/nicekey/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/nicekey/rules.mk b/keyboards/handwired/nicekey/rules.mk index e311fac590a..59c896dbff6 100644 --- a/keyboards/handwired/nicekey/rules.mk +++ b/keyboards/handwired/nicekey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json index 5d8f7ff9609..73eca15ca58 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk index 8f9772df22e..8ea05b5f74a 100644 --- a/keyboards/handwired/not_so_minidox/rules.mk +++ b/keyboards/handwired/not_so_minidox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/info.json index e1699e99e27..656863da644 100644 --- a/keyboards/handwired/novem/info.json +++ b/keyboards/handwired/novem/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/novem/rules.mk b/keyboards/handwired/novem/rules.mk index ba0ee2cb43d..ca9d24172d0 100644 --- a/keyboards/handwired/novem/rules.mk +++ b/keyboards/handwired/novem/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json index 57a4751bdb0..27b088958b6 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/nozbe_macro/rules.mk b/keyboards/handwired/nozbe_macro/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/handwired/nozbe_macro/rules.mk +++ b/keyboards/handwired/nozbe_macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json index b6b277503ad..adc0abec123 100644 --- a/keyboards/handwired/numpad20/info.json +++ b/keyboards/handwired/numpad20/info.json @@ -8,6 +8,8 @@ "pid": "0x0504", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/numpad20/rules.mk b/keyboards/handwired/numpad20/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/handwired/numpad20/rules.mk +++ b/keyboards/handwired/numpad20/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json index 124f74fd3c5..ed635d02089 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/info.json +++ b/keyboards/handwired/obuwunkunubi/spaget/info.json @@ -8,6 +8,8 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/obuwunkunubi/spaget/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/rules.mk index 9a469b22ecb..bf275d4f6f2 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/rules.mk +++ b/keyboards/handwired/obuwunkunubi/spaget/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/info.json index f374dfcd522..57a3a74df99 100644 --- a/keyboards/handwired/oem_ansi_fullsize/info.json +++ b/keyboards/handwired/oem_ansi_fullsize/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "community_layouts": ["fullsize_ansi"], "layouts": { "LAYOUT_fullsize_ansi": { diff --git a/keyboards/handwired/oem_ansi_fullsize/rules.mk b/keyboards/handwired/oem_ansi_fullsize/rules.mk index f9559494d6e..6fe874e748b 100644 --- a/keyboards/handwired/oem_ansi_fullsize/rules.mk +++ b/keyboards/handwired/oem_ansi_fullsize/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json index a3736dc768a..b1c5c509691 100644 --- a/keyboards/handwired/oem_iso_fullsize/info.json +++ b/keyboards/handwired/oem_iso_fullsize/info.json @@ -8,6 +8,8 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/oem_iso_fullsize/rules.mk b/keyboards/handwired/oem_iso_fullsize/rules.mk index 29f63631625..ac49f53a205 100644 --- a/keyboards/handwired/oem_iso_fullsize/rules.mk +++ b/keyboards/handwired/oem_iso_fullsize/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json index 0fe0530e337..6057d1e0929 100644 --- a/keyboards/handwired/ortho5x13/info.json +++ b/keyboards/handwired/ortho5x13/info.json @@ -8,6 +8,8 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ortho5x13/rules.mk b/keyboards/handwired/ortho5x13/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/handwired/ortho5x13/rules.mk +++ b/keyboards/handwired/ortho5x13/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json index 3702a2ff389..8e657b7675f 100644 --- a/keyboards/handwired/ortho5x14/info.json +++ b/keyboards/handwired/ortho5x14/info.json @@ -8,6 +8,8 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/ortho5x14/rules.mk b/keyboards/handwired/ortho5x14/rules.mk index aae71d46026..c8758ba64c3 100644 --- a/keyboards/handwired/ortho5x14/rules.mk +++ b/keyboards/handwired/ortho5x14/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json index 25c4dbe697e..c931dc327f0 100644 --- a/keyboards/handwired/ortho_brass/info.json +++ b/keyboards/handwired/ortho_brass/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk index 7d1c9c83530..36acc6fd924 100644 --- a/keyboards/handwired/ortho_brass/rules.mk +++ b/keyboards/handwired/ortho_brass/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index a20537b1972..6b84c37e9be 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -8,6 +8,8 @@ "pid": "0xDA19", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 9, "community_layouts": ["alice", "alice_split_bs"], "layouts": { diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk index eb0aba45274..dd125034f29 100644 --- a/keyboards/handwired/owlet60/rules.mk +++ b/keyboards/handwired/owlet60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index 5daf9d1c993..1b8e87a2c83 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x75B4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk index be2f090b134..b5bcf508c4a 100644 --- a/keyboards/handwired/p65rgb/rules.mk +++ b/keyboards/handwired/p65rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json index ee3a0e733d4..2c05b74a36b 100644 --- a/keyboards/handwired/pilcrow/info.json +++ b/keyboards/handwired/pilcrow/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/pilcrow/rules.mk b/keyboards/handwired/pilcrow/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/handwired/pilcrow/rules.mk +++ b/keyboards/handwired/pilcrow/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json new file mode 100644 index 00000000000..acd7e83f77d --- /dev/null +++ b/keyboards/handwired/pill60/blackpill_f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk index 8d72b0e4463..3d2bfceea99 100644 --- a/keyboards/handwired/pill60/blackpill_f401/rules.mk +++ b/keyboards/handwired/pill60/blackpill_f401/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/handwired/pill60/blackpill_f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk index 13a6cb5286b..b5f27c93eab 100644 --- a/keyboards/handwired/pill60/blackpill_f411/rules.mk +++ b/keyboards/handwired/pill60/blackpill_f411/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/info.json new file mode 100644 index 00000000000..cf993be2471 --- /dev/null +++ b/keyboards/handwired/pill60/bluepill/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F103", + "bootloader": "stm32duino" +} diff --git a/keyboards/handwired/pill60/bluepill/rules.mk b/keyboards/handwired/pill60/bluepill/rules.mk index 019b1130d99..a92b0993283 100644 --- a/keyboards/handwired/pill60/bluepill/rules.mk +++ b/keyboards/handwired/pill60/bluepill/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/info.json index e557e4d3076..65be217368d 100644 --- a/keyboards/handwired/postageboard/mini/info.json +++ b/keyboards/handwired/postageboard/mini/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/handwired/postageboard/mini/rules.mk +++ b/keyboards/handwired/postageboard/mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/info.json index 90ac25f360b..dab37baf045 100644 --- a/keyboards/handwired/postageboard/r1/info.json +++ b/keyboards/handwired/postageboard/r1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/handwired/postageboard/r1/rules.mk +++ b/keyboards/handwired/postageboard/r1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index 9c40e5e69e6..d8949ec3891 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -8,6 +8,8 @@ "pid": "0x6578", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.25,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}] diff --git a/keyboards/handwired/prime_exl/rules.mk b/keyboards/handwired/prime_exl/rules.mk index e9ceebba3b5..9ce191fd81e 100644 --- a/keyboards/handwired/prime_exl/rules.mk +++ b/keyboards/handwired/prime_exl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json index 1ae1b33152d..d15982860f7 100644 --- a/keyboards/handwired/prime_exl_plus/info.json +++ b/keyboards/handwired/prime_exl_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x6579", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"K040", "x":0, "y":0}, {"label":"K050", "x":1, "y":0}, {"label":"K041", "x":2, "y":0}, {"label":"K051", "x":3, "y":0}, {"label":"K042", "x":4, "y":0}, {"label":"K052", "x":5, "y":0}, {"label":"K043", "x":6.5, "y":0}, {"label":"K053", "x":7.5, "y":0}, {"label":"K044", "x":8.5, "y":0}, {"label":"K054", "x":9.5, "y":0}, {"label":"K045", "x":10.5, "y":0}, {"label":"K055", "x":11.5, "y":0}, {"label":"K046", "x":14, "y":0}, {"label":"K056", "x":15, "y":0}, {"label":"K047", "x":16, "y":0}, {"label":"K057", "x":17, "y":0}, {"label":"K048", "x":18, "y":0}, {"label":"K058", "x":19, "y":0, "w":2}, {"label":"K030", "x":0, "y":1}, {"label":"K060", "x":1, "y":1}, {"label":"K031", "x":2, "y":1}, {"label":"K061", "x":3, "y":1}, {"label":"K032", "x":4, "y":1}, {"label":"K062", "x":5, "y":1}, {"label":"K033", "x":6.5, "y":1}, {"label":"K063", "x":7.5, "y":1}, {"label":"K034", "x":8.5, "y":1}, {"label":"K064", "x":9.5, "y":1}, {"label":"K035", "x":10.5, "y":1}, {"label":"K065", "x":11.5, "y":1}, {"label":"K036", "x":14, "y":1}, {"label":"K066", "x":15, "y":1}, {"label":"K037", "x":16, "y":1}, {"label":"K067", "x":17, "y":1}, {"label":"K038", "x":18, "y":1}, {"label":"K068", "x":19, "y":1}, {"label":"K039", "x":20, "y":1}, {"label":"K020", "x":0, "y":2}, {"label":"K070", "x":1, "y":2}, {"label":"K021", "x":2, "y":2}, {"label":"K071", "x":3, "y":2}, {"label":"K022", "x":4, "y":2}, {"label":"K072", "x":5, "y":2}, {"label":"K023", "x":6.5, "y":2, "w":1.25}, {"label":"K073", "x":7.75, "y":2}, {"label":"K024", "x":8.75, "y":2}, {"label":"K074", "x":9.75, "y":2}, {"label":"K025", "x":10.75, "y":2}, {"label":"K075", "x":11.75, "y":2}, {"label":"K026", "x":14.25, "y":2}, {"label":"K076", "x":15.25, "y":2}, {"label":"K027", "x":16.25, "y":2}, {"label":"K077", "x":17.25, "y":2}, {"label":"K028", "x":18.25, "y":2}, {"label":"K029", "x":19.25, "y":2, "w":1.75}, {"label":"K010", "x":0, "y":3}, {"label":"K080", "x":1, "y":3}, {"label":"K011", "x":2, "y":3}, {"label":"K081", "x":3, "y":3}, {"label":"K012", "x":4, "y":3}, {"label":"K082", "x":5, "y":3}, {"label":"K013", "x":6.5, "y":3, "w":1.75}, {"label":"K083", "x":8.25, "y":3}, {"label":"K014", "x":9.25, "y":3}, {"label":"K084", "x":10.25, "y":3}, {"label":"K015", "x":11.25, "y":3}, {"label":"K085", "x":12.25, "y":3}, {"label":"K016", "x":13.75, "y":3}, {"label":"K086", "x":14.75, "y":3}, {"label":"K017", "x":15.75, "y":3}, {"label":"K087", "x":16.75, "y":3}, {"label":"K018", "x":17.75, "y":3}, {"label":"K088", "x":18.75, "y":3}, {"label":"K019", "x":19.75, "y":3, "w":1.25}, {"label":"K000", "x":0, "y":4}, {"label":"K090", "x":1, "y":4}, {"label":"K001", "x":2, "y":4}, {"label":"K091", "x":3, "y":4}, {"label":"K002", "x":4, "y":4}, {"label":"K092", "x":5, "y":4}, {"label":"K003", "x":6.5, "y":4, "w":1.25}, {"label":"K093", "x":7.75, "y":4, "w":1.25}, {"label":"K004", "x":10.25, "y":4, "w":1.25}, {"label":"K095", "x":11.5, "y":4, "w":1.75}, {"label":"K006", "x":13.75, "y":4, "w":1.75}, {"label":"K097", "x":15.5, "y":4, "w":1.25}, {"label":"K098", "x":18.5, "y":4, "w":1.25}, {"label":"K009", "x":19.75, "y":4, "w":1.25}] diff --git a/keyboards/handwired/prime_exl_plus/rules.mk b/keyboards/handwired/prime_exl_plus/rules.mk index 61ec6a921a4..18684e62d3e 100644 --- a/keyboards/handwired/prime_exl_plus/rules.mk +++ b/keyboards/handwired/prime_exl_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk index 7578dcef743..6b109855a57 100644 --- a/keyboards/handwired/prkl30/feather/rules.mk +++ b/keyboards/handwired/prkl30/feather/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/prkl30/info.json b/keyboards/handwired/prkl30/info.json index b122fe3328d..3ba3e52511d 100644 --- a/keyboards/handwired/prkl30/info.json +++ b/keyboards/handwired/prkl30/info.json @@ -8,6 +8,8 @@ "pid": "0x0030", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12.25, "y":1, "w":1.25, "h":2}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2, "w":1.25}] diff --git a/keyboards/handwired/prkl30/promicro/rules.mk b/keyboards/handwired/prkl30/promicro/rules.mk index 82dfbafa4e6..a4e07e76d82 100644 --- a/keyboards/handwired/prkl30/promicro/rules.mk +++ b/keyboards/handwired/prkl30/promicro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json index 618b680ff1f..cd5928f4d4c 100644 --- a/keyboards/handwired/promethium/info.json +++ b/keyboards/handwired/promethium/info.json @@ -8,6 +8,8 @@ "pid": "0x6048", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk index 3960980dffa..038266add83 100644 --- a/keyboards/handwired/promethium/rules.mk +++ b/keyboards/handwired/promethium/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json index a98628d4153..ac0c498da70 100644 --- a/keyboards/handwired/pterodactyl/info.json +++ b/keyboards/handwired/pterodactyl/info.json @@ -8,6 +8,8 @@ "pid": "0x1308", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 0, "layouts": { "LAYOUT_pterodactyl": { diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk index fd63e2ad48d..eb2487d4103 100644 --- a/keyboards/handwired/pterodactyl/rules.mk +++ b/keyboards/handwired/pterodactyl/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/info.json index f23728f92e0..b21d12c9f98 100644 --- a/keyboards/handwired/pteron/info.json +++ b/keyboards/handwired/pteron/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/pteron/rules.mk b/keyboards/handwired/pteron/rules.mk index 9f51ea20cfc..a77b52c38bd 100644 --- a/keyboards/handwired/pteron/rules.mk +++ b/keyboards/handwired/pteron/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json index 2051d86e0bd..a2ea58d57aa 100644 --- a/keyboards/handwired/pteron38/info.json +++ b/keyboards/handwired/pteron38/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_3x5_4": { "layout": [ diff --git a/keyboards/handwired/pteron38/rules.mk b/keyboards/handwired/pteron38/rules.mk index 172f6cbeca6..3e66b069b36 100644 --- a/keyboards/handwired/pteron38/rules.mk +++ b/keyboards/handwired/pteron38/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json index 53b123dbe04..23b4ac785a3 100644 --- a/keyboards/handwired/pteron44/info.json +++ b/keyboards/handwired/pteron44/info.json @@ -8,6 +8,8 @@ "pid": "0x542C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/pteron44/rules.mk b/keyboards/handwired/pteron44/rules.mk index 172f6cbeca6..3e66b069b36 100644 --- a/keyboards/handwired/pteron44/rules.mk +++ b/keyboards/handwired/pteron44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json index f3ccde01dbe..c571e4b1772 100644 --- a/keyboards/handwired/qc60/info.json +++ b/keyboards/handwired/qc60/info.json @@ -8,6 +8,8 @@ "pid": "0x0C60", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/qc60/rules.mk b/keyboards/handwired/qc60/rules.mk index 524a0678cd2..9af766b35c3 100644 --- a/keyboards/handwired/qc60/rules.mk +++ b/keyboards/handwired/qc60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json index beb03c6a0ee..a04b54cf952 100644 --- a/keyboards/handwired/retro_refit/info.json +++ b/keyboards/handwired/retro_refit/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/retro_refit/rules.mk b/keyboards/handwired/retro_refit/rules.mk index 4d1b278f530..eb35f5c4d2a 100644 --- a/keyboards/handwired/retro_refit/rules.mk +++ b/keyboards/handwired/retro_refit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 689e354c8d9..ec9c7631aff 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -8,6 +8,9 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk index 40aa7dc9972..6f9a638f4b0 100644 --- a/keyboards/handwired/riblee_f401/rules.mk +++ b/keyboards/handwired/riblee_f401/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json index 179d14ea501..4941f567520 100644 --- a/keyboards/handwired/riblee_f411/info.json +++ b/keyboards/handwired/riblee_f411/info.json @@ -8,6 +8,9 @@ "pid": "0x002B", "device_version": "0.0.1" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk index bc3d198eac7..4741169e4db 100644 --- a/keyboards/handwired/riblee_f411/rules.mk +++ b/keyboards/handwired/riblee_f411/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json index 8bc5a07f22d..c96c1da1a30 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/info.json @@ -8,6 +8,8 @@ "pid": "0x4260", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk index 2c9be13fb9e..c827f15dcf8 100644 --- a/keyboards/handwired/rs60/rules.mk +++ b/keyboards/handwired/rs60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json index eb515eb11e8..c798895e866 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/selene/rules.mk b/keyboards/handwired/selene/rules.mk index 3fa2ca01eeb..648f79b599c 100644 --- a/keyboards/handwired/selene/rules.mk +++ b/keyboards/handwired/selene/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/sick68/info.json b/keyboards/handwired/sick68/info.json index 19203417ee6..eb998970233 100644 --- a/keyboards/handwired/sick68/info.json +++ b/keyboards/handwired/sick68/info.json @@ -8,6 +8,8 @@ "pid": "0x5F00", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/handwired/sick68/rules.mk b/keyboards/handwired/sick68/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/handwired/sick68/rules.mk +++ b/keyboards/handwired/sick68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/info.json index fd0a65a3dae..2a5f85ad68a 100644 --- a/keyboards/handwired/sick_pad/info.json +++ b/keyboards/handwired/sick_pad/info.json @@ -8,6 +8,9 @@ "pid": "0xDA20", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/handwired/sick_pad/rules.mk b/keyboards/handwired/sick_pad/rules.mk index 329e31e4e36..61bbba1c9e5 100644 --- a/keyboards/handwired/sick_pad/rules.mk +++ b/keyboards/handwired/sick_pad/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json index 2eed23d8094..721dc046d43 100644 --- a/keyboards/handwired/skakunm_dactyl/info.json +++ b/keyboards/handwired/skakunm_dactyl/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_3x5_5": { "layout": [ diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk index bd539487974..7f1fc659ccb 100644 --- a/keyboards/handwired/skakunm_dactyl/rules.mk +++ b/keyboards/handwired/skakunm_dactyl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json index 3fd0f1918e8..b272ff1ed2a 100644 --- a/keyboards/handwired/slash/info.json +++ b/keyboards/handwired/slash/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk index 53d114978f8..c99c2847cea 100644 --- a/keyboards/handwired/slash/rules.mk +++ b/keyboards/handwired/slash/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json index 22840d73521..da0221f4741 100644 --- a/keyboards/handwired/snatchpad/info.json +++ b/keyboards/handwired/snatchpad/info.json @@ -8,6 +8,8 @@ "pid": "0x7370", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/snatchpad/rules.mk b/keyboards/handwired/snatchpad/rules.mk index 7c73773c0d6..74f5b93cb9b 100644 --- a/keyboards/handwired/snatchpad/rules.mk +++ b/keyboards/handwired/snatchpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json index 90ac25f360b..241cf5e9a2e 100644 --- a/keyboards/handwired/sono1/stm32f103/info.json +++ b/keyboards/handwired/sono1/stm32f103/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk index 019b1130d99..a92b0993283 100644 --- a/keyboards/handwired/sono1/stm32f103/rules.mk +++ b/keyboards/handwired/sono1/stm32f103/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json index e557e4d3076..69ccef72aea 100644 --- a/keyboards/handwired/sono1/t2pp/info.json +++ b/keyboards/handwired/sono1/t2pp/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/handwired/sono1/t2pp/rules.mk b/keyboards/handwired/sono1/t2pp/rules.mk index 149471682df..e69de29bb2d 100644 --- a/keyboards/handwired/sono1/t2pp/rules.mk +++ b/keyboards/handwired/sono1/t2pp/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json index 33d24c39051..e03c13c3e07 100644 --- a/keyboards/handwired/space_oddity/info.json +++ b/keyboards/handwired/space_oddity/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/space_oddity/rules.mk b/keyboards/handwired/space_oddity/rules.mk index 0b1ff1cd0ae..8b3a3ef3691 100644 --- a/keyboards/handwired/space_oddity/rules.mk +++ b/keyboards/handwired/space_oddity/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/handwired/split65/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk index e47fa131158..3bc7f499ecd 100644 --- a/keyboards/handwired/split65/promicro/rules.mk +++ b/keyboards/handwired/split65/promicro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json new file mode 100644 index 00000000000..c06ffbaf069 --- /dev/null +++ b/keyboards/handwired/split65/stm32/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" +} diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk index 0c460745848..5033bd1e21f 100644 --- a/keyboards/handwired/split65/stm32/rules.mk +++ b/keyboards/handwired/split65/stm32/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json index e4b98e458c6..0ca4bfb295c 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk index 8f9772df22e..8ea05b5f74a 100644 --- a/keyboards/handwired/split89/rules.mk +++ b/keyboards/handwired/split89/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/info.json new file mode 100644 index 00000000000..cf993be2471 --- /dev/null +++ b/keyboards/handwired/splittest/bluepill/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F103", + "bootloader": "stm32duino" +} diff --git a/keyboards/handwired/splittest/bluepill/rules.mk b/keyboards/handwired/splittest/bluepill/rules.mk index 019b1130d99..a92b0993283 100644 --- a/keyboards/handwired/splittest/bluepill/rules.mk +++ b/keyboards/handwired/splittest/bluepill/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/handwired/splittest/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/handwired/splittest/promicro/rules.mk b/keyboards/handwired/splittest/promicro/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/handwired/splittest/promicro/rules.mk +++ b/keyboards/handwired/splittest/promicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json new file mode 100644 index 00000000000..0b2db81c11e --- /dev/null +++ b/keyboards/handwired/splittest/teensy_2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/handwired/splittest/teensy_2/rules.mk b/keyboards/handwired/splittest/teensy_2/rules.mk index 320633f80f3..e69de29bb2d 100644 --- a/keyboards/handwired/splittest/teensy_2/rules.mk +++ b/keyboards/handwired/splittest/teensy_2/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json index e84a73ab8e4..ddadbcb97cf 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_standard": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Win", "x":9.5, "y":3, "w":1.5}, {"label":"Menu", "x":11, "y":3, "w":1.75}] diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk index 3d45b63d217..e6848a7b65e 100644 --- a/keyboards/handwired/steamvan/rev1/rules.mk +++ b/keyboards/handwired/steamvan/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Use SPI for RGB underglow: WS2812_DRIVER = spi diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json index a1248b2d9e5..70f33d3e53f 100644 --- a/keyboards/handwired/stef9998/split_5x7/info.json +++ b/keyboards/handwired/stef9998/split_5x7/info.json @@ -8,6 +8,8 @@ "pid": "0x6063", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/stef9998/split_5x7/rules.mk b/keyboards/handwired/stef9998/split_5x7/rules.mk index 01f4b93976e..f74fc175456 100644 --- a/keyboards/handwired/stef9998/split_5x7/rules.mk +++ b/keyboards/handwired/stef9998/split_5x7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/sticc14/info.json b/keyboards/handwired/sticc14/info.json index ab602839ac8..194ac0eeb33 100644 --- a/keyboards/handwired/sticc14/info.json +++ b/keyboards/handwired/sticc14/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/sticc14/rules.mk b/keyboards/handwired/sticc14/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/handwired/sticc14/rules.mk +++ b/keyboards/handwired/sticc14/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json index fb36caae9fe..8754226f1c8 100644 --- a/keyboards/handwired/stream_cheap/2x3/info.json +++ b/keyboards/handwired/stream_cheap/2x3/info.json @@ -8,6 +8,8 @@ "pid": "0x1213", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/handwired/stream_cheap/2x3/rules.mk +++ b/keyboards/handwired/stream_cheap/2x3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json index 441a68caaa2..ae7e361a4d1 100644 --- a/keyboards/handwired/stream_cheap/2x4/info.json +++ b/keyboards/handwired/stream_cheap/2x4/info.json @@ -8,6 +8,8 @@ "pid": "0x1214", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_2x4": { "layout": [ diff --git a/keyboards/handwired/stream_cheap/2x4/rules.mk b/keyboards/handwired/stream_cheap/2x4/rules.mk index 6dac16c3e43..3ced86d55c4 100644 --- a/keyboards/handwired/stream_cheap/2x4/rules.mk +++ b/keyboards/handwired/stream_cheap/2x4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json index 57088d112be..b8a4623b64d 100644 --- a/keyboards/handwired/stream_cheap/2x5/info.json +++ b/keyboards/handwired/stream_cheap/2x5/info.json @@ -8,6 +8,8 @@ "pid": "0x1215", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_2x5": { "layout": [ diff --git a/keyboards/handwired/stream_cheap/2x5/rules.mk b/keyboards/handwired/stream_cheap/2x5/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/handwired/stream_cheap/2x5/rules.mk +++ b/keyboards/handwired/stream_cheap/2x5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/info.json index e5c0d3ce409..fef1bd69991 100644 --- a/keyboards/handwired/swiftrax/astro65/info.json +++ b/keyboards/handwired/swiftrax/astro65/info.json @@ -8,6 +8,8 @@ "pid": "0xEAEF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/handwired/swiftrax/astro65/rules.mk b/keyboards/handwired/swiftrax/astro65/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/swiftrax/astro65/rules.mk +++ b/keyboards/handwired/swiftrax/astro65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json index c25284ac9f3..29c7f213237 100644 --- a/keyboards/handwired/swiftrax/bebol/info.json +++ b/keyboards/handwired/swiftrax/bebol/info.json @@ -8,6 +8,8 @@ "pid": "0xEAC4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/handwired/swiftrax/bebol/rules.mk b/keyboards/handwired/swiftrax/bebol/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/swiftrax/bebol/rules.mk +++ b/keyboards/handwired/swiftrax/bebol/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json index 7e4d05a1982..a52b6e37e76 100644 --- a/keyboards/handwired/swiftrax/beegboy/info.json +++ b/keyboards/handwired/swiftrax/beegboy/info.json @@ -8,6 +8,8 @@ "pid": "0xEAC5", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/swiftrax/beegboy/rules.mk b/keyboards/handwired/swiftrax/beegboy/rules.mk index d143924b882..da25f7f3dc3 100644 --- a/keyboards/handwired/swiftrax/beegboy/rules.mk +++ b/keyboards/handwired/swiftrax/beegboy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json index c210e75c14f..887fc697af6 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/info.json @@ -8,6 +8,8 @@ "pid": "0xE881", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0, "w":1.5}, {"label":"0,1", "x":2.5, "y":0}, {"label":"1,1", "x":3.5, "y":0}, {"label":"0,2", "x":4.5, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.5, "y":0}, {"label":"0,5", "x":10.5, "y":0}, {"label":"1,5", "x":11.5, "y":0}, {"label":"0,6", "x":12.5, "y":0}, {"label":"1,6", "x":13.5, "y":0}, {"label":"0,7", "x":14.5, "y":0, "w":1.5}, {"label":"1,7", "x":16, "y":0}, {"label":"2,0", "x":0, "y":1}, {"label":"3,0", "x":1, "y":1, "w":1.75}, {"label":"2,1", "x":2.75, "y":1}, {"label":"3,1", "x":3.75, "y":1}, {"label":"2,2", "x":4.75, "y":1}, {"label":"3,2", "x":5.75, "y":1}, {"label":"2,3", "x":6.75, "y":1}, {"label":"3,3", "x":7.75, "y":1}, {"label":"2,4", "x":8.75, "y":1}, {"label":"3,4", "x":9.75, "y":1}, {"label":"2,5", "x":10.75, "y":1}, {"label":"3,5", "x":11.75, "y":1}, {"label":"2,6", "x":12.75, "y":1}, {"label":"3,6", "x":13.75, "y":1, "w":2.25}, {"label":"2,7", "x":16, "y":1}, {"label":"4,0", "x":0, "y":2}, {"label":"5,0", "x":1, "y":2, "w":2.25}, {"label":"4,1", "x":3.25, "y":2}, {"label":"5,1", "x":4.25, "y":2}, {"label":"4,2", "x":5.25, "y":2}, {"label":"5,2", "x":6.25, "y":2}, {"label":"4,3", "x":7.25, "y":2}, {"label":"5,3", "x":8.25, "y":2}, {"label":"4,4", "x":9.25, "y":2}, {"label":"5,4", "x":10.25, "y":2}, {"label":"4,5", "x":11.25, "y":2}, {"label":"5,5", "x":12.25, "y":2}, {"label":"4,6", "x":13.25, "y":2, "w":1.75}, {"label":"5,6", "x":15, "y":2}, {"label":"4,7", "x":16, "y":2}, {"label":"6,0", "x":0, "y":3}, {"label":"7,0", "x":1, "y":3, "w":1.5}, {"label":"6,2", "x":3.88, "y":3, "w":1.5}, {"label":"7,2", "x":5.38, "y":3, "w":2.75}, {"label":"6,3", "x":8.13, "y":3}, {"label":"7,4", "x":9.13, "y":3, "w":2}, {"label":"6,5", "x":11.13, "y":3, "w":1.5}, {"label":"6,6", "x":14, "y":3}, {"label":"7,6", "x":15, "y":3}, {"label":"6,7", "x":16, "y":3}] diff --git a/keyboards/handwired/swiftrax/bumblebee/rules.mk b/keyboards/handwired/swiftrax/bumblebee/rules.mk index e0590e039ae..0ca8090ba86 100644 --- a/keyboards/handwired/swiftrax/bumblebee/rules.mk +++ b/keyboards/handwired/swiftrax/bumblebee/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/info.json index 0b1833d9d1b..4de9d072921 100644 --- a/keyboards/handwired/swiftrax/cowfish/info.json +++ b/keyboards/handwired/swiftrax/cowfish/info.json @@ -8,6 +8,8 @@ "pid": "0xEB53", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_f13_ansi": { "layout": [ diff --git a/keyboards/handwired/swiftrax/cowfish/rules.mk b/keyboards/handwired/swiftrax/cowfish/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/handwired/swiftrax/cowfish/rules.mk +++ b/keyboards/handwired/swiftrax/cowfish/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json index a15f55ee568..aba6fbd54d6 100644 --- a/keyboards/handwired/swiftrax/digicarp65/info.json +++ b/keyboards/handwired/swiftrax/digicarp65/info.json @@ -8,6 +8,8 @@ "pid": "0xE7F1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso", "65_iso_split_bs"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk index a98832772dc..21a966bffa4 100644 --- a/keyboards/handwired/swiftrax/digicarp65/rules.mk +++ b/keyboards/handwired/swiftrax/digicarp65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json index bbb62b101f5..f311c9606d2 100644 --- a/keyboards/handwired/swiftrax/digicarpice/info.json +++ b/keyboards/handwired/swiftrax/digicarpice/info.json @@ -8,6 +8,8 @@ "pid": "0xE79A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_unified_bs": { "layout": [ diff --git a/keyboards/handwired/swiftrax/digicarpice/rules.mk b/keyboards/handwired/swiftrax/digicarpice/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/swiftrax/digicarpice/rules.mk +++ b/keyboards/handwired/swiftrax/digicarpice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/info.json index e648e452c7b..0e58b5569c5 100644 --- a/keyboards/handwired/swiftrax/equator/info.json +++ b/keyboards/handwired/swiftrax/equator/info.json @@ -8,6 +8,8 @@ "pid": "0xE984", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_unified_bs_rshift": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}] diff --git a/keyboards/handwired/swiftrax/equator/rules.mk b/keyboards/handwired/swiftrax/equator/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/swiftrax/equator/rules.mk +++ b/keyboards/handwired/swiftrax/equator/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json index 8e27f9cc440..dc3bae097c7 100644 --- a/keyboards/handwired/swiftrax/glacier/info.json +++ b/keyboards/handwired/swiftrax/glacier/info.json @@ -8,6 +8,8 @@ "pid": "0xE890", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1.25, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"1,1", "x":3.25, "y":0}, {"label":"0,2", "x":4.25, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.75, "y":0}, {"label":"0,5", "x":10.75, "y":0}, {"label":"1,5", "x":11.75, "y":0}, {"label":"0,6", "x":12.75, "y":0}, {"label":"1,6", "x":14, "y":0}, {"label":"0,7", "x":15.25, "y":0}, {"label":"1,7", "x":16.5, "y":0}, {"label":"0,8", "x":17.5, "y":0}, {"label":"1,8", "x":18.5, "y":0}, {"label":"0,9", "x":19.5, "y":0}, {"label":"2,0", "x":0, "y":1.25}, {"label":"3,0", "x":1, "y":1.25}, {"label":"2,1", "x":2, "y":1.25}, {"label":"3,1", "x":3, "y":1.25}, {"label":"2,2", "x":4, "y":1.25}, {"label":"3,2", "x":5, "y":1.25}, {"label":"2,3", "x":6, "y":1.25}, {"label":"3,3", "x":7, "y":1.25}, {"label":"2,4", "x":8, "y":1.25}, {"label":"3,4", "x":9, "y":1.25}, {"label":"2,5", "x":10, "y":1.25}, {"label":"3,5", "x":11, "y":1.25}, {"label":"2,6", "x":12, "y":1.25}, {"label":"3,6", "x":13, "y":1.25}, {"label":"7,8", "x":14, "y":1.25}, {"label":"2,7", "x":15.25, "y":1.25}, {"label":"3,7", "x":16.5, "y":1.25}, {"label":"2,8", "x":17.5, "y":1.25}, {"label":"3,8", "x":18.5, "y":1.25}, {"label":"2,9", "x":19.5, "y":1.25}, {"label":"4,0", "x":0, "y":2.25, "w":1.5}, {"label":"5,0", "x":1.5, "y":2.25}, {"label":"4,1", "x":2.5, "y":2.25}, {"label":"5,1", "x":3.5, "y":2.25}, {"label":"4,2", "x":4.5, "y":2.25}, {"label":"5,2", "x":5.5, "y":2.25}, {"label":"4,3", "x":6.5, "y":2.25}, {"label":"5,3", "x":7.5, "y":2.25}, {"label":"4,4", "x":8.5, "y":2.25}, {"label":"5,4", "x":9.5, "y":2.25}, {"label":"4,5", "x":10.5, "y":2.25}, {"label":"5,5", "x":11.5, "y":2.25}, {"label":"4,6", "x":12.5, "y":2.25}, {"label":"5,6", "x":13.5, "y":2.25, "w":1.5}, {"label":"4,7", "x":15.25, "y":2.25}, {"label":"5,7", "x":16.5, "y":2.25}, {"label":"4,8", "x":17.5, "y":2.25}, {"label":"5,8", "x":18.5, "y":2.25}, {"label":"4,9", "x":19.5, "y":2.25, "h":2}, {"label":"6,0", "x":0, "y":3.25, "w":1.75}, {"label":"7,0", "x":1.75, "y":3.25}, {"label":"6,1", "x":2.75, "y":3.25}, {"label":"7,1", "x":3.75, "y":3.25}, {"label":"6,2", "x":4.75, "y":3.25}, {"label":"7,2", "x":5.75, "y":3.25}, {"label":"6,3", "x":6.75, "y":3.25}, {"label":"7,3", "x":7.75, "y":3.25}, {"label":"6,4", "x":8.75, "y":3.25}, {"label":"7,4", "x":9.75, "y":3.25}, {"label":"6,5", "x":10.75, "y":3.25}, {"label":"7,5", "x":11.75, "y":3.25}, {"label":"6,6", "x":12.75, "y":3.25, "w":2.25}, {"label":"6,7", "x":16.5, "y":3.25}, {"label":"7,7", "x":17.5, "y":3.25}, {"label":"6,8", "x":18.5, "y":3.25}, {"label":"8,0", "x":0, "y":4.25, "w":2.25}, {"label":"9,0", "x":2.25, "y":4.25}, {"label":"8,1", "x":3.25, "y":4.25}, {"label":"9,1", "x":4.25, "y":4.25}, {"label":"8,2", "x":5.25, "y":4.25}, {"label":"9,2", "x":6.25, "y":4.25}, {"label":"8,3", "x":7.25, "y":4.25}, {"label":"9,3", "x":8.25, "y":4.25}, {"label":"8,4", "x":9.25, "y":4.25}, {"label":"9,4", "x":10.25, "y":4.25}, {"label":"8,5", "x":11.25, "y":4.25}, {"label":"9,5", "x":12.25, "y":4.25, "w":1.75}, {"label":"9,6", "x":16.5, "y":4.25}, {"label":"8,7", "x":17.5, "y":4.25}, {"label":"9,7", "x":18.5, "y":4.25}, {"label":"8,8", "x":19.5, "y":4.25, "h":2}, {"label":"8,6", "x":14.25, "y":4.5}, {"label":"10,0", "x":0, "y":5.25, "w":1.25}, {"label":"11,0", "x":1.25, "y":5.25, "w":1.25}, {"label":"10,1", "x":2.5, "y":5.25, "w":1.25}, {"label":"11,3", "x":3.75, "y":5.25, "w":6.25}, {"label":"10,4", "x":10, "y":5.25, "w":1.5}, {"label":"11,4", "x":11.5, "y":5.25, "w":1.5}, {"label":"11,6", "x":16.5, "y":5.25, "w":2}, {"label":"10,7", "x":18.5, "y":5.25}, {"label":"10,5", "x":13.25, "y":5.5}, {"label":"11,5", "x":14.25, "y":5.5}, {"label":"10,6", "x":15.25, "y":5.5}] diff --git a/keyboards/handwired/swiftrax/glacier/rules.mk b/keyboards/handwired/swiftrax/glacier/rules.mk index b2d6d9e43c5..9be7a1985b1 100644 --- a/keyboards/handwired/swiftrax/glacier/rules.mk +++ b/keyboards/handwired/swiftrax/glacier/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/info.json index 5916bb705d9..9b3f094e85c 100644 --- a/keyboards/handwired/swiftrax/joypad/info.json +++ b/keyboards/handwired/swiftrax/joypad/info.json @@ -8,6 +8,8 @@ "pid": "0xEA68", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_6x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}] diff --git a/keyboards/handwired/swiftrax/joypad/rules.mk b/keyboards/handwired/swiftrax/joypad/rules.mk index 451ec62f44f..deedc379986 100644 --- a/keyboards/handwired/swiftrax/joypad/rules.mk +++ b/keyboards/handwired/swiftrax/joypad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/info.json index 35a8f73e396..dccea0b2b81 100644 --- a/keyboards/handwired/swiftrax/koalafications/info.json +++ b/keyboards/handwired/swiftrax/koalafications/info.json @@ -8,6 +8,8 @@ "pid": "0xEA44", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,A", "x":10.75, "y":0}, {"label":"0,B", "x":11.75, "y":0}, {"label":"0,C", "x":12.75, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,A", "x":10, "y":1.25}, {"label":"1,B", "x":11, "y":1.25}, {"label":"1,C", "x":12, "y":1.25}, {"label":"1,D", "x":13, "y":1.25}, {"label":"3,D", "x":14, "y":1.25}, {"label":"1,E", "x":15, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,A", "x":10.5, "y":2.25}, {"label":"2,B", "x":11.5, "y":2.25}, {"label":"2,C", "x":12.5, "y":2.25}, {"label":"2,D", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,E", "x":15, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,A", "x":10.75, "y":3.25}, {"label":"3,B", "x":11.75, "y":3.25}, {"label":"3,C", "x":12.75, "y":3.25, "w":2.25}, {"label":"3,E", "x":15, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,A", "x":11.25, "y":4.25}, {"label":"4,B", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,C", "x":14, "y":4.25}, {"label":"4,E", "x":15, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,8", "x":10, "y":5.25}, {"label":"5,9", "x":11, "y":5.25}, {"label":"5,A", "x":12, "y":5.25}, {"label":"5,B", "x":13, "y":5.25}, {"label":"5,C", "x":14, "y":5.25}, {"label":"5,E", "x":15, "y":5.25}] diff --git a/keyboards/handwired/swiftrax/koalafications/rules.mk b/keyboards/handwired/swiftrax/koalafications/rules.mk index 4c7427c0d7a..51909d1883c 100644 --- a/keyboards/handwired/swiftrax/koalafications/rules.mk +++ b/keyboards/handwired/swiftrax/koalafications/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/info.json index 5a8742abca3..c73c80f4d5b 100644 --- a/keyboards/handwired/swiftrax/nodu/info.json +++ b/keyboards/handwired/swiftrax/nodu/info.json @@ -8,6 +8,8 @@ "pid": "0xEA6E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi_split_bs_rshift" }, diff --git a/keyboards/handwired/swiftrax/nodu/rules.mk b/keyboards/handwired/swiftrax/nodu/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/handwired/swiftrax/nodu/rules.mk +++ b/keyboards/handwired/swiftrax/nodu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json index 59008905dcd..b5d0ebd1ba5 100644 --- a/keyboards/handwired/swiftrax/pandamic/info.json +++ b/keyboards/handwired/swiftrax/pandamic/info.json @@ -8,6 +8,8 @@ "pid": "0xEB0E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":18.25, "y":0}, {"x":19.75, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1, "h":2}, {"x":4.25, "y":1, "w":1.5}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":19.75, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":4.25, "y":2, "w":1.75}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2, "w":2.25}, {"x":19.75, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "h":2}, {"x":4.25, "y":3, "w":1.25}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3, "w":1.75}, {"x":18.5, "y":3.25}, {"x":19.75, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":1.25}, {"x":6.75, "y":4, "w":1.25}, {"x":8, "y":4, "w":6.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.5, "y":4.25}, {"x":18.5, "y":4.25}, {"x":19.5, "y":4.25}] diff --git a/keyboards/handwired/swiftrax/pandamic/rules.mk b/keyboards/handwired/swiftrax/pandamic/rules.mk index e1c8e595cf1..0d8c75f6af6 100644 --- a/keyboards/handwired/swiftrax/pandamic/rules.mk +++ b/keyboards/handwired/swiftrax/pandamic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/info.json index 52a62f26208..bd62d9de2da 100644 --- a/keyboards/handwired/swiftrax/the_galleon/info.json +++ b/keyboards/handwired/swiftrax/the_galleon/info.json @@ -8,6 +8,8 @@ "pid": "0xEA2D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/swiftrax/the_galleon/rules.mk b/keyboards/handwired/swiftrax/the_galleon/rules.mk index 662963630b9..5587a8dbbc6 100644 --- a/keyboards/handwired/swiftrax/the_galleon/rules.mk +++ b/keyboards/handwired/swiftrax/the_galleon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json index 9f39a2857b7..619bd652fbd 100644 --- a/keyboards/handwired/swiftrax/unsplit/info.json +++ b/keyboards/handwired/swiftrax/unsplit/info.json @@ -8,6 +8,8 @@ "pid": "0xEAB1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":3, "y":0.25}, {"x":13, "y":0.25}, {"x":2, "y":0.5}, {"x":4, "y":0.5}, {"x":12, "y":0.5}, {"x":14, "y":0.5}, {"x":5, "y":0.625}, {"x":11, "y":0.625}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":3, "y":1.25}, {"x":13, "y":1.25}, {"x":2, "y":1.5}, {"x":4, "y":1.5}, {"x":12, "y":1.5}, {"x":14, "y":1.5}, {"x":5, "y":1.625}, {"x":11, "y":1.625}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":3, "y":2.25}, {"x":13, "y":2.25}, {"x":2, "y":2.5}, {"x":4, "y":2.5}, {"x":12, "y":2.5}, {"x":14, "y":2.5}, {"x":5, "y":2.625}, {"x":11, "y":2.625}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":2.5, "y":3.5}, {"x":13.5, "y":3.5}, {"x":3.5, "y":3.5}, {"x":12.5, "y":3.5}, {"x":4.5, "y":3.75}, {"x":11.5, "y":3.75}, {"x":5.5, "y":4}, {"x":10.5, "y":4}] diff --git a/keyboards/handwired/swiftrax/unsplit/rules.mk b/keyboards/handwired/swiftrax/unsplit/rules.mk index 14c4d5ddea1..d737227db3c 100644 --- a/keyboards/handwired/swiftrax/unsplit/rules.mk +++ b/keyboards/handwired/swiftrax/unsplit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json index 5de2a6f5c7a..675da09c9ca 100644 --- a/keyboards/handwired/swiftrax/walter/info.json +++ b/keyboards/handwired/swiftrax/walter/info.json @@ -8,6 +8,8 @@ "pid": "0xE964", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/handwired/swiftrax/walter/rules.mk b/keyboards/handwired/swiftrax/walter/rules.mk index 0d1740dcad1..5e11a757b75 100644 --- a/keyboards/handwired/swiftrax/walter/rules.mk +++ b/keyboards/handwired/swiftrax/walter/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/symmetric70_proto/promicro/info.json b/keyboards/handwired/symmetric70_proto/promicro/info.json index 8ee579cd60d..782e713bfe3 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/info.json +++ b/keyboards/handwired/symmetric70_proto/promicro/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Symmetric70 prototype promicro" + "keyboard_name": "Symmetric70 prototype promicro", + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/handwired/symmetric70_proto/promicro/rules.mk b/keyboards/handwired/symmetric70_proto/promicro/rules.mk index fbe412faef6..29f6808ed5d 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/rules.mk +++ b/keyboards/handwired/symmetric70_proto/promicro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json index a105f39be6b..a6f017ae75d 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/info.json +++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json @@ -1,3 +1,6 @@ { - "keyboard_name": "Symmetric70 prototype proton-c" + "keyboard_name": "Symmetric70 prototype proton-c", + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk index 81d40223ea0..29f6808ed5d 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk +++ b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json index 1355f472ba0..850ae03b35f 100644 --- a/keyboards/handwired/symmetry60/info.json +++ b/keyboards/handwired/symmetry60/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT_ortho_5x14": { diff --git a/keyboards/handwired/symmetry60/rules.mk b/keyboards/handwired/symmetry60/rules.mk index 74f00f48d65..a44795bae04 100644 --- a/keyboards/handwired/symmetry60/rules.mk +++ b/keyboards/handwired/symmetry60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json index ff231bb66a3..0b5c1046186 100644 --- a/keyboards/handwired/t111/info.json +++ b/keyboards/handwired/t111/info.json @@ -8,6 +8,8 @@ "pid": "0x6FAA", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [{"label":"Break", "x":0, "y":0}, {"label":"PF1", "x":2, "y":0}, {"label":"PF2", "x":3, "y":0}, {"label":"PF3", "x":4, "y":0}, {"label":"PF4", "x":5, "y":0}, {"label":"PF5", "x":6, "y":0}, {"label":"PF6", "x":7, "y":0}, {"label":"PF7", "x":8, "y":0}, {"label":"PF8", "x":9, "y":0}, {"label":"PF9", "x":10, "y":0}, {"label":"PF10", "x":11, "y":0}, {"label":"PF11", "x":12, "y":0}, {"label":"PF12", "x":13, "y":0}, {"label":"PF13", "x":14, "y":0}, {"label":"PF14", "x":15, "y":0}, {"label":"PF15", "x":16, "y":0}, {"label":"PF16", "x":17, "y":0}, {"label":"Esc", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"~", "x":13, "y":1.5}, {"label":"bkspc", "x":14, "y":1.5, "w":1.25}, {"label":"Ins", "x":15.5, "y":1.5}, {"label":"Cls", "x":16.5, "y":1.5}, {"label":"*", "x":17.75, "y":1.5}, {"label":"/", "x":18.75, "y":1.5}, {"label":"+", "x":19.75, "y":1.5}, {"label":"-", "x":20.75, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"El", "x":15.5, "y":2.5}, {"label":"Dup", "x":16.5, "y":2.5}, {"label":"7", "x":17.75, "y":2.5}, {"label":"8", "x":18.75, "y":2.5}, {"label":"9", "x":19.75, "y":2.5}, {"label":"=", "x":20.75, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"|", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.5, "h":2}, {"label":"Del", "x":15.5, "y":3.5}, {"label":"Home", "x":16.5, "y":3.5}, {"label":"4", "x":17.75, "y":3.5}, {"label":"5", "x":18.75, "y":3.5}, {"label":"6", "x":19.75, "y":3.5}, {"label":",", "x":20.75, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"label":"Shift", "x":13.25, "y":4.5, "w":2}, {"label":"\u0432\u2020\u2018", "x":15.5, "y":4.5}, {"label":"\u0432\u2020\u201c", "x":16.5, "y":4.5}, {"label":"1", "x":17.75, "y":4.5}, {"label":"2", "x":18.75, "y":4.5}, {"label":"3", "x":19.75, "y":4.5}, {"label":"Enter", "x":20.75, "y":4.5, "h":2}, {"label":"Caps", "x":1.75, "y":5.5}, {"label":"Graph", "x":2.75, "y":5.5, "w":1.5}, {"x":4.25, "y":5.5, "w":8}, {"label":"Alt", "x":12.25, "y":5.5, "w":1.5}, {"label":"\u0432\u2020\u0452", "x":15.5, "y":5.5}, {"label":"\u0432\u2020\u2019", "x":16.5, "y":5.5}, {"label":"0", "x":17.75, "y":5.5, "w":2}, {"label":".", "x":19.75, "y":5.5}] diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk index 3e70fa7f954..3939229475d 100644 --- a/keyboards/handwired/t111/rules.mk +++ b/keyboards/handwired/t111/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json index 4a810d84d97..f2a8bcc1f9b 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/info.json @@ -8,6 +8,8 @@ "pid": "0x1313", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}] diff --git a/keyboards/handwired/tennie/rules.mk b/keyboards/handwired/tennie/rules.mk index b619ca49523..477ce541fd5 100644 --- a/keyboards/handwired/tennie/rules.mk +++ b/keyboards/handwired/tennie/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json index 79cbe720a3b..c059e9af7e2 100644 --- a/keyboards/handwired/terminus_mini/info.json +++ b/keyboards/handwired/terminus_mini/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/terminus_mini/rules.mk b/keyboards/handwired/terminus_mini/rules.mk index 8121b44ca7f..304b8ba7b9f 100644 --- a/keyboards/handwired/terminus_mini/rules.mk +++ b/keyboards/handwired/terminus_mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json index 3f2d1f2290f..b0c0848ca68 100644 --- a/keyboards/handwired/trackpoint/info.json +++ b/keyboards/handwired/trackpoint/info.json @@ -8,6 +8,8 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk index 1a452149c96..ca3836ef06b 100644 --- a/keyboards/handwired/trackpoint/rules.mk +++ b/keyboards/handwired/trackpoint/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 62b61072ec8..9ea6febd4aa 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -6,6 +6,8 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_4x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index c497bb2ee88..8c9bf430d86 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json index 63663f337de..322dd9f7822 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)" + "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)", + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index b3cb5928deb..3bc4455c557 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform (5x6) Elite-C" + "keyboard_name": "Tractyl Manuform (5x6) Elite-C", + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk index e594097f8ba..16c76d7f49b 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - LTO_ENABLE := yes RGBLIGHT_ENABLE = no OLED_ENABLE = no diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index d88708d17db..3ad29d36b8f 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform (5x6) Proton-C" + "keyboard_name": "Tractyl Manuform (5x6) Proton-C", + "processor": "STM32F303", + "bootloader": "stm32-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index 622d22704d2..7abe7f4ca24 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # KEYBOARD_SHARED_EP = yes CONSOLE_ENABLE = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 74660041659..9b81dc18ebb 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -1,3 +1,6 @@ { - "keyboard_name": "Tractyl Manuform (5x6) BlackPill" + "keyboard_name": "Tractyl Manuform (5x6) BlackPill", + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index dcbcc7ee7ea..4b8fe43b849 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - KEYBOARD_SHARED_EP = yes CONSOLE_ENABLE = yes MOUSE_SHARED_EP = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index dfdbc435bcb..9dc037b2c41 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++" + "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++", + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk index 149471682df..e69de29bb2d 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json index 143bf50b918..ee064ad0cc8 100644 --- a/keyboards/handwired/traveller/info.json +++ b/keyboards/handwired/traveller/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/traveller/rules.mk b/keyboards/handwired/traveller/rules.mk index 7d2cea91dfe..aa4c817d2a2 100644 --- a/keyboards/handwired/traveller/rules.mk +++ b/keyboards/handwired/traveller/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index 87b2d0f5b6c..97362a06652 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/handwired/tritium_numpad/rules.mk b/keyboards/handwired/tritium_numpad/rules.mk index a2e928df58a..ad6bc60f96f 100644 --- a/keyboards/handwired/tritium_numpad/rules.mk +++ b/keyboards/handwired/tritium_numpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json index 3669be349f5..a06580eadd9 100644 --- a/keyboards/handwired/twadlee/tp69/info.json +++ b/keyboards/handwired/twadlee/tp69/info.json @@ -8,6 +8,8 @@ "pid": "0xCACA", "device_version": "0.0.1" }, + "processor": "MKL26Z64", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4, "w":1.25}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk index a1c290cf15b..b1b6b8e616d 100644 --- a/keyboards/handwired/twadlee/tp69/rules.mk +++ b/keyboards/handwired/twadlee/tp69/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = MKL26Z64 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index ac1417e8cce..aae4bfa5312 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.2.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 8, "layouts": { "LAYOUT_diag_4x14": { diff --git a/keyboards/handwired/twig/twig50/rules.mk b/keyboards/handwired/twig/twig50/rules.mk index 137022d6727..60962ea47d9 100644 --- a/keyboards/handwired/twig/twig50/rules.mk +++ b/keyboards/handwired/twig/twig50/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json index ea2ab10b1b7..af9b90cc243 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/unicomp_mini_m/rules.mk b/keyboards/handwired/unicomp_mini_m/rules.mk index 69f5cb2d79e..7ae681a542b 100644 --- a/keyboards/handwired/unicomp_mini_m/rules.mk +++ b/keyboards/handwired/unicomp_mini_m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json index ec0927a0d3d..c2eebfb798c 100644 --- a/keyboards/handwired/unk/rev1/info.json +++ b/keyboards/handwired/unk/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk index 84e2f3e1b2d..c8a36bee0f2 100644 --- a/keyboards/handwired/unk/rules.mk +++ b/keyboards/handwired/unk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/info.json index 44de6469f5b..1a0047080ac 100644 --- a/keyboards/handwired/uthol/rev1/info.json +++ b/keyboards/handwired/uthol/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "UtholOne", "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/handwired/uthol/rev1/rules.mk b/keyboards/handwired/uthol/rev1/rules.mk index 0da1dde9cb1..c06a99e1e4a 100644 --- a/keyboards/handwired/uthol/rev1/rules.mk +++ b/keyboards/handwired/uthol/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json index fbb73096299..95112123d55 100644 --- a/keyboards/handwired/uthol/rev2/info.json +++ b/keyboards/handwired/uthol/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "UtholTwo", "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/handwired/uthol/rev2/rules.mk b/keyboards/handwired/uthol/rev2/rules.mk index 63476766fde..445e503d0bd 100644 --- a/keyboards/handwired/uthol/rev2/rules.mk +++ b/keyboards/handwired/uthol/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index 44078b4ab12..d95bbc9bca2 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -2,5 +2,8 @@ "keyboard_name": "UtholThree", "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk index 8752bb87ebf..2eaa7224979 100644 --- a/keyboards/handwired/uthol/rev3/rules.mk +++ b/keyboards/handwired/uthol/rev3/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json index 23f8b712e54..59ea1c06131 100644 --- a/keyboards/handwired/videowriter/info.json +++ b/keyboards/handwired/videowriter/info.json @@ -8,6 +8,8 @@ "pid": "0x5657", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/videowriter/rules.mk b/keyboards/handwired/videowriter/rules.mk index f5c8a1405bd..6e0404820cd 100644 --- a/keyboards/handwired/videowriter/rules.mk +++ b/keyboards/handwired/videowriter/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/wabi/info.json b/keyboards/handwired/wabi/info.json index 624bc739f24..a93666554d6 100644 --- a/keyboards/handwired/wabi/info.json +++ b/keyboards/handwired/wabi/info.json @@ -8,6 +8,8 @@ "pid": "0xB07D", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1", "x":2.25, "y":0}, {"label":"2", "x":3.25, "y":0}, {"label":"3", "x":4.25, "y":0}, {"label":"4", "x":5.25, "y":0}, {"label":"5", "x":6.25, "y":0}, {"label":"6", "x":8.75, "y":0}, {"label":"7", "x":9.75, "y":0}, {"label":"8", "x":10.75, "y":0}, {"label":"9", "x":11.75, "y":0}, {"label":"0", "x":12.75, "y":0}, {"label":"-", "x":13.75, "y":0}, {"label":"=", "x":14.75, "y":0}, {"label":"Backspace", "x":15.75, "y":0, "w":2}, {"label":"Tab", "x":0.75, "y":1, "w":1.5}, {"label":"Q", "x":2.25, "y":1}, {"label":"W", "x":3.25, "y":1}, {"label":"E", "x":4.25, "y":1}, {"label":"R", "x":5.25, "y":1}, {"label":"T", "x":6.25, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"[", "x":13.75, "y":1}, {"label":"]", "x":14.75, "y":1}, {"label":"\\", "x":15.75, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.5, "y":2, "w":1.75}, {"label":"A", "x":2.25, "y":2}, {"label":"S", "x":3.25, "y":2}, {"label":"D", "x":4.25, "y":2}, {"label":"F", "x":5.25, "y":2}, {"label":"G", "x":6.25, "y":2}, {"label":"H", "x":8.75, "y":2}, {"label":"J", "x":9.75, "y":2}, {"label":"K", "x":10.75, "y":2}, {"label":"L", "x":11.75, "y":2}, {"label":";", "x":12.75, "y":2}, {"label":"'", "x":13.75, "y":2}, {"label":"Enter", "x":14.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Up", "x":16.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":4, "y":4, "w":1.25}, {"label":"Space", "x":5.25, "y":4}, {"label":"Page Down", "x":6.25, "y":4, "w":1.25}, {"label":"Enter", "x":8.5, "y":4, "w":1.25}, {"label":"Space", "x":9.75, "y":4}, {"label":"Backspace", "x":10.75, "y":4, "w":1.25}, {"label":"Left", "x":15.5, "y":4}, {"label":"Down", "x":16.5, "y":4}, {"label":"Right", "x":17.5, "y":4}] } diff --git a/keyboards/handwired/wabi/rules.mk b/keyboards/handwired/wabi/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/handwired/wabi/rules.mk +++ b/keyboards/handwired/wabi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/woodpad/info.json b/keyboards/handwired/woodpad/info.json index 976d2eff884..c31bca5e098 100644 --- a/keyboards/handwired/woodpad/info.json +++ b/keyboards/handwired/woodpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/handwired/woodpad/rules.mk b/keyboards/handwired/woodpad/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/handwired/woodpad/rules.mk +++ b/keyboards/handwired/woodpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index b68dbf735a7..09907a556b2 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/keyboards/handwired/wulkan/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk index 26bbcaa095d..e664c345408 100644 --- a/keyboards/handwired/wulkan/rules.mk +++ b/keyboards/handwired/wulkan/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json index 59865e93212..c470e72a167 100644 --- a/keyboards/handwired/xealous/rev1/info.json +++ b/keyboards/handwired/xealous/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x5141", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index 985ee385b96..5e9547ec9da 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json index 823467b6947..72796b314e6 100644 --- a/keyboards/handwired/z150/info.json +++ b/keyboards/handwired/z150/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":1.75}, {"label":"", "x":17.25, "y":0}, {"label":"", "x":18.25, "y":0, "w":1.5}, {"label":"", "x":19.75, "y":0, "w":1.5}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1, "w":1.25}, {"label":"7", "x":17.25, "y":1}, {"label":"8", "x":18.25, "y":1}, {"label":"9", "x":19.25, "y":1}, {"label":"PrtSc", "x":20.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Ctrl", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2}, {"label":"4", "x":17.25, "y":2}, {"label":"5", "x":18.25, "y":2}, {"label":"6", "x":19.25, "y":2}, {"label":"\u0432\u0402\u201c", "x":20.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.5}, {"label":"|", "x":16.25, "y":3}, {"label":"1", "x":17.25, "y":3}, {"label":"2", "x":18.25, "y":3}, {"label":"6", "x":19.25, "y":3}, {"label":"+", "x":20.25, "y":3, "h":2}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.75}, {"label":"~", "x":4.25, "y":4}, {"x":5.25, "y":4, "w":9}, {"label":"CapsLock", "x":14.25, "y":4, "w":2}, {"label":"0", "x":16.25, "y":4, "w":2}, {"label":".", "x":18.25, "y":4, "w":2}] diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk index 99b06301578..8e7bef8b5c8 100644 --- a/keyboards/handwired/z150/rules.mk +++ b/keyboards/handwired/z150/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json index cec0c8954d9..7b9776134ce 100644 --- a/keyboards/handwired/zergo/info.json +++ b/keyboards/handwired/zergo/info.json @@ -8,6 +8,8 @@ "pid": "0xB92B", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/zergo/rules.mk b/keyboards/handwired/zergo/rules.mk index ae614e0b6d4..7d0adddded9 100644 --- a/keyboards/handwired/zergo/rules.mk +++ b/keyboards/handwired/zergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/hardlineworks/otd_plus/info.json b/keyboards/hardlineworks/otd_plus/info.json index d61987b65f5..c097e0de380 100644 --- a/keyboards/hardlineworks/otd_plus/info.json +++ b/keyboards/hardlineworks/otd_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi_wkl": { "layout": [ diff --git a/keyboards/hardlineworks/otd_plus/rules.mk b/keyboards/hardlineworks/otd_plus/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/hardlineworks/otd_plus/rules.mk +++ b/keyboards/hardlineworks/otd_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/heliar/wm1_hotswap/info.json b/keyboards/heliar/wm1_hotswap/info.json index bee3c03ab21..c6dda77a58e 100644 --- a/keyboards/heliar/wm1_hotswap/info.json +++ b/keyboards/heliar/wm1_hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xD070", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/heliar/wm1_hotswap/rules.mk b/keyboards/heliar/wm1_hotswap/rules.mk index 7d0fd8ee510..201a97b6f2b 100644 --- a/keyboards/heliar/wm1_hotswap/rules.mk +++ b/keyboards/heliar/wm1_hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - ## Build Options # change yes to no to disable # diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json index dd1cfbc8702..cc05d105bf3 100644 --- a/keyboards/hhkb/jp/info.json +++ b/keyboards/hhkb/jp/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_jp": { "layout": [ diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index ae0710e028f..2979c855c70 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json index 1378032eeab..6c5bdcf1f6d 100644 --- a/keyboards/hhkb/yang/info.json +++ b/keyboards/hhkb/yang/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "debounce": 0, "community_layouts": ["60_hhkb"], "layouts": { diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk index ace12412fe4..71ec705822b 100644 --- a/keyboards/hhkb/yang/rules.mk +++ b/keyboards/hhkb/yang/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # MCU frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = lufa-ms - # Build Options # change yes to no to disable # diff --git a/keyboards/hhkb_lite_2/info.json b/keyboards/hhkb_lite_2/info.json index bceac58ba41..078cd1a5c13 100644 --- a/keyboards/hhkb_lite_2/info.json +++ b/keyboards/hhkb_lite_2/info.json @@ -8,6 +8,8 @@ "pid": "0x88B2", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/hhkb_lite_2/rules.mk b/keyboards/hhkb_lite_2/rules.mk index 005769e43ae..11e507797bb 100644 --- a/keyboards/hhkb_lite_2/rules.mk +++ b/keyboards/hhkb_lite_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json index a15d5efcf01..d892ff583b7 100644 --- a/keyboards/hidtech/bastyl/info.json +++ b/keyboards/hidtech/bastyl/info.json @@ -8,6 +8,8 @@ "pid": "0x1827", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/hidtech/bastyl/rules.mk b/keyboards/hidtech/bastyl/rules.mk index 070c6b27adb..323b24ba201 100644 --- a/keyboards/hidtech/bastyl/rules.mk +++ b/keyboards/hidtech/bastyl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json index 5f9821a7d8d..f345bf7f3c2 100644 --- a/keyboards/hifumi/info.json +++ b/keyboards/hifumi/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"F5", "x":0, "y":0}, {"label":"Up", "x":1, "y":0}, {"label":"PrSc", "x":2, "y":0}, {"label":"Left", "x":0, "y":1}, {"label":"Down", "x":1, "y":1}, {"label":"Right", "x":2, "y":1}] diff --git a/keyboards/hifumi/rules.mk b/keyboards/hifumi/rules.mk index 2e57c8520c8..da7ffbbc488 100644 --- a/keyboards/hifumi/rules.mk +++ b/keyboards/hifumi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json index 94de718a3e8..d7e395285bd 100644 --- a/keyboards/hineybush/h08_ocelot/info.json +++ b/keyboards/hineybush/h08_ocelot/info.json @@ -8,6 +8,8 @@ "pid": "0xE8E9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/hineybush/h08_ocelot/rules.mk b/keyboards/hineybush/h08_ocelot/rules.mk index 465de5f68dc..c09eb37bfd8 100644 --- a/keyboards/hineybush/h08_ocelot/rules.mk +++ b/keyboards/hineybush/h08_ocelot/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h10/info.json b/keyboards/hineybush/h10/info.json index abf9bc83452..d62ce90c6a4 100644 --- a/keyboards/hineybush/h10/info.json +++ b/keyboards/hineybush/h10/info.json @@ -8,6 +8,8 @@ "pid": "0xEBD8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4", "numpad_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/hineybush/h10/rules.mk b/keyboards/hineybush/h10/rules.mk index 1509243ebbf..432c9ea5d27 100644 --- a/keyboards/hineybush/h10/rules.mk +++ b/keyboards/hineybush/h10/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json index a8867629636..e4c62971b2e 100644 --- a/keyboards/hineybush/h60/info.json +++ b/keyboards/hineybush/h60/info.json @@ -8,6 +8,8 @@ "pid": "0xEBBE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/hineybush/h60/rules.mk b/keyboards/hineybush/h60/rules.mk index 01701e2118d..6764167b6b4 100644 --- a/keyboards/hineybush/h60/rules.mk +++ b/keyboards/hineybush/h60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json index e58e073fd51..148fedec1bf 100644 --- a/keyboards/hineybush/h65/info.json +++ b/keyboards/hineybush/h65/info.json @@ -8,6 +8,8 @@ "pid": "0xE9E4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/hineybush/h65/rules.mk b/keyboards/hineybush/h65/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/hineybush/h65/rules.mk +++ b/keyboards/hineybush/h65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json index 1d33ce00f43..1d5d283fd7c 100644 --- a/keyboards/hineybush/h65_hotswap/info.json +++ b/keyboards/hineybush/h65_hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xE8B7", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/hineybush/h65_hotswap/rules.mk b/keyboards/hineybush/h65_hotswap/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/hineybush/h65_hotswap/rules.mk +++ b/keyboards/hineybush/h65_hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json index f3a5f7aaf44..880f31c923c 100644 --- a/keyboards/hineybush/h660s/info.json +++ b/keyboards/hineybush/h660s/info.json @@ -8,6 +8,8 @@ "pid": "0xEB1B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_66_ansi": { "layout": [ diff --git a/keyboards/hineybush/h660s/rules.mk b/keyboards/hineybush/h660s/rules.mk index b42558c6801..5ed3676575c 100644 --- a/keyboards/hineybush/h660s/rules.mk +++ b/keyboards/hineybush/h660s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json index ba2f50b355b..6ca317e720d 100644 --- a/keyboards/hineybush/h75_singa/info.json +++ b/keyboards/hineybush/h75_singa/info.json @@ -8,6 +8,8 @@ "pid": "0xEC9A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1}, {"x":14, "y":1}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":2.75}, {"x":6.5, "y":5, "w":1.25}, {"x":7.75, "y":5, "w":2.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] diff --git a/keyboards/hineybush/h75_singa/rules.mk b/keyboards/hineybush/h75_singa/rules.mk index 4323e2466e7..0a394ac16e9 100644 --- a/keyboards/hineybush/h75_singa/rules.mk +++ b/keyboards/hineybush/h75_singa/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json index e9164edfcd9..c24e1082dc2 100644 --- a/keyboards/hineybush/h87a/info.json +++ b/keyboards/hineybush/h87a/info.json @@ -8,6 +8,8 @@ "pid": "0xECE9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Bksp", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/hineybush/h87a/rules.mk b/keyboards/hineybush/h87a/rules.mk index 7d4728f70c0..9748c083e3d 100644 --- a/keyboards/hineybush/h87a/rules.mk +++ b/keyboards/hineybush/h87a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json index 559e7a20274..c011d100aee 100644 --- a/keyboards/hineybush/h88/info.json +++ b/keyboards/hineybush/h88/info.json @@ -8,6 +8,8 @@ "pid": "0xECA2", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"label":"Bksp", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/hineybush/h88/rules.mk b/keyboards/hineybush/h88/rules.mk index 7d4728f70c0..9748c083e3d 100644 --- a/keyboards/hineybush/h88/rules.mk +++ b/keyboards/hineybush/h88/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json index d63e293bb50..8e1b8bbbcc8 100644 --- a/keyboards/hineybush/hbcp/info.json +++ b/keyboards/hineybush/hbcp/info.json @@ -8,6 +8,8 @@ "pid": "0xECE8", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/hineybush/hbcp/rules.mk b/keyboards/hineybush/hbcp/rules.mk index 669b18a5496..f60d6afa1e2 100644 --- a/keyboards/hineybush/hbcp/rules.mk +++ b/keyboards/hineybush/hbcp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/info.json index 40c54ebe40d..b16f445efed 100644 --- a/keyboards/hineybush/hineyg80/info.json +++ b/keyboards/hineybush/hineyg80/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Pause", "x":15.5, "y":0}, {"label":"Insert", "x":16.5, "y":0}, {"label":"Home", "x":17.5, "y":0}, {"label":"PgUp", "x":18.5, "y":0}, {"label":"Scroll Lock", "x":15.5, "y":1}, {"label":"Delete", "x":16.5, "y":1}, {"label":"End", "x":17.5, "y":1}, {"label":"PgDn", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Bksp", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"-", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"+", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"x":12.75, "y":4}, {"label":"Enter", "x":13.75, "y":4, "w":1.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":1.25}, {"x":1.25, "y":5}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"Alt", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}] diff --git a/keyboards/hineybush/hineyg80/rules.mk b/keyboards/hineybush/hineyg80/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/hineybush/hineyg80/rules.mk +++ b/keyboards/hineybush/hineyg80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json index 274f9bb7253..828e8fbb4f9 100644 --- a/keyboards/hineybush/physix/info.json +++ b/keyboards/hineybush/physix/info.json @@ -8,6 +8,8 @@ "pid": "0xEC81", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/hineybush/physix/rules.mk b/keyboards/hineybush/physix/rules.mk index 3ca912f6ecb..0922d3d5112 100644 --- a/keyboards/hineybush/physix/rules.mk +++ b/keyboards/hineybush/physix/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json index a3b9e4c0513..642e7b5e07a 100644 --- a/keyboards/hineybush/sm68/info.json +++ b/keyboards/hineybush/sm68/info.json @@ -8,6 +8,8 @@ "pid": "0xEC9F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_68_ansi_split_bs_rshift": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.5, "y":1}, {"x":16.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"\u2191", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.5, "y":4}, {"label":"\u2193", "x":15.5, "y":4}, {"label":"\u2192", "x":16.5, "y":4}] diff --git a/keyboards/hineybush/sm68/rules.mk b/keyboards/hineybush/sm68/rules.mk index 9c435aa07bc..3414d97c204 100644 --- a/keyboards/hineybush/sm68/rules.mk +++ b/keyboards/hineybush/sm68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hnahkb/freyr/info.json b/keyboards/hnahkb/freyr/info.json index 306a9e0db65..0fce74f0ccd 100644 --- a/keyboards/hnahkb/freyr/info.json +++ b/keyboards/hnahkb/freyr/info.json @@ -8,6 +8,8 @@ "pid": "0x1895", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/hnahkb/freyr/rules.mk b/keyboards/hnahkb/freyr/rules.mk index f3c3ee450d2..26064ab2ac9 100644 --- a/keyboards/hnahkb/freyr/rules.mk +++ b/keyboards/hnahkb/freyr/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json index bd3cc805ac2..f3e6550f8ef 100644 --- a/keyboards/hnahkb/stella/info.json +++ b/keyboards/hnahkb/stella/info.json @@ -8,6 +8,8 @@ "pid": "0x0AB7", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/hnahkb/stella/rules.mk b/keyboards/hnahkb/stella/rules.mk index 5b0dcd2db40..b7e8d8e706b 100644 --- a/keyboards/hnahkb/stella/rules.mk +++ b/keyboards/hnahkb/stella/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json index 5d79bb51f0f..ce2124fe5c2 100644 --- a/keyboards/hnahkb/vn66/info.json +++ b/keyboards/hnahkb/vn66/info.json @@ -8,6 +8,8 @@ "pid": "0xCA2C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/hnahkb/vn66/rules.mk b/keyboards/hnahkb/vn66/rules.mk index 70d0d4c8414..4f5a4635de4 100644 --- a/keyboards/hnahkb/vn66/rules.mk +++ b/keyboards/hnahkb/vn66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/holyswitch/southpaw75/info.json b/keyboards/holyswitch/southpaw75/info.json index f96a75e3ccf..6171d8a41ab 100644 --- a/keyboards/holyswitch/southpaw75/info.json +++ b/keyboards/holyswitch/southpaw75/info.json @@ -8,6 +8,8 @@ "pid": "0x5350", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/holyswitch/southpaw75/rules.mk b/keyboards/holyswitch/southpaw75/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/holyswitch/southpaw75/rules.mk +++ b/keyboards/holyswitch/southpaw75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/horizon/info.json b/keyboards/horizon/info.json index c0dc63c1f1e..d6b919338f4 100644 --- a/keyboards/horizon/info.json +++ b/keyboards/horizon/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/horizon/rules.mk b/keyboards/horizon/rules.mk index 9cfcaf1bbcb..03778480554 100644 --- a/keyboards/horizon/rules.mk +++ b/keyboards/horizon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json index bd11a97d819..f336f57a527 100644 --- a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json +++ b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "community_layouts": ["tkl_f13_ansi"], "layouts": { "LAYOUT_tkl_f13_ansi": { diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk index f834a21af48..f8fe1f7dbb3 100644 --- a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk +++ b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json index 9abad105915..4eb49411022 100644 --- a/keyboards/horrortroll/caticorn/rev1/solder/info.json +++ b/keyboards/horrortroll/caticorn/rev1/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift", "tkl_f13_iso", "tkl_f13_iso_split_bs_rshift", "tkl_f13_iso_tsangan", "tkl_f13_iso_tsangan_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk index 104bb7d0c3a..4f873e37383 100644 --- a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk +++ b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json index 59d3f70aefa..f5eff6caa63 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json +++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json @@ -8,6 +8,8 @@ "pid": "0x7000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk b/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk index 38f81fd4dcc..1955f1d315b 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk +++ b/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json index 36f776b62c8..96168dd67e4 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json @@ -8,6 +8,8 @@ "pid": "0x7001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk index 66354d79261..e3a981b6349 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json index 9aa73df1fac..40e6f70ccd8 100644 --- a/keyboards/horrortroll/lemon40/info.json +++ b/keyboards/horrortroll/lemon40/info.json @@ -8,6 +8,8 @@ "pid": "0x2434", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk index d3b7b88d633..933affaa863 100644 --- a/keyboards/horrortroll/lemon40/rules.mk +++ b/keyboards/horrortroll/lemon40/rules.mk @@ -1,11 +1,5 @@ SRC += lib/bongocat.c -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json index f50329a4a5d..475172ffc07 100644 --- a/keyboards/horrortroll/paws60/info.json +++ b/keyboards/horrortroll/paws60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { diff --git a/keyboards/horrortroll/paws60/rules.mk b/keyboards/horrortroll/paws60/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/horrortroll/paws60/rules.mk +++ b/keyboards/horrortroll/paws60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json index fbe5ca96b8e..8a67473fb80 100644 --- a/keyboards/hotdox/info.json +++ b/keyboards/hotdox/info.json @@ -7,6 +7,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ergodox"], "layouts": { "LAYOUT_ergodox": { diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk index 6f0ce6bbf15..1088cbc14ba 100644 --- a/keyboards/hotdox/rules.mk +++ b/keyboards/hotdox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json index c026ca99e79..cec2abf977b 100644 --- a/keyboards/hp69/info.json +++ b/keyboards/hp69/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.1.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/hp69/rules.mk b/keyboards/hp69/rules.mk index 6deb7a31621..b851d0ab392 100644 --- a/keyboards/hp69/rules.mk +++ b/keyboards/hp69/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json index 46222da73c9..2c723f58b53 100644 --- a/keyboards/hs60/v1/info.json +++ b/keyboards/hs60/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0257", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_60_iso": { diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk index d5d8ff6eed2..91c36443cdb 100644 --- a/keyboards/hs60/v1/rules.mk +++ b/keyboards/hs60/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json index 762a5892e64..cf965708006 100644 --- a/keyboards/hs60/v2/ansi/info.json +++ b/keyboards/hs60/v2/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x4854", "device_version": "0.0.2" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk index 8dedad03df7..a231765dffa 100644 --- a/keyboards/hs60/v2/ansi/rules.mk +++ b/keyboards/hs60/v2/ansi/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json index 5e43f8bdba0..10fb020eb7e 100644 --- a/keyboards/hs60/v2/hhkb/info.json +++ b/keyboards/hs60/v2/hhkb/info.json @@ -8,6 +8,9 @@ "pid": "0x4855", "device_version": "0.0.2" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_60_hhkb": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk index 8dedad03df7..a231765dffa 100644 --- a/keyboards/hs60/v2/hhkb/rules.mk +++ b/keyboards/hs60/v2/hhkb/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json index 42a9b6381ad..771c44bd693 100644 --- a/keyboards/hs60/v2/iso/info.json +++ b/keyboards/hs60/v2/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x4853", "device_version": "0.0.2" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["60_iso"], "layouts": { "LAYOUT_60_iso": { diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk index 8dedad03df7..a231765dffa 100644 --- a/keyboards/hs60/v2/iso/rules.mk +++ b/keyboards/hs60/v2/iso/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json index f34f5a4496e..ec1f3fc2cd5 100644 --- a/keyboards/hub16/info.json +++ b/keyboards/hub16/info.json @@ -8,6 +8,8 @@ "pid": "0x4810", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 20, "layouts": { "LAYOUT": { diff --git a/keyboards/hub16/rules.mk b/keyboards/hub16/rules.mk index 9b3be3a2c90..51fa8f6ee62 100755 --- a/keyboards/hub16/rules.mk +++ b/keyboards/hub16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json index 3f829a3c7ba..a8f678cb243 100644 --- a/keyboards/hub20/info.json +++ b/keyboards/hub20/info.json @@ -8,6 +8,8 @@ "pid": "0x4414", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/hub20/rules.mk b/keyboards/hub20/rules.mk index 96702a3a76f..2dd9c5acc60 100644 --- a/keyboards/hub20/rules.mk +++ b/keyboards/hub20/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json index 9e47b768e80..095740b3db8 100644 --- a/keyboards/huytbt/h50/info.json +++ b/keyboards/huytbt/h50/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/huytbt/h50/rules.mk b/keyboards/huytbt/h50/rules.mk index 288fe84296e..88b3b117198 100644 --- a/keyboards/huytbt/h50/rules.mk +++ b/keyboards/huytbt/h50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ianklug/grooveboard/info.json b/keyboards/ianklug/grooveboard/info.json index a4bb849952f..c4bd7ab01fa 100644 --- a/keyboards/ianklug/grooveboard/info.json +++ b/keyboards/ianklug/grooveboard/info.json @@ -8,6 +8,8 @@ "pid": "0x4742", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ianklug/grooveboard/rules.mk b/keyboards/ianklug/grooveboard/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/ianklug/grooveboard/rules.mk +++ b/keyboards/ianklug/grooveboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json index b6cecf43099..b8e0bf00f12 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "STM32F446", // RET6 + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":6}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk index 8acd50a10f2..225317b3674 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F446 # STM32F446RET6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index 3ce8256003b..9e34484de5f 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -8,6 +8,8 @@ "pid": "0x6955", "device_version": "8.9.9" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ibnuda/alicia_cook/rules.mk b/keyboards/ibnuda/alicia_cook/rules.mk index f35bef0a637..64562f09320 100644 --- a/keyboards/ibnuda/alicia_cook/rules.mk +++ b/keyboards/ibnuda/alicia_cook/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 4c7db56fd99..7b3c71aa882 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,8 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ibnuda/gurindam/rules.mk b/keyboards/ibnuda/gurindam/rules.mk index afcb13df486..76a5b62f607 100644 --- a/keyboards/ibnuda/gurindam/rules.mk +++ b/keyboards/ibnuda/gurindam/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index d7451927e11..f8653afb9a1 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT": { diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk index afe167d1a91..ff66487bad9 100644 --- a/keyboards/ibnuda/squiggle/rev1/rules.mk +++ b/keyboards/ibnuda/squiggle/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json index 675fce45826..1114abd5bd4 100644 --- a/keyboards/idb/idb_60/info.json +++ b/keyboards/idb/idb_60/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all", "LAYOUT_default": "LAYOUT_60_ansi_wkl_split_rshift" diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk index 6862c48e49f..bb93c95954a 100644 --- a/keyboards/idb/idb_60/rules.mk +++ b/keyboards/idb/idb_60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index 36e5e7132e1..16285f6819d 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/idobao/id75/v1/rules.mk b/keyboards/idobao/id75/v1/rules.mk index 797105d55b6..4b4bc45417f 100644 --- a/keyboards/idobao/id75/v1/rules.mk +++ b/keyboards/idobao/id75/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index afdb4b16b5c..558cbda3c86 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0075", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/idobao/id75/v2/rules.mk b/keyboards/idobao/id75/v2/rules.mk index 7a432dba449..a29a20b7667 100644 --- a/keyboards/idobao/id75/v2/rules.mk +++ b/keyboards/idobao/id75/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index 97ba29d0084..eeba492e84b 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/idobao/id87/v1/rules.mk b/keyboards/idobao/id87/v1/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/idobao/id87/v1/rules.mk +++ b/keyboards/idobao/id87/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 0732bce1542..52ccc7b9568 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -8,6 +8,8 @@ "pid": "0x0096", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/idobao/id96/rules.mk b/keyboards/idobao/id96/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/idobao/id96/rules.mk +++ b/keyboards/idobao/id96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index f6834561749..cd4ccc6256d 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_numpad_6x5": { "layout": [ diff --git a/keyboards/idobao/montex/v1/rules.mk b/keyboards/idobao/montex/v1/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/idobao/montex/v1/rules.mk +++ b/keyboards/idobao/montex/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index afa36efc97b..75add6a8969 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -6,6 +6,8 @@ "pid": "0x0127", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x5"], "layouts": { "LAYOUT_numpad_6x5": { diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk index 140d126df8c..9a1656f5d68 100755 --- a/keyboards/idobao/montex/v1rgb/rules.mk +++ b/keyboards/idobao/montex/v1rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json index f56850ca851..04964b09555 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0.25, "y":0, "w":1.25, "h":2}] diff --git a/keyboards/illuminati/is0/rules.mk b/keyboards/illuminati/is0/rules.mk index 9d7635000ac..5e28d2cc453 100644 --- a/keyboards/illuminati/is0/rules.mk +++ b/keyboards/illuminati/is0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json index 7e771a2d05a..adc7d51a20e 100644 --- a/keyboards/illusion/rosa/info.json +++ b/keyboards/illusion/rosa/info.json @@ -8,6 +8,8 @@ "pid": "0x6952", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_tsangan"], "layouts": { "LAYOUT_60_ansi_tsangan": { diff --git a/keyboards/illusion/rosa/rules.mk b/keyboards/illusion/rosa/rules.mk index 6dcfb6ff1dd..184072b19e4 100644 --- a/keyboards/illusion/rosa/rules.mk +++ b/keyboards/illusion/rosa/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json index 30a970a5c95..7ee6a7177af 100644 --- a/keyboards/ilumkb/primus75/info.json +++ b/keyboards/ilumkb/primus75/info.json @@ -8,6 +8,8 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"label":"Backspace", "x":14, "y":1.25}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25}, {"label":"Fn", "x":11, "y":5.25}, {"label":"Ctrl", "x":12, "y":5.25}, {"label":"Left", "x":13, "y":5.25}, {"label":"Down", "x":14, "y":5.25}, {"label":"Right", "x":15, "y":5.25}] diff --git a/keyboards/ilumkb/primus75/rules.mk b/keyboards/ilumkb/primus75/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/ilumkb/primus75/rules.mk +++ b/keyboards/ilumkb/primus75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json index 4814183e359..867152f2954 100644 --- a/keyboards/ilumkb/simpler61/info.json +++ b/keyboards/ilumkb/simpler61/info.json @@ -8,6 +8,8 @@ "pid": "0xC361", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_61_ansi": { diff --git a/keyboards/ilumkb/simpler61/rules.mk b/keyboards/ilumkb/simpler61/rules.mk index ab16f67c8d2..df3e43eac79 100644 --- a/keyboards/ilumkb/simpler61/rules.mk +++ b/keyboards/ilumkb/simpler61/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json index 450a91261ac..15d17d3540d 100644 --- a/keyboards/ilumkb/simpler64/info.json +++ b/keyboards/ilumkb/simpler64/info.json @@ -8,6 +8,8 @@ "pid": "0xC364", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_64_ansi": { diff --git a/keyboards/ilumkb/simpler64/rules.mk b/keyboards/ilumkb/simpler64/rules.mk index ab16f67c8d2..df3e43eac79 100644 --- a/keyboards/ilumkb/simpler64/rules.mk +++ b/keyboards/ilumkb/simpler64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json index a48cabf7209..c6eb8bb5c5b 100644 --- a/keyboards/ilumkb/volcano660/info.json +++ b/keyboards/ilumkb/volcano660/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"label":"Shift", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"x":14.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}] diff --git a/keyboards/ilumkb/volcano660/rules.mk b/keyboards/ilumkb/volcano660/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/ilumkb/volcano660/rules.mk +++ b/keyboards/ilumkb/volcano660/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json index 09d0154cabb..1d9014bdbd2 100644 --- a/keyboards/inett_studio/sqx/hotswap/info.json +++ b/keyboards/inett_studio/sqx/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { diff --git a/keyboards/inett_studio/sqx/hotswap/rules.mk b/keyboards/inett_studio/sqx/hotswap/rules.mk index 495304211e8..bb431dcb1df 100644 --- a/keyboards/inett_studio/sqx/hotswap/rules.mk +++ b/keyboards/inett_studio/sqx/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json index 950bcdbbbde..7da0598d91b 100644 --- a/keyboards/inett_studio/sqx/universal/info.json +++ b/keyboards/inett_studio/sqx/universal/info.json @@ -8,6 +8,8 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi_tsangan_split_rshift": { diff --git a/keyboards/inett_studio/sqx/universal/rules.mk b/keyboards/inett_studio/sqx/universal/rules.mk index 2d3c62a3051..15a127480aa 100644 --- a/keyboards/inett_studio/sqx/universal/rules.mk +++ b/keyboards/inett_studio/sqx/universal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json index cc55c56b930..7030086a5c0 100644 --- a/keyboards/ingrained/info.json +++ b/keyboards/ingrained/info.json @@ -8,6 +8,8 @@ "pid": "0x58E4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_3", "split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/ingrained/rules.mk b/keyboards/ingrained/rules.mk index e10b352c4fa..8dd98052579 100644 --- a/keyboards/ingrained/rules.mk +++ b/keyboards/ingrained/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index a01b6fd200e..635355d4904 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -6,6 +6,9 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "processor": "MK20DX256", + "bootloader": "kiibohd", + "board": "IC_TEENSY_3_1", "community_layouts": ["ergodox"], "layouts": { "LAYOUT_ergodox": { diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk index aa1ff6980f6..88bd6b0041a 100644 --- a/keyboards/input_club/ergodox_infinity/rules.mk +++ b/keyboards/input_club/ergodox_infinity/rules.mk @@ -1,16 +1,3 @@ -# MCU name -MCU = MK20DX256 - -# Bootloader selection -BOOTLOADER = kiibohd - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# This board was copied from PJRC_TEENSY_3_1. The only difference should be a -# hack to ensure the watchdog has started before trying to disable it, and an -# override to disable restart of USB driver after returning from suspend. -BOARD = IC_TEENSY_3_1 - # Build Options # change yes to no to disable # diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json index 58642a56ede..a1ee4900987 100644 --- a/keyboards/input_club/infinity60/info.json +++ b/keyboards/input_club/infinity60/info.json @@ -8,6 +8,9 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "processor": "MK20DX128", + "bootloader": "kiibohd", + "board": "MCHCK_K20", "community_layouts": ["60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk index 258a68f83eb..e47069dac9b 100644 --- a/keyboards/input_club/infinity60/rules.mk +++ b/keyboards/input_club/infinity60/rules.mk @@ -1,18 +1,3 @@ -# MCU name -MCU = MK20DX128 - -# Bootloader selection -BOOTLOADER = kiibohd - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# - BOARD = -# - PJRC_TEENSY_LC for Teensy LC -# - PJRC_TEENSY_3 for Teensy 3.0 -# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 -# - MCHCK_K20 for Infinity KB -BOARD = MCHCK_K20 - # Build Options # change yes to no to disable # diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json index 8bd8a4414cd..60522333d7c 100644 --- a/keyboards/input_club/k_type/info.json +++ b/keyboards/input_club/k_type/info.json @@ -8,6 +8,9 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "processor": "MK20DX256", + "bootloader": "kiibohd", + "board": "IC_TEENSY_3_1", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk index 3ca2e0ee2bf..3e5006cd5ae 100644 --- a/keyboards/input_club/k_type/rules.mk +++ b/keyboards/input_club/k_type/rules.mk @@ -1,16 +1,3 @@ -# MCU name -MCU = MK20DX256 - -# Bootloader selection -BOOTLOADER = kiibohd - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# This board was copied from PJRC_TEENSY_3_1. The only difference should be a -# hack to ensure the watchdog has started before trying to disable it, and an -# override to disable restart of USB driver after returning from suspend. -BOARD = IC_TEENSY_3_1 - # Build Options # change yes to no to disable # diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json index 9f65d1d8c2f..0cd34f83125 100644 --- a/keyboards/input_club/whitefox/info.json +++ b/keyboards/input_club/whitefox/info.json @@ -7,6 +7,9 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "processor": "MK20DX256", + "bootloader": "kiibohd", + "board": "IC_TEENSY_3_1", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk index 48691029aa9..2a45fc02ddb 100644 --- a/keyboards/input_club/whitefox/rules.mk +++ b/keyboards/input_club/whitefox/rules.mk @@ -1,16 +1,3 @@ -# MCU name -MCU = MK20DX256 - -# Bootloader selection -BOOTLOADER = kiibohd - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# This board was copied from PJRC_TEENSY_3_1. The only difference should be a -# hack to ensure the watchdog has started before trying to disable it, and an -# override to disable restart of USB driver after returning from suspend. -BOARD = IC_TEENSY_3_1 - # Build Options # change yes to no to disable # diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json index 0db951f44a7..bdc04f17166 100644 --- a/keyboards/io_mini1800/info.json +++ b/keyboards/io_mini1800/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_625u": { "layout": [ diff --git a/keyboards/io_mini1800/rules.mk b/keyboards/io_mini1800/rules.mk index 284ea23e781..453f0a34d38 100644 --- a/keyboards/io_mini1800/rules.mk +++ b/keyboards/io_mini1800/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index 1500f81ca27..a9e943db5c1 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -8,6 +8,8 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/irene/rules.mk b/keyboards/irene/rules.mk index 1f52c371540..2eba275490a 100644 --- a/keyboards/irene/rules.mk +++ b/keyboards/irene/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/iriskeyboards/info.json b/keyboards/iriskeyboards/info.json index 9091531538b..860d9f21b7d 100644 --- a/keyboards/iriskeyboards/info.json +++ b/keyboards/iriskeyboards/info.json @@ -8,6 +8,8 @@ "pid": "0x3031", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/iriskeyboards/rules.mk b/keyboards/iriskeyboards/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/iriskeyboards/rules.mk +++ b/keyboards/iriskeyboards/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/iron180/info.json b/keyboards/iron180/info.json index cd689706410..3092b2021f2 100644 --- a/keyboards/iron180/info.json +++ b/keyboards/iron180/info.json @@ -8,6 +8,8 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/iron180/rules.mk b/keyboards/iron180/rules.mk index 6649381de34..924e14bfe47 100644 --- a/keyboards/iron180/rules.mk +++ b/keyboards/iron180/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json index bbb86f66f70..48553be0e0a 100644 --- a/keyboards/j80/info.json +++ b/keyboards/j80/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/j80/rules.mk b/keyboards/j80/rules.mk index 370a9913df8..109bdfc4db8 100644 --- a/keyboards/j80/rules.mk +++ b/keyboards/j80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json index b1621eecd73..f2e51f63acb 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk b/keyboards/jacky_studio/s7_elephant/rev1/rules.mk index 543f0f79da1..718a761cb41 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk +++ b/keyboards/jacky_studio/s7_elephant/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index c9f45edca93..c7cc5aaf144 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk b/keyboards/jacky_studio/s7_elephant/rev2/rules.mk index 1daeed7bd79..cafe30d9293 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk +++ b/keyboards/jacky_studio/s7_elephant/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json index ef27783c7a8..0a72e6b7bc8 100644 --- a/keyboards/jadookb/jkb2/info.json +++ b/keyboards/jadookb/jkb2/info.json @@ -8,6 +8,8 @@ "pid": "0x3225", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }] diff --git a/keyboards/jadookb/jkb2/rules.mk b/keyboards/jadookb/jkb2/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/jadookb/jkb2/rules.mk +++ b/keyboards/jadookb/jkb2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index c6f5813feec..60908bda8e1 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -6,6 +6,8 @@ "vid": "0x4A4B", "pid": "0xEF6A" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk index f230e8ae9fb..14493320b2f 100644 --- a/keyboards/jadookb/jkb65/rules.mk +++ b/keyboards/jadookb/jkb65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json index 94363e3aa5d..e5617e01932 100644 --- a/keyboards/jae/j01/info.json +++ b/keyboards/jae/j01/info.json @@ -8,6 +8,8 @@ "pid": "0x0143", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.75, "y":3.25}, {"x":18, "y":3}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"x":12.5, "y":4, "w":1.5}, {"x":14, "y":4, "w":1.5}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25}, {"x":17.75, "y":4.25}] diff --git a/keyboards/jae/j01/rules.mk b/keyboards/jae/j01/rules.mk index 983fcface1f..8dea3757839 100644 --- a/keyboards/jae/j01/rules.mk +++ b/keyboards/jae/j01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json index 48945eaf3e1..d29849d0c64 100644 --- a/keyboards/jagdpietr/drakon/info.json +++ b/keyboards/jagdpietr/drakon/info.json @@ -8,6 +8,8 @@ "pid": "0x7776", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":17.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":16.25, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.25}, {"x":13.75, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.25}] diff --git a/keyboards/jagdpietr/drakon/rules.mk b/keyboards/jagdpietr/drakon/rules.mk index 1c043b7c4fb..94fd5ee9d13 100644 --- a/keyboards/jagdpietr/drakon/rules.mk +++ b/keyboards/jagdpietr/drakon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json index a6130b77c64..80c6d6d7b8c 100644 --- a/keyboards/jc65/v32a/info.json +++ b/keyboards/jc65/v32a/info.json @@ -8,6 +8,8 @@ "pid": "0x5679", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/jc65/v32a/rules.mk b/keyboards/jc65/v32a/rules.mk index 9686fd1aa4c..25437c442c6 100644 --- a/keyboards/jc65/v32a/rules.mk +++ b/keyboards/jc65/v32a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json index 83e248fc30e..5a387a58079 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/jc65/v32u4/rules.mk b/keyboards/jc65/v32u4/rules.mk index 4551e3c3650..854004ccf73 100644 --- a/keyboards/jc65/v32u4/rules.mk +++ b/keyboards/jc65/v32u4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json index b94e9076f77..9bb96326d38 100644 --- a/keyboards/jd40/info.json +++ b/keyboards/jd40/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jd40/rules.mk b/keyboards/jd40/rules.mk index 59bbf0ca8ba..08d4d2d8869 100644 --- a/keyboards/jd40/rules.mk +++ b/keyboards/jd40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json index 3fa16119f6a..9113ae7e0d8 100644 --- a/keyboards/jd45/info.json +++ b/keyboards/jd45/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jd45/rules.mk b/keyboards/jd45/rules.mk index 0e6f70f0c92..4870b8d6a17 100644 --- a/keyboards/jd45/rules.mk +++ b/keyboards/jd45/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json index d8c6590ccb1..dc2b234f16d 100644 --- a/keyboards/jels/jels60/info.json +++ b/keyboards/jels/jels60/info.json @@ -8,6 +8,8 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/jels/jels60/rules.mk b/keyboards/jels/jels60/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/jels/jels60/rules.mk +++ b/keyboards/jels/jels60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json index dc4887cbb7f..e91331b66fc 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/info.json @@ -8,6 +8,8 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/jels/jels88/rules.mk b/keyboards/jels/jels88/rules.mk index 15caede3fdb..0098dc473ac 100644 --- a/keyboards/jels/jels88/rules.mk +++ b/keyboards/jels/jels88/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json index 120c6c4a248..712c3d9b016 100644 --- a/keyboards/jian/handwired/info.json +++ b/keyboards/jian/handwired/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Huma", "usb": { "device_version": "0.1.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk index b12d594ea18..947cf020389 100644 --- a/keyboards/jian/handwired/rules.mk +++ b/keyboards/jian/handwired/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json index 06fbfeb8332..a642aaf0a9e 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Huma", "usb": { "device_version": "2.1.0" - } + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu" } diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk index 7f93cad7128..3d0af8ae989 100644 --- a/keyboards/jian/nsrev2/rules.mk +++ b/keyboards/jian/nsrev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index 32540b3f787..bcd7c88d693 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Jian", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk index cce01f50c30..8e6da2d84f0 100644 --- a/keyboards/jian/rev1/rules.mk +++ b/keyboards/jian/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index db130bf467e..39b2b65010b 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Jian", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu" } diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk index fa43614a064..8e6da2d84f0 100644 --- a/keyboards/jian/rev2/rules.mk +++ b/keyboards/jian/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json index 93b8ad11cee..4a2d96f9d00 100644 --- a/keyboards/jiran/info.json +++ b/keyboards/jiran/info.json @@ -8,6 +8,8 @@ "pid": "0x3735", "device_version": "3.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk index f7ee8a22146..b4c74a089dc 100644 --- a/keyboards/jiran/rules.mk +++ b/keyboards/jiran/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json index 24671d285d5..10ef74c0aa1 100644 --- a/keyboards/jkdlab/binary_monkey/info.json +++ b/keyboards/jkdlab/binary_monkey/info.json @@ -8,6 +8,8 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jkdlab/binary_monkey/rules.mk b/keyboards/jkdlab/binary_monkey/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/jkdlab/binary_monkey/rules.mk +++ b/keyboards/jkdlab/binary_monkey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json index 3a8e6168aac..51a34f460e4 100644 --- a/keyboards/jkeys_design/gentleman65/info.json +++ b/keyboards/jkeys_design/gentleman65/info.json @@ -8,6 +8,8 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/jkeys_design/gentleman65/rules.mk b/keyboards/jkeys_design/gentleman65/rules.mk index fceba7b48c5..cb8a7d75f18 100644 --- a/keyboards/jkeys_design/gentleman65/rules.mk +++ b/keyboards/jkeys_design/gentleman65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json index 477940ffa63..b4acdb13929 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/info.json @@ -8,6 +8,8 @@ "pid": "0x2322", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/jkeys_design/gentleman65_se_s/rules.mk b/keyboards/jkeys_design/gentleman65_se_s/rules.mk index fceba7b48c5..cb8a7d75f18 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/rules.mk +++ b/keyboards/jkeys_design/gentleman65_se_s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json index 0224187eff1..fd5dc464ea9 100644 --- a/keyboards/jolofsor/denial75/info.json +++ b/keyboards/jolofsor/denial75/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_denial75_ansi": { "layout": [ diff --git a/keyboards/jolofsor/denial75/rules.mk b/keyboards/jolofsor/denial75/rules.mk index 61ec6a921a4..18684e62d3e 100644 --- a/keyboards/jolofsor/denial75/rules.mk +++ b/keyboards/jolofsor/denial75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index c2884886b62..996509d5047 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -8,6 +8,8 @@ "pid": "0x175A", "device_version": "0.3.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk index 5b420e24ead..0afd3b816aa 100644 --- a/keyboards/jones/v03/rules.mk +++ b/keyboards/jones/v03/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 365178b9d59..0bde4d3b5b2 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -8,6 +8,8 @@ "pid": "0x175A", "device_version": "0.3.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk index 93e442d4809..eff64d9a584 100644 --- a/keyboards/jones/v03_1/rules.mk +++ b/keyboards/jones/v03_1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index e323445fc9f..88966004445 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x175A", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk index 56d629cfe9d..cfc8879b74b 100644 --- a/keyboards/jones/v1/rules.mk +++ b/keyboards/jones/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index 9e0cf7be412..7de2ce45803 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk index cb35ae6cff8..60e4f7b0dee 100644 --- a/keyboards/jorne/rules.mk +++ b/keyboards/jorne/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json index b6491c7c95d..d6e1ee19aad 100644 --- a/keyboards/k34/info.json +++ b/keyboards/k34/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/k34/rules.mk b/keyboards/k34/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/k34/rules.mk +++ b/keyboards/k34/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json index 83668c5458c..7ca4605cef1 100644 --- a/keyboards/kabedon/kabedon78s/info.json +++ b/keyboards/kabedon/kabedon78s/info.json @@ -8,6 +8,8 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kabedon/kabedon78s/rules.mk b/keyboards/kabedon/kabedon78s/rules.mk index 30854a59b9e..360d1d3206b 100644 --- a/keyboards/kabedon/kabedon78s/rules.mk +++ b/keyboards/kabedon/kabedon78s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json index 879ea537be7..fc0384f649c 100644 --- a/keyboards/kabedon/kabedon980/info.json +++ b/keyboards/kabedon/kabedon980/info.json @@ -8,6 +8,8 @@ "pid": "0x3938", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kabedon/kabedon980/rules.mk b/keyboards/kabedon/kabedon980/rules.mk index 30854a59b9e..360d1d3206b 100644 --- a/keyboards/kabedon/kabedon980/rules.mk +++ b/keyboards/kabedon/kabedon980/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json index 60a1cd25c6b..c60ffa392ec 100644 --- a/keyboards/kabedon/kabedon98e/info.json +++ b/keyboards/kabedon/kabedon98e/info.json @@ -8,6 +8,8 @@ "pid": "0x3935", "device_version": "0.0.2" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kabedon/kabedon98e/rules.mk b/keyboards/kabedon/kabedon98e/rules.mk index 05b69c269a8..091969b61b4 100644 --- a/keyboards/kabedon/kabedon98e/rules.mk +++ b/keyboards/kabedon/kabedon98e/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json index a57b82bf04d..8cafe4cc7ee 100644 --- a/keyboards/kagizaraya/chidori/info.json +++ b/keyboards/kagizaraya/chidori/info.json @@ -8,6 +8,8 @@ "pid": "0x3942", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kagizaraya/chidori/rules.mk b/keyboards/kagizaraya/chidori/rules.mk index 371456cc09f..cbec27a8cbb 100644 --- a/keyboards/kagizaraya/chidori/rules.mk +++ b/keyboards/kagizaraya/chidori/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json index e3459726803..43ab1df6e9d 100644 --- a/keyboards/kagizaraya/halberd/info.json +++ b/keyboards/kagizaraya/halberd/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"!", "x":0, "y":0}, {"label":"@", "x":1, "y":0}, {"label":"#", "x":2, "y":0}, {"label":"$", "x":3, "y":0}, {"label":"%", "x":4, "y":0}, {"label":"Tab", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"_", "x":1, "y":1}, {"label":"+", "x":2, "y":1}, {"label":"|", "x":3, "y":1}, {"label":"~", "x":4, "y":1}, {"label":"BkSp", "x":5, "y":1}, {"label":":", "x":6, "y":1}, {"label":"\"", "x":7, "y":1}, {"label":">", "x":8, "y":1}, {"label":"{", "x":9, "y":1}, {"label":"}", "x":10, "y":1}, {"label":"Caps", "x":0, "y":2}, {"label":"-", "x":1, "y":2}, {"label":"=", "x":2, "y":2}, {"label":"\\", "x":3, "y":2}, {"label":"`", "x":4, "y":2}, {"label":"Enter", "x":5, "y":2}, {"label":";", "x":6, "y":2}, {"label":"'", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":"[", "x":9, "y":2}, {"label":"]", "x":10, "y":2}, {"label":"GUI", "x":2, "y":3}, {"label":"Lower", "x":3, "y":3}, {"label":"Esc", "x":4, "y":3}, {"x":5, "y":3}, {"label":"Shift", "x":6, "y":3}, {"label":"Raise", "x":7, "y":3}, {"label":"Alt", "x":8, "y":3}] diff --git a/keyboards/kagizaraya/halberd/rules.mk b/keyboards/kagizaraya/halberd/rules.mk index a979346fe5f..266798f905c 100644 --- a/keyboards/kagizaraya/halberd/rules.mk +++ b/keyboards/kagizaraya/halberd/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index 8b91a851eca..5eb3fcd8770 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -8,6 +8,8 @@ "pid": "0x3941", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":2, "y":0}, {"label":"1", "x":3, "y":0}, {"label":"2", "x":4, "y":0}, {"label":"3", "x":5, "y":0}, {"label":"4", "x":6, "y":0}, {"label":"5", "x":7, "y":0}, {"label":"_", "x":8, "y":0}, {"label":"+", "x":9.5, "y":0}, {"label":"6", "x":10.5, "y":0}, {"label":"7", "x":11.5, "y":0}, {"label":"8", "x":12.5, "y":0}, {"label":"9", "x":13.5, "y":0}, {"label":"0", "x":14.5, "y":0}, {"label":"\\", "x":15.5, "y":0}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"{", "x":7.75, "y":1}, {"label":"}", "x":9.75, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"Backace", "x":15.75, "y":1, "w":1.5}, {"label":"Control", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"~", "x":7.5, "y":2}, {"label":"\"", "x":10, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"Return", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"Caps", "x":7.25, "y":3}, {"label":"Del", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":1.75}, {"label":"Fn", "x":18, "y":3}, {"label":"", "x":2.75, "y":4, "w":1.25}, {"label":"", "x":4, "y":4, "w":1.25}, {"label":"Fn", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2}, {"x":10, "y":4, "w":2}, {"label":"Fn", "x":12, "y":4, "w":1.25}, {"label":"", "x":13.25, "y":4, "w":1.25}, {"label":"", "x":14.5, "y":4, "w":1.25}] diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk index 174790a3e9f..aa7fc332fe5 100644 --- a/keyboards/kagizaraya/scythe/rules.mk +++ b/keyboards/kagizaraya/scythe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/angel17/alpha/rules.mk b/keyboards/kakunpc/angel17/alpha/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/kakunpc/angel17/alpha/rules.mk +++ b/keyboards/kakunpc/angel17/alpha/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json index 1520131035a..da7b1d688ee 100644 --- a/keyboards/kakunpc/angel17/info.json +++ b/keyboards/kakunpc/angel17/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/kakunpc/angel17/rev1/rules.mk b/keyboards/kakunpc/angel17/rev1/rules.mk index dfe92e16583..7585984f784 100644 --- a/keyboards/kakunpc/angel17/rev1/rules.mk +++ b/keyboards/kakunpc/angel17/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/angel17/rules.mk b/keyboards/kakunpc/angel17/rules.mk index 96193268774..15778ab1d4b 100644 --- a/keyboards/kakunpc/angel17/rules.mk +++ b/keyboards/kakunpc/angel17/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json index a73004f0920..0fe4f0f5ab9 100644 --- a/keyboards/kakunpc/angel64/alpha/info.json +++ b/keyboards/kakunpc/angel64/alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x0A64", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"back", "x":13, "y":0}, {"label":"Q", "x":0, "y":1, "w":1.5}, {"label":"W", "x":1.5, "y":1}, {"label":"E", "x":2.5, "y":1}, {"label":"R", "x":3.5, "y":1}, {"label":"T", "x":4.5, "y":1}, {"label":"Y", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"I", "x":7.5, "y":1}, {"label":"O", "x":8.5, "y":1}, {"label":"P", "x":9.5, "y":1}, {"label":"[", "x":10.5, "y":1}, {"label":"]", "x":11.5, "y":1}, {"label":"|", "x":12.5, "y":1, "w":1.5}, {"label":"Ctrl", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";:", "x":10, "y":2}, {"label":"`", "x":11, "y":2}, {"label":"Enter", "x":12, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":"<", "x":8.5, "y":3}, {"label":">", "x":9.5, "y":3}, {"label":"?", "x":10.5, "y":3}, {"label":"\u2191", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3, "w":1.5}, {"label":"Caps", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Start", "x":2, "y":4, "w":1.5}, {"label":"Ctrl", "x":3.5, "y":4, "w":1.5}, {"label":"Space", "x":5, "y":4, "w":2}, {"label":"Ctrl", "x":7, "y":4, "w":1.5}, {"label":"Alt", "x":8.5, "y":4, "w":1.5}, {"label":"\u2190", "x":10, "y":4}, {"label":"\u2193", "x":11, "y":4}, {"label":"\u2192", "x":12, "y":4}, {"label":"Alt", "x":13, "y":4}] diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json index 688674c8c7f..77d034baeb9 100644 --- a/keyboards/kakunpc/angel64/rev1/info.json +++ b/keyboards/kakunpc/angel64/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0A64", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":":", "x":11, "y":2}, {"label":"\"", "x":12, "y":2}, {"label":"Enter", "x":13, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":2.5}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":"<", "x":9.5, "y":3}, {"label":">", "x":10.5, "y":3}, {"label":"?", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Alt", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":2.75, "y":4, "w":1.5}, {"x":4.25, "y":4}, {"x":5.25, "y":4, "w":1.5}, {"x":6.75, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Menu", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk index ca4e93f35cb..e10619259c7 100644 --- a/keyboards/kakunpc/angel64/rules.mk +++ b/keyboards/kakunpc/angel64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json index efa3ad965ad..3cbeeef196a 100644 --- a/keyboards/kakunpc/business_card/alpha/info.json +++ b/keyboards/kakunpc/business_card/alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk index e85829c1101..fa42618a3b0 100644 --- a/keyboards/kakunpc/business_card/alpha/rules.mk +++ b/keyboards/kakunpc/business_card/alpha/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json index 87c8c079301..1dab5c4d3af 100644 --- a/keyboards/kakunpc/business_card/beta/info.json +++ b/keyboards/kakunpc/business_card/beta/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk index e85829c1101..fa42618a3b0 100644 --- a/keyboards/kakunpc/business_card/beta/rules.mk +++ b/keyboards/kakunpc/business_card/beta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/business_card/rules.mk b/keyboards/kakunpc/business_card/rules.mk index ad9ea936af7..ffdd81c22b5 100644 --- a/keyboards/kakunpc/business_card/rules.mk +++ b/keyboards/kakunpc/business_card/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/choc_taro/info.json b/keyboards/kakunpc/choc_taro/info.json index d08b6a093db..495f8d31bca 100644 --- a/keyboards/kakunpc/choc_taro/info.json +++ b/keyboards/kakunpc/choc_taro/info.json @@ -8,6 +8,8 @@ "pid": "0xEB60", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kakunpc/choc_taro/rules.mk b/keyboards/kakunpc/choc_taro/rules.mk index b8b8a0bc354..46d6848acef 100644 --- a/keyboards/kakunpc/choc_taro/rules.mk +++ b/keyboards/kakunpc/choc_taro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json index d587ec1797e..fe65d480fb8 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/info.json +++ b/keyboards/kakunpc/rabbit_capture_plan/info.json @@ -8,6 +8,8 @@ "pid": "0xEB59", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kakunpc/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk index d6f3529e10a..18499a95838 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/rules.mk +++ b/keyboards/kakunpc/rabbit_capture_plan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json index 299c847aab3..76c31631ff7 100644 --- a/keyboards/kakunpc/suihankey/alpha/info.json +++ b/keyboards/kakunpc/suihankey/alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json index 299c847aab3..76c31631ff7 100644 --- a/keyboards/kakunpc/suihankey/rev1/info.json +++ b/keyboards/kakunpc/suihankey/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk index 332c7d73551..85df4231d50 100644 --- a/keyboards/kakunpc/suihankey/rules.mk +++ b/keyboards/kakunpc/suihankey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 43675197d0d..a2731271b14 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json index 5712db3d1b5..26b320083cc 100644 --- a/keyboards/kakunpc/thedogkeyboard/info.json +++ b/keyboards/kakunpc/thedogkeyboard/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"1", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"13", "x":3, "y":0}, {"label":"19", "x":4, "y":0}, {"label":"24", "x":5, "y":0}, {"label":"29", "x":6.5, "y":0}, {"label":"35", "x":7.5, "y":0}, {"label":"40", "x":8.5, "y":0}, {"label":"45", "x":9.5, "y":0}, {"label":"50", "x":11, "y":0}, {"label":"56", "x":12, "y":0}, {"label":"62", "x":13, "y":0}, {"label":"66", "x":14, "y":0}, {"label":"70", "x":15.25, "y":0}, {"label":"76", "x":16.25, "y":0}, {"label":"82", "x":17.25, "y":0}, {"label":"2", "x":0, "y":1.5}, {"label":"8", "x":1, "y":1.5}, {"label":"14", "x":2, "y":1.5}, {"label":"20", "x":3, "y":1.5}, {"label":"25", "x":4, "y":1.5}, {"label":"30", "x":5, "y":1.5}, {"label":"36", "x":6, "y":1.5}, {"label":"41", "x":7, "y":1.5}, {"label":"46", "x":8, "y":1.5}, {"label":"51", "x":9, "y":1.5}, {"label":"57", "x":10, "y":1.5}, {"label":"63", "x":11, "y":1.5}, {"label":"67", "x":12, "y":1.5}, {"label":"71", "x":13, "y":1.5, "w":2}, {"label":"77", "x":15.25, "y":1.5}, {"label":"84", "x":16.25, "y":1.5}, {"label":"83", "x":17.25, "y":1.5}, {"label":"88", "x":18.5, "y":1.5}, {"label":"93", "x":19.5, "y":1.5}, {"label":"97", "x":20.5, "y":1.5}, {"label":"102", "x":21.5, "y":1.5}, {"label":"3", "x":0, "y":2.5, "w":1.5}, {"label":"9", "x":1.5, "y":2.5}, {"label":"15", "x":2.5, "y":2.5}, {"label":"21", "x":3.5, "y":2.5}, {"label":"26", "x":4.5, "y":2.5}, {"label":"31", "x":5.5, "y":2.5}, {"label":"37", "x":6.5, "y":2.5}, {"label":"42", "x":7.5, "y":2.5}, {"label":"47", "x":8.5, "y":2.5}, {"label":"52", "x":9.5, "y":2.5}, {"label":"58", "x":10.5, "y":2.5}, {"label":"64", "x":11.5, "y":2.5}, {"label":"68", "x":12.5, "y":2.5}, {"label":"72", "x":13.5, "y":2.5, "w":1.5}, {"label":"78", "x":15.25, "y":2.5}, {"label":"86", "x":16.25, "y":2.5}, {"label":"85", "x":17.25, "y":2.5}, {"label":"89", "x":18.5, "y":2.5}, {"label":"94", "x":19.5, "y":2.5}, {"label":"98", "x":20.5, "y":2.5}, {"label":"103", "x":21.5, "y":2.5}, {"label":"4", "x":0, "y":3.5, "w":1.75}, {"label":"10", "x":1.75, "y":3.5}, {"label":"16", "x":2.75, "y":3.5}, {"label":"22", "x":3.75, "y":3.5}, {"label":"27", "x":4.75, "y":3.5}, {"label":"32", "x":5.75, "y":3.5}, {"label":"38", "x":6.75, "y":3.5}, {"label":"43", "x":7.75, "y":3.5}, {"label":"48", "x":8.75, "y":3.5}, {"label":"53", "x":9.75, "y":3.5}, {"label":"59", "x":10.75, "y":3.5}, {"label":"65", "x":11.75, "y":3.5}, {"label":"73", "x":12.75, "y":3.5, "w":2.25}, {"label":"90", "x":18.5, "y":3.5}, {"label":"95", "x":19.5, "y":3.5}, {"label":"99", "x":20.5, "y":3.5}, {"label":"110", "x":21.5, "y":3.5}, {"label":"5", "x":0, "y":4.5, "w":2.25}, {"label":"11", "x":2.25, "y":4.5}, {"label":"17", "x":3.25, "y":4.5}, {"label":"23", "x":4.25, "y":4.5}, {"label":"28", "x":5.25, "y":4.5}, {"label":"33", "x":6.25, "y":4.5}, {"label":"39", "x":7.25, "y":4.5}, {"label":"44", "x":8.25, "y":4.5}, {"label":"49", "x":9.25, "y":4.5}, {"label":"54", "x":10.25, "y":4.5}, {"label":"60", "x":11.25, "y":4.5}, {"label":"74", "x":12.25, "y":4.5, "w":2.75}, {"label":"87", "x":16.25, "y":4.5}, {"label":"91", "x":18.5, "y":4.5}, {"label":"96", "x":19.5, "y":4.5}, {"label":"100", "x":20.5, "y":4.5}, {"label":"104", "x":21.5, "y":4.5}, {"label":"6", "x":0, "y":5.5, "w":1.25}, {"label":"12", "x":1.25, "y":5.5, "w":1.25}, {"label":"18", "x":2.5, "y":5.5, "w":1.25}, {"label":"105", "x":3.75, "y":5.5, "w":1.25}, {"label":"106", "x":5, "y":5.5, "w":1.25}, {"label":"34", "x":6.25, "y":5.5, "w":1.25}, {"label":"107", "x":7.5, "y":5.5, "w":1.25}, {"label":"108", "x":8.75, "y":5.5, "w":1.25}, {"label":"55", "x":10, "y":5.5, "w":1.25}, {"label":"61", "x":11.25, "y":5.5, "w":1.25}, {"label":"69", "x":12.5, "y":5.5, "w":1.25}, {"label":"75", "x":13.75, "y":5.5, "w":1.25}, {"label":"79", "x":15.25, "y":5.5}, {"label":"80", "x":16.25, "y":5.5}, {"label":"81", "x":17.25, "y":5.5}, {"label":"92", "x":18.5, "y":5.5}, {"label":"109", "x":19.5, "y":5.5}, {"label":"101", "x":20.5, "y":5.5}, {"label":"111", "x":21.5, "y":5.5}] diff --git a/keyboards/kakunpc/thedogkeyboard/rules.mk b/keyboards/kakunpc/thedogkeyboard/rules.mk index b91a3736ad1..cc71e1e7cb1 100644 --- a/keyboards/kakunpc/thedogkeyboard/rules.mk +++ b/keyboards/kakunpc/thedogkeyboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json index 17d87084c89..9ded56205af 100644 --- a/keyboards/kapcave/arya/info.json +++ b/keyboards/kapcave/arya/info.json @@ -8,6 +8,8 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/kapcave/arya/rules.mk b/keyboards/kapcave/arya/rules.mk index 09800a48f25..bfdeb0e3ec9 100644 --- a/keyboards/kapcave/arya/rules.mk +++ b/keyboards/kapcave/arya/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/info.json index 70336b0fde5..3abf75460b9 100644 --- a/keyboards/kapcave/gskt00/info.json +++ b/keyboards/kapcave/gskt00/info.json @@ -8,6 +8,8 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_tsangan", "60_iso_tsangan"], "layouts": { "LAYOUT_60_ansi_tsangan": { diff --git a/keyboards/kapcave/gskt00/rules.mk b/keyboards/kapcave/gskt00/rules.mk index 4d2d6bb38c9..ebecd0f9dbe 100755 --- a/keyboards/kapcave/gskt00/rules.mk +++ b/keyboards/kapcave/gskt00/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json index a5bf4693e20..3188395d527 100644 --- a/keyboards/kapcave/paladin64/info.json +++ b/keyboards/kapcave/paladin64/info.json @@ -8,6 +8,8 @@ "pid": "0x5036", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kapcave/paladin64/rules.mk b/keyboards/kapcave/paladin64/rules.mk index e3b5ed2af1f..b483118606d 100755 --- a/keyboards/kapcave/paladin64/rules.mk +++ b/keyboards/kapcave/paladin64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index 4cbe1ca7c1c..fcc6ba49412 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -7,6 +7,8 @@ "vid": "0x4B43", "pid": "0x5050" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/kapcave/paladinpad/rules.mk b/keyboards/kapcave/paladinpad/rules.mk index 8eb12ac07a7..257c83aee0e 100644 --- a/keyboards/kapcave/paladinpad/rules.mk +++ b/keyboards/kapcave/paladinpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json index 2b497b9848e..9744e77019c 100644 --- a/keyboards/kapl/rev1/info.json +++ b/keyboards/kapl/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk index 19a0cb5fa41..e243d257030 100644 --- a/keyboards/kapl/rules.mk +++ b/keyboards/kapl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json index aef0551cb36..e37b1ce987b 100644 --- a/keyboards/karlb/kbic65/info.json +++ b/keyboards/karlb/kbic65/info.json @@ -32,6 +32,8 @@ "pid": "0xD87A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/karlb/kbic65/rules.mk b/keyboards/karlb/kbic65/rules.mk index f7da71aab2d..c5b4c0254f3 100644 --- a/keyboards/karlb/kbic65/rules.mk +++ b/keyboards/karlb/kbic65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json index 1ee4082433e..fecd3864669 100644 --- a/keyboards/kb58/info.json +++ b/keyboards/kb58/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk index 0854164fb63..d8ff9ad313d 100644 --- a/keyboards/kb58/rules.mk +++ b/keyboards/kb58/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json index 20311fa2f24..1035b0ba0b2 100644 --- a/keyboards/kb_elmo/67mk_e/info.json +++ b/keyboards/kb_elmo/67mk_e/info.json @@ -8,6 +8,8 @@ "pid": "0xD03E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kb_elmo/67mk_e/rules.mk b/keyboards/kb_elmo/67mk_e/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/kb_elmo/67mk_e/rules.mk +++ b/keyboards/kb_elmo/67mk_e/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json index ef94b0994e9..dfce0e1c7d7 100644 --- a/keyboards/kb_elmo/aek2_usb/info.json +++ b/keyboards/kb_elmo/aek2_usb/info.json @@ -8,6 +8,8 @@ "pid": "0xDB52", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/aek2_usb/rules.mk b/keyboards/kb_elmo/aek2_usb/rules.mk index b06d4ee3671..31ac76281ab 100644 --- a/keyboards/kb_elmo/aek2_usb/rules.mk +++ b/keyboards/kb_elmo/aek2_usb/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json index 47ad36826b7..a4e3e090e54 100644 --- a/keyboards/kb_elmo/elmopad/info.json +++ b/keyboards/kb_elmo/elmopad/info.json @@ -8,6 +8,8 @@ "pid": "0x8B35", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/kb_elmo/elmopad/rules.mk b/keyboards/kb_elmo/elmopad/rules.mk index 119cfde6115..31ac76281ab 100644 --- a/keyboards/kb_elmo/elmopad/rules.mk +++ b/keyboards/kb_elmo/elmopad/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega328p - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json index 4042b2677cd..ef7fb5a14e3 100644 --- a/keyboards/kb_elmo/isolation/info.json +++ b/keyboards/kb_elmo/isolation/info.json @@ -8,6 +8,8 @@ "pid": "0x4EE6", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/isolation/rules.mk b/keyboards/kb_elmo/isolation/rules.mk index 4450aebc2ad..f1b708c074f 100644 --- a/keyboards/kb_elmo/isolation/rules.mk +++ b/keyboards/kb_elmo/isolation/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega328p - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json index e515a1e1425..0663e627896 100644 --- a/keyboards/kb_elmo/m0110a_usb/info.json +++ b/keyboards/kb_elmo/m0110a_usb/info.json @@ -8,6 +8,8 @@ "pid": "0xDB4B", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0110a_usb/rules.mk b/keyboards/kb_elmo/m0110a_usb/rules.mk index b06d4ee3671..31ac76281ab 100644 --- a/keyboards/kb_elmo/m0110a_usb/rules.mk +++ b/keyboards/kb_elmo/m0110a_usb/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json index 1b52a8c0e6e..c22ec2912b8 100644 --- a/keyboards/kb_elmo/m0116_usb/info.json +++ b/keyboards/kb_elmo/m0116_usb/info.json @@ -8,6 +8,8 @@ "pid": "0x8F7E", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0116_usb/rules.mk b/keyboards/kb_elmo/m0116_usb/rules.mk index b06d4ee3671..31ac76281ab 100644 --- a/keyboards/kb_elmo/m0116_usb/rules.mk +++ b/keyboards/kb_elmo/m0116_usb/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json index 6d376287492..42c795888ab 100644 --- a/keyboards/kb_elmo/noah_avr/info.json +++ b/keyboards/kb_elmo/noah_avr/info.json @@ -8,6 +8,8 @@ "pid": "0x1DB0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi": "LAYOUT_65_ansi_blocker", "LAYOUT_ansi_splitbs": "LAYOUT_65_ansi_blocker_split_bs", diff --git a/keyboards/kb_elmo/noah_avr/rules.mk b/keyboards/kb_elmo/noah_avr/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/kb_elmo/noah_avr/rules.mk +++ b/keyboards/kb_elmo/noah_avr/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/info.json index a0c2da02f9f..54051e89fed 100644 --- a/keyboards/kb_elmo/qez/info.json +++ b/keyboards/kb_elmo/qez/info.json @@ -8,6 +8,8 @@ "pid": "0x675F", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/kb_elmo/qez/rules.mk b/keyboards/kb_elmo/qez/rules.mk index 43eb792fc16..6fe874e748b 100644 --- a/keyboards/kb_elmo/qez/rules.mk +++ b/keyboards/kb_elmo/qez/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json index 63ee23b4559..19aba72de86 100644 --- a/keyboards/kb_elmo/sesame/info.json +++ b/keyboards/kb_elmo/sesame/info.json @@ -8,6 +8,8 @@ "pid": "0xE2BD", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice": { diff --git a/keyboards/kb_elmo/sesame/rules.mk b/keyboards/kb_elmo/sesame/rules.mk index b06d4ee3671..31ac76281ab 100644 --- a/keyboards/kb_elmo/sesame/rules.mk +++ b/keyboards/kb_elmo/sesame/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json index 27a67923d0b..4c3764f4d07 100644 --- a/keyboards/kb_elmo/twelvekey/info.json +++ b/keyboards/kb_elmo/twelvekey/info.json @@ -8,6 +8,8 @@ "pid": "0x9879", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_3x4": { "layout": [{"x":0, "y":0}, diff --git a/keyboards/kb_elmo/twelvekey/rules.mk b/keyboards/kb_elmo/twelvekey/rules.mk index b5150a96c41..7d1ccce5cb8 100644 --- a/keyboards/kb_elmo/twelvekey/rules.mk +++ b/keyboards/kb_elmo/twelvekey/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega328p - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/kb_elmo/vertex/info.json b/keyboards/kb_elmo/vertex/info.json index e443ae5f720..571dcb674ca 100644 --- a/keyboards/kb_elmo/vertex/info.json +++ b/keyboards/kb_elmo/vertex/info.json @@ -8,6 +8,8 @@ "pid": "0x6B47", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_8keys": { "layout": [ diff --git a/keyboards/kb_elmo/vertex/rules.mk b/keyboards/kb_elmo/vertex/rules.mk index 20c49d4776c..ab2c49da70e 100644 --- a/keyboards/kb_elmo/vertex/rules.mk +++ b/keyboards/kb_elmo/vertex/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdclack/kaishi65/info.json b/keyboards/kbdclack/kaishi65/info.json index 5530a41d2b1..cad279ec3dc 100644 --- a/keyboards/kbdclack/kaishi65/info.json +++ b/keyboards/kbdclack/kaishi65/info.json @@ -8,6 +8,8 @@ "pid": "0x1A81", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/kbdclack/kaishi65/rules.mk b/keyboards/kbdclack/kaishi65/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/kbdclack/kaishi65/rules.mk +++ b/keyboards/kbdclack/kaishi65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index c9b4c545a9e..d179a751d8b 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -7,6 +7,8 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.25}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Win", "x":11, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}] diff --git a/keyboards/kbdfans/baguette66/rgb/rules.mk b/keyboards/kbdfans/baguette66/rgb/rules.mk index 17a78c939f1..2972c82a31f 100644 --- a/keyboards/kbdfans/baguette66/rgb/rules.mk +++ b/keyboards/kbdfans/baguette66/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/baguette66/soldered/info.json b/keyboards/kbdfans/baguette66/soldered/info.json index dbad08e2609..03b430da040 100644 --- a/keyboards/kbdfans/baguette66/soldered/info.json +++ b/keyboards/kbdfans/baguette66/soldered/info.json @@ -7,6 +7,8 @@ "pid": "0x0107", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.25}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Win", "x":11, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}] diff --git a/keyboards/kbdfans/baguette66/soldered/rules.mk b/keyboards/kbdfans/baguette66/soldered/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/kbdfans/baguette66/soldered/rules.mk +++ b/keyboards/kbdfans/baguette66/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json index 1e080471ce4..0a4763d0bd9 100644 --- a/keyboards/kbdfans/bella/rgb/info.json +++ b/keyboards/kbdfans/bella/rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15.25, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15.25, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15.25, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Fn", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.25}, {"label":"\u2193", "x":14.25, "y":5.25}, {"label":"\u2192", "x":15.25, "y":5.25}] diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk index 60a8bdbdb95..d65c419c556 100644 --- a/keyboards/kbdfans/bella/rgb/rules.mk +++ b/keyboards/kbdfans/bella/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json index 632f41a09e8..c1ba9a023ca 100644 --- a/keyboards/kbdfans/bella/rgb_iso/info.json +++ b/keyboards/kbdfans/bella/rgb_iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"Page Up", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Insert", "x":15.25, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"Delete", "x":15.25, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"~", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"Page Down", "x":15.25, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"|", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Fn", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.25}, {"label":"\u2193", "x":14.25, "y":5.25}, {"label":"\u2192", "x":15.25, "y":5.25}] diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk index 60a8bdbdb95..d65c419c556 100644 --- a/keyboards/kbdfans/bella/rgb_iso/rules.mk +++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/bella/soldered/info.json b/keyboards/kbdfans/bella/soldered/info.json index c958b17d4ad..ebe65f83484 100644 --- a/keyboards/kbdfans/bella/soldered/info.json +++ b/keyboards/kbdfans/bella/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kbdfans/bella/soldered/rules.mk b/keyboards/kbdfans/bella/soldered/rules.mk index 1c4073c9cee..b325f3f0c79 100755 --- a/keyboards/kbdfans/bella/soldered/rules.mk +++ b/keyboards/kbdfans/bella/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json index 97eddd4fe4d..16ed9b7963c 100644 --- a/keyboards/kbdfans/boop65/rgb/info.json +++ b/keyboards/kbdfans/boop65/rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/kbdfans/boop65/rgb/rules.mk b/keyboards/kbdfans/boop65/rgb/rules.mk index ca15c882ad1..2e8325c39de 100644 --- a/keyboards/kbdfans/boop65/rgb/rules.mk +++ b/keyboards/kbdfans/boop65/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index bc9622f8745..d1f6186627c 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -7,6 +7,8 @@ "pid": "0x7001", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"PrtSc", "x":14, "y":0}, {"label":"Pause", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Home", "x":15.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15.25, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}] diff --git a/keyboards/kbdfans/bounce/75/hotswap/rules.mk b/keyboards/kbdfans/bounce/75/hotswap/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/rules.mk +++ b/keyboards/kbdfans/bounce/75/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index 00ae5d3f6ff..ab2ca4ba7ac 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x7000", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kbdfans/bounce/75/soldered/rules.mk b/keyboards/kbdfans/bounce/75/soldered/rules.mk index cb5238f27dc..bb40a3ee66c 100644 --- a/keyboards/kbdfans/bounce/75/soldered/rules.mk +++ b/keyboards/kbdfans/bounce/75/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json index e929b8ec789..d431567c24d 100644 --- a/keyboards/kbdfans/bounce/pad/info.json +++ b/keyboards/kbdfans/bounce/pad/info.json @@ -7,6 +7,8 @@ "pid": "0x7002", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/kbdfans/bounce/pad/rules.mk b/keyboards/kbdfans/bounce/pad/rules.mk index e8822e805a7..0942de29321 100644 --- a/keyboards/kbdfans/bounce/pad/rules.mk +++ b/keyboards/kbdfans/bounce/pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index d5c0c68197b..cbf3fbfe233 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -8,6 +8,8 @@ "pid": "0x0191", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/kbdfans/kbd19x/rules.mk b/keyboards/kbdfans/kbd19x/rules.mk index 35fbff0af95..a4b56c37ddd 100644 --- a/keyboards/kbdfans/kbd19x/rules.mk +++ b/keyboards/kbdfans/kbd19x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 23524284059..620855a79fd 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/kbdfans/kbd4x/rules.mk b/keyboards/kbdfans/kbd4x/rules.mk index 7e05b06b891..33020c98c40 100644 --- a/keyboards/kbdfans/kbd4x/rules.mk +++ b/keyboards/kbdfans/kbd4x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd66/info.json b/keyboards/kbdfans/kbd66/info.json index bed764ef6ab..3d12131caee 100644 --- a/keyboards/kbdfans/kbd66/info.json +++ b/keyboards/kbdfans/kbd66/info.json @@ -8,6 +8,8 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.25}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":2.75}, {"x":6.75, "y":4, "w":2.75}, {"label":"Alt", "x":9.5, "y":4, "w":1.5}, {"label":"Win", "x":11, "y":4, "w":1.25}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}] diff --git a/keyboards/kbdfans/kbd66/rules.mk b/keyboards/kbdfans/kbd66/rules.mk index 58af7540604..df4dea661be 100644 --- a/keyboards/kbdfans/kbd66/rules.mk +++ b/keyboards/kbdfans/kbd66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index ac7f27254b3..25ffaef2513 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], "layouts": { "LAYOUT": { diff --git a/keyboards/kbdfans/kbd67/hotswap/rules.mk b/keyboards/kbdfans/kbd67/hotswap/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/kbdfans/kbd67/hotswap/rules.mk +++ b/keyboards/kbdfans/kbd67/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/info.json index 8ddc9eec2f7..99fa9359002 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json +++ b/keyboards/kbdfans/kbd67/mkii_soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk index fa4a60486a5..5e28d2cc453 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk +++ b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json index d5baf103110..703797f89e2 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json @@ -4,5 +4,8 @@ "pid": "0x1224", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk index 72e21b2c614..cd78765d76a 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json index 3eacb6df686..ac7d892196e 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json @@ -4,5 +4,7 @@ "pid": "0x1225", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3 } diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk index 50b64f9cfbd..39afa4b3483 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json index 496016ea8c6..75971d682d1 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x1226", "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "lufa-ms" } diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk index 8f6dee4c8a2..67366c7a000 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms BOOTLOADER_SIZE = 6144 # Build Options diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index 1bb937c0c2d..36ed264dadc 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x1227", "device_version": "0.0.4" - } + }, + "processor": "atmega32u4", + "bootloader": "lufa-ms" } diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk index bf2c1d1a6e0..653cd377ab3 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json index ea4576001ee..e9f206395e8 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0105", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_65_iso_blocker": { diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk index 26e6dd78184..699a9f9384d 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms BOOTLOADER_SIZE = 6144 # Build Options diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index cfbdb417cad..dec2a09e946 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk index f9b746baf0f..99067f7d6a3 100644 --- a/keyboards/kbdfans/kbd67/rev1/rules.mk +++ b/keyboards/kbdfans/kbd67/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index 0d7dee132a3..c6da451c5a2 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x6067", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs", "LAYOUT_65_ansi_split_bs_2_right_mods": "LAYOUT_65_ansi_rwkl_split_bs" diff --git a/keyboards/kbdfans/kbd67/rev2/rules.mk b/keyboards/kbdfans/kbd67/rev2/rules.mk index 2234de0511e..8ff144aa352 100644 --- a/keyboards/kbdfans/kbd67/rev2/rules.mk +++ b/keyboards/kbdfans/kbd67/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index a6e410878cd..7ec9838d2a5 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -8,6 +8,8 @@ "pid": "0x3658", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/kbdfans/kbd6x/rules.mk b/keyboards/kbdfans/kbd6x/rules.mk index 0a0f62cdc06..999f36c7db2 100644 --- a/keyboards/kbdfans/kbd6x/rules.mk +++ b/keyboards/kbdfans/kbd6x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index f7904b646fc..d9a14dc7a49 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/kbdfans/kbd75/rev1/rules.mk +++ b/keyboards/kbdfans/kbd75/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 0677ddadb8d..4a6b902925b 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x6061", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/kbdfans/kbd75/rev2/rules.mk +++ b/keyboards/kbdfans/kbd75/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index 11085f74de9..460dca30d1d 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -7,6 +7,8 @@ "pid": "0x6062", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/kbdfans/kbd75hs/rules.mk b/keyboards/kbdfans/kbd75hs/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/kbdfans/kbd75hs/rules.mk +++ b/keyboards/kbdfans/kbd75hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index 984b6a3bf6d..63ce9ebf36d 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/kbdfans/kbd75rgb/rules.mk b/keyboards/kbdfans/kbd75rgb/rules.mk index bf3d21991c8..d8e620b77d3 100644 --- a/keyboards/kbdfans/kbd75rgb/rules.mk +++ b/keyboards/kbdfans/kbd75rgb/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index 8749577d634..adf2f98b52a 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/kbdfans/kbd8x/rules.mk b/keyboards/kbdfans/kbd8x/rules.mk index 55fef17f29a..80535f911d2 100644 --- a/keyboards/kbdfans/kbd8x/rules.mk +++ b/keyboards/kbdfans/kbd8x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 763727529bf..8530aaf773c 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT": { diff --git a/keyboards/kbdfans/kbd8x_mk2/rules.mk b/keyboards/kbdfans/kbd8x_mk2/rules.mk index 63a57dcadb9..45377383806 100644 --- a/keyboards/kbdfans/kbd8x_mk2/rules.mk +++ b/keyboards/kbdfans/kbd8x_mk2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json index e105b510027..0ed41d99f0b 100644 --- a/keyboards/kbdfans/kbdmini/info.json +++ b/keyboards/kbdfans/kbdmini/info.json @@ -8,6 +8,8 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk index 6f1f01eebe1..daa102eb3fa 100644 --- a/keyboards/kbdfans/kbdmini/rules.mk +++ b/keyboards/kbdfans/kbdmini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index 25dd4eb7eae..9e7fdb2b83e 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["ortho_6x4", "numpad_6x4"], "layouts": { "LAYOUT": { diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk index 779bddfc490..98e6c701436 100644 --- a/keyboards/kbdfans/kbdpad/mk1/rules.mk +++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index c1678fa246e..74ff3cbeaa1 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/kbdfans/kbdpad/mk2/rules.mk b/keyboards/kbdfans/kbdpad/mk2/rules.mk index 76081061950..45377383806 100644 --- a/keyboards/kbdfans/kbdpad/mk2/rules.mk +++ b/keyboards/kbdfans/kbdpad/mk2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json index ad3c41e9d7b..cc1dadcf919 100644 --- a/keyboards/kbdfans/maja/info.json +++ b/keyboards/kbdfans/maja/info.json @@ -8,6 +8,8 @@ "pid": "0x6068", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk index 07ffe11355a..ba5c2a94f72 100755 --- a/keyboards/kbdfans/maja/rules.mk +++ b/keyboards/kbdfans/maja/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json index f883ff82214..b6e15112a39 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk index 9385d5e1766..ea875031b1f 100755 --- a/keyboards/kbdfans/maja_soldered/rules.mk +++ b/keyboards/kbdfans/maja_soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index 569995736b9..7b724cc38d6 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/kbdfans/niu_mini/rules.mk b/keyboards/kbdfans/niu_mini/rules.mk index 4f5d2e7f80b..d8d8866c48b 100644 --- a/keyboards/kbdfans/niu_mini/rules.mk +++ b/keyboards/kbdfans/niu_mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json index b4845f94681..1de70047396 100644 --- a/keyboards/kbdfans/odin/rgb/info.json +++ b/keyboards/kbdfans/odin/rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0102", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk index 212eb8ba080..38a6bb6887f 100644 --- a/keyboards/kbdfans/odin/rgb/rules.mk +++ b/keyboards/kbdfans/odin/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index bf0f0b55642..c806c294813 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "debounce": 15, "layouts": { "LAYOUT_all": { diff --git a/keyboards/kbdfans/odin/soldered/rules.mk b/keyboards/kbdfans/odin/soldered/rules.mk index aefc49d3c1f..9e42693cb69 100644 --- a/keyboards/kbdfans/odin/soldered/rules.mk +++ b/keyboards/kbdfans/odin/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 2a2c71fa2e5..f6644bb2938 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdfans/odin/v2/rules.mk b/keyboards/kbdfans/odin/v2/rules.mk index 8728fe0a377..0f15f10b208 100644 --- a/keyboards/kbdfans/odin/v2/rules.mk +++ b/keyboards/kbdfans/odin/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index 45ad884530c..567f6aa68b8 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -8,6 +8,8 @@ "pid": "0x0103", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_wkl": "LAYOUT_65_ansi_blocker_tsangan_wkl" }, diff --git a/keyboards/kbdfans/phaseone/rules.mk b/keyboards/kbdfans/phaseone/rules.mk index b5761555d40..3c777809b4a 100644 --- a/keyboards/kbdfans/phaseone/rules.mk +++ b/keyboards/kbdfans/phaseone/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index f9fed731e1f..40a32fdc01e 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan" }, diff --git a/keyboards/kbdfans/tiger80/rules.mk b/keyboards/kbdfans/tiger80/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/kbdfans/tiger80/rules.mk +++ b/keyboards/kbdfans/tiger80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json index 99d8fe874cc..8019c480bde 100644 --- a/keyboards/kbnordic/nordic60/rev_a/info.json +++ b/keyboards/kbnordic/nordic60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kbnordic/nordic60/rev_a/rules.mk b/keyboards/kbnordic/nordic60/rev_a/rules.mk index 43eb792fc16..6fe874e748b 100644 --- a/keyboards/kbnordic/nordic60/rev_a/rules.mk +++ b/keyboards/kbnordic/nordic60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json index 4c9882e28d0..e1b13f46a08 100644 --- a/keyboards/kc60/info.json +++ b/keyboards/kc60/info.json @@ -8,6 +8,8 @@ "pid": "0x6FFC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk index cd916bca42e..2b2f2b1159a 100644 --- a/keyboards/kc60/rules.mk +++ b/keyboards/kc60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kc60se/info.json b/keyboards/kc60se/info.json index bb65f8a34bb..3815eaf7a35 100644 --- a/keyboards/kc60se/info.json +++ b/keyboards/kc60se/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kc60se/rules.mk b/keyboards/kc60se/rules.mk index c578c01a208..aa085b605e5 100644 --- a/keyboards/kc60se/rules.mk +++ b/keyboards/kc60se/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 858dcfc9482..fb16f585bb9 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -8,6 +8,8 @@ "pid": "0x1111", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk index f48fee9a210..514d88831ac 100644 --- a/keyboards/keebio/bamfk1/rules.mk +++ b/keyboards/keebio/bamfk1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json index 0704d0e1d21..5559d586e9c 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/info.json @@ -8,6 +8,8 @@ "pid": "0x1114", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk index b8ae2544137..a236a21bdec 100644 --- a/keyboards/keebio/bamfk4/rules.mk +++ b/keyboards/keebio/bamfk4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json index 768ad3ad9b6..a308d1c87c5 100644 --- a/keyboards/keebio/bdn9/rev1/info.json +++ b/keyboards/keebio/bdn9/rev1/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x1133", "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keebio/bdn9/rev1/rules.mk b/keyboards/keebio/bdn9/rev1/rules.mk index 05449ecfe8a..b0fc1d94e5d 100644 --- a/keyboards/keebio/bdn9/rev1/rules.mk +++ b/keyboards/keebio/bdn9/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json index 2a610ba304f..04d22a19365 100644 --- a/keyboards/keebio/bdn9/rev2/info.json +++ b/keyboards/keebio/bdn9/rev2/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x2133", "device_version": "2.0.0" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk index b9272d860a1..a692875bb56 100644 --- a/keyboards/keebio/bdn9/rev2/rules.mk +++ b/keyboards/keebio/bdn9/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json index 3e455b3d6e2..05f69696d42 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/info.json @@ -8,6 +8,8 @@ "pid": "0x1169", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk index 6ed299d0edd..743a54659e1 100644 --- a/keyboards/keebio/bfo9000/rules.mk +++ b/keyboards/keebio/bfo9000/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json index d66ef5b5ce4..df0cb6d9e89 100644 --- a/keyboards/keebio/bigswitchseat/info.json +++ b/keyboards/keebio/bigswitchseat/info.json @@ -8,6 +8,8 @@ "pid": "0x1011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}] diff --git a/keyboards/keebio/bigswitchseat/rules.mk b/keyboards/keebio/bigswitchseat/rules.mk index d6d12ae0dbf..3f6eff7f550 100644 --- a/keyboards/keebio/bigswitchseat/rules.mk +++ b/keyboards/keebio/bigswitchseat/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index ab9876387a3..f92da2ad137 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -8,6 +8,8 @@ "pid": "0x1154", "device_version": "1.0.0" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/keebio/choconum/rules.mk b/keyboards/keebio/choconum/rules.mk index d9e4f3e842f..f3805c2acc5 100644 --- a/keyboards/keebio/choconum/rules.mk +++ b/keyboards/keebio/choconum/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json index c82efccde96..eee4f8170db 100644 --- a/keyboards/keebio/chocopad/info.json +++ b/keyboards/keebio/chocopad/info.json @@ -8,6 +8,8 @@ "pid": "0x1144", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/keebio/chocopad/rules.mk b/keyboards/keebio/chocopad/rules.mk index 2f93c82229d..ce70b7c8f23 100644 --- a/keyboards/keebio/chocopad/rules.mk +++ b/keyboards/keebio/chocopad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json index 5d17ad28e91..b1189b9e62f 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/info.json @@ -8,6 +8,8 @@ "pid": "0x113A", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/keebio/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk index f01bc5cb32d..32e82925ccf 100644 --- a/keyboards/keebio/dilly/rules.mk +++ b/keyboards/keebio/dilly/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json index 3d5ce68f5fd..f50ee33ed30 100644 --- a/keyboards/keebio/dsp40/rev1/info.json +++ b/keyboards/keebio/dsp40/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x144C", "device_version": "1.0.0" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/dsp40/rev1/rules.mk b/keyboards/keebio/dsp40/rev1/rules.mk index 1b86273b88e..8c70082a374 100644 --- a/keyboards/keebio/dsp40/rev1/rules.mk +++ b/keyboards/keebio/dsp40/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json index 55090a01dc7..3e5ba3e17c7 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/info.json @@ -8,6 +8,8 @@ "pid": "0x125F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/ergodicity/rules.mk b/keyboards/keebio/ergodicity/rules.mk index 719d3243467..c358b798e4c 100644 --- a/keyboards/keebio/ergodicity/rules.mk +++ b/keyboards/keebio/ergodicity/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json index da06fadac12..851ea3227a2 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1258", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk index cfab94fa0f5..744acea63fe 100644 --- a/keyboards/keebio/foldkb/rules.mk +++ b/keyboards/keebio/foldkb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 598ca2af783..c7ccdd6f674 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -8,6 +8,8 @@ "pid": "0x1247", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk index c1d341a7c80..ff93a339143 100644 --- a/keyboards/keebio/fourier/rules.mk +++ b/keyboards/keebio/fourier/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json index 414db5ad6a9..8daff17bfce 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x1256", "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk index 4b17f9c833c..12e5a0674bb 100644 --- a/keyboards/keebio/iris/rev1/rules.mk +++ b/keyboards/keebio/iris/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json index 38b09bbe35f..98cd499b5be 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x1256", "device_version": "1.1.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk index 4b17f9c833c..12e5a0674bb 100644 --- a/keyboards/keebio/iris/rev1_led/rules.mk +++ b/keyboards/keebio/iris/rev1_led/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json index dd223d4f949..c0d2528df40 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x2256", "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk index 314daabe3fc..286733cc508 100644 --- a/keyboards/keebio/iris/rev2/rules.mk +++ b/keyboards/keebio/iris/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index af6215b2019..fe7973b3681 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x3256", "device_version": "3.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu" } diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk index b3b724cc1b2..44c1c1fac3f 100644 --- a/keyboards/keebio/iris/rev3/rules.mk +++ b/keyboards/keebio/iris/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index aa42788154b..732623daab1 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x4256", "device_version": "4.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu" } diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk index b1ee82a5274..02da189f9ea 100644 --- a/keyboards/keebio/iris/rev4/rules.mk +++ b/keyboards/keebio/iris/rev4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 60a73d42522..dda77533e28 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x5256", "device_version": "5.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu" } diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk index 4425ef2f9ba..8859d8f69ca 100644 --- a/keyboards/keebio/iris/rev5/rules.mk +++ b/keyboards/keebio/iris/rev5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json index 86dc585c816..c7fcfe9c792 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6256", "device_version": "6.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk index 87f19b5fc1c..5dcf2c2b7cf 100644 --- a/keyboards/keebio/iris/rev6/rules.mk +++ b/keyboards/keebio/iris/rev6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json index c580018ea7e..4d551fd759f 100644 --- a/keyboards/keebio/iris/rev6a/info.json +++ b/keyboards/keebio/iris/rev6a/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6356", "device_version": "6.1.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/keebio/iris/rev6a/rules.mk b/keyboards/keebio/iris/rev6a/rules.mk index 87f19b5fc1c..5dcf2c2b7cf 100644 --- a/keyboards/keebio/iris/rev6a/rules.mk +++ b/keyboards/keebio/iris/rev6a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json index eafae192024..38a90c7b865 100644 --- a/keyboards/keebio/iris/rev6b/info.json +++ b/keyboards/keebio/iris/rev6b/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6456", "device_version": "6.2.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/keebio/iris/rev6b/rules.mk b/keyboards/keebio/iris/rev6b/rules.mk index 87f19b5fc1c..5dcf2c2b7cf 100644 --- a/keyboards/keebio/iris/rev6b/rules.mk +++ b/keyboards/keebio/iris/rev6b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json index b0ba3ca359a..74767c0d08f 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x7256", "device_version": "7.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk index 87f19b5fc1c..5dcf2c2b7cf 100644 --- a/keyboards/keebio/iris/rev7/rules.mk +++ b/keyboards/keebio/iris/rev7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json index b07e73f17e8..affa6eb60cb 100644 --- a/keyboards/keebio/kbo5000/rev1/info.json +++ b/keyboards/keebio/kbo5000/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x126A", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk index 5608cb60232..68661bd7dcf 100644 --- a/keyboards/keebio/kbo5000/rules.mk +++ b/keyboards/keebio/kbo5000/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json index 364bc08c0b9..21312f64f38 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/info.json @@ -8,6 +8,8 @@ "pid": "0x1147", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/laplace/rules.mk b/keyboards/keebio/laplace/rules.mk index 619bf27b555..fb930c2a929 100644 --- a/keyboards/keebio/laplace/rules.mk +++ b/keyboards/keebio/laplace/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json index 23c6cdf984e..2bf92724bbb 100644 --- a/keyboards/keebio/levinson/info.json +++ b/keyboards/keebio/levinson/info.json @@ -6,6 +6,8 @@ "usb": { "vid": "0xCB10" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk index 7d7ee3efbfe..249f8878816 100644 --- a/keyboards/keebio/levinson/rules.mk +++ b/keyboards/keebio/levinson/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json index 76affd233c4..72d85f675bd 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x1156", "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk index d27f63fd10e..714a247e2bd 100644 --- a/keyboards/keebio/nyquist/rev1/rules.mk +++ b/keyboards/keebio/nyquist/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json index 579fa5acb28..8b83b5bbad0 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x2156", "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk index bbfdb402e9a..83432f0b5e6 100644 --- a/keyboards/keebio/nyquist/rev2/rules.mk +++ b/keyboards/keebio/nyquist/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json index 1de3fe17c5b..b0f243e4953 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x3156", "device_version": "3.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu" } diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk index 82366bb64c6..83432f0b5e6 100644 --- a/keyboards/keebio/nyquist/rev3/rules.mk +++ b/keyboards/keebio/nyquist/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json index 44832344996..b5e55f6febc 100644 --- a/keyboards/keebio/quefrency/rev1/info.json +++ b/keyboards/keebio/quefrency/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1257", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/quefrency/rev1/rules.mk b/keyboards/keebio/quefrency/rev1/rules.mk index 14423312b07..b771d431ad5 100644 --- a/keyboards/keebio/quefrency/rev1/rules.mk +++ b/keyboards/keebio/quefrency/rev1/rules.mk @@ -1,3 +1 @@ -BOOTLOADER = caterina - MOUSEKEY_ENABLE = yes # Mouse keys diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json index e68f0ce8926..bf7b3be9efd 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x2257", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev2/rules.mk b/keyboards/keebio/quefrency/rev2/rules.mk index 0a368deb47b..32e78815991 100644 --- a/keyboards/keebio/quefrency/rev2/rules.mk +++ b/keyboards/keebio/quefrency/rev2/rules.mk @@ -1,4 +1,3 @@ -BOOTLOADER = atmel-dfu BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json index 5baacbb4de7..80b2a6316ac 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x3357", "device_version": "3.1.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev3/rules.mk b/keyboards/keebio/quefrency/rev3/rules.mk index 0a368deb47b..32e78815991 100644 --- a/keyboards/keebio/quefrency/rev3/rules.mk +++ b/keyboards/keebio/quefrency/rev3/rules.mk @@ -1,4 +1,3 @@ -BOOTLOADER = atmel-dfu BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json index b4010a3814c..2efe174ead3 100644 --- a/keyboards/keebio/quefrency/rev4/info.json +++ b/keyboards/keebio/quefrency/rev4/info.json @@ -8,6 +8,8 @@ "pid": "0x4357", "device_version": "4.1.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev4/rules.mk b/keyboards/keebio/quefrency/rev4/rules.mk index f071ae81b8a..ab97bd78f35 100644 --- a/keyboards/keebio/quefrency/rev4/rules.mk +++ b/keyboards/keebio/quefrency/rev4/rules.mk @@ -1,4 +1,3 @@ -BOOTLOADER = atmel-dfu BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json index 02b0673be53..601452b797a 100644 --- a/keyboards/keebio/quefrency/rev5/info.json +++ b/keyboards/keebio/quefrency/rev5/info.json @@ -8,6 +8,8 @@ "pid": "0x5357", "device_version": "5.1.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev5/rules.mk b/keyboards/keebio/quefrency/rev5/rules.mk index f071ae81b8a..ab97bd78f35 100644 --- a/keyboards/keebio/quefrency/rev5/rules.mk +++ b/keyboards/keebio/quefrency/rev5/rules.mk @@ -1,4 +1,3 @@ -BOOTLOADER = atmel-dfu BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk index b65828319c0..cd165afef28 100644 --- a/keyboards/keebio/quefrency/rules.mk +++ b/keyboards/keebio/quefrency/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index 8e04c211dd6..5bc03470274 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x1246", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk index 6e3d022b027..baf3beba146 100644 --- a/keyboards/keebio/rorschach/rules.mk +++ b/keyboards/keebio/rorschach/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json index 0a45edc35fc..c247e3ae990 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/info.json @@ -8,6 +8,8 @@ "pid": "0x111C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk index 996fef2ad1c..d5f501196c8 100644 --- a/keyboards/keebio/stick/rules.mk +++ b/keyboards/keebio/stick/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json index a9262a28e39..e498a1c49ae 100644 --- a/keyboards/keebio/tragicforce68/info.json +++ b/keyboards/keebio/tragicforce68/info.json @@ -8,6 +8,8 @@ "pid": "0x0510", "device_version": "1.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/keebio/tragicforce68/rules.mk b/keyboards/keebio/tragicforce68/rules.mk index 7b4dc1fa2be..86bb2554d89 100644 --- a/keyboards/keebio/tragicforce68/rules.mk +++ b/keyboards/keebio/tragicforce68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json index 4427d0cc8b7..27a5159c0e3 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/info.json @@ -8,6 +8,8 @@ "pid": "0x1112", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/tukey/rules.mk b/keyboards/keebio/tukey/rules.mk index e4e00e62741..4465ace1727 100644 --- a/keyboards/keebio/tukey/rules.mk +++ b/keyboards/keebio/tukey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json index 9f2be26a42b..0b6d002758f 100644 --- a/keyboards/keebio/viterbi/info.json +++ b/keyboards/keebio/viterbi/info.json @@ -5,6 +5,8 @@ "usb": { "vid": "0xCB10" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT": { diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 6d42e54aa85..2008e63b003 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json index 45d1b7517f8..8a313f55250 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/info.json @@ -8,6 +8,8 @@ "pid": "0x1046", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { diff --git a/keyboards/keebio/wavelet/rules.mk b/keyboards/keebio/wavelet/rules.mk index 75c2eab3c96..74f0e0d5666 100644 --- a/keyboards/keebio/wavelet/rules.mk +++ b/keyboards/keebio/wavelet/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json index 95092b56646..d6932595cf0 100644 --- a/keyboards/keebio/wtf60/info.json +++ b/keyboards/keebio/wtf60/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_full_wtf": { diff --git a/keyboards/keebio/wtf60/rules.mk b/keyboards/keebio/wtf60/rules.mk index 2ba490fbb30..d34a5e4685a 100644 --- a/keyboards/keebio/wtf60/rules.mk +++ b/keyboards/keebio/wtf60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json index f05d80e2ea7..802f3d63600 100644 --- a/keyboards/keebmonkey/kbmg68/info.json +++ b/keyboards/keebmonkey/kbmg68/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keebmonkey/kbmg68/rules.mk b/keyboards/keebmonkey/kbmg68/rules.mk index 92d41db80a9..10d95a77523 100644 --- a/keyboards/keebmonkey/kbmg68/rules.mk +++ b/keyboards/keebmonkey/kbmg68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json index 325670d304e..3f31eaf65f9 100644 --- a/keyboards/keebsforall/coarse60/info.json +++ b/keyboards/keebsforall/coarse60/info.json @@ -8,6 +8,8 @@ "pid": "0x5341", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/keebsforall/coarse60/rules.mk b/keyboards/keebsforall/coarse60/rules.mk index 8c88a08e065..5b122a7b503 100644 --- a/keyboards/keebsforall/coarse60/rules.mk +++ b/keyboards/keebsforall/coarse60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebsforall/freebird60/info.json b/keyboards/keebsforall/freebird60/info.json index a6d6b973252..4cd786a174e 100644 --- a/keyboards/keebsforall/freebird60/info.json +++ b/keyboards/keebsforall/freebird60/info.json @@ -8,6 +8,8 @@ "pid": "0xFB60", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/keebsforall/freebird60/rules.mk b/keyboards/keebsforall/freebird60/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/keebsforall/freebird60/rules.mk +++ b/keyboards/keebsforall/freebird60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json index 7e84e2527b7..599d592fc02 100644 --- a/keyboards/keebsforall/freebirdnp/lite/info.json +++ b/keyboards/keebsforall/freebirdnp/lite/info.json @@ -8,6 +8,8 @@ "pid": "0x1013", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/keebsforall/freebirdnp/lite/rules.mk b/keyboards/keebsforall/freebirdnp/lite/rules.mk index 20c49d4776c..ab2c49da70e 100644 --- a/keyboards/keebsforall/freebirdnp/lite/rules.mk +++ b/keyboards/keebsforall/freebirdnp/lite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json index 7f2ab933419..40723c36996 100644 --- a/keyboards/keebsforall/freebirdnp/pro/info.json +++ b/keyboards/keebsforall/freebirdnp/pro/info.json @@ -8,6 +8,8 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/keebsforall/freebirdnp/pro/rules.mk b/keyboards/keebsforall/freebirdnp/pro/rules.mk index 86534dd3070..b03b6fa9058 100644 --- a/keyboards/keebsforall/freebirdnp/pro/rules.mk +++ b/keyboards/keebsforall/freebirdnp/pro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebsforall/freebirdtkl/info.json b/keyboards/keebsforall/freebirdtkl/info.json index 4c7f8de39e6..a55626c908f 100644 --- a/keyboards/keebsforall/freebirdtkl/info.json +++ b/keyboards/keebsforall/freebirdtkl/info.json @@ -8,6 +8,8 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi", "LAYOUT_tsangan": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift", diff --git a/keyboards/keebsforall/freebirdtkl/rules.mk b/keyboards/keebsforall/freebirdtkl/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/keebsforall/freebirdtkl/rules.mk +++ b/keyboards/keebsforall/freebirdtkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebwerk/mega/ansi/info.json b/keyboards/keebwerk/mega/ansi/info.json index 36a0e23f35f..6cd20c2a321 100755 --- a/keyboards/keebwerk/mega/ansi/info.json +++ b/keyboards/keebwerk/mega/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x4B41", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk index bf55603027c..5546dc18d47 100755 --- a/keyboards/keebwerk/mega/ansi/rules.mk +++ b/keyboards/keebwerk/mega/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json index 257bc711108..1d843e14754 100644 --- a/keyboards/keebwerk/nano_slider/info.json +++ b/keyboards/keebwerk/nano_slider/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebwerk/nano_slider/rules.mk b/keyboards/keebwerk/nano_slider/rules.mk index 5412232d0f9..a7fcafd4b90 100644 --- a/keyboards/keebwerk/nano_slider/rules.mk +++ b/keyboards/keebwerk/nano_slider/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebzdotnet/fme/info.json b/keyboards/keebzdotnet/fme/info.json index 3c243798650..51691bbce4c 100644 --- a/keyboards/keebzdotnet/fme/info.json +++ b/keyboards/keebzdotnet/fme/info.json @@ -8,6 +8,8 @@ "pid": "0x8008", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/keebzdotnet/fme/rules.mk b/keyboards/keebzdotnet/fme/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/keebzdotnet/fme/rules.mk +++ b/keyboards/keebzdotnet/fme/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json index 699a588cf43..c5884b6402c 100644 --- a/keyboards/keebzdotnet/wazowski/info.json +++ b/keyboards/keebzdotnet/wazowski/info.json @@ -8,6 +8,8 @@ "pid": "0x53FC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebzdotnet/wazowski/rules.mk b/keyboards/keebzdotnet/wazowski/rules.mk index 2098a160c08..6e0404820cd 100644 --- a/keyboards/keebzdotnet/wazowski/rules.mk +++ b/keyboards/keebzdotnet/wazowski/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json index a47bfdb7b8e..f59808bf117 100644 --- a/keyboards/kegen/gboy/info.json +++ b/keyboards/kegen/gboy/info.json @@ -8,6 +8,8 @@ "pid": "0x6762", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kegen/gboy/rules.mk b/keyboards/kegen/gboy/rules.mk index 8723047c1eb..de8df1910ce 100644 --- a/keyboards/kegen/gboy/rules.mk +++ b/keyboards/kegen/gboy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # comment out to disable the options. # diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index 233144e95e9..e6bc0d83700 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -8,6 +8,8 @@ "pid": "0x5250", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_4x4_encoders": { "layout": [ diff --git a/keyboards/keybage/radpad/rules.mk b/keyboards/keybage/radpad/rules.mk index b961abe4733..18b77f249ec 100644 --- a/keyboards/keybage/radpad/rules.mk +++ b/keyboards/keybage/radpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json index c88ed659a16..fa46a093235 100644 --- a/keyboards/keybee/keybee65/info.json +++ b/keyboards/keybee/keybee65/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keybee/keybee65/rules.mk b/keyboards/keybee/keybee65/rules.mk index d11e2090646..b0bc8468ed7 100644 --- a/keyboards/keybee/keybee65/rules.mk +++ b/keyboards/keybee/keybee65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyboardio/atreus/info.json b/keyboards/keyboardio/atreus/info.json index 8431c1e62da..1e31d8578af 100644 --- a/keyboards/keyboardio/atreus/info.json +++ b/keyboards/keyboardio/atreus/info.json @@ -8,6 +8,8 @@ "pid": "0x2303", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyboardio/atreus/rules.mk b/keyboards/keyboardio/atreus/rules.mk index abe9fface81..2513240d91e 100644 --- a/keyboards/keyboardio/atreus/rules.mk +++ b/keyboards/keyboardio/atreus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json index b4ba81bc673..c00c0161736 100644 --- a/keyboards/keyboardio/model01/info.json +++ b/keyboards/keyboardio/model01/info.json @@ -8,6 +8,8 @@ "pid": "0x2301", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk index 7b99346d02c..7edcc5ff773 100644 --- a/keyboards/keyboardio/model01/rules.mk +++ b/keyboards/keyboardio/model01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index 2aef1306ecb..5661ea9e770 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x4B69", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keycapsss/kimiko/rules.mk b/keyboards/keycapsss/kimiko/rules.mk index db4776a8013..7aeacb46d0b 100644 --- a/keyboards/keycapsss/kimiko/rules.mk +++ b/keyboards/keycapsss/kimiko/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json index 2efda3f6d3b..6409b8a7121 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/info.json @@ -8,6 +8,8 @@ "pid": "0x0512", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/keycapsss/o4l_5x12/rules.mk b/keyboards/keycapsss/o4l_5x12/rules.mk index b9d4bea70ff..ede7e9753e0 100644 --- a/keyboards/keycapsss/o4l_5x12/rules.mk +++ b/keyboards/keycapsss/o4l_5x12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 24ac857f32c..5d01d25bbd0 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -6,6 +6,8 @@ "vid": "0x7983", "pid": "0x5050" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/keycapsss/plaid_pad/rules.mk b/keyboards/keycapsss/plaid_pad/rules.mk index 7d4a96a89bb..1172f98f888 100644 --- a/keyboards/keycapsss/plaid_pad/rules.mk +++ b/keyboards/keycapsss/plaid_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json index e5f25f62ac8..334f879d3ba 100644 --- a/keyboards/keychron/q0/rev_0130/info.json +++ b/keyboards/keychron/q0/rev_0130/info.json @@ -8,6 +8,8 @@ "pid": "0x0130", "device_version": "1.0.2" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_numpad_6x4": { "layout": [ diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk index 5a04c755cd5..3a31dbc81a7 100644 --- a/keyboards/keychron/q0/rev_0130/rules.mk +++ b/keyboards/keychron/q0/rev_0130/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json index 171344b4c0c..63602d71c52 100644 --- a/keyboards/keychron/q1/ansi/info.json +++ b/keyboards/keychron/q1/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0100", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/q1/ansi/rules.mk b/keyboards/keychron/q1/ansi/rules.mk index 3ff731a72b3..395b6616858 100644 --- a/keyboards/keychron/q1/ansi/rules.mk +++ b/keyboards/keychron/q1/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json index ad9c258c38e..8fdd64ed7a4 100644 --- a/keyboards/keychron/q1/ansi_encoder/info.json +++ b/keyboards/keychron/q1/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0101", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/q1/ansi_encoder/rules.mk b/keyboards/keychron/q1/ansi_encoder/rules.mk index 6aad3136e5e..f67fe2bf030 100644 --- a/keyboards/keychron/q1/ansi_encoder/rules.mk +++ b/keyboards/keychron/q1/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json index 8da7a886ef4..d8f5205f5fd 100644 --- a/keyboards/keychron/q1/iso/info.json +++ b/keyboards/keychron/q1/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0102", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/q1/iso/rules.mk b/keyboards/keychron/q1/iso/rules.mk index 3ff731a72b3..395b6616858 100644 --- a/keyboards/keychron/q1/iso/rules.mk +++ b/keyboards/keychron/q1/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json index fc5dc7abc4a..573c43696fa 100644 --- a/keyboards/keychron/q1/iso_encoder/info.json +++ b/keyboards/keychron/q1/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0103", "device_version": "1.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk index 1dce5c53908..3eea458e726 100644 --- a/keyboards/keychron/q1/iso_encoder/rules.mk +++ b/keyboards/keychron/q1/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json index caf0d8d6bf3..0c8590c222d 100644 --- a/keyboards/keychron/q10/ansi_encoder/info.json +++ b/keyboards/keychron/q10/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x01A1", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_89": { "layout": [ diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/q10/ansi_encoder/rules.mk +++ b/keyboards/keychron/q10/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json index 9978af0b4b9..4b60bc9f76c 100644 --- a/keyboards/keychron/q10/iso_encoder/info.json +++ b/keyboards/keychron/q10/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x01A3", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_90": { "layout": [ diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/q10/iso_encoder/rules.mk +++ b/keyboards/keychron/q10/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json index 5992d5a69d0..d125560dde6 100644 --- a/keyboards/keychron/q2/ansi/info.json +++ b/keyboards/keychron/q2/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0110", "device_version": "1.0.0" }, + "processor": "STM32L433", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk index 8da17d91b3d..6c675518ee1 100644 --- a/keyboards/keychron/q2/ansi/rules.mk +++ b/keyboards/keychron/q2/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L433 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json index 67c47880672..01d326a9838 100644 --- a/keyboards/keychron/q2/ansi_encoder/info.json +++ b/keyboards/keychron/q2/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0111", "device_version": "1.0.0" }, + "processor": "STM32L433", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk index 8631891e0d9..0e909ff6f8c 100644 --- a/keyboards/keychron/q2/ansi_encoder/rules.mk +++ b/keyboards/keychron/q2/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L433 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json index 104b97cd239..d7b47640282 100644 --- a/keyboards/keychron/q2/iso/info.json +++ b/keyboards/keychron/q2/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0112", "device_version": "1.0.0" }, + "processor": "STM32L433", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk index 38d48f0b272..57b7516f4c7 100644 --- a/keyboards/keychron/q2/iso/rules.mk +++ b/keyboards/keychron/q2/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L433 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json index 38ea233ea18..e6fe1a5b49b 100644 --- a/keyboards/keychron/q2/iso_encoder/info.json +++ b/keyboards/keychron/q2/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0113", "device_version": "1.0.0" }, + "processor": "STM32L433", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk index 9332d294324..987db28ad5c 100644 --- a/keyboards/keychron/q2/iso_encoder/rules.mk +++ b/keyboards/keychron/q2/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L433 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json index de2b72cd7b2..1ebffbff455 100644 --- a/keyboards/keychron/q3/ansi/info.json +++ b/keyboards/keychron/q3/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0120", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk index 34f570aa156..8669178c4c3 100644 --- a/keyboards/keychron/q3/ansi/rules.mk +++ b/keyboards/keychron/q3/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json index 3b75c97509b..491a2831c87 100644 --- a/keyboards/keychron/q3/ansi_encoder/info.json +++ b/keyboards/keychron/q3/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0121", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_f13_ansi": { "layout": [ diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk index 4b277f6d9e7..a8eaf50f9a3 100644 --- a/keyboards/keychron/q3/ansi_encoder/rules.mk +++ b/keyboards/keychron/q3/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json index fdf5a5d875c..b50fffd3a27 100644 --- a/keyboards/keychron/q3/iso/info.json +++ b/keyboards/keychron/q3/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0122", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_iso": { "layout": [ diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk index 34f570aa156..8669178c4c3 100644 --- a/keyboards/keychron/q3/iso/rules.mk +++ b/keyboards/keychron/q3/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json index 9c635521c3d..06fb0338256 100644 --- a/keyboards/keychron/q3/iso_encoder/info.json +++ b/keyboards/keychron/q3/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0123", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_f13_iso": { "layout": [ diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk index 4b277f6d9e7..a8eaf50f9a3 100644 --- a/keyboards/keychron/q3/iso_encoder/rules.mk +++ b/keyboards/keychron/q3/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json index 757c1e45c00..69536c290cc 100644 --- a/keyboards/keychron/q3/jis/info.json +++ b/keyboards/keychron/q3/jis/info.json @@ -8,6 +8,8 @@ "pid": "0x0124", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_91": { "layout": [ diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk index 34f570aa156..8669178c4c3 100644 --- a/keyboards/keychron/q3/jis/rules.mk +++ b/keyboards/keychron/q3/jis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json index ebe1a08f562..7e203cb9c98 100644 --- a/keyboards/keychron/q3/jis_encoder/info.json +++ b/keyboards/keychron/q3/jis_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0125", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_92": { "layout": [ diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk index 4b277f6d9e7..a8eaf50f9a3 100644 --- a/keyboards/keychron/q3/jis_encoder/rules.mk +++ b/keyboards/keychron/q3/jis_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json index d5408369e0f..f24a4acba59 100644 --- a/keyboards/keychron/q4/ansi_v1/info.json +++ b/keyboards/keychron/q4/ansi_v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0140", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_61": { "layout": [ diff --git a/keyboards/keychron/q4/ansi_v1/rules.mk b/keyboards/keychron/q4/ansi_v1/rules.mk index 74b8754562f..4bb31fd14c0 100644 --- a/keyboards/keychron/q4/ansi_v1/rules.mk +++ b/keyboards/keychron/q4/ansi_v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json index d5408369e0f..f24a4acba59 100644 --- a/keyboards/keychron/q4/ansi_v2/info.json +++ b/keyboards/keychron/q4/ansi_v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0140", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_61": { "layout": [ diff --git a/keyboards/keychron/q4/ansi_v2/rules.mk b/keyboards/keychron/q4/ansi_v2/rules.mk index 74b8754562f..4bb31fd14c0 100644 --- a/keyboards/keychron/q4/ansi_v2/rules.mk +++ b/keyboards/keychron/q4/ansi_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json index 987822e2143..9c65fa29d1b 100644 --- a/keyboards/keychron/q4/iso/info.json +++ b/keyboards/keychron/q4/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0142", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_62": { "layout": [ diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk index 74b8754562f..4bb31fd14c0 100644 --- a/keyboards/keychron/q4/iso/rules.mk +++ b/keyboards/keychron/q4/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json index 4d5f1be85e5..4e77f23b7ca 100644 --- a/keyboards/keychron/q5/ansi/info.json +++ b/keyboards/keychron/q5/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0150", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_100": { "layout": [ diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/q5/ansi/rules.mk +++ b/keyboards/keychron/q5/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json index ed7bbc5987e..ab5d25320a6 100644 --- a/keyboards/keychron/q5/ansi_encoder/info.json +++ b/keyboards/keychron/q5/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0151", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_98": { "layout": [ diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/q5/ansi_encoder/rules.mk +++ b/keyboards/keychron/q5/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json index ea3ff899bba..20eebe22b07 100644 --- a/keyboards/keychron/q5/iso/info.json +++ b/keyboards/keychron/q5/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0152", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_101": { "layout": [ diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/q5/iso/rules.mk +++ b/keyboards/keychron/q5/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json index e628e1d0597..59a4ad32334 100644 --- a/keyboards/keychron/q5/iso_encoder/info.json +++ b/keyboards/keychron/q5/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0153", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_99": { "layout": [ diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/q5/iso_encoder/rules.mk +++ b/keyboards/keychron/q5/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json index a104096a6f7..ed1732655fd 100644 --- a/keyboards/keychron/q6/ansi/info.json +++ b/keyboards/keychron/q6/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0160", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_108": { "layout": [ diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk index d7ee4abddd0..e57fa16e324 100644 --- a/keyboards/keychron/q6/ansi/rules.mk +++ b/keyboards/keychron/q6/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json index 7449c191cf7..86d2cda5d16 100644 --- a/keyboards/keychron/q6/ansi_encoder/info.json +++ b/keyboards/keychron/q6/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0161", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_109": { "layout": [ diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk index 4b277f6d9e7..a8eaf50f9a3 100644 --- a/keyboards/keychron/q6/ansi_encoder/rules.mk +++ b/keyboards/keychron/q6/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json index fd83c3baf8e..0195e4420b2 100644 --- a/keyboards/keychron/q6/iso/info.json +++ b/keyboards/keychron/q6/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0162", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_109": { "layout": [ diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk index 878a067c9f8..638f1eaeb09 100644 --- a/keyboards/keychron/q6/iso/rules.mk +++ b/keyboards/keychron/q6/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json index d368ffee285..2996e0022a7 100644 --- a/keyboards/keychron/q6/iso_encoder/info.json +++ b/keyboards/keychron/q6/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0163", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_110": { "layout": [ diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk index a4a0e8b7588..757e051f46d 100644 --- a/keyboards/keychron/q6/iso_encoder/rules.mk +++ b/keyboards/keychron/q6/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json index 2f1580281cb..c64de7b5e22 100644 --- a/keyboards/keychron/q60/ansi/info.json +++ b/keyboards/keychron/q60/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x01C0", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_60": { "layout": [ diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk index 3b06a1ad95e..70c663e777b 100644 --- a/keyboards/keychron/q60/ansi/rules.mk +++ b/keyboards/keychron/q60/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json index dd712de81ab..dea29260d6a 100644 --- a/keyboards/keychron/q65/ansi_encoder/info.json +++ b/keyboards/keychron/q65/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x01B1", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_73": { "layout": [ diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/q65/ansi_encoder/rules.mk +++ b/keyboards/keychron/q65/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json index 939690d2e86..dbbc462a6da 100644 --- a/keyboards/keychron/q7/ansi/info.json +++ b/keyboards/keychron/q7/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0170", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_72": { "layout": [ diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/q7/ansi/rules.mk +++ b/keyboards/keychron/q7/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json index 518cd2caf37..876412d7b6e 100644 --- a/keyboards/keychron/q7/iso/info.json +++ b/keyboards/keychron/q7/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0172", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_73": { "layout": [ diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk index 7cf95ed1738..deac2e12e60 100644 --- a/keyboards/keychron/q7/iso/rules.mk +++ b/keyboards/keychron/q7/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json index 160672b62a0..b80cb424321 100644 --- a/keyboards/keychron/q8/ansi/info.json +++ b/keyboards/keychron/q8/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0180", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "layout": [ diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/q8/ansi/rules.mk +++ b/keyboards/keychron/q8/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json index d0f84747d98..3859c19dee7 100644 --- a/keyboards/keychron/q8/ansi_encoder/info.json +++ b/keyboards/keychron/q8/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0181", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "layout": [ diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk index 7d43a461e7b..d0d74a11b52 100644 --- a/keyboards/keychron/q8/ansi_encoder/rules.mk +++ b/keyboards/keychron/q8/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json index 36c3320b5cd..c5a5b7653e1 100644 --- a/keyboards/keychron/q8/iso/info.json +++ b/keyboards/keychron/q8/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0182", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_70": { "layout": [ diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/q8/iso/rules.mk +++ b/keyboards/keychron/q8/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json index 6e35bedf29e..48a32c915cf 100644 --- a/keyboards/keychron/q8/iso_encoder/info.json +++ b/keyboards/keychron/q8/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0183", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_70": { "layout": [ diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk index 8448f473264..5240004b8c9 100644 --- a/keyboards/keychron/q8/iso_encoder/rules.mk +++ b/keyboards/keychron/q8/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json index a09aefa0681..e1a6ae534db 100644 --- a/keyboards/keychron/q9/ansi/info.json +++ b/keyboards/keychron/q9/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0190", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_52": { "layout": [ diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/q9/ansi/rules.mk +++ b/keyboards/keychron/q9/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json index b305f49f244..54719d57496 100644 --- a/keyboards/keychron/q9/ansi_encoder/info.json +++ b/keyboards/keychron/q9/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0191", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_52": { "layout": [ diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk index 0b77b0ec7b3..37010e0d598 100644 --- a/keyboards/keychron/q9/ansi_encoder/rules.mk +++ b/keyboards/keychron/q9/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json index c1238d5c7ec..159abc63ae8 100644 --- a/keyboards/keychron/q9/iso/info.json +++ b/keyboards/keychron/q9/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0192", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_53": { "layout": [ diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/q9/iso/rules.mk +++ b/keyboards/keychron/q9/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json index a0a80a33fbd..4e4819519d3 100644 --- a/keyboards/keychron/q9/iso_encoder/info.json +++ b/keyboards/keychron/q9/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0193", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_53": { "layout": [ diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk index 0b77b0ec7b3..37010e0d598 100644 --- a/keyboards/keychron/q9/iso_encoder/rules.mk +++ b/keyboards/keychron/q9/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json index 475d3d4c6d0..02ea4d4c90f 100644 --- a/keyboards/keychron/s1/ansi/rgb/info.json +++ b/keyboards/keychron/s1/ansi/rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0410", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_ansi_84": "LAYOUT_75_ansi" }, diff --git a/keyboards/keychron/s1/ansi/rgb/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/s1/ansi/rgb/rules.mk +++ b/keyboards/keychron/s1/ansi/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json index 707c7904cac..a64f5eb0a9d 100644 --- a/keyboards/keychron/s1/ansi/white/info.json +++ b/keyboards/keychron/s1/ansi/white/info.json @@ -8,6 +8,8 @@ "pid": "0x0411", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_ansi_84": "LAYOUT_75_ansi" }, diff --git a/keyboards/keychron/s1/ansi/white/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk index 2455c56cfdf..081a3b63f05 100644 --- a/keyboards/keychron/s1/ansi/white/rules.mk +++ b/keyboards/keychron/s1/ansi/white/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json index 41893a6843e..d6d35f8474d 100644 --- a/keyboards/keychron/v1/ansi/info.json +++ b/keyboards/keychron/v1/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0310", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/v1/ansi/rules.mk +++ b/keyboards/keychron/v1/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json index 0ad45813fe3..19322f1fc98 100644 --- a/keyboards/keychron/v1/ansi_encoder/info.json +++ b/keyboards/keychron/v1/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0311", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v1/ansi_encoder/rules.mk +++ b/keyboards/keychron/v1/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json index bbf0cd5ab83..d9b11f5f554 100644 --- a/keyboards/keychron/v1/iso/info.json +++ b/keyboards/keychron/v1/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0312", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/v1/iso/rules.mk +++ b/keyboards/keychron/v1/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json index e252a49334d..9febe465db7 100644 --- a/keyboards/keychron/v1/iso_encoder/info.json +++ b/keyboards/keychron/v1/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0313", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v1/iso_encoder/rules.mk +++ b/keyboards/keychron/v1/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json index 2d5a67499df..8d06120f5dc 100644 --- a/keyboards/keychron/v1/jis/info.json +++ b/keyboards/keychron/v1/jis/info.json @@ -8,6 +8,8 @@ "pid": "0x0314", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_86": { "layout": [ diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/v1/jis/rules.mk +++ b/keyboards/keychron/v1/jis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json index dad9bf085dd..abbe941427e 100644 --- a/keyboards/keychron/v1/jis_encoder/info.json +++ b/keyboards/keychron/v1/jis_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0315", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_86": { "layout": [ diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v1/jis_encoder/rules.mk +++ b/keyboards/keychron/v1/jis_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json index fc08bab41d5..f0bb49cee2b 100644 --- a/keyboards/keychron/v2/ansi/info.json +++ b/keyboards/keychron/v2/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0320", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/v2/ansi/rules.mk +++ b/keyboards/keychron/v2/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json index 10c3fe43546..257bd6b5fc7 100644 --- a/keyboards/keychron/v2/ansi_encoder/info.json +++ b/keyboards/keychron/v2/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0321", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk index 8448f473264..5240004b8c9 100644 --- a/keyboards/keychron/v2/ansi_encoder/rules.mk +++ b/keyboards/keychron/v2/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json index d66607d26dd..0679e1737c4 100644 --- a/keyboards/keychron/v2/iso/info.json +++ b/keyboards/keychron/v2/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0322", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/v2/iso/rules.mk +++ b/keyboards/keychron/v2/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json index 7f36838c1d4..212129eeb47 100644 --- a/keyboards/keychron/v2/iso_encoder/info.json +++ b/keyboards/keychron/v2/iso_encoder/info.json @@ -7,6 +7,8 @@ "pid": "0x0323", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk index 8448f473264..5240004b8c9 100644 --- a/keyboards/keychron/v2/iso_encoder/rules.mk +++ b/keyboards/keychron/v2/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json index cc727d546d6..89ec07b0722 100644 --- a/keyboards/keychron/v2/jis/info.json +++ b/keyboards/keychron/v2/jis/info.json @@ -8,6 +8,8 @@ "pid": "0x0324", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_71": { "layout": [ diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/v2/jis/rules.mk +++ b/keyboards/keychron/v2/jis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json index 6fccf979893..d284dd5a249 100644 --- a/keyboards/keychron/v2/jis_encoder/info.json +++ b/keyboards/keychron/v2/jis_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0325", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_71": { "layout": [ diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk index 8448f473264..5240004b8c9 100644 --- a/keyboards/keychron/v2/jis_encoder/rules.mk +++ b/keyboards/keychron/v2/jis_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json index 365402b723a..ae70657b840 100644 --- a/keyboards/keychron/v3/ansi/info.json +++ b/keyboards/keychron/v3/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0330", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk index f5327cf417f..345807d8247 100644 --- a/keyboards/keychron/v3/ansi/rules.mk +++ b/keyboards/keychron/v3/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json index 91ba7228bd6..fb9a1a669e7 100644 --- a/keyboards/keychron/v3/ansi_encoder/info.json +++ b/keyboards/keychron/v3/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0331", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_f13_ansi": { "layout": [ diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v3/ansi_encoder/rules.mk +++ b/keyboards/keychron/v3/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json index 73e75d5c8c6..9f79518cb27 100644 --- a/keyboards/keychron/v3/iso/info.json +++ b/keyboards/keychron/v3/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0332", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_iso": { "layout": [ diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk index 5ade504735e..8f5af0583ca 100644 --- a/keyboards/keychron/v3/iso/rules.mk +++ b/keyboards/keychron/v3/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json index 9bd0ff35887..34ff04a9d06 100644 --- a/keyboards/keychron/v3/iso_encoder/info.json +++ b/keyboards/keychron/v3/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0333", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_f13_iso": { "layout": [ diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v3/iso_encoder/rules.mk +++ b/keyboards/keychron/v3/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json index f700d2cf454..3bab42c8dd8 100644 --- a/keyboards/keychron/v3/jis/info.json +++ b/keyboards/keychron/v3/jis/info.json @@ -8,6 +8,8 @@ "pid": "0x0334", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_91": { "layout": [ diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk index 7cf95ed1738..deac2e12e60 100644 --- a/keyboards/keychron/v3/jis/rules.mk +++ b/keyboards/keychron/v3/jis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json index 68e411fd50d..86374520f7c 100644 --- a/keyboards/keychron/v3/jis_encoder/info.json +++ b/keyboards/keychron/v3/jis_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0335", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_jis_92": { "layout": [ diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v3/jis_encoder/rules.mk +++ b/keyboards/keychron/v3/jis_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json index e64763bcf80..04bd9e47612 100644 --- a/keyboards/keychron/v4/ansi/info.json +++ b/keyboards/keychron/v4/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0340", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_61": { "layout": [ diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk index 3b06a1ad95e..70c663e777b 100644 --- a/keyboards/keychron/v4/ansi/rules.mk +++ b/keyboards/keychron/v4/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json index de496653b52..561fdde3cc5 100644 --- a/keyboards/keychron/v4/iso/info.json +++ b/keyboards/keychron/v4/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0342", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_62": { "layout": [ diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk index 3b06a1ad95e..70c663e777b 100644 --- a/keyboards/keychron/v4/iso/rules.mk +++ b/keyboards/keychron/v4/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json index d3c3b962224..40e253367c3 100644 --- a/keyboards/keychron/v5/ansi/info.json +++ b/keyboards/keychron/v5/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0350", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_100": { "layout": [ diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/v5/ansi/rules.mk +++ b/keyboards/keychron/v5/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json index f317eafbd29..b9da185e56d 100644 --- a/keyboards/keychron/v5/ansi_encoder/info.json +++ b/keyboards/keychron/v5/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0351", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_98": { "layout": [ diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v5/ansi_encoder/rules.mk +++ b/keyboards/keychron/v5/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json index 4c747a1f6c4..729297f2a1d 100644 --- a/keyboards/keychron/v5/iso/info.json +++ b/keyboards/keychron/v5/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0352", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_101": { "layout": [ diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk index a98845acc19..311ca648e1a 100644 --- a/keyboards/keychron/v5/iso/rules.mk +++ b/keyboards/keychron/v5/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json index 8a645697b1b..edde8d4b21d 100644 --- a/keyboards/keychron/v5/iso_encoder/info.json +++ b/keyboards/keychron/v5/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0353", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_99": { "layout": [ diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk index 359346625e6..ef55047753b 100644 --- a/keyboards/keychron/v5/iso_encoder/rules.mk +++ b/keyboards/keychron/v5/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json index 75e7c71fa3d..00df236f6de 100644 --- a/keyboards/keychron/v7/ansi/info.json +++ b/keyboards/keychron/v7/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0370", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_72": { "layout": [ diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk index 3b06a1ad95e..70c663e777b 100644 --- a/keyboards/keychron/v7/ansi/rules.mk +++ b/keyboards/keychron/v7/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json index 689045bde4c..e01b12464c0 100644 --- a/keyboards/keychron/v7/iso/info.json +++ b/keyboards/keychron/v7/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0372", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_73": { "layout": [ diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk index 3b06a1ad95e..70c663e777b 100644 --- a/keyboards/keychron/v7/iso/rules.mk +++ b/keyboards/keychron/v7/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable. # diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json index c097a395172..f1f2e75e4da 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0380", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "layout": [ diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk index 0116815f0bc..6f738741e93 100644 --- a/keyboards/keychron/v8/ansi/rules.mk +++ b/keyboards/keychron/v8/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json index 32df68bde5e..c33b8955e85 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0381", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "layout": [ diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk index 43b26ecc3a4..f2cbf4a6606 100644 --- a/keyboards/keychron/v8/ansi_encoder/rules.mk +++ b/keyboards/keychron/v8/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json index ee00d3f0030..22b363d0727 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0382", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_70": { "layout": [ diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk index 6999bcc18eb..e306f3211ee 100644 --- a/keyboards/keychron/v8/iso/rules.mk +++ b/keyboards/keychron/v8/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json index bc5fea848da..ad546d0e330 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0383", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_70": { "layout": [ diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk index 43b26ecc3a4..f2cbf4a6606 100644 --- a/keyboards/keychron/v8/iso_encoder/rules.mk +++ b/keyboards/keychron/v8/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json index a66cbb26bcc..7376b014852 100644 --- a/keyboards/keygem/kg60ansi/info.json +++ b/keyboards/keygem/kg60ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/keygem/kg60ansi/rules.mk b/keyboards/keygem/kg60ansi/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/keygem/kg60ansi/rules.mk +++ b/keyboards/keygem/kg60ansi/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json index a784bec2ff7..326d5256e1e 100644 --- a/keyboards/keygem/kg65rgbv2/info.json +++ b/keyboards/keygem/kg65rgbv2/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keygem/kg65rgbv2/rules.mk b/keyboards/keygem/kg65rgbv2/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/keygem/kg65rgbv2/rules.mk +++ b/keyboards/keygem/kg65rgbv2/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json index ed20471a3e7..7739f4f1715 100644 --- a/keyboards/keyhive/absinthe/info.json +++ b/keyboards/keyhive/absinthe/info.json @@ -8,6 +8,8 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/keyhive/absinthe/rules.mk b/keyboards/keyhive/absinthe/rules.mk index 5b1bf3cdf3a..5d5924f767b 100644 --- a/keyboards/keyhive/absinthe/rules.mk +++ b/keyboards/keyhive/absinthe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json index 5556c9127ae..872ba2d76b4 100644 --- a/keyboards/keyhive/ergosaurus/info.json +++ b/keyboards/keyhive/ergosaurus/info.json @@ -7,6 +7,8 @@ "pid": "0xE590", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/keyhive/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/keyhive/ergosaurus/rules.mk +++ b/keyboards/keyhive/ergosaurus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json index e4be0814258..693b836ede2 100644 --- a/keyboards/keyhive/honeycomb/info.json +++ b/keyboards/keyhive/honeycomb/info.json @@ -8,6 +8,8 @@ "pid": "0xACC8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk index 420e409e439..040710a460d 100755 --- a/keyboards/keyhive/honeycomb/rules.mk +++ b/keyboards/keyhive/honeycomb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json index 81e125c5cb2..345bd4b8e1f 100644 --- a/keyboards/keyhive/lattice60/info.json +++ b/keyboards/keyhive/lattice60/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/keyhive/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk index fc52b05ed77..b60fe3290a5 100644 --- a/keyboards/keyhive/lattice60/rules.mk +++ b/keyboards/keyhive/lattice60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Processor frequency F_CPU = 12000000 diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json index 638394f99bb..be72cb07f96 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/info.json @@ -8,6 +8,8 @@ "pid": "0x4D50", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/keyhive/maypad/rules.mk +++ b/keyboards/keyhive/maypad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json index 90ac25f360b..e1dda21feba 100644 --- a/keyboards/keyhive/navi10/rev0/info.json +++ b/keyboards/keyhive/navi10/rev0/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keyhive/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk index 52a1cbb711a..27b0a2549ed 100644 --- a/keyboards/keyhive/navi10/rev0/rules.mk +++ b/keyboards/keyhive/navi10/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json index e557e4d3076..1b44b7d70f7 100644 --- a/keyboards/keyhive/navi10/rev2/info.json +++ b/keyboards/keyhive/navi10/rev2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keyhive/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk index 52a1cbb711a..27b0a2549ed 100644 --- a/keyboards/keyhive/navi10/rev2/rules.mk +++ b/keyboards/keyhive/navi10/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json index b377cdff008..2d7d9f1f84b 100644 --- a/keyboards/keyhive/navi10/rev3/info.json +++ b/keyboards/keyhive/navi10/rev3/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keyhive/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk index 52a1cbb711a..27b0a2549ed 100644 --- a/keyboards/keyhive/navi10/rev3/rules.mk +++ b/keyboards/keyhive/navi10/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json index 422ede053fb..f3ce5cec587 100644 --- a/keyboards/keyhive/opus/info.json +++ b/keyboards/keyhive/opus/info.json @@ -7,6 +7,8 @@ "pid": "0x4F50", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/opus/rules.mk b/keyboards/keyhive/opus/rules.mk index 515ca5621f8..ab2c49da70e 100644 --- a/keyboards/keyhive/opus/rules.mk +++ b/keyboards/keyhive/opus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json index 5eb8d0a42d2..39bdd4d09ae 100644 --- a/keyboards/keyhive/smallice/info.json +++ b/keyboards/keyhive/smallice/info.json @@ -8,6 +8,8 @@ "pid": "0x5341", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"V+", "x":0.5, "y":0}, {"label":"Tab", "x":1.75, "y":0}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":8.25, "y":0}, {"label":"U", "x":9.25, "y":0}, {"label":"I", "x":10.25, "y":0}, {"label":"O", "x":11.25, "y":0}, {"label":"P", "x":12.25, "y":0}, {"label":"[ {", "x":13.25, "y":0}, {"label":"] }", "x":14.25, "y":0}, {"label":"Bcsp", "x":15.25, "y":0}, {"label":"V-", "x":0.25, "y":1}, {"label":"Caps", "x":1.5, "y":1, "w":1.25}, {"label":"A", "x":2.75, "y":1}, {"label":"S", "x":3.75, "y":1}, {"label":"D", "x":4.75, "y":1}, {"label":"F", "x":5.75, "y":1}, {"label":"G", "x":6.75, "y":1}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":": ;", "x":12.75, "y":1}, {"label":", \"", "x":13.75, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.75}, {"label":"V-", "x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.5, "y":2}, {"label":"N", "x":9.5, "y":2}, {"label":"M", "x":10.5, "y":2}, {"label":"<", "x":11.5, "y":2}, {"label":">", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"label":"Up", "x":14.75, "y":2}, {"label":"?", "x":15.75, "y":2}, {"label":"Ctrl", "x":1.25, "y":3}, {"label":"Alt", "x":3, "y":3, "w":1.25}, {"x":4.25, "y":3, "w":2}, {"label":"Win", "x":6.25, "y":3}, {"x":9.5, "y":3, "w":2.75}, {"label":"Fn", "x":12.25, "y":3}, {"label":"left", "x":13.75, "y":3}, {"label":"down", "x":14.75, "y":3}, {"label":"right", "x":15.75, "y":3}] diff --git a/keyboards/keyhive/smallice/rules.mk b/keyboards/keyhive/smallice/rules.mk index 1f52c371540..2eba275490a 100644 --- a/keyboards/keyhive/smallice/rules.mk +++ b/keyboards/keyhive/smallice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/info.json index 1091c519118..0c06a2be3be 100644 --- a/keyboards/keyhive/southpole/info.json +++ b/keyboards/keyhive/southpole/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/southpole/rules.mk b/keyboards/keyhive/southpole/rules.mk index 278ee36f239..e3ebdd5cf3c 100644 --- a/keyboards/keyhive/southpole/rules.mk +++ b/keyboards/keyhive/southpole/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json index 69d6dfba0d1..6038321e527 100644 --- a/keyboards/keyhive/uno/rev1/info.json +++ b/keyboards/keyhive/uno/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Uno rev1", "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keyhive/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk index 7180be7497a..95667aacd75 100644 --- a/keyboards/keyhive/uno/rev1/rules.mk +++ b/keyboards/keyhive/uno/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json index 787f306351c..811d052ac3f 100644 --- a/keyboards/keyhive/uno/rev2/info.json +++ b/keyboards/keyhive/uno/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Uno rev2", "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/keyhive/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk index 1ce2738442b..98b5879d7b0 100644 --- a/keyboards/keyhive/uno/rev2/rules.mk +++ b/keyboards/keyhive/uno/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json index e1ea8256508..de93aeef6d5 100644 --- a/keyboards/keyhive/ut472/info.json +++ b/keyboards/keyhive/ut472/info.json @@ -8,6 +8,8 @@ "pid": "0x0472", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}] diff --git a/keyboards/keyhive/ut472/rules.mk b/keyboards/keyhive/ut472/rules.mk index 9c7d75a344e..9ebb40efd6b 100644 --- a/keyboards/keyhive/ut472/rules.mk +++ b/keyboards/keyhive/ut472/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json index 36aeb27a106..987588216ce 100644 --- a/keyboards/keyprez/bison/info.json +++ b/keyboards/keyprez/bison/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyprez/bison/rules.mk b/keyboards/keyprez/bison/rules.mk index 710c90186d8..21a7746f6c6 100644 --- a/keyboards/keyprez/bison/rules.mk +++ b/keyboards/keyprez/bison/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json index 5e20640b952..daaacae394e 100644 --- a/keyboards/keyprez/corgi/info.json +++ b/keyboards/keyprez/corgi/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/keyprez/corgi/rules.mk b/keyboards/keyprez/corgi/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/keyprez/corgi/rules.mk +++ b/keyboards/keyprez/corgi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json index 28c0b81be42..b203dc23d70 100644 --- a/keyboards/keyprez/rhino/info.json +++ b/keyboards/keyprez/rhino/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 2, "layouts": { "LAYOUT_ortho_2x2u": { diff --git a/keyboards/keyprez/rhino/rules.mk b/keyboards/keyprez/rhino/rules.mk index 9a6162bb479..7439cd7de21 100644 --- a/keyboards/keyprez/rhino/rules.mk +++ b/keyboards/keyprez/rhino/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json index 90a81b8cc84..e4b8680964f 100644 --- a/keyboards/keyprez/unicorn/info.json +++ b/keyboards/keyprez/unicorn/info.json @@ -8,6 +8,8 @@ "pid": "0x7563", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk index b529cf64562..9458603d100 100644 --- a/keyboards/keyprez/unicorn/rules.mk +++ b/keyboards/keyprez/unicorn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json index 5d062931c54..8fc30557298 100644 --- a/keyboards/keyquest/enclave/info.json +++ b/keyboards/keyquest/enclave/info.json @@ -7,6 +7,8 @@ "pid": "0x0E0E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_3x3" }, diff --git a/keyboards/keyquest/enclave/rules.mk b/keyboards/keyquest/enclave/rules.mk index 0730fa9d7ea..420c346b6b4 100644 --- a/keyboards/keyquest/enclave/rules.mk +++ b/keyboards/keyquest/enclave/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # Change yes to no to disable # diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json index cf1d79d250c..86e3a070e90 100644 --- a/keyboards/keysofkings/twokey/info.json +++ b/keyboards/keysofkings/twokey/info.json @@ -8,6 +8,8 @@ "pid": "0xAE12", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keysofkings/twokey/rules.mk b/keyboards/keysofkings/twokey/rules.mk index 9c634bc376b..9982ce0a871 100755 --- a/keyboards/keysofkings/twokey/rules.mk +++ b/keyboards/keysofkings/twokey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json index 33e62ed20c7..4b0227fedf2 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk index be3b8b9a618..2a8d8c7bce6 100644 --- a/keyboards/keystonecaps/gameroyadvance/rules.mk +++ b/keyboards/keystonecaps/gameroyadvance/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina # For Pro Micro -# BOOTLOADER = qmk-dfu # For Elite-C - # Build Options # change yes to no to disable # diff --git a/keyboards/keyten/aperture/info.json b/keyboards/keyten/aperture/info.json index 99b31751c99..f848f705b3d 100644 --- a/keyboards/keyten/aperture/info.json +++ b/keyboards/keyten/aperture/info.json @@ -8,6 +8,8 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs" }, diff --git a/keyboards/keyten/aperture/rules.mk b/keyboards/keyten/aperture/rules.mk index 6983d5c803f..d1d32f35d0f 100644 --- a/keyboards/keyten/aperture/rules.mk +++ b/keyboards/keyten/aperture/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/info.json index f6788979278..7babb7d0877 100644 --- a/keyboards/keyten/kt60_m/info.json +++ b/keyboards/keyten/kt60_m/info.json @@ -8,6 +8,8 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/keyten/kt60_m/rules.mk b/keyboards/keyten/kt60_m/rules.mk index 6983d5c803f..d1d32f35d0f 100644 --- a/keyboards/keyten/kt60_m/rules.mk +++ b/keyboards/keyten/kt60_m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kikkou/info.json b/keyboards/kikkou/info.json index 1703a71e438..3d27cecac5f 100644 --- a/keyboards/kikkou/info.json +++ b/keyboards/kikkou/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}] diff --git a/keyboards/kikkou/rules.mk b/keyboards/kikkou/rules.mk index f9417ae2bf7..d65d32df0aa 100644 --- a/keyboards/kikkou/rules.mk +++ b/keyboards/kikkou/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json index f4bdb9ee00d..1f32b9af2f4 100644 --- a/keyboards/kikoslab/ellora65/info.json +++ b/keyboards/kikoslab/ellora65/info.json @@ -8,6 +8,8 @@ "pid": "0xE88F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kikoslab/ellora65/rules.mk b/keyboards/kikoslab/ellora65/rules.mk index 7fe30a833f8..52e7b596ee2 100644 --- a/keyboards/kikoslab/ellora65/rules.mk +++ b/keyboards/kikoslab/ellora65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json index 15f573d7db3..7caa9824b05 100644 --- a/keyboards/kikoslab/kl90/info.json +++ b/keyboards/kikoslab/kl90/info.json @@ -8,6 +8,8 @@ "pid": "0xEA53", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kikoslab/kl90/rules.mk b/keyboards/kikoslab/kl90/rules.mk index bec60734c0a..27c445ca2fc 100644 --- a/keyboards/kikoslab/kl90/rules.mk +++ b/keyboards/kikoslab/kl90/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json index e557e4d3076..63c9650579d 100644 --- a/keyboards/kin80/blackpill103/info.json +++ b/keyboards/kin80/blackpill103/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/kin80/blackpill103/rules.mk b/keyboards/kin80/blackpill103/rules.mk index 019b1130d99..a92b0993283 100644 --- a/keyboards/kin80/blackpill103/rules.mk +++ b/keyboards/kin80/blackpill103/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json index b377cdff008..7d4ec1294e9 100644 --- a/keyboards/kin80/blackpill401/info.json +++ b/keyboards/kin80/blackpill401/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/kin80/blackpill401/rules.mk b/keyboards/kin80/blackpill401/rules.mk index 1fec226e9b3..1071cf62ee3 100644 --- a/keyboards/kin80/blackpill401/rules.mk +++ b/keyboards/kin80/blackpill401/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - KEYBOARD_SHARED_EP = yes diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json index b377cdff008..6ad9e67e040 100644 --- a/keyboards/kin80/blackpill411/info.json +++ b/keyboards/kin80/blackpill411/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/kin80/blackpill411/rules.mk b/keyboards/kin80/blackpill411/rules.mk index cd1657335d9..1071cf62ee3 100644 --- a/keyboards/kin80/blackpill411/rules.mk +++ b/keyboards/kin80/blackpill411/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - KEYBOARD_SHARED_EP = yes diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json index 90ac25f360b..7818e745378 100644 --- a/keyboards/kin80/micro/info.json +++ b/keyboards/kin80/micro/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "lufa-dfu" } diff --git a/keyboards/kin80/micro/rules.mk b/keyboards/kin80/micro/rules.mk index def852a5315..e69de29bb2d 100644 --- a/keyboards/kin80/micro/rules.mk +++ b/keyboards/kin80/micro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-dfu \ No newline at end of file diff --git a/keyboards/kindakeyboards/conone65/info.json b/keyboards/kindakeyboards/conone65/info.json index 5dcf63330e0..3b924683e64 100644 --- a/keyboards/kindakeyboards/conone65/info.json +++ b/keyboards/kindakeyboards/conone65/info.json @@ -8,6 +8,8 @@ "pid": "0x6AAB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kindakeyboards/conone65/rules.mk b/keyboards/kindakeyboards/conone65/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/kindakeyboards/conone65/rules.mk +++ b/keyboards/kindakeyboards/conone65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json index 1db31a0429f..009bfb83931 100644 --- a/keyboards/kinesis/alvicstep/info.json +++ b/keyboards/kinesis/alvicstep/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.1" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json index dcc543e0fc1..e31d3490a0f 100644 --- a/keyboards/kinesis/kint2pp/info.json +++ b/keyboards/kinesis/kint2pp/info.json @@ -6,5 +6,7 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "debounce": 20 } diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json index 61bd4508a08..fca353504f4 100644 --- a/keyboards/kinesis/kint36/info.json +++ b/keyboards/kinesis/kint36/info.json @@ -6,5 +6,7 @@ "pid": "0x345C", "device_version": "0.0.1" }, + "processor": "MK66FX1M0", + "bootloader": "halfkay", "debounce": 20 } diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk index d495568dd3c..7c48a98bfcb 100644 --- a/keyboards/kinesis/kint36/rules.mk +++ b/keyboards/kinesis/kint36/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = MK66FX1M0 - # Debounce eagerly (report change immediately), keep per-key timers. We can use # this because the kinT does not have to deal with noise. DEBOUNCE_TYPE = sym_eager_pk diff --git a/keyboards/kinesis/kint41/rules.mk b/keyboards/kinesis/kint41/rules.mk index 4b39b87be64..99c7c0f7d60 100644 --- a/keyboards/kinesis/kint41/rules.mk +++ b/keyboards/kinesis/kint41/rules.mk @@ -6,9 +6,10 @@ BOARD = IC_TEENSY_4_1 MCU = cortex-m4 ARMV = 7 +# Bootloader selection +BOOTLOADER = halfkay + # Debounce eagerly (report change immediately), keep per-key timers. We can use # this because the Cherry MX keyswitches on the Kinesis only produce noise while # pressed. DEBOUNCE_TYPE = sym_eager_pk - -FIRMWARE_FORMAT = hex diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json index d937ad902d7..d05b01ec09f 100644 --- a/keyboards/kinesis/kintlc/info.json +++ b/keyboards/kinesis/kintlc/info.json @@ -6,5 +6,7 @@ "pid": "0x345C", "device_version": "0.0.1" }, + "processor": "MKL26Z64", + "bootloader": "halfkay", "debounce": 20 } diff --git a/keyboards/kinesis/kintlc/rules.mk b/keyboards/kinesis/kintlc/rules.mk index bfc10748ab5..a6a1eafbfcc 100644 --- a/keyboards/kinesis/kintlc/rules.mk +++ b/keyboards/kinesis/kintlc/rules.mk @@ -1,5 +1,3 @@ -# MCU name -MCU = MKL26Z64 # This MCU is not in the main CHIBIOS repo but in the CHIBIOS_CONTRIB repo. USE_CHIBIOS_CONTRIB = yes diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json index 4035bb8e11f..7a486826845 100644 --- a/keyboards/kinesis/nguyenvietyen/info.json +++ b/keyboards/kinesis/nguyenvietyen/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk index 65018bc3cc9..3e0a265135a 100644 --- a/keyboards/kinesis/nguyenvietyen/rules.mk +++ b/keyboards/kinesis/nguyenvietyen/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk index 129e08635d5..2090c50d470 100644 --- a/keyboards/kinesis/rules.mk +++ b/keyboards/kinesis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json index b44abddfdfb..ba14567443f 100644 --- a/keyboards/kinesis/stapelberg/info.json +++ b/keyboards/kinesis/stapelberg/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.2" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/kineticlabs/emu/hotswap/info.json b/keyboards/kineticlabs/emu/hotswap/info.json index 52ecae519d1..7e04725e8e3 100644 --- a/keyboards/kineticlabs/emu/hotswap/info.json +++ b/keyboards/kineticlabs/emu/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xC387", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kineticlabs/emu/hotswap/rules.mk b/keyboards/kineticlabs/emu/hotswap/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/kineticlabs/emu/hotswap/rules.mk +++ b/keyboards/kineticlabs/emu/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kineticlabs/emu/soldered/info.json b/keyboards/kineticlabs/emu/soldered/info.json index f6c14304aa7..82e0313a78d 100644 --- a/keyboards/kineticlabs/emu/soldered/info.json +++ b/keyboards/kineticlabs/emu/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0xC386", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kineticlabs/emu/soldered/rules.mk b/keyboards/kineticlabs/emu/soldered/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/kineticlabs/emu/soldered/rules.mk +++ b/keyboards/kineticlabs/emu/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json index bc8b83334f0..f9344727c11 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_all": { "layout": [ diff --git a/keyboards/kingly_keys/ave/ortho/rules.mk b/keyboards/kingly_keys/ave/ortho/rules.mk index 19d0131a736..12ee1bcfbd2 100644 --- a/keyboards/kingly_keys/ave/ortho/rules.mk +++ b/keyboards/kingly_keys/ave/ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json index 9757472b9f5..9b0d9cf0c1c 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/info.json @@ -8,6 +8,8 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_staggered": { "layout": [ diff --git a/keyboards/kingly_keys/ave/staggered/rules.mk b/keyboards/kingly_keys/ave/staggered/rules.mk index 19d0131a736..12ee1bcfbd2 100644 --- a/keyboards/kingly_keys/ave/staggered/rules.mk +++ b/keyboards/kingly_keys/ave/staggered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json index 6b1f8871654..e306ed38a2d 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_space_base": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":2}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1.5}] diff --git a/keyboards/kingly_keys/little_foot/rules.mk b/keyboards/kingly_keys/little_foot/rules.mk index 4792d1c7942..53b742083f1 100644 --- a/keyboards/kingly_keys/little_foot/rules.mk +++ b/keyboards/kingly_keys/little_foot/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json index da73cadfb91..1f8b3f4871a 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}] diff --git a/keyboards/kingly_keys/romac/rules.mk b/keyboards/kingly_keys/romac/rules.mk index 40d08b7731c..5e7b5aadb5a 100644 --- a/keyboards/kingly_keys/romac/rules.mk +++ b/keyboards/kingly_keys/romac/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json index 79aa4eccb6a..b9ffc070766 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}] diff --git a/keyboards/kingly_keys/romac_plus/rules.mk b/keyboards/kingly_keys/romac_plus/rules.mk index ccd2ba6ecfe..a2287ae9158 100644 --- a/keyboards/kingly_keys/romac_plus/rules.mk +++ b/keyboards/kingly_keys/romac_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json index 60419947d4e..b9150cbcfa1 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Esc", "x":1, "y":1}, {"label":"1", "x":2, "y":1}, {"label":"2", "x":3, "y":1}, {"label":"3", "x":4, "y":1}, {"label":"4", "x":5, "y":1}, {"label":"5", "x":6, "y":1}, {"label":"6;", "x":7, "y":1}, {"label":"7", "x":8, "y":1}, {"label":"8", "x":9, "y":1}, {"label":"9", "x":10, "y":1}, {"label":"0", "x":11, "y":1}, {"label":"-", "x":12, "y":1}, {"label":"CAPS", "x":0, "y":2}, {"label":"Tab", "x":1, "y":2}, {"label":"Q", "x":2, "y":2}, {"label":"W", "x":3, "y":2}, {"label":"E", "x":4, "y":2}, {"label":"R", "x":5, "y":2}, {"label":"T", "x":6, "y":2}, {"label":"Y", "x":7, "y":2}, {"label":"U", "x":8, "y":2}, {"label":"I", "x":9, "y":2}, {"label":"O", "x":10, "y":2}, {"label":"P", "x":11, "y":2}, {"label":"Bksp", "x":12, "y":2}, {"label":"PgUp", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"A", "x":2, "y":3}, {"label":"S", "x":3, "y":3}, {"label":"D", "x":4, "y":3}, {"label":"F", "x":5, "y":3}, {"label":"G", "x":6, "y":3}, {"label":"H;", "x":7, "y":3}, {"label":"J", "x":8, "y":3}, {"label":"K", "x":9, "y":3}, {"label":"L", "x":10, "y":3}, {"label":";", "x":11, "y":3}, {"label":"'", "x":12, "y":3}, {"label":"Home", "x":0, "y":4}, {"label":"Shift", "x":1, "y":4}, {"label":"Z", "x":2, "y":4}, {"label":"X", "x":3, "y":4}, {"label":"C", "x":4, "y":4}, {"label":"V", "x":5, "y":4}, {"label":"B", "x":6, "y":4}, {"label":"N", "x":7, "y":4}, {"label":"M", "x":8, "y":4}, {"label":",", "x":9, "y":4}, {"label":".", "x":10, "y":4}, {"label":"/", "x":11, "y":4}, {"label":"Enter", "x":12, "y":4}, {"label":"PgDn", "x":0, "y":5}, {"label":"Del", "x":1, "y":5}, {"label":"Ctrl", "x":2, "y":5}, {"label":"GUI", "x":3, "y":5}, {"label":"Alt", "x":4, "y":5}, {"label":"Lower", "x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"label":"End", "x":8, "y":5}, {"label":"Left", "x":9, "y":5}, {"label":"Down", "x":10, "y":5}, {"label":"Up", "x":11, "y":5}, {"label":"Right", "x":12, "y":5}] diff --git a/keyboards/kingly_keys/ropro/rules.mk b/keyboards/kingly_keys/ropro/rules.mk index 9b76d2abd60..81181d52454 100644 --- a/keyboards/kingly_keys/ropro/rules.mk +++ b/keyboards/kingly_keys/ropro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json index 66d8116f43b..f6bbca92899 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/info.json @@ -8,6 +8,8 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] diff --git a/keyboards/kingly_keys/smd_milk/rules.mk b/keyboards/kingly_keys/smd_milk/rules.mk index 469e098ba55..5d1006936de 100644 --- a/keyboards/kingly_keys/smd_milk/rules.mk +++ b/keyboards/kingly_keys/smd_milk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json index 0bd017e8e0c..2caa2c27b63 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":4, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":4, "y":1}] diff --git a/keyboards/kingly_keys/soap/rules.mk b/keyboards/kingly_keys/soap/rules.mk index 78d37366724..81181d52454 100644 --- a/keyboards/kingly_keys/soap/rules.mk +++ b/keyboards/kingly_keys/soap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json index 37bded93f7c..cf8e9ce6987 100644 --- a/keyboards/kira75/info.json +++ b/keyboards/kira75/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] diff --git a/keyboards/kira75/rules.mk b/keyboards/kira75/rules.mk index 532462bca26..609fcf84a87 100644 --- a/keyboards/kira75/rules.mk +++ b/keyboards/kira75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kira80/info.json b/keyboards/kira80/info.json index 3f7dbe7af7c..1ed50c668a0 100644 --- a/keyboards/kira80/info.json +++ b/keyboards/kira80/info.json @@ -8,6 +8,8 @@ "pid": "0xC583", "device_version": "1.0.2" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Back", "x":13, "y":1.25}, {"label":"Back", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"FN", "x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/kira80/rules.mk b/keyboards/kira80/rules.mk index a5756a78451..f7616462037 100644 --- a/keyboards/kira80/rules.mk +++ b/keyboards/kira80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 63fedd2484f..223bd710352 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -8,6 +8,8 @@ "pid": "0x4712", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikeebs/macro/rules.mk b/keyboards/kiwikeebs/macro/rules.mk index c4a39c910fc..f0a88209b69 100644 --- a/keyboards/kiwikeebs/macro/rules.mk +++ b/keyboards/kiwikeebs/macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json index 8c76890abd9..c83e861c72f 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4712", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikeebs/macro_v2/rules.mk b/keyboards/kiwikeebs/macro_v2/rules.mk index 5f58c5684bf..131aa72aeb5 100644 --- a/keyboards/kiwikeebs/macro_v2/rules.mk +++ b/keyboards/kiwikeebs/macro_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json index 2123268c2e6..d88a8b20bfb 100644 --- a/keyboards/kiwikey/borderland/info.json +++ b/keyboards/kiwikey/borderland/info.json @@ -8,6 +8,8 @@ "pid": "0x424C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikey/borderland/rules.mk b/keyboards/kiwikey/borderland/rules.mk index c362ae9a8b9..e44305c4fff 100644 --- a/keyboards/kiwikey/borderland/rules.mk +++ b/keyboards/kiwikey/borderland/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json index ad8ae3679a8..e1511b544cc 100644 --- a/keyboards/kiwikey/kawii9/info.json +++ b/keyboards/kiwikey/kawii9/info.json @@ -8,6 +8,8 @@ "pid": "0x0303", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/kiwikey/kawii9/rules.mk b/keyboards/kiwikey/kawii9/rules.mk index f57e786cbcc..a6f559ca779 100644 --- a/keyboards/kiwikey/kawii9/rules.mk +++ b/keyboards/kiwikey/kawii9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json index 92dfb2fff67..92346d4f567 100644 --- a/keyboards/kiwikey/wanderland/info.json +++ b/keyboards/kiwikey/wanderland/info.json @@ -8,6 +8,8 @@ "pid": "0x574C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/kiwikey/wanderland/rules.mk b/keyboards/kiwikey/wanderland/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/kiwikey/wanderland/rules.mk +++ b/keyboards/kiwikey/wanderland/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kkatano/bakeneko60/info.json b/keyboards/kkatano/bakeneko60/info.json index 9e53a3a26bf..e4335d11475 100644 --- a/keyboards/kkatano/bakeneko60/info.json +++ b/keyboards/kkatano/bakeneko60/info.json @@ -8,6 +8,8 @@ "pid": "0xCBDC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { diff --git a/keyboards/kkatano/bakeneko60/rules.mk b/keyboards/kkatano/bakeneko60/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/kkatano/bakeneko60/rules.mk +++ b/keyboards/kkatano/bakeneko60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kkatano/bakeneko65/rev2/info.json b/keyboards/kkatano/bakeneko65/rev2/info.json index be313c06243..63cbf3ab7f7 100644 --- a/keyboards/kkatano/bakeneko65/rev2/info.json +++ b/keyboards/kkatano/bakeneko65/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x4C82", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi_split_bs": { diff --git a/keyboards/kkatano/bakeneko65/rev2/rules.mk b/keyboards/kkatano/bakeneko65/rev2/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/kkatano/bakeneko65/rev2/rules.mk +++ b/keyboards/kkatano/bakeneko65/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kkatano/bakeneko65/rev3/info.json b/keyboards/kkatano/bakeneko65/rev3/info.json index 43e1170904c..ad74ae3e74f 100644 --- a/keyboards/kkatano/bakeneko65/rev3/info.json +++ b/keyboards/kkatano/bakeneko65/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x4C83", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0.25}, {"x":1, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.25}, {"x":9, "y":0.25}, {"x":10, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15, "y":0.25}, {"x":0, "y":1.25, "w":1.5}, {"x":1.5, "y":1.25}, {"x":2.5, "y":1.25}, {"x":3.5, "y":1.25}, {"x":4.5, "y":1.25}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25}, {"x":7.5, "y":1.25}, {"x":8.5, "y":1.25}, {"x":9.5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.25}, {"x":12.5, "y":1.25}, {"x":13.5, "y":1.25, "w":1.5}, {"x":15, "y":1.25}, {"x":0, "y":2.25, "w":1.75}, {"x":1.75, "y":2.25}, {"x":2.75, "y":2.25}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25, "w":2.25}, {"x":15, "y":2.25}, {"x":0, "y":3.25, "w":2.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":6.25, "y":3.25}, {"x":7.25, "y":3.25}, {"x":8.25, "y":3.25}, {"x":9.25, "y":3.25}, {"x":10.25, "y":3.25}, {"x":11.25, "y":3.25}, {"x":12.25, "y":3.25, "w":1.75}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25, "w":1.25}, {"x":2.5, "y":4.25, "w":1.25}, {"x":3.75, "y":4.25, "w":6.25}, {"x":10, "y":4.25, "w":1.25}, {"x":11.25, "y":4.25, "w":1.25}, {"x":13, "y":4.25}, {"x":14, "y":4.25}, {"x":15, "y":4.25}] diff --git a/keyboards/kkatano/bakeneko65/rev3/rules.mk b/keyboards/kkatano/bakeneko65/rev3/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/kkatano/bakeneko65/rev3/rules.mk +++ b/keyboards/kkatano/bakeneko65/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kkatano/bakeneko80/info.json b/keyboards/kkatano/bakeneko80/info.json index 3a27eba1f58..8cb125d3090 100644 --- a/keyboards/kkatano/bakeneko80/info.json +++ b/keyboards/kkatano/bakeneko80/info.json @@ -8,6 +8,8 @@ "pid": "0x8DEF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kkatano/bakeneko80/rules.mk b/keyboards/kkatano/bakeneko80/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/kkatano/bakeneko80/rules.mk +++ b/keyboards/kkatano/bakeneko80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kkatano/wallaby/info.json b/keyboards/kkatano/wallaby/info.json index 5b7ae06f6ed..b5ee4bd1ed0 100644 --- a/keyboards/kkatano/wallaby/info.json +++ b/keyboards/kkatano/wallaby/info.json @@ -8,6 +8,8 @@ "pid": "0x5967", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kkatano/wallaby/rules.mk b/keyboards/kkatano/wallaby/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/kkatano/wallaby/rules.mk +++ b/keyboards/kkatano/wallaby/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kkatano/yurei/info.json b/keyboards/kkatano/yurei/info.json index d1d1f4b1a60..b1efc635810 100644 --- a/keyboards/kkatano/yurei/info.json +++ b/keyboards/kkatano/yurei/info.json @@ -8,6 +8,8 @@ "pid": "0x5D5E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kkatano/yurei/rules.mk b/keyboards/kkatano/yurei/rules.mk index ad5f5465e8e..fce764c22d4 100644 --- a/keyboards/kkatano/yurei/rules.mk +++ b/keyboards/kkatano/yurei/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json index da411b24111..b8e5497e28f 100644 --- a/keyboards/kmac/info.json +++ b/keyboards/kmac/info.json @@ -7,6 +7,8 @@ "pid": "0x4143", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kmac/rules.mk b/keyboards/kmac/rules.mk index e087abdab28..b1bd80232c6 100644 --- a/keyboards/kmac/rules.mk +++ b/keyboards/kmac/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kmac_pad/info.json b/keyboards/kmac_pad/info.json index 2ce217d70a9..9d07f3d45af 100644 --- a/keyboards/kmac_pad/info.json +++ b/keyboards/kmac_pad/info.json @@ -7,6 +7,8 @@ "pid": "0x4143", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kmac_pad/rules.mk b/keyboards/kmac_pad/rules.mk index 2f6f8e99273..1c42620aca5 100644 --- a/keyboards/kmac_pad/rules.mk +++ b/keyboards/kmac_pad/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kmini/info.json b/keyboards/kmini/info.json index 42d7da54bba..91f88c03949 100755 --- a/keyboards/kmini/info.json +++ b/keyboards/kmini/info.json @@ -8,6 +8,8 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"GUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Fn", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/kmini/rules.mk b/keyboards/kmini/rules.mk index 4a1f9693e4b..c93d5be7ff3 100755 --- a/keyboards/kmini/rules.mk +++ b/keyboards/kmini/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json index 2e77b6c7d05..c1515a24fa5 100644 --- a/keyboards/knobgoblin/info.json +++ b/keyboards/knobgoblin/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 2, "layouts": { "LAYOUT_ortho": { diff --git a/keyboards/knobgoblin/rules.mk b/keyboards/knobgoblin/rules.mk index 25a47597905..e19365e2abd 100644 --- a/keyboards/knobgoblin/rules.mk +++ b/keyboards/knobgoblin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/knops/mini/info.json b/keyboards/knops/mini/info.json index fcc8e5229ef..6246a17cd3d 100644 --- a/keyboards/knops/mini/info.json +++ b/keyboards/knops/mini/info.json @@ -8,6 +8,8 @@ "pid": "0x9460", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}] diff --git a/keyboards/knops/mini/rules.mk b/keyboards/knops/mini/rules.mk index 7fa21ec4c53..b6e2a5f9a41 100644 --- a/keyboards/knops/mini/rules.mk +++ b/keyboards/knops/mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kona_classic/info.json b/keyboards/kona_classic/info.json index 2b64911bcbf..6a6f996d903 100644 --- a/keyboards/kona_classic/info.json +++ b/keyboards/kona_classic/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_all": { "layout": [{"label":"KA0", "x":0, "y":0}, {"label":"KA1", "x":1, "y":0}, {"label":"K00", "x":2.25, "y":0}, {"label":"K01", "x":3.25, "y":0}, {"label":"K02", "x":4.25, "y":0}, {"label":"K03", "x":5.25, "y":0}, {"label":"K04", "x":6.25, "y":0}, {"label":"K05", "x":7.25, "y":0}, {"label":"K06", "x":8.25, "y":0}, {"label":"K07", "x":9.25, "y":0}, {"label":"K08", "x":10.25, "y":0}, {"label":"K09", "x":11.25, "y":0}, {"label":"K0A", "x":12.25, "y":0}, {"label":"K0B", "x":13.25, "y":0}, {"label":"K0C", "x":14.25, "y":0}, {"label":"K0D", "x":15.25, "y":0, "w":2}, {"label":"KA2", "x":0, "y":1}, {"label":"KA3", "x":1, "y":1}, {"label":"K10", "x":2.25, "y":1, "w":1.5}, {"label":"K11", "x":3.75, "y":1}, {"label":"K12", "x":4.75, "y":1}, {"label":"K13", "x":5.75, "y":1}, {"label":"K14", "x":6.75, "y":1}, {"label":"K15", "x":7.75, "y":1}, {"label":"K16", "x":8.75, "y":1}, {"label":"K17", "x":9.75, "y":1}, {"label":"K18", "x":10.75, "y":1}, {"label":"K19", "x":11.75, "y":1}, {"label":"K1A", "x":12.75, "y":1}, {"label":"K1B", "x":13.75, "y":1}, {"label":"K1C", "x":14.75, "y":1}, {"label":"K1D", "x":15.75, "y":1, "w":1.5}, {"label":"KA4", "x":0, "y":2}, {"label":"KA5", "x":1, "y":2}, {"label":"K20", "x":2.25, "y":2, "w":1.75}, {"label":"K21", "x":4, "y":2}, {"label":"K22", "x":5, "y":2}, {"label":"K23", "x":6, "y":2}, {"label":"K24", "x":7, "y":2}, {"label":"K25", "x":8, "y":2}, {"label":"K26", "x":9, "y":2}, {"label":"K27", "x":10, "y":2}, {"label":"K28", "x":11, "y":2}, {"label":"K29", "x":12, "y":2}, {"label":"K2A", "x":13, "y":2}, {"label":"K2B", "x":14, "y":2}, {"label":"K2C", "x":15, "y":2, "w":2.25}, {"label":"KA6", "x":0, "y":3}, {"label":"KA7", "x":1, "y":3}, {"label":"K30", "x":2.25, "y":3, "w":1.25}, {"label":"K31", "x":3.5, "y":3}, {"label":"K32", "x":4.5, "y":3}, {"label":"K33", "x":5.5, "y":3}, {"label":"K34", "x":6.5, "y":3}, {"label":"K35", "x":7.5, "y":3}, {"label":"K36", "x":8.5, "y":3}, {"label":"K37", "x":9.5, "y":3}, {"label":"K38", "x":10.5, "y":3}, {"label":"K39", "x":11.5, "y":3}, {"label":"K3A", "x":12.5, "y":3}, {"label":"K3B", "x":13.5, "y":3}, {"label":"K3C", "x":15.25, "y":3}, {"label":"K3D", "x":16.25, "y":3}, {"label":"KA8", "x":0, "y":4}, {"label":"KA9", "x":1, "y":4}, {"label":"K40", "x":2.25, "y":4, "w":1.25}, {"label":"K41", "x":3.5, "y":4, "w":1.25}, {"label":"K42", "x":4.75, "y":4, "w":1.25}, {"label":"K44", "x":6, "y":4, "w":2.25}, {"label":"K46", "x":8.25, "y":4, "w":1.25}, {"label":"K47", "x":9.5, "y":4, "w":2.75}, {"label":"K49", "x":12.25, "y":4}, {"label":"K4A", "x":13.25, "y":4}, {"label":"K4B", "x":14.25, "y":4}, {"label":"K4C", "x":15.25, "y":4}, {"label":"K4D", "x":16.25, "y":4}] diff --git a/keyboards/kona_classic/rules.mk b/keyboards/kona_classic/rules.mk index 9b2c210d421..b6e2a5f9a41 100644 --- a/keyboards/kona_classic/rules.mk +++ b/keyboards/kona_classic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json index 63db590dd3e..df261b8951b 100644 --- a/keyboards/kopibeng/mnk65/info.json +++ b/keyboards/kopibeng/mnk65/info.json @@ -8,6 +8,8 @@ "pid": "0x0651", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kopibeng/mnk65/rules.mk b/keyboards/kopibeng/mnk65/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/kopibeng/mnk65/rules.mk +++ b/keyboards/kopibeng/mnk65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/info.json index 9f75fa28640..77ace62e361 100644 --- a/keyboards/kopibeng/mnk65_stm32/info.json +++ b/keyboards/kopibeng/mnk65_stm32/info.json @@ -8,6 +8,8 @@ "pid": "0x0652", "device_version": "1.0.0" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kopibeng/mnk65_stm32/rules.mk b/keyboards/kopibeng/mnk65_stm32/rules.mk index c073176e848..fddc8cdf737 100644 --- a/keyboards/kopibeng/mnk65_stm32/rules.mk +++ b/keyboards/kopibeng/mnk65_stm32/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF diff --git a/keyboards/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json index 151038e7601..d8cc5998915 100644 --- a/keyboards/kopibeng/mnk88/info.json +++ b/keyboards/kopibeng/mnk88/info.json @@ -8,6 +8,8 @@ "pid": "0x8800", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan", "tkl_f13_iso", "tkl_f13_iso_tsangan"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/kopibeng/mnk88/rules.mk b/keyboards/kopibeng/mnk88/rules.mk index 5cb386a4025..cc3bf2abed3 100644 --- a/keyboards/kopibeng/mnk88/rules.mk +++ b/keyboards/kopibeng/mnk88/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json index 01abcaa4332..c70704af27f 100644 --- a/keyboards/kopibeng/typ65/info.json +++ b/keyboards/kopibeng/typ65/info.json @@ -8,6 +8,8 @@ "pid": "0x065E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/kopibeng/typ65/rules.mk b/keyboards/kopibeng/typ65/rules.mk index 6089f643c4e..76764d6e0d9 100644 --- a/keyboards/kopibeng/typ65/rules.mk +++ b/keyboards/kopibeng/typ65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json index 6d946c960ec..7334cf12764 100644 --- a/keyboards/kopibeng/xt60/info.json +++ b/keyboards/kopibeng/xt60/info.json @@ -8,6 +8,8 @@ "pid": "0x0600", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kopibeng/xt60/rules.mk b/keyboards/kopibeng/xt60/rules.mk index 72ab2800c56..0b221b7e17a 100644 --- a/keyboards/kopibeng/xt60/rules.mk +++ b/keyboards/kopibeng/xt60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json index 09191eac104..9d46fe49da3 100644 --- a/keyboards/kopibeng/xt60_singa/info.json +++ b/keyboards/kopibeng/xt60_singa/info.json @@ -8,6 +8,8 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kopibeng/xt60_singa/rules.mk b/keyboards/kopibeng/xt60_singa/rules.mk index 72ab2800c56..0b221b7e17a 100644 --- a/keyboards/kopibeng/xt60_singa/rules.mk +++ b/keyboards/kopibeng/xt60_singa/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json index 04d61df7189..bc8fe61543e 100644 --- a/keyboards/kopibeng/xt65/info.json +++ b/keyboards/kopibeng/xt65/info.json @@ -8,6 +8,8 @@ "pid": "0x0650", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_7u_split_bs": "LAYOUT_65_ansi_blocker_tsangan_split_bs", "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs", diff --git a/keyboards/kopibeng/xt65/rules.mk b/keyboards/kopibeng/xt65/rules.mk index 63a57dcadb9..45377383806 100644 --- a/keyboards/kopibeng/xt65/rules.mk +++ b/keyboards/kopibeng/xt65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json index ad828e0ecb7..efda8a48ef9 100644 --- a/keyboards/kopibeng/xt8x/info.json +++ b/keyboards/kopibeng/xt8x/info.json @@ -8,6 +8,8 @@ "pid": "0x8788", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kopibeng/xt8x/rules.mk b/keyboards/kopibeng/xt8x/rules.mk index 5cb386a4025..cc3bf2abed3 100644 --- a/keyboards/kopibeng/xt8x/rules.mk +++ b/keyboards/kopibeng/xt8x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json index 61e492964dc..adda71d87bf 100644 --- a/keyboards/kprepublic/bm16s/info.json +++ b/keyboards/kprepublic/bm16s/info.json @@ -8,6 +8,8 @@ "pid": "0x016B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/kprepublic/bm16s/rules.mk b/keyboards/kprepublic/bm16s/rules.mk index fced7bef9ae..483ffc81068 100755 --- a/keyboards/kprepublic/bm16s/rules.mk +++ b/keyboards/kprepublic/bm16s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json index 02840f56d43..10c41a9b3c3 100644 --- a/keyboards/kprepublic/bm40hsrgb/info.json +++ b/keyboards/kprepublic/bm40hsrgb/info.json @@ -8,6 +8,8 @@ "pid": "0x3430", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/kprepublic/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk index 429a9b171db..9690e3e495a 100755 --- a/keyboards/kprepublic/bm40hsrgb/rules.mk +++ b/keyboards/kprepublic/bm40hsrgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json index 0cbeeac6333..545d0871281 100644 --- a/keyboards/kprepublic/bm43a/info.json +++ b/keyboards/kprepublic/bm43a/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kprepublic/bm43a/rules.mk b/keyboards/kprepublic/bm43a/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/kprepublic/bm43a/rules.mk +++ b/keyboards/kprepublic/bm43a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json index 052a4f8a6a4..8190cded611 100755 --- a/keyboards/kprepublic/bm43hsrgb/info.json +++ b/keyboards/kprepublic/bm43hsrgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk index 296559b4743..f8265c4c244 100755 --- a/keyboards/kprepublic/bm43hsrgb/rules.mk +++ b/keyboards/kprepublic/bm43hsrgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json index c58b9151059..ba4d0fcae58 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEF8C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi_arrow" }, diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk index 34784b43ba2..cb6e15ad0a9 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json index 01055ba2b60..9a765bc984d 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x1121", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk index f3078129173..d1baac82c4a 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json index d56d62fe593..3e0084c1a7d 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEF9C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk index a4adc68fa1a..8164eaacdbd 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json index 09128cceaf6..cb75c22dd60 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x1124", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk index ba1fc44aef5..858a74bdf03 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json index 9531c817489..3f0e2c6a230 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEF8C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_iso_arrow": { "layout": [ diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk index 33488b9d3a7..0459a2ad6b5 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json index 9cb7499ddff..7a49695dbc0 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x1123", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_60_iso_arrow": { diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk index 8ac7dd5a514..fde42415fea 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json index a14695e4597..734169c9e45 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEF8D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk index e58dc5849a9..a1fe09e1fd7 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index dd4fa1ab899..83962c13ff5 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x1122", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index 449c2f6f294..98b66d638eb 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json index b32a18cf327..a2c126ee301 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEF6E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk index 239ea39a741..bd6310d8593 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json index 1a61ea3647b..af805bd81c8 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0653", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_65_iso_blocker": { diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk index 239ea39a741..bd6310d8593 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json index 7fd1dd43d92..54dc1efe673 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEF6F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk index 239ea39a741..bd6310d8593 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json index 4239947cdb9..b205449d3f3 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x1131", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk index 3520ee32293..9072e268b91 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk +++ b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json index fd3d521e2bb..2e025c1f92a 100644 --- a/keyboards/kprepublic/bm80hsrgb/info.json +++ b/keyboards/kprepublic/bm80hsrgb/info.json @@ -8,6 +8,8 @@ "pid": "0xEF83", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kprepublic/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk index 239ea39a741..bd6310d8593 100644 --- a/keyboards/kprepublic/bm80hsrgb/rules.mk +++ b/keyboards/kprepublic/bm80hsrgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json index 2209fcce1b9..f7d153f42c4 100644 --- a/keyboards/kprepublic/bm80v2/info.json +++ b/keyboards/kprepublic/bm80v2/info.json @@ -8,6 +8,8 @@ "pid": "0x1141", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk index f41d45b7ed7..0288e3a9b0d 100644 --- a/keyboards/kprepublic/bm80v2/rules.mk +++ b/keyboards/kprepublic/bm80v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json index 18eee3fa32d..826d10d6cd4 100644 --- a/keyboards/kprepublic/bm80v2_iso/info.json +++ b/keyboards/kprepublic/bm80v2_iso/info.json @@ -8,6 +8,8 @@ "pid": "0x1142", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_iso"], "layouts": { "LAYOUT_tkl_iso": { diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk index eef5beb7f0b..dfbbfb974d9 100644 --- a/keyboards/kprepublic/bm80v2_iso/rules.mk +++ b/keyboards/kprepublic/bm80v2_iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json index ba8173c6c88..c7dde26d233 100644 --- a/keyboards/kprepublic/bm980hsrgb/info.json +++ b/keyboards/kprepublic/bm980hsrgb/info.json @@ -8,6 +8,8 @@ "pid": "0xEF61", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk index 03f72adf543..41d2efeaa87 100644 --- a/keyboards/kprepublic/bm980hsrgb/rules.mk +++ b/keyboards/kprepublic/bm980hsrgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json index d110a78b7de..92eb7c0ae9a 100644 --- a/keyboards/kprepublic/cospad/info.json +++ b/keyboards/kprepublic/cospad/info.json @@ -8,6 +8,8 @@ "pid": "0xB1E5", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/kprepublic/cospad/rules.mk b/keyboards/kprepublic/cospad/rules.mk index 38f81fd4dcc..1955f1d315b 100644 --- a/keyboards/kprepublic/cospad/rules.mk +++ b/keyboards/kprepublic/cospad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json index 5256649ff6f..189ae81ae0e 100644 --- a/keyboards/kprepublic/jj40/info.json +++ b/keyboards/kprepublic/jj40/info.json @@ -8,6 +8,8 @@ "pid": "0x0040", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk index aac05cdffed..80a6c4bed25 100644 --- a/keyboards/kprepublic/jj40/rules.mk +++ b/keyboards/kprepublic/jj40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json index 5cb263f3da8..4a85eb55f3d 100644 --- a/keyboards/kprepublic/jj4x4/info.json +++ b/keyboards/kprepublic/jj4x4/info.json @@ -8,6 +8,8 @@ "pid": "0x0044", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/kprepublic/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk index 579e99478fc..4b774fe5d05 100644 --- a/keyboards/kprepublic/jj4x4/rules.mk +++ b/keyboards/kprepublic/jj4x4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json index ef243fe6e16..5e955207590 100644 --- a/keyboards/kprepublic/jj50/info.json +++ b/keyboards/kprepublic/jj50/info.json @@ -8,6 +8,8 @@ "pid": "0x0050", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x12" }, diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk index 939bd2fcf6c..1ac5e85541e 100644 --- a/keyboards/kprepublic/jj50/rules.mk +++ b/keyboards/kprepublic/jj50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json index f9c7b3e3823..832f5021f1e 100644 --- a/keyboards/ktec/daisy/info.json +++ b/keyboards/ktec/daisy/info.json @@ -8,6 +8,8 @@ "pid": "0xD7DC", "device_version": "5.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ktec/daisy/rules.mk b/keyboards/ktec/daisy/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/ktec/daisy/rules.mk +++ b/keyboards/ktec/daisy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index 8971ec70215..392610c98ae 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -8,6 +8,8 @@ "pid": "0x2328", "device_version": "2.0.5" }, + "processor": "atmega32u2", + "bootloader": "lufa-dfu", "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}] diff --git a/keyboards/ktec/staryu/rules.mk b/keyboards/ktec/staryu/rules.mk index 73b1a479537..8a6e2c7b715 100755 --- a/keyboards/ktec/staryu/rules.mk +++ b/keyboards/ktec/staryu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json index 2bc8ff50d34..d0a2b00b0dc 100644 --- a/keyboards/kudox/columner/info.json +++ b/keyboards/kudox/columner/info.json @@ -8,6 +8,8 @@ "pid": "0x9691", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json index 45f3a4e304f..445916ebd4e 100644 --- a/keyboards/kudox/rev1/info.json +++ b/keyboards/kudox/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x9690", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json index 2af08beaf24..d0e7320c21e 100644 --- a/keyboards/kudox/rev2/info.json +++ b/keyboards/kudox/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x9690", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json index 31975f28d72..98abd322679 100644 --- a/keyboards/kudox/rev3/info.json +++ b/keyboards/kudox/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x9690", "device_version": "3.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox/rules.mk b/keyboards/kudox/rules.mk index 2b3d1be5502..8654d9b5208 100644 --- a/keyboards/kudox/rules.mk +++ b/keyboards/kudox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json index bb230b352c3..6e337304220 100644 --- a/keyboards/kudox_full/rev1/info.json +++ b/keyboards/kudox_full/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x9693", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox_full/rules.mk b/keyboards/kudox_full/rules.mk index 5250547b663..cbdafb7a5c6 100644 --- a/keyboards/kudox_full/rules.mk +++ b/keyboards/kudox_full/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kudox_game/info.json b/keyboards/kudox_game/info.json index 4cfc75850ad..e927bb94394 100644 --- a/keyboards/kudox_game/info.json +++ b/keyboards/kudox_game/info.json @@ -7,6 +7,8 @@ "vid": "0xABBA", "pid": "0x9696" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox_game/rules.mk b/keyboards/kudox_game/rules.mk index 97036eb2e28..762675efe1a 100644 --- a/keyboards/kudox_game/rules.mk +++ b/keyboards/kudox_game/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kv/revt/info.json b/keyboards/kv/revt/info.json index 2b018ee6546..afa7d65e0c0 100644 --- a/keyboards/kv/revt/info.json +++ b/keyboards/kv/revt/info.json @@ -8,6 +8,9 @@ "pid": "0x6520", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/kv/revt/rules.mk b/keyboards/kv/revt/rules.mk index 05bfa36e0e5..5356b24d77c 100644 --- a/keyboards/kv/revt/rules.mk +++ b/keyboards/kv/revt/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/kwub/bloop/info.json b/keyboards/kwub/bloop/info.json index ddce5d363a9..9312f84a525 100644 --- a/keyboards/kwub/bloop/info.json +++ b/keyboards/kwub/bloop/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_625": { "layout": [ diff --git a/keyboards/kwub/bloop/rules.mk b/keyboards/kwub/bloop/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/kwub/bloop/rules.mk +++ b/keyboards/kwub/bloop/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ky01/info.json b/keyboards/ky01/info.json index d80cb261a2d..32df643d9a6 100644 --- a/keyboards/ky01/info.json +++ b/keyboards/ky01/info.json @@ -8,6 +8,8 @@ "pid": "0x4B59", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ky01/rules.mk b/keyboards/ky01/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/ky01/rules.mk +++ b/keyboards/ky01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/labbe/labbeminiv1/info.json b/keyboards/labbe/labbeminiv1/info.json index b14a43903f3..ac920876f40 100644 --- a/keyboards/labbe/labbeminiv1/info.json +++ b/keyboards/labbe/labbeminiv1/info.json @@ -8,6 +8,8 @@ "pid": "0x4C4D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_wasd": { "layout": [{"x":1, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}] diff --git a/keyboards/labbe/labbeminiv1/rules.mk b/keyboards/labbe/labbeminiv1/rules.mk index 424f7c14f5d..57f52095a4e 100644 --- a/keyboards/labbe/labbeminiv1/rules.mk +++ b/keyboards/labbe/labbeminiv1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json index d83e27c662d..a01a1a26fa3 100644 --- a/keyboards/labyrinth75/info.json +++ b/keyboards/labyrinth75/info.json @@ -8,6 +8,8 @@ "pid": "0x464B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":5.75, "y":0}, {"label":"F6", "x":6.75, "y":0}, {"label":"F7", "x":7.75, "y":0}, {"label":"F8", "x":8.75, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] diff --git a/keyboards/labyrinth75/rules.mk b/keyboards/labyrinth75/rules.mk index f0f5b83f012..502dc1b7bdf 100644 --- a/keyboards/labyrinth75/rules.mk +++ b/keyboards/labyrinth75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json index b439b053472..5c8da7fb21f 100644 --- a/keyboards/late9/rev1/info.json +++ b/keyboards/late9/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3777", "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/late9/rev1/rules.mk b/keyboards/late9/rev1/rules.mk index 26b6991c2f7..82d5e4237f8 100644 --- a/keyboards/late9/rev1/rules.mk +++ b/keyboards/late9/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json index 05eecd52f5d..eeb1bf151c2 100644 --- a/keyboards/latincompass/latin17rgb/info.json +++ b/keyboards/latincompass/latin17rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x7C97", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "community_layouts": ["numpad_5x4"], "layouts": { diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk index a556dbc434e..9a4182e9829 100644 --- a/keyboards/latincompass/latin17rgb/rules.mk +++ b/keyboards/latincompass/latin17rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json index eac2210f9c1..5d695e86cf2 100644 --- a/keyboards/latincompass/latin47ble/info.json +++ b/keyboards/latincompass/latin47ble/info.json @@ -8,6 +8,8 @@ "pid": "0x6C62", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/latincompass/latin47ble/rules.mk b/keyboards/latincompass/latin47ble/rules.mk index d97a3c1d59f..77af9dc3dac 100644 --- a/keyboards/latincompass/latin47ble/rules.mk +++ b/keyboards/latincompass/latin47ble/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json index 577ce49d50a..c21003fcd09 100644 --- a/keyboards/latincompass/latin60rgb/info.json +++ b/keyboards/latincompass/latin60rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6C69", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_60_latin_hhkb": { diff --git a/keyboards/latincompass/latin60rgb/rules.mk b/keyboards/latincompass/latin60rgb/rules.mk index fde06cb9fee..fe9c141422e 100644 --- a/keyboards/latincompass/latin60rgb/rules.mk +++ b/keyboards/latincompass/latin60rgb/rules.mk @@ -1,10 +1,3 @@ - -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json index b3475a2aab9..935e788d966 100644 --- a/keyboards/latincompass/latin64ble/info.json +++ b/keyboards/latincompass/latin64ble/info.json @@ -8,6 +8,8 @@ "pid": "0x6C71", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/latincompass/latin64ble/rules.mk b/keyboards/latincompass/latin64ble/rules.mk index 97717333de7..5fdb1567a42 100644 --- a/keyboards/latincompass/latin64ble/rules.mk +++ b/keyboards/latincompass/latin64ble/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json index 02ab9f64cbb..2ab390e119c 100644 --- a/keyboards/latincompass/latin6rgb/info.json +++ b/keyboards/latincompass/latin6rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x7C96", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_numpad_2x3": { diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk index 9837de97e17..dc0e116999a 100644 --- a/keyboards/latincompass/latin6rgb/rules.mk +++ b/keyboards/latincompass/latin6rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json index 0a2ef6f69b1..4ab11d8cfba 100644 --- a/keyboards/latincompass/latinpad/info.json +++ b/keyboards/latincompass/latinpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6C70", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { diff --git a/keyboards/latincompass/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk index 1570b33db4e..7583158b926 100644 --- a/keyboards/latincompass/latinpad/rules.mk +++ b/keyboards/latincompass/latinpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json index 2f0bf016165..ed82794f821 100644 --- a/keyboards/latincompass/latinpadble/info.json +++ b/keyboards/latincompass/latinpadble/info.json @@ -8,6 +8,8 @@ "pid": "0x7C98", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_pad": { "layout": [ diff --git a/keyboards/latincompass/latinpadble/rules.mk b/keyboards/latincompass/latinpadble/rules.mk index 2afef0b777f..c47ad1fdbff 100644 --- a/keyboards/latincompass/latinpadble/rules.mk +++ b/keyboards/latincompass/latinpadble/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json index 783293945df..98874151a8d 100644 --- a/keyboards/lazydesigners/bolt/info.json +++ b/keyboards/lazydesigners/bolt/info.json @@ -8,6 +8,8 @@ "pid": "0x0041", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/bolt/rules.mk b/keyboards/lazydesigners/bolt/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/lazydesigners/bolt/rules.mk +++ b/keyboards/lazydesigners/bolt/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json index 24ba706b64c..fd2733321be 100755 --- a/keyboards/lazydesigners/cassette8/info.json +++ b/keyboards/lazydesigners/cassette8/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/cassette8/rules.mk b/keyboards/lazydesigners/cassette8/rules.mk index 93eb9c4395d..58d6460e33e 100755 --- a/keyboards/lazydesigners/cassette8/rules.mk +++ b/keyboards/lazydesigners/cassette8/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json index 752f8293d4b..5bd57ed1b72 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x0040", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_2u": { "layout": [ diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk index ee586a38e18..5316d1bc7e1 100644 --- a/keyboards/lazydesigners/dimple/rules.mk +++ b/keyboards/lazydesigners/dimple/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json index cdce3c767c5..1161789c1e1 100644 --- a/keyboards/lazydesigners/dimple/staggered/info.json +++ b/keyboards/lazydesigners/dimple/staggered/info.json @@ -7,5 +7,7 @@ "vid": "0x4C44", "pid": "0x0040", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json index 7ba8b088129..c0ed213d58d 100644 --- a/keyboards/lazydesigners/dimpleplus/info.json +++ b/keyboards/lazydesigners/dimpleplus/info.json @@ -8,6 +8,8 @@ "pid": "0x0061", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/dimpleplus/rules.mk b/keyboards/lazydesigners/dimpleplus/rules.mk index 0973ca51325..e3b4d3b94d5 100644 --- a/keyboards/lazydesigners/dimpleplus/rules.mk +++ b/keyboards/lazydesigners/dimpleplus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/the30/info.json b/keyboards/lazydesigners/the30/info.json index 7c5ff4a5876..20be3649a8f 100644 --- a/keyboards/lazydesigners/the30/info.json +++ b/keyboards/lazydesigners/the30/info.json @@ -8,6 +8,8 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/lazydesigners/the30/rules.mk b/keyboards/lazydesigners/the30/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/lazydesigners/the30/rules.mk +++ b/keyboards/lazydesigners/the30/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json index 2afadd83ee7..6e0bc06db68 100644 --- a/keyboards/lazydesigners/the40/info.json +++ b/keyboards/lazydesigners/the40/info.json @@ -8,6 +8,8 @@ "pid": "0x0042", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lazydesigners/the40/rules.mk b/keyboards/lazydesigners/the40/rules.mk index ce1d79e917f..8d59557bc89 100644 --- a/keyboards/lazydesigners/the40/rules.mk +++ b/keyboards/lazydesigners/the40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index ebf94646be0..e6243e4add9 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -8,6 +8,8 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/the50/rules.mk b/keyboards/lazydesigners/the50/rules.mk index c9f848a0180..0cc1bff4116 100644 --- a/keyboards/lazydesigners/the50/rules.mk +++ b/keyboards/lazydesigners/the50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/the60/rev1/info.json b/keyboards/lazydesigners/the60/rev1/info.json index b177b0c23d9..5ef3d14aefd 100755 --- a/keyboards/lazydesigners/the60/rev1/info.json +++ b/keyboards/lazydesigners/the60/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_spc_split_bspc": { "layout": [ diff --git a/keyboards/lazydesigners/the60/rev1/rules.mk b/keyboards/lazydesigners/the60/rev1/rules.mk index 9ebd4620b92..a0debe7a23e 100755 --- a/keyboards/lazydesigners/the60/rev1/rules.mk +++ b/keyboards/lazydesigners/the60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json index e2e9ff21855..b91acfa71eb 100755 --- a/keyboards/lazydesigners/the60/rev2/info.json +++ b/keyboards/lazydesigners/the60/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0062", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lazydesigners/the60/rev2/rules.mk b/keyboards/lazydesigners/the60/rev2/rules.mk index 35fbff0af95..a4b56c37ddd 100755 --- a/keyboards/lazydesigners/the60/rev2/rules.mk +++ b/keyboards/lazydesigners/the60/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json index 39ace77b123..5933c6301f1 100644 --- a/keyboards/leafcutterlabs/bigknob/info.json +++ b/keyboards/leafcutterlabs/bigknob/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_1x5": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}] diff --git a/keyboards/leafcutterlabs/bigknob/rules.mk b/keyboards/leafcutterlabs/bigknob/rules.mk index c4c90ab7b2e..5a3a85a3eb0 100644 --- a/keyboards/leafcutterlabs/bigknob/rules.mk +++ b/keyboards/leafcutterlabs/bigknob/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/leeku/finger65/info.json b/keyboards/leeku/finger65/info.json index b50c676e5b6..beea79a5390 100644 --- a/keyboards/leeku/finger65/info.json +++ b/keyboards/leeku/finger65/info.json @@ -8,6 +8,8 @@ "pid": "0x6050", "device_version": "1.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/leeku/finger65/rules.mk b/keyboards/leeku/finger65/rules.mk index e1e0dba786f..d0fd1ea5dd6 100644 --- a/keyboards/leeku/finger65/rules.mk +++ b/keyboards/leeku/finger65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/lefty/info.json b/keyboards/lefty/info.json index 210c7064592..ac48f157aa7 100644 --- a/keyboards/lefty/info.json +++ b/keyboards/lefty/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lefty/rules.mk b/keyboards/lefty/rules.mk index 658803f6c78..e0d5a4375e5 100644 --- a/keyboards/lefty/rules.mk +++ b/keyboards/lefty/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json index de9547a15e2..81a06257261 100644 --- a/keyboards/lets_split/info.json +++ b/keyboards/lets_split/info.json @@ -1,6 +1,8 @@ { "url": "", "maintainer": "qmk", + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index 45945516c67..cb7097b091a 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json index 550aad3df93..8973c3fafab 100644 --- a/keyboards/lfkeyboards/lfk65_hs/info.json +++ b/keyboards/lfkeyboards/lfk65_hs/info.json @@ -8,6 +8,8 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "","x": 13,"y": 0,"w": 1},{"label": "","x": 14,"y": 0,"w": 1},{"label": "Home","x": 15,"y": 0},{"label": "Tab","x": 0,"y": 1,"w": 1.5},{"label": "Q","x": 1.5,"y": 1},{"label": "W","x": 2.5,"y": 1},{"label": "E","x": 3.5,"y": 1},{"label": "R","x": 4.5,"y": 1},{"label": "T","x": 5.5,"y": 1},{"label": "Y","x": 6.5,"y": 1},{"label": "U","x": 7.5,"y": 1},{"label": "I","x": 8.5,"y": 1},{"label": "O","x": 9.5,"y": 1},{"label": "P","x": 10.5,"y": 1},{"label": "{","x": 11.5,"y": 1},{"label": "}","x": 12.5,"y": 1},{"label": "|","x": 13.5,"y": 1,"w": 1.5},{"label": "Page Up","x": 15,"y": 1},{"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},{"label": "A","x": 1.75,"y": 2},{"label": "S","x": 2.75,"y": 2},{"label": "D","x": 3.75,"y": 2},{"label": "F","x": 4.75,"y": 2},{"label": "G","x": 5.75,"y": 2},{"label": "H","x": 6.75,"y": 2},{"label": "J","x": 7.75,"y": 2},{"label": "K","x": 8.75,"y": 2},{"label": "L","x": 9.75,"y": 2},{"label": ":","x": 10.75,"y": 2},{"label": "\"","x": 11.75,"y": 2},{"label": "","x": 12.75,"y": 2},{"label": "Enter","x": 13.75,"y": 2,"w": 1.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 1.25},{"label": "","x": 1.25,"y": 3},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "←","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]}, "LAYOUT_ansi": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "Backspace","x": 13,"y": 0,"w": 2},{"label": "Home","x": 15,"y": 0},{"label": "Tab","x": 0,"y": 1,"w": 1.5},{"label": "Q","x": 1.5,"y": 1},{"label": "W","x": 2.5,"y": 1},{"label": "E","x": 3.5,"y": 1},{"label": "R","x": 4.5,"y": 1},{"label": "T","x": 5.5,"y": 1},{"label": "Y","x": 6.5,"y": 1},{"label": "U","x": 7.5,"y": 1},{"label": "I","x": 8.5,"y": 1},{"label": "O","x": 9.5,"y": 1},{"label": "P","x": 10.5,"y": 1},{"label": "{","x": 11.5,"y": 1},{"label": "}","x": 12.5,"y": 1},{"label": "|","x": 13.5,"y": 1,"w": 1.5},{"label": "Page Up","x": 15,"y": 1},{"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},{"label": "A","x": 1.75,"y": 2},{"label": "S","x": 2.75,"y": 2},{"label": "D","x": 3.75,"y": 2},{"label": "F","x": 4.75,"y": 2},{"label": "G","x": 5.75,"y": 2},{"label": "H","x": 6.75,"y": 2},{"label": "J","x": 7.75,"y": 2},{"label": "K","x": 8.75,"y": 2},{"label": "L","x": 9.75,"y": 2},{"label": ":","x": 10.75,"y": 2},{"label": "\"","x": 11.75,"y": 2},{"label": "Enter","x": 12.75,"y": 2,"w": 2.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 2.25},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "←","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]} diff --git a/keyboards/lfkeyboards/lfk65_hs/rules.mk b/keyboards/lfkeyboards/lfk65_hs/rules.mk index 618c502e061..5589209fddc 100644 --- a/keyboards/lfkeyboards/lfk65_hs/rules.mk +++ b/keyboards/lfkeyboards/lfk65_hs/rules.mk @@ -1,5 +1,2 @@ -MCU = atmega32u4 -BOOTLOADER = atmel-dfu - # Extra source files for IS3731 lighting SRC = TWIlib.c issi.c lighting.c diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json index bd9edaea017..8ff16c7e54e 100644 --- a/keyboards/lfkeyboards/lfk78/revb/info.json +++ b/keyboards/lfkeyboards/lfk78/revb/info.json @@ -8,6 +8,8 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revb/rules.mk b/keyboards/lfkeyboards/lfk78/revb/rules.mk index 451373a9278..e69de29bb2d 100644 --- a/keyboards/lfkeyboards/lfk78/revb/rules.mk +++ b/keyboards/lfkeyboards/lfk78/revb/rules.mk @@ -1,2 +0,0 @@ -# MCU name -MCU = atmega32u4 diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json index 1af3ffaf860..48233f60cd1 100644 --- a/keyboards/lfkeyboards/lfk78/revc/info.json +++ b/keyboards/lfkeyboards/lfk78/revc/info.json @@ -8,6 +8,8 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revc/rules.mk b/keyboards/lfkeyboards/lfk78/revc/rules.mk index 889bfaad549..e69de29bb2d 100644 --- a/keyboards/lfkeyboards/lfk78/revc/rules.mk +++ b/keyboards/lfkeyboards/lfk78/revc/rules.mk @@ -1,2 +0,0 @@ -# MCU name -MCU = at90usb1286 diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json index d905b4977e1..0d1c3551847 100644 --- a/keyboards/lfkeyboards/lfk78/revj/info.json +++ b/keyboards/lfkeyboards/lfk78/revj/info.json @@ -8,6 +8,8 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revj/rules.mk b/keyboards/lfkeyboards/lfk78/revj/rules.mk index c1836b74961..ef72559a0c1 100644 --- a/keyboards/lfkeyboards/lfk78/revj/rules.mk +++ b/keyboards/lfkeyboards/lfk78/revj/rules.mk @@ -1,4 +1 @@ -# MCU name -MCU = at90usb646 - AUDIO_ENABLE = yes diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk index 89d8c7ff59c..1db50d1423f 100644 --- a/keyboards/lfkeyboards/lfk78/rules.mk +++ b/keyboards/lfkeyboards/lfk78/rules.mk @@ -1,6 +1,3 @@ -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json index e4906fe7fd9..86180fc6caa 100644 --- a/keyboards/lfkeyboards/lfkpad/info.json +++ b/keyboards/lfkeyboards/lfkpad/info.json @@ -8,6 +8,8 @@ "pid": "0x3231", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk index 29351a36cf5..b60f4b532ff 100644 --- a/keyboards/lfkeyboards/lfkpad/rules.mk +++ b/keyboards/lfkeyboards/lfkpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lfkeyboards/mini1800/reva/info.json b/keyboards/lfkeyboards/mini1800/reva/info.json new file mode 100644 index 00000000000..a0204033d8e --- /dev/null +++ b/keyboards/lfkeyboards/mini1800/reva/info.json @@ -0,0 +1,4 @@ +{ + "processor": "at90usb1286", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk index 1f67c5f199f..bb938f99b39 100644 --- a/keyboards/lfkeyboards/mini1800/reva/rules.mk +++ b/keyboards/lfkeyboards/mini1800/reva/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lfkeyboards/mini1800/revc/info.json b/keyboards/lfkeyboards/mini1800/revc/info.json new file mode 100644 index 00000000000..fd4b030c4ea --- /dev/null +++ b/keyboards/lfkeyboards/mini1800/revc/info.json @@ -0,0 +1,4 @@ +{ + "processor": "at90usb646", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk index 0ea69b6d6f1..bb938f99b39 100644 --- a/keyboards/lfkeyboards/mini1800/revc/rules.mk +++ b/keyboards/lfkeyboards/mini1800/revc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb646 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json index 8790e7e33a1..bf42e51ded2 100644 --- a/keyboards/lfkeyboards/smk65/revb/info.json +++ b/keyboards/lfkeyboards/smk65/revb/info.json @@ -1,5 +1,7 @@ { "usb": { "pid": "0x565B" - } + }, + "processor": "at90usb646", + "bootloader": "atmel-dfu" } diff --git a/keyboards/lfkeyboards/smk65/revb/rules.mk b/keyboards/lfkeyboards/smk65/revb/rules.mk index 9e823724169..57bf01d4cf5 100644 --- a/keyboards/lfkeyboards/smk65/revb/rules.mk +++ b/keyboards/lfkeyboards/smk65/revb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb646 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json index 071eab2f471..685e550b423 100644 --- a/keyboards/lfkeyboards/smk65/revf/info.json +++ b/keyboards/lfkeyboards/smk65/revf/info.json @@ -1,5 +1,7 @@ { "usb": { "pid": "0x565F" - } + }, + "processor": "atmega32u4", + "bootloader": "halfkay" } diff --git a/keyboards/lfkeyboards/smk65/revf/rules.mk b/keyboards/lfkeyboards/smk65/revf/rules.mk index 1d20f1e2817..25457479594 100644 --- a/keyboards/lfkeyboards/smk65/revf/rules.mk +++ b/keyboards/lfkeyboards/smk65/revf/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index 8e8b72434bd..9fcf2de6cd4 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -8,6 +8,8 @@ "pid": "0x0059", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index a0f931a6d91..5bd6b3de3cc 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -8,6 +8,8 @@ "pid": "0x4C4C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 10370c6d16c..6bbaa4203e3 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEB2D", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index d6635f73479..2fca52967d6 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json index 3357ba536f6..e464c020c47 100644 --- a/keyboards/lime/rev1/info.json +++ b/keyboards/lime/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x2784", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk index 17e83d045c8..1d1f049a53d 100644 --- a/keyboards/lime/rules.mk +++ b/keyboards/lime/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index 4cc1a71a555..be1decf4f5c 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/info.json @@ -7,6 +7,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_alice": { "layout": [ diff --git a/keyboards/linworks/dolice/rules.mk b/keyboards/linworks/dolice/rules.mk index a3d10eaaaa3..477fb5989c0 100644 --- a/keyboards/linworks/dolice/rules.mk +++ b/keyboards/linworks/dolice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json index f675f8c51fb..8e64093fa44 100644 --- a/keyboards/linworks/fave104/info.json +++ b/keyboards/linworks/fave104/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/fave104/rules.mk b/keyboards/linworks/fave104/rules.mk index 296105bb2b9..af31ae9eca1 100644 --- a/keyboards/linworks/fave104/rules.mk +++ b/keyboards/linworks/fave104/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json index 480a778e6ee..c04eb5644be 100644 --- a/keyboards/linworks/fave65h/info.json +++ b/keyboards/linworks/fave65h/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs", "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" diff --git a/keyboards/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk index cd0eb1ee645..f876ea8a182 100644 --- a/keyboards/linworks/fave65h/rules.mk +++ b/keyboards/linworks/fave65h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json index 4447c404f8f..38af8fb3eb2 100644 --- a/keyboards/linworks/fave84h/info.json +++ b/keyboards/linworks/fave84h/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": [ "tkl_ansi_tsangan" ], diff --git a/keyboards/linworks/fave84h/rules.mk b/keyboards/linworks/fave84h/rules.mk index c3ddbe42523..87ea6a36c2b 100644 --- a/keyboards/linworks/fave84h/rules.mk +++ b/keyboards/linworks/fave84h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json index 8b01d89c03b..dffb86c8ec6 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/info.json @@ -7,6 +7,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/linworks/fave87/rules.mk b/keyboards/linworks/fave87/rules.mk index 216713b44b4..dd1bb7c54f6 100644 --- a/keyboards/linworks/fave87/rules.mk +++ b/keyboards/linworks/fave87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json index b6a836e0ec9..1746353c264 100644 --- a/keyboards/linworks/fave87h/info.json +++ b/keyboards/linworks/fave87h/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_ansi_split_bs" }, diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk index cd0eb1ee645..f876ea8a182 100644 --- a/keyboards/linworks/fave87h/rules.mk +++ b/keyboards/linworks/fave87h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json index 1f6c3cdf148..30d9352f73f 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/info.json @@ -7,6 +7,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk index adad6ab5d25..bd6499b2396 100644 --- a/keyboards/linworks/whale75/rules.mk +++ b/keyboards/linworks/whale75/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json index c3f3091c988..02348599e5d 100644 --- a/keyboards/littlealby/mute/info.json +++ b/keyboards/littlealby/mute/info.json @@ -8,6 +8,8 @@ "pid": "0x4D55", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }] diff --git a/keyboards/littlealby/mute/rules.mk b/keyboards/littlealby/mute/rules.mk index d8c28e194fe..e673ad8b73a 100644 --- a/keyboards/littlealby/mute/rules.mk +++ b/keyboards/littlealby/mute/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/info.json index 9ebec82be70..376f2dcf60f 100644 --- a/keyboards/lizard_trick/tenkey_plusplus/info.json +++ b/keyboards/lizard_trick/tenkey_plusplus/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lizard_trick/tenkey_plusplus/rules.mk b/keyboards/lizard_trick/tenkey_plusplus/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/lizard_trick/tenkey_plusplus/rules.mk +++ b/keyboards/lizard_trick/tenkey_plusplus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json index 90979cd7ba6..2b79851bdc5 100644 --- a/keyboards/ll3macorn/bongopad/info.json +++ b/keyboards/ll3macorn/bongopad/info.json @@ -8,6 +8,8 @@ "pid": "0x2949", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [{"x":0, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}] diff --git a/keyboards/ll3macorn/bongopad/rules.mk b/keyboards/ll3macorn/bongopad/rules.mk index 9a6b49f2c73..c7f8935a088 100644 --- a/keyboards/ll3macorn/bongopad/rules.mk +++ b/keyboards/ll3macorn/bongopad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json index df410a3f652..c9996161174 100644 --- a/keyboards/lm_keyboard/lm60n/info.json +++ b/keyboards/lm_keyboard/lm60n/info.json @@ -8,6 +8,8 @@ "pid": "0x4B01", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/lm_keyboard/lm60n/rules.mk b/keyboards/lm_keyboard/lm60n/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/lm_keyboard/lm60n/rules.mk +++ b/keyboards/lm_keyboard/lm60n/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json index 29b7cf64abb..66e908268cf 100644 --- a/keyboards/loki65/info.json +++ b/keyboards/loki65/info.json @@ -8,6 +8,8 @@ "pid": "0x4C36", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/loki65/rules.mk b/keyboards/loki65/rules.mk index a53d7daeb0f..f430af42f41 100644 --- a/keyboards/loki65/rules.mk +++ b/keyboards/loki65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json index 96108107242..5381fd0e32e 100644 --- a/keyboards/longnald/corin/info.json +++ b/keyboards/longnald/corin/info.json @@ -8,6 +8,8 @@ "pid": "0x1024", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/longnald/corin/rules.mk b/keyboards/longnald/corin/rules.mk index b5761555d40..3c777809b4a 100644 --- a/keyboards/longnald/corin/rules.mk +++ b/keyboards/longnald/corin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json index 31051514e1d..256bf2821a4 100644 --- a/keyboards/lucid/alexa/info.json +++ b/keyboards/lucid/alexa/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/lucid/alexa/rules.mk b/keyboards/lucid/alexa/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/lucid/alexa/rules.mk +++ b/keyboards/lucid/alexa/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/info.json index 9f1c64363f1..1d527d44691 100644 --- a/keyboards/lucid/alexa_solder/info.json +++ b/keyboards/lucid/alexa_solder/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lucid/alexa_solder/rules.mk b/keyboards/lucid/alexa_solder/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/lucid/alexa_solder/rules.mk +++ b/keyboards/lucid/alexa_solder/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json index 5adeb63b8b0..f1549917321 100644 --- a/keyboards/lucid/kbd8x_hs/info.json +++ b/keyboards/lucid/kbd8x_hs/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/lucid/kbd8x_hs/rules.mk b/keyboards/lucid/kbd8x_hs/rules.mk index aed2d80b8b8..f117516ecce 100644 --- a/keyboards/lucid/kbd8x_hs/rules.mk +++ b/keyboards/lucid/kbd8x_hs/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = at90usb646 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/info.json index 15f450c6464..cff92a3b8e7 100644 --- a/keyboards/lucid/phantom_hs/info.json +++ b/keyboards/lucid/phantom_hs/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/lucid/phantom_hs/rules.mk b/keyboards/lucid/phantom_hs/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/lucid/phantom_hs/rules.mk +++ b/keyboards/lucid/phantom_hs/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/info.json index 950107367ff..4bd9a953a88 100644 --- a/keyboards/lucid/phantom_solder/info.json +++ b/keyboards/lucid/phantom_solder/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lucid/phantom_solder/rules.mk b/keyboards/lucid/phantom_solder/rules.mk index 67f00abb1ef..f117516ecce 100644 --- a/keyboards/lucid/phantom_solder/rules.mk +++ b/keyboards/lucid/phantom_solder/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lucid/scarlet/info.json b/keyboards/lucid/scarlet/info.json index 219a64a2ae0..9d4006a8fe3 100644 --- a/keyboards/lucid/scarlet/info.json +++ b/keyboards/lucid/scarlet/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/lucid/scarlet/rules.mk b/keyboards/lucid/scarlet/rules.mk index aed2d80b8b8..f117516ecce 100644 --- a/keyboards/lucid/scarlet/rules.mk +++ b/keyboards/lucid/scarlet/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = at90usb646 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lw67/info.json b/keyboards/lw67/info.json index 329ff4eb369..29579215dbb 100644 --- a/keyboards/lw67/info.json +++ b/keyboards/lw67/info.json @@ -8,6 +8,8 @@ "pid": "0x9998", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts":{ "LAYOUT_ansi":{ "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Mute", "x":16, "y":0.5}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}] diff --git a/keyboards/lw67/rules.mk b/keyboards/lw67/rules.mk index 5f58c5684bf..131aa72aeb5 100644 --- a/keyboards/lw67/rules.mk +++ b/keyboards/lw67/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json index 07476f4ebc5..025f1fe168d 100644 --- a/keyboards/lyso1/lck75/info.json +++ b/keyboards/lyso1/lck75/info.json @@ -8,6 +8,8 @@ "pid": "0x6163", "device_version": "0.0.2" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_default": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}] diff --git a/keyboards/lyso1/lck75/rules.mk b/keyboards/lyso1/lck75/rules.mk index 1af1d4921b0..db42ab6247c 100644 --- a/keyboards/lyso1/lck75/rules.mk +++ b/keyboards/lyso1/lck75/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/lyso1/lefishe/info.json b/keyboards/lyso1/lefishe/info.json index 5a98c2ea431..ad9618f1c1d 100644 --- a/keyboards/lyso1/lefishe/info.json +++ b/keyboards/lyso1/lefishe/info.json @@ -8,6 +8,8 @@ "pid": "0x6169", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"LGUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/lyso1/lefishe/rules.mk b/keyboards/lyso1/lefishe/rules.mk index 5d063b87567..f91ecd04338 100644 --- a/keyboards/lyso1/lefishe/rules.mk +++ b/keyboards/lyso1/lefishe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json index 11fb15898c4..db5130b4fb5 100644 --- a/keyboards/lz/erghost/info.json +++ b/keyboards/lz/erghost/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6, "y":0}, {"label":"0,6", "x":8.75, "y":0}, {"label":"0,7", "x":9.75, "y":0}, {"label":"0,8", "x":10.75, "y":0}, {"label":"0,9", "x":11.75, "y":0}, {"label":"0,10", "x":12.75, "y":0}, {"label":"0,11", "x":13.75, "y":0}, {"label":"0,12", "x":14.75, "y":0}, {"label":"0,14", "x":17, "y":0}, {"label":"0,15", "x":18, "y":0}, {"label":"0,16", "x":19, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":8.75, "y":1.25}, {"label":"1,8", "x":9.75, "y":1.25}, {"label":"1,9", "x":10.75, "y":1.25}, {"label":"1,10", "x":11.75, "y":1.25}, {"label":"1,11", "x":12.75, "y":1.25}, {"label":"1,12", "x":13.75, "y":1.25}, {"label":"1,13", "x":14.75, "y":1.25}, {"label":"0,13", "x":15.75, "y":1.25}, {"label":"1,14", "x":17, "y":1.25}, {"label":"1,15", "x":18, "y":1.25}, {"label":"1,16", "x":19, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":8.25, "y":2.25}, {"label":"2,7", "x":9.25, "y":2.25}, {"label":"2,8", "x":10.25, "y":2.25}, {"label":"2,9", "x":11.25, "y":2.25}, {"label":"2,10", "x":12.25, "y":2.25}, {"label":"2,11", "x":13.25, "y":2.25}, {"label":"2,12", "x":14.25, "y":2.25}, {"label":"2,13", "x":15.25, "y":2.25, "w":1.5}, {"label":"2,14", "x":17, "y":2.25}, {"label":"2,15", "x":18, "y":2.25}, {"label":"2,16", "x":19, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":8.5, "y":3.25}, {"label":"3,7", "x":9.5, "y":3.25}, {"label":"3,8", "x":10.5, "y":3.25}, {"label":"3,9", "x":11.5, "y":3.25}, {"label":"3,10", "x":12.5, "y":3.25}, {"label":"3,11", "x":13.5, "y":3.25}, {"label":"3,13", "x":14.5, "y":3.25, "w":1.25}, {"label":"3,12", "x":15.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"5,7", "x":8, "y":4.25}, {"label":"4,7", "x":9, "y":4.25}, {"label":"4,8", "x":10, "y":4.25}, {"label":"4,9", "x":11, "y":4.25}, {"label":"4,10", "x":12, "y":4.25}, {"label":"4,11", "x":13, "y":4.25}, {"label":"4,12", "x":14, "y":4.25, "w":1.75}, {"label":"4,13", "x":15.75, "y":4.25}, {"label":"4,15", "x":18, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,2", "x":3.75, "y":5.25, "w":1.25}, {"label":"5,6", "x":5, "y":5.25, "w":1.25}, {"x":6.25, "y":5.25}, {"label":"5,10", "x":8, "y":5.25, "w":1.75}, {"x":9.75, "y":5.25}, {"label":"5,11", "x":10.75, "y":5.25, "w":1.25}, {"label":"5,12", "x":12, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.25, "y":5.25, "w":1.25}, {"label":"5,13", "x":14.5, "y":5.25, "w":1.25}, {"label":"5,14", "x":17, "y":5.25}, {"label":"5,15", "x":18, "y":5.25}, {"label":"5,16", "x":19, "y":5.25}] diff --git a/keyboards/lz/erghost/rules.mk b/keyboards/lz/erghost/rules.mk index a10d80e257d..03ea2f1bda0 100644 --- a/keyboards/lz/erghost/rules.mk +++ b/keyboards/lz/erghost/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/m10a/info.json b/keyboards/m10a/info.json index 49a84776237..f039afc9a76 100644 --- a/keyboards/m10a/info.json +++ b/keyboards/m10a/info.json @@ -8,6 +8,8 @@ "pid": "0x00AA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/m10a/rules.mk b/keyboards/m10a/rules.mk index 1d0c9335df6..df1f40ed766 100644 --- a/keyboards/m10a/rules.mk +++ b/keyboards/m10a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/info.json index 8caf54a4a4b..05c2a57234a 100644 --- a/keyboards/machine_industries/m4_a/info.json +++ b/keyboards/machine_industries/m4_a/info.json @@ -8,6 +8,8 @@ "pid": "0x004A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/machine_industries/m4_a/rules.mk b/keyboards/machine_industries/m4_a/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/machine_industries/m4_a/rules.mk +++ b/keyboards/machine_industries/m4_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json index 3eab9a1a3f3..77b69b9651d 100644 --- a/keyboards/machkeyboards/mach3/info.json +++ b/keyboards/machkeyboards/mach3/info.json @@ -8,6 +8,8 @@ "pid": "0x4D33", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_3x3": { "layout": [ diff --git a/keyboards/machkeyboards/mach3/rules.mk b/keyboards/machkeyboards/mach3/rules.mk index ada54400b27..244bc3f763c 100644 --- a/keyboards/machkeyboards/mach3/rules.mk +++ b/keyboards/machkeyboards/mach3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json index ddb15fb4e35..c79e7bd4389 100644 --- a/keyboards/macro1/info.json +++ b/keyboards/macro1/info.json @@ -8,6 +8,8 @@ "pid": "0x9999", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts":{ "LAYOUT_numpad":{ "layout":[ diff --git a/keyboards/macro1/rules.mk b/keyboards/macro1/rules.mk index c4a39c910fc..f0a88209b69 100644 --- a/keyboards/macro1/rules.mk +++ b/keyboards/macro1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json index b95ab110f35..830abdb9e9c 100644 --- a/keyboards/macro3/info.json +++ b/keyboards/macro3/info.json @@ -8,6 +8,8 @@ "pid": "0x3388", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_2x4" }, diff --git a/keyboards/macro3/rules.mk b/keyboards/macro3/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/macro3/rules.mk +++ b/keyboards/macro3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json index 19b60ad2eef..35e9e14ffcb 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/info.json @@ -8,6 +8,8 @@ "pid": "0x6E55", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/majistic/rules.mk b/keyboards/majistic/rules.mk index 859c6c35029..d7abef3ae35 100644 --- a/keyboards/majistic/rules.mk +++ b/keyboards/majistic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/makeymakey/info.json b/keyboards/makeymakey/info.json index 531ab4f6c95..f8c83898a40 100644 --- a/keyboards/makeymakey/info.json +++ b/keyboards/makeymakey/info.json @@ -8,6 +8,8 @@ "pid": "0x2B74", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 10, "layouts": { "LAYOUT": { diff --git a/keyboards/makeymakey/rules.mk b/keyboards/makeymakey/rules.mk index 66ad5334b31..9244882477d 100644 --- a/keyboards/makeymakey/rules.mk +++ b/keyboards/makeymakey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json index 30b17ebad37..98b59ca236a 100644 --- a/keyboards/makrosu/info.json +++ b/keyboards/makrosu/info.json @@ -8,6 +8,8 @@ "pid": "0x8585", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/makrosu/rules.mk b/keyboards/makrosu/rules.mk index d88257b2d62..0334a51bb5b 100644 --- a/keyboards/makrosu/rules.mk +++ b/keyboards/makrosu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json index 02c1a2421b1..895bfec6d13 100644 --- a/keyboards/malevolti/lyra/rev1/info.json +++ b/keyboards/malevolti/lyra/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x4C43", "device_version": "30.3.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk index 87f331ab6c5..78e2bfea04a 100644 --- a/keyboards/malevolti/lyra/rev1/rules.mk +++ b/keyboards/malevolti/lyra/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json index 5baf9581176..c45b496c54e 100644 --- a/keyboards/malevolti/superlyra/rev1/info.json +++ b/keyboards/malevolti/superlyra/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x4C53", "device_version": "30.3.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/malevolti/superlyra/rev1/rules.mk b/keyboards/malevolti/superlyra/rev1/rules.mk index e3012714c8f..7087b97cf14 100644 --- a/keyboards/malevolti/superlyra/rev1/rules.mk +++ b/keyboards/malevolti/superlyra/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json index 3b3b58a9c2e..6dc7f65dbac 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/info.json @@ -8,6 +8,8 @@ "pid": "0x991D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk index 8d5f3a9ce64..31ff5c952c5 100644 --- a/keyboards/manta60/rules.mk +++ b/keyboards/manta60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index 47eb066f493..f781e92265b 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -8,6 +8,8 @@ "pid": "0x0015", "device_version": "1.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/manyboard/macro/rules.mk b/keyboards/manyboard/macro/rules.mk index 9999ddafffc..51c7b089b0c 100644 --- a/keyboards/manyboard/macro/rules.mk +++ b/keyboards/manyboard/macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json index 087372c1868..21df7d9ddac 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/6ball/rules.mk b/keyboards/maple_computing/6ball/rules.mk index bb1a873d645..a73f2bd6931 100644 --- a/keyboards/maple_computing/6ball/rules.mk +++ b/keyboards/maple_computing/6ball/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json index 971c483627e..370f21ad09a 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/info.json @@ -8,6 +8,8 @@ "pid": "0xCA39", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Back", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Enter", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Fn", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}] diff --git a/keyboards/maple_computing/c39/rules.mk b/keyboards/maple_computing/c39/rules.mk index 4b65b7b9deb..3328e87188b 100755 --- a/keyboards/maple_computing/c39/rules.mk +++ b/keyboards/maple_computing/c39/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index 2f5dfef702d..6aa86425a00 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -7,6 +7,8 @@ "vid": "0xFEED", "pid": "0x3070" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk index ed78c6fabeb..54ee8484372 100644 --- a/keyboards/maple_computing/christmas_tree/rules.mk +++ b/keyboards/maple_computing/christmas_tree/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index 4bacbdb9b9b..3c028e0ea5a 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk index c076565dfc0..49af313aeb8 100644 --- a/keyboards/maple_computing/ivy/rules.mk +++ b/keyboards/maple_computing/ivy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json index bf468e5915e..84fd17bbb29 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/info.json @@ -8,6 +8,8 @@ "pid": "0x6017", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x12", "ortho_4x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/maple_computing/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk index 35f962dc8a7..4c9e4991bf0 100644 --- a/keyboards/maple_computing/jnao/rules.mk +++ b/keyboards/maple_computing/jnao/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index 4931670cb4c..8ae1835b692 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk index 67e76c62447..42b694f9180 100644 --- a/keyboards/maple_computing/launchpad/rules.mk +++ b/keyboards/maple_computing/launchpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 70b023d35d2..53cae800b7d 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -8,6 +8,8 @@ "pid": "0xE401", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk index 0fcfbf5e83e..4c5d9f9e5d4 100644 --- a/keyboards/maple_computing/lets_split_eh/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index f10a57e1366..6efef4ddc8d 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk index 175ed0f6be9..4cf751c4931 100644 --- a/keyboards/maple_computing/minidox/rules.mk +++ b/keyboards/maple_computing/minidox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json index c0aa2b371b1..69347412ce6 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/info.json @@ -8,6 +8,8 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0, "w":2}] diff --git a/keyboards/maple_computing/the_ruler/rules.mk b/keyboards/maple_computing/the_ruler/rules.mk index 986f0f277a7..473689d8144 100644 --- a/keyboards/maple_computing/the_ruler/rules.mk +++ b/keyboards/maple_computing/the_ruler/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json index 61f2a922510..7c4a6b43450 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/info.json @@ -8,6 +8,8 @@ "pid": "0xDFA8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/marksard/leftover30/rules.mk b/keyboards/marksard/leftover30/rules.mk index 1681487a94e..9f1aa1c0bff 100644 --- a/keyboards/marksard/leftover30/rules.mk +++ b/keyboards/marksard/leftover30/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json index 5373c34a022..a8b3c790ed1 100644 --- a/keyboards/marksard/rhymestone/rev1/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xDFA1", "device_version": "0.2.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk index 6bdbdcba3dc..affdbd6f113 100644 --- a/keyboards/marksard/rhymestone/rules.mk +++ b/keyboards/marksard/rhymestone/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index 2d664559004..040083b9685 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -2,5 +2,7 @@ "keyboard_name": "treadstone32 lite", "usb": { "device_version": "0.1.5" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/marksard/treadstone32/lite/rules.mk b/keyboards/marksard/treadstone32/lite/rules.mk index 6ded83e74b1..e69de29bb2d 100644 --- a/keyboards/marksard/treadstone32/lite/rules.mk +++ b/keyboards/marksard/treadstone32/lite/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index 9a2ae10a508..51b46b22d20 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "treadstone32", "usb": { "device_version": "0.1.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/marksard/treadstone32/rev1/rules.mk b/keyboards/marksard/treadstone32/rev1/rules.mk index bddd4e389e4..e69de29bb2d 100644 --- a/keyboards/marksard/treadstone32/rev1/rules.mk +++ b/keyboards/marksard/treadstone32/rev1/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk index a0b43873cc4..43e13475d32 100644 --- a/keyboards/marksard/treadstone32/rules.mk +++ b/keyboards/marksard/treadstone32/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Build Options # change yes to no to disable # diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json index 9182a3e9cf9..a17d9ab0a29 100644 --- a/keyboards/marksard/treadstone48/rev1/info.json +++ b/keyboards/marksard/treadstone48/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xDFA3", "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_base": { "layout": [ diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json index 37c513e24ed..34f44f1aba7 100644 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ b/keyboards/marksard/treadstone48/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0xDFA3", "device_version": "0.2.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_base": { "layout": [ diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk index 67c171a7b74..78219bfaceb 100644 --- a/keyboards/marksard/treadstone48/rules.mk +++ b/keyboards/marksard/treadstone48/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json index 437b5d7409b..c80f4d93731 100644 --- a/keyboards/massdrop/thekey/info.json +++ b/keyboards/massdrop/thekey/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/massdrop/thekey/rules.mk b/keyboards/massdrop/thekey/rules.mk index 5b0dcd2db40..b7e8d8e706b 100644 --- a/keyboards/massdrop/thekey/rules.mk +++ b/keyboards/massdrop/thekey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json index a808f376379..19ae416b6ee 100644 --- a/keyboards/massdrop/thekey_v2/info.json +++ b/keyboards/massdrop/thekey_v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/massdrop/thekey_v2/rules.mk b/keyboards/massdrop/thekey_v2/rules.mk index a0a1e94e36d..a927de843cb 100644 --- a/keyboards/massdrop/thekey_v2/rules.mk +++ b/keyboards/massdrop/thekey_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/masterworks/classy_tkl/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json index 38c4a2331b9..5a3c567bc9f 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/info.json +++ b/keyboards/masterworks/classy_tkl/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rules.mk +++ b/keyboards/masterworks/classy_tkl/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json index d7380644ff7..3c88dc453c4 100644 --- a/keyboards/matchstickworks/southpad/info.json +++ b/keyboards/matchstickworks/southpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_numpad_6x4_southpaw": { "layout": [ diff --git a/keyboards/matchstickworks/southpad/rules.mk b/keyboards/matchstickworks/southpad/rules.mk index 5ce64a46c30..59c896dbff6 100644 --- a/keyboards/matchstickworks/southpad/rules.mk +++ b/keyboards/matchstickworks/southpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index ee2f0382ee2..84b8dc38ebb 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -8,6 +8,8 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":20, "y":0}, {"label":"Scroll Lock", "x":21, "y":0}, {"label":"Pause", "x":22, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Num Lock", "x":15.5, "y":1.5}, {"label":"/", "x":16.5, "y":1.5}, {"label":"*", "x":17.5, "y":1.5}, {"label":"-", "x":18.5, "y":1.5}, {"label":"Insert", "x":20, "y":1.5}, {"label":"Home", "x":21, "y":1.5}, {"label":"PgUp", "x":22, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"7", "x":15.5, "y":2.5}, {"label":"8", "x":16.5, "y":2.5}, {"label":"9", "x":17.5, "y":2.5}, {"label":"+", "x":18.5, "y":2.5}, {"label":"Delete", "x":20, "y":2.5}, {"label":"End", "x":21, "y":2.5}, {"label":"PgDn", "x":22, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":15.5, "y":3.5}, {"label":"5", "x":16.5, "y":3.5}, {"label":"6", "x":17.5, "y":3.5}, {"label":"+", "x":18.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"1", "x":15.5, "y":4.5}, {"label":"2", "x":16.5, "y":4.5}, {"label":"3", "x":17.5, "y":4.5}, {"label":"Enter", "x":18.5, "y":4.5}, {"label":"\u2191", "x":21, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"0", "x":15.5, "y":5.5}, {"label":"0", "x":16.5, "y":5.5}, {"label":".", "x":17.5, "y":5.5}, {"label":"Enter", "x":18.5, "y":5.5}, {"label":"\u2190", "x":20, "y":5.5}, {"label":"\u2193", "x":21, "y":5.5}, {"label":"\u2192", "x":22, "y":5.5}] diff --git a/keyboards/matrix/cain_re/rules.mk b/keyboards/matrix/cain_re/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/matrix/cain_re/rules.mk +++ b/keyboards/matrix/cain_re/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json index a8e43410ff1..b5f58bc26ca 100644 --- a/keyboards/matrix/falcon/info.json +++ b/keyboards/matrix/falcon/info.json @@ -8,6 +8,8 @@ "pid": "0x474E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/matrix/falcon/rules.mk b/keyboards/matrix/falcon/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/matrix/falcon/rules.mk +++ b/keyboards/matrix/falcon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json index d747108bedc..af7e96d7193 100644 --- a/keyboards/matrix/m12og/rev2/info.json +++ b/keyboards/matrix/m12og/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x8712", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/matrix/m12og/rev2/rules.mk b/keyboards/matrix/m12og/rev2/rules.mk index 51da7491d3c..f1af8ca4c9c 100644 --- a/keyboards/matrix/m12og/rev2/rules.mk +++ b/keyboards/matrix/m12og/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json index af42327f063..e99f6f4146b 100644 --- a/keyboards/matrix/me/info.json +++ b/keyboards/matrix/me/info.json @@ -8,6 +8,8 @@ "pid": "0x454D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/matrix/me/rules.mk b/keyboards/matrix/me/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/matrix/me/rules.mk +++ b/keyboards/matrix/me/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json index 347868cffb5..bef63b4de03 100644 --- a/keyboards/matthewdias/m3n3van/info.json +++ b/keyboards/matthewdias/m3n3van/info.json @@ -8,6 +8,8 @@ "pid": "0x2323", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/matthewdias/m3n3van/rules.mk b/keyboards/matthewdias/m3n3van/rules.mk index 5f58c5684bf..131aa72aeb5 100644 --- a/keyboards/matthewdias/m3n3van/rules.mk +++ b/keyboards/matthewdias/m3n3van/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/info.json index 58d2066bd4f..d6b12a09755 100644 --- a/keyboards/matthewdias/minim/info.json +++ b/keyboards/matthewdias/minim/info.json @@ -8,6 +8,8 @@ "pid": "0xAAAA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/matthewdias/minim/rules.mk b/keyboards/matthewdias/minim/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/matthewdias/minim/rules.mk +++ b/keyboards/matthewdias/minim/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matthewdias/model_v/info.json b/keyboards/matthewdias/model_v/info.json index 0e279d5df4f..7c9f24c8925 100644 --- a/keyboards/matthewdias/model_v/info.json +++ b/keyboards/matthewdias/model_v/info.json @@ -7,6 +7,8 @@ "pid": "0x6D76", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split": { "layout": [ diff --git a/keyboards/matthewdias/model_v/rules.mk b/keyboards/matthewdias/model_v/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/matthewdias/model_v/rules.mk +++ b/keyboards/matthewdias/model_v/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/matthewdias/txuu/info.json b/keyboards/matthewdias/txuu/info.json index c5606388de6..f71b1ed80bd 100644 --- a/keyboards/matthewdias/txuu/info.json +++ b/keyboards/matthewdias/txuu/info.json @@ -7,6 +7,8 @@ "pid": "0x2809", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/matthewdias/txuu/rules.mk b/keyboards/matthewdias/txuu/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/matthewdias/txuu/rules.mk +++ b/keyboards/matthewdias/txuu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/maxipad/promicro/info.json b/keyboards/maxipad/promicro/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/maxipad/promicro/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/maxipad/promicro/rules.mk b/keyboards/maxipad/promicro/rules.mk index cf663a7ed6a..e69de29bb2d 100644 --- a/keyboards/maxipad/promicro/rules.mk +++ b/keyboards/maxipad/promicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/maxipad/teensy2/info.json b/keyboards/maxipad/teensy2/info.json new file mode 100644 index 00000000000..0b2db81c11e --- /dev/null +++ b/keyboards/maxipad/teensy2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/maxipad/teensy2/rules.mk b/keyboards/maxipad/teensy2/rules.mk index 320633f80f3..e69de29bb2d 100644 --- a/keyboards/maxipad/teensy2/rules.mk +++ b/keyboards/maxipad/teensy2/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json index f5ff668edfa..449a3fc0a52 100644 --- a/keyboards/maxr1998/pulse4k/info.json +++ b/keyboards/maxr1998/pulse4k/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maxr1998/pulse4k/rules.mk b/keyboards/maxr1998/pulse4k/rules.mk index 5533ac6f35b..3b110a7ade0 100644 --- a/keyboards/maxr1998/pulse4k/rules.mk +++ b/keyboards/maxr1998/pulse4k/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mb44/info.json b/keyboards/mb44/info.json index 4f916a0bf06..dce66f746a1 100644 --- a/keyboards/mb44/info.json +++ b/keyboards/mb44/info.json @@ -8,6 +8,8 @@ "pid": "0x6D62", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/mb44/rules.mk b/keyboards/mb44/rules.mk index 25bfe0732aa..9d77ae8a3c8 100644 --- a/keyboards/mb44/rules.mk +++ b/keyboards/mb44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mc_76k/info.json b/keyboards/mc_76k/info.json index db07a87f354..791d798ff9a 100644 --- a/keyboards/mc_76k/info.json +++ b/keyboards/mc_76k/info.json @@ -8,6 +8,8 @@ "pid": "0x4D43", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"Delete", "x":14, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Backspace", "x":13.5, "y":2.5, "w":1.5}, {"label":"Ctrl", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"Caps Lock", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}] diff --git a/keyboards/mc_76k/rules.mk b/keyboards/mc_76k/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/mc_76k/rules.mk +++ b/keyboards/mc_76k/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json index 94779c888f6..30e2ecab36b 100644 --- a/keyboards/mechanickeys/miniashen40/info.json +++ b/keyboards/mechanickeys/miniashen40/info.json @@ -8,6 +8,8 @@ "pid": "0x6D6E", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechanickeys/miniashen40/rules.mk b/keyboards/mechanickeys/miniashen40/rules.mk index d1dde8af62f..ab2c49da70e 100644 --- a/keyboards/mechanickeys/miniashen40/rules.mk +++ b/keyboards/mechanickeys/miniashen40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json index db1fd604469..c525db64202 100644 --- a/keyboards/mechanickeys/undead60m/info.json +++ b/keyboards/mechanickeys/undead60m/info.json @@ -8,6 +8,8 @@ "pid": "0x3C4D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechanickeys/undead60m/rules.mk b/keyboards/mechanickeys/undead60m/rules.mk index d5f4c9de7c9..8af9f7024aa 100644 --- a/keyboards/mechanickeys/undead60m/rules.mk +++ b/keyboards/mechanickeys/undead60m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechbrewery/mb65h/info.json b/keyboards/mechbrewery/mb65h/info.json index 6d25d11ac0c..e96a92660d9 100644 --- a/keyboards/mechbrewery/mb65h/info.json +++ b/keyboards/mechbrewery/mb65h/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { diff --git a/keyboards/mechbrewery/mb65h/rules.mk b/keyboards/mechbrewery/mb65h/rules.mk index be36efd4067..ec422af51da 100644 --- a/keyboards/mechbrewery/mb65h/rules.mk +++ b/keyboards/mechbrewery/mb65h/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json index fbcaea0d577..18c749f5921 100644 --- a/keyboards/mechbrewery/mb65s/info.json +++ b/keyboards/mechbrewery/mb65s/info.json @@ -8,6 +8,8 @@ "pid": "0x3635", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/mechbrewery/mb65s/rules.mk b/keyboards/mechbrewery/mb65s/rules.mk index be36efd4067..ec422af51da 100644 --- a/keyboards/mechbrewery/mb65s/rules.mk +++ b/keyboards/mechbrewery/mb65s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json index 79fcfba429c..de4f96707ba 100644 --- a/keyboards/mechkeys/acr60/info.json +++ b/keyboards/mechkeys/acr60/info.json @@ -8,6 +8,8 @@ "pid": "0xCA60", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_2_shifts": "LAYOUT_all" }, diff --git a/keyboards/mechkeys/acr60/rules.mk b/keyboards/mechkeys/acr60/rules.mk index 9ccce6abf4d..32e82925ccf 100644 --- a/keyboards/mechkeys/acr60/rules.mk +++ b/keyboards/mechkeys/acr60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json index 04802d1485f..c3cedc651ef 100644 --- a/keyboards/mechkeys/alu84/info.json +++ b/keyboards/mechkeys/alu84/info.json @@ -8,6 +8,8 @@ "pid": "0xCA75", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_75_ansi" }, diff --git a/keyboards/mechkeys/alu84/rules.mk b/keyboards/mechkeys/alu84/rules.mk index cadeb888ed8..730863ddccc 100755 --- a/keyboards/mechkeys/alu84/rules.mk +++ b/keyboards/mechkeys/alu84/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json index d293c96978b..698b7b7b343 100644 --- a/keyboards/mechkeys/espectro/info.json +++ b/keyboards/mechkeys/espectro/info.json @@ -8,6 +8,8 @@ "pid": "0xCA96", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/mechkeys/espectro/rules.mk b/keyboards/mechkeys/espectro/rules.mk index ad15c847bd1..5b869c14545 100755 --- a/keyboards/mechkeys/espectro/rules.mk +++ b/keyboards/mechkeys/espectro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json index 6a171711542..d971979c34e 100644 --- a/keyboards/mechkeys/mechmini/v1/info.json +++ b/keyboards/mechkeys/mechmini/v1/info.json @@ -8,6 +8,8 @@ "pid": "0xCA40", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechkeys/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk index a7d4a67a166..1829f64e676 100644 --- a/keyboards/mechkeys/mechmini/v1/rules.mk +++ b/keyboards/mechkeys/mechmini/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json index 0dfe5877a5b..bc8a60cd46f 100644 --- a/keyboards/mechkeys/mechmini/v2/info.json +++ b/keyboards/mechkeys/mechmini/v2/info.json @@ -8,6 +8,8 @@ "pid": "0xCA40", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Caps", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"GUI", "x":3, "y":3}, {"label":"MO(1)", "x":4, "y":3}, {"label":"Space", "x":5, "y":3}, {"label":"Space", "x":6, "y":3}, {"label":"MO(2)", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}] diff --git a/keyboards/mechkeys/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk index 4f6e666b62c..3a899c4650b 100755 --- a/keyboards/mechkeys/mechmini/v2/rules.mk +++ b/keyboards/mechkeys/mechmini/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json index b322a589ab6..909215662e7 100644 --- a/keyboards/mechkeys/mk60/info.json +++ b/keyboards/mechkeys/mk60/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechkeys/mk60/rules.mk b/keyboards/mechkeys/mk60/rules.mk index 3ca912f6ecb..0922d3d5112 100644 --- a/keyboards/mechkeys/mk60/rules.mk +++ b/keyboards/mechkeys/mk60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index 465e145a970..ae29c4bfbd0 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -7,6 +7,8 @@ "vid": "0xCEEB", "pid": "0x0035" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}] diff --git a/keyboards/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk index af6241ff59d..205f5872385 100644 --- a/keyboards/mechllama/g35/rules.mk +++ b/keyboards/mechllama/g35/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - NKRO_ENABLE = yes # Enable N-Key Rollover OLED_ENABLE = yes OLED_DRIVER = SSD1306 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 66dedc5ef7b..5958db55d0b 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,6 +6,8 @@ "usb": { "vid": "0x4D4C" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk index 1cb91c908c7..ef29542a937 100644 --- a/keyboards/mechlovin/delphine/rules.mk +++ b/keyboards/mechlovin/delphine/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 584a774367f..2ed9cbdc06c 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -8,6 +8,8 @@ "pid": "0x0180", "device_version": "0.0.2" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layout_aliases": { "LAYOUT_tkl_nofrow_ansi": "LAYOUT_ansi", "LAYOUT_tkl_nofrow_iso": "LAYOUT_iso" diff --git a/keyboards/mechlovin/foundation/rules.mk b/keyboards/mechlovin/foundation/rules.mk index 5a0af7c463d..c0fdd8a2cea 100644 --- a/keyboards/mechlovin/foundation/rules.mk +++ b/keyboards/mechlovin/foundation/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F103 -BOARD = STM32_F103_STM32DUINO - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 912f973e0c4..2ed43a3fc2c 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 616d15c3e2a..798e67ee780 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk index 8d523230216..65e5f070fb7 100644 --- a/keyboards/mechlovin/hannah60rgb/rules.mk +++ b/keyboards/mechlovin/hannah60rgb/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json new file mode 100644 index 00000000000..c06ffbaf069 --- /dev/null +++ b/keyboards/mechlovin/hannah65/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" +} diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk index 39cf604383d..e01e6c73dad 100644 --- a/keyboards/mechlovin/hannah65/rules.mk +++ b/keyboards/mechlovin/hannah65/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index bbfdddf1ad8..7f61b0e023b 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x9101", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"INS", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"HOME", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Shift", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"END", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":2.75}, {"label":"Space", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/mechlovin/hannah910/rev1/rules.mk +++ b/keyboards/mechlovin/hannah910/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index b180466eeb4..76cb6cb8f0f 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x9102", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/mechlovin/hannah910/rev2/rules.mk +++ b/keyboards/mechlovin/hannah910/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index dc4953d831f..7bae7c15795 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x9103", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/mechlovin/hannah910/rev3/rules.mk +++ b/keyboards/mechlovin/hannah910/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json index b2dfdec696d..be59552b332 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Hex-4B Rev.1", "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32a", + "bootloader": "usbasploader" } diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk index c3a1785039a..15d473397d4 100644 --- a/keyboards/mechlovin/hex4b/rev1/rules.mk +++ b/keyboards/mechlovin/hex4b/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = usbasploader - # Processor frequency F_CPU = 16000000 diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json index da18a2ce4bf..040f96b0104 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Hex-4B Rev.2", "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk index a61a25009b2..a5089d51a5b 100644 --- a/keyboards/mechlovin/hex4b/rev2/rules.mk +++ b/keyboards/mechlovin/hex4b/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json index 5c01225cd7e..990dbfd48cd 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/info.json @@ -8,6 +8,9 @@ "pid": "0x6C01", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hex6c/rules.mk b/keyboards/mechlovin/hex6c/rules.mk index 3bdec7329d8..61776ab8924 100644 --- a/keyboards/mechlovin/hex6c/rules.mk +++ b/keyboards/mechlovin/hex6c/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json new file mode 100644 index 00000000000..c06ffbaf069 --- /dev/null +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" +} diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk index 82b0f2e482b..53a9137b2f9 100644 --- a/keyboards/mechlovin/infinity87/rev1/rules.mk +++ b/keyboards/mechlovin/infinity87/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index 62aa3cfeb0a..858f906ed2a 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x8702", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk index 92823adea9c..ea7804f1585 100644 --- a/keyboards/mechlovin/infinity87/rev2/rules.mk +++ b/keyboards/mechlovin/infinity87/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index fc308175cff..604fa512eda 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x8710", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk index 27de40424a0..5a28c2e1c2c 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk +++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk @@ -1,9 +1,2 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3741 diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index 9c9fe10a101..3b31aee81ab 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -8,6 +8,8 @@ "pid": "0x0875", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}] diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk index d16f1ac35b7..202f5f759b4 100644 --- a/keyboards/mechlovin/infinity875/rules.mk +++ b/keyboards/mechlovin/infinity875/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index 46ae961cde9..975d40a8a9a 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/info.json @@ -8,6 +8,9 @@ "pid": "0x8802", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/infinity88/rules.mk b/keyboards/mechlovin/infinity88/rules.mk index 75bcbf69879..ca7f10db504 100644 --- a/keyboards/mechlovin/infinity88/rules.mk +++ b/keyboards/mechlovin/infinity88/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json index f85aa212783..23a34f48a81 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/info.json @@ -8,6 +8,8 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinityce/rules.mk b/keyboards/mechlovin/infinityce/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/mechlovin/infinityce/rules.mk +++ b/keyboards/mechlovin/infinityce/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json index 69e336fa310..f95f0654eb0 100644 --- a/keyboards/mechlovin/jay60/info.json +++ b/keyboards/mechlovin/jay60/info.json @@ -8,6 +8,8 @@ "pid": "0x0600", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/mechlovin/jay60/rules.mk +++ b/keyboards/mechlovin/jay60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json index 310bccda290..0f21e4b7666 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/info.json @@ -8,6 +8,8 @@ "pid": "0x4B4E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/kanu/rules.mk b/keyboards/mechlovin/kanu/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/mechlovin/kanu/rules.mk +++ b/keyboards/mechlovin/kanu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json index 86298b55823..38bbb3c65a8 100644 --- a/keyboards/mechlovin/kay60/info.json +++ b/keyboards/mechlovin/kay60/info.json @@ -8,6 +8,8 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/kay60/rules.mk b/keyboards/mechlovin/kay60/rules.mk index f3ae57a3741..48c738da8f9 100644 --- a/keyboards/mechlovin/kay60/rules.mk +++ b/keyboards/mechlovin/kay60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json index 50b0830ef94..209e1a076dd 100644 --- a/keyboards/mechlovin/kay65/info.json +++ b/keyboards/mechlovin/kay65/info.json @@ -8,6 +8,8 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mechlovin/kay65/rules.mk b/keyboards/mechlovin/kay65/rules.mk index 1f52c371540..2eba275490a 100644 --- a/keyboards/mechlovin/kay65/rules.mk +++ b/keyboards/mechlovin/kay65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json index 2153f0ad17d..e079a7a4036 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/info.json +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -3,5 +3,8 @@ "usb": { "pid": "0x6509", "device_version": "0.0.1" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk index 927204fc74c..d6fa8455698 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk +++ b/keyboards/mechlovin/mechlovin9/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json index 2c92773e6de..bada93cca4e 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/info.json +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6509", "device_version": "0.0.2" - } + }, + "processor": "atmega32a", + "bootloader": "bootloadhid" } diff --git a/keyboards/mechlovin/mechlovin9/rev2/rules.mk b/keyboards/mechlovin/mechlovin9/rev2/rules.mk index afbfc0d853f..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/rules.mk +++ b/keyboards/mechlovin/mechlovin9/rev2/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 - -# Bootloader selection -BOOTLOADER = bootloadhid diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index c37f167bdb5..87d2f3a1a61 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json @@ -8,6 +8,8 @@ "pid": "0xD181", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk index 2fafe64f12e..1d15495eef5 100644 --- a/keyboards/mechlovin/olly/bb/rules.mk +++ b/keyboards/mechlovin/olly/bb/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index 96ea429cb99..4496f5c92ae 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -8,6 +8,8 @@ "pid": "0xD180", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk index 2fafe64f12e..1d15495eef5 100644 --- a/keyboards/mechlovin/olly/jf/rules.mk +++ b/keyboards/mechlovin/olly/jf/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index a8da1881e4f..9adec5281c9 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -8,6 +8,8 @@ "pid": "0xD750", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layout_aliases": { "LAYOUT": "LAYOUT_split_bs", "LAYOUT_all": "LAYOUT_split_bs" diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk index 163e6224bdb..25096b03d7e 100644 --- a/keyboards/mechlovin/olly/octagon/rules.mk +++ b/keyboards/mechlovin/olly/octagon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json index 07f2208b3f1..864fd7ff46b 100644 --- a/keyboards/mechlovin/olly/orion/info.json +++ b/keyboards/mechlovin/olly/orion/info.json @@ -8,6 +8,8 @@ "pid": "0xD870", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}] diff --git a/keyboards/mechlovin/olly/orion/rules.mk b/keyboards/mechlovin/olly/orion/rules.mk index 2e0fa8f7436..ef83f572ccb 100644 --- a/keyboards/mechlovin/olly/orion/rules.mk +++ b/keyboards/mechlovin/olly/orion/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F103 -BOARD = STM32_F103_STM32DUINO - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index 20b521636f1..7a057d15c35 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json @@ -8,6 +8,8 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/pisces/rules.mk b/keyboards/mechlovin/pisces/rules.mk index 2a88ecc5da3..bb8afde082e 100644 --- a/keyboards/mechlovin/pisces/rules.mk +++ b/keyboards/mechlovin/pisces/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json index fe891d5987b..d3ba633cf27 100644 --- a/keyboards/mechlovin/serratus/info.json +++ b/keyboards/mechlovin/serratus/info.json @@ -8,6 +8,8 @@ "pid": "0x0870", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk index a10d80e257d..03ea2f1bda0 100644 --- a/keyboards/mechlovin/serratus/rules.mk +++ b/keyboards/mechlovin/serratus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json index 535903586c2..52a00d5c9cd 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/info.json @@ -8,6 +8,8 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/mechlovin/th1800/rules.mk +++ b/keyboards/mechlovin/th1800/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json index 80922903cee..163b4de6d1a 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/info.json @@ -7,6 +7,9 @@ "pid": "0xC601", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechlovin/tmkl/rules.mk b/keyboards/mechlovin/tmkl/rules.mk index 6d58f12af6a..80b09b5e419 100644 --- a/keyboards/mechlovin/tmkl/rules.mk +++ b/keyboards/mechlovin/tmkl/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json index e40e1ae91f8..0208f48349e 100644 --- a/keyboards/mechlovin/zed60/info.json +++ b/keyboards/mechlovin/zed60/info.json @@ -8,6 +8,8 @@ "pid": "0x0602", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, diff --git a/keyboards/mechlovin/zed60/rules.mk b/keyboards/mechlovin/zed60/rules.mk index d90d20b776c..a0a5d798436 100644 --- a/keyboards/mechlovin/zed60/rules.mk +++ b/keyboards/mechlovin/zed60/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json new file mode 100644 index 00000000000..cf993be2471 --- /dev/null +++ b/keyboards/mechlovin/zed65/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F103", + "bootloader": "stm32duino" +} diff --git a/keyboards/mechlovin/zed65/rules.mk b/keyboards/mechlovin/zed65/rules.mk index dbee1e24868..8e2643d31fc 100644 --- a/keyboards/mechlovin/zed65/rules.mk +++ b/keyboards/mechlovin/zed65/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F103 -BOARD = STM32_F103_STM32DUINO - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/info.json index c40496ae495..bc1bd35c519 100644 --- a/keyboards/mechstudio/dawn/info.json +++ b/keyboards/mechstudio/dawn/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechstudio/dawn/rules.mk b/keyboards/mechstudio/dawn/rules.mk index 7314d63b460..0a7f474acba 100644 --- a/keyboards/mechstudio/dawn/rules.mk +++ b/keyboards/mechstudio/dawn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index ca86393ada4..f323fdd02c4 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/mechstudio/ud_40_ortho/rules.mk b/keyboards/mechstudio/ud_40_ortho/rules.mk index 6e1b381678c..585ce414dcd 100644 --- a/keyboards/mechstudio/ud_40_ortho/rules.mk +++ b/keyboards/mechstudio/ud_40_ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index a6b6747df6d..97fc709de97 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -8,6 +8,9 @@ "pid": "0x170E", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bbs/rules.mk b/keyboards/mechwild/bbs/rules.mk index 519b77b437b..6dbff620b83 100644 --- a/keyboards/mechwild/bbs/rules.mk +++ b/keyboards/mechwild/bbs/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json index f3323ac48fa..b0596e76e5b 100644 --- a/keyboards/mechwild/mercutio/info.json +++ b/keyboards/mechwild/mercutio/info.json @@ -8,6 +8,8 @@ "pid": "0x1703", "device_version": "1.0.0" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [{"label":"encoder", "x":12, "y":0}, {"label":"1.5u", "x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"label":"1.5u", "x":11.5, "y":1, "w":1.5}, {"label":"1.75u", "x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"1.25u", "x":11.75, "y":2, "w":1.25}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"label":"1.75u", "x":11.25, "y":3, "w":1.75},{"label":"1.25u", "x":0, "y":4, "w":1.25}, {"label":"1u", "x":1.25, "y":4}, {"label":"1.25u", "x":2.25, "y":4, "w":1.25}, {"label":"2.25u", "x":3.5, "y":4, "w":2.25}, {"label":"1u", "x":5.75, "y":4}, {"label":"2.75u", "x":6.75, "y":4, "w":2.75}, {"label":"1.25u", "x":9.5, "y":4, "w":1.25}, {"label":"1u", "x":10.75, "y":4}, {"label":"1.25u", "x":11.75, "y":4, "w":1.25}] diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk index cba3861f34f..27c445ca2fc 100644 --- a/keyboards/mechwild/mercutio/rules.mk +++ b/keyboards/mechwild/mercutio/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 15ed63a858e..4cc18e68c46 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -8,6 +8,8 @@ "pid": "0x170C", "device_version": "1.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_mirrored": { "layout": [ diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk index 5aae5c7c769..c04e6937b06 100644 --- a/keyboards/mechwild/mokulua/mirrored/rules.mk +++ b/keyboards/mechwild/mokulua/mirrored/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index 74bcd0b16fd..dd9507dbe48 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -8,6 +8,8 @@ "pid": "0x170B", "device_version": "1.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_standard": { "layout": [ diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk index 5aae5c7c769..c04e6937b06 100644 --- a/keyboards/mechwild/mokulua/standard/rules.mk +++ b/keyboards/mechwild/mokulua/standard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index ae4f24f9fae..6344d426724 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/info.json @@ -8,6 +8,8 @@ "pid": "0x1705", "device_version": "3.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk index 22109659702..ddfffd4c4b0 100644 --- a/keyboards/mechwild/murphpad/rules.mk +++ b/keyboards/mechwild/murphpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/obe/f401/eeprom/rules.mk b/keyboards/mechwild/obe/f401/eeprom/rules.mk index 4707020e586..44adba039b5 100644 --- a/keyboards/mechwild/obe/f401/eeprom/rules.mk +++ b/keyboards/mechwild/obe/f401/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/obe/f401/info.json b/keyboards/mechwild/obe/f401/info.json new file mode 100644 index 00000000000..acd7e83f77d --- /dev/null +++ b/keyboards/mechwild/obe/f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk index 1b21bbaf770..e69de29bb2d 100644 --- a/keyboards/mechwild/obe/f401/rules.mk +++ b/keyboards/mechwild/obe/f401/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechwild/obe/f411/eeprom/rules.mk b/keyboards/mechwild/obe/f411/eeprom/rules.mk index 3d2f9bcf053..44adba039b5 100644 --- a/keyboards/mechwild/obe/f411/eeprom/rules.mk +++ b/keyboards/mechwild/obe/f411/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/obe/f411/info.json b/keyboards/mechwild/obe/f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/mechwild/obe/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk index c25a64f4b3b..e69de29bb2d 100644 --- a/keyboards/mechwild/obe/f411/rules.mk +++ b/keyboards/mechwild/obe/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 742438e8f55..d8ae46caf3c 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -8,6 +8,9 @@ "pid": "0x170F", "device_version": "1.0.0" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk index a2837f92167..4bddc4813fc 100644 --- a/keyboards/mechwild/puckbuddy/rules.mk +++ b/keyboards/mechwild/puckbuddy/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/waka60/f401/eeprom/rules.mk b/keyboards/mechwild/waka60/f401/eeprom/rules.mk index 4707020e586..44adba039b5 100644 --- a/keyboards/mechwild/waka60/f401/eeprom/rules.mk +++ b/keyboards/mechwild/waka60/f401/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/waka60/f401/info.json b/keyboards/mechwild/waka60/f401/info.json new file mode 100644 index 00000000000..acd7e83f77d --- /dev/null +++ b/keyboards/mechwild/waka60/f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk index 1b21bbaf770..e69de29bb2d 100644 --- a/keyboards/mechwild/waka60/f401/rules.mk +++ b/keyboards/mechwild/waka60/f401/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechwild/waka60/f411/eeprom/rules.mk b/keyboards/mechwild/waka60/f411/eeprom/rules.mk index 3d2f9bcf053..44adba039b5 100644 --- a/keyboards/mechwild/waka60/f411/eeprom/rules.mk +++ b/keyboards/mechwild/waka60/f411/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/waka60/f411/info.json b/keyboards/mechwild/waka60/f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/mechwild/waka60/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk index c25a64f4b3b..e69de29bb2d 100644 --- a/keyboards/mechwild/waka60/f411/rules.mk +++ b/keyboards/mechwild/waka60/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json index 34b9b001c8d..d33d458f783 100644 --- a/keyboards/mehkee96/info.json +++ b/keyboards/mehkee96/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print Screen", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"End", "x":16, "y":0}, {"label":"Page Up", "x":17, "y":0}, {"label":"Page Down", "x":18, "y":0}, {"label":"`", "x":0, "y":1}, {"label":"1", "x":1, "y":1}, {"label":"2", "x":2, "y":1}, {"label":"3", "x":3, "y":1}, {"label":"4", "x":4, "y":1}, {"label":"5", "x":5, "y":1}, {"label":"6", "x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"label":"0", "x":10, "y":1}, {"label":"-", "x":11, "y":1}, {"label":"=", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"P/", "x":16, "y":1}, {"label":"P*", "x":17, "y":1}, {"label":"P-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"[", "x":11.5, "y":2}, {"label":"]", "x":12.5, "y":2}, {"label":"\\", "x":13.5, "y":2, "w":1.5}, {"label":"P7", "x":15, "y":2}, {"label":"P8", "x":16, "y":2}, {"label":"P9", "x":17, "y":2}, {"label":"P+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":";", "x":10.75, "y":3}, {"label":"'", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"P4", "x":15, "y":3}, {"label":"P5", "x":16, "y":3}, {"label":"P6", "x":17, "y":3}, {"label":"P+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":",", "x":9.25, "y":4}, {"label":".", "x":10.25, "y":4}, {"label":"/", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14, "y":4}, {"label":"P1", "x":15, "y":4}, {"label":"P2", "x":16, "y":4}, {"label":"P3", "x":17, "y":4}, {"label":"PEnter", "x":18, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"label":"Fn", "x":12, "y":5}, {"label":"Left", "x":13, "y":5}, {"label":"Down", "x":14, "y":5}, {"label":"Right", "x":15, "y":5}, {"label":"P0", "x":16, "y":5}, {"label":"P.", "x":17, "y":5}, {"label":"PEnter", "x":18, "y":5}] diff --git a/keyboards/mehkee96/rules.mk b/keyboards/mehkee96/rules.mk index 9e2ac24f885..4fbc43c43e3 100644 --- a/keyboards/mehkee96/rules.mk +++ b/keyboards/mehkee96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json index ed4851c2895..3304b1cd33f 100644 --- a/keyboards/meletrix/zoom65/info.json +++ b/keyboards/meletrix/zoom65/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/meletrix/zoom65/rules.mk b/keyboards/meletrix/zoom65/rules.mk index f1debb5dff8..c310a235a93 100644 --- a/keyboards/meletrix/zoom65/rules.mk +++ b/keyboards/meletrix/zoom65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json index 9a8fd10f854..d1f598c140e 100644 --- a/keyboards/meletrix/zoom65_lite/info.json +++ b/keyboards/meletrix/zoom65_lite/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/meletrix/zoom65_lite/rules.mk b/keyboards/meletrix/zoom65_lite/rules.mk index f1debb5dff8..c310a235a93 100644 --- a/keyboards/meletrix/zoom65_lite/rules.mk +++ b/keyboards/meletrix/zoom65_lite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json index 5d37e84c017..4fb5b83f4b7 100644 --- a/keyboards/meletrix/zoom87/info.json +++ b/keyboards/meletrix/zoom87/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_87": "LAYOUT_tkl_f13", "LAYOUT_87_split_bs": "LAYOUT_tkl_f13_split_bs", diff --git a/keyboards/meletrix/zoom87/rules.mk b/keyboards/meletrix/zoom87/rules.mk index 85a4a905a5a..9f087183c5e 100644 --- a/keyboards/meletrix/zoom87/rules.mk +++ b/keyboards/meletrix/zoom87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json index 4b68bfc211d..c3ac841283e 100755 --- a/keyboards/melgeek/mach80/info.json +++ b/keyboards/melgeek/mach80/info.json @@ -8,6 +8,8 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "community_layouts": ["tkl_ansi"], "layouts": { diff --git a/keyboards/melgeek/mach80/rev1/rules.mk b/keyboards/melgeek/mach80/rev1/rules.mk index 498b9c36112..c4fed6e6e44 100755 --- a/keyboards/melgeek/mach80/rev1/rules.mk +++ b/keyboards/melgeek/mach80/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mach80/rev2/rules.mk b/keyboards/melgeek/mach80/rev2/rules.mk index 498b9c36112..c4fed6e6e44 100755 --- a/keyboards/melgeek/mach80/rev2/rules.mk +++ b/keyboards/melgeek/mach80/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json index 926877ceccf..0a6e033dea7 100644 --- a/keyboards/melgeek/mj61/info.json +++ b/keyboards/melgeek/mj61/info.json @@ -8,6 +8,9 @@ "pid": "0xED61", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3, "community_layouts": ["60_ansi"], "layouts": { diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj61/rev1/rules.mk +++ b/keyboards/melgeek/mj61/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj61/rev2/rules.mk +++ b/keyboards/melgeek/mj61/rev2/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj63/info.json b/keyboards/melgeek/mj63/info.json index 52ab22e492f..9a62795cb94 100644 --- a/keyboards/melgeek/mj63/info.json +++ b/keyboards/melgeek/mj63/info.json @@ -8,6 +8,9 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3, "community_layouts": ["60_ansi_arrow"], "layouts": { diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj63/rev1/rules.mk +++ b/keyboards/melgeek/mj63/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj63/rev2/rules.mk +++ b/keyboards/melgeek/mj63/rev2/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json index 2a2a0c919aa..1329740be6a 100644 --- a/keyboards/melgeek/mj64/info.json +++ b/keyboards/melgeek/mj64/info.json @@ -8,6 +8,9 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3, "community_layouts": ["64_ansi"], "layouts": { diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj64/rev1/rules.mk +++ b/keyboards/melgeek/mj64/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj64/rev2/rules.mk +++ b/keyboards/melgeek/mj64/rev2/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mj64/rev3/rules.mk +++ b/keyboards/melgeek/mj64/rev3/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json index 239eec528bf..f7a24f9a55e 100644 --- a/keyboards/melgeek/mj65/info.json +++ b/keyboards/melgeek/mj65/info.json @@ -8,6 +8,9 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3, "community_layouts": ["65_ansi"], "layouts": { diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 2a9a4c01a2c..51ff8073d26 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json index 516bb01b607..b0783663cc4 100755 --- a/keyboards/melgeek/mj6xy/info.json +++ b/keyboards/melgeek/mj6xy/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layout_aliases": { "LAYOUT_60_ansi_7u_spc": "LAYOUT_60_ansi_tsangan", diff --git a/keyboards/melgeek/mj6xy/rev3/rules.mk b/keyboards/melgeek/mj6xy/rev3/rules.mk index 6b0e1cd1a08..6559b3778b5 100755 --- a/keyboards/melgeek/mj6xy/rev3/rules.mk +++ b/keyboards/melgeek/mj6xy/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json index 59983529985..a7930598f71 100755 --- a/keyboards/melgeek/mojo68/info.json +++ b/keyboards/melgeek/mojo68/info.json @@ -8,6 +8,8 @@ "pid": "0x0068", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "community_layouts": ["68_ansi"], "layouts": { diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk index b7321c334f1..6180ab52a44 100755 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ b/keyboards/melgeek/mojo68/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json index 97e80df6adb..185b3414fc9 100644 --- a/keyboards/melgeek/mojo75/info.json +++ b/keyboards/melgeek/mojo75/info.json @@ -8,6 +8,9 @@ "pid": "0x7075", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3, "community_layouts": ["75_ansi"], "layouts": { diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ b/keyboards/melgeek/mojo75/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json old mode 100755 new mode 100644 index 4c4b8513192..9c33a5d3a25 --- a/keyboards/melgeek/tegic/info.json +++ b/keyboards/melgeek/tegic/info.json @@ -8,6 +8,8 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layout_aliases": { "LAYOUT_tegic_ansi": "LAYOUT" diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk index 313b87e8ffe..974cf04cb8e 100755 --- a/keyboards/melgeek/tegic/rev1/rules.mk +++ b/keyboards/melgeek/tegic/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json index 7c18e7ff863..a7042fe04b7 100644 --- a/keyboards/melgeek/z70ultra/info.json +++ b/keyboards/melgeek/z70ultra/info.json @@ -8,6 +8,9 @@ "pid": "0x6570", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "debounce": 3, "community_layouts": ["65_ansi_blocker"], "layouts": { diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk index 12eb7ffc274..186f1d00bf5 100644 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ b/keyboards/melgeek/z70ultra/rev1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/meme/info.json b/keyboards/meme/info.json index 07327ce3c88..872a9523d13 100644 --- a/keyboards/meme/info.json +++ b/keyboards/meme/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_spicy": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/meme/rules.mk b/keyboards/meme/rules.mk index a95b6c06d87..b6e2a5f9a41 100644 --- a/keyboards/meme/rules.mk +++ b/keyboards/meme/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json index a3367a0849a..ba3d696cb0d 100644 --- a/keyboards/meow48/info.json +++ b/keyboards/meow48/info.json @@ -8,6 +8,8 @@ "pid": "0xF048", "vid": "0xF048" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/meow48/rules.mk b/keyboards/meow48/rules.mk index 523669774a7..b38f37579e1 100644 --- a/keyboards/meow48/rules.mk +++ b/keyboards/meow48/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json index f877546a399..729fb3287c2 100644 --- a/keyboards/meow65/info.json +++ b/keyboards/meow65/info.json @@ -8,6 +8,8 @@ "pid": "0x4D36", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/meow65/rules.mk b/keyboards/meow65/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/meow65/rules.mk +++ b/keyboards/meow65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json index bdade6a712d..3c5f6d6784a 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/info.json @@ -8,6 +8,8 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk index a220ff6f85d..f6b1d47e1a9 100644 --- a/keyboards/merge/iso_macro/rules.mk +++ b/keyboards/merge/iso_macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index ed4beff454d..d42f88c7948 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,8 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk index a3f7ea0f8de..e78e1f6cec4 100644 --- a/keyboards/merge/uc1/rules.mk +++ b/keyboards/merge/uc1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index 20b0d918f7c..74ed0a7308d 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -8,6 +8,8 @@ "pid": "0x3222", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_rspace_2u_bksp": { "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0, "w":2}, {"x":17.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":17.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2, "w":2.25}, {"x":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3, "w":1.75}, {"x":16.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}] diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk index 8865137009a..de0aec2ab23 100644 --- a/keyboards/merge/um70/rules.mk +++ b/keyboards/merge/um70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index 1f367c91838..f17b9d7691b 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -8,6 +8,8 @@ "pid": "0x3241", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_rspace_split_bksp": { "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"F1", "x":2.75, "y":0}, {"label":"F2", "x":3.75, "y":0}, {"label":"F3", "x":4.75, "y":0}, {"label":"F4", "x":5.75, "y":0}, {"label":"F5", "x":7, "y":0}, {"label":"F6", "x":8, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.5, "y":0}, {"label":"F10", "x":13.5, "y":0}, {"label":"F11", "x":14.5, "y":0}, {"label":"F12", "x":15.5, "y":0}, {"label":"Del", "x":16.75, "y":0}, {"label":"Encoder", "x":18.25, "y":0}, {"label":"~", "x":1.5, "y":1.25}, {"label":"!", "x":2.5, "y":1.25}, {"label":"@", "x":3.5, "y":1.25}, {"label":"#", "x":4.5, "y":1.25}, {"label":"$", "x":5.5, "y":1.25}, {"label":"%", "x":6.5, "y":1.25}, {"label":"^", "x":7.5, "y":1.25}, {"label":"&", "x":9.75, "y":1.25}, {"label":"*", "x":10.75, "y":1.25}, {"label":"(", "x":11.75, "y":1.25}, {"label":")", "x":12.75, "y":1.25}, {"label":"_", "x":13.75, "y":1.25}, {"label":"+", "x":14.75, "y":1.25}, {"label":"~", "x":15.75, "y":1.25}, {"label":"Bksp", "x":16.75, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"M0", "x":0, "y":2.25}, {"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, {"label":"Q", "x":3, "y":2.25}, {"label":"W", "x":4, "y":2.25}, {"label":"E", "x":5, "y":2.25}, {"label":"R", "x":6, "y":2.25}, {"label":"T", "x":7, "y":2.25}, {"label":"Y", "x":9.25, "y":2.25}, {"label":"U", "x":10.25, "y":2.25}, {"label":"I", "x":11.25, "y":2.25}, {"label":"O", "x":12.25, "y":2.25}, {"label":"P", "x":13.25, "y":2.25}, {"label":"{", "x":14.25, "y":2.25}, {"label":"}", "x":15.25, "y":2.25}, {"label":"|", "x":16.25, "y":2.25, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2.25}, {"label":"M1", "x":0, "y":3.25}, {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, {"label":"A", "x":3.25, "y":3.25}, {"label":"S", "x":4.25, "y":3.25}, {"label":"D", "x":5.25, "y":3.25}, {"label":"F", "x":6.25, "y":3.25}, {"label":"G", "x":7.25, "y":3.25}, {"label":"H", "x":9.5, "y":3.25}, {"label":"J", "x":10.5, "y":3.25}, {"label":"K", "x":11.5, "y":3.25}, {"label":"L", "x":12.5, "y":3.25}, {"label":":", "x":13.5, "y":3.25}, {"label":"\"", "x":14.5, "y":3.25}, {"label":"Enter", "x":15.5, "y":3.25, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3.25}, {"label":"M2", "x":0, "y":4.25}, {"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, {"label":"Z", "x":3.75, "y":4.25}, {"label":"X", "x":4.75, "y":4.25}, {"label":"C", "x":5.75, "y":4.25}, {"label":"V", "x":6.75, "y":4.25}, {"label":"B", "x":7.75, "y":4.25}, {"label":"N", "x":10, "y":4.25}, {"label":"M", "x":11, "y":4.25}, {"label":"<", "x":12, "y":4.25}, {"label":">", "x":13, "y":4.25}, {"label":"?", "x":14, "y":4.25}, {"label":"Shift", "x":15, "y":4.25, "w":1.75}, {"label":"\u2191", "x":17, "y":4.5}, {"label":"M3", "x":0, "y":5.25}, {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, {"label":"Win", "x":2.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":4, "y":5.25, "w":1.25}, {"x":5.25, "y":5.25, "w":1.25}, {"x":6.5, "y":5.25, "w":2.25}, {"x":10, "y":5.25, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":14.25, "y":5.25, "w":1.5}, {"label":"\u2190", "x":16, "y":5.5}, {"label":"\u2193", "x":17, "y":5.5}, {"label":"\u2192", "x":18, "y":5.5}] diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk index 8865137009a..de0aec2ab23 100644 --- a/keyboards/merge/um80/rules.mk +++ b/keyboards/merge/um80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json index 96ed8c01484..48170cfd6e4 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/info.json @@ -8,6 +8,8 @@ "pid": "0x3232", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi_rspace_2u_bksp": { "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk index 27f0425b4f6..1fec8e42150 100644 --- a/keyboards/merge/uma/rules.mk +++ b/keyboards/merge/uma/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mesa/mesa_tkl/info.json b/keyboards/mesa/mesa_tkl/info.json index e1bf4b1dc9f..b940ffb7f5f 100644 --- a/keyboards/mesa/mesa_tkl/info.json +++ b/keyboards/mesa/mesa_tkl/info.json @@ -8,6 +8,8 @@ "pid": "0x8001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Back Space", "x":13, "y":1.25}, {"label":"Split BkSp", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"NUBS", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Fn", "x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Win", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/mesa/mesa_tkl/rules.mk b/keyboards/mesa/mesa_tkl/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/mesa/mesa_tkl/rules.mk +++ b/keyboards/mesa/mesa_tkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json index cc052c37fa7..5b923bcfbf5 100644 --- a/keyboards/meson/info.json +++ b/keyboards/meson/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/meson/rules.mk b/keyboards/meson/rules.mk index e1f6caafc49..2f33b87f294 100644 --- a/keyboards/meson/rules.mk +++ b/keyboards/meson/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/info.json index 89e5e796b84..87ee8d48a8f 100644 --- a/keyboards/metamechs/timberwolf/info.json +++ b/keyboards/metamechs/timberwolf/info.json @@ -8,6 +8,8 @@ "pid": "0x5754", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/metamechs/timberwolf/rules.mk b/keyboards/metamechs/timberwolf/rules.mk index 4f16ad10247..0a9f98774c0 100644 --- a/keyboards/metamechs/timberwolf/rules.mk +++ b/keyboards/metamechs/timberwolf/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json index d682d3e6cbe..a5709d78284 100644 --- a/keyboards/mexsistor/ludmila/info.json +++ b/keyboards/mexsistor/ludmila/info.json @@ -8,6 +8,8 @@ "pid": "0x6BF6", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mexsistor/ludmila/rules.mk b/keyboards/mexsistor/ludmila/rules.mk index 0fbc73da483..547c4ad49c9 100644 --- a/keyboards/mexsistor/ludmila/rules.mk +++ b/keyboards/mexsistor/ludmila/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mikeneko65/info.json b/keyboards/mikeneko65/info.json index 566509cc0f1..0ae602b096f 100644 --- a/keyboards/mikeneko65/info.json +++ b/keyboards/mikeneko65/info.json @@ -8,6 +8,8 @@ "pid": "0x6D54", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mikeneko65/rules.mk b/keyboards/mikeneko65/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/mikeneko65/rules.mk +++ b/keyboards/mikeneko65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json index 891ad9eb80d..9f3d247305c 100644 --- a/keyboards/miller/gm862/info.json +++ b/keyboards/miller/gm862/info.json @@ -8,6 +8,8 @@ "pid": "0x0223", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk index 036987413e1..c1fb17d02d6 100644 --- a/keyboards/miller/gm862/rules.mk +++ b/keyboards/miller/gm862/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json index 4f0318ce65b..f0a0f2da180 100644 --- a/keyboards/millipad/info.json +++ b/keyboards/millipad/info.json @@ -8,6 +8,8 @@ "pid": "0x1A1B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/millipad/rules.mk b/keyboards/millipad/rules.mk index e73fd25b16e..4b9105caf38 100644 --- a/keyboards/millipad/rules.mk +++ b/keyboards/millipad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mini_elixivy/info.json b/keyboards/mini_elixivy/info.json index cd9eed50b71..84ee3ee6f6a 100644 --- a/keyboards/mini_elixivy/info.json +++ b/keyboards/mini_elixivy/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/mini_elixivy/rules.mk b/keyboards/mini_elixivy/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/mini_elixivy/rules.mk +++ b/keyboards/mini_elixivy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json index 7bbbf6acccc..70c1d76832d 100644 --- a/keyboards/mini_ten_key_plus/info.json +++ b/keyboards/mini_ten_key_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout":[ diff --git a/keyboards/mini_ten_key_plus/rules.mk b/keyboards/mini_ten_key_plus/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/mini_ten_key_plus/rules.mk +++ b/keyboards/mini_ten_key_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json index cbc81cd7482..3c366ed6f28 100644 --- a/keyboards/miniaxe/info.json +++ b/keyboards/miniaxe/info.json @@ -8,6 +8,8 @@ "pid": "0x3939", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/miniaxe/rules.mk b/keyboards/miniaxe/rules.mk index d9fa6099484..ee687e87af2 100644 --- a/keyboards/miniaxe/rules.mk +++ b/keyboards/miniaxe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json index 0dba5c0e6c4..ad17e89c69f 100644 --- a/keyboards/minimacro5/info.json +++ b/keyboards/minimacro5/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_1x5": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0}] diff --git a/keyboards/minimacro5/rules.mk b/keyboards/minimacro5/rules.mk index 2bb7b0b50a2..897a356cf68 100644 --- a/keyboards/minimacro5/rules.mk +++ b/keyboards/minimacro5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 604c3881e17..f3fd4717ecf 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -9,6 +9,8 @@ "pid": "0x1306", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_6x13": { "layout": [ diff --git a/keyboards/minimon/index_tab/rules.mk b/keyboards/minimon/index_tab/rules.mk index 60b6f3bfa32..26982ff0073 100644 --- a/keyboards/minimon/index_tab/rules.mk +++ b/keyboards/minimon/index_tab/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mino/hotswap/info.json b/keyboards/mino/hotswap/info.json index 32231595ae2..4e932f4939e 100644 --- a/keyboards/mino/hotswap/info.json +++ b/keyboards/mino/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/mino/hotswap/rules.mk b/keyboards/mino/hotswap/rules.mk index 64d04b189b4..f8a709213ce 100644 --- a/keyboards/mino/hotswap/rules.mk +++ b/keyboards/mino/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json index e0deae38eec..252b952fb86 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk index ab7b04be205..2cd353930ea 100644 --- a/keyboards/mint60/rules.mk +++ b/keyboards/mint60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json index 409b1119b71..bc577e22fec 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/info.json @@ -8,6 +8,8 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/misonoworks/chocolatebar/rules.mk b/keyboards/misonoworks/chocolatebar/rules.mk index 509b0dc71a3..de4cbe598cf 100644 --- a/keyboards/misonoworks/chocolatebar/rules.mk +++ b/keyboards/misonoworks/chocolatebar/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index b76a16e7e74..a9d1ecbd31c 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -8,6 +8,8 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/misonoworks/karina/rules.mk b/keyboards/misonoworks/karina/rules.mk index 271385424a4..7e8534dae5a 100644 --- a/keyboards/misonoworks/karina/rules.mk +++ b/keyboards/misonoworks/karina/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json index 7ed334ee922..4a7bc23c353 100644 --- a/keyboards/misterknife/knife66/info.json +++ b/keyboards/misterknife/knife66/info.json @@ -8,6 +8,8 @@ "pid": "0x4172", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15.5, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14.25, "y":3.25}, {"x":15.5, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4, "w":1.25}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4, "w":2.75}, {"x":9.5, "y":4, "w":1.25}, {"x":10.75, "y":4}, {"x":11.75, "y":4, "w":1.25}, {"x":13.25, "y":4.25}, {"x":14.25, "y":4.25}, {"x":15.25, "y":4.25}] diff --git a/keyboards/misterknife/knife66/rules.mk b/keyboards/misterknife/knife66/rules.mk index 8a89ded5851..532eee6a624 100644 --- a/keyboards/misterknife/knife66/rules.mk +++ b/keyboards/misterknife/knife66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json index da475626a48..b3c84a65bc7 100644 --- a/keyboards/misterknife/knife66_iso/info.json +++ b/keyboards/misterknife/knife66_iso/info.json @@ -8,6 +8,8 @@ "pid": "0x4173", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/misterknife/knife66_iso/rules.mk b/keyboards/misterknife/knife66_iso/rules.mk index 8a89ded5851..532eee6a624 100644 --- a/keyboards/misterknife/knife66_iso/rules.mk +++ b/keyboards/misterknife/knife66_iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/info.json index 07d3c8f5ec2..a6d48c4e4ec 100644 --- a/keyboards/mitosis/info.json +++ b/keyboards/mitosis/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.75}, {"x":1, "y":0.25}, {"x":2, "y":0}, {"x":3, "y":0.25}, {"x":4, "y":0.125}, {"x":7, "y":0.125}, {"x":8, "y":0.25}, {"x":9, "y":0}, {"x":10, "y":0.25}, {"x":11, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.25}, {"x":2, "y":1}, {"x":3, "y":1.25}, {"x":4, "y":1.125}, {"x":7, "y":1.125}, {"x":8, "y":1.25}, {"x":9, "y":1}, {"x":10, "y":1.25}, {"x":11, "y":1.75}, {"x":0, "y":2.75}, {"x":1, "y":2.25}, {"x":2, "y":2}, {"x":3, "y":2.25}, {"x":4, "y":2.125}, {"x":7, "y":2.125}, {"x":8, "y":2.25}, {"x":9, "y":2}, {"x":10, "y":2.25}, {"x":11, "y":2.75}, {"x":1.5, "y":3.75}, {"x":2.5, "y":3.75}, {"x":3.5, "y":3.75}, {"x":4.5, "y":3.75}, {"x":6.5, "y":3.75}, {"x":7.5, "y":3.75}, {"x":8.5, "y":3.75}, {"x":9.5, "y":3.75}, {"x":1.5, "y":4.75}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":4.75}, {"x":6.5, "y":4.75}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}, {"x":9.5, "y":4.75}] diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk index 0a8a31e7dd7..6b1876f87ca 100644 --- a/keyboards/mitosis/rules.mk +++ b/keyboards/mitosis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json index b9ee96c7558..7dd62adb5a6 100644 --- a/keyboards/miuni32/info.json +++ b/keyboards/miuni32/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}] diff --git a/keyboards/miuni32/rules.mk b/keyboards/miuni32/rules.mk index 71b0107189c..34c8bbc6337 100644 --- a/keyboards/miuni32/rules.mk +++ b/keyboards/miuni32/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index c1f60e8ee73..17503123e35 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -8,6 +8,8 @@ "pid": "0x4D49", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mixi/rules.mk b/keyboards/mixi/rules.mk index f0530f599c1..bb895a7bf2e 100644 --- a/keyboards/mixi/rules.mk +++ b/keyboards/mixi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json index 4810c22d7e2..8ee1c8f94d1 100644 --- a/keyboards/ml/gas75/info.json +++ b/keyboards/ml/gas75/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ml/gas75/rules.mk b/keyboards/ml/gas75/rules.mk index a0fe1627d43..031ace3d41b 100644 --- a/keyboards/ml/gas75/rules.mk +++ b/keyboards/ml/gas75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json index 68c73096c4a..24b283fc26d 100644 --- a/keyboards/mlego/m48/rev1/info.json +++ b/keyboards/mlego/m48/rev1/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6261", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m48/rev1/rules.mk b/keyboards/mlego/m48/rev1/rules.mk index 3a1c9a94ab7..52fd5e68dc5 100644 --- a/keyboards/mlego/m48/rev1/rules.mk +++ b/keyboards/mlego/m48/rev1/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json index 865399a4604..dc653ed762b 100644 --- a/keyboards/mlego/m60/rev1/info.json +++ b/keyboards/mlego/m60/rev1/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6161", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk index b3b349f6f73..a8c86807b4e 100644 --- a/keyboards/mlego/m60/rev1/rules.mk +++ b/keyboards/mlego/m60/rev1/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 90303c33c51..b1cfbd3d4bf 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6361", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index 6463d57d379..497e86c8cb6 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index bee03f611f3..936c6fbdad9 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6362", "device_version": "0.0.1" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk index 72f146cc82d..ac47e053a2a 100644 --- a/keyboards/mlego/m60_split/rev2/rules.mk +++ b/keyboards/mlego/m60_split/rev2/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index e495c94992e..553fe3b7d2e 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x6061", "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev1/rules.mk b/keyboards/mlego/m65/rev1/rules.mk index 5e456c26060..fa351eadbac 100644 --- a/keyboards/mlego/m65/rev1/rules.mk +++ b/keyboards/mlego/m65/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 470262ed856..3e6ef2d0bc7 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x6061", "device_version": "0.0.2" - } + }, + "processor": "STM32F103", // GD32F303CCT6 + "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev2/rules.mk b/keyboards/mlego/m65/rev2/rules.mk index 1b7c586b716..51070f97189 100644 --- a/keyboards/mlego/m65/rev2/rules.mk +++ b/keyboards/mlego/m65/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 #GD32F303CCT6 weact - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index e42ab508570..cf330be7c93 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6062", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk index 57908335fd4..fa351eadbac 100644 --- a/keyboards/mlego/m65/rev3/rules.mk +++ b/keyboards/mlego/m65/rev3/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index c94ea38e22b..dee2b86933a 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6062", "device_version": "0.0.2" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk index a16dbefe322..bf9405e1d19 100644 --- a/keyboards/mlego/m65/rev4/rules.mk +++ b/keyboards/mlego/m65/rev4/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json index e83b0cc7675..5d613fee01f 100644 --- a/keyboards/mmkzoo65/info.json +++ b/keyboards/mmkzoo65/info.json @@ -8,6 +8,8 @@ "pid": "0x6505", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mmkzoo65/rules.mk b/keyboards/mmkzoo65/rules.mk index b018a630b52..299541fa82d 100644 --- a/keyboards/mmkzoo65/rules.mk +++ b/keyboards/mmkzoo65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mnk1800s/info.json b/keyboards/mnk1800s/info.json index 7c2a2738b78..26fab96ba94 100755 --- a/keyboards/mnk1800s/info.json +++ b/keyboards/mnk1800s/info.json @@ -8,6 +8,8 @@ "pid": "0x3138", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mnk1800s/rules.mk b/keyboards/mnk1800s/rules.mk index 169c45b479d..7000bb65710 100755 --- a/keyboards/mnk1800s/rules.mk +++ b/keyboards/mnk1800s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/mnk50/info.json b/keyboards/mnk50/info.json index c4d222138b9..26b900d70aa 100755 --- a/keyboards/mnk50/info.json +++ b/keyboards/mnk50/info.json @@ -8,6 +8,8 @@ "pid": "0x4D35", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mnk50/rules.mk b/keyboards/mnk50/rules.mk index 169c45b479d..7000bb65710 100755 --- a/keyboards/mnk50/rules.mk +++ b/keyboards/mnk50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/mnk75/info.json b/keyboards/mnk75/info.json index 24f54f8c000..71ff32beb1a 100755 --- a/keyboards/mnk75/info.json +++ b/keyboards/mnk75/info.json @@ -8,6 +8,8 @@ "pid": "0x4D37", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":15, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":15, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.75}, {"x":6.5, "y":5.5, "w":1.25}, {"x":7.75, "y":5.5, "w":2.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}] diff --git a/keyboards/mnk75/rules.mk b/keyboards/mnk75/rules.mk index 16600f5b66a..ae3dafb3deb 100755 --- a/keyboards/mnk75/rules.mk +++ b/keyboards/mnk75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json index 77ffdb28099..c5949adcb11 100644 --- a/keyboards/mntre/info.json +++ b/keyboards/mntre/info.json @@ -8,6 +8,8 @@ "pid": "0x1302", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mntre/rules.mk b/keyboards/mntre/rules.mk index 0159e4da7e6..ce8ecc4a9c7 100644 --- a/keyboards/mntre/rules.mk +++ b/keyboards/mntre/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json index 63cafbbd260..e856d0a7b65 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x6566", "device_version": "0.6.5" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mode/m65ha_alpha/rules.mk b/keyboards/mode/m65ha_alpha/rules.mk index 091e076bd02..71de5b0a9fd 100644 --- a/keyboards/mode/m65ha_alpha/rules.mk +++ b/keyboards/mode/m65ha_alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json index 7869008f8d2..3adafce6f03 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x6574", "device_version": "0.6.5" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_iso_blocker" }, diff --git a/keyboards/mode/m65hi_alpha/rules.mk b/keyboards/mode/m65hi_alpha/rules.mk index 091e076bd02..71de5b0a9fd 100644 --- a/keyboards/mode/m65hi_alpha/rules.mk +++ b/keyboards/mode/m65hi_alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json index 511a05bf8f6..60ee66db884 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/info.json @@ -8,6 +8,8 @@ "pid": "0x6583", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk index 91f94bfa10c..91bc99f944d 100644 --- a/keyboards/mode/m65s/rules.mk +++ b/keyboards/mode/m65s/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json index e3b5c6d64bf..f7d265707e9 100644 --- a/keyboards/mode/m75h/info.json +++ b/keyboards/mode/m75h/info.json @@ -8,6 +8,8 @@ "pid": "0x7572", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk index 76752ec1b38..ee752a964b3 100644 --- a/keyboards/mode/m75h/rules.mk +++ b/keyboards/mode/m75h/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json index 2b58f194fbd..58768a1063f 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -8,6 +8,8 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m75s/rules.mk b/keyboards/mode/m75s/rules.mk index 76752ec1b38..ee752a964b3 100644 --- a/keyboards/mode/m75s/rules.mk +++ b/keyboards/mode/m75s/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index a5e18224ae8..e7558244cef 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -8,6 +8,8 @@ "pid": "0x0081", "device_version": "0.7.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], "layout_aliases": { "LAYOUT_eighty_m80h": "LAYOUT_tkl_ansi" diff --git a/keyboards/mode/m80v1/m80h/rules.mk b/keyboards/mode/m80v1/m80h/rules.mk index 56294f95fd0..8c9d2aea969 100644 --- a/keyboards/mode/m80v1/m80h/rules.mk +++ b/keyboards/mode/m80v1/m80h/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index 7b72eb256f1..a94585c9266 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -8,6 +8,8 @@ "pid": "0x0080", "device_version": "0.8.3" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_eighty_m80s": { "layout": [ diff --git a/keyboards/mode/m80v1/m80s/rules.mk b/keyboards/mode/m80v1/m80s/rules.mk index 56294f95fd0..8c9d2aea969 100644 --- a/keyboards/mode/m80v1/m80s/rules.mk +++ b/keyboards/mode/m80v1/m80s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 04f3577bf61..fdbd5c88d1f 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -8,6 +8,8 @@ "pid": "0x0083", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], "layout_aliases": { "LAYOUT_m80v2h": "LAYOUT_tkl_ansi" diff --git a/keyboards/mode/m80v2/m80v2h/rules.mk b/keyboards/mode/m80v2/m80v2h/rules.mk index 5422160c872..113eb5ade88 100644 --- a/keyboards/mode/m80v2/m80v2h/rules.mk +++ b/keyboards/mode/m80v2/m80v2h/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 4e2a4fc6f50..06c106ecdc7 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -8,6 +8,8 @@ "pid": "0x0082", "device_version": "0.0.2" }, + "processor": "F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_m80v2s": { "layout": [ diff --git a/keyboards/mode/m80v2/m80v2s/rules.mk b/keyboards/mode/m80v2/m80v2s/rules.mk index 5422160c872..113eb5ade88 100644 --- a/keyboards/mode/m80v2/m80v2s/rules.mk +++ b/keyboards/mode/m80v2/m80v2s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/info.json index f5ea978684d..42c8ac5c6b1 100644 --- a/keyboards/mokey/ginkgo65/info.json +++ b/keyboards/mokey/ginkgo65/info.json @@ -8,6 +8,8 @@ "pid": "0x3365", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], diff --git a/keyboards/mokey/ginkgo65/rules.mk b/keyboards/mokey/ginkgo65/rules.mk index 02fbe725257..14e80e7106b 100644 --- a/keyboards/mokey/ginkgo65/rules.mk +++ b/keyboards/mokey/ginkgo65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json index 2525389a243..9083672c7de 100644 --- a/keyboards/mokey/ginkgo65hot/info.json +++ b/keyboards/mokey/ginkgo65hot/info.json @@ -8,6 +8,8 @@ "pid": "0x3366", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mokey/ginkgo65hot/rules.mk b/keyboards/mokey/ginkgo65hot/rules.mk index 02fbe725257..14e80e7106b 100644 --- a/keyboards/mokey/ginkgo65hot/rules.mk +++ b/keyboards/mokey/ginkgo65hot/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/info.json index 8f906681fa4..df1771d5e8a 100644 --- a/keyboards/mokey/ibis80/info.json +++ b/keyboards/mokey/ibis80/info.json @@ -8,6 +8,8 @@ "pid": "0x3380", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan" }, diff --git a/keyboards/mokey/ibis80/rules.mk b/keyboards/mokey/ibis80/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/mokey/ibis80/rules.mk +++ b/keyboards/mokey/ibis80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json index f34c47050e5..0a29380114c 100644 --- a/keyboards/mokey/mokey63/info.json +++ b/keyboards/mokey/mokey63/info.json @@ -8,6 +8,8 @@ "pid": "0x063A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mokey/mokey63/rules.mk b/keyboards/mokey/mokey63/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/mokey/mokey63/rules.mk +++ b/keyboards/mokey/mokey63/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json index 4673f1120c4..b31ef95cfd4 100644 --- a/keyboards/mokey/mokey64/info.json +++ b/keyboards/mokey/mokey64/info.json @@ -8,6 +8,8 @@ "pid": "0x001A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mokey/mokey64/rules.mk b/keyboards/mokey/mokey64/rules.mk index 79ef16449d9..c21ddd50844 100644 --- a/keyboards/mokey/mokey64/rules.mk +++ b/keyboards/mokey/mokey64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json index edff8976784..f2dc99719a6 100644 --- a/keyboards/mokey/xox70/info.json +++ b/keyboards/mokey/xox70/info.json @@ -8,6 +8,8 @@ "pid": "0x3370", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/mokey/xox70/rules.mk b/keyboards/mokey/xox70/rules.mk index 7b507a4165f..33ab188ca78 100644 --- a/keyboards/mokey/xox70/rules.mk +++ b/keyboards/mokey/xox70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json index 8a490265ec8..132ade0c9d4 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/info.json @@ -8,6 +8,8 @@ "pid": "0x3371", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan" }, diff --git a/keyboards/mokey/xox70hot/rules.mk b/keyboards/mokey/xox70hot/rules.mk index 72aebf2d0bd..9e621339867 100644 --- a/keyboards/mokey/xox70hot/rules.mk +++ b/keyboards/mokey/xox70hot/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json index e820ad99687..dd4a2773ca3 100755 --- a/keyboards/molecule/info.json +++ b/keyboards/molecule/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk index 8573995efbf..35280e22e3a 100755 --- a/keyboards/molecule/rules.mk +++ b/keyboards/molecule/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json index 1ca54fcd7ea..9eea6214bea 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/momoka_ergo/rules.mk b/keyboards/momoka_ergo/rules.mk index 509dcc85c52..850aa4e2248 100644 --- a/keyboards/momoka_ergo/rules.mk +++ b/keyboards/momoka_ergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json index d24aeaace52..b23740befa1 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/momokai/tap_duo/rules.mk b/keyboards/momokai/tap_duo/rules.mk index 59e0e1381f6..0b56f37c994 100644 --- a/keyboards/momokai/tap_duo/rules.mk +++ b/keyboards/momokai/tap_duo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json index 8f3c6ebb6da..63e6257ee8e 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/momokai/tap_trio/rules.mk b/keyboards/momokai/tap_trio/rules.mk index 59e0e1381f6..0b56f37c994 100644 --- a/keyboards/momokai/tap_trio/rules.mk +++ b/keyboards/momokai/tap_trio/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/monarch/info.json b/keyboards/monarch/info.json index 7e615207b6e..cb5239e9159 100644 --- a/keyboards/monarch/info.json +++ b/keyboards/monarch/info.json @@ -8,6 +8,8 @@ "pid": "0x43C1", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"x":0.25, "y":0.25}, {"x":1.25, "y":0.25}, {"x":2.25, "y":0.25}, {"x":3.25, "y":0.25}, {"x":4.25, "y":0.25}, {"x":5.25, "y":0.25}, {"x":6.25, "y":0.25}, {"x":7.25, "y":0.25}, {"x":8.25, "y":0.25}, {"x":9.25, "y":0.25}, {"x":10.25, "y":0.25}, {"x":11.25, "y":0.25}, {"x":12.25, "y":0.25}, {"x":13.25, "y":0.25}, {"x":14.25, "y":0.25}, {"x":15.75, "y":0.25}, {"x":0.25, "y":1.25, "w":1.5}, {"x":1.75, "y":1.25}, {"x":2.75, "y":1.25}, {"x":3.75, "y":1.25}, {"x":4.75, "y":1.25}, {"x":5.75, "y":1.25}, {"x":6.75, "y":1.25}, {"x":7.75, "y":1.25}, {"x":8.75, "y":1.25}, {"x":9.75, "y":1.25}, {"x":10.75, "y":1.25}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1.25}, {"x":13.75, "y":1.25, "w":1.5}, {"x":15.75, "y":1.75}, {"x":0.25, "y":2.25, "w":1.75}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4, "y":2.25}, {"x":5, "y":2.25}, {"x":6, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.25}, {"x":9, "y":2.25}, {"x":10, "y":2.25}, {"x":11, "y":2.25}, {"x":12, "y":2.25}, {"x":13, "y":2.25, "w":2.25}, {"x":15.75, "y":2.75}, {"x":0.25, "y":3.25, "w":2.25}, {"x":2.5, "y":3.25}, {"x":3.5, "y":3.25}, {"x":4.5, "y":3.25}, {"x":5.5, "y":3.25}, {"x":6.5, "y":3.25}, {"x":7.5, "y":3.25}, {"x":8.5, "y":3.25}, {"x":9.5, "y":3.25}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.25}, {"x":12.5, "y":3.25, "w":1.75}, {"x":14.5, "y":3.5}, {"x":0.25, "y":4.25, "w":1.5}, {"x":1.75, "y":4.25}, {"x":2.75, "y":4.25, "w":1.5}, {"x":4.25, "y":4.25, "w":7}, {"x":11.25, "y":4.25, "w":1.5}, {"x":13.5, "y":4.5}, {"x":14.5, "y":4.5}, {"x":15.5, "y":4.5}] diff --git a/keyboards/monarch/rules.mk b/keyboards/monarch/rules.mk index c62230982f5..bed35367eb1 100644 --- a/keyboards/monarch/rules.mk +++ b/keyboards/monarch/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/monoflex60/info.json b/keyboards/monoflex60/info.json index a724e5de75d..771c5aac66c 100644 --- a/keyboards/monoflex60/info.json +++ b/keyboards/monoflex60/info.json @@ -8,6 +8,8 @@ "pid": "0x60EB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": [ "60_tsangan_hhkb", "60_iso_tsangan" diff --git a/keyboards/monoflex60/rules.mk b/keyboards/monoflex60/rules.mk index 6983d5c803f..d1d32f35d0f 100644 --- a/keyboards/monoflex60/rules.mk +++ b/keyboards/monoflex60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json index 185dc7616b9..8176bac03ff 100644 --- a/keyboards/monstargear/xo87/rgb/info.json +++ b/keyboards/monstargear/xo87/rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x584F", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "lufa-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/monstargear/xo87/rgb/rules.mk b/keyboards/monstargear/xo87/rgb/rules.mk index c795314c81a..cc8c380fc01 100644 --- a/keyboards/monstargear/xo87/rgb/rules.mk +++ b/keyboards/monstargear/xo87/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb646 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json index d07bdfc6be5..8a6e4984d63 100644 --- a/keyboards/monstargear/xo87/solderable/info.json +++ b/keyboards/monstargear/xo87/solderable/info.json @@ -8,6 +8,8 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "processor": "at90usb646", + "bootloader": "lufa-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/monstargear/xo87/solderable/rules.mk b/keyboards/monstargear/xo87/solderable/rules.mk index 3ceb217bf2c..f015ea5d01c 100644 --- a/keyboards/monstargear/xo87/solderable/rules.mk +++ b/keyboards/monstargear/xo87/solderable/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb646 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/info.json index fe52052ae14..d7d6cf0d07a 100644 --- a/keyboards/montsinger/rebound/rev1/info.json +++ b/keyboards/montsinger/rebound/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk index 37bef024fe2..fc1633fe637 100644 --- a/keyboards/montsinger/rebound/rev1/rules.mk +++ b/keyboards/montsinger/rebound/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json index 0ac991aae34..cac145319ca 100644 --- a/keyboards/montsinger/rebound/rev2/info.json +++ b/keyboards/montsinger/rebound/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk index 4d4c3c8708f..02bef78ce31 100644 --- a/keyboards/montsinger/rebound/rev2/rules.mk +++ b/keyboards/montsinger/rebound/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json index 366ec855add..3d0df411776 100644 --- a/keyboards/montsinger/rebound/rev3/info.json +++ b/keyboards/montsinger/rebound/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk index 4d4c3c8708f..02bef78ce31 100644 --- a/keyboards/montsinger/rebound/rev3/rules.mk +++ b/keyboards/montsinger/rebound/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index 895e0f439f2..cde8ba679d0 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk index e6bd8510f19..f52c1697f78 100644 --- a/keyboards/montsinger/rebound/rev4/rules.mk +++ b/keyboards/montsinger/rebound/rev4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/info.json index 5e0bf1e3e1a..6df88109e84 100644 --- a/keyboards/montsinger/rewind/info.json +++ b/keyboards/montsinger/rewind/info.json @@ -8,6 +8,8 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_5x10": { "layout": [ diff --git a/keyboards/montsinger/rewind/rules.mk b/keyboards/montsinger/rewind/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/montsinger/rewind/rules.mk +++ b/keyboards/montsinger/rewind/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/moon/info.json b/keyboards/moon/info.json index cf591117c1f..7bc7228cf99 100644 --- a/keyboards/moon/info.json +++ b/keyboards/moon/info.json @@ -8,6 +8,8 @@ "pid": "0xFCB8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk index 6f1ac1ec003..804580d1f9f 100644 --- a/keyboards/moon/rules.mk +++ b/keyboards/moon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json index 6322dccd5b5..3492713a6aa 100644 --- a/keyboards/moonlander/info.json +++ b/keyboards/moonlander/info.json @@ -8,6 +8,8 @@ "pid": "0x1969", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_moonlander": { "layout": [ diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk index 72682d29b1e..825afb6ba1a 100644 --- a/keyboards/moonlander/rules.mk +++ b/keyboards/moonlander/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json index 6c0c20837b7..b012a2ecc6f 100644 --- a/keyboards/morizon/info.json +++ b/keyboards/morizon/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/morizon/rules.mk b/keyboards/morizon/rules.mk index 9cfcaf1bbcb..03778480554 100644 --- a/keyboards/morizon/rules.mk +++ b/keyboards/morizon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mountainblocks/mb17/info.json b/keyboards/mountainblocks/mb17/info.json index 46f1133aad1..56cb02fa28c 100644 --- a/keyboards/mountainblocks/mb17/info.json +++ b/keyboards/mountainblocks/mb17/info.json @@ -8,6 +8,8 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_numpad_5x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":1, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":3, "y":3, "h":2}] diff --git a/keyboards/mountainblocks/mb17/rules.mk b/keyboards/mountainblocks/mb17/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/mountainblocks/mb17/rules.mk +++ b/keyboards/mountainblocks/mb17/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json index 37bdb911602..a1e22f16148 100644 --- a/keyboards/mschwingen/modelm/info.json +++ b/keyboards/mschwingen/modelm/info.json @@ -8,6 +8,8 @@ "pid": "0x558E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "lufa-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mschwingen/modelm/rules.mk b/keyboards/mschwingen/modelm/rules.mk index 5a5a8e55870..94830f7a75d 100644 --- a/keyboards/mschwingen/modelm/rules.mk +++ b/keyboards/mschwingen/modelm/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json index 577903c264e..45b07231029 100644 --- a/keyboards/mss_studio/m63_rgb/info.json +++ b/keyboards/mss_studio/m63_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_60_ansi_arrow": { "layout": [ diff --git a/keyboards/mss_studio/m63_rgb/rules.mk b/keyboards/mss_studio/m63_rgb/rules.mk index 9291499b777..e3a981b6349 100644 --- a/keyboards/mss_studio/m63_rgb/rules.mk +++ b/keyboards/mss_studio/m63_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json index 971a213cb7d..ec168e049b1 100644 --- a/keyboards/mss_studio/m64_rgb/info.json +++ b/keyboards/mss_studio/m64_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/mss_studio/m64_rgb/rules.mk b/keyboards/mss_studio/m64_rgb/rules.mk index 9291499b777..e3a981b6349 100644 --- a/keyboards/mss_studio/m64_rgb/rules.mk +++ b/keyboards/mss_studio/m64_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json index 387a315b1e2..3a76a3bc618 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/mt/blocked65/rules.mk b/keyboards/mt/blocked65/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/mt/blocked65/rules.mk +++ b/keyboards/mt/blocked65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/info.json index 999c3b075d3..89b385472c0 100644 --- a/keyboards/mt/mt40/info.json +++ b/keyboards/mt/mt40/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/mt/mt40/rules.mk b/keyboards/mt/mt40/rules.mk index 1046811e2f9..05b8900231c 100644 --- a/keyboards/mt/mt40/rules.mk +++ b/keyboards/mt/mt40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json index 86612de6a73..20acbceedbf 100644 --- a/keyboards/mt/mt64rgb/info.json +++ b/keyboards/mt/mt64rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { diff --git a/keyboards/mt/mt64rgb/rules.mk b/keyboards/mt/mt64rgb/rules.mk index 4e5f77405a6..56bc9f57522 100644 --- a/keyboards/mt/mt64rgb/rules.mk +++ b/keyboards/mt/mt64rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json index be8d7ca41bd..ad101223aaa 100644 --- a/keyboards/mt/mt84/info.json +++ b/keyboards/mt/mt84/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/mt/mt84/rules.mk b/keyboards/mt/mt84/rules.mk index 259e03cb5ab..fc03a2e5345 100644 --- a/keyboards/mt/mt84/rules.mk +++ b/keyboards/mt/mt84/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json index 1e0ffaf11eb..e5d005916b4 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mt/mt980/rules.mk b/keyboards/mt/mt980/rules.mk index 2ca5686493c..9107b459049 100644 --- a/keyboards/mt/mt980/rules.mk +++ b/keyboards/mt/mt980/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json index 121498e5f97..7a6a97c726a 100644 --- a/keyboards/mt/ncr80/hotswap/info.json +++ b/keyboards/mt/ncr80/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x2002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mt/ncr80/hotswap/rules.mk b/keyboards/mt/ncr80/hotswap/rules.mk index 2501d49e2da..e82e95f7843 100644 --- a/keyboards/mt/ncr80/hotswap/rules.mk +++ b/keyboards/mt/ncr80/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json index 36d254d032c..2fcc0c1af11 100644 --- a/keyboards/mt/ncr80/solder/info.json +++ b/keyboards/mt/ncr80/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mt/ncr80/solder/rules.mk b/keyboards/mt/ncr80/solder/rules.mk index 282578f0e02..9032f3e4b8f 100644 --- a/keyboards/mt/ncr80/solder/rules.mk +++ b/keyboards/mt/ncr80/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json index 3a83e816e21..77559a1705c 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] diff --git a/keyboards/mt/split75/rules.mk b/keyboards/mt/split75/rules.mk index 4aed5ab5867..ebcb8a1159d 100644 --- a/keyboards/mt/split75/rules.mk +++ b/keyboards/mt/split75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json index b58f9273330..6f5da086d06 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/info.json +++ b/keyboards/mtbkeys/mtb60/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi" }, diff --git a/keyboards/mtbkeys/mtb60/hotswap/rules.mk b/keyboards/mtbkeys/mtb60/hotswap/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/rules.mk +++ b/keyboards/mtbkeys/mtb60/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json index ab60075874e..2f97a88913e 100644 --- a/keyboards/mtbkeys/mtb60/solder/info.json +++ b/keyboards/mtbkeys/mtb60/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/mtbkeys/mtb60/solder/rules.mk b/keyboards/mtbkeys/mtb60/solder/rules.mk index 1f52c371540..2eba275490a 100644 --- a/keyboards/mtbkeys/mtb60/solder/rules.mk +++ b/keyboards/mtbkeys/mtb60/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index 3fd078898b3..7c1878b91da 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk index 765d29393c1..c067a2faa03 100644 --- a/keyboards/murcielago/rev1/rules.mk +++ b/keyboards/murcielago/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index 7a2f830273a..a60e30be8f6 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -5,5 +5,7 @@ "vid": "0x7BA1", "pid": "0x3201", "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/mwstudio/alicekk/rules.mk b/keyboards/mwstudio/alicekk/rules.mk index 3c4396fabfd..f365071da0e 100644 --- a/keyboards/mwstudio/alicekk/rules.mk +++ b/keyboards/mwstudio/alicekk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json index 05057ba8f03..9030c897f6e 100644 --- a/keyboards/mwstudio/mw65_black/info.json +++ b/keyboards/mwstudio/mw65_black/info.json @@ -8,6 +8,8 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mwstudio/mw65_black/rules.mk b/keyboards/mwstudio/mw65_black/rules.mk index ed59e99abc7..6c261600bc0 100644 --- a/keyboards/mwstudio/mw65_black/rules.mk +++ b/keyboards/mwstudio/mw65_black/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json index 9518a2b54c4..d09a0d7b3a7 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk index e2e979fb684..b7a0f357da9 100644 --- a/keyboards/mwstudio/mw65_rgb/rules.mk +++ b/keyboards/mwstudio/mw65_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json index e861c5ea23b..bfba17e818c 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/info.json @@ -8,6 +8,8 @@ "pid": "0x7501", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mwstudio/mw75/rules.mk b/keyboards/mwstudio/mw75/rules.mk index 9407031ed84..067e1df2ae6 100644 --- a/keyboards/mwstudio/mw75/rules.mk +++ b/keyboards/mwstudio/mw75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json index fc6f8e4c80c..621d9beafae 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/info.json @@ -8,6 +8,8 @@ "pid": "0x7502", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk index 9407031ed84..067e1df2ae6 100644 --- a/keyboards/mwstudio/mw75r2/rules.mk +++ b/keyboards/mwstudio/mw75r2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json index 765d266e35f..8bc02770168 100644 --- a/keyboards/mxss/info.json +++ b/keyboards/mxss/info.json @@ -8,6 +8,8 @@ "pid": "0x5353", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/mxss/rules.mk b/keyboards/mxss/rules.mk index 002d99227ad..cc4f0ca9261 100644 --- a/keyboards/mxss/rules.mk +++ b/keyboards/mxss/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mysticworks/wyvern/info.json b/keyboards/mysticworks/wyvern/info.json index 5492929ab5b..f2307c1f039 100644 --- a/keyboards/mysticworks/wyvern/info.json +++ b/keyboards/mysticworks/wyvern/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mysticworks/wyvern/rules.mk b/keyboards/mysticworks/wyvern/rules.mk index 8f4134d0b59..ab2c49da70e 100644 --- a/keyboards/mysticworks/wyvern/rules.mk +++ b/keyboards/mysticworks/wyvern/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json index 9444eb3ad32..3ece3f5dba6 100644 --- a/keyboards/nack/info.json +++ b/keyboards/nack/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x13" }, diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk index 7704d802ab5..ff4148699a0 100644 --- a/keyboards/nack/rules.mk +++ b/keyboards/nack/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index b8b72121dd0..81bb72b2f75 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -8,6 +8,8 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk index ea969e963fd..f30bd81997e 100644 --- a/keyboards/nacly/sodium42/rules.mk +++ b/keyboards/nacly/sodium42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index ca96685f4ca..dc3a3916692 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -8,6 +8,8 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk index ea969e963fd..f30bd81997e 100644 --- a/keyboards/nacly/sodium50/rules.mk +++ b/keyboards/nacly/sodium50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 87946969983..95ca9a649ac 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -8,6 +8,8 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk index f7e87175ac5..c62dc408b51 100644 --- a/keyboards/nacly/sodium62/rules.mk +++ b/keyboards/nacly/sodium62/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index a237ff2262c..70da654540f 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -8,6 +8,8 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] diff --git a/keyboards/nacly/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk index d585e3b4b32..81ed47f82da 100644 --- a/keyboards/nacly/splitreus62/rules.mk +++ b/keyboards/nacly/splitreus62/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json index 6562aee7c31..d7bbd11265e 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/info.json @@ -8,6 +8,8 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] diff --git a/keyboards/nacly/ua62/rules.mk b/keyboards/nacly/ua62/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/nacly/ua62/rules.mk +++ b/keyboards/nacly/ua62/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json index b7e5fbd8ffd..9ac89dd1f03 100644 --- a/keyboards/nasu/info.json +++ b/keyboards/nasu/info.json @@ -8,6 +8,8 @@ "pid": "0x4E53", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk index 169c45b479d..7000bb65710 100644 --- a/keyboards/nasu/rules.mk +++ b/keyboards/nasu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/ncc1701kb/info.json b/keyboards/ncc1701kb/info.json index 628341fde0f..41c76f52f58 100644 --- a/keyboards/ncc1701kb/info.json +++ b/keyboards/ncc1701kb/info.json @@ -8,6 +8,8 @@ "pid": "0x1701", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ncc1701kb/rules.mk b/keyboards/ncc1701kb/rules.mk index d52e72b5b3e..86884fb0826 100644 --- a/keyboards/ncc1701kb/rules.mk +++ b/keyboards/ncc1701kb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 884a97b1365..a62445996dc 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -8,6 +8,8 @@ "pid": "0xB44C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index 6e98d9d811f..a36b9d8dca8 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/info.json index f5e93269ad2..49e78b298b0 100644 --- a/keyboards/nek_type_a/info.json +++ b/keyboards/nek_type_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk index 0a8adccb52e..ca61554f78e 100644 --- a/keyboards/nek_type_a/rules.mk +++ b/keyboards/nek_type_a/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nemui/info.json b/keyboards/nemui/info.json index f88d906fe56..3ac29f519ce 100644 --- a/keyboards/nemui/info.json +++ b/keyboards/nemui/info.json @@ -8,6 +8,8 @@ "pid": "0x2371", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nemui/rules.mk b/keyboards/nemui/rules.mk index fd449807869..0aeca0dd9f3 100644 --- a/keyboards/nemui/rules.mk +++ b/keyboards/nemui/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json index 11ff4e2b12c..24dc48cab2c 100644 --- a/keyboards/neokeys/g67/element_hs/info.json +++ b/keyboards/neokeys/g67/element_hs/info.json @@ -8,6 +8,8 @@ "pid": "0x5049", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/neokeys/g67/element_hs/rules.mk b/keyboards/neokeys/g67/element_hs/rules.mk index 818e7290faf..f819a9f1e02 100644 --- a/keyboards/neokeys/g67/element_hs/rules.mk +++ b/keyboards/neokeys/g67/element_hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json index 37b68ddc431..9dca75aee1b 100644 --- a/keyboards/neokeys/g67/hotswap/info.json +++ b/keyboards/neokeys/g67/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x5048", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/neokeys/g67/hotswap/rules.mk b/keyboards/neokeys/g67/hotswap/rules.mk index 818e7290faf..f819a9f1e02 100644 --- a/keyboards/neokeys/g67/hotswap/rules.mk +++ b/keyboards/neokeys/g67/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json index 828776e43d9..a97249e2e14 100644 --- a/keyboards/neokeys/g67/soldered/info.json +++ b/keyboards/neokeys/g67/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x5053", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/neokeys/g67/soldered/rules.mk b/keyboards/neokeys/g67/soldered/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/neokeys/g67/soldered/rules.mk +++ b/keyboards/neokeys/g67/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json index ef84eef1617..f0ced98faae 100755 --- a/keyboards/neopad/rev1/info.json +++ b/keyboards/neopad/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0913", "device_version": "0.1.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/neopad/rev1/rules.mk b/keyboards/neopad/rev1/rules.mk index af192561367..7816aab001a 100755 --- a/keyboards/neopad/rev1/rules.mk +++ b/keyboards/neopad/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index 43b5382d7ef..2c2a3126c65 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -8,6 +8,8 @@ "pid": "0x700E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk index aca054eabd6..6e1439f1f5c 100644 --- a/keyboards/neson_design/700e/rules.mk +++ b/keyboards/neson_design/700e/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index 3d124e9ae05..c916f1f4c04 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -8,6 +8,8 @@ "pid": "0x4E36", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk index 86bab73f555..5d8397653eb 100644 --- a/keyboards/neson_design/n6/rules.mk +++ b/keyboards/neson_design/n6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json index e6135425e4a..eabcccd7082 100644 --- a/keyboards/newgame40/info.json +++ b/keyboards/newgame40/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk index 1421a82df23..e05b73d6d98 100644 --- a/keyboards/newgame40/rules.mk +++ b/keyboards/newgame40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nibiria/stream15/info.json b/keyboards/nibiria/stream15/info.json index eb4d196ea7b..72e6facbda5 100644 --- a/keyboards/nibiria/stream15/info.json +++ b/keyboards/nibiria/stream15/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ortho_3x5": { diff --git a/keyboards/nibiria/stream15/rules.mk b/keyboards/nibiria/stream15/rules.mk index aefc49d3c1f..9e42693cb69 100644 --- a/keyboards/nibiria/stream15/rules.mk +++ b/keyboards/nibiria/stream15/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightingale_studios/hailey/info.json b/keyboards/nightingale_studios/hailey/info.json index ac199206b97..52f364ef0ac 100644 --- a/keyboards/nightingale_studios/hailey/info.json +++ b/keyboards/nightingale_studios/hailey/info.json @@ -7,6 +7,8 @@ "pid": "0x4879", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,2", "x":1.25, "y":0}, {"label":"0,3", "x":2.25, "y":0}, {"label":"0,4", "x":3.25, "y":0}, {"label":"0,5", "x":4.25, "y":0}, {"label":"0,6", "x":5.5, "y":0}, {"label":"0,7", "x":6.5, "y":0}, {"label":"0,8", "x":7.5, "y":0}, {"label":"0,9", "x":8.5, "y":0}, {"label":"0,10", "x":9.75, "y":0}, {"label":"0,11", "x":10.75, "y":0}, {"label":"0,12", "x":11.75, "y":0}, {"label":"0,13", "x":12.75, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"6,16", "x":15.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,15", "x":15.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,15", "x":15.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"3,15", "x":15.25, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,14", "x":14.25, "y":4.5}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,9", "x":10, "y":5.25, "w":1.5}, {"label":"5,11", "x":11.5, "y":5.25, "w":1.5}, {"label":"5,12", "x":13.25, "y":5.5}, {"label":"5,14", "x":14.25, "y":5.5}, {"label":"5,15", "x":15.25, "y":5.5}] diff --git a/keyboards/nightingale_studios/hailey/rules.mk b/keyboards/nightingale_studios/hailey/rules.mk index 4dc4b3490e3..b03b6fa9058 100644 --- a/keyboards/nightingale_studios/hailey/rules.mk +++ b/keyboards/nightingale_studios/hailey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json index 08a0eeb0409..58b49b32904 100644 --- a/keyboards/nightly_boards/adellein/info.json +++ b/keyboards/nightly_boards/adellein/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_40ergo_split_ent": { "layout": [ diff --git a/keyboards/nightly_boards/adellein/rules.mk b/keyboards/nightly_boards/adellein/rules.mk index 84d2a875647..8daf6a353a6 100644 --- a/keyboards/nightly_boards/adellein/rules.mk +++ b/keyboards/nightly_boards/adellein/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 287d3660960..122f7fb38fb 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/nightly_boards/alter/rev1/rules.mk b/keyboards/nightly_boards/alter/rev1/rules.mk index 4df0b468074..178b634fcbe 100644 --- a/keyboards/nightly_boards/alter/rev1/rules.mk +++ b/keyboards/nightly_boards/alter/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json index 2f4d6b83439..72fea11f33c 100644 --- a/keyboards/nightly_boards/alter_lite/info.json +++ b/keyboards/nightly_boards/alter_lite/info.json @@ -8,6 +8,8 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/alter_lite/rules.mk b/keyboards/nightly_boards/alter_lite/rules.mk index 334299a9eb6..1576a6efb62 100644 --- a/keyboards/nightly_boards/alter_lite/rules.mk +++ b/keyboards/nightly_boards/alter_lite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 97c10ca29c5..67c415381c0 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -8,6 +8,8 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/conde60/rules.mk b/keyboards/nightly_boards/conde60/rules.mk index 806f708f996..4bbc6892bcb 100644 --- a/keyboards/nightly_boards/conde60/rules.mk +++ b/keyboards/nightly_boards/conde60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/daily60/info.json b/keyboards/nightly_boards/daily60/info.json index cc89e20d54e..afb674faf4b 100644 --- a/keyboards/nightly_boards/daily60/info.json +++ b/keyboards/nightly_boards/daily60/info.json @@ -7,6 +7,8 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nightly_boards/daily60/rules.mk b/keyboards/nightly_boards/daily60/rules.mk index 659b7fede0a..0cd6926a62a 100644 --- a/keyboards/nightly_boards/daily60/rules.mk +++ b/keyboards/nightly_boards/daily60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json index f70aa8c7ab2..a2a4418541a 100644 --- a/keyboards/nightly_boards/jisoo/info.json +++ b/keyboards/nightly_boards/jisoo/info.json @@ -7,6 +7,8 @@ "pid": "0x0025", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/jisoo/rules.mk b/keyboards/nightly_boards/jisoo/rules.mk index 659b7fede0a..0cd6926a62a 100644 --- a/keyboards/nightly_boards/jisoo/rules.mk +++ b/keyboards/nightly_boards/jisoo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json index e5cd7392233..8339bedc878 100644 --- a/keyboards/nightly_boards/n2/info.json +++ b/keyboards/nightly_boards/n2/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":0, "y":1}] diff --git a/keyboards/nightly_boards/n2/rules.mk b/keyboards/nightly_boards/n2/rules.mk index a0a1e94e36d..a927de843cb 100644 --- a/keyboards/nightly_boards/n2/rules.mk +++ b/keyboards/nightly_boards/n2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json index 6f1748a7ab0..e2ccad4db31 100644 --- a/keyboards/nightly_boards/n40_o/info.json +++ b/keyboards/nightly_boards/n40_o/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x13_encoders": { "layout": [ diff --git a/keyboards/nightly_boards/n40_o/rules.mk b/keyboards/nightly_boards/n40_o/rules.mk index e8d7ea59ba6..f1189a87d2d 100644 --- a/keyboards/nightly_boards/n40_o/rules.mk +++ b/keyboards/nightly_boards/n40_o/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json index 473dd141223..37a0d3895c5 100644 --- a/keyboards/nightly_boards/n60_s/info.json +++ b/keyboards/nightly_boards/n60_s/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/nightly_boards/n60_s/rules.mk b/keyboards/nightly_boards/n60_s/rules.mk index 8bdff099b21..a37378959e0 100644 --- a/keyboards/nightly_boards/n60_s/rules.mk +++ b/keyboards/nightly_boards/n60_s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json index 8eb020d29c5..a45c8333fc6 100644 --- a/keyboards/nightly_boards/n87/info.json +++ b/keyboards/nightly_boards/n87/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/nightly_boards/n87/rules.mk b/keyboards/nightly_boards/n87/rules.mk index f0d05967ab6..a32639a0b58 100644 --- a/keyboards/nightly_boards/n87/rules.mk +++ b/keyboards/nightly_boards/n87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json index afaee7244ce..3b93fbdac1d 100644 --- a/keyboards/nightly_boards/n9/info.json +++ b/keyboards/nightly_boards/n9/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/n9/rules.mk b/keyboards/nightly_boards/n9/rules.mk index 051e6296bc9..c2fee558278 100644 --- a/keyboards/nightly_boards/n9/rules.mk +++ b/keyboards/nightly_boards/n9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json index c4668da903c..ce794f28a81 100644 --- a/keyboards/nightly_boards/octopad/info.json +++ b/keyboards/nightly_boards/octopad/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/octopad/rules.mk b/keyboards/nightly_boards/octopad/rules.mk index 357a293a8c2..d36fbdc8600 100644 --- a/keyboards/nightly_boards/octopad/rules.mk +++ b/keyboards/nightly_boards/octopad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json index c4ae8b52007..8f0d6766e0c 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/info.json @@ -8,6 +8,8 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "rgblight": { "animations": { "alternating": true, diff --git a/keyboards/nightly_boards/octopadplus/rules.mk b/keyboards/nightly_boards/octopadplus/rules.mk index 08b58953c23..89c0d63d8b9 100644 --- a/keyboards/nightly_boards/octopadplus/rules.mk +++ b/keyboards/nightly_boards/octopadplus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/paraluman/info.json b/keyboards/nightly_boards/paraluman/info.json index a71adb315f6..5d7238faaa9 100644 --- a/keyboards/nightly_boards/paraluman/info.json +++ b/keyboards/nightly_boards/paraluman/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/nightly_boards/paraluman/rules.mk b/keyboards/nightly_boards/paraluman/rules.mk index 3e6c2b2ea3c..1e3ad1484c6 100644 --- a/keyboards/nightly_boards/paraluman/rules.mk +++ b/keyboards/nightly_boards/paraluman/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/info.json index ba1e9811442..ddf9469f368 100644 --- a/keyboards/nightly_boards/ph_arisu/info.json +++ b/keyboards/nightly_boards/ph_arisu/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":8.5, "y":0}, {"label":"0,4", "x":9.5, "y":0}, {"label":"1,4", "x":10.5, "y":0}, {"label":"0,5", "x":11.5, "y":0}, {"label":"1,5", "x":12.5, "y":0}, {"label":"0,6", "x":13.5, "y":0}, {"label":"1,6", "x":14.5, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"2,7", "x":16.8, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":8, "y":1}, {"label":"3,3", "x":9, "y":1}, {"label":"2,4", "x":10, "y":1}, {"label":"3,4", "x":11, "y":1}, {"label":"2,5", "x":12, "y":1}, {"label":"3,5", "x":13, "y":1}, {"label":"2,6", "x":14, "y":1}, {"label":"3,6", "x":15, "y":1, "w":1.5}, {"label":"4,7", "x":16.8, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":8.25, "y":2}, {"label":"5,3", "x":9.25, "y":2}, {"label":"4,4", "x":10.25, "y":2}, {"label":"5,4", "x":11.25, "y":2}, {"label":"4,5", "x":12.25, "y":2}, {"label":"5,5", "x":13.25, "y":2}, {"label":"4,6", "x":14.25, "y":2, "w":2.25}, {"label":"6,7", "x":16.8, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"7,0", "x":2.25, "y":3}, {"label":"6,1", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":8.75, "y":3}, {"label":"7,3", "x":9.75, "y":3}, {"label":"6,4", "x":10.75, "y":3}, {"label":"7,4", "x":11.75, "y":3}, {"label":"6,5", "x":12.75, "y":3}, {"label":"7,5", "x":13.75, "y":3, "w":1.75}, {"label":"7,6", "x":15.75, "y":3.25}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":2.75, "y":4, "w":1.5}, {"label":"8,2", "x":4.25, "y":4, "w":2}, {"label":"9,2", "x":6.25, "y":4, "w":1.25}, {"label":"9,3", "x":8.25, "y":4, "w":2.75}, {"label":"9,4", "x":11, "y":4, "w":1.5}, {"label":"8,6", "x":14.75, "y":4.25}, {"label":"9,6", "x":15.75, "y":4.25}, {"label":"8,7", "x":16.75, "y":4.25}] diff --git a/keyboards/nightly_boards/ph_arisu/rules.mk b/keyboards/nightly_boards/ph_arisu/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/nightly_boards/ph_arisu/rules.mk +++ b/keyboards/nightly_boards/ph_arisu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nightmare/info.json b/keyboards/nightmare/info.json index 858bb5d8aba..30cdf631141 100644 --- a/keyboards/nightmare/info.json +++ b/keyboards/nightmare/info.json @@ -8,6 +8,8 @@ "pid": "0x4E49", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/nightmare/rules.mk b/keyboards/nightmare/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/nightmare/rules.mk +++ b/keyboards/nightmare/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nimrod/info.json b/keyboards/nimrod/info.json index b6f5d903697..ed1b8b02e9b 100644 --- a/keyboards/nimrod/info.json +++ b/keyboards/nimrod/info.json @@ -8,6 +8,8 @@ "pid": "0x720D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { diff --git a/keyboards/nimrod/rules.mk b/keyboards/nimrod/rules.mk index 32cc2a55f6d..fadee908150 100644 --- a/keyboards/nimrod/rules.mk +++ b/keyboards/nimrod/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/info.json index 8d83b420656..73fe121551b 100644 --- a/keyboards/nix_studio/n60_a/info.json +++ b/keyboards/nix_studio/n60_a/info.json @@ -8,6 +8,8 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nix_studio/n60_a/rules.mk b/keyboards/nix_studio/n60_a/rules.mk index cbeed4653c0..7fb99d788f2 100644 --- a/keyboards/nix_studio/n60_a/rules.mk +++ b/keyboards/nix_studio/n60_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json index 003e8e361ce..7c402260c97 100644 --- a/keyboards/nix_studio/oxalys80/info.json +++ b/keyboards/nix_studio/oxalys80/info.json @@ -8,6 +8,8 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/nix_studio/oxalys80/rules.mk b/keyboards/nix_studio/oxalys80/rules.mk index c08994d0469..c23f6dab30e 100644 --- a/keyboards/nix_studio/oxalys80/rules.mk +++ b/keyboards/nix_studio/oxalys80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json index 0c57be6e82a..45a79479d79 100644 --- a/keyboards/nixkeyboards/day_off/info.json +++ b/keyboards/nixkeyboards/day_off/info.json @@ -8,6 +8,8 @@ "pid": "0x444F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nixkeyboards/day_off/rules.mk b/keyboards/nixkeyboards/day_off/rules.mk index 05e63bf5b87..bb4ad767b29 100644 --- a/keyboards/nixkeyboards/day_off/rules.mk +++ b/keyboards/nixkeyboards/day_off/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json index 8145f282d7b..bc6fbd9d640 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/info.json +++ b/keyboards/nopunin10did/jabberwocky/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x4A57", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_rh": { "layout": [ diff --git a/keyboards/nopunin10did/jabberwocky/v1/rules.mk b/keyboards/nopunin10did/jabberwocky/v1/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/rules.mk +++ b/keyboards/nopunin10did/jabberwocky/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index 6cccff491ba..d189f18126e 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4A58", "device_version": "0.2.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_lh": { "layout": [ diff --git a/keyboards/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk index 9d065177d42..ae0d08d8023 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/rules.mk +++ b/keyboards/nopunin10did/jabberwocky/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json index 1ca9e7a5a58..07a1ce0a102 100644 --- a/keyboards/nopunin10did/kastenwagen1840/info.json +++ b/keyboards/nopunin10did/kastenwagen1840/info.json @@ -8,6 +8,8 @@ "pid": "0x4B57", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nopunin10did/kastenwagen1840/rules.mk b/keyboards/nopunin10did/kastenwagen1840/rules.mk index 61eb7eafb08..0cf05c09d15 100644 --- a/keyboards/nopunin10did/kastenwagen1840/rules.mk +++ b/keyboards/nopunin10did/kastenwagen1840/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json index d2acb89eff5..a1333c1c5e2 100644 --- a/keyboards/nopunin10did/kastenwagen48/info.json +++ b/keyboards/nopunin10did/kastenwagen48/info.json @@ -8,6 +8,8 @@ "pid": "0x4B30", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nopunin10did/kastenwagen48/rules.mk b/keyboards/nopunin10did/kastenwagen48/rules.mk index 61eb7eafb08..0cf05c09d15 100644 --- a/keyboards/nopunin10did/kastenwagen48/rules.mk +++ b/keyboards/nopunin10did/kastenwagen48/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/info.json index ef82004a79b..8a89b6c287b 100644 --- a/keyboards/nopunin10did/railroad/rev0/info.json +++ b/keyboards/nopunin10did/railroad/rev0/info.json @@ -8,6 +8,8 @@ "pid": "0x9111", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nopunin10did/railroad/rev0/rules.mk b/keyboards/nopunin10did/railroad/rev0/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/nopunin10did/railroad/rev0/rules.mk +++ b/keyboards/nopunin10did/railroad/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json index 876b8a3d524..137608c978d 100755 --- a/keyboards/novelkeys/nk1/info.json +++ b/keyboards/novelkeys/nk1/info.json @@ -8,6 +8,8 @@ "pid": "0x4E4D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_1x1"], "layouts": { "LAYOUT_ortho_1x1": { diff --git a/keyboards/novelkeys/nk1/rules.mk b/keyboards/novelkeys/nk1/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/novelkeys/nk1/rules.mk +++ b/keyboards/novelkeys/nk1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json index f6da7d52daa..e50174c50a0 100644 --- a/keyboards/novelkeys/nk20/info.json +++ b/keyboards/novelkeys/nk20/info.json @@ -8,6 +8,8 @@ "pid": "0x4E4E", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk index 230cc1ec147..96367c6a4c8 100644 --- a/keyboards/novelkeys/nk20/rules.mk +++ b/keyboards/novelkeys/nk20/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json index f5ddf8ba2f3..e223e11b5ce 100755 --- a/keyboards/novelkeys/nk65/info.json +++ b/keyboards/novelkeys/nk65/info.json @@ -8,6 +8,9 @@ "pid": "0x4E4B", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk index 8dedad03df7..a231765dffa 100755 --- a/keyboards/novelkeys/nk65/rules.mk +++ b/keyboards/novelkeys/nk65/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json index 609a64ab79e..2b8beefd6c2 100755 --- a/keyboards/novelkeys/nk65b/info.json +++ b/keyboards/novelkeys/nk65b/info.json @@ -8,6 +8,8 @@ "pid": "0x4E4F", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_65_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk index 230cc1ec147..96367c6a4c8 100755 --- a/keyboards/novelkeys/nk65b/rules.mk +++ b/keyboards/novelkeys/nk65b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/novelkeys/nk87/info.json b/keyboards/novelkeys/nk87/info.json index e871dfb3eb5..8a07b272776 100755 --- a/keyboards/novelkeys/nk87/info.json +++ b/keyboards/novelkeys/nk87/info.json @@ -8,6 +8,9 @@ "pid": "0x4E4C", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,12", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.5}, {"label":"5,1", "x":1.5, "y":5.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.5}, {"label":"5,6", "x":4, "y":5.25, "w":7}, {"label":"5,11", "x":11, "y":5.25, "w":1.5}, {"label":"5,12", "x":12.5, "y":5.25}, {"label":"5,13", "x":13.5, "y":5.25, "w":1.5}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}] diff --git a/keyboards/novelkeys/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk index fb3055a2a88..288d8020543 100755 --- a/keyboards/novelkeys/nk87/rules.mk +++ b/keyboards/novelkeys/nk87/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json index 01518c9b2f2..a7d0eb4d36b 100755 --- a/keyboards/novelkeys/nk87b/info.json +++ b/keyboards/novelkeys/nk87b/info.json @@ -8,6 +8,8 @@ "pid": "0x4E50", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,12", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.5}, {"label":"5,1", "x":1.5, "y":5.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.5}, {"label":"5,6", "x":4, "y":5.25, "w":7}, {"label":"5,11", "x":11, "y":5.25, "w":1.5}, {"label":"5,12", "x":12.5, "y":5.25}, {"label":"5,13", "x":13.5, "y":5.25, "w":1.5}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}] diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk index 230cc1ec147..96367c6a4c8 100644 --- a/keyboards/novelkeys/nk87b/rules.mk +++ b/keyboards/novelkeys/nk87b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json index 3533380291a..d08adfe99f6 100644 --- a/keyboards/novelkeys/novelpad/info.json +++ b/keyboards/novelkeys/novelpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6070", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/novelkeys/novelpad/rules.mk b/keyboards/novelkeys/novelpad/rules.mk index d4bb9ba48af..40888f5a30e 100755 --- a/keyboards/novelkeys/novelpad/rules.mk +++ b/keyboards/novelkeys/novelpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/220/info.json b/keyboards/noxary/220/info.json index 97ef01607b7..423b20a663a 100644 --- a/keyboards/noxary/220/info.json +++ b/keyboards/noxary/220/info.json @@ -8,6 +8,8 @@ "pid": "0x0899", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/noxary/220/rules.mk b/keyboards/noxary/220/rules.mk index cc614322b17..8dea3757839 100644 --- a/keyboards/noxary/220/rules.mk +++ b/keyboards/noxary/220/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/260/info.json b/keyboards/noxary/260/info.json index ea0e2e83f52..08f4699b90a 100644 --- a/keyboards/noxary/260/info.json +++ b/keyboards/noxary/260/info.json @@ -8,6 +8,8 @@ "pid": "0x0A29", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/noxary/260/rules.mk b/keyboards/noxary/260/rules.mk index b93903e48de..9aa342e19d3 100644 --- a/keyboards/noxary/260/rules.mk +++ b/keyboards/noxary/260/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/268/info.json b/keyboards/noxary/268/info.json index f32ea9887c2..842c3970223 100644 --- a/keyboards/noxary/268/info.json +++ b/keyboards/noxary/268/info.json @@ -8,6 +8,8 @@ "pid": "0x0A79", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"- _", "x":11, "y":0}, {"label":"= +", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0}, {"label":"Back Space", "x":14, "y":0}, {"label":"` ~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"[ {", "x":11.5, "y":1}, {"label":"] }", "x":12.5, "y":1}, {"label":"\\ |", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":"; :", "x":10.75, "y":2}, {"label":"' \"", "x":11.75, "y":2}, {"label":"# ~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Page Up", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"\\ |", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":", <", "x":9.25, "y":3}, {"label":". >", "x":10.25, "y":3}, {"label":"/ ?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":0.75}, {"label":"Up", "x":14, "y":3}, {"label":"Page Down", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"GUI", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/noxary/268/rules.mk b/keyboards/noxary/268/rules.mk index 983fcface1f..8dea3757839 100644 --- a/keyboards/noxary/268/rules.mk +++ b/keyboards/noxary/268/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json index 252534d9497..80dafd23b92 100644 --- a/keyboards/noxary/268_2/info.json +++ b/keyboards/noxary/268_2/info.json @@ -8,6 +8,8 @@ "pid": "0x0A7A", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/noxary/268_2/rules.mk b/keyboards/noxary/268_2/rules.mk index e6c1aaa3d75..4caf87aa2b1 100644 --- a/keyboards/noxary/268_2/rules.mk +++ b/keyboards/noxary/268_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json index 9cf57e646fe..38fc324f557 100644 --- a/keyboards/noxary/268_2_rgb/info.json +++ b/keyboards/noxary/268_2_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0A7C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/noxary/268_2_rgb/rules.mk b/keyboards/noxary/268_2_rgb/rules.mk index 38f81fd4dcc..1955f1d315b 100644 --- a/keyboards/noxary/268_2_rgb/rules.mk +++ b/keyboards/noxary/268_2_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/280/info.json b/keyboards/noxary/280/info.json index e3eeabc84f4..8f9b2aafc93 100644 --- a/keyboards/noxary/280/info.json +++ b/keyboards/noxary/280/info.json @@ -8,6 +8,8 @@ "pid": "0x0AF1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] diff --git a/keyboards/noxary/280/rules.mk b/keyboards/noxary/280/rules.mk index 983fcface1f..8dea3757839 100644 --- a/keyboards/noxary/280/rules.mk +++ b/keyboards/noxary/280/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/378/info.json b/keyboards/noxary/378/info.json index 24ef51cbe8d..2663b46dfad 100644 --- a/keyboards/noxary/378/info.json +++ b/keyboards/noxary/378/info.json @@ -8,6 +8,8 @@ "pid": "0x017A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/noxary/378/rules.mk b/keyboards/noxary/378/rules.mk index 75490909f34..3c9c278b519 100644 --- a/keyboards/noxary/378/rules.mk +++ b/keyboards/noxary/378/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build options # change yes to no to disable # diff --git a/keyboards/noxary/valhalla/info.json b/keyboards/noxary/valhalla/info.json index d5934b2e702..cfa29e69b0b 100644 --- a/keyboards/noxary/valhalla/info.json +++ b/keyboards/noxary/valhalla/info.json @@ -8,6 +8,8 @@ "pid": "0x5648", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/noxary/valhalla/rules.mk b/keyboards/noxary/valhalla/rules.mk index 75490909f34..3c9c278b519 100644 --- a/keyboards/noxary/valhalla/rules.mk +++ b/keyboards/noxary/valhalla/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build options # change yes to no to disable # diff --git a/keyboards/noxary/vulcan/info.json b/keyboards/noxary/vulcan/info.json index 7956a21deb1..4a5ee09d626 100644 --- a/keyboards/noxary/vulcan/info.json +++ b/keyboards/noxary/vulcan/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/noxary/vulcan/rules.mk b/keyboards/noxary/vulcan/rules.mk index f0cdbb9b0c7..ab9ede17169 100644 --- a/keyboards/noxary/vulcan/rules.mk +++ b/keyboards/noxary/vulcan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json index bbad48252a0..bbc0eacdad8 100644 --- a/keyboards/noxary/x268/info.json +++ b/keyboards/noxary/x268/info.json @@ -8,6 +8,8 @@ "pid": "0x0A7B", "device_version": "0.7.8" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/noxary/x268/rules.mk b/keyboards/noxary/x268/rules.mk index 35fbff0af95..a4b56c37ddd 100644 --- a/keyboards/noxary/x268/rules.mk +++ b/keyboards/noxary/x268/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/np12/info.json b/keyboards/np12/info.json index 8b8d89cc4a3..a5612a8c149 100644 --- a/keyboards/np12/info.json +++ b/keyboards/np12/info.json @@ -8,6 +8,8 @@ "pid": "0x4401", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/np12/rules.mk b/keyboards/np12/rules.mk index a56e12eb22b..b03b6fa9058 100644 --- a/keyboards/np12/rules.mk +++ b/keyboards/np12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json index c12acf5f267..b59fee24115 100644 --- a/keyboards/nullbitsco/nibble/info.json +++ b/keyboards/nullbitsco/nibble/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 10, "layouts": { "LAYOUT_all": { diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk index f33bfbb9b84..0d5d3e2aac1 100644 --- a/keyboards/nullbitsco/nibble/rules.mk +++ b/keyboards/nullbitsco/nibble/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json new file mode 100644 index 00000000000..11307eba89f --- /dev/null +++ b/keyboards/nullbitsco/scramble/v1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega328p", + "bootloader": "usbasploader" +} diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk index c1cf175c649..f917d68f4e2 100644 --- a/keyboards/nullbitsco/scramble/v1/rules.mk +++ b/keyboards/nullbitsco/scramble/v1/rules.mk @@ -1,11 +1,3 @@ -# NOTE: This file is specific to AVR builds. - -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json new file mode 100644 index 00000000000..87b7fcf7ecc --- /dev/null +++ b/keyboards/nullbitsco/scramble/v2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "RP2040", + "bootloader": "rp2040" +} diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk index f93963285bf..f917d68f4e2 100644 --- a/keyboards/nullbitsco/scramble/v2/rules.mk +++ b/keyboards/nullbitsco/scramble/v2/rules.mk @@ -1,11 +1,3 @@ -# NOTE: This file is is specific to RP2040 builds. - -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json index 7b9c4eb8ae3..ec014a66809 100644 --- a/keyboards/nullbitsco/tidbit/info.json +++ b/keyboards/nullbitsco/tidbit/info.json @@ -7,6 +7,8 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk index 13893a69e23..3b7ff078bbb 100644 --- a/keyboards/nullbitsco/tidbit/rules.mk +++ b/keyboards/nullbitsco/tidbit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json index 17975f6d0e8..4ce325048a8 100644 --- a/keyboards/numatreus/info.json +++ b/keyboards/numatreus/info.json @@ -8,6 +8,8 @@ "pid": "0xE80A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.35}, {"x":2, "y":0}, {"x":3, "y":0.35}, {"x":4, "y":0.7}, {"x":8, "y":0.7}, {"x":9, "y":0.35}, {"x":10, "y":0}, {"x":11, "y":0.35}, {"x":12, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.35}, {"x":2, "y":1}, {"x":3, "y":1.35}, {"x":4, "y":1.7}, {"x":8, "y":1.7}, {"x":9, "y":1.35}, {"x":10, "y":1}, {"x":11, "y":1.35}, {"x":12, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.35}, {"x":2, "y":2}, {"x":3, "y":2.35}, {"x":4, "y":2.7}, {"x":8, "y":2.7}, {"x":9, "y":2.35}, {"x":10, "y":2}, {"x":11, "y":2.35}, {"x":12, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.35}, {"x":2, "y":3}, {"x":3, "y":3.35}, {"x":4, "y":3.7}, {"x":5, "y":2.95, "h":1.5}, {"x":7, "y":2.95, "h":1.5}, {"x":8, "y":3.7}, {"x":9, "y":3.35}, {"x":10, "y":3}, {"x":11, "y":3.35}, {"x":12, "y":3.6}] diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk index c984ff05f68..2a92a7e48b8 100644 --- a/keyboards/numatreus/rules.mk +++ b/keyboards/numatreus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json index 4ec5bde08f3..4742e2f9bdd 100644 --- a/keyboards/nyhxis/nfr_70/info.json +++ b/keyboards/nyhxis/nfr_70/info.json @@ -13,6 +13,8 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi":{ "layout": diff --git a/keyboards/nyhxis/nfr_70/rules.mk b/keyboards/nyhxis/nfr_70/rules.mk index 66c1ee26f42..d65d32df0aa 100644 --- a/keyboards/nyhxis/nfr_70/rules.mk +++ b/keyboards/nyhxis/nfr_70/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#BOOTLOADER = caterina # Pro-Micro -BOOTLOADER = atmel-dfu # Elite-C - # Build Options # change yes to no to disable # diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 2b358df1c2a..51721631722 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -8,6 +8,8 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk index 0b8e99da751..e2392b12930 100644 --- a/keyboards/obosob/arch_36/rules.mk +++ b/keyboards/obosob/arch_36/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json index 96943968731..1cba6142173 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/info.json @@ -8,6 +8,8 @@ "pid": "0x50AD", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": [ "split_3x5_2" ], diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk index 03ff7955741..0ce5439c7b3 100644 --- a/keyboards/obosob/steal_this_keyboard/rules.mk +++ b/keyboards/obosob/steal_this_keyboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json index 05d41ab59af..fa7d1ab7fad 100644 --- a/keyboards/ocean/addon/info.json +++ b/keyboards/ocean/addon/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ocean/addon/rules.mk b/keyboards/ocean/addon/rules.mk index 7c70616682d..fd62cad1658 100644 --- a/keyboards/ocean/addon/rules.mk +++ b/keyboards/ocean/addon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/info.json index d7493b39c31..4a6b259909a 100644 --- a/keyboards/ocean/gin_v2/info.json +++ b/keyboards/ocean/gin_v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ocean/gin_v2/rules.mk b/keyboards/ocean/gin_v2/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/ocean/gin_v2/rules.mk +++ b/keyboards/ocean/gin_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json index 6534007c3b3..d15f271b1c6 100644 --- a/keyboards/ocean/slamz/info.json +++ b/keyboards/ocean/slamz/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/ocean/slamz/rules.mk b/keyboards/ocean/slamz/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/ocean/slamz/rules.mk +++ b/keyboards/ocean/slamz/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json index 7b45dcd520f..4e17ba36a7b 100644 --- a/keyboards/ocean/stealth/info.json +++ b/keyboards/ocean/stealth/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}] diff --git a/keyboards/ocean/stealth/rules.mk b/keyboards/ocean/stealth/rules.mk index 5bf7023f03b..d65d32df0aa 100644 --- a/keyboards/ocean/stealth/rules.mk +++ b/keyboards/ocean/stealth/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json index 580379f25af..61ef3a50dbc 100644 --- a/keyboards/ocean/sus/info.json +++ b/keyboards/ocean/sus/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/ocean/sus/rules.mk b/keyboards/ocean/sus/rules.mk index 552f86883f0..75b0df17a21 100644 --- a/keyboards/ocean/sus/rules.mk +++ b/keyboards/ocean/sus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json index 04065cdb07a..904d622338e 100644 --- a/keyboards/ocean/wang_ergo/info.json +++ b/keyboards/ocean/wang_ergo/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/ocean/wang_ergo/rules.mk b/keyboards/ocean/wang_ergo/rules.mk index 5bf7023f03b..d65d32df0aa 100644 --- a/keyboards/ocean/wang_ergo/rules.mk +++ b/keyboards/ocean/wang_ergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json index 7a04f23e1b2..cfa68f7cb42 100644 --- a/keyboards/ocean/wang_v2/info.json +++ b/keyboards/ocean/wang_v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0.75, "y":1, "w":1.25}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1, "w":1.75}, {"x":0.25, "y":2, "w":1.75}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/ocean/wang_v2/rules.mk b/keyboards/ocean/wang_v2/rules.mk index 552f86883f0..75b0df17a21 100644 --- a/keyboards/ocean/wang_v2/rules.mk +++ b/keyboards/ocean/wang_v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json index 458c11d0917..149434d76a7 100644 --- a/keyboards/ocean/yuri/info.json +++ b/keyboards/ocean/yuri/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, diff --git a/keyboards/ocean/yuri/rules.mk b/keyboards/ocean/yuri/rules.mk index 7c70616682d..fd62cad1658 100644 --- a/keyboards/ocean/yuri/rules.mk +++ b/keyboards/ocean/yuri/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index 84e512dbdc0..2eaca18e655 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -8,6 +8,7 @@ "pid": "0xCA49", "device_version": "0.0.1" }, + "processor": "atmega32u4", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk index 4698218128a..50c2891bb8a 100644 --- a/keyboards/oddball/rules.mk +++ b/keyboards/oddball/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Build Options # change yes to no to disable # diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/info.json new file mode 100644 index 00000000000..66ed86e13c5 --- /dev/null +++ b/keyboards/oddball/v1/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "halfkay" +} diff --git a/keyboards/oddball/v1/rules.mk b/keyboards/oddball/v1/rules.mk index e4320fb1252..e69de29bb2d 100644 --- a/keyboards/oddball/v1/rules.mk +++ b/keyboards/oddball/v1/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = halfkay diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/info.json new file mode 100644 index 00000000000..cc907028049 --- /dev/null +++ b/keyboards/oddball/v2/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "qmk-dfu" +} diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk index 8b8ada3d9d6..e69de29bb2d 100644 --- a/keyboards/oddball/v2/rules.mk +++ b/keyboards/oddball/v2/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = qmk-dfu diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/info.json new file mode 100644 index 00000000000..cc907028049 --- /dev/null +++ b/keyboards/oddball/v2_1/info.json @@ -0,0 +1,3 @@ +{ + "bootloader": "qmk-dfu" +} diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk index 8b8ada3d9d6..e69de29bb2d 100644 --- a/keyboards/oddball/v2_1/rules.mk +++ b/keyboards/oddball/v2_1/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = qmk-dfu diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json index e2ab0d97a38..699758f9168 100644 --- a/keyboards/oddforge/vea/info.json +++ b/keyboards/oddforge/vea/info.json @@ -8,6 +8,8 @@ "pid": "0x4155", "device_version": "1.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"label":"5,0", "x":2.25, "y":0}, {"label":"5,1", "x":3.25, "y":0}, {"label":"5,2", "x":4.25, "y":0}, {"label":"5,3", "x":5.25, "y":0}, {"label":"5,4", "x":6.25, "y":0}, {"label":"5,5", "x":7.25, "y":0}, {"label":"5,6", "x":8.25, "y":0}, {"label":"5,8", "x":10.75, "y":0}, {"label":"5,9", "x":11.75, "y":0}, {"label":"5,10", "x":12.75, "y":0}, {"label":"5,11", "x":13.75, "y":0}, {"label":"5,12", "x":14.75, "y":0}, {"label":"5,13", "x":15.75, "y":0}, {"label":"6,11", "x":16.75, "y":0}, {"label":"7,11", "x":17.75, "y":0}, {"label":"6,13", "x":18.75, "y":0}, {"label":"6,1", "x":0, "y":1}, {"label":"7,1", "x":1, "y":1}, {"label":"4,0", "x":2.25, "y":1}, {"label":"4,1", "x":3.25, "y":1}, {"label":"4,2", "x":4.25, "y":1}, {"label":"4,3", "x":5.25, "y":1}, {"label":"4,4", "x":6.25, "y":1}, {"label":"4,5", "x":7.25, "y":1}, {"label":"4,6", "x":8.25, "y":1}, {"label":"4,8", "x":10.75, "y":1}, {"label":"4,9", "x":11.75, "y":1}, {"label":"4,10", "x":12.75, "y":1}, {"label":"4,11", "x":13.75, "y":1}, {"label":"4,12", "x":14.75, "y":1}, {"label":"4,13", "x":15.75, "y":1}, {"label":"4,14", "x":16.75, "y":1, "w":2}, {"label":"6,10", "x":18.75, "y":1}, {"label":"6,2", "x":0, "y":2}, {"label":"7,2", "x":1, "y":2}, {"label":"3,0", "x":2.25, "y":2, "w":1.5}, {"label":"3,1", "x":3.75, "y":2}, {"label":"3,2", "x":4.75, "y":2}, {"label":"3,3", "x":5.75, "y":2}, {"label":"3,4", "x":6.75, "y":2}, {"label":"3,5", "x":7.75, "y":2}, {"label":"1,8", "x":10.25, "y":2}, {"label":"1,9", "x":11.25, "y":2}, {"label":"1,10", "x":12.25, "y":2}, {"label":"1,11", "x":13.25, "y":2}, {"label":"1,12", "x":14.25, "y":2}, {"label":"1,13", "x":15.25, "y":2}, {"label":"1,14", "x":16.25, "y":2}, {"label":"2,14", "x":17.25, "y":2, "w":1.5}, {"label":"7,10", "x":18.75, "y":2}, {"label":"6,3", "x":0, "y":3}, {"label":"7,3", "x":1, "y":3}, {"label":"2,0", "x":2.25, "y":3, "w":1.75}, {"label":"2,1", "x":4, "y":3}, {"label":"2,2", "x":5, "y":3}, {"label":"2,3", "x":6, "y":3}, {"label":"2,4", "x":7, "y":3}, {"label":"2,5", "x":8, "y":3}, {"label":"2,8", "x":10.5, "y":3}, {"label":"2,9", "x":11.5, "y":3}, {"label":"2,10", "x":12.5, "y":3}, {"label":"2,11", "x":13.5, "y":3}, {"label":"2,12", "x":14.5, "y":3}, {"label":"2,13", "x":15.5, "y":3}, {"label":"3,13", "x":16.5, "y":3, "w":2.25}, {"label":"6,12", "x":18.75, "y":3}, {"label":"6,4", "x":0, "y":4}, {"label":"7,4", "x":1, "y":4}, {"label":"1,0", "x":2.25, "y":4, "w":2.25}, {"label":"1,1", "x":4.5, "y":4}, {"label":"1,2", "x":5.5, "y":4}, {"label":"1,3", "x":6.5, "y":4}, {"label":"1,4", "x":7.5, "y":4}, {"label":"1,5", "x":8.5, "y":4}, {"label":"3,8", "x":11, "y":4}, {"label":"3,9", "x":12, "y":4}, {"label":"3,10", "x":13, "y":4}, {"label":"3,11", "x":14, "y":4}, {"label":"3,12", "x":15, "y":4}, {"label":"3,14", "x":16, "y":4, "w":1.75}, {"label":"6,8", "x":17.75, "y":4}, {"label":"7,12", "x":18.75, "y":4}, {"label":"6,5", "x":0, "y":5}, {"label":"7,5", "x":1, "y":5}, {"label":"0,0", "x":2.25, "y":5, "w":1.25}, {"label":"0,1", "x":3.5, "y":5, "w":1.25}, {"label":"0,2", "x":4.75, "y":5, "w":1.25}, {"label":"7,7", "x":6, "y":5, "w":2}, {"label":"6,6", "x":8, "y":5}, {"label":"6,14", "x":10.5, "y":5, "w":2.75}, {"label":"0,10", "x":13.25, "y":5, "w":1.25}, {"label":"0,9", "x":14.5, "y":5}, {"label":"0,8", "x":15.5, "y":5, "w":1.25}, {"label":"7,8", "x":16.75, "y":5}, {"label":"6,9", "x":17.75, "y":5}, {"label":"7,9", "x":18.75, "y":5}] diff --git a/keyboards/oddforge/vea/rules.mk b/keyboards/oddforge/vea/rules.mk index 4aed5ab5867..ebcb8a1159d 100644 --- a/keyboards/oddforge/vea/rules.mk +++ b/keyboards/oddforge/vea/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/odelia/info.json b/keyboards/odelia/info.json index dacdc497603..3d9ef9c4d46 100644 --- a/keyboards/odelia/info.json +++ b/keyboards/odelia/info.json @@ -8,6 +8,8 @@ "pid": "0xA129", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/odelia/rules.mk b/keyboards/odelia/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/odelia/rules.mk +++ b/keyboards/odelia/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index fd446099f5c..04db9ff8d5f 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk index 99f9befa53a..a3964a74c08 100644 --- a/keyboards/ogre/ergo_single/rules.mk +++ b/keyboards/ogre/ergo_single/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index 2e3e2f73a8f..bf2b9484928 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk index 9920cd3aa35..ce485aeb0a5 100644 --- a/keyboards/ogre/ergo_split/rules.mk +++ b/keyboards/ogre/ergo_split/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json index 109b1398042..1413a3ca64a 100644 --- a/keyboards/ok60/info.json +++ b/keyboards/ok60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk index e21a3830563..ed7a8ea0312 100644 --- a/keyboards/ok60/rules.mk +++ b/keyboards/ok60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json index 319dca00717..4da5396c58b 100644 --- a/keyboards/om60/info.json +++ b/keyboards/om60/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"4,0", "x":1.5, "y":0}, {"label":"4,1", "x":2.5, "y":0}, {"label":"4,2", "x":3.5, "y":0}, {"label":"4,3", "x":4.5, "y":0}, {"label":"4,4", "x":5.5, "y":0}, {"label":"4,5", "x":6.5, "y":0}, {"label":"4,6", "x":7.5, "y":0}, {"label":"4,7", "x":8.5, "y":0}, {"label":"9,0", "x":9.5, "y":0}, {"label":"9,1", "x":10.5, "y":0}, {"label":"9,2", "x":11.5, "y":0}, {"label":"9,3", "x":12.5, "y":0}, {"label":"9,4", "x":13.5, "y":0}, {"label":"0,1", "x":1.5, "y":1}, {"label":"0,2", "x":2.5, "y":1}, {"label":"0,3", "x":3.5, "y":1}, {"label":"0,4", "x":4.5, "y":1}, {"label":"0,5", "x":5.5, "y":1}, {"label":"0,6", "x":6.5, "y":1}, {"label":"0,7", "x":7.5, "y":1}, {"label":"5,0", "x":8.5, "y":1}, {"label":"5,1", "x":9.5, "y":1}, {"label":"5,2", "x":10.5, "y":1}, {"label":"5,3", "x":11.5, "y":1}, {"label":"5,4", "x":12.5, "y":1}, {"label":"5,5", "x":13.5, "y":1}, {"label":"1,0", "x":0, "y":2}, {"label":"1,1", "x":1.5, "y":2}, {"label":"1,2", "x":2.5, "y":2}, {"label":"1,3", "x":3.5, "y":2}, {"label":"1,4", "x":4.5, "y":2}, {"label":"1,5", "x":5.5, "y":2}, {"label":"1,6", "x":6.5, "y":2}, {"label":"1,7", "x":7.5, "y":2}, {"label":"6,0", "x":8.5, "y":2}, {"label":"6,1", "x":9.5, "y":2}, {"label":"6,2", "x":10.5, "y":2}, {"label":"6,3", "x":11.5, "y":2}, {"label":"6,4", "x":12.5, "y":2}, {"label":"6,5", "x":13.5, "y":2}, {"label":"2,0", "x":0, "y":3}, {"label":"2,1", "x":1.5, "y":3}, {"label":"2,2", "x":2.5, "y":3}, {"label":"2,3", "x":3.5, "y":3}, {"label":"2,4", "x":4.5, "y":3}, {"label":"2,5", "x":5.5, "y":3}, {"label":"2,6", "x":6.5, "y":3}, {"label":"2,7", "x":7.5, "y":3}, {"label":"7,0", "x":8.5, "y":3}, {"label":"7,1", "x":9.5, "y":3}, {"label":"7,2", "x":10.5, "y":3}, {"label":"7,3", "x":11.5, "y":3}, {"label":"7,4", "x":12.5, "y":3}, {"label":"7,5", "x":13.5, "y":3}, {"label":"3,0", "x":0, "y":4}, {"label":"3,1", "x":1.5, "y":4}, {"label":"3,2", "x":2.5, "y":4}, {"label":"3,3", "x":3.5, "y":4}, {"label":"3,4", "x":4.5, "y":4}, {"label":"3,5", "x":5.5, "y":4}, {"label":"3,6", "x":6.5, "y":4}, {"label":"3,7", "x":7.5, "y":4}, {"label":"8,0", "x":8.5, "y":4}, {"label":"8,1", "x":9.5, "y":4}, {"label":"8,2", "x":10.5, "y":4}, {"label":"8,3", "x":11.5, "y":4}, {"label":"8,4", "x":12.5, "y":4}, {"label":"8,5", "x":13.5, "y":4}] diff --git a/keyboards/om60/rules.mk b/keyboards/om60/rules.mk index 9dc673edbff..e3e0047771f 100644 --- a/keyboards/om60/rules.mk +++ b/keyboards/om60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/omkbd/ergodash/info.json b/keyboards/omkbd/ergodash/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/omkbd/ergodash/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk index 5c44a744339..9a3cb950887 100644 --- a/keyboards/omkbd/ergodash/rules.mk +++ b/keyboards/omkbd/ergodash/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/omkbd/runner3680/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk index 1be171295da..5f16740e242 100644 --- a/keyboards/omkbd/runner3680/rules.mk +++ b/keyboards/omkbd/runner3680/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json index e56e9dfa1a7..27c0419a7d4 100644 --- a/keyboards/omnikeyish/info.json +++ b/keyboards/omnikeyish/info.json @@ -8,6 +8,8 @@ "pid": "0x0666", "device_version": "13.3.7" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT_all": { "layout": [ {"label":"P11", "x":0, "y":0}, {"label":"P12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"F1", "x":4.6667, "y":0}, {"label":"F2", "x":5.6667, "y":0}, {"label":"F3", "x":6.6667, "y":0}, {"label":"F4", "x":7.6667, "y":0}, {"label":"F5", "x":9.1667, "y":0}, {"label":"F6", "x":10.1667, "y":0}, {"label":"F7", "x":11.1667, "y":0}, {"label":"F8", "x":12.1667, "y":0}, {"label":"F9", "x":13.6667, "y":0}, {"label":"F10", "x":14.6667, "y":0}, {"label":"F11", "x":15.6667, "y":0}, {"label":"F12", "x":16.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0}, {"x":21.6667, "y":0}, {"x":22.6667, "y":0}, {"x":23.6667, "y":0}, {"x":24.6667, "y":0}, diff --git a/keyboards/omnikeyish/rules.mk b/keyboards/omnikeyish/rules.mk index 2a00a52c846..a8a5143e24d 100644 --- a/keyboards/omnikeyish/rules.mk +++ b/keyboards/omnikeyish/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/onekeyco/dango40/info.json b/keyboards/onekeyco/dango40/info.json index 4305346827e..d964098f3d5 100644 --- a/keyboards/onekeyco/dango40/info.json +++ b/keyboards/onekeyco/dango40/info.json @@ -8,6 +8,8 @@ "pid": "0xE9B9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/onekeyco/dango40/rules.mk b/keyboards/onekeyco/dango40/rules.mk index 2f9a36a2685..614384dd3c7 100644 --- a/keyboards/onekeyco/dango40/rules.mk +++ b/keyboards/onekeyco/dango40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json new file mode 100644 index 00000000000..042c41f34d6 --- /dev/null +++ b/keyboards/opendeck/32/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/opendeck/32/rev1/rules.mk b/keyboards/opendeck/32/rev1/rules.mk index 91031bcb226..15bc9d0a1de 100644 --- a/keyboards/opendeck/32/rev1/rules.mk +++ b/keyboards/opendeck/32/rev1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/orange75/info.json b/keyboards/orange75/info.json index 1fe4752635f..9aa445afb2b 100644 --- a/keyboards/orange75/info.json +++ b/keyboards/orange75/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orange75/rules.mk b/keyboards/orange75/rules.mk index 60293f13865..e0fca34fa1e 100644 --- a/keyboards/orange75/rules.mk +++ b/keyboards/orange75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index f2741af6e2f..e537bb65cc5 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/org60/rules.mk b/keyboards/org60/rules.mk index 6deca35cd9a..d22d1cd2f42 100644 --- a/keyboards/org60/rules.mk +++ b/keyboards/org60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json index 5bda0d68fbc..c8494e8d6f3 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_5x12_1x2uC": { "layout": [ diff --git a/keyboards/ortho5by12/rules.mk b/keyboards/ortho5by12/rules.mk index 6b944b130fb..bf02b031194 100644 --- a/keyboards/ortho5by12/rules.mk +++ b/keyboards/ortho5by12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json index d4781f6d94c..f918fbe2586 100644 --- a/keyboards/orthocode/info.json +++ b/keyboards/orthocode/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/orthocode/rules.mk b/keyboards/orthocode/rules.mk index 66c72d60227..d9dd6a59c96 100644 --- a/keyboards/orthocode/rules.mk +++ b/keyboards/orthocode/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json index d539fc8be26..9b1e79c58e4 100644 --- a/keyboards/orthodox/rev1/info.json +++ b/keyboards/orthodox/rev1/info.json @@ -7,6 +7,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orthodox/rev1/rules.mk b/keyboards/orthodox/rev1/rules.mk index e0c0df2de20..7b30c0beff2 100644 --- a/keyboards/orthodox/rev1/rules.mk +++ b/keyboards/orthodox/rev1/rules.mk @@ -1,4 +1 @@ -# Bootloader selection -BOOTLOADER = caterina - BACKLIGHT_ENABLE = no diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json index 6769fe7a30a..ea471648f40 100644 --- a/keyboards/orthodox/rev3/info.json +++ b/keyboards/orthodox/rev3/info.json @@ -7,6 +7,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orthodox/rev3/rules.mk b/keyboards/orthodox/rev3/rules.mk index e0c0df2de20..7b30c0beff2 100644 --- a/keyboards/orthodox/rev3/rules.mk +++ b/keyboards/orthodox/rev3/rules.mk @@ -1,4 +1 @@ -# Bootloader selection -BOOTLOADER = caterina - BACKLIGHT_ENABLE = no diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json index 91a73c5cb3d..5402ba8ed50 100644 --- a/keyboards/orthodox/rev3_teensy/info.json +++ b/keyboards/orthodox/rev3_teensy/info.json @@ -7,6 +7,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orthodox/rev3_teensy/rules.mk b/keyboards/orthodox/rev3_teensy/rules.mk index ad8482a3df7..7b30c0beff2 100644 --- a/keyboards/orthodox/rev3_teensy/rules.mk +++ b/keyboards/orthodox/rev3_teensy/rules.mk @@ -1,4 +1 @@ -# Bootloader selection -BOOTLOADER = halfkay - BACKLIGHT_ENABLE = no diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index c78ec0cedfe..bb68468ec43 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json index c5ee4ff522c..796aa995c32 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x4A4C", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/owlab/jelly_epoch/hotswap/rules.mk b/keyboards/owlab/jelly_epoch/hotswap/rules.mk index b108e80f24e..951dd07d6e0 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/rules.mk +++ b/keyboards/owlab/jelly_epoch/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json index 59358ae99fd..9e80a4ff300 100644 --- a/keyboards/owlab/jelly_epoch/soldered/info.json +++ b/keyboards/owlab/jelly_epoch/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x4A53", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/owlab/jelly_epoch/soldered/rules.mk b/keyboards/owlab/jelly_epoch/soldered/rules.mk index b108e80f24e..951dd07d6e0 100644 --- a/keyboards/owlab/jelly_epoch/soldered/rules.mk +++ b/keyboards/owlab/jelly_epoch/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index e5d57b3f75d..5d94c0cff80 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -8,6 +8,8 @@ "pid": "0x5350", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_spring": "LAYOUT" }, diff --git a/keyboards/owlab/spring/rules.mk b/keyboards/owlab/spring/rules.mk index 5f9bfe1f0c3..bc48e6b5bb1 100644 --- a/keyboards/owlab/spring/rules.mk +++ b/keyboards/owlab/spring/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json index bdfaccacb86..cb8447107fe 100644 --- a/keyboards/owlab/suit80/ansi/info.json +++ b/keyboards/owlab/suit80/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x5355", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/owlab/suit80/ansi/rules.mk b/keyboards/owlab/suit80/ansi/rules.mk index f9417ae2bf7..d65d32df0aa 100644 --- a/keyboards/owlab/suit80/ansi/rules.mk +++ b/keyboards/owlab/suit80/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json index 0818212330a..4cd35dff5ec 100644 --- a/keyboards/owlab/suit80/iso/info.json +++ b/keyboards/owlab/suit80/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x5349", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/owlab/suit80/iso/rules.mk b/keyboards/owlab/suit80/iso/rules.mk index f9417ae2bf7..d65d32df0aa 100644 --- a/keyboards/owlab/suit80/iso/rules.mk +++ b/keyboards/owlab/suit80/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json index faaf7041af5..b17375dd5cf 100644 --- a/keyboards/owlab/voice65/hotswap/info.json +++ b/keyboards/owlab/voice65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x564F", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/owlab/voice65/hotswap/rules.mk b/keyboards/owlab/voice65/hotswap/rules.mk index f2b43d49a2f..3cd81f231cf 100644 --- a/keyboards/owlab/voice65/hotswap/rules.mk +++ b/keyboards/owlab/voice65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json index 33f536930d5..8135dcf29d9 100644 --- a/keyboards/owlab/voice65/soldered/info.json +++ b/keyboards/owlab/voice65/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x5657", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/owlab/voice65/soldered/rules.mk b/keyboards/owlab/voice65/soldered/rules.mk index f2b43d49a2f..3cd81f231cf 100644 --- a/keyboards/owlab/voice65/soldered/rules.mk +++ b/keyboards/owlab/voice65/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json index 63d5cfc0ca9..9de0250289f 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -8,6 +8,8 @@ "pid": "0x3568", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/p3d/glitch/rules.mk b/keyboards/p3d/glitch/rules.mk index 7ec8d5c09ac..65ecff135b0 100644 --- a/keyboards/p3d/glitch/rules.mk +++ b/keyboards/p3d/glitch/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json index d6338182c65..ce40842afee 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/info.json @@ -8,6 +8,8 @@ "pid": "0x6668", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pabile/p18/rules.mk b/keyboards/pabile/p18/rules.mk index 9c9341f36ae..9d58ddf3057 100644 --- a/keyboards/pabile/p18/rules.mk +++ b/keyboards/pabile/p18/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json index 18b5e4bd2b0..cea8ee87a0b 100644 --- a/keyboards/pabile/p20/ver1/info.json +++ b/keyboards/pabile/p20/ver1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "P20 ver1", "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/pabile/p20/ver1/rules.mk b/keyboards/pabile/p20/ver1/rules.mk index 8d59bcc03e9..8341cf19a2a 100644 --- a/keyboards/pabile/p20/ver1/rules.mk +++ b/keyboards/pabile/p20/ver1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/info.json index dae1f84edb2..d3c8d8aafc7 100644 --- a/keyboards/pabile/p20/ver2/info.json +++ b/keyboards/pabile/p20/ver2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "P20 ver2", "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/pabile/p20/ver2/rules.mk b/keyboards/pabile/p20/ver2/rules.mk index 93de3f12437..58a67089140 100644 --- a/keyboards/pabile/p20/ver2/rules.mk +++ b/keyboards/pabile/p20/ver2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index 42e4dcd6b56..703a3b1f80f 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -8,6 +8,8 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { diff --git a/keyboards/pabile/p40/rules.mk b/keyboards/pabile/p40/rules.mk index 7293fc306d9..9871ad5be73 100644 --- a/keyboards/pabile/p40/rules.mk +++ b/keyboards/pabile/p40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json index a630973622e..72cfe178b1b 100644 --- a/keyboards/pabile/p40_ortho/info.json +++ b/keyboards/pabile/p40_ortho/info.json @@ -7,6 +7,8 @@ "pid": "0x6669", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/pabile/p40_ortho/rules.mk b/keyboards/pabile/p40_ortho/rules.mk index 7293fc306d9..9871ad5be73 100644 --- a/keyboards/pabile/p40_ortho/rules.mk +++ b/keyboards/pabile/p40_ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json index 5c1c2c8589b..f1ef5eda34d 100644 --- a/keyboards/pabile/p42/info.json +++ b/keyboards/pabile/p42/info.json @@ -8,6 +8,8 @@ "pid": "0x6670", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pabile/p42/rules.mk b/keyboards/pabile/p42/rules.mk index 7293fc306d9..9871ad5be73 100644 --- a/keyboards/pabile/p42/rules.mk +++ b/keyboards/pabile/p42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json index 318a4c565c0..0b33a857227 100644 --- a/keyboards/palette1202/info.json +++ b/keyboards/palette1202/info.json @@ -8,6 +8,8 @@ "pid": "0x1202", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk index 217ed732bab..1c07ca71f28 100644 --- a/keyboards/palette1202/rules.mk +++ b/keyboards/palette1202/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json index 57989732c44..db7a1ead868 100644 --- a/keyboards/panc40/info.json +++ b/keyboards/panc40/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/panc40/rules.mk b/keyboards/panc40/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/panc40/rules.mk +++ b/keyboards/panc40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json index 7282d28718e..6ee1bfa3bde 100644 --- a/keyboards/panc60/info.json +++ b/keyboards/panc60/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["60_ansi", "60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/panc60/rules.mk b/keyboards/panc60/rules.mk index 918661d425e..c9d4726eec7 100644 --- a/keyboards/panc60/rules.mk +++ b/keyboards/panc60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json index 8de08c41bd4..63b5e325f33 100644 --- a/keyboards/papercranekeyboards/gerald65/info.json +++ b/keyboards/papercranekeyboards/gerald65/info.json @@ -8,6 +8,8 @@ "pid": "0x1501", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/papercranekeyboards/gerald65/rules.mk b/keyboards/papercranekeyboards/gerald65/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/papercranekeyboards/gerald65/rules.mk +++ b/keyboards/papercranekeyboards/gerald65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json index 5761467ac66..13a7ea609dd 100644 --- a/keyboards/paprikman/albacore/info.json +++ b/keyboards/paprikman/albacore/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/paprikman/albacore/rules.mk b/keyboards/paprikman/albacore/rules.mk index cbfd971b0f7..c9826178124 100644 --- a/keyboards/paprikman/albacore/rules.mk +++ b/keyboards/paprikman/albacore/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/parallel/parallel_65/hotswap/info.json b/keyboards/parallel/parallel_65/hotswap/info.json index 0b3d370f1d3..25a8b75f04f 100644 --- a/keyboards/parallel/parallel_65/hotswap/info.json +++ b/keyboards/parallel/parallel_65/hotswap/info.json @@ -7,6 +7,8 @@ "pid": "0x5069", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/parallel/parallel_65/hotswap/rules.mk b/keyboards/parallel/parallel_65/hotswap/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/parallel/parallel_65/hotswap/rules.mk +++ b/keyboards/parallel/parallel_65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/parallel/parallel_65/soldered/info.json b/keyboards/parallel/parallel_65/soldered/info.json index 3ae75057198..509d14b2648 100644 --- a/keyboards/parallel/parallel_65/soldered/info.json +++ b/keyboards/parallel/parallel_65/soldered/info.json @@ -7,6 +7,8 @@ "pid": "0x5068", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/parallel/parallel_65/soldered/rules.mk b/keyboards/parallel/parallel_65/soldered/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/parallel/parallel_65/soldered/rules.mk +++ b/keyboards/parallel/parallel_65/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pdxkbc/info.json b/keyboards/pdxkbc/info.json index 5b1e1e66845..e86295207c3 100644 --- a/keyboards/pdxkbc/info.json +++ b/keyboards/pdxkbc/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"reddit", "x":0, "y":0}, {"label":"discord", "x":1, "y":0}, {"label":"badge", "x":0, "y":1}, {"label":"hack", "x":1, "y":1}, {"label":"volu", "x":0, "y":2}, {"label":"vold", "x":1, "y":2}] diff --git a/keyboards/pdxkbc/rules.mk b/keyboards/pdxkbc/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/pdxkbc/rules.mk +++ b/keyboards/pdxkbc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json index e812245ef50..08ab8db4d42 100644 --- a/keyboards/pearl/info.json +++ b/keyboards/pearl/info.json @@ -7,6 +7,8 @@ "pid": "0x0348", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"Backspace", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"\\", "x":11.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Alt", "x":1.13, "y":3}, {"label":"Ctrl", "x":2.13, "y":3, "w":1.25}, {"label":"Win", "x":3.375, "y":3, "w":1.25}, {"label":"Shift", "x":4.625, "y":3, "w":2.25}, {"x":6.875, "y":3, "w":1.25}, {"x":8.125, "y":3, "w":1.5}, {"label":"Menu", "x":9.625, "y":3}, {"label":"Fn", "x":10.63, "y":3, "w":1.25}] diff --git a/keyboards/pearl/rules.mk b/keyboards/pearl/rules.mk index 9a2e1da0ded..9a00928ea84 100644 --- a/keyboards/pearl/rules.mk +++ b/keyboards/pearl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json index 2d5abf5b91f..9c28399c901 100644 --- a/keyboards/pearlboards/atlas/info.json +++ b/keyboards/pearlboards/atlas/info.json @@ -8,6 +8,8 @@ "pid": "0x6964", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk index b75d687546f..15d4f79cde6 100644 --- a/keyboards/pearlboards/atlas/rules.mk +++ b/keyboards/pearlboards/atlas/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json index 10c3bba7edc..39ec8d1089a 100644 --- a/keyboards/pearlboards/pandora/info.json +++ b/keyboards/pearlboards/pandora/info.json @@ -8,6 +8,8 @@ "pid": "0x6963", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/pearlboards/pandora/rules.mk b/keyboards/pearlboards/pandora/rules.mk index e0d88f1d856..2c92da8fedd 100644 --- a/keyboards/pearlboards/pandora/rules.mk +++ b/keyboards/pearlboards/pandora/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json index b0623dfab5e..b7d6d2a5914 100644 --- a/keyboards/pearlboards/pearl/info.json +++ b/keyboards/pearlboards/pearl/info.json @@ -8,6 +8,8 @@ "pid": "0x6965", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 4, "layouts": { "LAYOUT_all": { diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk index 3d9fec280e7..707e9c93126 100644 --- a/keyboards/pearlboards/pearl/rules.mk +++ b/keyboards/pearlboards/pearl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json index 41a72b5fb61..e589b534fbf 100644 --- a/keyboards/pearlboards/zeus/info.json +++ b/keyboards/pearlboards/zeus/info.json @@ -8,6 +8,8 @@ "pid": "0x6966", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk index 556a5e9df99..eeb36fee4ee 100644 --- a/keyboards/pearlboards/zeus/rules.mk +++ b/keyboards/pearlboards/zeus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json index 6c0c188e7f7..0558b83aad1 100644 --- a/keyboards/pearlboards/zeuspad/info.json +++ b/keyboards/pearlboards/zeuspad/info.json @@ -8,6 +8,8 @@ "pid": "0x6967", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts": { "LAYOUT_all": { diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk index b76fe206a17..c6e9db406ab 100644 --- a/keyboards/pearlboards/zeuspad/rules.mk +++ b/keyboards/pearlboards/zeuspad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json index 1949b81e224..7e3878151fe 100644 --- a/keyboards/peej/lumberjack/info.json +++ b/keyboards/peej/lumberjack/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/peej/lumberjack/rules.mk b/keyboards/peej/lumberjack/rules.mk index 128c51e7c63..59c896dbff6 100644 --- a/keyboards/peej/lumberjack/rules.mk +++ b/keyboards/peej/lumberjack/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json index be47e6431d4..2be28d4ef65 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_4x15": { "layout": [ diff --git a/keyboards/peej/rosaline/ortho/rules.mk b/keyboards/peej/rosaline/ortho/rules.mk index d1dde8af62f..ab2c49da70e 100644 --- a/keyboards/peej/rosaline/ortho/rules.mk +++ b/keyboards/peej/rosaline/ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json index cd842ecaeda..f37e073fbd4 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT_staggered_40": "LAYOUT_all" }, diff --git a/keyboards/peej/rosaline/staggered/rules.mk b/keyboards/peej/rosaline/staggered/rules.mk index d1dde8af62f..ab2c49da70e 100644 --- a/keyboards/peej/rosaline/staggered/rules.mk +++ b/keyboards/peej/rosaline/staggered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json index 01beef6aae5..3816cf75926 100644 --- a/keyboards/peej/tripel/info.json +++ b/keyboards/peej/tripel/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_7u": { "layout": [ diff --git a/keyboards/peej/tripel/rules.mk b/keyboards/peej/tripel/rules.mk index c73bdddf5de..4d1c7e3e33f 100644 --- a/keyboards/peej/tripel/rules.mk +++ b/keyboards/peej/tripel/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pegasus/info.json b/keyboards/pegasus/info.json index 00faec71ece..597c7b98e54 100644 --- a/keyboards/pegasus/info.json +++ b/keyboards/pegasus/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/pegasus/rules.mk b/keyboards/pegasus/rules.mk index 50b46dc9587..0334a51bb5b 100644 --- a/keyboards/pegasus/rules.mk +++ b/keyboards/pegasus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index 29ee59e390f..a5ad8532b1b 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/peranekofactory/tone/rev1/rules.mk b/keyboards/peranekofactory/tone/rev1/rules.mk index a56e12eb22b..b03b6fa9058 100644 --- a/keyboards/peranekofactory/tone/rev1/rules.mk +++ b/keyboards/peranekofactory/tone/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index 29ee59e390f..a5ad8532b1b 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/peranekofactory/tone/rev2/rules.mk b/keyboards/peranekofactory/tone/rev2/rules.mk index a56e12eb22b..b03b6fa9058 100644 --- a/keyboards/peranekofactory/tone/rev2/rules.mk +++ b/keyboards/peranekofactory/tone/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json index aa6d7abf055..d17ba98f056 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/info.json @@ -8,6 +8,8 @@ "pid": "0x4253", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/percent/booster/rules.mk b/keyboards/percent/booster/rules.mk index c6760c8826e..74db606881a 100644 --- a/keyboards/percent/booster/rules.mk +++ b/keyboards/percent/booster/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json index 25db8e44b01..0c0af65e8cd 100644 --- a/keyboards/percent/canoe/info.json +++ b/keyboards/percent/canoe/info.json @@ -8,6 +8,8 @@ "pid": "0x434E", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], "layouts": { "LAYOUT_65_iso_blocker": { diff --git a/keyboards/percent/canoe/rules.mk b/keyboards/percent/canoe/rules.mk index 9686fd1aa4c..25437c442c6 100644 --- a/keyboards/percent/canoe/rules.mk +++ b/keyboards/percent/canoe/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json index df17bea6149..e84a8359918 100644 --- a/keyboards/percent/canoe_gen2/info.json +++ b/keyboards/percent/canoe_gen2/info.json @@ -8,6 +8,8 @@ "pid": "0x89F0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/percent/canoe_gen2/rules.mk b/keyboards/percent/canoe_gen2/rules.mk index e03be0345bb..0be47ec5d1d 100644 --- a/keyboards/percent/canoe_gen2/rules.mk +++ b/keyboards/percent/canoe_gen2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json index 9f7c86cdd88..39a36d40421 100644 --- a/keyboards/percent/skog/info.json +++ b/keyboards/percent/skog/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] diff --git a/keyboards/percent/skog/rules.mk b/keyboards/percent/skog/rules.mk index 9686fd1aa4c..25437c442c6 100644 --- a/keyboards/percent/skog/rules.mk +++ b/keyboards/percent/skog/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json index df89a611d8d..f405a83974c 100644 --- a/keyboards/percent/skog_lite/info.json +++ b/keyboards/percent/skog_lite/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/percent/skog_lite/rules.mk b/keyboards/percent/skog_lite/rules.mk index c5fbe8c3ef8..752df263153 100644 --- a/keyboards/percent/skog_lite/rules.mk +++ b/keyboards/percent/skog_lite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json index 56253bff63f..5ed053be674 100644 --- a/keyboards/phantom/info.json +++ b/keyboards/phantom/info.json @@ -8,6 +8,8 @@ "pid": "0x5B50", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/phantom/rules.mk b/keyboards/phantom/rules.mk index a370f6bb519..ab9ede17169 100644 --- a/keyboards/phantom/rules.mk +++ b/keyboards/phantom/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json index 6b9a2b80ace..d1e2b0e58b9 100644 --- a/keyboards/phase_studio/titan65/hotswap/info.json +++ b/keyboards/phase_studio/titan65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xBB91", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk index 140bc4fccb6..4f7d24eafcc 100644 --- a/keyboards/phase_studio/titan65/hotswap/rules.mk +++ b/keyboards/phase_studio/titan65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/info.json index 6abbf8d0aaa..ba7d9f9354e 100644 --- a/keyboards/phase_studio/titan65/soldered/info.json +++ b/keyboards/phase_studio/titan65/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0xBB92", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/phase_studio/titan65/soldered/rules.mk b/keyboards/phase_studio/titan65/soldered/rules.mk index 5d56d105b8a..ad3fad5cb59 100644 --- a/keyboards/phase_studio/titan65/soldered/rules.mk +++ b/keyboards/phase_studio/titan65/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json index 85cffa1c31a..f24d4dbbf50 100644 --- a/keyboards/phoenix/info.json +++ b/keyboards/phoenix/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk index c155cd0988c..a83da5e996d 100644 --- a/keyboards/phoenix/rules.mk +++ b/keyboards/phoenix/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/phrygian/ph100/info.json b/keyboards/phrygian/ph100/info.json index d187cd3fb64..0046f260d74 100644 --- a/keyboards/phrygian/ph100/info.json +++ b/keyboards/phrygian/ph100/info.json @@ -8,6 +8,8 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "debounce": 10, "layouts": { "LAYOUT": { diff --git a/keyboards/phrygian/ph100/rules.mk b/keyboards/phrygian/ph100/rules.mk index 2ab3883521c..707adf67c4e 100644 --- a/keyboards/phrygian/ph100/rules.mk +++ b/keyboards/phrygian/ph100/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json index f87dd24c227..5650ef91567 100644 --- a/keyboards/pico/65keys/info.json +++ b/keyboards/pico/65keys/info.json @@ -8,6 +8,8 @@ "pid": "0x9692", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json index e70e1a3abfa..48eb3064940 100644 --- a/keyboards/pico/70keys/info.json +++ b/keyboards/pico/70keys/info.json @@ -8,6 +8,8 @@ "pid": "0x9692", "device_version": "1.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pico/rules.mk b/keyboards/pico/rules.mk index c3e08dd9307..fac3912a251 100644 --- a/keyboards/pico/rules.mk +++ b/keyboards/pico/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json index e64e1425f6e..130b1839bf2 100644 --- a/keyboards/picolab/frusta_fundamental/info.json +++ b/keyboards/picolab/frusta_fundamental/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/picolab/frusta_fundamental/rules.mk b/keyboards/picolab/frusta_fundamental/rules.mk index 819e4b01136..866703c96e3 100644 --- a/keyboards/picolab/frusta_fundamental/rules.mk +++ b/keyboards/picolab/frusta_fundamental/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json index e77f77d74a4..503f476c2cc 100644 --- a/keyboards/pierce/info.json +++ b/keyboards/pierce/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/pierce/rules.mk b/keyboards/pierce/rules.mk index 56c173529ce..660bba3c3fd 100644 --- a/keyboards/pierce/rules.mk +++ b/keyboards/pierce/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json index bf9147e5f3a..f7fbee01d16 100644 --- a/keyboards/pimentoso/paddino02/rev1/info.json +++ b/keyboards/pimentoso/paddino02/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0020", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pimentoso/paddino02/rev1/rules.mk b/keyboards/pimentoso/paddino02/rev1/rules.mk index 8898d81daf2..21bcb26f658 100644 --- a/keyboards/pimentoso/paddino02/rev1/rules.mk +++ b/keyboards/pimentoso/paddino02/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json index 40a3bb14a02..90d7e4e90d4 100644 --- a/keyboards/pimentoso/paddino02/rev2/left/info.json +++ b/keyboards/pimentoso/paddino02/rev2/left/info.json @@ -8,6 +8,8 @@ "pid": "0x0021", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pimentoso/paddino02/rev2/left/rules.mk b/keyboards/pimentoso/paddino02/rev2/left/rules.mk index 8898d81daf2..21bcb26f658 100755 --- a/keyboards/pimentoso/paddino02/rev2/left/rules.mk +++ b/keyboards/pimentoso/paddino02/rev2/left/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json index 9a341b606b8..3e361839f33 100644 --- a/keyboards/pimentoso/paddino02/rev2/right/info.json +++ b/keyboards/pimentoso/paddino02/rev2/right/info.json @@ -8,6 +8,8 @@ "pid": "0x0022", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pimentoso/paddino02/rev2/right/rules.mk b/keyboards/pimentoso/paddino02/rev2/right/rules.mk index 8898d81daf2..21bcb26f658 100755 --- a/keyboards/pimentoso/paddino02/rev2/right/rules.mk +++ b/keyboards/pimentoso/paddino02/rev2/right/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json index 86cb56a1d5f..755b1cf6ba9 100644 --- a/keyboards/pimentoso/touhoupad/info.json +++ b/keyboards/pimentoso/touhoupad/info.json @@ -8,6 +8,8 @@ "pid": "0x0031", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pimentoso/touhoupad/rules.mk b/keyboards/pimentoso/touhoupad/rules.mk index 7d2cea91dfe..aa4c817d2a2 100644 --- a/keyboards/pimentoso/touhoupad/rules.mk +++ b/keyboards/pimentoso/touhoupad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json index 0fb7e5a6f64..b691a1602a0 100644 --- a/keyboards/pinky/3/info.json +++ b/keyboards/pinky/3/info.json @@ -8,6 +8,8 @@ "pid": "0x7033", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_3x7_4": { "layout": [ diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json index 373861b1388..a05ad52e535 100644 --- a/keyboards/pinky/4/info.json +++ b/keyboards/pinky/4/info.json @@ -8,6 +8,8 @@ "pid": "0x7034", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_4x7_4": { "layout": [ diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk index 2118d54a311..1b080863552 100644 --- a/keyboards/pinky/rules.mk +++ b/keyboards/pinky/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json index f70712c9f66..365c7a7be53 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_3x6_1": { "layout": [ diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk index fe6c0576685..b3c916d3cea 100644 --- a/keyboards/pisces/rules.mk +++ b/keyboards/pisces/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json index ccf3e1760da..ef1c6db09bb 100644 --- a/keyboards/pixelspace/capsule65i/info.json +++ b/keyboards/pixelspace/capsule65i/info.json @@ -8,6 +8,8 @@ "pid": "0xE66E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/pixelspace/capsule65i/rules.mk b/keyboards/pixelspace/capsule65i/rules.mk index 744a2725357..b5cde0eb87a 100644 --- a/keyboards/pixelspace/capsule65i/rules.mk +++ b/keyboards/pixelspace/capsule65i/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json index 0407653596e..bbba5ae0e96 100644 --- a/keyboards/pizzakeyboards/pizza65/info.json +++ b/keyboards/pizzakeyboards/pizza65/info.json @@ -8,6 +8,8 @@ "pid": "0x707A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/pizzakeyboards/pizza65/rules.mk b/keyboards/pizzakeyboards/pizza65/rules.mk index 524b4e40183..3b6a1809db1 100644 --- a/keyboards/pizzakeyboards/pizza65/rules.mk +++ b/keyboards/pizzakeyboards/pizza65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json index e1217d7728f..0da1a7db5bc 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/info.json @@ -8,6 +8,8 @@ "pid": "0x4552", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all_f13": "LAYOUT_tkl_f13_ansi_split_bs_rshift", "LAYOUT_tkl_ansi_f13": "LAYOUT_tkl_f13_ansi", diff --git a/keyboards/pjb/eros/rules.mk b/keyboards/pjb/eros/rules.mk index 696b8ca99e1..12dca933d74 100644 --- a/keyboards/pjb/eros/rules.mk +++ b/keyboards/pjb/eros/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/info.json index b9272dae2c4..50be7dff7df 100644 --- a/keyboards/pkb65/info.json +++ b/keyboards/pkb65/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pkb65/rules.mk b/keyboards/pkb65/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/pkb65/rules.mk +++ b/keyboards/pkb65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 45ec112c0b6..9e400ee45fe 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -6,6 +6,8 @@ "vid": "0x3297", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 04dbfde189a..0bfe083b6c6 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json index bb0936db63a..ed23c148289 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/info.json @@ -8,6 +8,8 @@ "pid": "0xBEA2", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk index 5344c56d2c4..6a6a846dedb 100644 --- a/keyboards/planck/light/rules.mk +++ b/keyboards/planck/light/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json index 0f2291a0d15..6829001b0e6 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xAE01", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/rev1/rules.mk b/keyboards/planck/rev1/rules.mk index 3956ffba90e..8827627e99f 100644 --- a/keyboards/planck/rev1/rules.mk +++ b/keyboards/planck/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json index 118e5182013..2f36673b1e5 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0xAE01", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/rev2/rules.mk b/keyboards/planck/rev2/rules.mk index 3956ffba90e..8827627e99f 100644 --- a/keyboards/planck/rev2/rules.mk +++ b/keyboards/planck/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json index 91748bf1106..5479a93d93a 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/info.json @@ -8,6 +8,8 @@ "pid": "0xAE01", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk index 3956ffba90e..8827627e99f 100644 --- a/keyboards/planck/rev3/rules.mk +++ b/keyboards/planck/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json index 9d70320a630..2c3c9e842b5 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/info.json @@ -8,6 +8,8 @@ "pid": "0xAE01", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk index 1d33b8a7972..78e1ba9f7b1 100644 --- a/keyboards/planck/rev4/rules.mk +++ b/keyboards/planck/rev4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index b39d519d825..9e271ec0729 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -8,6 +8,8 @@ "pid": "0xAE01", "device_version": "0.0.5" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_1x2uC": { diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk index 67057c035d5..78e1ba9f7b1 100644 --- a/keyboards/planck/rev5/rules.mk +++ b/keyboards/planck/rev5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json index b3696cb7d98..6e46d01954c 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/info.json @@ -8,6 +8,9 @@ "pid": "0xA4F9", "device_version": "0.0.6" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk index 886cafd7520..2ab8a36fe0a 100644 --- a/keyboards/planck/rev6/rules.mk +++ b/keyboards/planck/rev6/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json index e85d44334c9..f2a3db50826 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/info.json @@ -8,6 +8,8 @@ "pid": "0xA4F9", "device_version": "0.0.6" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk index 5d56d3b7aeb..5fdf1176499 100644 --- a/keyboards/planck/rev6_drop/rules.mk +++ b/keyboards/planck/rev6_drop/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index a678d57af34..8824929a390 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json @@ -8,6 +8,8 @@ "pid": "0x25A7", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk index 1dd5e5657eb..417fb95129a 100644 --- a/keyboards/planck/thk/rules.mk +++ b/keyboards/planck/thk/rules.mk @@ -1,27 +1,6 @@ -# Copyright 2021 Erovia -# -# 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 . - -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json index 547f60de41b..32404221517 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15.5, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":15.5, "y":3}, {"x":14.25, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4, "w":1.25}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4, "w":2.75}, {"x":9.5, "y":4, "w":1.25}, {"x":10.75, "y":4}, {"x":11.75, "y":4, "w":1.25}, {"x":13.25, "y":4.25}, {"x":14.25, "y":4.25}, {"x":15.25, "y":4.25}] diff --git a/keyboards/playkbtw/ca66/rules.mk b/keyboards/playkbtw/ca66/rules.mk index 9ccce6abf4d..32e82925ccf 100644 --- a/keyboards/playkbtw/ca66/rules.mk +++ b/keyboards/playkbtw/ca66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json index 806994ef4f0..5968f4f6e95 100644 --- a/keyboards/playkbtw/helen80/info.json +++ b/keyboards/playkbtw/helen80/info.json @@ -8,6 +8,8 @@ "pid": "0x4845", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/playkbtw/helen80/rules.mk b/keyboards/playkbtw/helen80/rules.mk index 615efad6f84..86bda7a9c00 100644 --- a/keyboards/playkbtw/helen80/rules.mk +++ b/keyboards/playkbtw/helen80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json index abb846dd448..f8048ded55a 100644 --- a/keyboards/playkbtw/pk60/info.json +++ b/keyboards/playkbtw/pk60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { diff --git a/keyboards/playkbtw/pk60/rules.mk b/keyboards/playkbtw/pk60/rules.mk index 9ccce6abf4d..32e82925ccf 100644 --- a/keyboards/playkbtw/pk60/rules.mk +++ b/keyboards/playkbtw/pk60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json index 05ec89471a7..7cb2950d6a0 100644 --- a/keyboards/playkbtw/pk64rgb/info.json +++ b/keyboards/playkbtw/pk64rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x3634", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { diff --git a/keyboards/playkbtw/pk64rgb/rules.mk b/keyboards/playkbtw/pk64rgb/rules.mk index d85089d0ac7..e18aaeaa8a1 100644 --- a/keyboards/playkbtw/pk64rgb/rules.mk +++ b/keyboards/playkbtw/pk64rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index f672336c258..3550c1d5a35 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -8,6 +8,8 @@ "pid": "0x4D6F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk index 840b5eba39a..8d62f78ed71 100644 --- a/keyboards/ploopyco/mouse/rules.mk +++ b/keyboards/ploopyco/mouse/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ploopyco/trackball/rev1/info.json b/keyboards/ploopyco/trackball/rev1/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/ploopyco/trackball/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/ploopyco/trackball/rev1/rules.mk b/keyboards/ploopyco/trackball/rev1/rules.mk index 6ded83e74b1..e69de29bb2d 100644 --- a/keyboards/ploopyco/trackball/rev1/rules.mk +++ b/keyboards/ploopyco/trackball/rev1/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json new file mode 100644 index 00000000000..042c41f34d6 --- /dev/null +++ b/keyboards/ploopyco/trackball/rev1_005/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/ploopyco/trackball/rev1_005/rules.mk b/keyboards/ploopyco/trackball/rev1_005/rules.mk index bddd4e389e4..e69de29bb2d 100644 --- a/keyboards/ploopyco/trackball/rev1_005/rules.mk +++ b/keyboards/ploopyco/trackball/rev1_005/rules.mk @@ -1,2 +0,0 @@ -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk index 3d5c364e3e4..0f5f3f648f6 100644 --- a/keyboards/ploopyco/trackball/rules.mk +++ b/keyboards/ploopyco/trackball/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json index f465a7a21ef..0941cd40246 100644 --- a/keyboards/ploopyco/trackball_mini/info.json +++ b/keyboards/ploopyco/trackball_mini/info.json @@ -8,6 +8,8 @@ "pid": "0x1EAB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk index f5e7935ee20..d7016929c90 100644 --- a/keyboards/ploopyco/trackball_mini/rules.mk +++ b/keyboards/ploopyco/trackball_mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json index ec6dcf3c59b..610efd27b3e 100644 --- a/keyboards/ploopyco/trackball_nano/info.json +++ b/keyboards/ploopyco/trackball_nano/info.json @@ -8,6 +8,8 @@ "pid": "0x54A3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/ploopyco/trackball_nano/rules.mk b/keyboards/ploopyco/trackball_nano/rules.mk index 565be1280f1..7a1052a4fac 100644 --- a/keyboards/ploopyco/trackball_nano/rules.mk +++ b/keyboards/ploopyco/trackball_nano/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json index 594cc6a7d3d..8595df0f313 100644 --- a/keyboards/pluckey/info.json +++ b/keyboards/pluckey/info.json @@ -8,6 +8,8 @@ "pid": "0x91CE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk index 3018ef12bf2..171b6139c2c 100644 --- a/keyboards/pluckey/rules.mk +++ b/keyboards/pluckey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json index eb9bc6fcd91..ba046dfa02a 100644 --- a/keyboards/plume/plume65/info.json +++ b/keyboards/plume/plume65/info.json @@ -8,6 +8,8 @@ "pid": "0x22CF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_iso": { "layout": [ diff --git a/keyboards/plume/plume65/rules.mk b/keyboards/plume/plume65/rules.mk index 0d0282ac7c4..a927de843cb 100644 --- a/keyboards/plume/plume65/rules.mk +++ b/keyboards/plume/plume65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json index 8f00fa9a3c0..8c112f34633 100644 --- a/keyboards/plut0nium/0x3e/info.json +++ b/keyboards/plut0nium/0x3e/info.json @@ -8,6 +8,8 @@ "pid": "0x3E01", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/plut0nium/0x3e/rules.mk b/keyboards/plut0nium/0x3e/rules.mk index 9cccfc48337..22590b0ae02 100644 --- a/keyboards/plut0nium/0x3e/rules.mk +++ b/keyboards/plut0nium/0x3e/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/plx/info.json b/keyboards/plx/info.json index be37e4efe01..fe0e02d2996 100644 --- a/keyboards/plx/info.json +++ b/keyboards/plx/info.json @@ -8,6 +8,8 @@ "pid": "0xE972", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi_tsangan" }, diff --git a/keyboards/plx/rules.mk b/keyboards/plx/rules.mk index a1392cf92f3..29f6808ed5d 100644 --- a/keyboards/plx/rules.mk +++ b/keyboards/plx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/info.json index 37204070a39..02c5e0c8b21 100644 --- a/keyboards/plywrks/ahgase/info.json +++ b/keyboards/plywrks/ahgase/info.json @@ -8,6 +8,8 @@ "pid": "0x7902", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi", "LAYOUT_iso": "LAYOUT_tkl_f13_iso" diff --git a/keyboards/plywrks/ahgase/rules.mk b/keyboards/plywrks/ahgase/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/plywrks/ahgase/rules.mk +++ b/keyboards/plywrks/ahgase/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json index 83ccfe12f33..2061b282e4c 100644 --- a/keyboards/plywrks/lune/info.json +++ b/keyboards/plywrks/lune/info.json @@ -8,6 +8,8 @@ "pid": "0x7901", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/plywrks/lune/rules.mk b/keyboards/plywrks/lune/rules.mk index 89f7f108406..e557ae8ab43 100644 --- a/keyboards/plywrks/lune/rules.mk +++ b/keyboards/plywrks/lune/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json index e305708d7d3..a6d3fa1d357 100644 --- a/keyboards/pohjolaworks/louhi/info.json +++ b/keyboards/pohjolaworks/louhi/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_7u_space": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k10", "x":1, "y":0}, {"label":"k01", "x":2, "y":0}, {"label":"k11", "x":3, "y":0}, {"label":"k02", "x":4, "y":0}, {"label":"k12", "x":5, "y":0}, {"label":"k03", "x":6, "y":0}, {"label":"k13", "x":7, "y":0}, {"label":"k04", "x":8, "y":0}, {"label":"k14", "x":9, "y":0}, {"label":"k05", "x":10, "y":0}, {"label":"k15", "x":11, "y":0}, {"label":"k06", "x":12, "y":0}, {"label":"k20", "x":0, "y":1}, {"label":"k30", "x":1, "y":1}, {"label":"k21", "x":2, "y":1}, {"label":"k31", "x":3, "y":1}, {"label":"k22", "x":4, "y":1}, {"label":"k32", "x":5, "y":1}, {"label":"k23", "x":6, "y":1}, {"label":"k33", "x":7, "y":1}, {"label":"k24", "x":8, "y":1}, {"label":"k34", "x":9, "y":1}, {"label":"k25", "x":10, "y":1}, {"label":"k35", "x":11, "y":1}, {"label":"k26", "x":12, "y":1}, {"label":"k40", "x":0, "y":2}, {"label":"k50", "x":1, "y":2}, {"label":"k41", "x":2, "y":2}, {"label":"k51", "x":3, "y":2}, {"label":"k42", "x":4, "y":2}, {"label":"k52", "x":5, "y":2}, {"label":"k43", "x":6, "y":2}, {"label":"k53", "x":7, "y":2}, {"label":"k44", "x":8, "y":2}, {"label":"k54", "x":9, "y":2}, {"label":"k45", "x":10, "y":2}, {"label":"k55", "x":11, "y":2}, {"label":"k46", "x":12, "y":2}, {"label":"k60", "x":0, "y":3}, {"label":"k70", "x":1, "y":3}, {"label":"k61", "x":2, "y":3}, {"label":"k63", "x":3, "y":3, "w":7}, {"label":"k65", "x":10, "y":3}, {"label":"k75", "x":11, "y":3}, {"label":"k66", "x":12, "y":3}] diff --git a/keyboards/pohjolaworks/louhi/rules.mk b/keyboards/pohjolaworks/louhi/rules.mk index a56e12eb22b..b03b6fa9058 100644 --- a/keyboards/pohjolaworks/louhi/rules.mk +++ b/keyboards/pohjolaworks/louhi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json index af6c4167936..27adbb74e35 100644 --- a/keyboards/poker87c/info.json +++ b/keyboards/poker87c/info.json @@ -8,6 +8,8 @@ "pid": "0x087C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/poker87c/rules.mk b/keyboards/poker87c/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/poker87c/rules.mk +++ b/keyboards/poker87c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json index 50f7e076dae..82d72f091c4 100644 --- a/keyboards/poker87d/info.json +++ b/keyboards/poker87d/info.json @@ -8,6 +8,8 @@ "pid": "0x087D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/poker87d/rules.mk b/keyboards/poker87d/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/poker87d/rules.mk +++ b/keyboards/poker87d/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json index bb6a98939c0..7bae2abb0d5 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "STM32F042", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk index e67dde490d4..1ffb0c55b90 100644 --- a/keyboards/polilla/rev1/rules.mk +++ b/keyboards/polilla/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F042 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json index ee4eea2ac99..d37ec49dcb7 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/info.json @@ -8,6 +8,8 @@ "pid": "0x7320", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/polycarbdiet/s20/rules.mk b/keyboards/polycarbdiet/s20/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/polycarbdiet/s20/rules.mk +++ b/keyboards/polycarbdiet/s20/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json index 12cfe77fb2b..bbe6c3460c6 100644 --- a/keyboards/pom_keyboards/tnln95/info.json +++ b/keyboards/pom_keyboards/tnln95/info.json @@ -8,6 +8,8 @@ "pid": "0x3931", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 8, "layouts": { "LAYOUT_all": { diff --git a/keyboards/pom_keyboards/tnln95/rules.mk b/keyboards/pom_keyboards/tnln95/rules.mk index 36c58097ac9..96c87dcb1b3 100644 --- a/keyboards/pom_keyboards/tnln95/rules.mk +++ b/keyboards/pom_keyboards/tnln95/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/portal_66/hotswap/info.json b/keyboards/portal_66/hotswap/info.json index 92df17b10c7..3951d86e3f5 100644 --- a/keyboards/portal_66/hotswap/info.json +++ b/keyboards/portal_66/hotswap/info.json @@ -7,6 +7,8 @@ "pid": "0x5067", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/portal_66/hotswap/rules.mk b/keyboards/portal_66/hotswap/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/portal_66/hotswap/rules.mk +++ b/keyboards/portal_66/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/portal_66/soldered/info.json b/keyboards/portal_66/soldered/info.json index bee21fd1a6f..3e7955e193d 100644 --- a/keyboards/portal_66/soldered/info.json +++ b/keyboards/portal_66/soldered/info.json @@ -7,6 +7,8 @@ "pid": "0x5066", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_split_bs": "LAYOUT_65_ansi_blocker_split_bs", "LAYOUT_65_ansi": "LAYOUT_65_ansi_blocker", diff --git a/keyboards/portal_66/soldered/rules.mk b/keyboards/portal_66/soldered/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/portal_66/soldered/rules.mk +++ b/keyboards/portal_66/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/pos78/info.json b/keyboards/pos78/info.json index d6bd269fc5c..cca5c4ac89e 100644 --- a/keyboards/pos78/info.json +++ b/keyboards/pos78/info.json @@ -8,6 +8,8 @@ "pid": "0x7878", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_6x13": { "layout": [ diff --git a/keyboards/pos78/rules.mk b/keyboards/pos78/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/pos78/rules.mk +++ b/keyboards/pos78/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json index a6f5233875e..6da254960bb 100644 --- a/keyboards/preonic/rev1/info.json +++ b/keyboards/preonic/rev1/info.json @@ -6,5 +6,7 @@ "pid": "0x67F3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x12"] } diff --git a/keyboards/preonic/rev1/rules.mk b/keyboards/preonic/rev1/rules.mk index 0ca1fec7d12..5700acd66cc 100644 --- a/keyboards/preonic/rev1/rules.mk +++ b/keyboards/preonic/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json index 928e4bcbcf3..b1e66a09e0c 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/info.json @@ -6,5 +6,7 @@ "pid": "0x67F3", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_5x12"] } diff --git a/keyboards/preonic/rev2/rules.mk b/keyboards/preonic/rev2/rules.mk index a9da1a9b3f3..0404fb325ab 100644 --- a/keyboards/preonic/rev2/rules.mk +++ b/keyboards/preonic/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json index 81f83ccb4bc..0f396fc87ef 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/info.json @@ -6,6 +6,9 @@ "pid": "0xA649", "device_version": "0.0.3" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_preonic_1x2uC": { diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk index a7f7e9e6519..e4c6852526e 100644 --- a/keyboards/preonic/rev3/rules.mk +++ b/keyboards/preonic/rev3/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json index 7cd1b111e9f..c8095a62e69 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/info.json @@ -6,6 +6,8 @@ "pid": "0xA649", "device_version": "0.0.3" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_preonic_1x2uC": { diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk index 18a86c09f87..e3f9e52110f 100644 --- a/keyboards/preonic/rev3_drop/rules.mk +++ b/keyboards/preonic/rev3_drop/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json index c12b1b75876..ab16646490d 100644 --- a/keyboards/primekb/meridian/info.json +++ b/keyboards/primekb/meridian/info.json @@ -8,6 +8,8 @@ "pid": "0x004D", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_unified_bs_rshift": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}] diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk index 93737e35154..ead22f6c155 100644 --- a/keyboards/primekb/meridian/rules.mk +++ b/keyboards/primekb/meridian/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json index eebf1ea394d..5e04483018a 100644 --- a/keyboards/primekb/meridian_rgb/info.json +++ b/keyboards/primekb/meridian_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x0042", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}] diff --git a/keyboards/primekb/meridian_rgb/rules.mk b/keyboards/primekb/meridian_rgb/rules.mk index ee0e024ddb1..d307363777b 100644 --- a/keyboards/primekb/meridian_rgb/rules.mk +++ b/keyboards/primekb/meridian_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index 25f14ee9cef..8046f233e98 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -5,6 +5,8 @@ "usb": { "vid": "0x5052" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1}, diff --git a/keyboards/primekb/prime_e/rules.mk b/keyboards/primekb/prime_e/rules.mk index 448009e7e67..64b21fa0a25 100644 --- a/keyboards/primekb/prime_e/rules.mk +++ b/keyboards/primekb/prime_e/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json index 88a2cdb065f..b9c5545ca71 100644 --- a/keyboards/primekb/prime_l/info.json +++ b/keyboards/primekb/prime_l/info.json @@ -5,6 +5,8 @@ "usb": { "vid": "0x5052" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/primekb/prime_l/rules.mk b/keyboards/primekb/prime_l/rules.mk index 6f1af706bfe..b94eff91169 100644 --- a/keyboards/primekb/prime_l/rules.mk +++ b/keyboards/primekb/prime_l/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/prime_m/info.json b/keyboards/primekb/prime_m/info.json index 1fb143bde19..32493fc6f33 100644 --- a/keyboards/primekb/prime_m/info.json +++ b/keyboards/primekb/prime_m/info.json @@ -8,6 +8,8 @@ "pid": "0x504D", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x6"], "layouts": { "LAYOUT_ortho_5x6": { diff --git a/keyboards/primekb/prime_m/rules.mk b/keyboards/primekb/prime_m/rules.mk index 48996630d38..bdc6e54bc21 100644 --- a/keyboards/primekb/prime_m/rules.mk +++ b/keyboards/primekb/prime_m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/prime_o/info.json b/keyboards/primekb/prime_o/info.json index 164c431a67f..b3d41057e4f 100644 --- a/keyboards/primekb/prime_o/info.json +++ b/keyboards/primekb/prime_o/info.json @@ -8,6 +8,8 @@ "pid": "0x4024", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/primekb/prime_o/rules.mk b/keyboards/primekb/prime_o/rules.mk index ea8dd4a8ae8..9ce191fd81e 100644 --- a/keyboards/primekb/prime_o/rules.mk +++ b/keyboards/primekb/prime_o/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/primekb/prime_r/info.json b/keyboards/primekb/prime_r/info.json index c29b0419f8b..ffddcee44f5 100644 --- a/keyboards/primekb/prime_r/info.json +++ b/keyboards/primekb/prime_r/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K012", "x":12, "y":0}, {"label":"K013", "x":13, "y":0}, {"label":"K014", "x":14, "y":0}, {"label":"K015", "x":15, "y":0}, {"label":"K100", "x":0, "y":1}, {"label":"K101", "x":1, "y":1}, {"label":"K102", "x":2, "y":1}, {"label":"K103", "x":3, "y":1}, {"label":"K104", "x":4, "y":1}, {"label":"K105", "x":5, "y":1}, {"label":"K106", "x":6, "y":1}, {"label":"K107", "x":7, "y":1}, {"label":"K108", "x":8, "y":1}, {"label":"K109", "x":9, "y":1}, {"label":"K110", "x":10, "y":1}, {"label":"K111", "x":11, "y":1}, {"label":"K112", "x":12, "y":1}, {"label":"K113", "x":13, "y":1}, {"label":"K114", "x":14, "y":1}, {"label":"K115", "x":15, "y":1}, {"label":"K200", "x":0, "y":2, "w":1.25}, {"label":"K201", "x":1.25, "y":2}, {"label":"K202", "x":2.25, "y":2}, {"label":"K203", "x":3.25, "y":2}, {"label":"K204", "x":4.25, "y":2}, {"label":"K205", "x":5.25, "y":2}, {"label":"K206", "x":6.25, "y":2}, {"label":"K207", "x":7.25, "y":2}, {"label":"K208", "x":8.25, "y":2}, {"label":"K209", "x":9.25, "y":2}, {"label":"K210", "x":10.25, "y":2}, {"label":"K212", "x":11.25, "y":2, "w":1.75}, {"label":"K213", "x":13, "y":2}, {"label":"K214", "x":14, "y":2}, {"label":"K215", "x":15, "y":2}, {"label":"K300", "x":0, "y":3, "w":1.75}, {"label":"K302", "x":1.75, "y":3}, {"label":"K303", "x":2.75, "y":3}, {"label":"K304", "x":3.75, "y":3}, {"label":"K305", "x":4.75, "y":3}, {"label":"K306", "x":5.75, "y":3}, {"label":"K307", "x":6.75, "y":3}, {"label":"K308", "x":7.75, "y":3}, {"label":"K309", "x":8.75, "y":3}, {"label":"K310", "x":9.75, "y":3}, {"label":"K311", "x":10.75, "y":3}, {"label":"K312", "x":11.75, "y":3, "w":1.25}, {"label":"K313", "x":13, "y":3}, {"label":"K314", "x":14, "y":3}, {"label":"K315", "x":15, "y":3}, {"label":"K400", "x":0, "y":4, "w":1.25}, {"label":"K402", "x":1.25, "y":4, "w":1.25}, {"label":"K403", "x":2.5, "y":4}, {"label":"K404", "x":3.5, "y":4}, {"label":"K405", "x":4.5, "y":4, "w":2}, {"label":"K407", "x":6.5, "y":4, "w":2.25}, {"label":"K409", "x":8.75, "y":4}, {"label":"K410", "x":9.75, "y":4}, {"label":"K411", "x":10.75, "y":4}, {"label":"K412", "x":11.75, "y":4, "w":1.25}, {"label":"K413", "x":13, "y":4}, {"label":"K414", "x":14, "y":4}, {"label":"K415", "x":15, "y":4}] diff --git a/keyboards/primekb/prime_r/rules.mk b/keyboards/primekb/prime_r/rules.mk index 60293f13865..e0fca34fa1e 100644 --- a/keyboards/primekb/prime_r/rules.mk +++ b/keyboards/primekb/prime_r/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json index c73b4cc0302..e27a7b66180 100644 --- a/keyboards/program_yoink/ortho/info.json +++ b/keyboards/program_yoink/ortho/info.json @@ -8,6 +8,8 @@ "pid": "0xF10C", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho": { "layout": [ diff --git a/keyboards/program_yoink/rules.mk b/keyboards/program_yoink/rules.mk index d4c3d6a3403..1d2265b8337 100644 --- a/keyboards/program_yoink/rules.mk +++ b/keyboards/program_yoink/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json index cc488e4a8fd..7c98c3ed717 100644 --- a/keyboards/program_yoink/staggered/info.json +++ b/keyboards/program_yoink/staggered/info.json @@ -8,6 +8,8 @@ "pid": "0xF10B", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/projectcain/relic/info.json b/keyboards/projectcain/relic/info.json index 2b4041a2616..5c07c8e1063 100644 --- a/keyboards/projectcain/relic/info.json +++ b/keyboards/projectcain/relic/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK
SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"LGUI", "x":3, "y":3.25}, {"label":"BACK
SPACE", "x":4, "y":3.25, "w":1.5}, {"label":"Space", "x":5.5, "y":3.25}, {"label":"Space", "x":6.5, "y":3.25, "w":1.5}, {"label":"RGUI", "x":8, "y":3.25}] diff --git a/keyboards/projectcain/relic/rules.mk b/keyboards/projectcain/relic/rules.mk index 717cc07b4b7..c58df49ea8f 100644 --- a/keyboards/projectcain/relic/rules.mk +++ b/keyboards/projectcain/relic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json index 4b81c2ef76f..467c8293e80 100644 --- a/keyboards/projectcain/vault35/info.json +++ b/keyboards/projectcain/vault35/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_4space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK
SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"label":"LOWER", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1.75}, {"label":"RAISE", "x":7.25, "y":3, "w":1.25}, {"label":"ALT", "x":8.5, "y":3}] diff --git a/keyboards/projectcain/vault35/rules.mk b/keyboards/projectcain/vault35/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/projectcain/vault35/rules.mk +++ b/keyboards/projectcain/vault35/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/projectcain/vault45/info.json b/keyboards/projectcain/vault45/info.json index 9e3ebcb02e9..a8a4dcba8ec 100644 --- a/keyboards/projectcain/vault45/info.json +++ b/keyboards/projectcain/vault45/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/projectcain/vault45/rules.mk b/keyboards/projectcain/vault45/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/projectcain/vault45/rules.mk +++ b/keyboards/projectcain/vault45/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/projectkb/alice/info.json b/keyboards/projectkb/alice/info.json index a1f65d837f8..f77f68441df 100644 --- a/keyboards/projectkb/alice/info.json +++ b/keyboards/projectkb/alice/info.json @@ -8,6 +8,8 @@ "pid": "0xA71C", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk index 9b677145613..e1e604dfc53 100644 --- a/keyboards/projectkb/alice/rev1/rules.mk +++ b/keyboards/projectkb/alice/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk index 9b677145613..e1e604dfc53 100644 --- a/keyboards/projectkb/alice/rev2/rules.mk +++ b/keyboards/projectkb/alice/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/projectkb/signature65/info.json b/keyboards/projectkb/signature65/info.json index 1344dedac41..2f0f01621b7 100644 --- a/keyboards/projectkb/signature65/info.json +++ b/keyboards/projectkb/signature65/info.json @@ -8,6 +8,8 @@ "pid": "0x0165", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/projectkb/signature65/rules.mk b/keyboards/projectkb/signature65/rules.mk index d08b1dfd880..707adf67c4e 100644 --- a/keyboards/projectkb/signature65/rules.mk +++ b/keyboards/projectkb/signature65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/projectkb/signature87/info.json b/keyboards/projectkb/signature87/info.json index 1812247317f..76ff092fb29 100644 --- a/keyboards/projectkb/signature87/info.json +++ b/keyboards/projectkb/signature87/info.json @@ -8,6 +8,8 @@ "pid": "0x0187", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/projectkb/signature87/rules.mk b/keyboards/projectkb/signature87/rules.mk index dc28ad7a256..06b7b460e38 100644 --- a/keyboards/projectkb/signature87/rules.mk +++ b/keyboards/projectkb/signature87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/prototypist/allison/info.json b/keyboards/prototypist/allison/info.json index f4108081cc8..dbfb113af0e 100644 --- a/keyboards/prototypist/allison/info.json +++ b/keyboards/prototypist/allison/info.json @@ -8,6 +8,8 @@ "pid": "0x414D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":1.25, "y":0}, {"label":"0,1", "x":2.5, "y":0}, {"label":"0,2", "x":3.5, "y":0}, {"label":"0,3", "x":4.5, "y":0}, {"label":"0,4", "x":5.5, "y":0}, {"label":"0,5", "x":6.75, "y":0}, {"label":"0,6", "x":7.75, "y":0}, {"label":"0,7", "x":8.75, "y":0}, {"label":"0,8", "x":9.75, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,13", "x":15.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1.25, "y":1.25}, {"label":"1,2", "x":2.25, "y":1.25}, {"label":"1,3", "x":3.25, "y":1.25}, {"label":"1,4", "x":4.25, "y":1.25}, {"label":"1,5", "x":5.25, "y":1.25}, {"label":"1,6", "x":6.25, "y":1.25}, {"label":"1,7", "x":7.25, "y":1.25}, {"label":"1,8", "x":8.25, "y":1.25}, {"label":"1,9", "x":9.25, "y":1.25}, {"label":"1,10", "x":10.25, "y":1.25}, {"label":"1,11", "x":11.25, "y":1.25}, {"label":"1,12", "x":12.25, "y":1.25}, {"label":"1,13", "x":13.25, "y":1.25}, {"label":"1,14", "x":14.25, "y":1.25}, {"label":"0,14", "x":15.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25}, {"label":"2,1", "x":1.25, "y":2.25, "w":1.5}, {"label":"2,2", "x":2.75, "y":2.25}, {"label":"2,3", "x":3.75, "y":2.25}, {"label":"2,4", "x":4.75, "y":2.25}, {"label":"2,5", "x":5.75, "y":2.25}, {"label":"2,6", "x":6.75, "y":2.25}, {"label":"2,7", "x":7.75, "y":2.25}, {"label":"2,8", "x":8.75, "y":2.25}, {"label":"2,9", "x":9.75, "y":2.25}, {"label":"2,10", "x":10.75, "y":2.25}, {"label":"2,11", "x":11.75, "y":2.25}, {"label":"2,12", "x":12.75, "y":2.25}, {"label":"2,13", "x":13.75, "y":2.25}, {"label":"2,14", "x":14.75, "y":2.25, "w":1.5}, {"label":"3,0", "x":0, "y":3.25}, {"label":"3,1", "x":1.25, "y":3.25, "w":1.75}, {"label":"3,2", "x":3, "y":3.25}, {"label":"3,3", "x":4, "y":3.25}, {"label":"3,4", "x":5, "y":3.25}, {"label":"3,5", "x":6, "y":3.25}, {"label":"3,6", "x":7, "y":3.25}, {"label":"3,7", "x":8, "y":3.25}, {"label":"3,8", "x":9, "y":3.25}, {"label":"3,9", "x":10, "y":3.25}, {"label":"3,10", "x":11, "y":3.25}, {"label":"3,11", "x":12, "y":3.25}, {"label":"3,12", "x":13, "y":3.25}, {"label":"3,13", "x":14, "y":3.25}, {"label":"3,14", "x":15, "y":3.25, "w":1.25}, {"label":"4,0", "x":0, "y":4.25}, {"label":"4,1", "x":1.25, "y":4.25, "w":1.25}, {"label":"4,2", "x":2.5, "y":4.25}, {"label":"4,3", "x":3.5, "y":4.25}, {"label":"4,4", "x":4.5, "y":4.25}, {"label":"4,5", "x":5.5, "y":4.25}, {"label":"4,6", "x":6.5, "y":4.25}, {"label":"4,7", "x":7.5, "y":4.25}, {"label":"4,8", "x":8.5, "y":4.25}, {"label":"4,9", "x":9.5, "y":4.25}, {"label":"4,10", "x":10.5, "y":4.25}, {"label":"4,11", "x":11.5, "y":4.25}, {"label":"4,12", "x":12.5, "y":4.25}, {"label":"4,13", "x":13.5, "y":4.25, "w":1.75}, {"label":"4,14", "x":15.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.5}, {"label":"5,2", "x":2.75, "y":5.25}, {"label":"5,3", "x":3.75, "y":5.25, "w":1.5}, {"label":"5,8", "x":5.25, "y":5.25, "w":7}, {"label":"5,12", "x":12.25, "y":5.25, "w":1.5}, {"label":"5,13", "x":13.75, "y":5.25}, {"label":"5,14", "x":14.75, "y":5.25, "w":1.5}] diff --git a/keyboards/prototypist/allison/rules.mk b/keyboards/prototypist/allison/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/prototypist/allison/rules.mk +++ b/keyboards/prototypist/allison/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/prototypist/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/info.json index 966a617ccf0..1d503cae202 100644 --- a/keyboards/prototypist/allison_numpad/info.json +++ b/keyboards/prototypist/allison_numpad/info.json @@ -8,6 +8,8 @@ "pid": "0x414E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4", "numpad_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/prototypist/allison_numpad/rules.mk b/keyboards/prototypist/allison_numpad/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/prototypist/allison_numpad/rules.mk +++ b/keyboards/prototypist/allison_numpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/prototypist/j01/info.json b/keyboards/prototypist/j01/info.json index 6ff8ce09c54..b62a49ecce8 100644 --- a/keyboards/prototypist/j01/info.json +++ b/keyboards/prototypist/j01/info.json @@ -8,6 +8,8 @@ "pid": "0x6A31", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/prototypist/j01/rules.mk b/keyboards/prototypist/j01/rules.mk index e3f81ddc4db..dc51cbd545d 100644 --- a/keyboards/prototypist/j01/rules.mk +++ b/keyboards/prototypist/j01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json index 456e00707b7..6cce88c9bfd 100644 --- a/keyboards/protozoa/cassini/info.json +++ b/keyboards/protozoa/cassini/info.json @@ -8,6 +8,8 @@ "pid": "0x4341", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/protozoa/cassini/rules.mk b/keyboards/protozoa/cassini/rules.mk index 169c45b479d..7000bb65710 100644 --- a/keyboards/protozoa/cassini/rules.mk +++ b/keyboards/protozoa/cassini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json index b4fce2823ff..d4c6872ef5a 100644 --- a/keyboards/protozoa/p01/info.json +++ b/keyboards/protozoa/p01/info.json @@ -8,6 +8,8 @@ "pid": "0x5031", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}] diff --git a/keyboards/protozoa/p01/rules.mk b/keyboards/protozoa/p01/rules.mk index 736745abf06..931b88745fd 100644 --- a/keyboards/protozoa/p01/rules.mk +++ b/keyboards/protozoa/p01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/info.json index 3858497cd2e..422973a6d1a 100644 --- a/keyboards/psuieee/pluto12/info.json +++ b/keyboards/psuieee/pluto12/info.json @@ -8,6 +8,8 @@ "pid": "0x7012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/psuieee/pluto12/rules.mk b/keyboards/psuieee/pluto12/rules.mk index a56e12eb22b..b03b6fa9058 100644 --- a/keyboards/psuieee/pluto12/rules.mk +++ b/keyboards/psuieee/pluto12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index b8ac941d60d..1fab1f84862 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json @@ -8,6 +8,8 @@ "pid": "0x5054", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk index 3cf6a1f0077..d07878747eb 100644 --- a/keyboards/pteron36/rules.mk +++ b/keyboards/pteron36/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json index 0d9c5ffa04d..f56b1ceef8f 100644 --- a/keyboards/puck/info.json +++ b/keyboards/puck/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/puck/rules.mk b/keyboards/puck/rules.mk index 89e2608f2db..c271aa0f069 100644 --- a/keyboards/puck/rules.mk +++ b/keyboards/puck/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/punk75/info.json b/keyboards/punk75/info.json index 850490fd5ea..77d5495d867 100644 --- a/keyboards/punk75/info.json +++ b/keyboards/punk75/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/punk75/rules.mk b/keyboards/punk75/rules.mk index 99bdcec6050..362b5c8e08d 100644 --- a/keyboards/punk75/rules.mk +++ b/keyboards/punk75/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json index 6b1503f5514..aed372df94d 100644 --- a/keyboards/q4z/info.json +++ b/keyboards/q4z/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/q4z/rules.mk b/keyboards/q4z/rules.mk index d2c0e0b0a96..6d3709762d5 100644 --- a/keyboards/q4z/rules.mk +++ b/keyboards/q4z/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json index f9cc6c77b9c..5d63633cfae 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/info.json @@ -8,6 +8,8 @@ "pid": "0x656D", "device_version": "10.0.0" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/qpockets/eggman/rules.mk b/keyboards/qpockets/eggman/rules.mk index 7cb0dc381fd..c473e6a78e4 100644 --- a/keyboards/qpockets/eggman/rules.mk +++ b/keyboards/qpockets/eggman/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json index b73e3a434c6..394a03b5ee0 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x7373", "device_version": "30.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 7, "layouts": { "LAYOUT_default": { diff --git a/keyboards/qpockets/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk index 5f58c5684bf..131aa72aeb5 100644 --- a/keyboards/qpockets/space_space/rev1/rules.mk +++ b/keyboards/qpockets/space_space/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index a6cad3665ea..e895a35d4de 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x7373", "device_version": "30.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/qpockets/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk index 8876a458810..ebe0d0e0e32 100644 --- a/keyboards/qpockets/space_space/rev2/rules.mk +++ b/keyboards/qpockets/space_space/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json index 8ce7326062d..61ff2f78dae 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/info.json @@ -8,6 +8,8 @@ "pid": "0x7774", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 4, "layouts": { "LAYOUT_default": { diff --git a/keyboards/qpockets/wanten/rules.mk b/keyboards/qpockets/wanten/rules.mk index c4a39c910fc..f0a88209b69 100644 --- a/keyboards/qpockets/wanten/rules.mk +++ b/keyboards/qpockets/wanten/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index 10e63cb2d02..fa18f23ffa9 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_continuous_fnrow": { "layout": [ diff --git a/keyboards/quad_h/lb75/rules.mk b/keyboards/quad_h/lb75/rules.mk index 63a57dcadb9..45377383806 100644 --- a/keyboards/quad_h/lb75/rules.mk +++ b/keyboards/quad_h/lb75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json index f30b74c1a77..da19670161a 100644 --- a/keyboards/quantrik/kyuu/info.json +++ b/keyboards/quantrik/kyuu/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/quantrik/kyuu/rules.mk b/keyboards/quantrik/kyuu/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/quantrik/kyuu/rules.mk +++ b/keyboards/quantrik/kyuu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json index 3109622d3b0..c142c01b7ec 100644 --- a/keyboards/quarkeys/z60/hotswap/info.json +++ b/keyboards/quarkeys/z60/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x3C02", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi_tsangan_split_rshift" }, diff --git a/keyboards/quarkeys/z60/hotswap/rules.mk b/keyboards/quarkeys/z60/hotswap/rules.mk index 1049ac1af77..36b8dd4d443 100644 --- a/keyboards/quarkeys/z60/hotswap/rules.mk +++ b/keyboards/quarkeys/z60/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json index f4ad797462c..e5ec227c7e8 100644 --- a/keyboards/quarkeys/z60/solder/info.json +++ b/keyboards/quarkeys/z60/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x3C01", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/quarkeys/z60/solder/rules.mk b/keyboards/quarkeys/z60/solder/rules.mk index 181a4345297..54bbea4e625 100644 --- a/keyboards/quarkeys/z60/solder/rules.mk +++ b/keyboards/quarkeys/z60/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json index 3a21a1f9b58..ef0088d47a5 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/info.json @@ -8,6 +8,8 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/qvex/lynepad/rules.mk b/keyboards/qvex/lynepad/rules.mk index 78ee3e942b9..fe695a8986e 100644 --- a/keyboards/qvex/lynepad/rules.mk +++ b/keyboards/qvex/lynepad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json index d88ada38945..27158173208 100644 --- a/keyboards/qwertlekeys/calice/info.json +++ b/keyboards/qwertlekeys/calice/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"1,0", "x":0.5, "y":0}, diff --git a/keyboards/qwertlekeys/calice/rules.mk b/keyboards/qwertlekeys/calice/rules.mk index cef940efac9..0334a51bb5b 100644 --- a/keyboards/qwertlekeys/calice/rules.mk +++ b/keyboards/qwertlekeys/calice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader Selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index b403e3e8e73..9f7664ea516 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x514B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_hotswap": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/qwertykeys/qk65/hotswap/rules.mk b/keyboards/qwertykeys/qk65/hotswap/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/qwertykeys/qk65/hotswap/rules.mk +++ b/keyboards/qwertykeys/qk65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 9a036d8b9b9..0e85073f59f 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x5153", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_solder": "LAYOUT_all", "LAYOUT_iso": "LAYOUT_65_iso_blocker" diff --git a/keyboards/qwertykeys/qk65/solder/rules.mk b/keyboards/qwertykeys/qk65/solder/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/qwertykeys/qk65/solder/rules.mk +++ b/keyboards/qwertykeys/qk65/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rabbit/rabbit68/info.json b/keyboards/rabbit/rabbit68/info.json index a850c3ae050..8dc29bc387d 100644 --- a/keyboards/rabbit/rabbit68/info.json +++ b/keyboards/rabbit/rabbit68/info.json @@ -8,6 +8,8 @@ "pid": "0x68F1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rabbit/rabbit68/rules.mk b/keyboards/rabbit/rabbit68/rules.mk index 57629ada151..7829a2753bb 100644 --- a/keyboards/rabbit/rabbit68/rules.mk +++ b/keyboards/rabbit/rabbit68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json index b8098c89a9b..46659d40e2e 100644 --- a/keyboards/rad/info.json +++ b/keyboards/rad/info.json @@ -6,6 +6,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rad/rules.mk b/keyboards/rad/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/rad/rules.mk +++ b/keyboards/rad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json index 5600bae870b..a92cc5d2c75 100644 --- a/keyboards/rainkeebs/delilah/info.json +++ b/keyboards/rainkeebs/delilah/info.json @@ -8,6 +8,8 @@ "pid": "0x645C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back
Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.5}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3}, {"label":"Alt", "x":2.25, "y":3}, {"label":"225", "x":3.25, "y":3, "w":2.25}, {"label":"275", "x":5.5, "y":3, "w":2.75}, {"label":"Alt", "x":9.0, "y":3}, {"label":"Win", "x":10.0, "y":3}, {"label":"Ctrl", "x":11.0, "y":3, "w":1.25}] diff --git a/keyboards/rainkeebs/delilah/rules.mk b/keyboards/rainkeebs/delilah/rules.mk index 7c928a6cbf2..c4a40815c6d 100644 --- a/keyboards/rainkeebs/delilah/rules.mk +++ b/keyboards/rainkeebs/delilah/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rainkeebs/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/info.json index b0ced909a66..34705a980a5 100644 --- a/keyboards/rainkeebs/rainkeeb/info.json +++ b/keyboards/rainkeebs/rainkeeb/info.json @@ -8,6 +8,8 @@ "pid": "0x726B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rainkeebs/rainkeeb/rules.mk b/keyboards/rainkeebs/rainkeeb/rules.mk index a4b7fca0d1d..ed4adffba93 100644 --- a/keyboards/rainkeebs/rainkeeb/rules.mk +++ b/keyboards/rainkeebs/rainkeeb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json index b1f44226f0b..ea7d8839955 100644 --- a/keyboards/rainkeebs/yasui/info.json +++ b/keyboards/rainkeebs/yasui/info.json @@ -8,6 +8,8 @@ "pid": "0x7973", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}] diff --git a/keyboards/rainkeebs/yasui/rules.mk b/keyboards/rainkeebs/yasui/rules.mk index bc14e746aa9..e9c793f741b 100644 --- a/keyboards/rainkeebs/yasui/rules.mk +++ b/keyboards/rainkeebs/yasui/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/aelith/info.json b/keyboards/ramonimbao/aelith/info.json index dd6c2c30f15..cef05569932 100644 --- a/keyboards/ramonimbao/aelith/info.json +++ b/keyboards/ramonimbao/aelith/info.json @@ -8,6 +8,8 @@ "pid": "0xE460", "device_version": "0.1.2" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/ramonimbao/aelith/rules.mk b/keyboards/ramonimbao/aelith/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/ramonimbao/aelith/rules.mk +++ b/keyboards/ramonimbao/aelith/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/chevron/info.json b/keyboards/ramonimbao/chevron/info.json index d9add91ebab..8e2c26563ae 100644 --- a/keyboards/ramonimbao/chevron/info.json +++ b/keyboards/ramonimbao/chevron/info.json @@ -8,6 +8,8 @@ "pid": "0xC4EE", "device_version": "0.1.2" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/chevron/rules.mk b/keyboards/ramonimbao/chevron/rules.mk index 6d433284364..36c6a2d0500 100644 --- a/keyboards/ramonimbao/chevron/rules.mk +++ b/keyboards/ramonimbao/chevron/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/herringbone/pro/info.json b/keyboards/ramonimbao/herringbone/pro/info.json index 3ca8db08581..3c7e7bead1b 100644 --- a/keyboards/ramonimbao/herringbone/pro/info.json +++ b/keyboards/ramonimbao/herringbone/pro/info.json @@ -8,6 +8,8 @@ "pid": "0x440B", "device_version": "0.1.2" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/herringbone/pro/rules.mk b/keyboards/ramonimbao/herringbone/pro/rules.mk index b91f11a68df..db45e4f61c5 100644 --- a/keyboards/ramonimbao/herringbone/pro/rules.mk +++ b/keyboards/ramonimbao/herringbone/pro/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/herringbone/v1/info.json b/keyboards/ramonimbao/herringbone/v1/info.json index 2bacde40156..35bdd08af29 100644 --- a/keyboards/ramonimbao/herringbone/v1/info.json +++ b/keyboards/ramonimbao/herringbone/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x04E5", "device_version": "0.1.2" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/herringbone/v1/rules.mk b/keyboards/ramonimbao/herringbone/v1/rules.mk index 9493018f5c8..18550f0a64d 100644 --- a/keyboards/ramonimbao/herringbone/v1/rules.mk +++ b/keyboards/ramonimbao/herringbone/v1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/mona/v1/info.json b/keyboards/ramonimbao/mona/v1/info.json index 05467e5dac7..6a6f8ccc0ec 100644 --- a/keyboards/ramonimbao/mona/v1/info.json +++ b/keyboards/ramonimbao/mona/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x404A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/mona/v1/rules.mk b/keyboards/ramonimbao/mona/v1/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/ramonimbao/mona/v1/rules.mk +++ b/keyboards/ramonimbao/mona/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/mona/v1_1/info.json b/keyboards/ramonimbao/mona/v1_1/info.json index b7f19f52bae..dd1909b39d1 100644 --- a/keyboards/ramonimbao/mona/v1_1/info.json +++ b/keyboards/ramonimbao/mona/v1_1/info.json @@ -8,6 +8,8 @@ "pid": "0x404B", "device_version": "0.1.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/mona/v1_1/rules.mk b/keyboards/ramonimbao/mona/v1_1/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/ramonimbao/mona/v1_1/rules.mk +++ b/keyboards/ramonimbao/mona/v1_1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/mona/v32a/info.json b/keyboards/ramonimbao/mona/v32a/info.json index b3a1332a83b..00d86414401 100644 --- a/keyboards/ramonimbao/mona/v32a/info.json +++ b/keyboards/ramonimbao/mona/v32a/info.json @@ -8,6 +8,8 @@ "pid": "0x4032", "device_version": "0.1.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/mona/v32a/rules.mk b/keyboards/ramonimbao/mona/v32a/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/ramonimbao/mona/v32a/rules.mk +++ b/keyboards/ramonimbao/mona/v32a/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/squishy65/info.json b/keyboards/ramonimbao/squishy65/info.json index 5e41ed2685f..58c41995904 100644 --- a/keyboards/ramonimbao/squishy65/info.json +++ b/keyboards/ramonimbao/squishy65/info.json @@ -8,6 +8,8 @@ "pid": "0x10B5", "device_version": "0.6.5" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/ramonimbao/squishy65/rules.mk b/keyboards/ramonimbao/squishy65/rules.mk index ac6894476f8..4eaa5819ac4 100644 --- a/keyboards/ramonimbao/squishy65/rules.mk +++ b/keyboards/ramonimbao/squishy65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/squishyfrl/info.json b/keyboards/ramonimbao/squishyfrl/info.json index d2623d0fc90..b64dbe1c462 100644 --- a/keyboards/ramonimbao/squishyfrl/info.json +++ b/keyboards/ramonimbao/squishyfrl/info.json @@ -8,6 +8,8 @@ "pid": "0x4BE5", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/squishyfrl/rules.mk b/keyboards/ramonimbao/squishyfrl/rules.mk index 30dd133d7b6..5c31520ab48 100644 --- a/keyboards/ramonimbao/squishyfrl/rules.mk +++ b/keyboards/ramonimbao/squishyfrl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/squishytkl/info.json b/keyboards/ramonimbao/squishytkl/info.json index 1f60e2bcafd..b5baf900a13 100644 --- a/keyboards/ramonimbao/squishytkl/info.json +++ b/keyboards/ramonimbao/squishytkl/info.json @@ -8,6 +8,8 @@ "pid": "0x00B1", "device_version": "1.0.0" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/squishytkl/rules.mk b/keyboards/ramonimbao/squishytkl/rules.mk index d85db040fcc..ae292c0a5af 100644 --- a/keyboards/ramonimbao/squishytkl/rules.mk +++ b/keyboards/ramonimbao/squishytkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json index 1ff3133deb4..9ad88092a3e 100644 --- a/keyboards/ramonimbao/tkl_ff/info.json +++ b/keyboards/ramonimbao/tkl_ff/info.json @@ -7,6 +7,8 @@ "vid": "0xB16B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi", "LAYOUT_iso": "LAYOUT_tkl_f13_iso" diff --git a/keyboards/ramonimbao/tkl_ff/rules.mk b/keyboards/ramonimbao/tkl_ff/rules.mk index 36c8b4137b3..abeb993a672 100644 --- a/keyboards/ramonimbao/tkl_ff/rules.mk +++ b/keyboards/ramonimbao/tkl_ff/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/wete/v1/info.json b/keyboards/ramonimbao/wete/v1/info.json index c57354bfcb6..a8446b1db94 100644 --- a/keyboards/ramonimbao/wete/v1/info.json +++ b/keyboards/ramonimbao/wete/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x00B5", "device_version": "0.1.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_rhnp": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] diff --git a/keyboards/ramonimbao/wete/v1/rules.mk b/keyboards/ramonimbao/wete/v1/rules.mk index 117c21de530..e81a5dd98ed 100644 --- a/keyboards/ramonimbao/wete/v1/rules.mk +++ b/keyboards/ramonimbao/wete/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ramonimbao/wete/v2/info.json b/keyboards/ramonimbao/wete/v2/info.json index 64f4d1afdf1..eccd2815be1 100644 --- a/keyboards/ramonimbao/wete/v2/info.json +++ b/keyboards/ramonimbao/wete/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x00B3", "device_version": "35.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/wete/v2/rules.mk b/keyboards/ramonimbao/wete/v2/rules.mk index ab62e48e5a6..7386bf69993 100644 --- a/keyboards/ramonimbao/wete/v2/rules.mk +++ b/keyboards/ramonimbao/wete/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json index e0f9986eeec..13c8c8e7040 100644 --- a/keyboards/rart/rart45/info.json +++ b/keyboards/rart/rart45/info.json @@ -8,6 +8,8 @@ "pid": "0x0045", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart45/rules.mk b/keyboards/rart/rart45/rules.mk index d1dde8af62f..ab2c49da70e 100644 --- a/keyboards/rart/rart45/rules.mk +++ b/keyboards/rart/rart45/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json index 25f44c02cca..1b01a4d2262 100644 --- a/keyboards/rart/rart4x4/info.json +++ b/keyboards/rart/rart4x4/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/rart/rart4x4/rules.mk b/keyboards/rart/rart4x4/rules.mk index b939df9dc1f..7e8534dae5a 100644 --- a/keyboards/rart/rart4x4/rules.mk +++ b/keyboards/rart/rart4x4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json index 8e6a1620f81..ea1788f669c 100644 --- a/keyboards/rart/rart67/info.json +++ b/keyboards/rart/rart67/info.json @@ -8,6 +8,8 @@ "pid": "0x0067", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart67/rules.mk b/keyboards/rart/rart67/rules.mk index e3b5ed2af1f..b483118606d 100644 --- a/keyboards/rart/rart67/rules.mk +++ b/keyboards/rart/rart67/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart67m/info.json b/keyboards/rart/rart67m/info.json index 6cfd7dcbd61..4db76f2bbb4 100644 --- a/keyboards/rart/rart67m/info.json +++ b/keyboards/rart/rart67m/info.json @@ -8,6 +8,8 @@ "pid": "0x6067", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart67m/rules.mk b/keyboards/rart/rart67m/rules.mk index 5677dc377bd..9d9090d7ea0 100644 --- a/keyboards/rart/rart67m/rules.mk +++ b/keyboards/rart/rart67m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart75/info.json b/keyboards/rart/rart75/info.json index ebb8c4044da..81781cdb7e5 100644 --- a/keyboards/rart/rart75/info.json +++ b/keyboards/rart/rart75/info.json @@ -8,6 +8,8 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75/rules.mk b/keyboards/rart/rart75/rules.mk index a5f27d5b1af..8feeffc98b9 100644 --- a/keyboards/rart/rart75/rules.mk +++ b/keyboards/rart/rart75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json index 43822f71f14..64408688049 100644 --- a/keyboards/rart/rart75hs/info.json +++ b/keyboards/rart/rart75hs/info.json @@ -8,6 +8,8 @@ "pid": "0x5575", "device_version": "0.0.3" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75hs/rules.mk b/keyboards/rart/rart75hs/rules.mk index 3a9dc7e9bc9..804d61435b6 100644 --- a/keyboards/rart/rart75hs/rules.mk +++ b/keyboards/rart/rart75hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = usbasploader - # Processor frequency F_CPU = 16000000 diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json index 5ff8da619ff..094bb55b8d0 100644 --- a/keyboards/rart/rart75m/info.json +++ b/keyboards/rart/rart75m/info.json @@ -8,6 +8,8 @@ "pid": "0x6075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75m/rules.mk b/keyboards/rart/rart75m/rules.mk index ffaadf24af2..6d03cffdfe7 100644 --- a/keyboards/rart/rart75m/rules.mk +++ b/keyboards/rart/rart75m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json index 9c6c52f33cf..f34f16be366 100644 --- a/keyboards/rart/rart80/info.json +++ b/keyboards/rart/rart80/info.json @@ -8,6 +8,8 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart80/rules.mk b/keyboards/rart/rart80/rules.mk index 4655675b629..1dfa09e016f 100644 --- a/keyboards/rart/rart80/rules.mk +++ b/keyboards/rart/rart80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = usbasploader - # Processor frequency F_CPU = 16000000 diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json index 8faf60cf01e..621d7b61bf5 100644 --- a/keyboards/rart/rartand/info.json +++ b/keyboards/rart/rartand/info.json @@ -8,6 +8,8 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk index 1bef27aa8a0..b9cc25d86e2 100644 --- a/keyboards/rart/rartand/rules.mk +++ b/keyboards/rart/rartand/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json index 5fb569d60aa..67e77b90c4e 100644 --- a/keyboards/rart/rartland/info.json +++ b/keyboards/rart/rartland/info.json @@ -8,6 +8,8 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk index e4a1dcaeab2..06d9ea1b916 100644 --- a/keyboards/rart/rartland/rules.mk +++ b/keyboards/rart/rartland/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json index d5e8802ee6f..3e06116c802 100644 --- a/keyboards/rart/rartlice/info.json +++ b/keyboards/rart/rartlice/info.json @@ -8,6 +8,8 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk index e46ca1a40e2..2be366363a7 100644 --- a/keyboards/rart/rartlice/rules.mk +++ b/keyboards/rart/rartlice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json index 6403eca743f..44a535aac5f 100644 --- a/keyboards/rart/rartlite/info.json +++ b/keyboards/rart/rartlite/info.json @@ -8,6 +8,8 @@ "pid": "0x4040", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_right_numpad": { "layout": [ diff --git a/keyboards/rart/rartlite/rules.mk b/keyboards/rart/rartlite/rules.mk index 1145bd5a437..6d3709762d5 100644 --- a/keyboards/rart/rartlite/rules.mk +++ b/keyboards/rart/rartlite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json index 38742f3faec..bf1b231544d 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/info.json @@ -8,6 +8,8 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/rart/rartpad/rules.mk b/keyboards/rart/rartpad/rules.mk index 6557114ea6c..8c692a7b560 100644 --- a/keyboards/rart/rartpad/rules.mk +++ b/keyboards/rart/rartpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json index 7f9e92e484d..109e2fa50c6 100644 --- a/keyboards/rate/pistachio/info.json +++ b/keyboards/rate/pistachio/info.json @@ -8,6 +8,8 @@ "pid": "0xD0C2", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"ESC", "x":1.25, "y":0.25}, diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk index 909b1e68de1..dda6154e66d 100644 --- a/keyboards/rate/pistachio/rev1/rules.mk +++ b/keyboards/rate/pistachio/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk index 909b1e68de1..dda6154e66d 100644 --- a/keyboards/rate/pistachio/rev2/rules.mk +++ b/keyboards/rate/pistachio/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index 52c754186fc..e0ad3440a3f 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -8,6 +8,8 @@ "pid": "0xE212", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rate/pistachio_mp/rules.mk b/keyboards/rate/pistachio_mp/rules.mk index 424aed9074b..c5c4d8f35f1 100644 --- a/keyboards/rate/pistachio_mp/rules.mk +++ b/keyboards/rate/pistachio_mp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json index e762f30b697..9a212a859be 100644 --- a/keyboards/rate/pistachio_pro/info.json +++ b/keyboards/rate/pistachio_pro/info.json @@ -8,6 +8,8 @@ "pid": "0xF40C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rate/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk index 6816d8d32be..df27be46be3 100644 --- a/keyboards/rate/pistachio_pro/rules.mk +++ b/keyboards/rate/pistachio_pro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json index 8616062b726..19d6371b48e 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Delete", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Insert", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Win", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk b/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk index 88173a40c20..a927de843cb 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json index ec846e517c6..5858f68abce 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/info.json +++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Back", "x":14, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Insert", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Nuhs", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Nubs", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Win", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/rationalist/ratio65_solder/rev_a/rules.mk b/keyboards/rationalist/ratio65_solder/rev_a/rules.mk index 88173a40c20..a927de843cb 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/rules.mk +++ b/keyboards/rationalist/ratio65_solder/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/recompile_keys/choco60/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk index ff16426c32a..b74db0a672b 100644 --- a/keyboards/recompile_keys/choco60/rev1/rules.mk +++ b/keyboards/recompile_keys/choco60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json new file mode 100644 index 00000000000..dd190d18ee0 --- /dev/null +++ b/keyboards/recompile_keys/choco60/rev2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk index f8bad8e08ee..ca4dbbab2fa 100644 --- a/keyboards/recompile_keys/choco60/rev2/rules.mk +++ b/keyboards/recompile_keys/choco60/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json index dca5750161b..6a666055f7f 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/info.json @@ -8,6 +8,8 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7.25, "y":0}, {"label":"U", "x":8.25, "y":0}, {"label":"I", "x":9.25, "y":0}, {"label":"O", "x":10.25, "y":0}, {"label":"P", "x":11.25, "y":0}, {"label":"{", "x":12.25, "y":0}, {"label":"}", "x":13.25, "y":0}, {"label":"Back
Space", "x":14.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":7.5, "y":1}, {"label":"J", "x":8.5, "y":1}, {"label":"K", "x":9.5, "y":1}, {"label":"L", "x":10.5, "y":1}, {"label":":", "x":11.5, "y":1}, {"label":"\"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":8, "y":2}, {"label":"M", "x":9, "y":2}, {"label":"<", "x":10, "y":2}, {"label":">", "x":11, "y":2}, {"label":"?", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"Fn", "x":14.25, "y":2}, {"label":"Opt", "x":1.5, "y":3}, {"label":"Command", "x":2.5, "y":3, "w":1.5}, {"label":"", "x":4, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"Command", "x":10.25, "y":3, "w":1.5}, {"label":"Opt", "x":11.75, "y":3}] diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk index 3ef3128f4ba..10e75fed2e2 100644 --- a/keyboards/recompile_keys/cocoa40/rules.mk +++ b/keyboards/recompile_keys/cocoa40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json index 6c82236727b..75235731593 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/info.json @@ -8,6 +8,8 @@ "pid": "0x4D41", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/recompile_keys/mio/rules.mk b/keyboards/recompile_keys/mio/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/recompile_keys/mio/rules.mk +++ b/keyboards/recompile_keys/mio/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/nomu30/rev1/info.json b/keyboards/recompile_keys/nomu30/rev1/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/recompile_keys/nomu30/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/recompile_keys/nomu30/rev1/rules.mk b/keyboards/recompile_keys/nomu30/rev1/rules.mk index df6d769aec7..e29387316f7 100644 --- a/keyboards/recompile_keys/nomu30/rev1/rules.mk +++ b/keyboards/recompile_keys/nomu30/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/nomu30/rev2/info.json b/keyboards/recompile_keys/nomu30/rev2/info.json new file mode 100644 index 00000000000..dd190d18ee0 --- /dev/null +++ b/keyboards/recompile_keys/nomu30/rev2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/recompile_keys/nomu30/rev2/rules.mk b/keyboards/recompile_keys/nomu30/rev2/rules.mk index eca6e85311a..c3de5dd6e58 100644 --- a/keyboards/recompile_keys/nomu30/rev2/rules.mk +++ b/keyboards/recompile_keys/nomu30/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json index 857df635d9f..2bb04a7f8bb 100644 --- a/keyboards/rect44/info.json +++ b/keyboards/rect44/info.json @@ -8,6 +8,8 @@ "pid": "0x4DD7", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rect44/rules.mk b/keyboards/rect44/rules.mk index 7d2cea91dfe..aa4c817d2a2 100644 --- a/keyboards/rect44/rules.mk +++ b/keyboards/rect44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index ad889c23048..34566b32e81 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 62a27157ad5..4f6bae6891f 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "1.0.1" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/redox/rev1/proton_c/rules.mk b/keyboards/redox/rev1/proton_c/rules.mk index 829c8365efa..d45b778a1a8 100644 --- a/keyboards/redox/rev1/proton_c/rules.mk +++ b/keyboards/redox/rev1/proton_c/rules.mk @@ -1,7 +1,2 @@ -# Proton C -MCU = STM32F303 -BOARD = QMK_PROTON_C -BOOTLOADER = stm32-dfu - # specific to using the serial serial driver SERIAL_DRIVER = usart diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk index 181027c417c..29ad3b9404e 100644 --- a/keyboards/redox/rules.mk +++ b/keyboards/redox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json index ac2480c997f..ed5afdab5e0 100644 --- a/keyboards/redox_media/info.json +++ b/keyboards/redox_media/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk index da72e5beade..786e3ac0293 100644 --- a/keyboards/redox_media/rules.mk +++ b/keyboards/redox_media/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/redox_w/info.json b/keyboards/redox_w/info.json index b91fec5a502..13e2bb32833 100644 --- a/keyboards/redox_w/info.json +++ b/keyboards/redox_w/info.json @@ -8,6 +8,8 @@ "pid": "0x5257", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk index 8cb17361471..32eca4db314 100644 --- a/keyboards/redox_w/rules.mk +++ b/keyboards/redox_w/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/info.json index ca4cd363cd5..1f508df3f56 100644 --- a/keyboards/redscarf_i/info.json +++ b/keyboards/redscarf_i/info.json @@ -8,6 +8,8 @@ "pid": "0x5959", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "ortho_6x4", "numpad_5x4", "numpad_6x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/redscarf_i/rules.mk b/keyboards/redscarf_i/rules.mk index 33b546af946..887d6344d73 100644 --- a/keyboards/redscarf_i/rules.mk +++ b/keyboards/redscarf_i/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json index 2e4ad618660..45096a152fc 100644 --- a/keyboards/redscarf_iiplus/verb/info.json +++ b/keyboards/redscarf_iiplus/verb/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_78_ansi": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.25, "y":1, "w":1.5}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.25, "y":2, "w":1.75}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2, "w":2.25}, {"x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.25, "y":3, "w":2.25}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3, "w":1.75}, {"x":16.25, "y":3}, {"x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":1.25}, {"x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"x":12.25, "y":4}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}] diff --git a/keyboards/redscarf_iiplus/verb/rules.mk b/keyboards/redscarf_iiplus/verb/rules.mk index 57075926c7a..73a2fe6487b 100755 --- a/keyboards/redscarf_iiplus/verb/rules.mk +++ b/keyboards/redscarf_iiplus/verb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json index 92535ce303f..0a951ade69c 100644 --- a/keyboards/redscarf_iiplus/verc/info.json +++ b/keyboards/redscarf_iiplus/verc/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/redscarf_iiplus/verc/rules.mk b/keyboards/redscarf_iiplus/verc/rules.mk index 57075926c7a..73a2fe6487b 100755 --- a/keyboards/redscarf_iiplus/verc/rules.mk +++ b/keyboards/redscarf_iiplus/verc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/redscarf_iiplus/verd/info.json b/keyboards/redscarf_iiplus/verd/info.json index 0d365422786..33d210a4f63 100644 --- a/keyboards/redscarf_iiplus/verd/info.json +++ b/keyboards/redscarf_iiplus/verd/info.json @@ -8,6 +8,8 @@ "pid": "0x7778", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_60_ansi_numpad_split0": { "layout": [ diff --git a/keyboards/redscarf_iiplus/verd/rules.mk b/keyboards/redscarf_iiplus/verd/rules.mk index 8ae7cef9e2b..4164035629a 100644 --- a/keyboards/redscarf_iiplus/verd/rules.mk +++ b/keyboards/redscarf_iiplus/verd/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json index 69dd3a89d7c..95a09b613d1 100644 --- a/keyboards/retro_75/info.json +++ b/keyboards/retro_75/info.json @@ -8,6 +8,8 @@ "pid": "0x5275", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"Prt Sc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"Fn", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":7}, {"label":"Alt", "x":10.75, "y":5.25, "w":1.5}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] diff --git a/keyboards/retro_75/rules.mk b/keyboards/retro_75/rules.mk index f83c2b86bfe..ac809dd9ede 100644 --- a/keyboards/retro_75/rules.mk +++ b/keyboards/retro_75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json index 5824f09885b..ef3d026c641 100644 --- a/keyboards/reversestudio/decadepad/info.json +++ b/keyboards/reversestudio/decadepad/info.json @@ -8,6 +8,8 @@ "pid": "0x4450", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/reversestudio/decadepad/rules.mk b/keyboards/reversestudio/decadepad/rules.mk index 4ce63765af5..6019f36e418 100644 --- a/keyboards/reversestudio/decadepad/rules.mk +++ b/keyboards/reversestudio/decadepad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json index af7584eee07..32097d284d7 100644 --- a/keyboards/reviung/reviung33/info.json +++ b/keyboards/reviung/reviung33/info.json @@ -8,6 +8,8 @@ "pid": "0x516D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_reviung33": "LAYOUT" }, diff --git a/keyboards/reviung/reviung33/rules.mk b/keyboards/reviung/reviung33/rules.mk index 77a2d1ee7d7..ff287d5235b 100644 --- a/keyboards/reviung/reviung33/rules.mk +++ b/keyboards/reviung/reviung33/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/info.json index c11eef91b1d..8699ea8b846 100755 --- a/keyboards/reviung/reviung34/info.json +++ b/keyboards/reviung/reviung34/info.json @@ -8,6 +8,8 @@ "pid": "0x4E03", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": [ "split_3x5_2" ], diff --git a/keyboards/reviung/reviung34/rules.mk b/keyboards/reviung/reviung34/rules.mk index 203f9645e5e..7829a2753bb 100755 --- a/keyboards/reviung/reviung34/rules.mk +++ b/keyboards/reviung/reviung34/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung39/info.json b/keyboards/reviung/reviung39/info.json index 1bd626f2028..3ad398f2e7c 100644 --- a/keyboards/reviung/reviung39/info.json +++ b/keyboards/reviung/reviung39/info.json @@ -8,6 +8,8 @@ "pid": "0x5F10", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_reviung39": "LAYOUT" }, diff --git a/keyboards/reviung/reviung39/rules.mk b/keyboards/reviung/reviung39/rules.mk index 203f9645e5e..7829a2753bb 100644 --- a/keyboards/reviung/reviung39/rules.mk +++ b/keyboards/reviung/reviung39/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json index 6ee7b0c108b..b7fea0f89f3 100644 --- a/keyboards/reviung/reviung41/info.json +++ b/keyboards/reviung/reviung41/info.json @@ -8,6 +8,8 @@ "pid": "0xDCCB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_reviung41": "LAYOUT" }, diff --git a/keyboards/reviung/reviung41/rules.mk b/keyboards/reviung/reviung41/rules.mk index e4e00e62741..4465ace1727 100644 --- a/keyboards/reviung/reviung41/rules.mk +++ b/keyboards/reviung/reviung41/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json index d804be4a869..8422e881172 100644 --- a/keyboards/reviung/reviung5/info.json +++ b/keyboards/reviung/reviung5/info.json @@ -8,6 +8,8 @@ "pid": "0x4F0D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_reviung5": "LAYOUT" }, diff --git a/keyboards/reviung/reviung5/rules.mk b/keyboards/reviung/reviung5/rules.mk index a72c1193153..5d71c286faf 100644 --- a/keyboards/reviung/reviung5/rules.mk +++ b/keyboards/reviung/reviung5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json index c8cec6578e3..86e4d054a1f 100644 --- a/keyboards/reviung/reviung53/info.json +++ b/keyboards/reviung/reviung53/info.json @@ -8,6 +8,8 @@ "pid": "0x4E09", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_reviung53": "LAYOUT" }, diff --git a/keyboards/reviung/reviung53/rules.mk b/keyboards/reviung/reviung53/rules.mk index bc1c6f2dc0c..a927de843cb 100644 --- a/keyboards/reviung/reviung53/rules.mk +++ b/keyboards/reviung/reviung53/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/reviung/reviung61/info.json b/keyboards/reviung/reviung61/info.json index a1bf103f558..5bb430d6a10 100644 --- a/keyboards/reviung/reviung61/info.json +++ b/keyboards/reviung/reviung61/info.json @@ -8,6 +8,8 @@ "pid": "0x7C1A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/reviung/reviung61/rules.mk b/keyboards/reviung/reviung61/rules.mk index 23e7470839c..ad81ce036a2 100644 --- a/keyboards/reviung/reviung61/rules.mk +++ b/keyboards/reviung/reviung61/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index 8b16bd4542b..3e672b26eb8 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3505", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index 7670e0ee452..0958dd21307 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Touch encoder needs VPATH += keyboards/rgbkb/common SRC += touch_encoder.c diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json new file mode 100644 index 00000000000..32a75ca0fcb --- /dev/null +++ b/keyboards/rgbkb/pan/rev1/32a/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32a", + "bootloader": "usbasploader" +} diff --git a/keyboards/rgbkb/pan/rev1/32a/rules.mk b/keyboards/rgbkb/pan/rev1/32a/rules.mk index b6959807301..c2ee0bc86f9 100644 --- a/keyboards/rgbkb/pan/rev1/32a/rules.mk +++ b/keyboards/rgbkb/pan/rev1/32a/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 - -# Bootloader selection -BOOTLOADER = usbasploader diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json new file mode 100644 index 00000000000..c06ffbaf069 --- /dev/null +++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" +} diff --git a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk index 7a846816d1b..e69de29bb2d 100644 --- a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk +++ b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index 2a611f7a6ac..6b886f1b9c6 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index bd1bba3d727..39bfa715bf9 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk index 762b5fa8918..2cacb68825d 100644 --- a/keyboards/rgbkb/sol/rules.mk +++ b/keyboards/rgbkb/sol/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Custom local font file OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index b8a8e5015ac..b2dddbd8d8a 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3510", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index de9f7185cf8..f761d71be24 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Touch encoder needs VPATH += keyboards/rgbkb/common SRC += touch_encoder.c diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json index cdd6497139d..93a085135f5 100644 --- a/keyboards/rgbkb/zen/rev1/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "y":0}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}] diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json index 3c80032407f..f28b9f4d224 100644 --- a/keyboards/rgbkb/zen/rev2/info.json +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x3061", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index 84a2d08ff0d..3c692c76fce 100644 --- a/keyboards/rgbkb/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index 446ca55dd41..e33354d7f95 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk index 454bb8e79c8..e926ec76411 100644 --- a/keyboards/rgbkb/zygomorph/rules.mk +++ b/keyboards/rgbkb/zygomorph/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json index a409f9339b5..3425dc03e6f 100644 --- a/keyboards/ristretto/info.json +++ b/keyboards/ristretto/info.json @@ -8,6 +8,8 @@ "pid": "0x7273", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk index 2a4cebb610d..cb202f5b9b1 100644 --- a/keyboards/ristretto/rules.mk +++ b/keyboards/ristretto/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json index f29edf66960..b5638b1829c 100644 --- a/keyboards/rmkeebs/rm_numpad/info.json +++ b/keyboards/rmkeebs/rm_numpad/info.json @@ -8,6 +8,8 @@ "pid": "0x524E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/rmkeebs/rm_numpad/rules.mk b/keyboards/rmkeebs/rm_numpad/rules.mk index ef216b37004..f024adf5c48 100644 --- a/keyboards/rmkeebs/rm_numpad/rules.mk +++ b/keyboards/rmkeebs/rm_numpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json index 1b4ec3c9432..8421147017b 100644 --- a/keyboards/rominronin/katana60/rev1/info.json +++ b/keyboards/rominronin/katana60/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0C2C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rominronin/katana60/rev1/rules.mk b/keyboards/rominronin/katana60/rev1/rules.mk index 354f194ca23..309e55c9f4c 100644 --- a/keyboards/rominronin/katana60/rev1/rules.mk +++ b/keyboards/rominronin/katana60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json index 3b26ff635e3..a036d85384e 100644 --- a/keyboards/rominronin/katana60/rev2/info.json +++ b/keyboards/rominronin/katana60/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0xF03B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_7u_a": { "layout": [ diff --git a/keyboards/rominronin/katana60/rev2/rules.mk b/keyboards/rominronin/katana60/rev2/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/rominronin/katana60/rev2/rules.mk +++ b/keyboards/rominronin/katana60/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/roseslite/info.json b/keyboards/roseslite/info.json index 0ecc988464d..81572eac9f2 100644 --- a/keyboards/roseslite/info.json +++ b/keyboards/roseslite/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/roseslite/rules.mk b/keyboards/roseslite/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/roseslite/rules.mk +++ b/keyboards/roseslite/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rotor/info.json b/keyboards/rotor/info.json index 455a7b3f608..4be09da18a2 100644 --- a/keyboards/rotor/info.json +++ b/keyboards/rotor/info.json @@ -8,6 +8,8 @@ "pid": "0xE8BE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Home", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"label":"7u", "x":6.25, "y":4, "w":7}, {"label":"Ctrl", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/rotor/rules.mk b/keyboards/rotor/rules.mk index 30e86c01902..6ff9b4e02ba 100644 --- a/keyboards/rotor/rules.mk +++ b/keyboards/rotor/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json index a621150f6b9..2bc5e96058e 100644 --- a/keyboards/rotr/info.json +++ b/keyboards/rotr/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}] diff --git a/keyboards/rotr/rules.mk b/keyboards/rotr/rules.mk index 7d803d97f5d..ba4c520f3a7 100644 --- a/keyboards/rotr/rules.mk +++ b/keyboards/rotr/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json index fb8e6789da5..5e206811a64 100644 --- a/keyboards/rpiguy9907/southpaw66/info.json +++ b/keyboards/rpiguy9907/southpaw66/info.json @@ -8,6 +8,8 @@ "pid": "0x5366", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { diff --git a/keyboards/rpiguy9907/southpaw66/rules.mk b/keyboards/rpiguy9907/southpaw66/rules.mk index afb39759e73..f5b61e673cf 100644 --- a/keyboards/rpiguy9907/southpaw66/rules.mk +++ b/keyboards/rpiguy9907/southpaw66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/rubi/info.json b/keyboards/rubi/info.json index 95d77d5204a..b8ad9447921 100644 --- a/keyboards/rubi/info.json +++ b/keyboards/rubi/info.json @@ -8,6 +8,8 @@ "pid": "0x5242", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rubi/rules.mk b/keyboards/rubi/rules.mk index bcb43c3c378..e2279a08a6c 100644 --- a/keyboards/rubi/rules.mk +++ b/keyboards/rubi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/runes/skjoldr/info.json b/keyboards/runes/skjoldr/info.json index 5f28e63ec6d..0560b512c42 100644 --- a/keyboards/runes/skjoldr/info.json +++ b/keyboards/runes/skjoldr/info.json @@ -8,6 +8,8 @@ "pid": "0x736B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi_arrow" }, diff --git a/keyboards/runes/skjoldr/rules.mk b/keyboards/runes/skjoldr/rules.mk index 286d30d6786..2957d6980d8 100644 --- a/keyboards/runes/skjoldr/rules.mk +++ b/keyboards/runes/skjoldr/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json index 3c5d4e2b86a..a96ade853c6 100644 --- a/keyboards/runes/vaengr/info.json +++ b/keyboards/runes/vaengr/info.json @@ -8,6 +8,8 @@ "pid": "0x7661", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/runes/vaengr/rules.mk b/keyboards/runes/vaengr/rules.mk index 533eacc989c..4ae26a099a5 100644 --- a/keyboards/runes/vaengr/rules.mk +++ b/keyboards/runes/vaengr/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json index bfa85a0eea6..a76f186a2e9 100644 --- a/keyboards/rura66/rev1/info.json +++ b/keyboards/rura66/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0200", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk index 6a67c6ed634..41795ddcb41 100644 --- a/keyboards/rura66/rules.mk +++ b/keyboards/rura66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/info.json index d368ceb9c3c..85c7fcafa65 100644 --- a/keyboards/ryanbaekr/rb1/info.json +++ b/keyboards/ryanbaekr/rb1/info.json @@ -10,6 +10,8 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json index 09bdc0c47e6..1111ff0bfad 100644 --- a/keyboards/ryanbaekr/rb18/info.json +++ b/keyboards/ryanbaekr/rb18/info.json @@ -10,6 +10,8 @@ "pid": "0x0018", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json index fdee9e51004..ddb71149e91 100644 --- a/keyboards/ryanbaekr/rb69/info.json +++ b/keyboards/ryanbaekr/rb69/info.json @@ -10,6 +10,8 @@ "pid": "0x0069", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.25, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.5}, {"x":15.25, "y":4.25}, {"x":14, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}] diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json index 30f05e83610..7d76d597817 100644 --- a/keyboards/ryanbaekr/rb86/info.json +++ b/keyboards/ryanbaekr/rb86/info.json @@ -10,6 +10,8 @@ "pid": "0x0086", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT_numpad_6x17": "LAYOUT" }, diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json index 20360fb8613..5bf34ad5e64 100644 --- a/keyboards/ryanskidmore/rskeys100/info.json +++ b/keyboards/ryanskidmore/rskeys100/info.json @@ -6,6 +6,8 @@ "pid": "0x0064", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "url": "", "maintainer": "ryanskidmore", "community_layouts": ["fullsize_iso"], diff --git a/keyboards/ryanskidmore/rskeys100/rules.mk b/keyboards/ryanskidmore/rskeys100/rules.mk index 769b7eef014..fe929e6ad6e 100644 --- a/keyboards/ryanskidmore/rskeys100/rules.mk +++ b/keyboards/ryanskidmore/rskeys100/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json index 691033e184e..28eec374d9a 100644 --- a/keyboards/ryloo_studio/m0110/info.json +++ b/keyboards/ryloo_studio/m0110/info.json @@ -8,6 +8,8 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb"], "layouts": { "LAYOUT": { diff --git a/keyboards/ryloo_studio/m0110/rules.mk b/keyboards/ryloo_studio/m0110/rules.mk index b27013f8630..3d5cb57ad50 100755 --- a/keyboards/ryloo_studio/m0110/rules.mk +++ b/keyboards/ryloo_studio/m0110/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json index 06d5a47e9ad..decf0ae1cb2 100644 --- a/keyboards/s_ol/0xc_pad/info.json +++ b/keyboards/s_ol/0xc_pad/info.json @@ -28,5 +28,7 @@ "vid": "0x732D", "pid": "0x0C70", "device_version": "0.0.1" - } + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu" } diff --git a/keyboards/s_ol/0xc_pad/rules.mk b/keyboards/s_ol/0xc_pad/rules.mk index 1322621d85a..d17272fe99f 100644 --- a/keyboards/s_ol/0xc_pad/rules.mk +++ b/keyboards/s_ol/0xc_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index 7bd508ed7f6..5627a14367d 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEB5F", "device_version": "0.0.7" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk index dc0a7dfb497..171b119b34d 100644 --- a/keyboards/salicylic_acid3/7skb/rules.mk +++ b/keyboards/salicylic_acid3/7skb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index aa70fe150a5..2ad447bc9f3 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -8,6 +8,8 @@ "pid": "0xEAE7", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk index b0a2799e4b9..124c57ba15a 100644 --- a/keyboards/salicylic_acid3/7splus/rules.mk +++ b/keyboards/salicylic_acid3/7splus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index c0e5c2b5c06..f1164b66b04 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -8,6 +8,8 @@ "pid": "0xEB54", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk index 8f9772df22e..8ea05b5f74a 100644 --- a/keyboards/salicylic_acid3/ajisai74/rules.mk +++ b/keyboards/salicylic_acid3/ajisai74/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 2c741c21e9b..fccfe217aff 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -8,6 +8,8 @@ "pid": "0xEA54", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk index aba3644c9ed..a876de5b539 100644 --- a/keyboards/salicylic_acid3/ergoarrows/rules.mk +++ b/keyboards/salicylic_acid3/ergoarrows/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index 23354552ea3..74435407049 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.1.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk index 977ef5bb1d3..dae9b6ae3bd 100644 --- a/keyboards/salicylic_acid3/getta25/rules.mk +++ b/keyboards/salicylic_acid3/getta25/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index 1279d2475e6..527d2544e7e 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEB4F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk index a6a85106751..a496323b5d3 100644 --- a/keyboards/salicylic_acid3/jisplit89/rules.mk +++ b/keyboards/salicylic_acid3/jisplit89/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index 822ee9e0a16..05cf322ccf7 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.1.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/nafuda/rules.mk b/keyboards/salicylic_acid3/nafuda/rules.mk index e9d90e7ad83..84e129e63b9 100644 --- a/keyboards/salicylic_acid3/nafuda/rules.mk +++ b/keyboards/salicylic_acid3/nafuda/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index fd4639c5ccd..154b2587138 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xE8BA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk index 0e297ebf600..956ae2cefcc 100644 --- a/keyboards/salicylic_acid3/naked48/rules.mk +++ b/keyboards/salicylic_acid3/naked48/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json index 30b1def9aa8..a40a2f8814c 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/info.json +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEB5C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk index 1aefc7b5953..e4bce8739b7 100644 --- a/keyboards/salicylic_acid3/naked60/rules.mk +++ b/keyboards/salicylic_acid3/naked60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json index c8fe578271b..b3119d2d465 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk index db027e3bda5..70e97d797de 100644 --- a/keyboards/salicylic_acid3/naked64/rules.mk +++ b/keyboards/salicylic_acid3/naked64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index 6c94b5deb69..a8c64be5831 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -8,6 +8,8 @@ "pid": "0xEA56", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk index aba3644c9ed..a876de5b539 100644 --- a/keyboards/salicylic_acid3/nknl7en/rules.mk +++ b/keyboards/salicylic_acid3/nknl7en/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index 1750c19dba7..8cddd5b0608 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -8,6 +8,8 @@ "pid": "0xEA55", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk index aba3644c9ed..a876de5b539 100644 --- a/keyboards/salicylic_acid3/nknl7jp/rules.mk +++ b/keyboards/salicylic_acid3/nknl7jp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index e9b05216769..a798c25e634 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.1.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk index dfe0d967600..ee8bd4cc407 100644 --- a/keyboards/salicylic_acid3/setta21/rules.mk +++ b/keyboards/salicylic_acid3/setta21/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index 6dd583ddd6e..39de786a79b 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -8,6 +8,8 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sam/s80/rules.mk b/keyboards/sam/s80/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/sam/s80/rules.mk +++ b/keyboards/sam/s80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json index 59561a84f30..0747be06572 100644 --- a/keyboards/sam/sg81m/info.json +++ b/keyboards/sam/sg81m/info.json @@ -8,6 +8,8 @@ "pid": "0x3831", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_7u_space": { "layout": [ diff --git a/keyboards/sam/sg81m/rules.mk b/keyboards/sam/sg81m/rules.mk index b860eb13326..2626cca9293 100644 --- a/keyboards/sam/sg81m/rules.mk +++ b/keyboards/sam/sg81m/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/info.json index 9b363e32d31..3c0814074e5 100644 --- a/keyboards/sanctified/dystopia/info.json +++ b/keyboards/sanctified/dystopia/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_bs": { "layout": [ diff --git a/keyboards/sanctified/dystopia/rules.mk b/keyboards/sanctified/dystopia/rules.mk index a8cbede7cd1..8b4206fb269 100644 --- a/keyboards/sanctified/dystopia/rules.mk +++ b/keyboards/sanctified/dystopia/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json index 5a1ff761ad5..f8c50fbd106 100644 --- a/keyboards/sandwich/keeb68/info.json +++ b/keyboards/sandwich/keeb68/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/sandwich/keeb68/rules.mk b/keyboards/sandwich/keeb68/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/sandwich/keeb68/rules.mk +++ b/keyboards/sandwich/keeb68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/info.json index be71dedb394..fd47ad9924f 100644 --- a/keyboards/satt/comet46/info.json +++ b/keyboards/satt/comet46/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk index 83f7d905e92..687d594ecbf 100644 --- a/keyboards/satt/comet46/rules.mk +++ b/keyboards/satt/comet46/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/satt/vision/info.json b/keyboards/satt/vision/info.json index bb32359aac3..fcca710f19b 100644 --- a/keyboards/satt/vision/info.json +++ b/keyboards/satt/vision/info.json @@ -8,6 +8,8 @@ "pid": "0x5649", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"PgUp", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"Q", "x":2.25, "y":0}, {"label":"W", "x":3.25, "y":0}, {"label":"E", "x":4.25, "y":0}, {"label":"R", "x":5.25, "y":0}, {"label":"T", "x":6.25, "y":0}, {"label":"Y", "x":9, "y":0}, {"label":"U", "x":10, "y":0}, {"label":"I", "x":11, "y":0}, {"label":"O", "x":12, "y":0}, {"label":"P", "x":13, "y":0}, {"label":"Back", "x":14, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"PgDn", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.25}, {"label":"A", "x":2.5, "y":1}, {"label":"S", "x":3.5, "y":1}, {"label":"D", "x":4.5, "y":1}, {"label":"F", "x":5.5, "y":1}, {"label":"G", "x":6.5, "y":1}, {"label":"H", "x":9.25, "y":1}, {"label":"J", "x":10.25, "y":1}, {"label":"K", "x":11.25, "y":1}, {"label":"L", "x":12.25, "y":1}, {"label":":", "x":13.25, "y":1}, {"label":"\"", "x":14.25, "y":1, "w":1.75}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.75, "y":2}, {"label":"N", "x":9.75, "y":2}, {"label":"M", "x":10.75, "y":2}, {"label":"<", "x":11.75, "y":2}, {"label":">", "x":12.75, "y":2}, {"label":"?", "x":13.75, "y":2, "w":1.25}, {"label":"Adjust", "x":15, "y":2}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":3.75, "y":3, "w":1.5}, {"label":"Lower", "x":5.25, "y":3, "w":2}, {"x":7.25, "y":3}, {"label":"Raise", "x":8.75, "y":3, "w":1.75}, {"label":"Enter", "x":10.5, "y":3}, {"label":"Alt", "x":11.5, "y":3, "w":1.5}, {"label":"Ctrl", "x":14.5, "y":3, "w":1.5}] diff --git a/keyboards/satt/vision/rules.mk b/keyboards/satt/vision/rules.mk index fd449807869..0aeca0dd9f3 100644 --- a/keyboards/satt/vision/rules.mk +++ b/keyboards/satt/vision/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sauce/mild/info.json b/keyboards/sauce/mild/info.json index 6893180ab80..623a75dbc0b 100644 --- a/keyboards/sauce/mild/info.json +++ b/keyboards/sauce/mild/info.json @@ -8,6 +8,8 @@ "pid": "0x7783", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sauce/mild/rules.mk b/keyboards/sauce/mild/rules.mk index 0f154047e9e..eed469b44e8 100644 --- a/keyboards/sauce/mild/rules.mk +++ b/keyboards/sauce/mild/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json index a04fa2f716e..dabfc538f8a 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -8,6 +8,8 @@ "pid": "0xA801", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/amber80/solder/rules.mk b/keyboards/sawnsprojects/amber80/solder/rules.mk index 4613b7d460e..97c1694c811 100644 --- a/keyboards/sawnsprojects/amber80/solder/rules.mk +++ b/keyboards/sawnsprojects/amber80/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index fbad1431334..36ff901d04b 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x6B32", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs", "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan" diff --git a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk b/keyboards/sawnsprojects/krush/krush60/solder/rules.mk index 1c1fc0aec88..c6d01d3079b 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk +++ b/keyboards/sawnsprojects/krush/krush60/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index b70ecd9ddd5..1e60b0743b6 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x5B31", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk b/keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk index c754f3f5d00..27132e67478 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index 378c60a4363..cabe5177240 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x6B31", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs_sp" }, diff --git a/keyboards/sawnsprojects/krush/krush65/solder/rules.mk b/keyboards/sawnsprojects/krush/krush65/solder/rules.mk index f8d2982152a..cb7ca38b803 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/rules.mk +++ b/keyboards/sawnsprojects/krush/krush65/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index a158fff7d26..50c304dda25 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -8,6 +8,8 @@ "pid": "0x0727", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/satxri6key/rules.mk b/keyboards/sawnsprojects/satxri6key/rules.mk index a2b29b5ae53..1dfb86ae3c3 100644 --- a/keyboards/sawnsprojects/satxri6key/rules.mk +++ b/keyboards/sawnsprojects/satxri6key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json index 982a09d9538..aa5c326c7d2 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/info.json @@ -8,6 +8,8 @@ "pid": "0x1727", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/vcl65/solder/rules.mk b/keyboards/sawnsprojects/vcl65/solder/rules.mk index 538e0d1bda1..fde71474dc9 100644 --- a/keyboards/sawnsprojects/vcl65/solder/rules.mk +++ b/keyboards/sawnsprojects/vcl65/solder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json index c30750c7c24..b7850d2f0a9 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/info.json @@ -8,6 +8,8 @@ "pid": "0x3B47", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/scatter42/rules.mk b/keyboards/scatter42/rules.mk index 3e7f833dc56..db5c82928c7 100644 --- a/keyboards/scatter42/rules.mk +++ b/keyboards/scatter42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json index 4da024cd448..12ad6c917cf 100644 --- a/keyboards/sck/gtm/info.json +++ b/keyboards/sck/gtm/info.json @@ -8,6 +8,8 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sck/gtm/rules.mk b/keyboards/sck/gtm/rules.mk index 756963d95da..54bef062d85 100644 --- a/keyboards/sck/gtm/rules.mk +++ b/keyboards/sck/gtm/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json index df77370b8be..5180511a9da 100644 --- a/keyboards/sck/m0116b/info.json +++ b/keyboards/sck/m0116b/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_m0116_ansi": { "layout": [ diff --git a/keyboards/sck/m0116b/rules.mk b/keyboards/sck/m0116b/rules.mk index 73ac281e0b4..5356b24d77c 100644 --- a/keyboards/sck/m0116b/rules.mk +++ b/keyboards/sck/m0116b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json index 4303e588575..3140669af58 100644 --- a/keyboards/sck/neiso/info.json +++ b/keyboards/sck/neiso/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}] diff --git a/keyboards/sck/neiso/rules.mk b/keyboards/sck/neiso/rules.mk index f95b846883c..d87b40c0b2c 100644 --- a/keyboards/sck/neiso/rules.mk +++ b/keyboards/sck/neiso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index 49e83606cb2..dafee91cd20 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_default_ansi": { diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 95d881012b9..2b56e4df774 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json index 55db0571f74..8ab64480b82 100644 --- a/keyboards/sekigon/grs_70ec/info.json +++ b/keyboards/sekigon/grs_70ec/info.json @@ -8,6 +8,8 @@ "pid": "0x70EC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk index eb2fa4ae5bd..00931a551e8 100644 --- a/keyboards/sekigon/grs_70ec/rules.mk +++ b/keyboards/sekigon/grs_70ec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json index e350651b424..81ced955d69 100644 --- a/keyboards/sendyyeah/75pixels/info.json +++ b/keyboards/sendyyeah/75pixels/info.json @@ -8,6 +8,8 @@ "pid": "0x3735", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/sendyyeah/75pixels/rules.mk b/keyboards/sendyyeah/75pixels/rules.mk index 8075263133f..f98db94648b 100644 --- a/keyboards/sendyyeah/75pixels/rules.mk +++ b/keyboards/sendyyeah/75pixels/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json index 508c3f50ef5..355fe1f8509 100644 --- a/keyboards/sendyyeah/bevi/info.json +++ b/keyboards/sendyyeah/bevi/info.json @@ -8,6 +8,8 @@ "pid": "0x4256", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sendyyeah/bevi/rules.mk b/keyboards/sendyyeah/bevi/rules.mk index 8075263133f..f98db94648b 100644 --- a/keyboards/sendyyeah/bevi/rules.mk +++ b/keyboards/sendyyeah/bevi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json index 339ad499f6a..62e387e16ba 100644 --- a/keyboards/sendyyeah/pix/info.json +++ b/keyboards/sendyyeah/pix/info.json @@ -8,6 +8,8 @@ "pid": "0x4E34", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sendyyeah/pix/rules.mk b/keyboards/sendyyeah/pix/rules.mk index c5eb6c7bcc5..a6fe4b81c41 100644 --- a/keyboards/sendyyeah/pix/rules.mk +++ b/keyboards/sendyyeah/pix/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json index a1c2fee19d3..d089aa333c3 100644 --- a/keyboards/senselessclay/ck60/info.json +++ b/keyboards/senselessclay/ck60/info.json @@ -8,6 +8,8 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_60_iso" }, diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk index b4b55feea81..5dadd1cf0e4 100644 --- a/keyboards/senselessclay/ck60/rules.mk +++ b/keyboards/senselessclay/ck60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json index 7774fece844..cb596c21e28 100644 --- a/keyboards/senselessclay/ck65/info.json +++ b/keyboards/senselessclay/ck65/info.json @@ -8,6 +8,8 @@ "pid": "0x0651", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_iso" }, diff --git a/keyboards/senselessclay/ck65/rules.mk b/keyboards/senselessclay/ck65/rules.mk index f0f5b83f012..502dc1b7bdf 100644 --- a/keyboards/senselessclay/ck65/rules.mk +++ b/keyboards/senselessclay/ck65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index 6bad2ae5567..b1007fe065b 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -8,6 +8,8 @@ "pid": "0x0650", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/senselessclay/gos65/rules.mk b/keyboards/senselessclay/gos65/rules.mk index b5761555d40..3c777809b4a 100644 --- a/keyboards/senselessclay/gos65/rules.mk +++ b/keyboards/senselessclay/gos65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json index 5dbcf2f68c3..a5a46d0cd5d 100644 --- a/keyboards/senselessclay/had60/info.json +++ b/keyboards/senselessclay/had60/info.json @@ -8,6 +8,8 @@ "pid": "0x060F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/senselessclay/had60/rules.mk b/keyboards/senselessclay/had60/rules.mk index 6b9a97646dd..903797c70d9 100644 --- a/keyboards/senselessclay/had60/rules.mk +++ b/keyboards/senselessclay/had60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index b0c0ca370df..d39336e2e48 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "url": "https://sentraq.com/collections/kits/products/number-pad-rgb-kit", "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/sentraq/number_pad/rules.mk b/keyboards/sentraq/number_pad/rules.mk index 8434db38dd4..16be45209b4 100644 --- a/keyboards/sentraq/number_pad/rules.mk +++ b/keyboards/sentraq/number_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json index 3f0110679da..2e98820a02b 100644 --- a/keyboards/sentraq/s60_x/default/info.json +++ b/keyboards/sentraq/s60_x/default/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "S60-X" + "keyboard_name": "S60-X", + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s60_x/default/rules.mk b/keyboards/sentraq/s60_x/default/rules.mk index aca7179da80..6da7eeb948a 100644 --- a/keyboards/sentraq/s60_x/default/rules.mk +++ b/keyboards/sentraq/s60_x/default/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json index bcee4ef9db9..b29f71288ba 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "S60-X-RGB" + "keyboard_name": "S60-X-RGB", + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s60_x/rgb/rules.mk b/keyboards/sentraq/s60_x/rgb/rules.mk index 7ccf7fee739..28fa223e99f 100644 --- a/keyboards/sentraq/s60_x/rgb/rules.mk +++ b/keyboards/sentraq/s60_x/rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index 625bc63fd37..5e5f2d33033 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/sentraq/s65_plus/rules.mk b/keyboards/sentraq/s65_plus/rules.mk index 964b81fb50f..7b8e9cd1c4f 100644 --- a/keyboards/sentraq/s65_plus/rules.mk +++ b/keyboards/sentraq/s65_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index 0f496785154..6b77754a658 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/sentraq/s65_x/rules.mk b/keyboards/sentraq/s65_x/rules.mk index 964b81fb50f..7b8e9cd1c4f 100644 --- a/keyboards/sentraq/s65_x/rules.mk +++ b/keyboards/sentraq/s65_x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json index 71d82a85bb9..a59d0824fbc 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -8,6 +8,8 @@ "pid": "0x0C00", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk index 15996395648..a7fd1110b21 100644 --- a/keyboards/sergiopoverony/creator_pro/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json index 9b712f75070..d4132bf736c 100644 --- a/keyboards/sets3n/kk980/info.json +++ b/keyboards/sets3n/kk980/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sets3n/kk980/rules.mk b/keyboards/sets3n/kk980/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/sets3n/kk980/rules.mk +++ b/keyboards/sets3n/kk980/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/shambles/info.json b/keyboards/shambles/info.json index 071f0c75680..a82614f0aec 100644 --- a/keyboards/shambles/info.json +++ b/keyboards/shambles/info.json @@ -8,6 +8,8 @@ "pid": "0x0F42", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1.5, "y":0}, {"label":"K02", "x":2.5, "y":0}, {"label":"K03", "x":3.5, "y":0}, {"label":"K04", "x":4.75, "y":0}, {"label":"K05", "x":5.75, "y":0}, {"label":"K06", "x":6.75, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"K08", "x":9, "y":0}, {"label":"K09", "x":10.25, "y":0}, {"label":"K10", "x":11.25, "y":0}, {"label":"K11", "x":12.25, "y":0}, {"label":"K12", "x":0, "y":1.5}, {"label":"K13", "x":1, "y":1.5}, {"label":"K14", "x":2, "y":1.5}, {"label":"K15", "x":3, "y":1.5}, {"label":"K16", "x":4, "y":1.5}, {"label":"K17", "x":5, "y":1.5}, {"label":"K18", "x":6, "y":1.5}, {"label":"K19", "x":7, "y":1.5}, {"label":"K20", "x":8, "y":1.5}, {"label":"K21", "x":9, "y":1.5}, {"label":"K22", "x":10.25, "y":1.25}, {"label":"K23", "x":11.25, "y":1.25}, {"label":"K24", "x":12.25, "y":1.25}, {"label":"K25", "x":0, "y":2.5}, {"label":"K26", "x":1, "y":2.5}, {"label":"K27", "x":2, "y":2.5}, {"label":"K28", "x":3, "y":2.5}, {"label":"K29", "x":4, "y":2.5}, {"label":"K30", "x":5, "y":2.5}, {"label":"K31", "x":6, "y":2.5}, {"label":"K32", "x":7, "y":2.5}, {"label":"K33", "x":8, "y":2.5}, {"label":"K34", "x":9, "y":2.5}, {"label":"K35", "x":11.25, "y":2.5}, {"label":"K36", "x":0.5, "y":3.5}, {"label":"K37", "x":1.5, "y":3.5}, {"label":"K38", "x":2.5, "y":3.5}, {"label":"K39", "x":3.5, "y":3.5}, {"label":"K40", "x":4.5, "y":3.5, "w":2}, {"label":"K41", "x":6.5, "y":3.5}, {"label":"K42", "x":7.5, "y":3.5}, {"label":"K43", "x":8.5, "y":3.5}, {"label":"K44", "x":10.25, "y":3.5}, {"label":"K45", "x":11.25, "y":3.5}, {"label":"K43", "x":12.25, "y":3.5}] diff --git a/keyboards/shambles/rules.mk b/keyboards/shambles/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/shambles/rules.mk +++ b/keyboards/shambles/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json index 14a0e4407f8..7a23820e24a 100644 --- a/keyboards/shapeshifter4060/info.json +++ b/keyboards/shapeshifter4060/info.json @@ -8,6 +8,8 @@ "pid": "0xA1F1", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/shapeshifter4060/rules.mk b/keyboards/shapeshifter4060/rules.mk index 00cb7fbcf7e..bac8b2e5518 100644 --- a/keyboards/shapeshifter4060/rules.mk +++ b/keyboards/shapeshifter4060/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/shiro/info.json b/keyboards/shiro/info.json index e2ff5a96dd6..a28a2fd905c 100644 --- a/keyboards/shiro/info.json +++ b/keyboards/shiro/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/shiro/rules.mk b/keyboards/shiro/rules.mk index eae129b29b7..fce764c22d4 100644 --- a/keyboards/shiro/rules.mk +++ b/keyboards/shiro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/shk9/info.json b/keyboards/shk9/info.json index 7784728b0a8..444736778be 100644 --- a/keyboards/shk9/info.json +++ b/keyboards/shk9/info.json @@ -8,6 +8,8 @@ "pid": "0x4B39", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/shk9/rules.mk b/keyboards/shk9/rules.mk index f0cdbb9b0c7..ab9ede17169 100644 --- a/keyboards/shk9/rules.mk +++ b/keyboards/shk9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json index c337ab9cb16..890bb5a5cbc 100644 --- a/keyboards/sidderskb/majbritt/rev1/info.json +++ b/keyboards/sidderskb/majbritt/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sidderskb/majbritt/rev1/rules.mk b/keyboards/sidderskb/majbritt/rev1/rules.mk index a2a5932cdcb..fce764c22d4 100644 --- a/keyboards/sidderskb/majbritt/rev1/rules.mk +++ b/keyboards/sidderskb/majbritt/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json index 9c3af6d1c45..7de72f1abfa 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sidderskb/majbritt/rev2/rules.mk b/keyboards/sidderskb/majbritt/rev2/rules.mk index a8f14184667..d7d5ea9bff6 100644 --- a/keyboards/sidderskb/majbritt/rev2/rules.mk +++ b/keyboards/sidderskb/majbritt/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/signum/3_0/info.json b/keyboards/signum/3_0/info.json index a11710fd20a..9b134ed610b 100644 --- a/keyboards/signum/3_0/info.json +++ b/keyboards/signum/3_0/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/signum/3_0/rules.mk b/keyboards/signum/3_0/rules.mk index b46c331131b..614691a01be 100644 --- a/keyboards/signum/3_0/rules.mk +++ b/keyboards/signum/3_0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index 932fde645ca..d064160e19d 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 10, "layouts": { "LAYOUT": { diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index b2e192e5b8c..fa56d060bf5 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json index ca79d19e727..b97720d7840 100644 --- a/keyboards/singa/info.json +++ b/keyboards/singa/info.json @@ -8,6 +8,8 @@ "pid": "0x7575", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":1}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5, "w":1}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] diff --git a/keyboards/singa/rules.mk b/keyboards/singa/rules.mk index 4dcdfe886af..03a618b76dc 100644 --- a/keyboards/singa/rules.mk +++ b/keyboards/singa/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/info.json index 9960c4c35be..fa6aa040711 100644 --- a/keyboards/sirius/uni660/rev1/info.json +++ b/keyboards/sirius/uni660/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0201", "device_version": "19.1.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk index 71cc3efd925..d44567105e4 100644 --- a/keyboards/sirius/uni660/rev1/rules.mk +++ b/keyboards/sirius/uni660/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sirius/uni660/rev2/ansi/info.json b/keyboards/sirius/uni660/rev2/ansi/info.json index eaf2e8538af..86b69d26ece 100644 --- a/keyboards/sirius/uni660/rev2/ansi/info.json +++ b/keyboards/sirius/uni660/rev2/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0202", "device_version": "20.0.4" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/info.json index bb46a2f3abf..9e9a8f2af86 100644 --- a/keyboards/sirius/uni660/rev2/iso/info.json +++ b/keyboards/sirius/uni660/rev2/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0203", "device_version": "20.0.4" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_iso": { "layout": [ diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk index 850c2a2e355..b41206636d5 100644 --- a/keyboards/sirius/uni660/rev2/rules.mk +++ b/keyboards/sirius/uni660/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json index fca325dd922..9954295859b 100644 --- a/keyboards/sirius/unigo66/info.json +++ b/keyboards/sirius/unigo66/info.json @@ -8,6 +8,8 @@ "pid": "0x1001", "device_version": "19.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk index cf5df2f2c38..6cf02169cf6 100644 --- a/keyboards/sirius/unigo66/rules.mk +++ b/keyboards/sirius/unigo66/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json index 76196d5a908..26c3a2894a7 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/info.json @@ -8,6 +8,8 @@ "pid": "0x736B", "device_version": "0.0.1" }, + "processor": "atmega16u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index d46072c14d9..d1d7bc48818 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega16u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index bab0b96f7ea..39b7461521f 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0xB5E9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/skeletn87/hotswap/rules.mk b/keyboards/skeletn87/hotswap/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/skeletn87/hotswap/rules.mk +++ b/keyboards/skeletn87/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index 04c77c1bd56..702cefed6c0 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0xB5E8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/skeletn87/soldered/rules.mk b/keyboards/skeletn87/soldered/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/skeletn87/soldered/rules.mk +++ b/keyboards/skeletn87/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json index 050ff5b61b3..c637cbfffc1 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/info.json +++ b/keyboards/skeletonkbd/skeletonnumpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6E70", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/skeletonkbd/skeletonnumpad/rules.mk b/keyboards/skeletonkbd/skeletonnumpad/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/rules.mk +++ b/keyboards/skeletonkbd/skeletonnumpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json index c47a1ac45f1..01572f630f6 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/info.json @@ -8,6 +8,8 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT_all": "LAYOUT_split_bs" }, diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk index fe2be33f829..1e9f9255447 100644 --- a/keyboards/skergo/rules.mk +++ b/keyboards/skergo/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json index 7ad7ef71643..497b5a0e7fe 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/skippys_custom_pcs/rooboard65/rules.mk b/keyboards/skippys_custom_pcs/rooboard65/rules.mk index a2117c37a00..52a18008f4a 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/rules.mk +++ b/keyboards/skippys_custom_pcs/rooboard65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json index 734310ed8c9..9b7c0797659 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Num Lock", "x":1.5, "y":0}, {"label":"/", "x":2.5, "y":0}, {"label":"*", "x":3.5, "y":0}, {"label":"-", "x":4.5, "y":0}, {"x":0, "y":1}, {"label":"7", "x":1.5, "y":1}, {"label":"8", "x":2.5, "y":1}, {"label":"9", "x":3.5, "y":1}, {"label":"+", "x":4.5, "y":1, "h":2}, {"x":0, "y":2}, {"label":"4", "x":1.5, "y":2}, {"label":"5", "x":2.5, "y":2}, {"label":"6", "x":3.5, "y":2}, {"x":0, "y":3}, {"label":"1", "x":1.5, "y":3}, {"label":"2", "x":2.5, "y":3}, {"label":"3", "x":3.5, "y":3}, {"label":"Enter", "x":4.5, "y":3, "h":2}, {"x":0, "y":4}, {"label":"0", "x":1.5, "y":4, "w":2}, {"label":".", "x":3.5, "y":4}] diff --git a/keyboards/skippys_custom_pcs/roopad/rules.mk b/keyboards/skippys_custom_pcs/roopad/rules.mk index 3aaf70166ed..d280d696f53 100644 --- a/keyboards/skippys_custom_pcs/roopad/rules.mk +++ b/keyboards/skippys_custom_pcs/roopad/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/info.json index 956761eeaae..4129cd6869a 100644 --- a/keyboards/skme/zeno/info.json +++ b/keyboards/skme/zeno/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [{"x":0.25, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0.25, "y":1, "w":1.5}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":0.15, "y":2, "w":1.75}, {"x":1.9, "y":2}, {"x":2.9, "y":2}, {"x":3.9, "y":2}, {"x":4.9, "y":2}, {"x":5.9, "y":2}, {"x":9.05, "y":2}, {"x":10.05, "y":2}, {"x":11.05, "y":2}, {"x":12.05, "y":2}, {"x":13.05, "y":2}, {"x":14.05, "y":2}, {"x":15.05, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":8.55, "y":3}, {"x":9.55, "y":3}, {"x":10.55, "y":3}, {"x":11.55, "y":3}, {"x":12.55, "y":3}, {"x":13.55, "y":3}, {"x":14.55, "y":3, "w":1.75}, {"x":16.3, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"x":8.55, "y":4, "w":2.75}, {"x":11.3, "y":4, "w":1.5}, {"x":15.8, "y":4, "w":1.5}] diff --git a/keyboards/skme/zeno/rules.mk b/keyboards/skme/zeno/rules.mk index 86a9da46456..fa0aeb021f3 100644 --- a/keyboards/skme/zeno/rules.mk +++ b/keyboards/skme/zeno/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/slz40/info.json b/keyboards/slz40/info.json index 4b69d20efbe..dcbd0c73b29 100644 --- a/keyboards/slz40/info.json +++ b/keyboards/slz40/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/slz40/rules.mk b/keyboards/slz40/rules.mk index 1275531ef6d..ab2c49da70e 100644 --- a/keyboards/slz40/rules.mk +++ b/keyboards/slz40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json index 9e002329aa9..11a96f5af67 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/info.json @@ -8,6 +8,8 @@ "pid": "0x736B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk index 342a6fb6c14..9202e8acf7c 100644 --- a/keyboards/smallkeyboard/rules.mk +++ b/keyboards/smallkeyboard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json new file mode 100644 index 00000000000..8bba6f5d5da --- /dev/null +++ b/keyboards/smithrune/iron165r2/f072/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F072", + "bootloader": "stm32-dfu" +} diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk index 016b8c2c1e4..1b6ec318172 100644 --- a/keyboards/smithrune/iron165r2/f072/rules.mk +++ b/keyboards/smithrune/iron165r2/f072/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json new file mode 100644 index 00000000000..8610c8de5f1 --- /dev/null +++ b/keyboards/smithrune/iron165r2/f411/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu" +} diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk index 6305fc5a141..3fcdaacb60d 100644 --- a/keyboards/smithrune/iron165r2/f411/rules.mk +++ b/keyboards/smithrune/iron165r2/f411/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json index cd689706410..3092b2021f2 100644 --- a/keyboards/smithrune/iron180/info.json +++ b/keyboards/smithrune/iron180/info.json @@ -8,6 +8,8 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/smithrune/iron180/rules.mk b/keyboards/smithrune/iron180/rules.mk index da310926f3b..837bececdc5 100644 --- a/keyboards/smithrune/iron180/rules.mk +++ b/keyboards/smithrune/iron180/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json index 6db06b28084..9e356ef6c8e 100644 --- a/keyboards/smk60/info.json +++ b/keyboards/smk60/info.json @@ -8,6 +8,8 @@ "pid": "0x6585", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso"], "layouts": { "LAYOUT_60_wkl": { diff --git a/keyboards/smk60/rules.mk b/keyboards/smk60/rules.mk index 87fe440c770..b5524236523 100644 --- a/keyboards/smk60/rules.mk +++ b/keyboards/smk60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/snampad/info.json b/keyboards/snampad/info.json index 735f73d7668..a8f8997593e 100644 --- a/keyboards/snampad/info.json +++ b/keyboards/snampad/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/snampad/rules.mk b/keyboards/snampad/rules.mk index 33d28b3a89f..309e55c9f4c 100644 --- a/keyboards/snampad/rules.mk +++ b/keyboards/snampad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json index d68fa8c5a05..9637022b528 100644 --- a/keyboards/sneakbox/aliceclone/info.json +++ b/keyboards/sneakbox/aliceclone/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/sneakbox/aliceclone/rules.mk b/keyboards/sneakbox/aliceclone/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/sneakbox/aliceclone/rules.mk +++ b/keyboards/sneakbox/aliceclone/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json index 048426d3e47..5a382f0bf8b 100644 --- a/keyboards/sneakbox/aliceclonergb/info.json +++ b/keyboards/sneakbox/aliceclonergb/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/sneakbox/aliceclonergb/rules.mk b/keyboards/sneakbox/aliceclonergb/rules.mk index 6dfedb28b85..c5c4d8f35f1 100644 --- a/keyboards/sneakbox/aliceclonergb/rules.mk +++ b/keyboards/sneakbox/aliceclonergb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index d745639a628..8f81e0bc4b6 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs", "LAYOUT_ava_split_bs": "LAYOUT_alice_split_bs", diff --git a/keyboards/sneakbox/ava/rules.mk b/keyboards/sneakbox/ava/rules.mk index 19d0131a736..12ee1bcfbd2 100644 --- a/keyboards/sneakbox/ava/rules.mk +++ b/keyboards/sneakbox/ava/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json index 46e163e4843..63b9223d7c3 100644 --- a/keyboards/sneakbox/disarray/ortho/info.json +++ b/keyboards/sneakbox/disarray/ortho/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sneakbox/disarray/ortho/rules.mk b/keyboards/sneakbox/disarray/ortho/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/sneakbox/disarray/ortho/rules.mk +++ b/keyboards/sneakbox/disarray/ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json index 2629c1ea4f3..b660922090f 100644 --- a/keyboards/sneakbox/disarray/staggered/info.json +++ b/keyboards/sneakbox/disarray/staggered/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sneakbox/disarray/staggered/rules.mk b/keyboards/sneakbox/disarray/staggered/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/sneakbox/disarray/staggered/rules.mk +++ b/keyboards/sneakbox/disarray/staggered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 8d6bea89470..713356f944c 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -8,6 +8,8 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_75_ansi": "LAYOUT" }, diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk index 55f433aaaaa..4e0fe558730 100644 --- a/keyboards/soda/cherish/rules.mk +++ b/keyboards/soda/cherish/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json index fd15873c42c..ac6dd82fcd1 100644 --- a/keyboards/sofle/keyhive/info.json +++ b/keyboards/sofle/keyhive/info.json @@ -6,6 +6,8 @@ "pid": "0x1287", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk index 1934963819b..bb1a7f3dc2b 100755 --- a/keyboards/sofle/keyhive/rules.mk +++ b/keyboards/sofle/keyhive/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json index 00afc505e3d..971ef6e955a 100644 --- a/keyboards/sofle/rev1/info.json +++ b/keyboards/sofle/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0287", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sofle/rules.mk b/keyboards/sofle/rules.mk index 8744590a0d0..e03eb21a90c 100644 --- a/keyboards/sofle/rules.mk +++ b/keyboards/sofle/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - SPLIT_KEYBOARD = yes DEFAULT_FOLDER = sofle/rev1 SWAP_HANDS_ENABLE = yes diff --git a/keyboards/soup10/info.json b/keyboards/soup10/info.json index 83fe4271157..fa4b129e57c 100644 --- a/keyboards/soup10/info.json +++ b/keyboards/soup10/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/soup10/rules.mk b/keyboards/soup10/rules.mk index b453f189abd..c8f5447c696 100644 --- a/keyboards/soup10/rules.mk +++ b/keyboards/soup10/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json index 03018825c5c..fef199e6cd1 100644 --- a/keyboards/sowbug/68keys/info.json +++ b/keyboards/sowbug/68keys/info.json @@ -8,6 +8,8 @@ "pid": "0x8888", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk index 44ea7fc29a2..38a6bb6887f 100644 --- a/keyboards/sowbug/68keys/rules.mk +++ b/keyboards/sowbug/68keys/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json index a7ff38a7fea..30cef14f701 100644 --- a/keyboards/sowbug/ansi_tkl/info.json +++ b/keyboards/sowbug/ansi_tkl/info.json @@ -8,6 +8,8 @@ "pid": "0x8889", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk index 44ea7fc29a2..38a6bb6887f 100644 --- a/keyboards/sowbug/ansi_tkl/rules.mk +++ b/keyboards/sowbug/ansi_tkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json index 20fdf1fde6f..4add710d13d 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/info.json @@ -8,6 +8,8 @@ "pid": "0x534F", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk index 69e1f9003c5..ab9ede17169 100644 --- a/keyboards/soy20/rules.mk +++ b/keyboards/soy20/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json index a48f88c8143..fac12196b1f 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/info.json @@ -8,6 +8,8 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk index 961d5a49157..23693f972a3 100755 --- a/keyboards/spaceholdings/nebula12/rules.mk +++ b/keyboards/spaceholdings/nebula12/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F072 -BOARD = GENERIC_STM32_F072XB - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json index 9da7dfcb26c..400e5790c98 100755 --- a/keyboards/spaceholdings/nebula12b/info.json +++ b/keyboards/spaceholdings/nebula12b/info.json @@ -8,6 +8,8 @@ "pid": "0x5332", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/spaceholdings/nebula12b/rules.mk b/keyboards/spaceholdings/nebula12b/rules.mk index 92dd198801b..e9b6e9fb5cb 100755 --- a/keyboards/spaceholdings/nebula12b/rules.mk +++ b/keyboards/spaceholdings/nebula12b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json index 1c73d404f34..77bda023d34 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/info.json @@ -8,6 +8,9 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk index d52e53891f5..00fca103d4c 100755 --- a/keyboards/spaceholdings/nebula68/rules.mk +++ b/keyboards/spaceholdings/nebula68/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json index 47fc6fc7189..b1ca0f0fd08 100755 --- a/keyboards/spaceholdings/nebula68b/info.json +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -8,6 +8,8 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_68_ansi_split_bs": { "layout": [ diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk index 92dd198801b..e9b6e9fb5cb 100755 --- a/keyboards/spaceholdings/nebula68b/rules.mk +++ b/keyboards/spaceholdings/nebula68b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json index 8cdf4745173..c7e4c944c70 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/info.json @@ -8,6 +8,8 @@ "pid": "0x3225", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] diff --git a/keyboards/spaceman/2_milk/rules.mk b/keyboards/spaceman/2_milk/rules.mk index 77b594bd813..55f12300d58 100644 --- a/keyboards/spaceman/2_milk/rules.mk +++ b/keyboards/spaceman/2_milk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk index caf6cdc373b..822ab9971bc 100644 --- a/keyboards/spaceman/pancake/rev1/feather/rules.mk +++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json index 8d781d89c33..723b6c1054d 100644 --- a/keyboards/spaceman/pancake/rev1/info.json +++ b/keyboards/spaceman/pancake/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x504B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk index fd6dd2408a5..96e36eba388 100644 --- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk +++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json index 4a21bf8c628..22da63e5f22 100644 --- a/keyboards/spaceman/pancake/rev2/info.json +++ b/keyboards/spaceman/pancake/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x5032", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/spaceman/pancake/rev2/rules.mk b/keyboards/spaceman/pancake/rev2/rules.mk index 6835fae82af..c085de5a4a2 100644 --- a/keyboards/spaceman/pancake/rev2/rules.mk +++ b/keyboards/spaceman/pancake/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json index 0caaa1521e9..1103a08c720 100644 --- a/keyboards/spaceman/yun65/info.json +++ b/keyboards/spaceman/yun65/info.json @@ -8,6 +8,8 @@ "pid": "0x594E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/spaceman/yun65/rules.mk b/keyboards/spaceman/yun65/rules.mk index d2c47c15299..e12dc198de2 100644 --- a/keyboards/spaceman/yun65/rules.mk +++ b/keyboards/spaceman/yun65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index b34bfe8a6ce..49535c29ffe 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -8,6 +8,8 @@ "pid": "0x0A0C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/spacetime/rules.mk b/keyboards/spacetime/rules.mk index 3260715dc57..01714f80cb4 100644 --- a/keyboards/spacetime/rules.mk +++ b/keyboards/spacetime/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json index e70efd6c758..fc6b1d1f367 100644 --- a/keyboards/spacey/info.json +++ b/keyboards/spacey/info.json @@ -8,6 +8,8 @@ "pid": "0x2045", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/spacey/rules.mk b/keyboards/spacey/rules.mk index 77d9fdb4107..b03b6fa9058 100644 --- a/keyboards/spacey/rules.mk +++ b/keyboards/spacey/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json index a1a1152c976..d8cc4b84167 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/info.json @@ -8,6 +8,8 @@ "pid": "0x7461", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sparrow62/rules.mk b/keyboards/sparrow62/rules.mk index 8f9772df22e..8ea05b5f74a 100644 --- a/keyboards/sparrow62/rules.mk +++ b/keyboards/sparrow62/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/specskeys/info.json b/keyboards/specskeys/info.json index 8138be8c358..e38b64339cd 100644 --- a/keyboards/specskeys/info.json +++ b/keyboards/specskeys/info.json @@ -8,6 +8,8 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_iso_tsangan" }, diff --git a/keyboards/specskeys/rules.mk b/keyboards/specskeys/rules.mk index 382c5a7f3f2..05f8c4ece5f 100644 --- a/keyboards/specskeys/rules.mk +++ b/keyboards/specskeys/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json index cbb07e3b18c..27ab69b27b0 100644 --- a/keyboards/spiderisland/split78/info.json +++ b/keyboards/spiderisland/split78/info.json @@ -8,6 +8,8 @@ "pid": "0xF4E4", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk index c5319e8410f..0f27d32c811 100644 --- a/keyboards/spiderisland/split78/rules.mk +++ b/keyboards/spiderisland/split78/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json index 6f8f8da1da0..310a31801e2 100644 --- a/keyboards/splitish/info.json +++ b/keyboards/splitish/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitish/rules.mk b/keyboards/splitish/rules.mk index 76fa2e63fb6..363f2330b33 100644 --- a/keyboards/splitish/rules.mk +++ b/keyboards/splitish/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 0afcbe5b6e7..744efd5b764 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -8,6 +8,8 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk index 4de2f506ebd..fb9a5856566 100644 --- a/keyboards/splitkb/zima/rules.mk +++ b/keyboards/splitkb/zima/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json index a7f8bb7c95f..7c4afd849ee 100644 --- a/keyboards/splitography/info.json +++ b/keyboards/splitography/info.json @@ -25,6 +25,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitography/rules.mk b/keyboards/splitography/rules.mk index e8326bcf099..e69de29bb2d 100644 --- a/keyboards/splitography/rules.mk +++ b/keyboards/splitography/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json index 71e31132e51..bdcb13d044c 100644 --- a/keyboards/splitty/info.json +++ b/keyboards/splitty/info.json @@ -8,6 +8,8 @@ "pid": "0x6052", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk index cdd74b06772..2389937b0b8 100644 --- a/keyboards/splitty/rules.mk +++ b/keyboards/splitty/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index 973e33b8de1..a99be6bf291 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/info.json @@ -8,7 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, - "community_layouts": ["ortho_4x10"], + "processor": "atmega32u4", + "bootloader": "caterina", + "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/sporewoh/banime40/rules.mk b/keyboards/sporewoh/banime40/rules.mk index 7c70616682d..fd62cad1658 100644 --- a/keyboards/sporewoh/banime40/rules.mk +++ b/keyboards/sporewoh/banime40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json index 879e681c38a..516fcb7a72e 100644 --- a/keyboards/star75/info.json +++ b/keyboards/star75/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/star75/rules.mk b/keyboards/star75/rules.mk index 0b3ffc06f23..ca8435743ff 100644 --- a/keyboards/star75/rules.mk +++ b/keyboards/star75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json index 3beb747bec8..364298d485f 100644 --- a/keyboards/stello65/beta/info.json +++ b/keyboards/stello65/beta/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"esc", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"bs", "x":13, "y":0}, {"label":"del", "x":14, "y":0}, {"label":"home", "x":15, "y":0}, {"label":"vold", "x":16.25, "y":0}, {"label":"volu", "x":17.25, "y":0}, {"label":"tab", "x":0, "y":1, "w":1.5}, {"label":"q", "x":1.5, "y":1}, {"label":"w", "x":2.5, "y":1}, {"label":"e", "x":3.5, "y":1}, {"label":"r", "x":4.5, "y":1}, {"label":"t", "x":5.5, "y":1}, {"label":"y", "x":6.5, "y":1}, {"label":"u", "x":7.5, "y":1}, {"label":"i", "x":8.5, "y":1}, {"label":"o", "x":9.5, "y":1}, {"label":"p", "x":10.5, "y":1}, {"label":"[", "x":11.5, "y":1}, {"label":"]", "x":12.5, "y":1}, {"label":"\\", "x":13.5, "y":1, "w":1.5}, {"label":"end", "x":15, "y":1}, {"label":"caps", "x":0, "y":2, "w":1.75}, {"label":"a", "x":1.75, "y":2}, {"label":"s", "x":2.75, "y":2}, {"label":"d", "x":3.75, "y":2}, {"label":"f", "x":4.75, "y":2}, {"label":"g", "x":5.75, "y":2}, {"label":"h", "x":6.75, "y":2}, {"label":"j", "x":7.75, "y":2}, {"label":"k", "x":8.75, "y":2}, {"label":"l", "x":9.75, "y":2}, {"label":";", "x":10.75, "y":2}, {"label":"'", "x":11.75, "y":2}, {"label":"enter", "x":12.75, "y":2, "w":2.25}, {"label":"pgup", "x":15, "y":2}, {"label":"shift", "x":0, "y":3, "w":1.25}, {"label":"\\", "x":1.25, "y":3}, {"label":"z", "x":2.25, "y":3}, {"label":"x", "x":3.25, "y":3}, {"label":"c", "x":4.25, "y":3}, {"label":"v", "x":5.25, "y":3}, {"label":"b", "x":6.25, "y":3}, {"label":"n", "x":7.25, "y":3}, {"label":"m", "x":8.25, "y":3}, {"label":",", "x":9.25, "y":3}, {"label":".", "x":10.25, "y":3}, {"label":"/", "x":11.25, "y":3}, {"label":"shift", "x":12.25, "y":3, "w":1.75}, {"label":"up", "x":14, "y":3}, {"label":"pgdn", "x":15, "y":3}, {"label":"ctrl", "x":0, "y":4, "w":1.25}, {"label":"gui", "x":1.25, "y":4, "w":1.25}, {"label":"alt", "x":2.5, "y":4, "w":1.25}, {"label":"spacce", "x":3.75, "y":4, "w":6.25}, {"label":"alt", "x":10, "y":4, "w":1.25}, {"label":"ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"left", "x":13, "y":4}, {"label":"down", "x":14, "y":4}, {"label":"right", "x":15, "y":4}] diff --git a/keyboards/stello65/beta/rules.mk b/keyboards/stello65/beta/rules.mk index 9754b6df42c..689c1e977ea 100644 --- a/keyboards/stello65/beta/rules.mk +++ b/keyboards/stello65/beta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json index f68e0333a22..218f2657ad3 100644 --- a/keyboards/stello65/hs_rev1/info.json +++ b/keyboards/stello65/hs_rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"1,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"1,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"1,6", "x":13, "y":0, "w":2}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":6.5, "y":1}, {"label":"3,3", "x":7.5, "y":1}, {"label":"2,4", "x":8.5, "y":1}, {"label":"3,4", "x":9.5, "y":1}, {"label":"2,5", "x":10.5, "y":1}, {"label":"3,5", "x":11.5, "y":1}, {"label":"2,6", "x":12.5, "y":1}, {"label":"3,6", "x":13.5, "y":1, "w":1.5}, {"label":"2,7", "x":15, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"4,1", "x":1.75, "y":2}, {"label":"5,0", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":6.75, "y":2}, {"label":"5,3", "x":7.75, "y":2}, {"label":"4,4", "x":8.75, "y":2}, {"label":"5,4", "x":9.75, "y":2}, {"label":"4,5", "x":10.75, "y":2}, {"label":"5,5", "x":11.75, "y":2}, {"label":"5,6", "x":12.75, "y":2, "w":2.25}, {"label":"4,7", "x":15, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"6,1", "x":2.25, "y":3}, {"label":"7,0", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":7.25, "y":3}, {"label":"7,3", "x":8.25, "y":3}, {"label":"6,4", "x":9.25, "y":3}, {"label":"7,4", "x":10.25, "y":3}, {"label":"6,5", "x":11.25, "y":3}, {"label":"7,5", "x":12.25, "y":3}, {"label":"7,6", "x":13.25, "y":3, "w":1.75}, {"label":"6,7", "x":15, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.25}, {"label":"9,0", "x":1.25, "y":4, "w":1.25}, {"label":"8,1", "x":2.5, "y":4, "w":1.25}, {"label":"9,1", "x":3.75, "y":4, "w":6.25}, {"label":"8,5", "x":10, "y":4, "w":1.25}, {"label":"9,5", "x":11.25, "y":4, "w":1.25}, {"label":"8,6", "x":13, "y":4}, {"label":"9,6", "x":14, "y":4}, {"label":"8,7", "x":15, "y":4}] diff --git a/keyboards/stello65/hs_rev1/rules.mk b/keyboards/stello65/hs_rev1/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/stello65/hs_rev1/rules.mk +++ b/keyboards/stello65/hs_rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json index 95eb2ccb3cd..647afe2e9c8 100644 --- a/keyboards/stello65/sl_rev1/info.json +++ b/keyboards/stello65/sl_rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/stello65/sl_rev1/rules.mk b/keyboards/stello65/sl_rev1/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/stello65/sl_rev1/rules.mk +++ b/keyboards/stello65/sl_rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/info.json index 90ac25f360b..e1dda21feba 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json +++ b/keyboards/stenokeyboards/the_uni/pro_micro/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk b/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk index ba22869d5ea..7cabc7b8731 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk +++ b/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/info.json index cebd90c01e3..64255146876 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json +++ b/keyboards/stenokeyboards/the_uni/rp_2040/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.4" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk b/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk index da6a3dc6a84..2249662c5d2 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk +++ b/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/info.json index b377cdff008..14c0e6d7cb3 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/info.json +++ b/keyboards/stenokeyboards/the_uni/usb_c/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/stenokeyboards/the_uni/usb_c/rules.mk b/keyboards/stenokeyboards/the_uni/usb_c/rules.mk index 5b78a2ede17..7cabc7b8731 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/rules.mk +++ b/keyboards/stenokeyboards/the_uni/usb_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json index 983b63ff5ef..2f278e18e7f 100644 --- a/keyboards/stratos/info.json +++ b/keyboards/stratos/info.json @@ -8,6 +8,8 @@ "pid": "0x992D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/stratos/rules.mk b/keyboards/stratos/rules.mk index a0a1e94e36d..a927de843cb 100644 --- a/keyboards/stratos/rules.mk +++ b/keyboards/stratos/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json index 6b9169ba0aa..0cde6da6847 100644 --- a/keyboards/studiokestra/bourgeau/info.json +++ b/keyboards/studiokestra/bourgeau/info.json @@ -8,6 +8,8 @@ "pid": "0x7501", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_75_ansi_rwkl" }, diff --git a/keyboards/studiokestra/bourgeau/rules.mk b/keyboards/studiokestra/bourgeau/rules.mk index 42e7cc3f2e9..e027898b626 100644 --- a/keyboards/studiokestra/bourgeau/rules.mk +++ b/keyboards/studiokestra/bourgeau/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json index eb5e9b5ffb6..096e20a27ba 100644 --- a/keyboards/studiokestra/cascade/info.json +++ b/keyboards/studiokestra/cascade/info.json @@ -8,6 +8,8 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/cascade/rules.mk b/keyboards/studiokestra/cascade/rules.mk index 42e7cc3f2e9..e027898b626 100644 --- a/keyboards/studiokestra/cascade/rules.mk +++ b/keyboards/studiokestra/cascade/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json index 2b832d7fc73..ee90d256a1e 100644 --- a/keyboards/studiokestra/galatea/rev1/info.json +++ b/keyboards/studiokestra/galatea/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/galatea/rev1/rules.mk b/keyboards/studiokestra/galatea/rev1/rules.mk index a61e60c8a40..6fe874e748b 100644 --- a/keyboards/studiokestra/galatea/rev1/rules.mk +++ b/keyboards/studiokestra/galatea/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index 9954a962743..d79ab68c407 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x8802", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/galatea/rev2/rules.mk b/keyboards/studiokestra/galatea/rev2/rules.mk index a0a1e94e36d..a927de843cb 100644 --- a/keyboards/studiokestra/galatea/rev2/rules.mk +++ b/keyboards/studiokestra/galatea/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json index 55d8d0049c0..d9c5d2b785f 100644 --- a/keyboards/studiokestra/nascent/info.json +++ b/keyboards/studiokestra/nascent/info.json @@ -8,6 +8,8 @@ "pid": "0x0165", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/studiokestra/nascent/rules.mk b/keyboards/studiokestra/nascent/rules.mk index 30e86c01902..6ff9b4e02ba 100644 --- a/keyboards/studiokestra/nascent/rules.mk +++ b/keyboards/studiokestra/nascent/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json index 874f827546a..bff06e269d1 100644 --- a/keyboards/studiokestra/nue/info.json +++ b/keyboards/studiokestra/nue/info.json @@ -8,6 +8,8 @@ "pid": "0x0701", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/nue/rules.mk b/keyboards/studiokestra/nue/rules.mk index 717cc07b4b7..c58df49ea8f 100644 --- a/keyboards/studiokestra/nue/rules.mk +++ b/keyboards/studiokestra/nue/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json index aec9c84cf50..d89669603d8 100755 --- a/keyboards/suavity/ehan/info.json +++ b/keyboards/suavity/ehan/info.json @@ -8,6 +8,8 @@ "pid": "0x4548", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/suavity/ehan/rules.mk b/keyboards/suavity/ehan/rules.mk index 9383acaf007..e7b278b4b23 100644 --- a/keyboards/suavity/ehan/rules.mk +++ b/keyboards/suavity/ehan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/subatomic/info.json b/keyboards/subatomic/info.json index 3b53a6cedaf..2b8546be712 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/info.json @@ -8,6 +8,8 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_5x14": { "layout": [ diff --git a/keyboards/subatomic/rules.mk b/keyboards/subatomic/rules.mk index 58d8c130a17..3c9bf3cc2cb 100644 --- a/keyboards/subatomic/rules.mk +++ b/keyboards/subatomic/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/info.json index f6ba95e2612..b0a8eb7daab 100644 --- a/keyboards/subrezon/la_nc/info.json +++ b/keyboards/subrezon/la_nc/info.json @@ -6,6 +6,8 @@ "pid": "0x1A7C", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/subrezon/la_nc/rules.mk b/keyboards/subrezon/la_nc/rules.mk index a74aa4dbc19..895af57980a 100644 --- a/keyboards/subrezon/la_nc/rules.mk +++ b/keyboards/subrezon/la_nc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build options # change yes to no to disable # diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json index d19f1e524d4..0057690f685 100644 --- a/keyboards/superuser/ext/info.json +++ b/keyboards/superuser/ext/info.json @@ -8,6 +8,8 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layout_aliases": { "LAYOUT_tkl": "LAYOUT_all" }, diff --git a/keyboards/superuser/ext/rules.mk b/keyboards/superuser/ext/rules.mk index 4fdac83bcae..58cb1ddd550 100644 --- a/keyboards/superuser/ext/rules.mk +++ b/keyboards/superuser/ext/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json index 5a01d0a39d5..6d108dd971f 100644 --- a/keyboards/superuser/frl/info.json +++ b/keyboards/superuser/frl/info.json @@ -8,6 +8,8 @@ "pid": "0x4652", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_tkl": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Bksp", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/superuser/frl/rules.mk b/keyboards/superuser/frl/rules.mk index 4fdac83bcae..58cb1ddd550 100644 --- a/keyboards/superuser/frl/rules.mk +++ b/keyboards/superuser/frl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json index ff8a6b7895a..ebaeb95a5c8 100644 --- a/keyboards/superuser/tkl/info.json +++ b/keyboards/superuser/tkl/info.json @@ -8,6 +8,8 @@ "pid": "0x544B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layout_aliases": { "LAYOUT_tkl": "LAYOUT_all" }, diff --git a/keyboards/superuser/tkl/rules.mk b/keyboards/superuser/tkl/rules.mk index 4fdac83bcae..58cb1ddd550 100644 --- a/keyboards/superuser/tkl/rules.mk +++ b/keyboards/superuser/tkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 4e3137edb0a..021c013eaee 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -8,6 +8,8 @@ "pid": "0xEB0C", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,1", "x":0.5, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1, "y":2.5}] diff --git a/keyboards/swiftrax/retropad/rules.mk b/keyboards/swiftrax/retropad/rules.mk index f1783698974..3d49f75c87a 100644 --- a/keyboards/swiftrax/retropad/rules.mk +++ b/keyboards/swiftrax/retropad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json index 0a47fd95b27..a59c899bd6c 100644 --- a/keyboards/switchplate/southpaw_65/info.json +++ b/keyboards/switchplate/southpaw_65/info.json @@ -8,6 +8,8 @@ "pid": "0x4084", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"!", "x":5, "y":0}, {"label":"@", "x":6, "y":0}, {"label":"#", "x":7, "y":0}, {"label":"$", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"^", "x":10, "y":0}, {"label":"&", "x":11, "y":0}, {"label":"*", "x":12, "y":0}, {"label":"(", "x":13, "y":0}, {"label":")", "x":14, "y":0}, {"label":"_", "x":15, "y":0}, {"label":"+", "x":16, "y":0}, {"label":"Backspace", "x":17, "y":0}, {"label":"Backspace", "x":18, "y":0}, {"label":"Home", "x":19, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.5}, {"label":"Q", "x":5.5, "y":1}, {"label":"W", "x":6.5, "y":1}, {"label":"E", "x":7.5, "y":1}, {"label":"R", "x":8.5, "y":1}, {"label":"T", "x":9.5, "y":1}, {"label":"Y", "x":10.5, "y":1}, {"label":"U", "x":11.5, "y":1}, {"label":"I", "x":12.5, "y":1}, {"label":"O", "x":13.5, "y":1}, {"label":"P", "x":14.5, "y":1}, {"label":"{", "x":15.5, "y":1}, {"label":"}", "x":16.5, "y":1}, {"label":"|", "x":17.5, "y":1, "w":1.5}, {"label":"End", "x":19, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":2}, {"label":"Caps Lock", "x":4, "y":2, "w":1.75}, {"label":"A", "x":5.75, "y":2}, {"label":"S", "x":6.75, "y":2}, {"label":"D", "x":7.75, "y":2}, {"label":"F", "x":8.75, "y":2}, {"label":"G", "x":9.75, "y":2}, {"label":"H", "x":10.75, "y":2}, {"label":"J", "x":11.75, "y":2}, {"label":"K", "x":12.75, "y":2}, {"label":"L", "x":13.75, "y":2}, {"label":":", "x":14.75, "y":2}, {"label":"\"", "x":15.75, "y":2}, {"label":"~", "x":16.75, "y":2}, {"label":"Enter", "x":17.75, "y":2, "w":1.25}, {"label":"Page Up", "x":19, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Num Enter", "x":3, "y":3}, {"label":"LShift", "x":4, "y":3, "w":1.25}, {"label":"|", "x":5.25, "y":3}, {"label":"Z", "x":6.25, "y":3}, {"label":"X", "x":7.25, "y":3}, {"label":"C", "x":8.25, "y":3}, {"label":"V", "x":9.25, "y":3}, {"label":"B", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"RShift", "x":16.25, "y":3, "w":1.75}, {"label":"Up", "x":18, "y":3}, {"label":"Page Down", "x":19, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"0", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Num Enter", "x":3, "y":4}, {"label":"LCtrl", "x":4, "y":4, "w":1.25}, {"label":"Win", "x":5.25, "y":4, "w":1.25}, {"label":"LAlt", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":6.25}, {"label":"RAlt", "x":14, "y":4}, {"label":"RCtrl", "x":15, "y":4}, {"label":"Fn0", "x":16, "y":4}, {"label":"Left", "x":17, "y":4}, {"label":"Down", "x":18, "y":4}, {"label":"Right", "x":19, "y":4}] diff --git a/keyboards/switchplate/southpaw_65/rules.mk b/keyboards/switchplate/southpaw_65/rules.mk index 864e780606c..c6c7f4ef933 100644 --- a/keyboards/switchplate/southpaw_65/rules.mk +++ b/keyboards/switchplate/southpaw_65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json index c90954ead7b..507ed097bc7 100644 --- a/keyboards/switchplate/southpaw_fullsize/info.json +++ b/keyboards/switchplate/southpaw_fullsize/info.json @@ -8,6 +8,8 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/switchplate/southpaw_fullsize/rules.mk b/keyboards/switchplate/southpaw_fullsize/rules.mk index db0ff42ef4e..3cd23319a29 100644 --- a/keyboards/switchplate/southpaw_fullsize/rules.mk +++ b/keyboards/switchplate/southpaw_fullsize/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/info.json index 7d31742faeb..cdc9291765e 100644 --- a/keyboards/switchplate/switchplate910/info.json +++ b/keyboards/switchplate/switchplate910/info.json @@ -8,6 +8,8 @@ "pid": "0x2065", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/switchplate/switchplate910/rules.mk b/keyboards/switchplate/switchplate910/rules.mk index 02fbe725257..14e80e7106b 100644 --- a/keyboards/switchplate/switchplate910/rules.mk +++ b/keyboards/switchplate/switchplate910/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json index dddc5873a80..b88cb070fd6 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"ANSIEnter", "x":15, "y":2, "w":1}, {"label":"ISOEnter", "x":16, "y":2, "w":1.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":1.25}, {"label":"\\|", "x":2.5, "y":3, "w":1}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}] diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk index 0848a4d73f0..a18361a0cd2 100755 --- a/keyboards/sx60/rules.mk +++ b/keyboards/sx60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json index b9acdae09d1..55860f9f264 100644 --- a/keyboards/synapse/info.json +++ b/keyboards/synapse/info.json @@ -8,6 +8,8 @@ "pid": "0x5359", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/synapse/rules.mk b/keyboards/synapse/rules.mk index 8876a458810..ebe0d0e0e32 100644 --- a/keyboards/synapse/rules.mk +++ b/keyboards/synapse/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index e369a4d3047..e61caec07c6 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -7,6 +7,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk index 1a0cd63b0d2..e20aa1fd585 100644 --- a/keyboards/system76/launch_1/rules.mk +++ b/keyboards/system76/launch_1/rules.mk @@ -1,15 +1,9 @@ -# MCU name -MCU = atmega32u4 - # CPU frequency divided by two since AVR is at 3.3 V F_CPU = 8000000 # External oscillator is 16 MHz F_USB = 16000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build options # change yes to no to disable BOOTMAGIC_ENABLE = no # Bootmagic Lite diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json index 331818cd492..d4e75776890 100644 --- a/keyboards/tada68/info.json +++ b/keyboards/tada68/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index 9be7b0a5c3d..01310bd4ea0 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-ms - # This board uses the older unsafe 6k version of lufa-ms BOOTLOADER_SIZE = 6144 diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index c9ecdb67ec4..edc871c3175 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/center_enter/rules.mk b/keyboards/takashicompany/center_enter/rules.mk index 43d5350abbb..916e9f99346 100644 --- a/keyboards/takashicompany/center_enter/rules.mk +++ b/keyboards/takashicompany/center_enter/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index 7690d3c333a..5a75a6a672b 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -8,6 +8,8 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk index 52deaa5d049..8e0e5ffd1ab 100644 --- a/keyboards/takashicompany/compacx/rules.mk +++ b/keyboards/takashicompany/compacx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index b9f82c26cb8..6da868a5c02 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -8,6 +8,8 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/dogtag/rules.mk b/keyboards/takashicompany/dogtag/rules.mk index 08b1ffe09c9..f4556ff1c6c 100644 --- a/keyboards/takashicompany/dogtag/rules.mk +++ b/keyboards/takashicompany/dogtag/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index 2284f7a3b43..60ca453e139 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/endzone34/rules.mk b/keyboards/takashicompany/endzone34/rules.mk index 653c8343e75..f8fbdec9bda 100644 --- a/keyboards/takashicompany/endzone34/rules.mk +++ b/keyboards/takashicompany/endzone34/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 6f04de17383..cd2132af0c1 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -8,6 +8,8 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/heavy_left/rules.mk b/keyboards/takashicompany/heavy_left/rules.mk index ce3c5bfaeb3..2bccd4af0ca 100644 --- a/keyboards/takashicompany/heavy_left/rules.mk +++ b/keyboards/takashicompany/heavy_left/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index 51fb57276c4..882a8ebdd55 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -8,6 +8,8 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/minizone/rules.mk b/keyboards/takashicompany/minizone/rules.mk index c7cf2137569..60c7bb59b5e 100644 --- a/keyboards/takashicompany/minizone/rules.mk +++ b/keyboards/takashicompany/minizone/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index 89335351cee..b7ed85676f4 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -8,6 +8,8 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/qoolee/rules.mk b/keyboards/takashicompany/qoolee/rules.mk index 2b0013386e5..0aa58dc8619 100644 --- a/keyboards/takashicompany/qoolee/rules.mk +++ b/keyboards/takashicompany/qoolee/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index 8aff0b5ab84..1ed37283e7e 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -8,6 +8,8 @@ "pid": "0x0019", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/radialex/rules.mk b/keyboards/takashicompany/radialex/rules.mk index d990e8cae36..7800cd80750 100644 --- a/keyboards/takashicompany/radialex/rules.mk +++ b/keyboards/takashicompany/radialex/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index 844736abd4d..c2860145778 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk index 343dd7d5a1c..adea9f5950d 100644 --- a/keyboards/takashiski/hecomi/alpha/rules.mk +++ b/keyboards/takashiski/hecomi/alpha/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashiski/hecomi/rules.mk b/keyboards/takashiski/hecomi/rules.mk index c46100f19e0..41002fe272f 100644 --- a/keyboards/takashiski/hecomi/rules.mk +++ b/keyboards/takashiski/hecomi/rules.mk @@ -1,21 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = takashiski/hecomi/alpha diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index 3c4b8dd2a8a..d1aa7848fc1 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -8,7 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, - "bootloader": "atmel-dfu", + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"4", "x":3, "y":0}, {"label":"5", "x":0, "y":1}, {"label":"6", "x":1, "y":1}, {"label":"7", "x":2, "y":1}, {"label":"8", "x":3, "y":1}] diff --git a/keyboards/takashiski/namecard2x4/rules.mk b/keyboards/takashiski/namecard2x4/rules.mk index e0f4e62f042..dbe601b71f2 100644 --- a/keyboards/takashiski/namecard2x4/rules.mk +++ b/keyboards/takashiski/namecard2x4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index 37844923faf..10d96ddfef3 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"x":0, "y":4, "w":2}, {"label":"Ctrl", "x":2, "y":4, "w":1.25}, {"label":"Alt", "x":3.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"Menu", "x":11.75, "y":4}, {"label":"\u5909\u63db", "x":12.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":14, "y":4, "w":1.25}, {"label":"Alt", "x":15.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":16.5, "y":4, "w":1.25}] diff --git a/keyboards/takashiski/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk index 2406b0dadf8..d43bca5db2a 100644 --- a/keyboards/takashiski/otaku_split/rev0/rules.mk +++ b/keyboards/takashiski/otaku_split/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 9fa11237b68..e94d723857d 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"Insert", "x":8.75, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":3.5, "y":4}, {"label":"2", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"\u5909\u63db", "x":11.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":13, "y":4, "w":1.25}, {"label":"Alt", "x":14.25, "y":4, "w":1.25}, {"label":"Menu", "x":15.5, "y":4}, {"label":"Ctrl", "x":16.5, "y":4, "w":1.25}] diff --git a/keyboards/takashiski/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk index 2406b0dadf8..d43bca5db2a 100644 --- a/keyboards/takashiski/otaku_split/rev1/rules.mk +++ b/keyboards/takashiski/otaku_split/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json index fc335eac92e..62761093d74 100644 --- a/keyboards/taleguers/taleguers75/info.json +++ b/keyboards/taleguers/taleguers75/info.json @@ -8,6 +8,8 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{ diff --git a/keyboards/taleguers/taleguers75/rules.mk b/keyboards/taleguers/taleguers75/rules.mk index 271385424a4..7e8534dae5a 100644 --- a/keyboards/taleguers/taleguers75/rules.mk +++ b/keyboards/taleguers/taleguers75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json index d4e91408498..e4c67e88396 100644 --- a/keyboards/tanuki/info.json +++ b/keyboards/tanuki/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Game", "x":11.25, "y":1}, {"label":"Shift", "x":0.25, "y":2, "w":1.5}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"\"", "x":8.75, "y":2}, {"label":"?", "x":9.75, "y":2}, {"label":"Enter", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3}, {"label":"<", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2}, {"label":">", "x":8.5, "y":3}, {"label":"GUI", "x":9.5, "y":3, "w":1.25}] diff --git a/keyboards/tanuki/rules.mk b/keyboards/tanuki/rules.mk index 453b0fb12f4..9047eadf714 100644 --- a/keyboards/tanuki/rules.mk +++ b/keyboards/tanuki/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json index 5780cbc8cfb..3abaaf33b76 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/info.json @@ -8,6 +8,8 @@ "pid": "0x3EAE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/team0110/p1800fl/rules.mk b/keyboards/team0110/p1800fl/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/team0110/p1800fl/rules.mk +++ b/keyboards/team0110/p1800fl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json index 4c509522ca2..6edc027f664 100644 --- a/keyboards/technika/info.json +++ b/keyboards/technika/info.json @@ -8,6 +8,8 @@ "pid": "0x6049", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/technika/rules.mk b/keyboards/technika/rules.mk index ff93e18a78e..98fc7315de0 100644 --- a/keyboards/technika/rules.mk +++ b/keyboards/technika/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/info.json index 71f71b00d22..a600c0f44b3 100644 --- a/keyboards/teleport/numpad/info.json +++ b/keyboards/teleport/numpad/info.json @@ -7,6 +7,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/teleport/numpad/rules.mk b/keyboards/teleport/numpad/rules.mk index 6a396c74894..1304f503911 100644 --- a/keyboards/teleport/numpad/rules.mk +++ b/keyboards/teleport/numpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json index 5a1647a2de8..8e1a2c62f7b 100644 --- a/keyboards/telophase/info.json +++ b/keyboards/telophase/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk index f6cc685e504..1ee3fc58f95 100644 --- a/keyboards/telophase/rules.mk +++ b/keyboards/telophase/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json index 374279d9ac0..834e0c46c4c 100644 --- a/keyboards/tempo_turtle/bradpad/info.json +++ b/keyboards/tempo_turtle/bradpad/info.json @@ -13,6 +13,8 @@ "pid":"0x6270", "device_version":"0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout":[ diff --git a/keyboards/tempo_turtle/bradpad/rules.mk b/keyboards/tempo_turtle/bradpad/rules.mk index 70c4676db8b..7738ffff8b8 100644 --- a/keyboards/tempo_turtle/bradpad/rules.mk +++ b/keyboards/tempo_turtle/bradpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index c9357100b3d..5d9184a87e8 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -8,6 +8,8 @@ "pid": "0xE936", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}] diff --git a/keyboards/tender/macrowo_pad/rules.mk b/keyboards/tender/macrowo_pad/rules.mk index 039a6132442..a112ce1f160 100644 --- a/keyboards/tender/macrowo_pad/rules.mk +++ b/keyboards/tender/macrowo_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json index e3f634cbede..560adac6b63 100644 --- a/keyboards/tenki/info.json +++ b/keyboards/tenki/info.json @@ -8,6 +8,8 @@ "pid": "0x5445", "device_version": "10.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/tenki/rules.mk b/keyboards/tenki/rules.mk index 82cf2b723bb..c4a40815c6d 100644 --- a/keyboards/tenki/rules.mk +++ b/keyboards/tenki/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json index 1fa582f82dd..36382c46484 100644 --- a/keyboards/terrazzo/info.json +++ b/keyboards/terrazzo/info.json @@ -8,6 +8,8 @@ "pid": "0x545A", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/terrazzo/rules.mk b/keyboards/terrazzo/rules.mk index e481089976b..ae42fe8a2fd 100644 --- a/keyboards/terrazzo/rules.mk +++ b/keyboards/terrazzo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json index eaae708614b..c0b9742dd01 100644 --- a/keyboards/tetris/info.json +++ b/keyboards/tetris/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_planck_mit": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/tetris/rules.mk b/keyboards/tetris/rules.mk index e68d632b65e..60057f2aa70 100755 --- a/keyboards/tetris/rules.mk +++ b/keyboards/tetris/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json index dca51d99274..775367c426c 100644 --- a/keyboards/tg4x/info.json +++ b/keyboards/tg4x/info.json @@ -8,6 +8,8 @@ "pid": "0x0458", "device_version": "0.2.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3, "w":1.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/tg4x/rules.mk b/keyboards/tg4x/rules.mk index 9558b2243fc..dcad20d05ad 100644 --- a/keyboards/tg4x/rules.mk +++ b/keyboards/tg4x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json index 694d4be5d92..bf9d895b4d6 100644 --- a/keyboards/tgr/910/info.json +++ b/keyboards/tgr/910/info.json @@ -8,6 +8,8 @@ "pid": "0x9100", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/tgr/910/rules.mk b/keyboards/tgr/910/rules.mk index 9a2e1da0ded..9a00928ea84 100644 --- a/keyboards/tgr/910/rules.mk +++ b/keyboards/tgr/910/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json index 7fb25e44129..d38a4720f34 100644 --- a/keyboards/tgr/910ce/info.json +++ b/keyboards/tgr/910ce/info.json @@ -8,6 +8,8 @@ "pid": "0x910C", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/tgr/910ce/rules.mk b/keyboards/tgr/910ce/rules.mk index 3be499411c4..78a6bee271d 100644 --- a/keyboards/tgr/910ce/rules.mk +++ b/keyboards/tgr/910ce/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json index f5be2ed6a39..cd1d330103f 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/info.json @@ -8,6 +8,8 @@ "pid": "0x422E", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk index 9686fd1aa4c..25437c442c6 100644 --- a/keyboards/tgr/alice/rules.mk +++ b/keyboards/tgr/alice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json index 101b66eded8..89949c886fe 100644 --- a/keyboards/tgr/jane/v2/info.json +++ b/keyboards/tgr/jane/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4A4E", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/tgr/jane/v2/rules.mk b/keyboards/tgr/jane/v2/rules.mk index 7bc9adda6b1..4ba23862208 100644 --- a/keyboards/tgr/jane/v2/rules.mk +++ b/keyboards/tgr/jane/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json index bbcb90bff04..391b657bed7 100644 --- a/keyboards/tgr/jane/v2ce/info.json +++ b/keyboards/tgr/jane/v2ce/info.json @@ -8,6 +8,8 @@ "pid": "0x4A43", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan", "tkl_f13_iso", "tkl_f13_iso_tsangan"], "layouts": { "LAYOUT_all_f13": { diff --git a/keyboards/tgr/jane/v2ce/rules.mk b/keyboards/tgr/jane/v2ce/rules.mk index 4bcec1c4ebe..ea1cd4ec4f2 100644 --- a/keyboards/tgr/jane/v2ce/rules.mk +++ b/keyboards/tgr/jane/v2ce/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json index 2c7034e5fc8..bd2a42b77fc 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/info.json @@ -8,6 +8,8 @@ "pid": "0x5452", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/tgr/tris/rules.mk b/keyboards/tgr/tris/rules.mk index 9a2e1da0ded..9a00928ea84 100644 --- a/keyboards/tgr/tris/rules.mk +++ b/keyboards/tgr/tris/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index d6f25ee6fe9..a1480dc5ffb 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_base_kit_all": { "layout": [ diff --git a/keyboards/the_royal/liminal/rules.mk b/keyboards/the_royal/liminal/rules.mk index 88173a40c20..a927de843cb 100644 --- a/keyboards/the_royal/liminal/rules.mk +++ b/keyboards/the_royal/liminal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json index a072970a382..97d10f6edc4 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/info.json @@ -8,6 +8,8 @@ "pid": "0x3521", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_mit": { "layout": [ diff --git a/keyboards/the_royal/schwann/rules.mk b/keyboards/the_royal/schwann/rules.mk index 53fe216163e..d7bdfe544b5 100644 --- a/keyboards/the_royal/schwann/rules.mk +++ b/keyboards/the_royal/schwann/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json index 7c919dc3bc8..9c1a9c8f5f9 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/info.json +++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x1701", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk index 866a3204bb6..dd5d8dbfe96 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk +++ b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json index c79d8ac305a..c6dc44ccec4 100644 --- a/keyboards/themadnoodle/noodlepad/info.json +++ b/keyboards/themadnoodle/noodlepad/info.json @@ -8,6 +8,8 @@ "pid": "0x1701", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/themadnoodle/noodlepad/rules.mk b/keyboards/themadnoodle/noodlepad/rules.mk index 866a3204bb6..dd5d8dbfe96 100644 --- a/keyboards/themadnoodle/noodlepad/rules.mk +++ b/keyboards/themadnoodle/noodlepad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json index b7df06e4601..961a89c94f5 100644 --- a/keyboards/thevankeyboards/bananasplit/info.json +++ b/keyboards/thevankeyboards/bananasplit/info.json @@ -8,6 +8,8 @@ "pid": "0x8870", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_base": { diff --git a/keyboards/thevankeyboards/bananasplit/rules.mk b/keyboards/thevankeyboards/bananasplit/rules.mk index df3f2cc64a8..f5b6814e29b 100644 --- a/keyboards/thevankeyboards/bananasplit/rules.mk +++ b/keyboards/thevankeyboards/bananasplit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/thevankeyboards/caravan/info.json b/keyboards/thevankeyboards/caravan/info.json index 8dbc08fccee..43a1f7ed70a 100644 --- a/keyboards/thevankeyboards/caravan/info.json +++ b/keyboards/thevankeyboards/caravan/info.json @@ -8,6 +8,8 @@ "pid": "0x8844", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/thevankeyboards/caravan/rules.mk b/keyboards/thevankeyboards/caravan/rules.mk index b314e12196b..5f2f28d2d25 100644 --- a/keyboards/thevankeyboards/caravan/rules.mk +++ b/keyboards/thevankeyboards/caravan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json index 8a9d4c69919..022ac65f5cb 100644 --- a/keyboards/thevankeyboards/jetvan/info.json +++ b/keyboards/thevankeyboards/jetvan/info.json @@ -8,6 +8,8 @@ "pid": "0x8858", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/thevankeyboards/jetvan/rules.mk b/keyboards/thevankeyboards/jetvan/rules.mk index fd419767781..725d8386824 100644 --- a/keyboards/thevankeyboards/jetvan/rules.mk +++ b/keyboards/thevankeyboards/jetvan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json index 82537ef0454..563bcc73ed2 100644 --- a/keyboards/thevankeyboards/minivan/info.json +++ b/keyboards/thevankeyboards/minivan/info.json @@ -8,6 +8,8 @@ "pid": "0x8844", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Win", "x":9.5, "y":3, "w":1.5}, {"label":"Menu", "x":11, "y":3, "w":1.75}] diff --git a/keyboards/thevankeyboards/minivan/rules.mk b/keyboards/thevankeyboards/minivan/rules.mk index ffebb6f44c1..b983ff075df 100644 --- a/keyboards/thevankeyboards/minivan/rules.mk +++ b/keyboards/thevankeyboards/minivan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/thevankeyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json index 280e34ecb81..7f71bb7abd5 100644 --- a/keyboards/thevankeyboards/roadkit/info.json +++ b/keyboards/thevankeyboards/roadkit/info.json @@ -8,6 +8,8 @@ "pid": "0x8846", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["numpad_4x4", "ortho_4x4"], "layouts": { "LAYOUT_numpad_4x4": { diff --git a/keyboards/thevankeyboards/roadkit/rules.mk b/keyboards/thevankeyboards/roadkit/rules.mk index 4615493faf3..a75f1b96cbf 100644 --- a/keyboards/thevankeyboards/roadkit/rules.mk +++ b/keyboards/thevankeyboards/roadkit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json index b673e5d30d1..7cce73d271e 100644 --- a/keyboards/tkc/california/info.json +++ b/keyboards/tkc/california/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.5, "y":0}, {"label":"Home", "x":17, "y":0}, {"label":"End", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"PgUp", "x":15.5, "y":1.5}, {"label":"Num Lock", "x":17, "y":1.5}, {"label":"/", "x":18, "y":1.5}, {"label":"*", "x":19, "y":1.5}, {"label":"-", "x":20, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"PgDn", "x":15.5, "y":2.5}, {"label":"7", "x":17, "y":2.5}, {"label":"8", "x":18, "y":2.5}, {"label":"9", "x":19, "y":2.5}, {"label":"+", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":17, "y":3.5}, {"label":"5", "x":18, "y":3.5}, {"label":"6", "x":19, "y":3.5}, {"x":20, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":15.5, "y":4.75}, {"label":"1", "x":17, "y":4.5}, {"label":"2", "x":18, "y":4.5}, {"label":"3", "x":19, "y":4.5}, {"label":"Enter", "x":20, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":14.5, "y":5.75}, {"label":"\u2193", "x":15.5, "y":5.75}, {"label":"\u2192", "x":16.5, "y":5.75}, {"label":"0", "x":18, "y":5.5}, {"label":".", "x":19, "y":5.5}, {"x":20, "y":5.5}] diff --git a/keyboards/tkc/california/rules.mk b/keyboards/tkc/california/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/tkc/california/rules.mk +++ b/keyboards/tkc/california/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json index c902c78ceed..53ed1e97dcd 100644 --- a/keyboards/tkc/candybar/lefty/info.json +++ b/keyboards/tkc/candybar/lefty/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.6" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk index 52cb35c5a2d..36101d2f8ee 100644 --- a/keyboards/tkc/candybar/lefty/rules.mk +++ b/keyboards/tkc/candybar/lefty/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json index c902c78ceed..a6e14261aa8 100644 --- a/keyboards/tkc/candybar/lefty_r3/info.json +++ b/keyboards/tkc/candybar/lefty_r3/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.6" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/lefty_r3/rules.mk b/keyboards/tkc/candybar/lefty_r3/rules.mk index 50212596670..92e817504f9 100644 --- a/keyboards/tkc/candybar/lefty_r3/rules.mk +++ b/keyboards/tkc/candybar/lefty_r3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json index 4dde92d27f6..e964fb23840 100644 --- a/keyboards/tkc/candybar/righty/info.json +++ b/keyboards/tkc/candybar/righty/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.6" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk index 52cb35c5a2d..36101d2f8ee 100644 --- a/keyboards/tkc/candybar/righty/rules.mk +++ b/keyboards/tkc/candybar/righty/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json index 4dde92d27f6..1a93578325d 100644 --- a/keyboards/tkc/candybar/righty_r3/info.json +++ b/keyboards/tkc/candybar/righty_r3/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.6" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/candybar/righty_r3/rules.mk b/keyboards/tkc/candybar/righty_r3/rules.mk index 50212596670..92e817504f9 100644 --- a/keyboards/tkc/candybar/righty_r3/rules.mk +++ b/keyboards/tkc/candybar/righty_r3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json index 6cffc225aca..f892202a397 100644 --- a/keyboards/tkc/godspeed75/info.json +++ b/keyboards/tkc/godspeed75/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Scroll Lock", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"label":"BkSp", "x":14, "y":1}, {"label":"PgUp", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"PgDn", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Insert", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"Delete", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.25}, {"x":3.5, "y":5, "w":6.25}, {"label":"MO(1)", "x":9.75, "y":5, "w":1.25}, {"label":"Ctrl", "x":11, "y":5, "w":1.25}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] diff --git a/keyboards/tkc/godspeed75/rules.mk b/keyboards/tkc/godspeed75/rules.mk index 8728fe0a377..0f15f10b208 100644 --- a/keyboards/tkc/godspeed75/rules.mk +++ b/keyboards/tkc/godspeed75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json index 4383bc04dd0..d685fa1eee0 100644 --- a/keyboards/tkc/m0lly/info.json +++ b/keyboards/tkc/m0lly/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/tkc/m0lly/rules.mk b/keyboards/tkc/m0lly/rules.mk index 8f29a8ea518..f07afe6ed40 100644 --- a/keyboards/tkc/m0lly/rules.mk +++ b/keyboards/tkc/m0lly/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json index c7483dc2aa5..d718a790c4e 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_default_ansi": { diff --git a/keyboards/tkc/osav2/rules.mk b/keyboards/tkc/osav2/rules.mk index 7767432831b..e98264035d1 100644 --- a/keyboards/tkc/osav2/rules.mk +++ b/keyboards/tkc/osav2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json index 272492b9f15..6fd68e21eaf 100644 --- a/keyboards/tkc/portico/info.json +++ b/keyboards/tkc/portico/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker" diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk index e6360748d21..278b7fd572b 100644 --- a/keyboards/tkc/portico/rules.mk +++ b/keyboards/tkc/portico/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json index 039a53dd165..844a727864a 100644 --- a/keyboards/tkc/portico68v2/info.json +++ b/keyboards/tkc/portico68v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/tkc/portico68v2/rules.mk b/keyboards/tkc/portico68v2/rules.mk index f8e7ced9816..c96ee7d13a9 100644 --- a/keyboards/tkc/portico68v2/rules.mk +++ b/keyboards/tkc/portico68v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json index 7b11a8f3f1a..c84a742761e 100644 --- a/keyboards/tkc/portico75/info.json +++ b/keyboards/tkc/portico75/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk index e8a74c9026e..cdc33f0c090 100644 --- a/keyboards/tkc/portico75/rules.mk +++ b/keyboards/tkc/portico75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json index 4d1de2e2f16..39d55cc2cee 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "processor": "at90usb1286", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkc/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk index cf95bbd4b2e..f9f3b206d04 100644 --- a/keyboards/tkc/tkc1800/rules.mk +++ b/keyboards/tkc/tkc1800/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json index d7b6b8f070a..e14b8c02ecc 100644 --- a/keyboards/tkc/tkl_ab87/info.json +++ b/keyboards/tkc/tkl_ab87/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/tkc/tkl_ab87/rules.mk b/keyboards/tkc/tkl_ab87/rules.mk index 63a57dcadb9..45377383806 100644 --- a/keyboards/tkc/tkl_ab87/rules.mk +++ b/keyboards/tkc/tkl_ab87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index dc4cf5a0eeb..d1d4b729d4b 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -6,6 +6,9 @@ "vid": "0xFEED", "pid": "0x7812" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 2220b162529..1b481a9e1e3 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json index 4d77a4ac683..2a8814d840a 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x7811", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["65_iso", "65_ansi"], "layouts": { "LAYOUT_encoder": { diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk index 837489db841..8dca0665f77 100644 --- a/keyboards/tkw/stoutgat/v1/rules.mk +++ b/keyboards/tkw/stoutgat/v1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/tkw/stoutgat/v2/f411/info.json b/keyboards/tkw/stoutgat/v2/f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/tkw/stoutgat/v2/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk index c25a64f4b3b..e69de29bb2d 100644 --- a/keyboards/tkw/stoutgat/v2/f411/rules.mk +++ b/keyboards/tkw/stoutgat/v2/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json index 04e2d5bdc1c..24d9e8296a4 100644 --- a/keyboards/tmo50/info.json +++ b/keyboards/tmo50/info.json @@ -8,6 +8,8 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"", "x":0, "y":0}, {"label":"", "x":1.25, "y":0}, {"label":"", "x":2.25, "y":0}, {"label":"", "x":3.25, "y":0}, {"label":"", "x":4.25, "y":0}, {"label":"", "x":5.25, "y":0}, {"label":"", "x":6.25, "y":0}, {"label":"", "x":7.25, "y":0}, {"label":"", "x":8.25, "y":0}, {"label":"", "x":9.25, "y":0}, {"label":"", "x":10.25, "y":0}, {"label":"", "x":11.25, "y":0}, {"label":"", "x":12.25, "y":0}, {"label":"", "x":13.25, "y":0}, {"label":"", "x":14.25, "y":0}, {"x":0, "y":1}, {"label":"Ctrl", "x":1.25, "y":1, "w":1.25}, {"label":"", "x":2.5, "y":1}, {"label":"", "x":3.5, "y":1}, {"label":"", "x":4.5, "y":1}, {"label":"", "x":5.5, "y":1}, {"label":"", "x":6.5, "y":1}, {"label":"", "x":7.5, "y":1}, {"label":"", "x":8.5, "y":1}, {"label":"", "x":9.5, "y":1}, {"label":"", "x":10.5, "y":1}, {"label":"", "x":11.5, "y":1}, {"label":"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"", "x":3, "y":2}, {"label":"", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"", "x":6, "y":2}, {"label":"b", "x":7, "y":2}, {"label":"", "x":8, "y":2}, {"label":"m", "x":9, "y":2}, {"label":"", "x":10, "y":2}, {"label":"", "x":11, "y":2}, {"label":"", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"", "x":14.25, "y":2}, {"x":0, "y":3}, {"label":"Alt", "x":2.75, "y":3}, {"label":"Win", "x":3.75, "y":3, "w":1.5}, {"label":"", "x":5.25, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"AltGr", "x":10.25, "y":3, "w":1.5}, {"label":"L3", "x":11.75, "y":3}] diff --git a/keyboards/tmo50/rules.mk b/keyboards/tmo50/rules.mk index 38f81fd4dcc..1955f1d315b 100644 --- a/keyboards/tmo50/rules.mk +++ b/keyboards/tmo50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json index 34b7b9d6eb5..370241b6ff6 100644 --- a/keyboards/toad/info.json +++ b/keyboards/toad/info.json @@ -8,6 +8,8 @@ "pid": "0x6776", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/toad/rules.mk b/keyboards/toad/rules.mk index 82694737e60..51c80ed6cf1 100644 --- a/keyboards/toad/rules.mk +++ b/keyboards/toad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index 220e2381289..1113fbf3924 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -8,6 +8,8 @@ "pid": "0x4134", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_40_alix": { "layout": [{ diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk index 358de97c5a3..2c7a2758470 100644 --- a/keyboards/tokyokeyboard/alix40/rules.mk +++ b/keyboards/tokyokeyboard/alix40/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index 27007871ce3..b39dff92bc6 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/tokyokeyboard/tokyo60/rules.mk b/keyboards/tokyokeyboard/tokyo60/rules.mk index 2e5dfef9793..f3d19b1d395 100644 --- a/keyboards/tokyokeyboard/tokyo60/rules.mk +++ b/keyboards/tokyokeyboard/tokyo60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/adalyn/info.json b/keyboards/tominabox1/adalyn/info.json index 4fe658d5a3e..93b478d5603 100644 --- a/keyboards/tominabox1/adalyn/info.json +++ b/keyboards/tominabox1/adalyn/info.json @@ -8,6 +8,8 @@ "pid": "0x6164", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0, "w":1.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":10.75, "y":3}] diff --git a/keyboards/tominabox1/adalyn/rules.mk b/keyboards/tominabox1/adalyn/rules.mk index 4574cfd83a7..60522b4706e 100644 --- a/keyboards/tominabox1/adalyn/rules.mk +++ b/keyboards/tominabox1/adalyn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json index 4c18c895559..79150cd3c27 100644 --- a/keyboards/tominabox1/bigboy/info.json +++ b/keyboards/tominabox1/bigboy/info.json @@ -8,6 +8,8 @@ "pid": "0x6262", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}] diff --git a/keyboards/tominabox1/bigboy/rules.mk b/keyboards/tominabox1/bigboy/rules.mk index a31774530d8..28fb3e866d6 100755 --- a/keyboards/tominabox1/bigboy/rules.mk +++ b/keyboards/tominabox1/bigboy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json index b377cdff008..14c0e6d7cb3 100644 --- a/keyboards/tominabox1/le_chiffre/he/info.json +++ b/keyboards/tominabox1/le_chiffre/he/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/tominabox1/le_chiffre/he/rules.mk b/keyboards/tominabox1/le_chiffre/he/rules.mk index 7054ebf63ba..812087ff8e6 100644 --- a/keyboards/tominabox1/le_chiffre/he/rules.mk +++ b/keyboards/tominabox1/le_chiffre/he/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json index 90ac25f360b..dab37baf045 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/info.json +++ b/keyboards/tominabox1/le_chiffre/rev1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk index 2cd4ebf52f7..c1a9ea05953 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk +++ b/keyboards/tominabox1/le_chiffre/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json index e557e4d3076..65be217368d 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/info.json +++ b/keyboards/tominabox1/le_chiffre/rev2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/tominabox1/le_chiffre/rev2/rules.mk b/keyboards/tominabox1/le_chiffre/rev2/rules.mk index 2cd4ebf52f7..c1a9ea05953 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/rules.mk +++ b/keyboards/tominabox1/le_chiffre/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json index 107b62910c5..c9e9f645cd2 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"x":1.5, "y":4, "w":7}] diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk index 67bea6b6093..964fd155399 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk +++ b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json index 107b62910c5..c9e9f645cd2 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"x":1.5, "y":4, "w":7}] diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk index 67bea6b6093..964fd155399 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk +++ b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json index 9e524eb5c3a..8e9ce395cd4 100644 --- a/keyboards/tominabox1/qaz/info.json +++ b/keyboards/tominabox1/qaz/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0, "w":1.25}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"Ent", "x":9.25, "y":1}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":".", "x":7.75, "y":2}, {"label":"Shift","x":8.75, "y":2, "w":1.5},{"label":"Super", "x":0, "y":3}, {"label":"Meta", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"", "x":3, "y":3, "w":2.25}, {"label":"", "x":5.25, "y":3, "w":2}, {"label":"AltGr", "x":7.25, "y":3},{"label":"Meta", "x":8.25, "y":3},{"label":"Super", "x":9.25, "y":3}] diff --git a/keyboards/tominabox1/qaz/rules.mk b/keyboards/tominabox1/qaz/rules.mk index d946d8641a3..b851d0ab392 100644 --- a/keyboards/tominabox1/qaz/rules.mk +++ b/keyboards/tominabox1/qaz/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json index 7dac1510004..2d71b0a3275 100644 --- a/keyboards/tominabox1/underscore33/rev1/info.json +++ b/keyboards/tominabox1/underscore33/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3301", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_33_big_space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":6.25}, {"label":"", "x":8.15, "y":3, "w":1.25}] diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/tominabox1/underscore33/rev1/rules.mk +++ b/keyboards/tominabox1/underscore33/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json index 36f8b5d8ee6..d6b5b04b2a2 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x3302", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_33_big_space": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":6.25}, {"label":"", "x":8.15, "y":3, "w":1.25}] diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk index dd550e3ae52..dd8f1a5ae7d 100644 --- a/keyboards/tominabox1/underscore33/rev2/rules.mk +++ b/keyboards/tominabox1/underscore33/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json index 26e6ade034e..4f878b2620d 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk index 280eaf8da54..7d7b3015899 100644 --- a/keyboards/torn/rules.mk +++ b/keyboards/torn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json index c20d14ce7e1..999f8deb614 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/info.json @@ -8,6 +8,8 @@ "pid": "0x0DB8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_6x6": { "layout": [ diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk index 45ffab29f43..c22f3a2da55 100644 --- a/keyboards/touchpad/rules.mk +++ b/keyboards/touchpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json index 8a8fbdff780..09e236dbd2a 100644 --- a/keyboards/tr60w/info.json +++ b/keyboards/tr60w/info.json @@ -8,6 +8,8 @@ "pid": "0x4140", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/tr60w/rules.mk b/keyboards/tr60w/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/tr60w/rules.mk +++ b/keyboards/tr60w/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index fbeffd539c7..57c6289d0d6 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -8,6 +8,8 @@ "pid": "0x8947", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/trashman/ketch/rules.mk b/keyboards/trashman/ketch/rules.mk index 08651407c59..5525d13f88b 100644 --- a/keyboards/trashman/ketch/rules.mk +++ b/keyboards/trashman/ketch/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json index 4f97080c006..6abc631310c 100644 --- a/keyboards/treasure/type9/info.json +++ b/keyboards/treasure/type9/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/treasure/type9/rules.mk b/keyboards/treasure/type9/rules.mk index 539eb1bf11b..fab0de3b945 100644 --- a/keyboards/treasure/type9/rules.mk +++ b/keyboards/treasure/type9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json index 388b202af08..ce99c159da4 100644 --- a/keyboards/treasure/type9s2/info.json +++ b/keyboards/treasure/type9s2/info.json @@ -8,6 +8,8 @@ "pid": "0x5492", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/treasure/type9s2/rules.mk b/keyboards/treasure/type9s2/rules.mk index 88f7e1f94cb..7dc6feef9d7 100644 --- a/keyboards/treasure/type9s2/rules.mk +++ b/keyboards/treasure/type9s2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json index e557e4d3076..f5e8f4835da 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/info.json +++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk index 821cf296322..0a85fffb85c 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk +++ b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json index b377cdff008..86af52a58d0 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/info.json +++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk index 023c22cd2c9..e69de29bb2d 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk +++ b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk @@ -1,7 +0,0 @@ -# Overrides for the Bluepill version - -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json index 90ac25f360b..def31867f6a 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/info.json +++ b/keyboards/tronguylabs/m122_3270/teensy/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/tronguylabs/m122_3270/teensy/rules.mk b/keyboards/tronguylabs/m122_3270/teensy/rules.mk index 16c4501c04d..0a85fffb85c 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/rules.mk +++ b/keyboards/tronguylabs/m122_3270/teensy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json index ad2e67dc703..b9c440e37f0 100644 --- a/keyboards/tszaboo/ortho4exent/info.json +++ b/keyboards/tszaboo/ortho4exent/info.json @@ -8,6 +8,8 @@ "pid": "0x7934", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tszaboo/ortho4exent/rules.mk b/keyboards/tszaboo/ortho4exent/rules.mk index 12b5d9ec2c1..e7aeda848fe 100644 --- a/keyboards/tszaboo/ortho4exent/rules.mk +++ b/keyboards/tszaboo/ortho4exent/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json index 64405edae43..2a11247d923 100644 --- a/keyboards/tunks/ergo33/info.json +++ b/keyboards/tunks/ergo33/info.json @@ -7,6 +7,8 @@ "pid": "0xA0A1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tunks/ergo33/rules.mk b/keyboards/tunks/ergo33/rules.mk index bd1dc8586aa..bff15770a8e 100644 --- a/keyboards/tunks/ergo33/rules.mk +++ b/keyboards/tunks/ergo33/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json index 68baf1819bd..86cba9bbfe0 100644 --- a/keyboards/tw40/info.json +++ b/keyboards/tw40/info.json @@ -8,6 +8,8 @@ "pid": "0x5457", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/tw40/rules.mk b/keyboards/tw40/rules.mk index 1f52c371540..2eba275490a 100644 --- a/keyboards/tw40/rules.mk +++ b/keyboards/tw40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json index 756235aaf85..7ce37df59e5 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/info.json @@ -8,6 +8,8 @@ "pid": "0x0868", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ubest/vn/rules.mk b/keyboards/ubest/vn/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/ubest/vn/rules.mk +++ b/keyboards/ubest/vn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json index 0481c330814..06c6626a0ab 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/info.json @@ -8,6 +8,8 @@ "pid": "0x004E", "device_version": "0.0.2" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K012", "x":12, "y":0}, {"label":"K013", "x":13, "y":0}, {"label":"K014", "x":14, "y":0}, {"label":"K015", "x":15, "y":0}, {"label":"K016", "x":16, "y":0}, {"label":"K017", "x":17, "y":0}, {"label":"K018", "x":18, "y":0}, {"label":"K100", "x":0, "y":1, "w":1.5}, {"label":"K101", "x":1.5, "y":1}, {"label":"K102", "x":2.5, "y":1}, {"label":"K103", "x":3.5, "y":1}, {"label":"K104", "x":4.5, "y":1}, {"label":"K105", "x":5.5, "y":1}, {"label":"K106", "x":6.5, "y":1}, {"label":"K107", "x":7.5, "y":1}, {"label":"K108", "x":8.5, "y":1}, {"label":"K109", "x":9.5, "y":1}, {"label":"K110", "x":10.5, "y":1}, {"label":"K111", "x":11.5, "y":1}, {"label":"K112", "x":12.5, "y":1}, {"label":"K114", "x":13.5, "y":1, "w":1.5}, {"label":"K115", "x":15, "y":1}, {"label":"K116", "x":16, "y":1}, {"label":"K117", "x":17, "y":1}, {"label":"K118", "x":18, "y":1}, {"label":"K200", "x":0, "y":2, "w":1.75}, {"label":"K201", "x":1.75, "y":2}, {"label":"K202", "x":2.75, "y":2}, {"label":"K203", "x":3.75, "y":2}, {"label":"K204", "x":4.75, "y":2}, {"label":"K205", "x":5.75, "y":2}, {"label":"K206", "x":6.75, "y":2}, {"label":"K207", "x":7.75, "y":2}, {"label":"K208", "x":8.75, "y":2}, {"label":"K209", "x":9.75, "y":2}, {"label":"K210", "x":10.75, "y":2}, {"label":"K211", "x":11.75, "y":2}, {"label":"K212", "x":12.75, "y":2}, {"label":"K214", "x":13.75, "y":2, "w":1.25}, {"label":"K215", "x":15, "y":2}, {"label":"K216", "x":16, "y":2}, {"label":"K217", "x":17, "y":2}, {"label":"K218", "x":18, "y":2}, {"label":"K300", "x":0, "y":3, "w":1.25}, {"label":"K301", "x":1.25, "y":3}, {"label":"K302", "x":2.25, "y":3}, {"label":"K303", "x":3.25, "y":3}, {"label":"K304", "x":4.25, "y":3}, {"label":"K305", "x":5.25, "y":3}, {"label":"K306", "x":6.25, "y":3}, {"label":"K307", "x":7.25, "y":3}, {"label":"K308", "x":8.25, "y":3}, {"label":"K309", "x":9.25, "y":3}, {"label":"K310", "x":10.25, "y":3}, {"label":"K311", "x":11.25, "y":3}, {"label":"K312", "x":12.25, "y":3}, {"label":"K313", "x":13.25, "y":3, "w":0.75}, {"label":"K314", "x":14, "y":3}, {"label":"K315", "x":15, "y":3}, {"label":"K316", "x":16, "y":3}, {"label":"K317", "x":17, "y":3}, {"label":"K318", "x":18, "y":3}, {"label":"K400", "x":0, "y":4, "w":1.25}, {"label":"K401", "x":1.25, "y":4, "w":1.25}, {"label":"K402", "x":2.5, "y":4, "w":1.25}, {"label":"K406", "x":3.75, "y":4, "w":6.25}, {"label":"K410", "x":10, "y":4}, {"label":"K411", "x":11, "y":4}, {"label":"K412", "x":12, "y":4}, {"label":"K413", "x":13, "y":4}, {"label":"K414", "x":14, "y":4}, {"label":"K415", "x":15, "y":4}, {"label":"K416", "x":16, "y":4}, {"label":"K417", "x":17, "y":4}, {"label":"K418", "x":18, "y":4}] diff --git a/keyboards/uk78/rules.mk b/keyboards/uk78/rules.mk index 0cf8df9c199..ce70b7c8f23 100644 --- a/keyboards/uk78/rules.mk +++ b/keyboards/uk78/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json index bc562186f4a..0adbbc45b15 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/info.json @@ -8,6 +8,8 @@ "pid": "0x4C50", "device_version": "99.9.9" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk index 49bc956e733..1177444e3e8 100644 --- a/keyboards/ungodly/launch_pad/rules.mk +++ b/keyboards/ungodly/launch_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ungodly/nines/info.json b/keyboards/ungodly/nines/info.json index 1a15a069e65..ee71e97cf50 100644 --- a/keyboards/ungodly/nines/info.json +++ b/keyboards/ungodly/nines/info.json @@ -8,6 +8,8 @@ "pid": "0x544E", "device_version": "99.9.9" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/ungodly/nines/rules.mk b/keyboards/ungodly/nines/rules.mk index c83294559fb..00d9411a632 100644 --- a/keyboards/ungodly/nines/rules.mk +++ b/keyboards/ungodly/nines/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index bfb70eb880e..e9ff22250e5 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "STM32F446", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk index 8acd50a10f2..225317b3674 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F446 # STM32F446RET6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index d5357c1c9b6..e207af78b11 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "STM32F446", // RET6 + "bootloader": "stm32-dfu", "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk index 8acd50a10f2..225317b3674 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F446 # STM32F446RET6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json index d991b81f4ac..3d479bfcfb6 100644 --- a/keyboards/unicomp/pc122/info.json +++ b/keyboards/unicomp/pc122/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "STM32F446", // RET6 + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":0, "y":2.5}, {"x":1, "y":2.5}, {"x":2.25, "y":2.5}, {"x":3.25, "y":2.5}, {"x":4.25, "y":2.5}, {"x":5.25, "y":2.5}, {"x":6.25, "y":2.5}, {"x":7.25, "y":2.5}, {"x":8.25, "y":2.5}, {"x":9.25, "y":2.5}, {"x":10.25, "y":2.5}, {"x":11.25, "y":2.5}, {"x":12.25, "y":2.5}, {"x":13.25, "y":2.5}, {"x":14.25, "y":2.5}, {"x":15.25, "y":2.5, "w":2}, {"x":17.75, "y":2.5}, {"x":18.75, "y":2.5}, {"x":19.75, "y":2.5}, {"x":21.25, "y":2.5}, {"x":22.25, "y":2.5}, {"x":23.25, "y":2.5}, {"x":24.25, "y":2.5}, {"x":0, "y":3.5}, {"x":1, "y":3.5}, {"x":2.25, "y":3.5, "w":1.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5}, {"x":14.75, "y":3.5}, {"x":15.75, "y":3.5, "w":1.5}, {"x":17.75, "y":3.5}, {"x":18.75, "y":3.5}, {"x":19.75, "y":3.5}, {"x":21.25, "y":3.5}, {"x":22.25, "y":3.5}, {"x":23.25, "y":3.5}, {"x":24.25, "y":3.5}, {"x":0, "y":4.5}, {"x":1, "y":4.5}, {"x":2.25, "y":4.5, "w":1.75}, {"x":4, "y":4.5}, {"x":5, "y":4.5}, {"x":6, "y":4.5}, {"x":7, "y":4.5}, {"x":8, "y":4.5}, {"x":9, "y":4.5}, {"x":10, "y":4.5}, {"x":11, "y":4.5}, {"x":12, "y":4.5}, {"x":13, "y":4.5}, {"x":14, "y":4.5}, {"x":15, "y":4.5}, {"x":16, "y":4.5, "w":1.25}, {"x":18.75, "y":4.5}, {"x":21.25, "y":4.5}, {"x":22.25, "y":4.5}, {"x":23.25, "y":4.5}, {"x":24.25, "y":4.5}, {"x":0, "y":5.5}, {"x":1, "y":5.5}, {"x":2.25, "y":5.5, "w":1.25}, {"x":3.5, "y":5.5}, {"x":4.5, "y":5.5}, {"x":5.5, "y":5.5}, {"x":6.5, "y":5.5}, {"x":7.5, "y":5.5}, {"x":8.5, "y":5.5}, {"x":9.5, "y":5.5}, {"x":10.5, "y":5.5}, {"x":11.5, "y":5.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5}, {"x":14.5, "y":5.5, "w":2.75}, {"x":17.75, "y":5.5}, {"x":18.75, "y":5.5}, {"x":19.75, "y":5.5}, {"x":21.25, "y":5.5}, {"x":22.25, "y":5.5}, {"x":23.25, "y":5.5}, {"x":24.25, "y":5.5, "h":2}, {"x":0, "y":6.5}, {"x":1, "y":6.5}, {"x":2.25, "y":6.5, "w":1.5}, {"x":4.75, "y":6.5, "w":1.5}, {"x":6.25, "y":6.5, "w":7}, {"x":13.25, "y":6.5, "w":1.5}, {"x":15.75, "y":6.5, "w":1.5}, {"x":18.75, "y":6.5}, {"x":21.25, "y":6.5, "w":2}, {"x":23.25, "y":6.5}] diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk index 8acd50a10f2..225317b3674 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F446 # STM32F446RET6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index bfc60adfafa..8e3fd6bf746 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "STM32F446", // RET6 + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk index 8acd50a10f2..225317b3674 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F446 # STM32F446RET6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index 3ce16d2c09e..a1ef9dc2f0a 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "STM32F446", // RET6 + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5, "w":1.25}, {"x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.25}, {"x":12.25, "y":5.5, "w":1.25}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk index 8acd50a10f2..225317b3674 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F446 # STM32F446RET6 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index 74dc2641a1c..01c2922b254 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -8,6 +8,8 @@ "pid": "0x1257", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}] diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk index 7fc9fd22914..40695440183 100644 --- a/keyboards/unikeyboard/diverge3/rules.mk +++ b/keyboards/unikeyboard/diverge3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json index 4d707c944c8..f58dbecdce0 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/info.json @@ -8,6 +8,8 @@ "pid": "0x1256", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk index bd539487974..7f1fc659ccb 100644 --- a/keyboards/unikeyboard/divergetm2/rules.mk +++ b/keyboards/unikeyboard/divergetm2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json index 47ed824f629..f8ebb754247 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/unikeyboard/felix/rules.mk b/keyboards/unikeyboard/felix/rules.mk index c2e40b55c50..b325f3f0c79 100644 --- a/keyboards/unikeyboard/felix/rules.mk +++ b/keyboards/unikeyboard/felix/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json index 671bb1870ed..732b9380c8b 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/info.json @@ -8,6 +8,8 @@ "pid": "0x556B", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/unikorn/rules.mk b/keyboards/unikorn/rules.mk index 7bc9adda6b1..4ba23862208 100644 --- a/keyboards/unikorn/rules.mk +++ b/keyboards/unikorn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json index 00de673b9e6..d0122e8108f 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/info.json @@ -8,6 +8,8 @@ "pid": "0x176A", "device_version": "0.4.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk index 5d99b1f4800..b4fc6e0d29e 100644 --- a/keyboards/unison/v04/rules.mk +++ b/keyboards/unison/v04/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index 74968e3e12f..d8bc5b107d4 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -8,6 +8,8 @@ "pid": "0x112D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/uranuma/rules.mk b/keyboards/uranuma/rules.mk index 34354b8500f..0dba652d235 100644 --- a/keyboards/uranuma/rules.mk +++ b/keyboards/uranuma/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json index bdc877ae3d3..f1eeac1d225 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/info.json @@ -8,6 +8,8 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi_wkl": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] diff --git a/keyboards/utd80/rules.mk b/keyboards/utd80/rules.mk index a7d70049c20..5681a9b5977 100644 --- a/keyboards/utd80/rules.mk +++ b/keyboards/utd80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json index f96564f36b4..4a7e2006ffb 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk index eb2392e08b0..ceb65c3053f 100644 --- a/keyboards/uzu42/rules.mk +++ b/keyboards/uzu42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/v4n4g0rth0n/v1/info.json b/keyboards/v4n4g0rth0n/v1/info.json index 90ac25f360b..dab37baf045 100644 --- a/keyboards/v4n4g0rth0n/v1/info.json +++ b/keyboards/v4n4g0rth0n/v1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/v4n4g0rth0n/v1/rules.mk b/keyboards/v4n4g0rth0n/v1/rules.mk index 4b26405509b..b3aa8c531b1 100644 --- a/keyboards/v4n4g0rth0n/v1/rules.mk +++ b/keyboards/v4n4g0rth0n/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json index e557e4d3076..65be217368d 100644 --- a/keyboards/v4n4g0rth0n/v2/info.json +++ b/keyboards/v4n4g0rth0n/v2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk index ae6fb924f1f..b63f4567082 100644 --- a/keyboards/v4n4g0rth0n/v2/rules.mk +++ b/keyboards/v4n4g0rth0n/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json index fd974f72896..f150360d18e 100644 --- a/keyboards/v60_type_r/info.json +++ b/keyboards/v60_type_r/info.json @@ -8,6 +8,8 @@ "pid": "0x0658", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk index 2624f155229..77b555c20c5 100644 --- a/keyboards/v60_type_r/rules.mk +++ b/keyboards/v60_type_r/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json index 15a406fe267..6c26013f602 100644 --- a/keyboards/vagrant_10/info.json +++ b/keyboards/vagrant_10/info.json @@ -8,6 +8,8 @@ "pid": "0x5E99", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0, "w":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}] diff --git a/keyboards/vagrant_10/rules.mk b/keyboards/vagrant_10/rules.mk index 7dae3a84234..3b6a1809db1 100755 --- a/keyboards/vagrant_10/rules.mk +++ b/keyboards/vagrant_10/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index 0580cef82ed..3063fa9f28f 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -8,6 +8,8 @@ "pid": "0x408F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": [ "tkl_ansi", "tkl_ansi_tsangan", diff --git a/keyboards/vertex/angler2/rules.mk b/keyboards/vertex/angler2/rules.mk index 744a2725357..b5cde0eb87a 100644 --- a/keyboards/vertex/angler2/rules.mk +++ b/keyboards/vertex/angler2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json index 7d2b2a452e8..da11e272c1d 100644 --- a/keyboards/vertex/arc60/info.json +++ b/keyboards/vertex/arc60/info.json @@ -8,6 +8,8 @@ "pid": "0x8370", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/vertex/arc60/rules.mk b/keyboards/vertex/arc60/rules.mk index 7b7725d5f72..5a90b0d7fe0 100644 --- a/keyboards/vertex/arc60/rules.mk +++ b/keyboards/vertex/arc60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json index 86464fd1039..9b8591ee228 100644 --- a/keyboards/viendi8l/info.json +++ b/keyboards/viendi8l/info.json @@ -8,6 +8,8 @@ "pid": "0x0877", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/viendi8l/rules.mk b/keyboards/viendi8l/rules.mk index e42bc577d71..947d1bf4359 100644 --- a/keyboards/viendi8l/rules.mk +++ b/keyboards/viendi8l/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 - -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json index a5ef9d4ca25..aebfd08f0ff 100644 --- a/keyboards/viktus/at101_bh/info.json +++ b/keyboards/viktus/at101_bh/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/viktus/at101_bh/rules.mk b/keyboards/viktus/at101_bh/rules.mk index 16dc2697bbb..06845b8e21c 100644 --- a/keyboards/viktus/at101_bh/rules.mk +++ b/keyboards/viktus/at101_bh/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json index c7ddd64e871..e4730b2031e 100644 --- a/keyboards/viktus/omnikey_bh/info.json +++ b/keyboards/viktus/omnikey_bh/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2.5, "y":0}, {"label":"K003", "x":4.5, "y":0}, {"label":"K004", "x":5.5, "y":0}, {"label":"K005", "x":6.5, "y":0}, {"label":"K006", "x":7.5, "y":0}, {"label":"K007", "x":9, "y":0}, {"label":"K008", "x":10, "y":0}, {"label":"K009", "x":11, "y":0}, {"label":"K010", "x":12, "y":0}, {"label":"K011", "x":13.5, "y":0}, {"label":"K012", "x":14.5, "y":0}, {"label":"K013", "x":15.5, "y":0}, {"label":"K014", "x":16.5, "y":0}, {"label":"K015", "x":18, "y":0}, {"label":"K016", "x":19, "y":0}, {"label":"K017", "x":20, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2.5, "y":1.5}, {"label":"K103", "x":3.5, "y":1.5}, {"label":"K104", "x":4.5, "y":1.5}, {"label":"K105", "x":5.5, "y":1.5}, {"label":"K106", "x":6.5, "y":1.5}, {"label":"K107", "x":7.5, "y":1.5}, {"label":"K108", "x":8.5, "y":1.5}, {"label":"K109", "x":9.5, "y":1.5}, {"label":"K110", "x":10.5, "y":1.5}, {"label":"K111", "x":11.5, "y":1.5}, {"label":"K112", "x":12.5, "y":1.5}, {"label":"K113", "x":13.5, "y":1.5}, {"label":"K114", "x":14.5, "y":1.5}, {"label":"K115", "x":15.5, "y":1.5, "w":2}, {"label":"K116", "x":18, "y":1.5}, {"label":"K117", "x":19, "y":1.5}, {"label":"K118", "x":20, "y":1.5}, {"label":"K119", "x":21.5, "y":1.5}, {"label":"K120", "x":22.5, "y":1.5}, {"label":"K121", "x":23.5, "y":1.5}, {"label":"K122", "x":24.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5}, {"label":"K201", "x":1, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5, "w":1.5}, {"label":"K203", "x":4, "y":2.5}, {"label":"K204", "x":5, "y":2.5}, {"label":"K205", "x":6, "y":2.5}, {"label":"K206", "x":7, "y":2.5}, {"label":"K207", "x":8, "y":2.5}, {"label":"K208", "x":9, "y":2.5}, {"label":"K209", "x":10, "y":2.5}, {"label":"K210", "x":11, "y":2.5}, {"label":"K211", "x":12, "y":2.5}, {"label":"K212", "x":13, "y":2.5}, {"label":"K213", "x":14, "y":2.5}, {"label":"K214", "x":15, "y":2.5}, {"label":"K215", "x":16, "y":2.5, "w":1.5}, {"label":"K216", "x":18, "y":2.5}, {"label":"K217", "x":19, "y":2.5}, {"label":"K218", "x":20, "y":2.5}, {"label":"K219", "x":21.5, "y":2.5}, {"label":"K220", "x":22.5, "y":2.5}, {"label":"K221", "x":23.5, "y":2.5}, {"label":"K222", "x":24.5, "y":2.5}, {"label":"K300", "x":0, "y":3.5}, {"label":"K301", "x":1, "y":3.5}, {"label":"K302", "x":2.5, "y":3.5, "w":1.75}, {"label":"K303", "x":4.25, "y":3.5}, {"label":"K304", "x":5.25, "y":3.5}, {"label":"K305", "x":6.25, "y":3.5}, {"label":"K306", "x":7.25, "y":3.5}, {"label":"K307", "x":8.25, "y":3.5}, {"label":"K308", "x":9.25, "y":3.5}, {"label":"K309", "x":10.25, "y":3.5}, {"label":"K310", "x":11.25, "y":3.5}, {"label":"K311", "x":12.25, "y":3.5}, {"label":"K312", "x":13.25, "y":3.5}, {"label":"K313", "x":14.25, "y":3.5}, {"label":"K314", "x":15.25, "y":3.5, "w":2.25}, {"label":"K315", "x":18, "y":3.5}, {"label":"K316", "x":19, "y":3.5}, {"label":"K317", "x":20, "y":3.5}, {"label":"K318", "x":21.5, "y":3.5}, {"label":"K319", "x":22.5, "y":3.5}, {"label":"K320", "x":23.5, "y":3.5}, {"label":"K321", "x":24.5, "y":3.5}, {"label":"K400", "x":0, "y":4.5}, {"label":"K401", "x":1, "y":4.5}, {"label":"K402", "x":2.5, "y":4.5, "w":2.25}, {"label":"K403", "x":4.75, "y":4.5}, {"label":"K404", "x":5.75, "y":4.5}, {"label":"K405", "x":6.75, "y":4.5}, {"label":"K406", "x":7.75, "y":4.5}, {"label":"K407", "x":8.75, "y":4.5}, {"label":"K408", "x":9.75, "y":4.5}, {"label":"K409", "x":10.75, "y":4.5}, {"label":"K410", "x":11.75, "y":4.5}, {"label":"K411", "x":12.75, "y":4.5}, {"label":"K412", "x":13.75, "y":4.5}, {"label":"K413", "x":14.75, "y":4.5, "w":1.75}, {"label":"K414", "x":16.5, "y":4.5}, {"label":"K415", "x":18, "y":4.5}, {"label":"K416", "x":19, "y":4.5}, {"label":"K417", "x":20, "y":4.5}, {"label":"K418", "x":21.5, "y":4.5}, {"label":"K419", "x":22.5, "y":4.5}, {"label":"K420", "x":23.5, "y":4.5}, {"label":"K421", "x":24.5, "y":4.5, "h":2}, {"label":"K500", "x":0, "y":5.5}, {"label":"K501", "x":1, "y":5.5}, {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, {"label":"K503", "x":4, "y":5.5}, {"label":"K504", "x":5, "y":5.5, "w":1.5}, {"label":"K507", "x":6.5, "y":5.5, "w":7}, {"label":"K512", "x":13.5, "y":5.5}, {"label":"K513", "x":14.5, "y":5.5}, {"label":"K514", "x":15.5, "y":5.5}, {"label":"K515", "x":16.5, "y":5.5}, {"label":"K516", "x":18, "y":5.5}, {"label":"K517", "x":19, "y":5.5}, {"label":"K518", "x":20, "y":5.5}, {"label":"K519", "x":21.5, "y":5.5, "w":2}, {"label":"K520", "x":23.5, "y":5.5}] diff --git a/keyboards/viktus/omnikey_bh/rules.mk b/keyboards/viktus/omnikey_bh/rules.mk index 65e353ad154..06845b8e21c 100644 --- a/keyboards/viktus/omnikey_bh/rules.mk +++ b/keyboards/viktus/omnikey_bh/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json index 2ee502bd37b..6627cbfb2e5 100644 --- a/keyboards/viktus/smolka/info.json +++ b/keyboards/viktus/smolka/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/viktus/smolka/rules.mk b/keyboards/viktus/smolka/rules.mk index 5f58c5684bf..131aa72aeb5 100644 --- a/keyboards/viktus/smolka/rules.mk +++ b/keyboards/viktus/smolka/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json index c438b91e25c..1ac5d4802ab 100644 --- a/keyboards/viktus/sp111/info.json +++ b/keyboards/viktus/sp111/info.json @@ -8,6 +8,8 @@ "pid": "0x5111", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk index fab90d4a881..0b9b8490de3 100644 --- a/keyboards/viktus/sp111/rules.mk +++ b/keyboards/viktus/sp111/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index ec63304eff9..b84a224bce6 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -8,6 +8,8 @@ "pid": "0x534D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index 92d4b71efeb..ca2a1036c34 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json index c1c161e5f4b..6bad0166c04 100644 --- a/keyboards/viktus/styrka/info.json +++ b/keyboards/viktus/styrka/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/viktus/styrka/rules.mk b/keyboards/viktus/styrka/rules.mk index a0b213f847a..718a1e8d099 100644 --- a/keyboards/viktus/styrka/rules.mk +++ b/keyboards/viktus/styrka/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json index 0c471fd1eab..a44c903b059 100644 --- a/keyboards/viktus/z150_bh/info.json +++ b/keyboards/viktus/z150_bh/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/viktus/z150_bh/rules.mk b/keyboards/viktus/z150_bh/rules.mk index 65e353ad154..06845b8e21c 100644 --- a/keyboards/viktus/z150_bh/rules.mk +++ b/keyboards/viktus/z150_bh/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json index f7a9cdef3d5..883278d9833 100644 --- a/keyboards/vitamins_included/info.json +++ b/keyboards/vitamins_included/info.json @@ -7,6 +7,7 @@ "vid": "0x1209", "pid": "0xBEE5" }, + "processor": "atmega32u4", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index 90ac25f360b..1245b8be564 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -1,5 +1,6 @@ { "usb": { "device_version": "0.0.1" - } + }, + "bootloader": "caterina" } diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk index 6e9beefafec..d38a6180907 100644 --- a/keyboards/vitamins_included/rev1/rules.mk +++ b/keyboards/vitamins_included/rev1/rules.mk @@ -1,4 +1 @@ -# Bootloader selection -BOOTLOADER = caterina - SPLIT_KEYBOARD = yes diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index e557e4d3076..f7a5336568b 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -1,5 +1,6 @@ { "usb": { "device_version": "0.0.2" - } + }, + "bootloader": "qmk-dfu" } diff --git a/keyboards/vitamins_included/rev2/rules.mk b/keyboards/vitamins_included/rev2/rules.mk index 05167eb3b9a..9f05083d69e 100644 --- a/keyboards/vitamins_included/rev2/rules.mk +++ b/keyboards/vitamins_included/rev2/rules.mk @@ -1,6 +1,3 @@ -# Bootloader selection -BOOTLOADER = qmk-dfu - SPLIT_KEYBOARD = yes # Disable unsupported hardware diff --git a/keyboards/vitamins_included/rules.mk b/keyboards/vitamins_included/rules.mk index c64a5ac5f01..3ca1a5cf70e 100644 --- a/keyboards/vitamins_included/rules.mk +++ b/keyboards/vitamins_included/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Build Options # change yes to no to disable # diff --git a/keyboards/w1_at/info.json b/keyboards/w1_at/info.json index 1c4f6bf22ac..12d8990ac4e 100644 --- a/keyboards/w1_at/info.json +++ b/keyboards/w1_at/info.json @@ -8,6 +8,8 @@ "pid": "0x5754", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":19.5, "y":0}, {"x":20.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.25, "y":1, "w":1.5}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":17.5, "y":1}, {"x":18.5, "y":1}, {"x":19.5, "y":1}, {"x":20.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.25, "y":2, "w":1.75}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2, "w":2.25}, {"x":17.5, "y":2}, {"x":18.5, "y":2}, {"x":19.5, "y":2}, {"x":20.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3, "w":1.75}, {"x":16.25, "y":3}, {"x":17.5, "y":3}, {"x":18.5, "y":3}, {"x":19.5, "y":3}, {"x":20.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.25, "y":4, "w":1.5}, {"x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"x":13.25, "y":4, "w":1.5}, {"x":15.75, "y":4, "w":1.5}, {"x":17.5, "y":4}, {"x":18.5, "y":4}, {"x":19.5, "y":4}, {"x":20.5, "y":4}] diff --git a/keyboards/w1_at/rules.mk b/keyboards/w1_at/rules.mk index 169c45b479d..7000bb65710 100644 --- a/keyboards/w1_at/rules.mk +++ b/keyboards/w1_at/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json index 199d37be358..277664fd71f 100644 --- a/keyboards/waldo/info.json +++ b/keyboards/waldo/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/waldo/rules.mk b/keyboards/waldo/rules.mk index 616fb150fe9..0e7e90f4394 100644 --- a/keyboards/waldo/rules.mk +++ b/keyboards/waldo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json index 99eb31c61a6..423ce13f6a9 100644 --- a/keyboards/walletburner/cajal/info.json +++ b/keyboards/walletburner/cajal/info.json @@ -8,6 +8,8 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_stagger": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"[", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"RGB", "x":13.25, "y":0.5}, {"label":"", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"'", "x":10.25, "y":1}, {"label":"Return", "x":11.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":",", "x":8.75, "y":2}, {"label":".", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12.25, "y":2.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Alt", "x":1.25, "y":3}, {"label":"Super", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":2.25}, {"x":5.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":8.5, "y":3, "w":1.25}, {"label":"Del", "x":9.75, "y":3, "w":1.25}, {"label":"←", "x":11.25, "y":3.25}, {"label":"↓", "x":12.25, "y":3.25}, {"label":"→", "x":13.25, "y":3.25}] diff --git a/keyboards/walletburner/cajal/rules.mk b/keyboards/walletburner/cajal/rules.mk index e8057998c56..aa609619e76 100644 --- a/keyboards/walletburner/cajal/rules.mk +++ b/keyboards/walletburner/cajal/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json index d7c2c7126c7..dd746f4c4b0 100644 --- a/keyboards/walletburner/neuron/info.json +++ b/keyboards/walletburner/neuron/info.json @@ -8,6 +8,8 @@ "pid": "0x6E75", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back
Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"Enter", "x":10.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":"Shift", "x":9.75, "y":2, "w":1.25}, {"label":"Fn", "x":11, "y":2}, {"label":"Hyper", "x":1, "y":3, "w":1.25}, {"label":"Super", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":1.75}, {"x":5.25, "y":3}, {"x":6.25, "y":3, "w":2.25}, {"label":"Meta", "x":8.5, "y":3, "w":1.25}, {"label":"Super", "x":9.75, "y":3, "w":1.25}] diff --git a/keyboards/walletburner/neuron/rules.mk b/keyboards/walletburner/neuron/rules.mk index 8f9b670fd9c..21fd8f40ee0 100644 --- a/keyboards/walletburner/neuron/rules.mk +++ b/keyboards/walletburner/neuron/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json index f8219ec80aa..3edf626ac4b 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/info.json @@ -8,6 +8,8 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk index 1515d5f8660..4f359b9ee8d 100644 --- a/keyboards/waterfowl/rules.mk +++ b/keyboards/waterfowl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json index 90c0e2270b0..984511c77db 100644 --- a/keyboards/wavtype/foundation/info.json +++ b/keyboards/wavtype/foundation/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_ansi_split_bs", "LAYOUT_tkl_ansi_7u": "LAYOUT_ansi_tsangan_split_bs", diff --git a/keyboards/wavtype/foundation/rules.mk b/keyboards/wavtype/foundation/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/wavtype/foundation/rules.mk +++ b/keyboards/wavtype/foundation/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json index 5f04bff14b3..d88ac83836b 100644 --- a/keyboards/wavtype/p01_ultra/info.json +++ b/keyboards/wavtype/p01_ultra/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_tkl_ansi_7u": "LAYOUT_tkl_ansi_tsangan", "LAYOUT_tkl_iso_7u": "LAYOUT_tkl_iso_tsangan" diff --git a/keyboards/wavtype/p01_ultra/rules.mk b/keyboards/wavtype/p01_ultra/rules.mk index 3ff392a61f5..951dd07d6e0 100644 --- a/keyboards/wavtype/p01_ultra/rules.mk +++ b/keyboards/wavtype/p01_ultra/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json index fd7170b6c16..890a0178672 100644 --- a/keyboards/weirdo/geminate60/info.json +++ b/keyboards/weirdo/geminate60/info.json @@ -8,6 +8,9 @@ "pid": "0x676D", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/weirdo/geminate60/rules.mk b/keyboards/weirdo/geminate60/rules.mk index bcc109f6d4b..3c777809b4a 100644 --- a/keyboards/weirdo/geminate60/rules.mk +++ b/keyboards/weirdo/geminate60/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json index 209f2d1fe2c..934da67ee45 100644 --- a/keyboards/weirdo/kelowna/rgb64/info.json +++ b/keyboards/weirdo/kelowna/rgb64/info.json @@ -8,6 +8,9 @@ "pid": "0x4C64", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { diff --git a/keyboards/weirdo/kelowna/rgb64/rules.mk b/keyboards/weirdo/kelowna/rgb64/rules.mk index bcc109f6d4b..3c777809b4a 100644 --- a/keyboards/weirdo/kelowna/rgb64/rules.mk +++ b/keyboards/weirdo/kelowna/rgb64/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json index 52685674333..906a9938842 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/info.json @@ -8,6 +8,9 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/ls_60/rules.mk b/keyboards/weirdo/ls_60/rules.mk index bcc109f6d4b..3c777809b4a 100644 --- a/keyboards/weirdo/ls_60/rules.mk +++ b/keyboards/weirdo/ls_60/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json index 223a0d197c2..c188d4bb11f 100644 --- a/keyboards/weirdo/naiping/np64/info.json +++ b/keyboards/weirdo/naiping/np64/info.json @@ -8,6 +8,9 @@ "pid": "0x7064", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_64_ansi" }, diff --git a/keyboards/weirdo/naiping/np64/rules.mk b/keyboards/weirdo/naiping/np64/rules.mk index bcc109f6d4b..3c777809b4a 100644 --- a/keyboards/weirdo/naiping/np64/rules.mk +++ b/keyboards/weirdo/naiping/np64/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json index fe5cc5cc9f6..b1b1c1f23d7 100644 --- a/keyboards/weirdo/naiping/nphhkb/info.json +++ b/keyboards/weirdo/naiping/nphhkb/info.json @@ -8,6 +8,9 @@ "pid": "0x7068", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/weirdo/naiping/nphhkb/rules.mk b/keyboards/weirdo/naiping/nphhkb/rules.mk index bcc109f6d4b..3c777809b4a 100644 --- a/keyboards/weirdo/naiping/nphhkb/rules.mk +++ b/keyboards/weirdo/naiping/nphhkb/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json index be15116ed73..9904ca28fca 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/info.json @@ -8,6 +8,9 @@ "pid": "0x706D", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/naiping/npminila/rules.mk b/keyboards/weirdo/naiping/npminila/rules.mk index bcc109f6d4b..3c777809b4a 100644 --- a/keyboards/weirdo/naiping/npminila/rules.mk +++ b/keyboards/weirdo/naiping/npminila/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json index 50edcced1a9..9634cc6f9af 100644 --- a/keyboards/weirdo/tiger910/info.json +++ b/keyboards/weirdo/tiger910/info.json @@ -8,6 +8,8 @@ "pid": "0x5447", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/tiger910/rules.mk b/keyboards/weirdo/tiger910/rules.mk index ee0b9bc30ca..1533e2ee82b 100644 --- a/keyboards/weirdo/tiger910/rules.mk +++ b/keyboards/weirdo/tiger910/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wekey/polaris/info.json b/keyboards/wekey/polaris/info.json index a0972771a6c..ad7477b5fc4 100644 --- a/keyboards/wekey/polaris/info.json +++ b/keyboards/wekey/polaris/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/wekey/polaris/rules.mk b/keyboards/wekey/polaris/rules.mk index b1416450243..7805f1f3c65 100644 --- a/keyboards/wekey/polaris/rules.mk +++ b/keyboards/wekey/polaris/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json index 3f80f460dc2..e47fb351859 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["numpad_6x5"], "layouts": { "LAYOUT_numpad_6x5": { diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk index 2477b1f2df6..3e2d707550d 100644 --- a/keyboards/wekey/we27/rules.mk +++ b/keyboards/wekey/we27/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json index 80f4b24c27f..465f59eea3e 100644 --- a/keyboards/westfoxtrot/aanzee/info.json +++ b/keyboards/westfoxtrot/aanzee/info.json @@ -8,6 +8,8 @@ "pid": "0xAA01", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"\u21e7 Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"Fn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/westfoxtrot/aanzee/rules.mk b/keyboards/westfoxtrot/aanzee/rules.mk index afa3f6d63dc..0db53fb7e83 100644 --- a/keyboards/westfoxtrot/aanzee/rules.mk +++ b/keyboards/westfoxtrot/aanzee/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/westfoxtrot/cyclops/info.json b/keyboards/westfoxtrot/cyclops/info.json index 0d145781f20..7af7031374a 100644 --- a/keyboards/westfoxtrot/cyclops/info.json +++ b/keyboards/westfoxtrot/cyclops/info.json @@ -8,6 +8,8 @@ "pid": "0x0A66", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/westfoxtrot/cyclops/rules.mk b/keyboards/westfoxtrot/cyclops/rules.mk index adc8923f053..2e0e4f94c04 100644 --- a/keyboards/westfoxtrot/cyclops/rules.mk +++ b/keyboards/westfoxtrot/cyclops/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json index fcb14604564..192d78d468c 100644 --- a/keyboards/westfoxtrot/cypher/rev1/info.json +++ b/keyboards/westfoxtrot/cypher/rev1/info.json @@ -6,6 +6,8 @@ "pid": "0xAA97", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/westfoxtrot/cypher/rev1/rules.mk b/keyboards/westfoxtrot/cypher/rev1/rules.mk index a237a6e497b..7cbb60ad2b7 100644 --- a/keyboards/westfoxtrot/cypher/rev1/rules.mk +++ b/keyboards/westfoxtrot/cypher/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json index 9df30afd755..b2d4417af59 100644 --- a/keyboards/westfoxtrot/cypher/rev5/info.json +++ b/keyboards/westfoxtrot/cypher/rev5/info.json @@ -6,6 +6,8 @@ "pid": "0xAA98", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/westfoxtrot/cypher/rev5/rules.mk b/keyboards/westfoxtrot/cypher/rev5/rules.mk index ddb79159789..456eb8a455a 100644 --- a/keyboards/westfoxtrot/cypher/rev5/rules.mk +++ b/keyboards/westfoxtrot/cypher/rev5/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/westfoxtrot/prophet/info.json b/keyboards/westfoxtrot/prophet/info.json index 2708c6e260f..ee65ab26014 100644 --- a/keyboards/westfoxtrot/prophet/info.json +++ b/keyboards/westfoxtrot/prophet/info.json @@ -8,6 +8,8 @@ "pid": "0xAA03", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/westfoxtrot/prophet/rules.mk b/keyboards/westfoxtrot/prophet/rules.mk index 7c8bb3669de..1d3680aec14 100644 --- a/keyboards/westfoxtrot/prophet/rules.mk +++ b/keyboards/westfoxtrot/prophet/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json index f7f67d45a0c..8ff4f8d8ce9 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -7,6 +7,8 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk index d92a34591f3..6174653422b 100644 --- a/keyboards/westm/westm68/rules.mk +++ b/keyboards/westm/westm68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 3beb8b232f9..c9ec1e17d7f 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -7,6 +7,8 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_macropad": { "layout": [ diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/westm/westm9/rules.mk index b8be7c4530a..00ce09e1a6c 100644 --- a/keyboards/westm/westm9/rules.mk +++ b/keyboards/westm/westm9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json index 316034146da..a50da579e35 100644 --- a/keyboards/westm/westmergo/info.json +++ b/keyboards/westm/westmergo/info.json @@ -8,6 +8,8 @@ "pid": "0x0201", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_alice": { "layout": [ diff --git a/keyboards/westm/westmergo/rules.mk b/keyboards/westm/westmergo/rules.mk index 0ad5e320fb2..aae254503b0 100644 --- a/keyboards/westm/westmergo/rules.mk +++ b/keyboards/westm/westmergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json index 3982a4c7154..0ab3b6c0a21 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/info.json @@ -8,6 +8,8 @@ "pid": "0x0495", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 3, "layouts": { "LAYOUT_all": { diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk index 4fcc8d1e6b7..21303846dcc 100644 --- a/keyboards/whale/sk/v3/rules.mk +++ b/keyboards/whale/sk/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json index c56d75787f0..18bba59fe59 100644 --- a/keyboards/wilba_tech/rama_works_kara/info.json +++ b/keyboards/wilba_tech/rama_works_kara/info.json @@ -8,6 +8,8 @@ "pid": "0x4B52", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk index 0185942a3bb..465bc65d9e5 100644 --- a/keyboards/wilba_tech/rama_works_kara/rules.mk +++ b/keyboards/wilba_tech/rama_works_kara/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json index ca94b8267f3..190638c0016 100644 --- a/keyboards/wilba_tech/rama_works_koyu/info.json +++ b/keyboards/wilba_tech/rama_works_koyu/info.json @@ -8,6 +8,8 @@ "pid": "0x4B59", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Num Lock", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Insert", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Home", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"/", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Ctrl", "x":11, "y":4, "w":1.5}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk index 35377a290b6..be907583a29 100644 --- a/keyboards/wilba_tech/rama_works_koyu/rules.mk +++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json index 0dad0cffd7d..ea7c0ba833e 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/info.json +++ b/keyboards/wilba_tech/rama_works_m10_b/info.json @@ -8,6 +8,8 @@ "pid": "0x00AB", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wilba_tech/rama_works_m10_b/rules.mk b/keyboards/wilba_tech/rama_works_m10_b/rules.mk index 2e24be64bad..29eb5c8fbe8 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m10_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json index c6016c19a30..b60dd538154 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/info.json +++ b/keyboards/wilba_tech/rama_works_m10_c/info.json @@ -8,6 +8,8 @@ "pid": "0x00AC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":0, "y":1}, {"label":"0,4", "x":1, "y":1}, {"label":"0,5", "x":2, "y":1}, {"label":"0,6", "x":0, "y":2}, {"label":"0,7", "x":1, "y":2}, {"label":"0,8", "x":2, "y":2}, {"label":"0,9", "x":1, "y":3, "w":2}] diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk index 438704163ef..89e17a01b49 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk +++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json index 2d9851c19c1..a53a960f0a0 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/info.json +++ b/keyboards/wilba_tech/rama_works_m50_a/info.json @@ -8,6 +8,8 @@ "pid": "0x050A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":0, "y":1}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":0, "y":2}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":0, "y":3}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}] diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk index 438704163ef..89e17a01b49 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/info.json index 2a93f56b151..2fc265fec9a 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/info.json +++ b/keyboards/wilba_tech/rama_works_m50_ax/info.json @@ -8,6 +8,8 @@ "pid": "0x150A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1}, {"label":"1,2", "x":2.25, "y":1}, {"label":"1,3", "x":3.25, "y":1}, {"label":"1,4", "x":4.25, "y":1}, {"label":"1,5", "x":5.25, "y":1}, {"label":"1,6", "x":6.25, "y":1}, {"label":"1,7", "x":7.25, "y":1}, {"label":"1,8", "x":8.25, "y":1}, {"label":"1,9", "x":9.25, "y":1}, {"label":"1,10", "x":10.25, "y":1}, {"label":"1,11", "x":11.25, "y":1}, {"label":"1,12", "x":12.25, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2}, {"label":"2,2", "x":2.25, "y":2}, {"label":"2,3", "x":3.25, "y":2}, {"label":"2,4", "x":4.25, "y":2}, {"label":"2,5", "x":5.25, "y":2}, {"label":"2,6", "x":6.25, "y":2}, {"label":"2,7", "x":7.25, "y":2}, {"label":"2,8", "x":8.25, "y":2}, {"label":"2,9", "x":9.25, "y":2}, {"label":"2,10", "x":10.25, "y":2}, {"label":"2,11", "x":11.25, "y":2}, {"label":"2,12", "x":12.25, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3}] diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rules.mk b/keyboards/wilba_tech/rama_works_m50_ax/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/rules.mk +++ b/keyboards/wilba_tech/rama_works_m50_ax/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json index 507ada8700a..d76b1789476 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/info.json +++ b/keyboards/wilba_tech/rama_works_m60_a/info.json @@ -8,6 +8,8 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk index 35377a290b6..be907583a29 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json index 9934c1bf186..55f9f05536d 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/info.json +++ b/keyboards/wilba_tech/rama_works_m65_b/info.json @@ -8,6 +8,8 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Num Lock", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Insert", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Home", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"/", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Ctrl", "x":11, "y":4, "w":1.5}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk index 438704163ef..89e17a01b49 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json index d821dec4228..ca5bf2b21e1 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/info.json +++ b/keyboards/wilba_tech/rama_works_m65_bx/info.json @@ -8,6 +8,8 @@ "pid": "0x165B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Num Lock", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Insert", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Home", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"/", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Ctrl", "x":11, "y":4, "w":1.5}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk index 438704163ef..89e17a01b49 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json index 5506e2e1aff..67912b6ce0c 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/info.json +++ b/keyboards/wilba_tech/rama_works_m6_a/info.json @@ -8,6 +8,8 @@ "pid": "0x006A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk index 30c249e6637..95303152b9b 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json index 24a24e6add2..96fc84b0027 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/info.json +++ b/keyboards/wilba_tech/rama_works_m6_b/info.json @@ -8,6 +8,8 @@ "pid": "0x006B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk index 549390a822d..04a197576fd 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json index 55e017d69d5..27a5fe7148f 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/info.json +++ b/keyboards/wilba_tech/rama_works_u80_a/info.json @@ -8,6 +8,8 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk index 1809b766f3f..3e1eda9d5e8 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_u80_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json index ecadcbfb5a2..85b1e2e6a1c 100644 --- a/keyboards/wilba_tech/wt60_a/info.json +++ b/keyboards/wilba_tech/wt60_a/info.json @@ -8,6 +8,8 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt60_a/rules.mk +++ b/keyboards/wilba_tech/wt60_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/info.json index 12b4edc8c1a..6e8d463abb7 100644 --- a/keyboards/wilba_tech/wt60_b/info.json +++ b/keyboards/wilba_tech/wt60_b/info.json @@ -8,6 +8,8 @@ "pid": "0x60B0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk index 9b5cffdee3c..a9fcf043e2c 100644 --- a/keyboards/wilba_tech/wt60_b/rules.mk +++ b/keyboards/wilba_tech/wt60_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/info.json index 858ecb46cc2..8c3cf7de2a0 100644 --- a/keyboards/wilba_tech/wt60_bx/info.json +++ b/keyboards/wilba_tech/wt60_bx/info.json @@ -8,6 +8,8 @@ "pid": "0x60B1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk index 9b5cffdee3c..a9fcf043e2c 100644 --- a/keyboards/wilba_tech/wt60_bx/rules.mk +++ b/keyboards/wilba_tech/wt60_bx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json index 87c68bf8a9e..b39a2786a47 100644 --- a/keyboards/wilba_tech/wt60_c/info.json +++ b/keyboards/wilba_tech/wt60_c/info.json @@ -8,6 +8,8 @@ "pid": "0x60C0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk index 9b5cffdee3c..a9fcf043e2c 100644 --- a/keyboards/wilba_tech/wt60_c/rules.mk +++ b/keyboards/wilba_tech/wt60_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/wt60_d/info.json b/keyboards/wilba_tech/wt60_d/info.json index 42b52b8b1f5..80aead3a832 100644 --- a/keyboards/wilba_tech/wt60_d/info.json +++ b/keyboards/wilba_tech/wt60_d/info.json @@ -8,6 +8,8 @@ "pid": "0x060D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"\\", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/wilba_tech/wt60_d/rules.mk b/keyboards/wilba_tech/wt60_d/rules.mk index 2e24be64bad..29eb5c8fbe8 100644 --- a/keyboards/wilba_tech/wt60_d/rules.mk +++ b/keyboards/wilba_tech/wt60_d/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_g/info.json b/keyboards/wilba_tech/wt60_g/info.json index 43b7f4d4ef3..5c22b6dc213 100644 --- a/keyboards/wilba_tech/wt60_g/info.json +++ b/keyboards/wilba_tech/wt60_g/info.json @@ -8,6 +8,8 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/wilba_tech/wt60_g/rules.mk b/keyboards/wilba_tech/wt60_g/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt60_g/rules.mk +++ b/keyboards/wilba_tech/wt60_g/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_g2/info.json b/keyboards/wilba_tech/wt60_g2/info.json index 3fc67039e73..33b0fd0d502 100644 --- a/keyboards/wilba_tech/wt60_g2/info.json +++ b/keyboards/wilba_tech/wt60_g2/info.json @@ -8,6 +8,8 @@ "pid": "0x002F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/wilba_tech/wt60_g2/rules.mk b/keyboards/wilba_tech/wt60_g2/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt60_g2/rules.mk +++ b/keyboards/wilba_tech/wt60_g2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json index f2a05dfae5b..928ea8ba8ab 100644 --- a/keyboards/wilba_tech/wt60_h1/info.json +++ b/keyboards/wilba_tech/wt60_h1/info.json @@ -8,6 +8,8 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { diff --git a/keyboards/wilba_tech/wt60_h1/rules.mk b/keyboards/wilba_tech/wt60_h1/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/wilba_tech/wt60_h1/rules.mk +++ b/keyboards/wilba_tech/wt60_h1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_h2/info.json b/keyboards/wilba_tech/wt60_h2/info.json index 30a2fb65f64..e9c59d1b8c9 100644 --- a/keyboards/wilba_tech/wt60_h2/info.json +++ b/keyboards/wilba_tech/wt60_h2/info.json @@ -8,6 +8,8 @@ "pid": "0x002B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/wilba_tech/wt60_h2/rules.mk b/keyboards/wilba_tech/wt60_h2/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/wilba_tech/wt60_h2/rules.mk +++ b/keyboards/wilba_tech/wt60_h2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json index b4d071c4416..df002063a37 100644 --- a/keyboards/wilba_tech/wt60_h3/info.json +++ b/keyboards/wilba_tech/wt60_h3/info.json @@ -8,6 +8,8 @@ "pid": "0x002C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_60_iso_tsangan_split_rshift" }, diff --git a/keyboards/wilba_tech/wt60_h3/rules.mk b/keyboards/wilba_tech/wt60_h3/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/wilba_tech/wt60_h3/rules.mk +++ b/keyboards/wilba_tech/wt60_h3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt60_xt/info.json b/keyboards/wilba_tech/wt60_xt/info.json index 50f64f9d6f2..d31d8380b14 100644 --- a/keyboards/wilba_tech/wt60_xt/info.json +++ b/keyboards/wilba_tech/wt60_xt/info.json @@ -8,6 +8,8 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.25, "y":1, "w":1.5}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.25, "y":2, "w":1.75}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3, "w":1.75}, {"x":16.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":1.25}, {"x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4, "w":1.25}, {"x":14.75, "y":4, "w":1.25}, {"x":16, "y":4, "w":1.25}] diff --git a/keyboards/wilba_tech/wt60_xt/rules.mk b/keyboards/wilba_tech/wt60_xt/rules.mk index 9666f1e255c..388b9f97e35 100644 --- a/keyboards/wilba_tech/wt60_xt/rules.mk +++ b/keyboards/wilba_tech/wt60_xt/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json index 88aa9b21dd2..1c73d405563 100644 --- a/keyboards/wilba_tech/wt65_a/info.json +++ b/keyboards/wilba_tech/wt65_a/info.json @@ -8,6 +8,8 @@ "pid": "0x065A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Fn", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt65_a/rules.mk +++ b/keyboards/wilba_tech/wt65_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json index c9c0ec3f356..17dc827d558 100644 --- a/keyboards/wilba_tech/wt65_b/info.json +++ b/keyboards/wilba_tech/wt65_b/info.json @@ -8,6 +8,8 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"End", "x":15, "y":1}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Win", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4, "w":7}, {"label":"Fn", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt65_b/rules.mk +++ b/keyboards/wilba_tech/wt65_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/info.json index 37d5dfba549..e073235c398 100644 --- a/keyboards/wilba_tech/wt65_d/info.json +++ b/keyboards/wilba_tech/wt65_d/info.json @@ -8,6 +8,8 @@ "pid": "0x0031", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/wilba_tech/wt65_d/rules.mk b/keyboards/wilba_tech/wt65_d/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_d/rules.mk +++ b/keyboards/wilba_tech/wt65_d/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_f/info.json b/keyboards/wilba_tech/wt65_f/info.json index 2e7ba6c3a0f..f5916bea1bf 100644 --- a/keyboards/wilba_tech/wt65_f/info.json +++ b/keyboards/wilba_tech/wt65_f/info.json @@ -8,6 +8,8 @@ "pid": "0x002D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/wilba_tech/wt65_f/rules.mk b/keyboards/wilba_tech/wt65_f/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_f/rules.mk +++ b/keyboards/wilba_tech/wt65_f/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_fx/info.json b/keyboards/wilba_tech/wt65_fx/info.json index 1e12d4e53b6..afbc80b8c1b 100644 --- a/keyboards/wilba_tech/wt65_fx/info.json +++ b/keyboards/wilba_tech/wt65_fx/info.json @@ -8,6 +8,8 @@ "pid": "0x002E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/wilba_tech/wt65_fx/rules.mk b/keyboards/wilba_tech/wt65_fx/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_fx/rules.mk +++ b/keyboards/wilba_tech/wt65_fx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_g/info.json b/keyboards/wilba_tech/wt65_g/info.json index c7713e58fd9..bdfea960a43 100644 --- a/keyboards/wilba_tech/wt65_g/info.json +++ b/keyboards/wilba_tech/wt65_g/info.json @@ -8,6 +8,8 @@ "pid": "0x0022", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/wilba_tech/wt65_g/rules.mk b/keyboards/wilba_tech/wt65_g/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_g/rules.mk +++ b/keyboards/wilba_tech/wt65_g/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_g2/info.json b/keyboards/wilba_tech/wt65_g2/info.json index 7e76598d71e..5d8769625ac 100644 --- a/keyboards/wilba_tech/wt65_g2/info.json +++ b/keyboards/wilba_tech/wt65_g2/info.json @@ -8,6 +8,8 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4, "w":7}, {"x":10.75, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/wilba_tech/wt65_g2/rules.mk b/keyboards/wilba_tech/wt65_g2/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_g2/rules.mk +++ b/keyboards/wilba_tech/wt65_g2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_h1/info.json b/keyboards/wilba_tech/wt65_h1/info.json index 9e594d8978c..2ccb1d90998 100644 --- a/keyboards/wilba_tech/wt65_h1/info.json +++ b/keyboards/wilba_tech/wt65_h1/info.json @@ -8,6 +8,8 @@ "pid": "0x0025", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_tsangan"], "layouts": { "LAYOUT_65_ansi_blocker_tsangan": { diff --git a/keyboards/wilba_tech/wt65_h1/rules.mk b/keyboards/wilba_tech/wt65_h1/rules.mk index e0403a960b5..718a1e8d099 100644 --- a/keyboards/wilba_tech/wt65_h1/rules.mk +++ b/keyboards/wilba_tech/wt65_h1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/info.json index 26fc69fa0ec..575d1c3add0 100644 --- a/keyboards/wilba_tech/wt65_xt/info.json +++ b/keyboards/wilba_tech/wt65_xt/info.json @@ -8,6 +8,8 @@ "pid": "0x001D", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0, "w":2}, {"x":17.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":17.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":17.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":17.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"x":13.5, "y":4, "w":1.5}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}] diff --git a/keyboards/wilba_tech/wt65_xt/rules.mk b/keyboards/wilba_tech/wt65_xt/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_xt/rules.mk +++ b/keyboards/wilba_tech/wt65_xt/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt65_xtx/info.json b/keyboards/wilba_tech/wt65_xtx/info.json index 96d10688731..196044185ba 100644 --- a/keyboards/wilba_tech/wt65_xtx/info.json +++ b/keyboards/wilba_tech/wt65_xtx/info.json @@ -8,6 +8,8 @@ "pid": "0x001E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":17.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":17.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":17.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}] diff --git a/keyboards/wilba_tech/wt65_xtx/rules.mk b/keyboards/wilba_tech/wt65_xtx/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt65_xtx/rules.mk +++ b/keyboards/wilba_tech/wt65_xtx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json index 0f82c92d8f9..67faf978d4e 100644 --- a/keyboards/wilba_tech/wt69_a/info.json +++ b/keyboards/wilba_tech/wt69_a/info.json @@ -8,6 +8,8 @@ "pid": "0x069A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"BkSp", "x":15.25, "y":0}, {"label":"BkSp", "x":16.25, "y":0}, {"label":"Home", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Control", "x":2.25, "y":4, "w":1.5}, {"label":"Win", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Fn", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/wilba_tech/wt69_a/rules.mk b/keyboards/wilba_tech/wt69_a/rules.mk index a7aa26a0753..396da8c7344 100644 --- a/keyboards/wilba_tech/wt69_a/rules.mk +++ b/keyboards/wilba_tech/wt69_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json index da6ad38d596..a004bb43a0c 100644 --- a/keyboards/wilba_tech/wt70_jb/info.json +++ b/keyboards/wilba_tech/wt70_jb/info.json @@ -8,6 +8,8 @@ "pid": "0x001F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"x":16.5, "y":1}, {"x":17.5, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":16.5, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}] diff --git a/keyboards/wilba_tech/wt70_jb/rules.mk b/keyboards/wilba_tech/wt70_jb/rules.mk index 712581eb1ec..4d010d8a29c 100644 --- a/keyboards/wilba_tech/wt70_jb/rules.mk +++ b/keyboards/wilba_tech/wt70_jb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json index b9420ea27e0..24342333354 100644 --- a/keyboards/wilba_tech/wt75_a/info.json +++ b/keyboards/wilba_tech/wt75_a/info.json @@ -8,6 +8,8 @@ "pid": "0x075A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":5.75, "y":0}, {"label":"F6", "x":6.75, "y":0}, {"label":"F7", "x":7.75, "y":0}, {"label":"F8", "x":8.75, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Bksp", "x":13, "y":1.25}, {"label":"Bksp", "x":14, "y":1.25}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"PgDn", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"label":"6.25U", "x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt75_a/rules.mk +++ b/keyboards/wilba_tech/wt75_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json index 2f0f784108a..b2bd5a02ae6 100644 --- a/keyboards/wilba_tech/wt75_b/info.json +++ b/keyboards/wilba_tech/wt75_b/info.json @@ -8,6 +8,8 @@ "pid": "0x075B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2, "w":1.5}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.75}, {"x":1.75, "y":3}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3, "w":2.25}, {"x":15, "y":3}, {"x":0, "y":4, "w":2.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.75}, {"x":14, "y":4}, {"x":15, "y":4}, {"x":0, "y":5, "w":1.25}, {"x":1.25, "y":5, "w":1.25}, {"x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"x":10, "y":5, "w":1.25}, {"x":11.25, "y":5, "w":1.25}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":15, "y":5}] diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt75_b/rules.mk +++ b/keyboards/wilba_tech/wt75_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json index c124bd0d99d..85a99879083 100644 --- a/keyboards/wilba_tech/wt75_c/info.json +++ b/keyboards/wilba_tech/wt75_c/info.json @@ -8,6 +8,8 @@ "pid": "0x075C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"0", "x":0, "y":0}, {"label":"1", "x":1.25, "y":0}, {"label":"2", "x":2.25, "y":0}, {"label":"3", "x":3.25, "y":0}, {"label":"4", "x":4.25, "y":0}, {"label":"5", "x":5.5, "y":0}, {"label":"6", "x":6.5, "y":0}, {"label":"7", "x":7.5, "y":0}, {"label":"8", "x":8.5, "y":0}, {"label":"9", "x":9.75, "y":0}, {"label":"10", "x":10.75, "y":0}, {"label":"11", "x":11.75, "y":0}, {"label":"12", "x":12.75, "y":0}, {"label":"13", "x":14, "y":0}, {"label":"14", "x":0, "y":1.25}, {"label":"15", "x":1, "y":1.25}, {"label":"16", "x":2, "y":1.25}, {"label":"17", "x":3, "y":1.25}, {"label":"18", "x":4, "y":1.25}, {"label":"19", "x":5, "y":1.25}, {"label":"20", "x":6, "y":1.25}, {"label":"21", "x":7, "y":1.25}, {"label":"22", "x":8, "y":1.25}, {"label":"23", "x":9, "y":1.25}, {"label":"24", "x":10, "y":1.25}, {"label":"25", "x":11, "y":1.25}, {"label":"26", "x":12, "y":1.25}, {"label":"27", "x":13, "y":1.25}, {"label":"28", "x":14, "y":1.25}, {"label":"29", "x":15.25, "y":1.25}, {"label":"30", "x":0, "y":2.25, "w":1.5}, {"label":"31", "x":1.5, "y":2.25}, {"label":"32", "x":2.5, "y":2.25}, {"label":"33", "x":3.5, "y":2.25}, {"label":"34", "x":4.5, "y":2.25}, {"label":"35", "x":5.5, "y":2.25}, {"label":"36", "x":6.5, "y":2.25}, {"label":"37", "x":7.5, "y":2.25}, {"label":"38", "x":8.5, "y":2.25}, {"label":"39", "x":9.5, "y":2.25}, {"label":"40", "x":10.5, "y":2.25}, {"label":"41", "x":11.5, "y":2.25}, {"label":"42", "x":12.5, "y":2.25}, {"label":"43", "x":13.5, "y":2.25, "w":1.5}, {"label":"44", "x":15.25, "y":2.25}, {"label":"45", "x":0, "y":3.25, "w":1.75}, {"label":"46", "x":1.75, "y":3.25}, {"label":"47", "x":2.75, "y":3.25}, {"label":"48", "x":3.75, "y":3.25}, {"label":"49", "x":4.75, "y":3.25}, {"label":"50", "x":5.75, "y":3.25}, {"label":"51", "x":6.75, "y":3.25}, {"label":"52", "x":7.75, "y":3.25}, {"label":"53", "x":8.75, "y":3.25}, {"label":"54", "x":9.75, "y":3.25}, {"label":"55", "x":10.75, "y":3.25}, {"label":"56", "x":11.75, "y":3.25}, {"label":"57", "x":12.75, "y":3.25, "w":2.25}, {"label":"58", "x":15.25, "y":3.25}, {"label":"59", "x":0, "y":4.25, "w":2.25}, {"label":"60", "x":2.25, "y":4.25}, {"label":"61", "x":3.25, "y":4.25}, {"label":"62", "x":4.25, "y":4.25}, {"label":"63", "x":5.25, "y":4.25}, {"label":"64", "x":6.25, "y":4.25}, {"label":"65", "x":7.25, "y":4.25}, {"label":"66", "x":8.25, "y":4.25}, {"label":"67", "x":9.25, "y":4.25}, {"label":"68", "x":10.25, "y":4.25}, {"label":"69", "x":11.25, "y":4.25}, {"label":"70", "x":12.25, "y":4.25, "w":1.75}, {"label":"71", "x":14.25, "y":4.5}, {"label":"72", "x":0, "y":5.25, "w":1.5}, {"label":"73", "x":1.5, "y":5.25}, {"label":"74", "x":2.5, "y":5.25, "w":1.5}, {"label":"75", "x":4, "y":5.25, "w":6}, {"label":"76", "x":10, "y":5.25, "w":1.5}, {"label":"77", "x":11.5, "y":5.25, "w":1.5}, {"label":"78", "x":13.25, "y":5.5}, {"label":"79", "x":14.25, "y":5.5}, {"label":"80", "x":15.25, "y":5.5}] diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt75_c/rules.mk +++ b/keyboards/wilba_tech/wt75_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json index ee08cc460bd..337207404ac 100644 --- a/keyboards/wilba_tech/wt80_a/info.json +++ b/keyboards/wilba_tech/wt80_a/info.json @@ -8,6 +8,8 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk index 20309ed79e2..4a53424c536 100644 --- a/keyboards/wilba_tech/wt80_a/rules.mk +++ b/keyboards/wilba_tech/wt80_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/info.json index bc8c4924ca3..e2858d238a1 100644 --- a/keyboards/wilba_tech/wt80_bc/info.json +++ b/keyboards/wilba_tech/wt80_bc/info.json @@ -8,6 +8,8 @@ "pid": "0x80B0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}] diff --git a/keyboards/wilba_tech/wt80_bc/rules.mk b/keyboards/wilba_tech/wt80_bc/rules.mk index a3ee67e2ade..5b8a8888456 100644 --- a/keyboards/wilba_tech/wt80_bc/rules.mk +++ b/keyboards/wilba_tech/wt80_bc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt80_g/info.json b/keyboards/wilba_tech/wt80_g/info.json index ee516282b45..1c7ff192d15 100644 --- a/keyboards/wilba_tech/wt80_g/info.json +++ b/keyboards/wilba_tech/wt80_g/info.json @@ -8,6 +8,8 @@ "pid": "0x0023", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}] diff --git a/keyboards/wilba_tech/wt80_g/rules.mk b/keyboards/wilba_tech/wt80_g/rules.mk index 51570559c02..c843e8a475a 100644 --- a/keyboards/wilba_tech/wt80_g/rules.mk +++ b/keyboards/wilba_tech/wt80_g/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json index 73806e07604..53cffb13aee 100644 --- a/keyboards/wilba_tech/wt8_a/info.json +++ b/keyboards/wilba_tech/wt8_a/info.json @@ -8,6 +8,8 @@ "pid": "0x008A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"x", "x":0, "y":0}, {"label":"x", "x":1, "y":0}, {"label":"x", "x":2, "y":0}, {"label":"x", "x":3, "y":0}, {"label":"x", "x":0, "y":1}, {"label":"x", "x":1, "y":1}, {"label":"x", "x":2, "y":1}, {"label":"x", "x":3, "y":1}] diff --git a/keyboards/wilba_tech/wt8_a/rules.mk b/keyboards/wilba_tech/wt8_a/rules.mk index a7aa26a0753..396da8c7344 100644 --- a/keyboards/wilba_tech/wt8_a/rules.mk +++ b/keyboards/wilba_tech/wt8_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json index 7178ca6b0be..5ef0875419b 100644 --- a/keyboards/wilba_tech/zeal60/info.json +++ b/keyboards/wilba_tech/zeal60/info.json @@ -8,6 +8,8 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_all": { diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index 9e89910b3e1..4f810f3d320 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json index 57f5f6c5eb6..935dc188749 100644 --- a/keyboards/wilba_tech/zeal65/info.json +++ b/keyboards/wilba_tech/zeal65/info.json @@ -8,6 +8,8 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_65_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Win", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Fn2", "x":10, "y":4, "w":1.5}, {"label":"Fn1", "x":11.5, "y":4, "w":1.5}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk index 9e89910b3e1..4f810f3d320 100644 --- a/keyboards/wilba_tech/zeal65/rules.mk +++ b/keyboards/wilba_tech/zeal65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json index f1379bb6127..d5039abf583 100644 --- a/keyboards/winkeyless/b87/info.json +++ b/keyboards/winkeyless/b87/info.json @@ -8,6 +8,8 @@ "pid": "0x0B87", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/winkeyless/b87/rules.mk b/keyboards/winkeyless/b87/rules.mk index 47f85799f58..44fd7274719 100644 --- a/keyboards/winkeyless/b87/rules.mk +++ b/keyboards/winkeyless/b87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json index b375c5121e2..47cd951632a 100644 --- a/keyboards/winkeyless/bface/info.json +++ b/keyboards/winkeyless/bface/info.json @@ -8,6 +8,8 @@ "pid": "0x4246", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_60_ansi": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/winkeyless/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk index 4dcdfe886af..03a618b76dc 100644 --- a/keyboards/winkeyless/bface/rules.mk +++ b/keyboards/winkeyless/bface/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json index a4cee455a67..7d0d4610507 100644 --- a/keyboards/winkeyless/bmini/info.json +++ b/keyboards/winkeyless/bmini/info.json @@ -8,6 +8,8 @@ "pid": "0x424D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1, "w":2}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K10", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":6.25}, {"label":"K57", "x":10, "y":5}, {"label":"KB0", "x":11, "y":5}, {"label":"KC0", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] diff --git a/keyboards/winkeyless/bmini/rules.mk b/keyboards/winkeyless/bmini/rules.mk index 9686fd1aa4c..25437c442c6 100644 --- a/keyboards/winkeyless/bmini/rules.mk +++ b/keyboards/winkeyless/bmini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json index f51ac4613a1..42acca0f6a3 100644 --- a/keyboards/winkeyless/bminiex/info.json +++ b/keyboards/winkeyless/bminiex/info.json @@ -8,6 +8,8 @@ "pid": "0x4258", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk index dca760709cb..b83fe79ca6c 100644 --- a/keyboards/winkeyless/bminiex/rules.mk +++ b/keyboards/winkeyless/bminiex/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json index 2f73cbf7f49..10c304db468 100644 --- a/keyboards/winkeys/mini_winni/info.json +++ b/keyboards/winkeys/mini_winni/info.json @@ -7,6 +7,8 @@ "pid": "0x7770", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/winkeys/mini_winni/rules.mk b/keyboards/winkeys/mini_winni/rules.mk index 7b7949afcb6..ed20f2bf91e 100644 --- a/keyboards/winkeys/mini_winni/rules.mk +++ b/keyboards/winkeys/mini_winni/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json index 6adc2dbba71..4cbb746408b 100644 --- a/keyboards/winry/winry25tc/info.json +++ b/keyboards/winry/winry25tc/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/winry/winry25tc/rules.mk b/keyboards/winry/winry25tc/rules.mk index 53a67bd4aed..e1908949b39 100644 --- a/keyboards/winry/winry25tc/rules.mk +++ b/keyboards/winry/winry25tc/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json index 6410c6222f9..7740c1a3e8c 100644 --- a/keyboards/winry/winry315/info.json +++ b/keyboards/winry/winry315/info.json @@ -8,6 +8,8 @@ "pid": "0x0315", "vid": "0xF1F1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_top" }, diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk index c10a9d570ab..d5f501196c8 100644 --- a/keyboards/winry/winry315/rules.mk +++ b/keyboards/winry/winry315/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json index fb2ca289566..39fec251a1d 100644 --- a/keyboards/wolf/kuku65/info.json +++ b/keyboards/wolf/kuku65/info.json @@ -8,6 +8,8 @@ "pid": "0x0052", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wolf/kuku65/rules.mk b/keyboards/wolf/kuku65/rules.mk index f4ad147581a..67bb6296514 100644 --- a/keyboards/wolf/kuku65/rules.mk +++ b/keyboards/wolf/kuku65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json index 26a99842057..5afce87aefc 100644 --- a/keyboards/wolf/ryujin/info.json +++ b/keyboards/wolf/ryujin/info.json @@ -8,6 +8,8 @@ "pid": "0x0200", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,5", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}] diff --git a/keyboards/wolf/ryujin/rules.mk b/keyboards/wolf/ryujin/rules.mk index f4ad147581a..67bb6296514 100644 --- a/keyboards/wolf/ryujin/rules.mk +++ b/keyboards/wolf/ryujin/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json index 2b8bce97b42..edefa1ad518 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/info.json @@ -8,6 +8,8 @@ "pid": "0x0055", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk index 39ad4aa5a04..c53a08ce4a5 100644 --- a/keyboards/wolf/sabre/rules.mk +++ b/keyboards/wolf/sabre/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json index 0e2633d058b..e3d2a375e37 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/info.json @@ -8,6 +8,8 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT": { diff --git a/keyboards/wolf/ts60/rules.mk b/keyboards/wolf/ts60/rules.mk index 56476b12b9f..fb26dc7de5f 100644 --- a/keyboards/wolf/ts60/rules.mk +++ b/keyboards/wolf/ts60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json index d23f5973248..f2f93b63eab 100644 --- a/keyboards/woodkeys/bigseries/1key/info.json +++ b/keyboards/woodkeys/bigseries/1key/info.json @@ -8,6 +8,8 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/woodkeys/bigseries/1key/rules.mk b/keyboards/woodkeys/bigseries/1key/rules.mk index 49ff0998f68..4465ace1727 100755 --- a/keyboards/woodkeys/bigseries/1key/rules.mk +++ b/keyboards/woodkeys/bigseries/1key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json index 643fc847e61..5137f4f1d19 100644 --- a/keyboards/woodkeys/bigseries/2key/info.json +++ b/keyboards/woodkeys/bigseries/2key/info.json @@ -8,6 +8,8 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/woodkeys/bigseries/2key/rules.mk b/keyboards/woodkeys/bigseries/2key/rules.mk index 49ff0998f68..4465ace1727 100755 --- a/keyboards/woodkeys/bigseries/2key/rules.mk +++ b/keyboards/woodkeys/bigseries/2key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json index 7b1a397ae39..af1c85f925b 100644 --- a/keyboards/woodkeys/bigseries/3key/info.json +++ b/keyboards/woodkeys/bigseries/3key/info.json @@ -8,6 +8,8 @@ "pid": "0x6073", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/woodkeys/bigseries/3key/rules.mk b/keyboards/woodkeys/bigseries/3key/rules.mk index 49ff0998f68..4465ace1727 100755 --- a/keyboards/woodkeys/bigseries/3key/rules.mk +++ b/keyboards/woodkeys/bigseries/3key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json index d773d377659..b6e02aa987d 100644 --- a/keyboards/woodkeys/bigseries/4key/info.json +++ b/keyboards/woodkeys/bigseries/4key/info.json @@ -8,6 +8,8 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/woodkeys/bigseries/4key/rules.mk b/keyboards/woodkeys/bigseries/4key/rules.mk index 49ff0998f68..4465ace1727 100755 --- a/keyboards/woodkeys/bigseries/4key/rules.mk +++ b/keyboards/woodkeys/bigseries/4key/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 652536e17bd..70d26001630 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -8,6 +8,8 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk index 76034643bdb..7f77c0a1238 100644 --- a/keyboards/woodkeys/meira/rules.mk +++ b/keyboards/woodkeys/meira/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json index c13df307dd3..180cd460980 100644 --- a/keyboards/woodkeys/scarletbandana/info.json +++ b/keyboards/woodkeys/scarletbandana/info.json @@ -8,6 +8,8 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":17.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":17.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":17.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":2.25}, {"x":8.5, "y":4, "w":1.75}, {"x":10.25, "y":4, "w":2.25}, {"x":12.5, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}] diff --git a/keyboards/woodkeys/scarletbandana/rules.mk b/keyboards/woodkeys/scarletbandana/rules.mk index a6313e3b41d..3de47dd4a0e 100644 --- a/keyboards/woodkeys/scarletbandana/rules.mk +++ b/keyboards/woodkeys/scarletbandana/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 86de1624f19..169e9eab2ef 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -7,6 +7,8 @@ "vid": "0x574C", "pid": "0x1DF9" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk index ac0a5137858..7b2a49bbc23 100644 --- a/keyboards/work_louder/loop/rules.mk +++ b/keyboards/work_louder/loop/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index 46b083d0efd..4464448621e 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -8,6 +8,8 @@ "pid": "0xE6F0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk index ddbd9618d0b..60c7afc95e6 100644 --- a/keyboards/work_louder/nano/rules.mk +++ b/keyboards/work_louder/nano/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index 570e5c21db9..e354390d83a 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -7,6 +7,8 @@ "vid": "0x574C", "pid": "0xDCD1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_2u_space": { "layout": [ diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk index b89d0adf1e8..714b4b5d049 100644 --- a/keyboards/work_louder/work_board/rules.mk +++ b/keyboards/work_louder/work_board/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json index c551ce6179d..72e96144f15 100644 --- a/keyboards/wren/info.json +++ b/keyboards/wren/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk index 7fa6b51f4be..6b9cc95ebf2 100644 --- a/keyboards/wren/rules.mk +++ b/keyboards/wren/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json index d335959b32f..1d7a859a141 100644 --- a/keyboards/wsk/alpha9/info.json +++ b/keyboards/wsk/alpha9/info.json @@ -8,6 +8,8 @@ "pid": "0x692A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":"Enter", "x":12.5, "y":1}, {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"label":"Z", "x":4, "y":2}, {"label":"X", "x":5, "y":2}, {"label":"C", "x":6, "y":2}, {"label":"V", "x":7, "y":2}, {"x":8, "y":2, "w":2}, {"label":"B", "x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}] diff --git a/keyboards/wsk/alpha9/rules.mk b/keyboards/wsk/alpha9/rules.mk index d946d8641a3..b851d0ab392 100644 --- a/keyboards/wsk/alpha9/rules.mk +++ b/keyboards/wsk/alpha9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json index 109da40b521..a55225c0bc0 100644 --- a/keyboards/wsk/g4m3ralpha/info.json +++ b/keyboards/wsk/g4m3ralpha/info.json @@ -8,6 +8,8 @@ "pid": "0x56D9", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"!", "x":0.5, "y":0}, {"label":"@", "x":1.5, "y":0}, {"label":"#", "x":2.5, "y":0}, {"label":"$", "x":3.5, "y":0}, {"label":"%", "x":4.5, "y":0}, {"label":"Q", "x":0, "y":1}, {"label":"W", "x":1, "y":1}, {"label":"E", "x":2, "y":1}, {"label":"R", "x":3, "y":1}, {"label":"T", "x":4, "y":1}, {"label":"Y", "x":5, "y":1}, {"label":"U", "x":6, "y":1}, {"label":"I", "x":7, "y":1}, {"label":"O", "x":8, "y":1}, {"label":"P", "x":9, "y":1}, {"label":"A", "x":0, "y":2}, {"label":"S", "x":1, "y":2}, {"label":"D", "x":2, "y":2}, {"label":"F", "x":3, "y":2}, {"label":"G", "x":4, "y":2}, {"label":"H", "x":5, "y":2}, {"label":"J", "x":6, "y":2}, {"label":"K", "x":7, "y":2}, {"label":"L", "x":8, "y":2}, {"label":"Enter", "x":9, "y":2}, {"label":"Z", "x":0.5, "y":3}, {"label":"X", "x":1.5, "y":3}, {"label":"C", "x":2.5, "y":3}, {"label":"V", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}] diff --git a/keyboards/wsk/g4m3ralpha/rules.mk b/keyboards/wsk/g4m3ralpha/rules.mk index d946d8641a3..b851d0ab392 100644 --- a/keyboards/wsk/g4m3ralpha/rules.mk +++ b/keyboards/wsk/g4m3ralpha/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json index 04e4ac501f6..bce25f39344 100644 --- a/keyboards/wsk/gothic50/info.json +++ b/keyboards/wsk/gothic50/info.json @@ -8,6 +8,8 @@ "pid": "0x04EF", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":8.25, "y":0}, {"label":"U", "x":9.25, "y":0}, {"label":"I", "x":10.25, "y":0}, {"label":"O", "x":11.25, "y":0}, {"label":"P", "x":12.25, "y":0}, {"label":"{", "x":13.25, "y":0}, {"label":"}", "x":14.25, "y":0}, {"x":15.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":":", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"x":15.5, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"x":15.5, "y":2}, {"x":14.25, "y":2.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3}, {"x":5.5, "y":3, "w":1.25}, {"x":8, "y":3, "w":1.75}, {"label":"Alt", "x":9.75, "y":3}, {"label":"Win", "x":10.75, "y":3, "w":1.25}, {"x":13.25, "y":3.25}, {"x":14.25, "y":3.25}, {"x":15.25, "y":3.25}] diff --git a/keyboards/wsk/gothic50/rules.mk b/keyboards/wsk/gothic50/rules.mk index a5c2b2bc445..4465ace1727 100644 --- a/keyboards/wsk/gothic50/rules.mk +++ b/keyboards/wsk/gothic50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json index fd28aba662e..f7baad64c12 100644 --- a/keyboards/wsk/gothic70/info.json +++ b/keyboards/wsk/gothic70/info.json @@ -8,6 +8,8 @@ "pid": "0x63CC", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}] diff --git a/keyboards/wsk/gothic70/rules.mk b/keyboards/wsk/gothic70/rules.mk index a5c2b2bc445..4465ace1727 100644 --- a/keyboards/wsk/gothic70/rules.mk +++ b/keyboards/wsk/gothic70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json index 43bcc1bf5ba..490088543cb 100644 --- a/keyboards/wsk/houndstooth/info.json +++ b/keyboards/wsk/houndstooth/info.json @@ -8,6 +8,8 @@ "pid": "0xFA9C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"Back Space", "x":11.5, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":";", "x":10.5, "y":1}, {"label":"'", "x":11.5, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":",", "x":8.5, "y":2}, {"label":".", "x":9.5, "y":2}, {"label":"/", "x":10.5, "y":2}, {"label":"Return", "x":11.5, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6.5, "y":3}, {"label":"⇑", "x":7.5, "y":3}, {"label":"←", "x":8.5, "y":3}, {"label":"↓", "x":9.5, "y":3}, {"label":"↑", "x":10.5, "y":3}, {"label":"→", "x":11.5, "y":3}] diff --git a/keyboards/wsk/houndstooth/rules.mk b/keyboards/wsk/houndstooth/rules.mk index 1b7716f469f..21a60b878fe 100644 --- a/keyboards/wsk/houndstooth/rules.mk +++ b/keyboards/wsk/houndstooth/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/jerkin/info.json b/keyboards/wsk/jerkin/info.json index 96536bc9f86..bc273e6c5ef 100644 --- a/keyboards/wsk/jerkin/info.json +++ b/keyboards/wsk/jerkin/info.json @@ -8,6 +8,8 @@ "pid": "0x79AE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"{", "x":12.75, "y":0}, {"label":"Back
Space", "x":13.75, "y":0}, {"label":"Tab", "x":0.25, "y":1, "w":1.25}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":8.25, "y":1}, {"label":"J", "x":9.25, "y":1}, {"label":"K", "x":10.25, "y":1}, {"label":"L", "x":11.25, "y":1}, {"label":"\"", "x":12.25, "y":1}, {"label":"Enter", "x":13.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"label":"Shift", "x":14, "y":2, "w":1.25}] diff --git a/keyboards/wsk/jerkin/rules.mk b/keyboards/wsk/jerkin/rules.mk index 2ad4835ae68..430e25d06d2 100644 --- a/keyboards/wsk/jerkin/rules.mk +++ b/keyboards/wsk/jerkin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json index 9ed93f9168b..713c1f064f0 100644 --- a/keyboards/wsk/kodachi50/info.json +++ b/keyboards/wsk/kodachi50/info.json @@ -8,6 +8,8 @@ "pid": "0x72D4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"{", "x":6.5, "y":0}, {"label":"}", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Backspace", "x":13.5, "y":0, "w":1.5}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"|", "x":6.25, "y":1, "w":1.25}, {"label":"Alt", "x":7.5, "y":1, "w":1.25}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":"\"", "x":12.75, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"~", "x":6, "y":2}, {"label":"_", "x":7, "y":2}, {"label":"+", "x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.75}, {"x":6.5, "y":3}, {"x":7.5, "y":3, "w":2.25}, {"label":"Win", "x":9.75, "y":3, "w":1.25}, {"label":"Left", "x":11, "y":3}, {"label":"Down", "x":12, "y":3}, {"label":"Up", "x":13, "y":3}, {"label":"Right", "x":14, "y":3}] diff --git a/keyboards/wsk/kodachi50/rules.mk b/keyboards/wsk/kodachi50/rules.mk index 82cf2b723bb..c4a40815c6d 100644 --- a/keyboards/wsk/kodachi50/rules.mk +++ b/keyboards/wsk/kodachi50/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json index 56753300987..ee3d5848738 100644 --- a/keyboards/wsk/pain27/info.json +++ b/keyboards/wsk/pain27/info.json @@ -8,6 +8,8 @@ "pid": "0x9E8C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"x":3.25, "y":3, "w":6.25}] diff --git a/keyboards/wsk/pain27/rules.mk b/keyboards/wsk/pain27/rules.mk index 99bf6e4cc05..21fd8f40ee0 100644 --- a/keyboards/wsk/pain27/rules.mk +++ b/keyboards/wsk/pain27/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json index 6333b32cd1b..f9f700e42c6 100644 --- a/keyboards/wsk/sl40/info.json +++ b/keyboards/wsk/sl40/info.json @@ -8,6 +8,8 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":6.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}] diff --git a/keyboards/wsk/sl40/rules.mk b/keyboards/wsk/sl40/rules.mk index 82cf2b723bb..c4a40815c6d 100644 --- a/keyboards/wsk/sl40/rules.mk +++ b/keyboards/wsk/sl40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json index 1e8eba68e7d..b210528ba0a 100644 --- a/keyboards/wsk/tkl30/info.json +++ b/keyboards/wsk/tkl30/info.json @@ -8,6 +8,8 @@ "pid": "0x0B7F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Tab", "x":0, "y":0.25, "w":1.5}, {"label":"Q", "x":1.5, "y":0.25}, {"label":"W", "x":2.5, "y":0.25}, {"label":"E", "x":3.5, "y":0.25}, {"label":"R", "x":4.5, "y":0.25}, {"label":"T", "x":5.5, "y":0.25}, {"label":"Y", "x":6.5, "y":0.25}, {"label":"U", "x":7.5, "y":0.25}, {"label":"I", "x":8.5, "y":0.25}, {"label":"O", "x":9.5, "y":0.25}, {"label":"P", "x":10.5, "y":0.25}, {"label":"{", "x":11.5, "y":0.25}, {"label":"}", "x":12.5, "y":0.25}, {"label":"|", "x":13.5, "y":0.25, "w":1.5}, {"label":"Ctrl", "x":0, "y":1.25, "w":1.75}, {"label":"A", "x":1.75, "y":1.25}, {"label":"S", "x":2.75, "y":1.25}, {"label":"D", "x":3.75, "y":1.25}, {"label":"F", "x":4.75, "y":1.25}, {"label":"G", "x":5.75, "y":1.25}, {"label":"H", "x":6.75, "y":1.25}, {"label":"J", "x":7.75, "y":1.25}, {"label":"K", "x":8.75, "y":1.25}, {"label":"L", "x":9.75, "y":1.25}, {"label":":", "x":10.75, "y":1.25}, {"label":"\"", "x":11.75, "y":1.25}, {"label":"Enter", "x":12.75, "y":1.25, "w":2.25}, {"label":"\u2191", "x":16.25, "y":1.25}, {"label":"Shift", "x":0, "y":2.25, "w":1.25}, {"label":"Alt", "x":1.25, "y":2.25}, {"label":"Z", "x":2.25, "y":2.25}, {"label":"X", "x":3.25, "y":2.25}, {"label":"C", "x":4.25, "y":2.25}, {"label":"V", "x":5.25, "y":2.25}, {"x":6.25, "y":2.25, "w":2}, {"label":"B", "x":8.25, "y":2.25}, {"label":"N", "x":9.25, "y":2.25}, {"label":"M", "x":10.25, "y":2.25}, {"label":"<", "x":11.25, "y":2.25}, {"label":">", "x":12.25, "y":2.25}, {"label":"Fn", "x":13.25, "y":2.25, "w":1.75}, {"label":"\u2190", "x":15.25, "y":2.25}, {"label":"\u2193", "x":16.25, "y":2.25}, {"label":"\u2192", "x":17.25, "y":2.25}] diff --git a/keyboards/wsk/tkl30/rules.mk b/keyboards/wsk/tkl30/rules.mk index 7dae3a84234..3b6a1809db1 100644 --- a/keyboards/wsk/tkl30/rules.mk +++ b/keyboards/wsk/tkl30/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json index 712c751f918..4cdf46a99a6 100644 --- a/keyboards/wuque/ikki68/info.json +++ b/keyboards/wuque/ikki68/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/wuque/ikki68/rules.mk b/keyboards/wuque/ikki68/rules.mk index 85eec9079f3..b851d0ab392 100644 --- a/keyboards/wuque/ikki68/rules.mk +++ b/keyboards/wuque/ikki68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json index 92c7da0eeb5..0a5176548bf 100644 --- a/keyboards/wuque/ikki68_aurora/info.json +++ b/keyboards/wuque/ikki68_aurora/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_68_ansi": { "layout": [ diff --git a/keyboards/wuque/ikki68_aurora/rules.mk b/keyboards/wuque/ikki68_aurora/rules.mk index 5d4be0ad061..540e0c2514d 100644 --- a/keyboards/wuque/ikki68_aurora/rules.mk +++ b/keyboards/wuque/ikki68_aurora/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json index 003bf12c6e7..a87798679f2 100644 --- a/keyboards/wuque/mammoth20x/info.json +++ b/keyboards/wuque/mammoth20x/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_default": "LAYOUT" }, diff --git a/keyboards/wuque/mammoth20x/rules.mk b/keyboards/wuque/mammoth20x/rules.mk index 0788f9ae5d0..1f4cf80a4d5 100644 --- a/keyboards/wuque/mammoth20x/rules.mk +++ b/keyboards/wuque/mammoth20x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json index 6e3bd8a46b8..4260d60d857 100644 --- a/keyboards/wuque/mammoth75x/info.json +++ b/keyboards/wuque/mammoth75x/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/wuque/mammoth75x/rules.mk b/keyboards/wuque/mammoth75x/rules.mk index a5bc34fd0cc..fe9d55b10fd 100644 --- a/keyboards/wuque/mammoth75x/rules.mk +++ b/keyboards/wuque/mammoth75x/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json index 649b60295af..eeecf46b348 100644 --- a/keyboards/wuque/promise87/ansi/info.json +++ b/keyboards/wuque/promise87/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_87_ansi": "LAYOUT_tkl_f13_ansi_tsangan", "LAYOUT_87_ansi_split_bs": "LAYOUT_tkl_f13_ansi_tsangan_split_bs", diff --git a/keyboards/wuque/promise87/ansi/rules.mk b/keyboards/wuque/promise87/ansi/rules.mk index 85a4a905a5a..9f087183c5e 100644 --- a/keyboards/wuque/promise87/ansi/rules.mk +++ b/keyboards/wuque/promise87/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json index 1331b6266e2..fcf2d5514c7 100644 --- a/keyboards/wuque/promise87/wkl/info.json +++ b/keyboards/wuque/promise87/wkl/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all_wkl": "LAYOUT_all", "LAYOUT_87_wkl": "LAYOUT_tkl_f13_ansi_wkl", diff --git a/keyboards/wuque/promise87/wkl/rules.mk b/keyboards/wuque/promise87/wkl/rules.mk index 85a4a905a5a..9f087183c5e 100644 --- a/keyboards/wuque/promise87/wkl/rules.mk +++ b/keyboards/wuque/promise87/wkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json index 18f70623973..fa2dc42e85e 100644 --- a/keyboards/wuque/serneity65/info.json +++ b/keyboards/wuque/serneity65/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/wuque/serneity65/rules.mk b/keyboards/wuque/serneity65/rules.mk index fcdc6f1f622..8c163bff643 100644 --- a/keyboards/wuque/serneity65/rules.mk +++ b/keyboards/wuque/serneity65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/x16/info.json b/keyboards/x16/info.json index a006269af07..2fafd80695a 100644 --- a/keyboards/x16/info.json +++ b/keyboards/x16/info.json @@ -8,6 +8,8 @@ "pid": "0x016A", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/x16/rules.mk b/keyboards/x16/rules.mk index 1c4073c9cee..b325f3f0c79 100644 --- a/keyboards/x16/rules.mk +++ b/keyboards/x16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json index f87903c3912..de0bc98a75f 100644 --- a/keyboards/xbows/knight/info.json +++ b/keyboards/xbows/knight/info.json @@ -8,6 +8,8 @@ "pid": "0x4B6E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/xbows/knight/rules.mk b/keyboards/xbows/knight/rules.mk index 9dec74c970f..2c371108288 100644 --- a/keyboards/xbows/knight/rules.mk +++ b/keyboards/xbows/knight/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json index 3c2c498da4e..107cadc3e5c 100644 --- a/keyboards/xbows/knight_plus/info.json +++ b/keyboards/xbows/knight_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x4B50", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/xbows/knight_plus/rules.mk b/keyboards/xbows/knight_plus/rules.mk index 9dec74c970f..2c371108288 100644 --- a/keyboards/xbows/knight_plus/rules.mk +++ b/keyboards/xbows/knight_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json index 50ab0801ac4..e99aa151c0f 100644 --- a/keyboards/xbows/nature/info.json +++ b/keyboards/xbows/nature/info.json @@ -8,6 +8,8 @@ "pid": "0x4E61", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/xbows/nature/rules.mk b/keyboards/xbows/nature/rules.mk index 9dec74c970f..2c371108288 100644 --- a/keyboards/xbows/nature/rules.mk +++ b/keyboards/xbows/nature/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json index 7542fd02b6c..eaecfca7f40 100644 --- a/keyboards/xbows/numpad/info.json +++ b/keyboards/xbows/numpad/info.json @@ -8,6 +8,8 @@ "pid": "0x4E75", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/xbows/numpad/rules.mk b/keyboards/xbows/numpad/rules.mk index 9dec74c970f..2c371108288 100644 --- a/keyboards/xbows/numpad/rules.mk +++ b/keyboards/xbows/numpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json index 231d285968d..5a549300c7a 100644 --- a/keyboards/xbows/ranger/info.json +++ b/keyboards/xbows/ranger/info.json @@ -8,6 +8,8 @@ "pid": "0x5261", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layout_aliases": { "LAYOUT": "LAYOUT_tkl_ansi" diff --git a/keyboards/xbows/ranger/rules.mk b/keyboards/xbows/ranger/rules.mk index 9dec74c970f..2c371108288 100644 --- a/keyboards/xbows/ranger/rules.mk +++ b/keyboards/xbows/ranger/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json index 1223301fe6c..8f212f965d8 100644 --- a/keyboards/xbows/woody/info.json +++ b/keyboards/xbows/woody/info.json @@ -8,6 +8,8 @@ "pid": "0x1224", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk index 6dcdb620582..c15a80d7514 100644 --- a/keyboards/xbows/woody/rules.mk +++ b/keyboards/xbows/woody/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/info.json index 36a6d782777..bc275f35099 100644 --- a/keyboards/xelus/akis/info.json +++ b/keyboards/xelus/akis/info.json @@ -8,6 +8,8 @@ "pid": "0xA04B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_all": "LAYOUT_all" }, diff --git a/keyboards/xelus/akis/rules.mk b/keyboards/xelus/akis/rules.mk index 65143933078..6160e71935c 100644 --- a/keyboards/xelus/akis/rules.mk +++ b/keyboards/xelus/akis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json index 24eba75384d..7dc91a84b18 100644 --- a/keyboards/xelus/dawn60/info.json +++ b/keyboards/xelus/dawn60/info.json @@ -8,6 +8,8 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_60_all": "LAYOUT_all" }, diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk index 3fe31770d0e..e641678ecb1 100644 --- a/keyboards/xelus/dawn60/rev1/rules.mk +++ b/keyboards/xelus/dawn60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk index 0932c3fc882..2101e1cd1ce 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk +++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json index 174cf2a1f05..13930405684 100644 --- a/keyboards/xelus/dharma/info.json +++ b/keyboards/xelus/dharma/info.json @@ -8,6 +8,8 @@ "pid": "0xDAAA", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/dharma/rules.mk b/keyboards/xelus/dharma/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/xelus/dharma/rules.mk +++ b/keyboards/xelus/dharma/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/info.json index 523aef4aaa8..f6e477a9ef8 100644 --- a/keyboards/xelus/kangaroo/rev1/info.json +++ b/keyboards/xelus/kangaroo/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Kangaroo Rev 1.0", "usb": { "device_version": "0.0.1" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/kangaroo/rev1/rules.mk b/keyboards/xelus/kangaroo/rev1/rules.mk index 80826fae5f8..805e07ebc2e 100644 --- a/keyboards/xelus/kangaroo/rev1/rules.mk +++ b/keyboards/xelus/kangaroo/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/info.json index 8f7a2c6ce95..a2dc9694c15 100644 --- a/keyboards/xelus/kangaroo/rev2/info.json +++ b/keyboards/xelus/kangaroo/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Kangaroo Rev 2.0", "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32L412", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/kangaroo/rev2/rules.mk b/keyboards/xelus/kangaroo/rev2/rules.mk index 44ac92bb816..c7c6f5f1633 100644 --- a/keyboards/xelus/kangaroo/rev2/rules.mk +++ b/keyboards/xelus/kangaroo/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L412 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json index ced81e6f3d1..c37c8989950 100644 --- a/keyboards/xelus/la_plus/info.json +++ b/keyboards/xelus/la_plus/info.json @@ -8,6 +8,8 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk index 440396715bb..cf619327069 100755 --- a/keyboards/xelus/la_plus/rules.mk +++ b/keyboards/xelus/la_plus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json index f85a6a54c44..32dc05f71cd 100644 --- a/keyboards/xelus/ninjin/info.json +++ b/keyboards/xelus/ninjin/info.json @@ -8,6 +8,8 @@ "pid": "0x4E4A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/xelus/ninjin/rules.mk b/keyboards/xelus/ninjin/rules.mk index 1407a61c3f1..3d8c7c0af87 100644 --- a/keyboards/xelus/ninjin/rules.mk +++ b/keyboards/xelus/ninjin/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json index ca78bdbffe4..bb3b24b1233 100644 --- a/keyboards/xelus/pachi/mini_32u4/info.json +++ b/keyboards/xelus/pachi/mini_32u4/info.json @@ -8,6 +8,8 @@ "pid": "0x5041", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/pachi/mini_32u4/rules.mk b/keyboards/xelus/pachi/mini_32u4/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/xelus/pachi/mini_32u4/rules.mk +++ b/keyboards/xelus/pachi/mini_32u4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json index 1b14340edd7..d5b965a97e1 100644 --- a/keyboards/xelus/pachi/rev1/info.json +++ b/keyboards/xelus/pachi/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x5041", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/pachi/rev1/rules.mk b/keyboards/xelus/pachi/rev1/rules.mk index ccb8e4eb545..c02eb841df6 100644 --- a/keyboards/xelus/pachi/rev1/rules.mk +++ b/keyboards/xelus/pachi/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json index 24b6c4834ab..be31e74a6ca 100644 --- a/keyboards/xelus/pachi/rgb/rev1/info.json +++ b/keyboards/xelus/pachi/rgb/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x5052", "device_version": "0.0.1" }, + "processor": "STM32L422", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk index 3cfa837091b..904565c01e9 100644 --- a/keyboards/xelus/pachi/rgb/rev1/rules.mk +++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L422 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json index 46a4de5920e..e7719164076 100644 --- a/keyboards/xelus/pachi/rgb/rev2/info.json +++ b/keyboards/xelus/pachi/rgb/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x5053", "device_version": "0.0.2" }, + "processor": "STM32L422", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk index 8092cc995a4..7150da03896 100644 --- a/keyboards/xelus/pachi/rgb/rev2/rules.mk +++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L422 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json index c266a5193ba..db08aa88c81 100644 --- a/keyboards/xelus/rs108/info.json +++ b/keyboards/xelus/rs108/info.json @@ -8,6 +8,8 @@ "pid": "0x5208", "device_version": "0.0.2" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_108_fullsize_ansi": { "layout": [ diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk index 46df2e4e8ea..8441c649b26 100644 --- a/keyboards/xelus/rs108/rules.mk +++ b/keyboards/xelus/rs108/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json index cf78bc4ec76..d86a0453c2c 100644 --- a/keyboards/xelus/rs60/rev1/info.json +++ b/keyboards/xelus/rs60/rev1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.1.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/xelus/rs60/rev1/rules.mk b/keyboards/xelus/rs60/rev1/rules.mk index cdac239154f..cfea96a79b0 100644 --- a/keyboards/xelus/rs60/rev1/rules.mk +++ b/keyboards/xelus/rs60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json index f9f8400732d..af4ce913eb6 100644 --- a/keyboards/xelus/rs60/rev2_0/info.json +++ b/keyboards/xelus/rs60/rev2_0/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.2.0" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk index 221b9d4c018..e81b538301a 100644 --- a/keyboards/xelus/rs60/rev2_0/rules.mk +++ b/keyboards/xelus/rs60/rev2_0/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json index 79768e0009a..c01512e8b69 100644 --- a/keyboards/xelus/rs60/rev2_1/info.json +++ b/keyboards/xelus/rs60/rev2_1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.2.1" - } + }, + "processor": "STM32L412", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk index 86f893cb2fc..6329d2c31d4 100644 --- a/keyboards/xelus/rs60/rev2_1/rules.mk +++ b/keyboards/xelus/rs60/rev2_1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L412 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/snap96/info.json b/keyboards/xelus/snap96/info.json index 74c7d6225ae..6550d46c8eb 100644 --- a/keyboards/xelus/snap96/info.json +++ b/keyboards/xelus/snap96/info.json @@ -8,6 +8,8 @@ "pid": "0x5396", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/snap96/rules.mk b/keyboards/xelus/snap96/rules.mk index 726bc460feb..8ced3c4cfc8 100644 --- a/keyboards/xelus/snap96/rules.mk +++ b/keyboards/xelus/snap96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json index 724eaef1148..094f9083f13 100644 --- a/keyboards/xelus/trinityxttkl/info.json +++ b/keyboards/xelus/trinityxttkl/info.json @@ -8,6 +8,8 @@ "pid": "0x5854", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk index 99fcb3cd13f..120a444ec8a 100644 --- a/keyboards/xelus/trinityxttkl/rules.mk +++ b/keyboards/xelus/trinityxttkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json index 057ae426ab2..547e50b3f8e 100644 --- a/keyboards/xelus/valor/rev1/info.json +++ b/keyboards/xelus/valor/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x5652", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/xelus/valor/rev1/rules.mk b/keyboards/xelus/valor/rev1/rules.mk index 813a5827eb1..2617d3d629c 100644 --- a/keyboards/xelus/valor/rev1/rules.mk +++ b/keyboards/xelus/valor/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json index 75c1057272a..f77f18dda3f 100644 --- a/keyboards/xelus/valor/rev2/info.json +++ b/keyboards/xelus/valor/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x5653", "device_version": "0.0.1" }, + "processor": "STM32L422", + "bootloader": "stm32-dfu", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk index 215891f29c9..47560d7f157 100644 --- a/keyboards/xelus/valor/rev2/rules.mk +++ b/keyboards/xelus/valor/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L422 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/valor_frl_tkl/rev1/info.json b/keyboards/xelus/valor_frl_tkl/rev1/info.json index 694c988376a..f4cc0f9659f 100644 --- a/keyboards/xelus/valor_frl_tkl/rev1/info.json +++ b/keyboards/xelus/valor_frl_tkl/rev1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Valor FRL TKL Rev1", "usb": { "device_version": "0.0.1" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/valor_frl_tkl/rev1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk index 1c71897c3ef..35173d663a9 100644 --- a/keyboards/xelus/valor_frl_tkl/rev1/rules.mk +++ b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json index 1764cc45ebe..972ee4bf922 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Valor FRL TKL Rev2.0", "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk index 0adbc4f3839..4ecf72dea77 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json index 1c7fb1dd6ba..6e76320a13b 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Valor FRL TKL Rev2.2", "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu" } diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk index 6b2ee6520dd..4ecf72dea77 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/xs108/info.json b/keyboards/xelus/xs108/info.json index c24b00b0114..95b758cd3e8 100644 --- a/keyboards/xelus/xs108/info.json +++ b/keyboards/xelus/xs108/info.json @@ -8,6 +8,8 @@ "pid": "0x0108", "device_version": "0.0.1" }, + "processor": "STM32L412", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_108_ansi": { "layout": [ diff --git a/keyboards/xelus/xs108/rules.mk b/keyboards/xelus/xs108/rules.mk index b02554d542f..a204d485fa6 100644 --- a/keyboards/xelus/xs108/rules.mk +++ b/keyboards/xelus/xs108/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L412 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/info.json index e16b675902a..35c4c7bc63e 100644 --- a/keyboards/xelus/xs60/hotswap/info.json +++ b/keyboards/xelus/xs60/hotswap/info.json @@ -8,6 +8,8 @@ "pid": "0x5861", "device_version": "0.0.1" }, + "processor": "STM32L422", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B0", "B1", "A8", "A9", "B5", "A6", "C14", "C15", "A0", "A5","A4","A3","A2","A1"], diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk index e0d3a00ac82..b58e18c74fd 100644 --- a/keyboards/xelus/xs60/hotswap/rules.mk +++ b/keyboards/xelus/xs60/hotswap/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L422 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/info.json index 6667a4ada61..471bedba8c3 100644 --- a/keyboards/xelus/xs60/soldered/info.json +++ b/keyboards/xelus/xs60/soldered/info.json @@ -8,6 +8,8 @@ "pid": "0x5860", "device_version": "0.0.1" }, + "processor": "STM32L422", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B0", "B1", "A8", "A9", "B5", "A6", "C14", "C15", "A0", "A5", "A4", "A3", "A2", "A1"], diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk index e0d3a00ac82..b58e18c74fd 100644 --- a/keyboards/xelus/xs60/soldered/rules.mk +++ b/keyboards/xelus/xs60/soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L422 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json index 9caa493f86e..934560827cd 100644 --- a/keyboards/xenon/info.json +++ b/keyboards/xenon/info.json @@ -8,6 +8,8 @@ "pid": "0x3404", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk index aeaa1fd1044..190ff6ca62b 100644 --- a/keyboards/xenon/rules.mk +++ b/keyboards/xenon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index e9876f8c645..2dcbc92637f 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -7,6 +7,8 @@ "pid": "0x0404", "device_version": "0.0.1" }, + "processor": "atmega16u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}] diff --git a/keyboards/xiudi/xd004/v1/rules.mk b/keyboards/xiudi/xd004/v1/rules.mk index 2a8b720e083..f5f21384361 100644 --- a/keyboards/xiudi/xd004/v1/rules.mk +++ b/keyboards/xiudi/xd004/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega16u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json index bceb5bc6cb3..29e6891948f 100644 --- a/keyboards/xiudi/xd60/rev2/info.json +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "XD60 Rev 2", "usb": { "pid": "0x6060" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/xiudi/xd60/rev2/rules.mk b/keyboards/xiudi/xd60/rev2/rules.mk index 52e9e2965ae..7dfcc1d898d 100644 --- a/keyboards/xiudi/xd60/rev2/rules.mk +++ b/keyboards/xiudi/xd60/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json index a03a344a28d..76273bbc3bb 100644 --- a/keyboards/xiudi/xd60/rev3/info.json +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "XD60 Rev 3", "usb": { "pid": "0x6363" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/xiudi/xd60/rev3/rules.mk b/keyboards/xiudi/xd60/rev3/rules.mk index 52e9e2965ae..7dfcc1d898d 100644 --- a/keyboards/xiudi/xd60/rev3/rules.mk +++ b/keyboards/xiudi/xd60/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json index a3769dcc787..1a140042902 100644 --- a/keyboards/xiudi/xd68/info.json +++ b/keyboards/xiudi/xd68/info.json @@ -8,6 +8,8 @@ "pid": "0x6868", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/xiudi/xd68/rules.mk b/keyboards/xiudi/xd68/rules.mk index 63a57dcadb9..45377383806 100644 --- a/keyboards/xiudi/xd68/rules.mk +++ b/keyboards/xiudi/xd68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json index 25ff7f16089..c3b751f474f 100644 --- a/keyboards/xiudi/xd75/info.json +++ b/keyboards/xiudi/xd75/info.json @@ -8,6 +8,8 @@ "pid": "0x7575", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/xiudi/xd75/rules.mk b/keyboards/xiudi/xd75/rules.mk index b3d0048dee1..ffa61ba8c5a 100644 --- a/keyboards/xiudi/xd75/rules.mk +++ b/keyboards/xiudi/xd75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json index 6d82671852f..7ff0dd7bcd2 100644 --- a/keyboards/xiudi/xd84/info.json +++ b/keyboards/xiudi/xd84/info.json @@ -8,6 +8,8 @@ "pid": "0x8484", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["75_ansi", "75_iso"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/xiudi/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk index 864e780606c..c6c7f4ef933 100644 --- a/keyboards/xiudi/xd84/rules.mk +++ b/keyboards/xiudi/xd84/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json index 38d13c7520a..a80a49598b6 100644 --- a/keyboards/xiudi/xd84pro/info.json +++ b/keyboards/xiudi/xd84pro/info.json @@ -8,6 +8,8 @@ "pid": "0x8450", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["75_ansi", "75_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/xiudi/xd84pro/rules.mk b/keyboards/xiudi/xd84pro/rules.mk index 38f81fd4dcc..1955f1d315b 100644 --- a/keyboards/xiudi/xd84pro/rules.mk +++ b/keyboards/xiudi/xd84pro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json index 770b3c6f350..d122894de02 100644 --- a/keyboards/xiudi/xd87/info.json +++ b/keyboards/xiudi/xd87/info.json @@ -8,6 +8,8 @@ "pid": "0x8787", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/xiudi/xd87/rules.mk b/keyboards/xiudi/xd87/rules.mk index 65748bbbe17..a2444417d6c 100644 --- a/keyboards/xiudi/xd87/rules.mk +++ b/keyboards/xiudi/xd87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json index aa9f2a7522d..a1d16818d5a 100644 --- a/keyboards/xiudi/xd96/info.json +++ b/keyboards/xiudi/xd96/info.json @@ -8,6 +8,8 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_96_ansi": { "layout": [ diff --git a/keyboards/xiudi/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk index 864e780606c..c6c7f4ef933 100644 --- a/keyboards/xiudi/xd96/rules.mk +++ b/keyboards/xiudi/xd96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xmmx/info.json b/keyboards/xmmx/info.json index 30b6cee59d2..3d0beb52831 100644 --- a/keyboards/xmmx/info.json +++ b/keyboards/xmmx/info.json @@ -8,6 +8,8 @@ "pid": "0x6776", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xmmx/rules.mk b/keyboards/xmmx/rules.mk index 82694737e60..51c80ed6cf1 100644 --- a/keyboards/xmmx/rules.mk +++ b/keyboards/xmmx/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json index 40f3f44760b..33cb350120f 100644 --- a/keyboards/xw60/info.json +++ b/keyboards/xw60/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K0C", "x":12, "y":0}, {"label":"K0D", "x":13, "y":0}, {"label":"K49", "x":14, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K1D", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2}, {"label":"K2D", "x":13.75, "y":2, "w":1.25}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3}, {"label":"K32", "x":2.25, "y":3}, {"label":"K33", "x":3.25, "y":3}, {"label":"K34", "x":4.25, "y":3}, {"label":"K35", "x":5.25, "y":3}, {"label":"K36", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K38", "x":8.25, "y":3}, {"label":"K39", "x":9.25, "y":3}, {"label":"K3A", "x":10.25, "y":3}, {"label":"K3B", "x":11.25, "y":3}, {"label":"K3D", "x":12.25, "y":3, "w":1.75}, {"label":"K3C", "x":14, "y":3}, {"label":"K40", "x":0, "y":4, "w":1.25}, {"label":"K41", "x":1.25, "y":4, "w":1.25}, {"label":"K42", "x":2.5, "y":4, "w":1.25}, {"label":"K44", "x":3.75, "y":4, "w":2}, {"label":"K45", "x":5.75, "y":4, "w":2.25}, {"label":"K46", "x":8, "y":4, "w":2}, {"label":"K4A", "x":10, "y":4, "w":1.25}, {"label":"K4B", "x":11.25, "y":4, "w":1.25}, {"label":"K4C", "x":12.5, "y":4, "w":1.25}, {"label":"K4D", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk index c327b021584..460d3ced43e 100644 --- a/keyboards/xw60/rules.mk +++ b/keyboards/xw60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json index 07546e3b0b5..753c952b1d6 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/info.json @@ -8,6 +8,8 @@ "pid": "0x8369", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "debounce": 2, "layouts": { "LAYOUT": { diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk index 7ad3dbb51b8..9f1bf198639 100644 --- a/keyboards/yampad/rules.mk +++ b/keyboards/yampad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 3275ac6f6e9..6e174509dba 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -5,6 +5,8 @@ "pid": "0xAAAF", "device_version": "1.0.0" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/yandrstudio/nz64/rules.mk b/keyboards/yandrstudio/nz64/rules.mk index 8debea0e663..302cf375a3d 100644 --- a/keyboards/yandrstudio/nz64/rules.mk +++ b/keyboards/yandrstudio/nz64/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index 26fc92799a3..e0fee4588e9 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -5,6 +5,8 @@ "pid": "0xAAAD", "device_version": "1.0.0" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/yandrstudio/zhou65/rules.mk b/keyboards/yandrstudio/zhou65/rules.mk index 0a84b0a1fe4..3b6a1809db1 100644 --- a/keyboards/yandrstudio/zhou65/rules.mk +++ b/keyboards/yandrstudio/zhou65/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yanghu/unicorne/f411/info.json b/keyboards/yanghu/unicorne/f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/yanghu/unicorne/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/yanghu/unicorne/f411/rules.mk b/keyboards/yanghu/unicorne/f411/rules.mk index c25a64f4b3b..e69de29bb2d 100644 --- a/keyboards/yanghu/unicorne/f411/rules.mk +++ b/keyboards/yanghu/unicorne/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/yatara/drink_me/info.json b/keyboards/yatara/drink_me/info.json index bb6f3de6953..d1d979a4e34 100644 --- a/keyboards/yatara/drink_me/info.json +++ b/keyboards/yatara/drink_me/info.json @@ -8,6 +8,8 @@ "pid": "0x1470", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yatara/drink_me/rules.mk b/keyboards/yatara/drink_me/rules.mk index 6dc87e01cbc..29f6808ed5d 100644 --- a/keyboards/yatara/drink_me/rules.mk +++ b/keyboards/yatara/drink_me/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json index a23d8bc0d74..f565eeeecfe 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backsp", "x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":3}, {"x":6.75, "y":5.5, "w":3}, {"label":"Alt", "x":9.75, "y":5.5, "w":1.5}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/ydkb/chili/rules.mk b/keyboards/ydkb/chili/rules.mk index 31559786a62..a48cbdc0dea 100644 --- a/keyboards/ydkb/chili/rules.mk +++ b/keyboards/ydkb/chili/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json index 80cad94330e..0ce6a3cc437 100644 --- a/keyboards/ydkb/grape/info.json +++ b/keyboards/ydkb/grape/info.json @@ -8,6 +8,8 @@ "pid": "0x6772", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ydkb/grape/rules.mk b/keyboards/ydkb/grape/rules.mk index 57b231441e3..d1eb5135b4d 100644 --- a/keyboards/ydkb/grape/rules.mk +++ b/keyboards/ydkb/grape/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json index 8d297d51adf..808341a5d1b 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/info.json @@ -8,6 +8,8 @@ "pid": "0x1960", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "lufa-ms", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ydkb/just60/rules.mk b/keyboards/ydkb/just60/rules.mk index 7323e8f1e21..2a99e009194 100644 --- a/keyboards/ydkb/just60/rules.mk +++ b/keyboards/ydkb/just60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = lufa-ms - # Build Options # change yes to no to disable # diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json index 08124d09028..557cefbcb27 100644 --- a/keyboards/ydkb/yd68/info.json +++ b/keyboards/ydkb/yd68/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/ydkb/yd68/rules.mk b/keyboards/ydkb/yd68/rules.mk index 561e8f4ca1a..aa4c817d2a2 100644 --- a/keyboards/ydkb/yd68/rules.mk +++ b/keyboards/ydkb/yd68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json index b0358618a04..30a0b1f6cbd 100644 --- a/keyboards/yeehaw/info.json +++ b/keyboards/yeehaw/info.json @@ -8,6 +8,8 @@ "pid": "0x5458", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"VOLU", "x":1, "y":0}, {"label":"VOLD", "x":1, "y":1}, {"label":"M1", "x":2, "y":1.5}, {"label":"UP", "x":3, "y":1.5}, {"label":"MNXT", "x":1, "y":2}, {"label":"M2", "x":4, "y":2}, {"label":"LEFT", "x":2, "y":2.5}, {"label":"DOWN", "x":3, "y":2.5}, {"label":"MO(1)", "x":0, "y":2.75}, {"label":"MPRV", "x":1, "y":3}, {"label":"RIGHT", "x":4, "y":3}, {"label":"MPLY", "x":2, "y":3.5}, {"label":"CTL S", "x":3, "y":3.5}, {"label":"RGB TOG", "x":2.5, "y":4.5}] diff --git a/keyboards/yeehaw/rules.mk b/keyboards/yeehaw/rules.mk index 43904f80cff..be11c03df95 100644 --- a/keyboards/yeehaw/rules.mk +++ b/keyboards/yeehaw/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/info.json index 3fb2f06a809..3c7af24ebe7 100644 --- a/keyboards/yiancardesigns/barleycorn/info.json +++ b/keyboards/yiancardesigns/barleycorn/info.json @@ -7,6 +7,8 @@ "pid": "0x4749", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/yiancardesigns/barleycorn/rules.mk b/keyboards/yiancardesigns/barleycorn/rules.mk index c7d4310cb21..b56efe3ef9c 100644 --- a/keyboards/yiancardesigns/barleycorn/rules.mk +++ b/keyboards/yiancardesigns/barleycorn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/info.json index fb2abb51ef2..97d8948c2ab 100644 --- a/keyboards/yiancardesigns/gingham/info.json +++ b/keyboards/yiancardesigns/gingham/info.json @@ -8,6 +8,8 @@ "pid": "0x4748", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Shift", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"App", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/yiancardesigns/gingham/rules.mk b/keyboards/yiancardesigns/gingham/rules.mk index 977d9b9d813..2fce424de8d 100644 --- a/keyboards/yiancardesigns/gingham/rules.mk +++ b/keyboards/yiancardesigns/gingham/rules.mk @@ -1,12 +1,6 @@ SRC = matrix.c \ i2c_master.c -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json index 279aedec49b..04e06f31d8a 100644 --- a/keyboards/yiancardesigns/seigaiha/info.json +++ b/keyboards/yiancardesigns/seigaiha/info.json @@ -8,6 +8,8 @@ "pid": "0x4750", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/yiancardesigns/seigaiha/rules.mk b/keyboards/yiancardesigns/seigaiha/rules.mk index c7d4310cb21..b56efe3ef9c 100644 --- a/keyboards/yiancardesigns/seigaiha/rules.mk +++ b/keyboards/yiancardesigns/seigaiha/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index 78281d892ec..fe3f8c2cea9 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -8,6 +8,8 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0},{"x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2},{"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":0, "y":3},{"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"x":12, "y":3},{"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.75}, {"x":1.75, "y":4, "w":1.25}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25},{"x":5.5, "y":4, "w":3}, {"x":8.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/ymdk/bface/rules.mk b/keyboards/ymdk/bface/rules.mk index 4dcdfe886af..03a618b76dc 100644 --- a/keyboards/ymdk/bface/rules.mk +++ b/keyboards/ymdk/bface/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index ab6c4385c39..2492d37dcbc 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -8,6 +8,8 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_all", "LAYOUT_hotswap": "LAYOUT_96_ansi" diff --git a/keyboards/ymdk/melody96/rules.mk b/keyboards/ymdk/melody96/rules.mk index b27013f8630..3d5cb57ad50 100644 --- a/keyboards/ymdk/melody96/rules.mk +++ b/keyboards/ymdk/melody96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 17f378edf42..9a7053358bf 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -7,6 +7,8 @@ "pid": "0x5021", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["ortho_6x4", "numpad_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/ymdk/np21/rules.mk b/keyboards/ymdk/np21/rules.mk index b73d1add464..674983a7ab2 100644 --- a/keyboards/ymdk/np21/rules.mk +++ b/keyboards/ymdk/np21/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 73e6f22911c..3353a16269b 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,8 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4", "numpad_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/ymdk/np24/u4rgb6/rules.mk b/keyboards/ymdk/np24/u4rgb6/rules.mk index c483c98ee32..8a6e2c7b715 100644 --- a/keyboards/ymdk/np24/u4rgb6/rules.mk +++ b/keyboards/ymdk/np24/u4rgb6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index a59c46d2f20..2b2ed162858 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -8,6 +8,8 @@ "pid": "0x5364", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk index 3dfe95cc0f4..6cef95fd457 100644 --- a/keyboards/ymdk/sp64/rules.mk +++ b/keyboards/ymdk/sp64/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 55c5a6798a4..44fcc47c639 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -8,6 +8,8 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ymdk/wings/rules.mk b/keyboards/ymdk/wings/rules.mk index c104e9c542f..6962e5ba56a 100644 --- a/keyboards/ymdk/wings/rules.mk +++ b/keyboards/ymdk/wings/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index 68692827798..ab474f0a195 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -8,6 +8,8 @@ "pid": "0x4975", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ymdk/wingshs/rules.mk b/keyboards/ymdk/wingshs/rules.mk index c104e9c542f..6962e5ba56a 100644 --- a/keyboards/ymdk/wingshs/rules.mk +++ b/keyboards/ymdk/wingshs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index ca1eba68c98..2d3777414e5 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -7,6 +7,8 @@ "vid": "0x594D", "pid": "0x604D" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/ymdk/yd60mq/rules.mk b/keyboards/ymdk/yd60mq/rules.mk index f125d1d7ca2..119cc37130e 100644 --- a/keyboards/ymdk/yd60mq/rules.mk +++ b/keyboards/ymdk/yd60mq/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index ba97a0b76b7..5074716cf3e 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -8,6 +8,8 @@ "pid": "0xD896", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ymdk/ym68/rules.mk b/keyboards/ymdk/ym68/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/ymdk/ym68/rules.mk +++ b/keyboards/ymdk/ym68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json index 42aa8e05381..0e3aaba46bf 100644 --- a/keyboards/ymdk/ymd09/info.json +++ b/keyboards/ymdk/ymd09/info.json @@ -8,6 +8,8 @@ "pid": "0x4409", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ymdk/ymd09/rules.mk b/keyboards/ymdk/ymd09/rules.mk index c32dee5d0f7..9bdb5fd9245 100644 --- a/keyboards/ymdk/ymd09/rules.mk +++ b/keyboards/ymdk/ymd09/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index b71ec06c5e3..b5729091f61 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0110", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/ymdk/ymd21/v2/rules.mk b/keyboards/ymdk/ymd21/v2/rules.mk index 3b061c11089..85830d31150 100644 --- a/keyboards/ymdk/ymd21/v2/rules.mk +++ b/keyboards/ymdk/ymd21/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index ffdf945865e..55681cb2f01 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4440", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/ymdk/ymd40/v2/rules.mk b/keyboards/ymdk/ymd40/v2/rules.mk index 48f54ee377d..e0fdb5c802b 100644 --- a/keyboards/ymdk/ymd40/v2/rules.mk +++ b/keyboards/ymdk/ymd40/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index e43da900f0b..39a823c830a 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ymdk/ymd67/rules.mk b/keyboards/ymdk/ymd67/rules.mk index d684f610e9e..3a3b26188fc 100644 --- a/keyboards/ymdk/ymd67/rules.mk +++ b/keyboards/ymdk/ymd67/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json index ad889c23048..d7be6a3c86e 100644 --- a/keyboards/ymdk/ymd75/rev1/info.json +++ b/keyboards/ymdk/ymd75/rev1/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32a", + "bootloader": "bootloadhid" } diff --git a/keyboards/ymdk/ymd75/rev1/rules.mk b/keyboards/ymdk/ymd75/rev1/rules.mk index 816b0060c97..17cd0cd8901 100644 --- a/keyboards/ymdk/ymd75/rev1/rules.mk +++ b/keyboards/ymdk/ymd75/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json index 3bdd63ee287..759d2c1e0c6 100644 --- a/keyboards/ymdk/ymd75/rev2/info.json +++ b/keyboards/ymdk/ymd75/rev2/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32a", + "bootloader": "bootloadhid" } diff --git a/keyboards/ymdk/ymd75/rev2/rules.mk b/keyboards/ymdk/ymd75/rev2/rules.mk index 816b0060c97..17cd0cd8901 100644 --- a/keyboards/ymdk/ymd75/rev2/rules.mk +++ b/keyboards/ymdk/ymd75/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json index 775a9740ca7..c72db1ba6f7 100644 --- a/keyboards/ymdk/ymd75/rev3/info.json +++ b/keyboards/ymdk/ymd75/rev3/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "3.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk index 14d8f08c350..e3b96df9c27 100644 --- a/keyboards/ymdk/ymd75/rev3/rules.mk +++ b/keyboards/ymdk/ymd75/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index 2fcefcbfbb4..1628aeb2718 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -8,6 +8,8 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_default": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print Screen", "x":13, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"Page Up", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3},{"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":2.75}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Fn", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"label":"\u2190", "x":12, "y":5}, {"label":"\u2193", "x":13, "y":5}, {"label":"\u2191", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}] diff --git a/keyboards/ymdk/ymd96/rules.mk b/keyboards/ymdk/ymd96/rules.mk index 8dab58389a2..4eaf6aa9193 100644 --- a/keyboards/ymdk/ymd96/rules.mk +++ b/keyboards/ymdk/ymd96/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json index e0358b44ac3..01d2032d2ee 100644 --- a/keyboards/yncognito/batpad/info.json +++ b/keyboards/yncognito/batpad/info.json @@ -8,6 +8,8 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_2x4": { "layout": [ diff --git a/keyboards/yncognito/batpad/rules.mk b/keyboards/yncognito/batpad/rules.mk index 4e91c729303..8009de294e8 100644 --- a/keyboards/yncognito/batpad/rules.mk +++ b/keyboards/yncognito/batpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json index f25d0ba72a3..f7d032a1d28 100644 --- a/keyboards/yoichiro/lunakey_macro/info.json +++ b/keyboards/yoichiro/lunakey_macro/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yoichiro/lunakey_macro/rules.mk b/keyboards/yoichiro/lunakey_macro/rules.mk index a1392cf92f3..29f6808ed5d 100644 --- a/keyboards/yoichiro/lunakey_macro/rules.mk +++ b/keyboards/yoichiro/lunakey_macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index cf458ad5f23..41c98cc2124 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/yoichiro/lunakey_mini/rules.mk b/keyboards/yoichiro/lunakey_mini/rules.mk index e76689a307e..6188406cdee 100644 --- a/keyboards/yoichiro/lunakey_mini/rules.mk +++ b/keyboards/yoichiro/lunakey_mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index aa2fe726eeb..91a12247700 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x01B8", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk index cf39e83a4f1..a51a58c5ead 100644 --- a/keyboards/yosino58/rev1/rules.mk +++ b/keyboards/yosino58/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yugo_m/model_m_101/info.json b/keyboards/yugo_m/model_m_101/info.json index e6d786a740d..35162e1b715 100644 --- a/keyboards/yugo_m/model_m_101/info.json +++ b/keyboards/yugo_m/model_m_101/info.json @@ -8,6 +8,9 @@ "pid": "0x8E81", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"Print Screen", "x":15.5, "y":0}, {"label":"Scroll Lock", "x":16.5, "y":0}, {"label":"Pause", "x":17.5, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"\uff0a", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"", "x":14, "y":1.5}, {"label":"Insert", "x":15.5, "y":1.5}, {"label":"Home", "x":16.5, "y":1.5}, {"label":"PgUp", "x":17.5, "y":1.5}, {"label":"Num Lock", "x":19, "y":1.5}, {"label":"/", "x":20, "y":1.5}, {"label":"\uff0a", "x":21, "y":1.5}, {"label":"\u2212", "x":22, "y":1.5}, {"label":"", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.5, "y":2.5}, {"label":"End", "x":16.5, "y":2.5}, {"label":"PgDn", "x":17.5, "y":2.5}, {"label":"7", "x":19, "y":2.5}, {"label":"8", "x":20, "y":2.5}, {"label":"9", "x":21, "y":2.5}, {"label":"+", "x":22, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.25}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":19, "y":3.5}, {"label":"5", "x":20, "y":3.5}, {"label":"6", "x":21, "y":3.5}, {"label":"=", "x":22, "y":3.5}, {"label":"\u21e7", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"_", "x":12.25, "y":4.5}, {"label":"\u21e7", "x":13.25, "y":4.5, "w":1.75}, {"label":"", "x":16.5, "y":4.5}, {"label":"1", "x":19, "y":4.5}, {"label":"2", "x":20, "y":4.5}, {"label":"3", "x":21, "y":4.5}, {"label":"Enter", "x":22, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt Gr", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"", "x":15.5, "y":5.5}, {"label":"", "x":16.5, "y":5.5}, {"label":"", "x":17.5, "y":5.5}, {"label":"0", "x":19, "y":5.5}, {"label":",", "x":20, "y":5.5}, {"label":".", "x":21, "y":5.5}, {"label":"GUI", "x":22, "y":5.5}] diff --git a/keyboards/yugo_m/model_m_101/rules.mk b/keyboards/yugo_m/model_m_101/rules.mk index 143b8dfddcf..ab2c49da70e 100644 --- a/keyboards/yugo_m/model_m_101/rules.mk +++ b/keyboards/yugo_m/model_m_101/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index 095b6b39ebb..bf006e158d2 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -7,6 +7,8 @@ "vid": "0x3265", "pid": "0x0008" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk index 53fb0ec174d..61cbbf351dc 100644 --- a/keyboards/yushakobo/navpad/10/rules.mk +++ b/keyboards/yushakobo/navpad/10/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index e2c44de4dab..6a8268900f4 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk index 54598940df7..aa146fa1d2d 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk +++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 07798a26499..1fbc570b6c1 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 297d482f356..a73ebf1d09d 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json index 58afeb97de5..d81bd07e1b0 100644 --- a/keyboards/yushakobo/quick7/info.json +++ b/keyboards/yushakobo/quick7/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/quick7/rules.mk b/keyboards/yushakobo/quick7/rules.mk index c1bb970bacf..2bec6222a29 100644 --- a/keyboards/yushakobo/quick7/rules.mk +++ b/keyboards/yushakobo/quick7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yynmt/acperience12/rev1/info.json b/keyboards/yynmt/acperience12/rev1/info.json index 7d4dbb40ce2..3d8bf426bac 100644 --- a/keyboards/yynmt/acperience12/rev1/info.json +++ b/keyboards/yynmt/acperience12/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xEA51", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yynmt/acperience12/rev1/rules.mk b/keyboards/yynmt/acperience12/rev1/rules.mk index 6ab81f6b120..e69de29bb2d 100644 --- a/keyboards/yynmt/acperience12/rev1/rules.mk +++ b/keyboards/yynmt/acperience12/rev1/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json index 364b8442469..b32291b0522 100644 --- a/keyboards/yynmt/dozen0/info.json +++ b/keyboards/yynmt/dozen0/info.json @@ -8,6 +8,8 @@ "pid": "0xEA4F", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yynmt/dozen0/rules.mk b/keyboards/yynmt/dozen0/rules.mk index 7d2cea91dfe..aa4c817d2a2 100644 --- a/keyboards/yynmt/dozen0/rules.mk +++ b/keyboards/yynmt/dozen0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json index eaca61afc8a..7ffbddfd257 100644 --- a/keyboards/yynmt/kagamidget/info.json +++ b/keyboards/yynmt/kagamidget/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yynmt/kagamidget/rules.mk b/keyboards/yynmt/kagamidget/rules.mk index 9afe45ddf5c..898f9b50add 100644 --- a/keyboards/yynmt/kagamidget/rules.mk +++ b/keyboards/yynmt/kagamidget/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json index 7aa53d9a5cb..1a7c75b12a1 100644 --- a/keyboards/z12/info.json +++ b/keyboards/z12/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/z12/rules.mk b/keyboards/z12/rules.mk index fe67be276f7..65ce7f2dea5 100644 --- a/keyboards/z12/rules.mk +++ b/keyboards/z12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json index f28ddf0e1c4..00d5e5252fe 100644 --- a/keyboards/z34/info.json +++ b/keyboards/z34/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/z34/rules.mk b/keyboards/z34/rules.mk index 90c0d7b6209..669d2bc02f2 100644 --- a/keyboards/z34/rules.mk +++ b/keyboards/z34/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json index 6467f4c008f..aaf72f61b3b 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/info.json @@ -8,6 +8,8 @@ "pid": "0x0A01", "device_version": "0.0.5" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/zfrontier/big_switch/rules.mk b/keyboards/zfrontier/big_switch/rules.mk index b9a2c9e2634..ead69ec32ec 100644 --- a/keyboards/zfrontier/big_switch/rules.mk +++ b/keyboards/zfrontier/big_switch/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/info.json index e1af7f8d88d..0cd86b049c0 100644 --- a/keyboards/ziggurat/info.json +++ b/keyboards/ziggurat/info.json @@ -8,6 +8,8 @@ "pid": "0x5258", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ziggurat/rules.mk b/keyboards/ziggurat/rules.mk index 343398b650d..ab2c49da70e 100644 --- a/keyboards/ziggurat/rules.mk +++ b/keyboards/ziggurat/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 2ff4f784373..7da059cbc4d 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/zj68/rules.mk b/keyboards/zj68/rules.mk index 6a1f5ba1640..5c84ca0a179 100644 --- a/keyboards/zj68/rules.mk +++ b/keyboards/zj68/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json index a8fa6b8a5b8..e69956a96d1 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/zlant/rules.mk b/keyboards/zlant/rules.mk index fe0cefdce1a..c0d021d8912 100755 --- a/keyboards/zlant/rules.mk +++ b/keyboards/zlant/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 97232a56ee9..7115c201fa0 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -8,6 +8,8 @@ "pid": "0xE600", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk index 11b8617d321..81a2dca23f5 100644 --- a/keyboards/zoo/wampus/rules.mk +++ b/keyboards/zoo/wampus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json index 6081f5c7ccc..ab0e4472e53 100644 --- a/keyboards/ztboards/after/info.json +++ b/keyboards/ztboards/after/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"|", "x":13, "y":1}, {"label":"`", "x":14, "y":1}, {"label":"Rotary", "x":15.5, "y":0.5}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Del", "x":15.5, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Pg Up", "x":15.5, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14.25, "y":4.25}, {"label":"Pg Dn", "x":15.5, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.5}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13.25, "y":5.25}, {"label":"Down", "x":14.25, "y":5.25}, {"label":"Right", "x":15.25, "y":5.25}] diff --git a/keyboards/ztboards/after/rules.mk b/keyboards/ztboards/after/rules.mk index 69529c9ada7..15dbc98f883 100644 --- a/keyboards/ztboards/after/rules.mk +++ b/keyboards/ztboards/after/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json index 167b8e76adc..c7140de8ded 100644 --- a/keyboards/ztboards/noon/info.json +++ b/keyboards/ztboards/noon/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Pg Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Pg Dn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4, "w":7}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/ztboards/noon/rules.mk b/keyboards/ztboards/noon/rules.mk index 476cf49f278..3b6a1809db1 100644 --- a/keyboards/ztboards/noon/rules.mk +++ b/keyboards/ztboards/noon/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json index 21343b1da6c..57fc7b2e1c5 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk index c57d7f548ff..c953eea0318 100644 --- a/keyboards/zvecr/split_blackpill/rules.mk +++ b/keyboards/zvecr/split_blackpill/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/zvecr/zv48/f401/info.json b/keyboards/zvecr/zv48/f401/info.json new file mode 100644 index 00000000000..acd7e83f77d --- /dev/null +++ b/keyboards/zvecr/zv48/f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk index 37ee7172f82..4df55cd2206 100644 --- a/keyboards/zvecr/zv48/f401/rules.mk +++ b/keyboards/zvecr/zv48/f401/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/zvecr/zv48/f411/info.json b/keyboards/zvecr/zv48/f411/info.json new file mode 100644 index 00000000000..2517a82403f --- /dev/null +++ b/keyboards/zvecr/zv48/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk index c25a64f4b3b..e69de29bb2d 100644 --- a/keyboards/zvecr/zv48/f411/rules.mk +++ b/keyboards/zvecr/zv48/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu