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

Reverse keymap search order #18449

Merged
merged 2 commits into from
Oct 1, 2022
Merged

Reverse keymap search order #18449

merged 2 commits into from
Oct 1, 2022

Conversation

fauxpark
Copy link
Member

Description

If a keyboard has two keymaps with the same name at multiple levels (eg. keyboardname and keyboardname/rev3 where rev1 and rev2 can share a keymap, but rev3 differs), the makefile logic will pick up the highest-level keymap instead.

Types of Changes

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

Issues Fixed or Closed by This PR

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).

@fauxpark fauxpark added the bug label Sep 21, 2022
@fauxpark fauxpark requested a review from a team September 21, 2022 20:28
@fauxpark
Copy link
Member Author

CI failure is expected; the affected boards will need a followup PR to fix the layouts.

@github-actions github-actions bot added keymap via Adds via keymap and/or updates keyboard for via support labels Sep 30, 2022
@drashna
Copy link
Member

drashna commented Sep 30, 2022

wait, would this prefer the board/rev3 or board keymap?

@fauxpark
Copy link
Member Author

The former. Note CI here is passing where dimple rev3 and infinity87 are failing in current develop builder.

@zvecr
Copy link
Member

zvecr commented Oct 1, 2022

Do we want such a logic change to go to master rather than develop?

@fauxpark
Copy link
Member Author

fauxpark commented Oct 1, 2022

May as well, I'm pretty confident the two boards above are the only ones affected, but just in case...

@fauxpark fauxpark changed the base branch from master to develop October 1, 2022 02:21
@zvecr zvecr merged commit c4ff819 into qmk:develop Oct 1, 2022
@fauxpark fauxpark deleted the keymap-search-order branch October 1, 2022 22:49
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants