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

Updating smoltcp on DMA branch #183

Merged
merged 9 commits into from
Jan 31, 2021
Merged

Updating smoltcp on DMA branch #183

merged 9 commits into from
Jan 31, 2021

Conversation

ryan-summers
Copy link
Member

This PR merges master back into dma so that we can get the smoltcp updates into dma as well.

As an aside, it seems to me like we should probably merge dma in to master - I'm fairly sure a lot of people are essentially treating dma as master to get access to DMA transfers right now. Curious to hear thoughts here

richardeoin and others added 9 commits November 10, 2020 21:27
More features are added by the dev-dependency so that the examples build
168: Reduce smoltcp dependency features to a minimum r=hargoniX a=richardeoin

Since [*Dependencies are resolved with the union of all features enabled on them*](https://doc.rust-lang.org/cargo/reference/resolver.html#features), it's good practice to remove unnecessary dependencies.

More features are added by the dev-dependency so that the examples build

Co-authored-by: Richard Meadows <962920+richardeoin@users.noreply.github.com>
* remove clear_uif_bit() it was identical to clear_irq()
* add urs_counter_only() method
* dogfood struct methods when implementing traits
170: Add DelayFromCountDownTimer for when SYST is unavailable r=richardeoin a=glindstedt

Fixes #169 

Co-authored-by: Gustaf Lindstedt <gustaflindstedt@protonmail.com>
182: Update smoltcp r=hargoniX a=diondokter

Smoltcp had an update

Co-authored-by: Dion Dokter <diondokter@gmail.com>
@richardeoin
Copy link
Member

I think there's a reasonable change of breaking changes still, and also changes in embedded-dma. But indeed if projects are using the dma implementation (and I see stabilizer is), then it might as well be in master. So let's finish the current review thread and merge the merge the dma branch.

@richardeoin richardeoin merged commit 2b8a04c into dma Jan 31, 2021
@bors bors bot deleted the master branch January 31, 2021 20:07
@richardeoin
Copy link
Member

That was unexpected bors. Actually I'd rather you didn't delete master

@richardeoin richardeoin restored the master branch January 31, 2021 20:12
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.

4 participants