Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bodge consolidation. #23448

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Bodge consolidation. #23448

merged 1 commit into from
Apr 10, 2024

Conversation

tzarc
Copy link
Member

@tzarc tzarc commented Apr 10, 2024

Description

We were reincluding headers multiple times. No need. SHA1 verification to follow.
As far as I can see, these have no real ability to be overridden between where they're set and where they're used. Removes duplication.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added the core label Apr 10, 2024
@tzarc tzarc requested a review from a team April 10, 2024 06:42
@tzarc
Copy link
Member Author

tzarc commented Apr 10, 2024

SHA1 verification running against a random selection of 300 boards:

0xc7/61key:default
1upkeyboards/pi40/mit_v1_1:default
1upkeyboards/pi60:default
25keys/zinc/reva:default
40percentclub/4x4:default
40percentclub/gherkin/kb2040:default
4pplet/eagle_viper_rep/rev_b:default
a_dux:default
abko/ak84bt:default
acheron/apollo/87h/delta:default
adpenrose/mine:default
ai03/equinox/rev1:default
akb/raine:default
aleblazer/zodiark:default
alf/x11:default
alpaca/wfeclipse:default
alps64:default
amag23:default
amjkeyboard/amj84:default
amjkeyboard/amj96:default
andean_condor:default
argo_works/ishi/80/mk0_avr:default
artemis/paragon/hotswap:default
artifact/lvl/rev_hs01:default
atomic:default
atreus/teensy2:default
avalanche/v4:default
axolstudio/foundation_gamma:default
aya:default
barracuda:default
bastardkb/charybdis/3x5/v2/stemcell:default
bastardkb/skeletyl/v2/elitec:default
bemeier/bmek/rev2:default
biacco42/meishi2:default
boardsource/beiwagon:default
boardsource/lulu/rp2040:default
boardwalk:default
buildakb/mw60:default
cannonkeys/caerdroia:default
cannonkeys/crin:default
cannonkeys/leviatan:default
cannonkeys/obliterated75:default
cannonkeys/ripple_hs:default
capsunlocked/cu75:default
catch22:default
checkerboards/quark_squared:default
cipulot/ec_prox/ansi_iso:default
cipulot/kallos:default
clawsome/roadster:default
clickety_split/leeloo/rev2:default
clickety_split/leeloo/rev3:default
cmm_studio/fuji65:default
converter/a1200/miss1200:default
converter/a1200/mistress1200:default
coseyfannitutti/discipad:default
coseyfannitutti/romeo:default
crypt_macro:default
custommk/genesis/rev2:default
cutie_club/giant_macro_pad:default
dailycraft/stickey4:default
darkproject/kd83a_bfg_edition:default
darmoshark/k3:default
deemen17/de60fs:default
delikeeb/vanana/rev1:default
delikeeb/waaffle/rev3/pro_micro:default
deltasplit75/v2:default
demiurge:default
deng/thirty:default
dm9records/tartan:default
dnworks/numpad:default
drhigsby/bkf:default
duck/lightsaver:default
duck/octagon/v2:default
dztech/bocc:default
dztech/dz60rgb_ansi/v2_1:default
dztech/dz60v2:default
e88:default
eek/silk_up:default
eggsworks/egg58:default
elephant42:default
enviousdesign/delirium/rev0:default
era/divine:default
evyd13/atom47/rev3:default
evyd13/mx5160:default
evyd13/plain60:default
evyd13/pockettype:default
exclusive/e6v2/le:default
feels/feels65:default
ferris/0_2/compact:default
ferris/sweep:default
fjlabs/polaris:default
fjlabs/ready100:default
fleuron:default
flx/lodestone:default
foostan/cornelius:default
for_science:default
fortitude60/rev1:default
geekboards/tester:default
genone/g1_65:default
gopolar/gg86:default
gray_studio/aero75:default
gray_studio/hb85:default
handwired/10k:default
handwired/3dp660_oled:default
handwired/aball:default
handwired/chiron:default
handwired/consolekeyboard/18key:default
handwired/consolekeyboard/30key:default
handwired/dactyl_manuform/4x6_4_3:default
handwired/dactyl_tracer:default
handwired/dactylmacropad:default
handwired/dygma/raise/ansi:default
handwired/hnah40:default
handwired/jotpad16:default
handwired/lagrange:default
handwired/leftynumpad:default
handwired/novem:default
handwired/obuwunkunubi/spaget:default
handwired/onekey/kb2040:default
handwired/onekey/teensy_35:default
handwired/orbweaver:default
handwired/ortho5x13:default
handwired/ortho_brass:default
handwired/scottokeebs/scottodeck:default
handwired/scottokeebs/scottoergo:default
handwired/scottokeebs/scottomouse:default
handwired/sick68:default
handwired/sono1/t2pp:default
handwired/stream_cheap/2x4:default
hineybush/h60:default
hineybush/h87_g2:default
hotdox76v2:default
ibm/model_m_122/m122_3270/blackpill:default
ibm/model_m_4th_gen/overnumpad_1xb:default
idobao/id80/v2/iso:default
inland/v83p:default
jadookb/jkb65/r1:default
jd40:default
jian/rev2:default
joshajohnson/hub16:default
kagizaraya/miniaxe:default
kaly/kaly42:default
kb_elmo/eliza:default
kb_elmo/elmopad:default
kb_elmo/gamehand:default
kb_elmo/noah_avr:default
kb_elmo/twelvekey:default
kbdfans/baguette66/rgb:default
kbdfans/boop65/rgb:default
kbdfans/d45/v2:default
kbdfans/kbd67/mkiirgb/v1:default
kbdfans/kbd8x:default
kbdfans/kbdpad/mk2:default
kbdfans/odin/v2:default
kbdfans/odin75:default
kbdfans/odinmini:default
keebformom:default
keebio/iris/rev5:default
keebio/levinson/rev3:default
keebio/nyquist/rev4:default
keebio/quefrency/rev2:default
keebio/rorschach/rev1:default
kepler_33/proto:default
keybee/keybee65:default
keycapsss/kimiko/rev1:default
keychron/q3/iso:default
keychron/q5/ansi_encoder:default
keychron/s1/ansi/rgb:default
keychron/v3/ansi_encoder:default
keychron/v4/ansi:default
keyhive/navi10/rev0:default
keyprez/bison:default
kibou/wendy:default
kinesis/nguyenvietyen:default
kisakeyluxury/qtz:default
kkatano/wallaby:default
knobgoblin:default
kopibeng/mnk60_stm32:default
kprepublic/bm43hsrgb:default
kraken_jones/pteron56:default
ky01:default
latincompass/latin47ble:default
latincompass/latin60rgb:default
lazydesigners/cassette8:default
lazydesigners/dimpleplus:default
lazydesigners/the30:default
lfkeyboards/lfk78/revc:default
lily58/glow_enc:default
lucid/alexa:default
lucid/phantom_solder:default
lucid/velvet_hotswap:default
macrocat:default
maple_computing/ivy/rev1:default
maple_computing/launchpad/rev1:default
mechkeys/mk60:default
mechlovin/adelais/rgb_led/rev3:default
mechlovin/adelais/standard_led/arm/rev3:default
mechlovin/adelais/standard_led/avr/rev1:default
mechlovin/foundation:default
mechlovin/hannah910/rev3:default
mechlovin/infinity87/rev1/rogue87:default
mechlovin/mechlovin9/rev3:default
mechlovin/tmkl:default
mechlovin/zed65/no_backlight/cor65:default
mechwild/obe/f411:default
mechwild/puckbuddy:default
meetlab/rena:default
melgeek/mj64/rev3:default
meme:default
millet/doksin:default
mode/m60h_f:default
mode/m60s:default
mode/m75s:default
mokey/mokey12x2:default
mokey/xox70hot:default
monokei/mnk1800s:default
monstargear/xo87/rgb:default
monstargear/xo87/solderable:default
mothwing:default
ms_sculpt:default
mwstudio/mw80:default
neokeys/g67/element_hs:default
neson_design/nico:default
noxary/268_2:default
nullbitsco/scramble/v2:default
ocean/wang_v2:default
oddball/v2:default
omkbd/runner3680/3x6:default
omkbd/runner3680/4x6:default
orthodox/rev3:default
orthograph:default
pangorin/tan67:default
pearlboards/atlas:default
peej/tripel/middle:default
pinky/3:default
pixelspace/capsule65i:default
planck/rev5:default
planck/rev7:default
pom_keyboards/tnln95:default
preonic/rev3:default
primekb/prime_o:default
program_yoink/ortho:default
projectcain/vault35/atmega32u4:default
qpockets/space_space/rev1:default
quarkeys/z40:default
rainkeebs/yasui:default
rart/rart45:default
recompile_keys/nomu30/rev1:default
relapsekb/or87:default
reviung/reviung41:default
reviung/reviung61:default
rmi_kb/aelith:default
rotor:default
runes/skjoldr:default
s_ol/0xc_pad:default
saevus/cor:default
sawnsprojects/vcl65/solder:default
scatter42:default
sck/neiso:default
sets3n/kk980:default
shostudio/arc:default
skeletonkbd/frost68:default
skeletonkbd/skeletonnumpad:default
skergo:default
skyloong/gk61/v1:default
soy20:default
spaceholdings/nebula68b/hs:default
spaceman/pancake/rev1/feather:default
spacetime/rev2:default
studiokestra/line_friends_tkl:default
subatomic:default
takashicompany/baumkuchen:default
takashicompany/dogtag:default
takashicompany/radialex:default
tau4:default
technika:default
teleport/native/iso:default
tgr/tris:default
tkc/tkc1800:default
toad:default
tominabox1/underscore33/rev2:default
v60_type_r:default
westm/westm9/rev1:default
wilba_tech/wt60_c:default
wilba_tech/wt60_g2:default
wilba_tech/wt65_xtx:default
winkeyless/bmini:default
wolf/sabre:default
wsk/houndstooth:default
xelus/kangaroo/rev2:default
xelus/pachi/rgb/rev1:default
xelus/valor/rev2:default
yiancardesigns/gingham:default
ymdk/bface:default
zeix/eden:default
zeix/qwertyqop60hs:default
zicodia/tklfrlnrlmlao:default
ztboards/after:default
ztboards/noon:default
zwag/zwag75:default

@tzarc
Copy link
Member Author

tzarc commented Apr 10, 2024

Zero SHA1 mismatches. Everything identical.

@tzarc tzarc marked this pull request as ready for review April 10, 2024 06:55
@tzarc tzarc merged commit 4acdddb into qmk:develop Apr 10, 2024
4 checks passed
@tzarc tzarc deleted the make/bodge-consolidation branch April 10, 2024 09:03
whoisjordangarcia pushed a commit to whoisjordangarcia/qmk_firmware that referenced this pull request Jun 8, 2024
nuess0r pushed a commit to nuess0r/qmk_firmware that referenced this pull request Sep 8, 2024
Ardakilic pushed a commit to Ardakilic/qmk_firmware that referenced this pull request Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants