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

Add rt-riscv and rt-xtensa features to esp-hal-common #1057

Merged
merged 3 commits into from
Jan 3, 2024

Conversation

jessebraham
Copy link
Member

Not an ideal solution, but it's not immediately obvious how we would unify these features to me. Happy to make any changes if anybody has a better solution. This should be enough to close #579 at least, though.

Once this gets merged I can rebase #1049 on top of it and wrap that up, too.

@@ -48,7 +48,8 @@ embassy-sync = { version = "0.5.0", optional = true }
embassy-time = { version = "0.2.0", optional = true }

# RISC-V
esp-riscv-rt = { version = "0.6.0", optional = true, path = "../esp-riscv-rt" }
riscv = { version = "0.10.1", optional = true }
Copy link
Contributor

Choose a reason for hiding this comment

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

is this just to make it look more aligned with Xtensa? Before we just used the re-export from esp-riscv-rt

Copy link
Member Author

@jessebraham jessebraham Jan 3, 2024

Choose a reason for hiding this comment

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

The critical section implementation uses riscv, which wasn't available if the rt-riscv feature is not enabled. So I've simply included the riscv dependency directly rather than using the re-exported version from esp-riscv-rt.

@bjoernQ
Copy link
Contributor

bjoernQ commented Jan 3, 2024

I also see no way to unify the rt features - given users shouldn't use esp-hal-common directly at all it's probably no problem at all

Copy link
Contributor

@bjoernQ bjoernQ left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@MabezDev MabezDev left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for looking into this!

@jessebraham jessebraham added this pull request to the merge queue Jan 3, 2024
Merged via the queue into esp-rs:main with commit 62ae9dc Jan 3, 2024
17 checks passed
@jessebraham jessebraham deleted the feature/rt branch January 3, 2024 14:26
Volkalex28 pushed a commit to Volkalex28/esp-hal that referenced this pull request Feb 6, 2024
)

* Add `rt-riscv` and `rt-xtensa` features to `esp-hal-common` to allow enabling/disable runtime support

* Update the CI workflow to check the chip-specific HAL packages without default features

* Update `CHANGELOG.md`
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.

Add a rt feature to the hals
3 participants