Skip to content

Correctly use earlephilhower.varant if variant not given, ensure USB… #444

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

Merged
merged 2 commits into from
Jan 28, 2022
Merged

Conversation

maxgerhardt
Copy link
Contributor

@maxgerhardt maxgerhardt commented Jan 28, 2022

… power macro is always there

Cherry-pick of maxgerhardt@beec911

Fixes a crash of the builder script, board.get("build.variant", None) will throw an exception if the build.variant was not found (and not return None as the fallback value which was the wanted behavior), but an empty string works, so check against that.

USB power defines moved directly into the board files, but still ensure that the macro always exists (with a default fallback value) to not fail the build.

… power macro is always there

Fixes a crash of the builder script, `board.get("build.variant", None)` will throw an exception if the `build.variant` was not found (and not return `None` as the fallback value), but an empty string works, so check against that.

USB power defines moved directly into the board files, but still ensure that the macro always exists (with a default fallback value) to not fail the build.
@earlephilhower
Copy link
Owner

I believe there's still a pico-quick-toolchain bug or PR left to fully close this stuff out, yes?

@earlephilhower earlephilhower merged commit 4a955b2 into earlephilhower:master Jan 28, 2022
@maxgerhardt
Copy link
Contributor Author

I believe there's still a pico-quick-toolchain bug or PR left to fully close this stuff out, yes?

You mean in regards to developing the PlatformIO further so that it is ready to merge into mainline PlatformIO / platform-raspberrypi? Yes, the whole packaging for toolchain-pico, tool-openocd-raspberry and framework-arduinopico is yet to be done. Either manually in the first round to get them in now or automated. The released OpenOCD package still has some issues on Windows (https://github.com/earlephilhower/pico-quick-toolchain/issues)

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