fix dir/shield order#24
Merged
petejohanson merged 1 commit intozmkfirmware:v3.2.0+zmk-fixesfrom Oct 27, 2023
Merged
Conversation
petejohanson
approved these changes
Oct 27, 2023
petejohanson
left a comment
There was a problem hiding this comment.
LGTM. Thanks for the fix. Local testing here and the build seems sane.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
this is basically PR #12 updated to the file supported in zephyr 3.2 (the old one was 3.0 based, I believe). The edits look messy but that's just due to inverting of logic. There is nothing new here, just reorganization.
Without this PR, a shield in zmk-config cannot use the nice!view shield (or any other shields) defined in the main zmk dir.
Right now, the logic basically goes:
foreach location (zmk, zmk-config)
foreach shield
if shield exists, append it to the list
This results in a board list like "my_keyboard_shield nice_view" being inverted -> "nice_view my_keyboard_shield".
This PR just inverts the logic and does:
foreach shield
foreach location (zmk, zmk-config)
if shield exists, append it to the list
This still allows any shield defined in zmk-config to overwrite any shield also defined in zmk/apps/boards/shields, but also does not re-order the shields according to where they were found