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

fix dir order - otherwise mixing between zmk-config and built-ins breaks #26

Conversation

petejohanson
Copy link

Ok, so this is a rework of #24 that does things now in two phases:

  • Iterates all the board roots, gathering the details of all the shields found therein.
  • Iterates the requested shields, finding them from the collected shield info from the first phase.

Doing so should preserve the ordering when adding DTS, config files, etc., but also properly sets up the collection of available shields for use in the "list unfound shield" piece.

@petejohanson petejohanson self-assigned this Oct 29, 2023
@petejohanson
Copy link
Author

@Percentnineteen Please give this a try. I tweaked your idea a bit to split into two phases, which seems to work for the specific bug fix you were shooting to fix, and still works as expected when no shields are passed in, which caused issues with your original version. Thanks again for the fix!

@petejohanson
Copy link
Author

Ok, so feeling confident about this; I should have done this testing before: I created a ZMK draft PR that uses this specific Zephyr branch and the builds all pass fine: zmkfirmware/zmk#1981

Also tested several of my user config repos against that ZMK branch, with no issues.

@petejohanson petejohanson merged commit 9b9cf36 into zmkfirmware:v3.2.0+zmk-fixes Oct 29, 2023
7 of 9 checks passed
@Percentnineteen
Copy link

Percentnineteen commented Oct 29, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants