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

Update dependencies, port to portable-atomic #342

Merged
merged 9 commits into from
Dec 5, 2023
Merged

Conversation

bugadani
Copy link
Contributor

@bugadani bugadani commented Nov 13, 2023

Blocked on the next esp-hal release. The PR keeps atomic emulation stuff enabled for ESP32-S2 because the old heapless doesn't know about xtensa and so it won't enable atomic-polyfill even with the cas feature enabled. Other than that, RISC-V targets should now be able to compile esp-wifi with the emulation trap disabled.

Closes #337
Closes #373

@bugadani bugadani force-pushed the atomic branch 12 times, most recently from 5b06b4f to a1c617f Compare November 14, 2023 19:01
esp-wifi/.cargo/config.toml Outdated Show resolved Hide resolved
@bugadani bugadani force-pushed the atomic branch 9 times, most recently from 58ffbae to 5da7d30 Compare November 14, 2023 21:05
@bugadani bugadani changed the title Update dependencies, port to portable-atomic Update dependencies, port to (optional) portable-atomic Nov 14, 2023
@bugadani bugadani marked this pull request as ready for review November 27, 2023 15:39
@bjoernQ bjoernQ mentioned this pull request Nov 28, 2023
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

Given we can now relax the "target currently published esp-hal" policy (since we have a release on crates.io) is there a reason to not merge this?

@bugadani
Copy link
Contributor Author

I think I'd like to hear @MabezDev's opinion as this is intended to be part of the atomic emulation related changes.

@bugadani bugadani force-pushed the atomic branch 8 times, most recently from cadd6a4 to 4184579 Compare November 30, 2023 23:28
esp-wifi/.cargo/config.toml Outdated Show resolved Hide resolved
esp-wifi/.cargo/config.toml Outdated Show resolved Hide resolved
esp-wifi/Cargo.toml Outdated Show resolved Hide resolved
esp-wifi/Cargo.toml Outdated Show resolved Hide resolved
@bugadani bugadani force-pushed the atomic branch 2 times, most recently from 884a4c9 to 3bea633 Compare December 4, 2023 14:52
@bugadani bugadani changed the title Update dependencies, port to (optional) portable-atomic Update dependencies, port to portable-atomic Dec 4, 2023
@bugadani
Copy link
Contributor Author

bugadani commented Dec 4, 2023

I went the lazy route and enabled portable-atomic on all targets. I can undo it if I shouldn't but I'm not sure right now.

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! I think enabling by default is the way to go.

@bjoernQ
Copy link
Contributor

bjoernQ commented Dec 5, 2023

I ran my tests and everything looks good. For C6 it needs the fix in esp-rs/esp-hal#997 however

@bugadani
Copy link
Contributor Author

bugadani commented Dec 5, 2023

Update esp-hal to https://github.com/esp-rs/esp-hal/commit/22f14fd3005466f5fc80a378a1f1f25b6a4de5a9 which is the merged commit of esp-rs/esp-hal#997

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.

LGTMl, thanks!

@MabezDev MabezDev merged commit d46dfc4 into esp-rs:main Dec 5, 2023
7 checks passed
@bugadani bugadani deleted the atomic branch December 5, 2023 10:48
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.

esp32c3 no_std with slint compile error Fix CAS requirements
3 participants