fix dir order - otherwise mixing between zmk-config and built-ins breaks#26
Merged
petejohanson merged 1 commit intozmkfirmware:v3.2.0+zmk-fixesfrom Oct 29, 2023
Conversation
Signed-off-by: Peter Johanson <peter@peterjohanson.com>
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! |
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. |
|
Sorry. I didn't think of the case where no shields were passed in. I won't
have any time to dig in but if it seems to work, I'm happy.
…On Sun, Oct 29, 2023, 9:55 AM Pete Johanson ***@***.***> wrote:
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
<zmkfirmware/zmk#1981>
Also tested several of my user config repos against that ZMK branch, with
no issues.
—
Reply to this email directly, view it on GitHub
<#26 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AC4HWRB37CAGJJNKMF5HEN3YBZU4PAVCNFSM6AAAAAA6USJLJWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTOOBUGEZTKOBZGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
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.
Ok, so this is a rework of #24 that does things now in two phases:
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.