Skip to content

52811#227

Merged
jonas-schievink merged 9 commits intomasterfrom
52811
Sep 28, 2020
Merged

52811#227
jonas-schievink merged 9 commits intomasterfrom
52811

Conversation

@Yatekii
Copy link
Copy Markdown
Contributor

@Yatekii Yatekii commented Sep 21, 2020

No description provided.

Comment thread README.md Outdated
Comment thread nrf-hal-common/src/comp.rs Outdated
@jacobrosenthal
Copy link
Copy Markdown

This needs to get removed too? Or do we intend to define this environment variable
https://github.com/nrf-rs/nrf-hal/blob/3ce300c0d4c3ed0d62bbf247ce14cb2de9f0bade/nrf-hal-common/build.rs

@Yatekii
Copy link
Copy Markdown
Contributor Author

Yatekii commented Sep 26, 2020

This needs to get removed too? Or do we intend to define this environment variable
https://github.com/nrf-rs/nrf-hal/blob/3ce300c0d4c3ed0d62bbf247ce14cb2de9f0bade/nrf-hal-common/build.rs

I don't see why this should be removed? It is helpful? :)

@jacobrosenthal
Copy link
Copy Markdown

ah yeah nevermind :)

@Yatekii Yatekii force-pushed the 52811 branch 2 times, most recently from 73fc3a0 to ad49219 Compare September 27, 2020 11:56
Copy link
Copy Markdown
Contributor

@jonas-schievink jonas-schievink left a comment

Choose a reason for hiding this comment

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

Looks good! Needs a rebase to fix the merge conflicts though.

Have the problems with the SVD been fixed or are there still workarounds needed?

Comment thread CHANGELOG.md Outdated
Comment thread nrf52811-hal/Cargo.toml Outdated
Comment thread xtask/src/lib.rs Outdated
@Yatekii
Copy link
Copy Markdown
Contributor Author

Yatekii commented Sep 28, 2020

I rebased this onto master to make it build again. Ofc it got into conflict with the PR I merged earlier today =)

I patched the SVD manually to be in line with all the other pac crates. It was my understanding from the comments on Matrix that all the SVDs have manual adjustments. It only really was changes in the SPI section (swapoped SPI0 and SPI1 naming wise :))

@jonas-schievink
Copy link
Copy Markdown
Contributor

I patched the SVD manually to be in line with all the other pac crates. It was my understanding from the comments on Matrix that all the SVDs have manual adjustments. It only really was changes in the SPI section (swapoped SPI0 and SPI1 naming wise :))

Yup, that's good.

@Yatekii
Copy link
Copy Markdown
Contributor Author

Yatekii commented Sep 28, 2020

Ok, I think all the changes have been made as requested :)

@jonas-schievink jonas-schievink merged commit 22910ee into master Sep 28, 2020
@jonas-schievink jonas-schievink deleted the 52811 branch September 28, 2020 16:44
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.

5 participants