Skip to content

cpu/nrf5x: clean up periph_uart#20102

Merged
maribu merged 2 commits intoRIOT-OS:masterfrom
maribu:cpu/nrf5x_common/clean_up_uart
Nov 26, 2023
Merged

cpu/nrf5x: clean up periph_uart#20102
maribu merged 2 commits intoRIOT-OS:masterfrom
maribu:cpu/nrf5x_common/clean_up_uart

Conversation

@maribu
Copy link
Copy Markdown
Member

@maribu maribu commented Nov 22, 2023

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
Copy Markdown

riot-ci commented Nov 22, 2023

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
Copy Markdown
Member

dylad commented Nov 23, 2023

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

@maribu
Copy link
Copy Markdown
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
Copy link
Copy Markdown
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
Copy Markdown
Member

dylad commented Nov 26, 2023

Seems like ruuvitag slips through

@maribu
Copy link
Copy Markdown
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
Copy Markdown
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
- 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
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
Copy Markdown
Member Author

maribu commented Nov 26, 2023

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
Copy Markdown
Member Author

maribu commented Nov 27, 2023

🎉 thx :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

4 participants