Skip to content

Implement UART type erasure #2381

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

Merged
bugadani merged 14 commits into from
Oct 25, 2024
Merged

Implement UART type erasure #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
74f834f
Simplify test
bugadani Oct 24, 2024
a316447
Remove unnecessary refs
bugadani Oct 24, 2024
c5c82e1
Improve readability
bugadani Oct 24, 2024
771274b
Require Instance: PeripheralMarker
bugadani Oct 24, 2024
c66f974
Take &self
bugadani Oct 24, 2024
1402d3e
Avoid unsafe code on non-s2
bugadani Oct 24, 2024
893ebf5
SImplify drain_fifo
bugadani Oct 24, 2024
eee5682
Simplify read_bytes
bugadani Oct 24, 2024
b4f2ba2
Avoid a register read on ESP32
bugadani Oct 24, 2024
c4329f7
Deduplicate is_idle functions
bugadani Oct 24, 2024
1438e23
Add missing inlines
bugadani Oct 24, 2024
a05fc1f
Move code out of trait
bugadani Oct 24, 2024
7987c25
Erase UART instances
bugadani Oct 24, 2024
2ec54be
Disable LTO
bugadani Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions esp-hal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added `AnySpi` and `AnySpiDmaChannel`. (#2334)
- Added `AnyI2s` and `AnyI2sDmaChannel`. (#2367)
- Added `AnyTwai`. (#2359)
- Added `AnyUart`. (#2381)
- `Pins::steal()` to unsafely obtain GPIO. (#2335)
- `I2c::with_timeout` (#2361)
- `Spi::half_duplex_read` and `Spi::half_duplex_write` (#2373)
Expand All @@ -28,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Peripheral type erasure for TWAI (#2359)
- The SPI driver has been rewritten to allow using half-duplex and full-duplex functionality on the same bus. See the migration guide for details. (#2373)
- Renamed `SpiDma` functions: `dma_transfer` to `transfer`, `dma_write` to `write`, `dma_read` to `read`. (#2373)
- Peripheral type erasure for UART (#2381)

### Fixed

Expand Down
1 change: 1 addition & 0 deletions esp-hal/MIGRATING-0.21.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ peripherals:
- I2S
- I2C
- TWAI
- UART

```diff
-Spi<'static, SPI2, FullDuplexMode>
Expand Down
6 changes: 3 additions & 3 deletions esp-hal/src/soc/esp32/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ crate::peripherals! {
TIMG1 <= TIMG1,
TOUCH <= virtual,
[Twai0] TWAI0 <= TWAI0,
UART0 <= UART0,
UART1 <= UART1,
UART2 <= UART2,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
[Uart2] UART2 <= UART2,
UHCI0 <= UHCI0,
UHCI1 <= UHCI1,
WIFI <= virtual,
Expand Down
4 changes: 2 additions & 2 deletions esp-hal/src/soc/esp32c2/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ crate::peripherals! {
SYSTIMER <= SYSTIMER,
SW_INTERRUPT <= virtual,
TIMG0 <= TIMG0,
UART0 <= UART0,
UART1 <= UART1,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
WIFI <= virtual,
XTS_AES <= XTS_AES,
MEM2MEM1 <= virtual,
Expand Down
4 changes: 2 additions & 2 deletions esp-hal/src/soc/esp32c3/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ crate::peripherals! {
TIMG0 <= TIMG0,
TIMG1 <= TIMG1,
[Twai0] TWAI0 <= TWAI0,
UART0 <= UART0,
UART1 <= UART1,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
UHCI0 <= UHCI0,
UHCI1 <= UHCI1,
USB_DEVICE <= USB_DEVICE,
Expand Down
4 changes: 2 additions & 2 deletions esp-hal/src/soc/esp32c6/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ crate::peripherals! {
TRACE0 <= TRACE,
[Twai0] TWAI0 <= TWAI0,
[Twai1] TWAI1 <= TWAI1,
UART0 <= UART0,
UART1 <= UART1,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
UHCI0 <= UHCI0,
USB_DEVICE <= USB_DEVICE,
WIFI <= virtual,
Expand Down
4 changes: 2 additions & 2 deletions esp-hal/src/soc/esp32h2/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ crate::peripherals! {
TIMG1 <= TIMG1,
TRACE0 <= TRACE,
[Twai0] TWAI0 <= TWAI0,
UART0 <= UART0,
UART1 <= UART1,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
UHCI0 <= UHCI0,
USB_DEVICE <= USB_DEVICE,
MEM2MEM1 <= virtual,
Expand Down
4 changes: 2 additions & 2 deletions esp-hal/src/soc/esp32s2/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ crate::peripherals! {
TIMG0 <= TIMG0,
TIMG1 <= TIMG1,
[Twai0] TWAI0 <= TWAI0,
UART0 <= UART0,
UART1 <= UART1,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
UHCI0 <= UHCI0,
ULP_RISCV_CORE <= virtual,
USB0 <= USB0,
Expand Down
6 changes: 3 additions & 3 deletions esp-hal/src/soc/esp32s3/peripherals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ crate::peripherals! {
TIMG0 <= TIMG0,
TIMG1 <= TIMG1,
[Twai0] TWAI0 <= TWAI0,
UART0 <= UART0,
UART1 <= UART1,
UART2 <= UART2,
[Uart0] UART0 <= UART0,
[Uart1] UART1 <= UART1,
[Uart2] UART2 <= UART2,
UHCI0 <= UHCI0,
UHCI1 <= UHCI1,
ULP_RISCV_CORE <= virtual,
Expand Down
Loading