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: Kconfig refactor now works correctly with external modules #2711

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

Nick-Munnich
Copy link
Contributor

The refactor of 2537 didn't account for external module boards and shields. This fixes it by pulling in the relevant Kconfig bits from kconfig.zephyr a bit earlier. Results in some duplication of defaults, but acceptable duplication I'd say.

PR check-list

@Nick-Munnich Nick-Munnich requested a review from a team as a code owner December 14, 2024 13:33
@caksoylar
Copy link
Contributor

Do we want this before ZMK boards so external modules with upstream keyboard configs can override built ins?

@Nick-Munnich
Copy link
Contributor Author

Do we want this before ZMK boards so external modules with upstream keyboard configs can override built ins?

I believe currently between e.g. internal corne_left and external corne_left the internal one has priority for the dts files. So I think this order is correct for consistency.

@ctranstrum
Copy link
Contributor

Tested this on my external-module-based keyboard and can confirm it works.

Copy link
Contributor

@petejohanson petejohanson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the research and fix!

@petejohanson petejohanson merged commit bb48661 into zmkfirmware:main Dec 19, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants