Skip to content

cpu/nrf5x: clean up periph_uart #20102

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Nov 26, 2023
Merged

cpu/nrf5x: clean up periph_uart #20102

merged 2 commits into from
Nov 26, 2023

Conversation

maribu
Copy link
Member

@maribu maribu commented Nov 22, 2023 •
edited
Loading

Contribution description

  • nRF51: Use uart_conf_t for consistency with nRF52
  • nRF52832: Use UARTE (UART with EasyDMA) over UART (without DMA), as done for all other nRF52 family members
  • use UARTE_PRESENT to detect whether an UARTE can be used, rather than family names

Testing procedure

UART should still work on

  • nRF51 (tested with nrf51-dk)
  • nRF52 other than nRF52832 (tested with nrf52840-dk)
  • nRF52832 (tested with nrf52-dk)

Issues/PRs references

None

@maribu maribu added Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Nov 22, 2023
@github-actions github-actions bot added Platform: ARM Platform: This PR/issue effects ARM-based platforms Area: boards Area: Board ports Area: cpu Area: CPU/MCU ports labels Nov 22, 2023
@riot-ci
Copy link

riot-ci commented Nov 22, 2023 •
edited
Loading

Murdock results

✔️ PASSED

a28003f cpu/nrf5x_common: add whitespace to please linter

Success Failures Total Runtime
7957 0 7957 09m:34s

Artifacts

@maribu maribu force-pushed the cpu/nrf5x_common/clean_up_uart branch 2 times, most recently from fc9bd78 to fa66a61 Compare November 23, 2023 08:12
@dylad
Copy link
Member

dylad commented Nov 23, 2023

I can test it on nRF53 too probably tonight or tomorrow if you want.

@maribu
Copy link
Member Author

maribu commented Nov 23, 2023

I can test it on nRF53 too probably tonight or tomorrow if you want.

That would be awesome! Thx 😄

@benpicco benpicco requested a review from dylad November 23, 2023 10:40
dylad
dylad approved these changes Nov 26, 2023
View reviewed changes
Copy link
Member

@dylad dylad left a comment

Choose a reason for hiding this comment

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

nRF53 shell still works and changes looks good to me.

@dylad dylad added this pull request to the merge queue Nov 26, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 26, 2023
@dylad dylad added this pull request to the merge queue Nov 26, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 26, 2023
@dylad
Copy link
Member

dylad commented Nov 26, 2023

Seems like ruuvitag slips through

@maribu
Copy link
Member Author

maribu commented Nov 26, 2023

Indeed. But at least the static_assert() has been tested this way 😅

I'll fix and squash when the kids are asleep :-)

@maribu maribu force-pushed the cpu/nrf5x_common/clean_up_uart branch from fa66a61 to a8eb54d Compare November 26, 2023 18:33
@maribu maribu enabled auto-merge November 26, 2023 18:34
@maribu maribu added this pull request to the merge queue Nov 26, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 26, 2023
@maribu maribu force-pushed the cpu/nrf5x_common/clean_up_uart branch from a8eb54d to f2e1e4e Compare November 26, 2023 19:12
@maribu maribu requested a review from fjmolinas as a code owner November 26, 2023 19:12
@maribu maribu force-pushed the cpu/nrf5x_common/clean_up_uart branch from f2e1e4e to 91c40ed Compare November 26, 2023 19:12
@maribu maribu enabled auto-merge November 26, 2023 19:19
@maribu
Copy link
Member Author

maribu commented Nov 26, 2023

Now at least locally all boards build exmaples/hello-world. So I hope the ruuvitag and the thingy52 were the only two slipped through thumbs pressed

@maribu maribu added this pull request to the merge queue Nov 26, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 26, 2023
@maribu
cpu/nrf5x: clean up periph_uart
63faa5f 
- nRF51: Use `uart_conf_t` for consistency with nRF52
- nRF52832: Use UARTE (UART with EasyDMA) over UART (without DMA), as
  done for all other nRF52 family members
- use `UARTE_PRESENT` to detect whether an UARTE can be used, rather
  than family names
@maribu
cpu/nrf5x_common: add whitespace to please linter
a28003f 
Fixes the "comma should be followed by whitespace" warning from
`static-tests`.
@maribu maribu force-pushed the cpu/nrf5x_common/clean_up_uart branch from 91c40ed to a28003f Compare November 26, 2023 20:33
@github-actions github-actions bot added the Area: Kconfig Area: Kconfig integration label Nov 26, 2023
@maribu
Copy link
Member Author

maribu commented Nov 26, 2023 •
edited
Loading

And the usual forgot about KConfig issue 😅

@maribu maribu enabled auto-merge November 26, 2023 20:38
@maribu maribu added this pull request to the merge queue Nov 26, 2023
Merged via the queue into RIOT-OS:master with commit 73bde97 Nov 26, 2023
@maribu maribu deleted the cpu/nrf5x_common/clean_up_uart branch November 27, 2023 06:58
@maribu
Copy link
Member Author

maribu commented Nov 27, 2023

🎉 thx :-)

@maribu maribu mentioned this pull request Nov 27, 2023
Merged
3 tasks
@MrKevinWeiss MrKevinWeiss added this to the Release 2024.01 milestone Feb 7, 2024
@crasbe crasbe mentioned this pull request May 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dylad dylad dylad approved these changes

@aabadie aabadie Awaiting requested review from aabadie aabadie is a code owner

@haukepetersen haukepetersen Awaiting requested review from haukepetersen

@fjmolinas fjmolinas Awaiting requested review from fjmolinas

@leandrolanzieri leandrolanzieri Awaiting requested review from leandrolanzieri leandrolanzieri is a code owner

@jia200x jia200x Awaiting requested review from jia200x jia200x is a code owner

@MrKevinWeiss MrKevinWeiss Awaiting requested review from MrKevinWeiss MrKevinWeiss is a code owner

Assignees
No one assigned
Labels
Area: boards Area: Board ports Area: cpu Area: CPU/MCU ports Area: Kconfig Area: Kconfig integration CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Milestone
Release 2024.01
Development

Successfully merging this pull request may close these issues.
4 participants
@maribu @riot-ci @dylad @MrKevinWeiss