Implement UART type erasure

esp-rs · Oct 24, 2024 · 40da306 · 40da306
1 parent a4bc053
commit 40da306
Show file tree

Hide file tree

Showing 16 changed files with 596 additions and 499 deletions.
diff --git a/esp-hal/CHANGELOG.md b/esp-hal/CHANGELOG.md
@@ -15,12 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `AnyPin` now implements `From<GpioPin<N>>`. (#2326)
 - Added `AnySpi` and `AnySpiDmaChannel`. (#2334)
 - Added `AnyI2s` and `AnyI2sDmaChannel`. (#2367)
+- Added `AnyUart`. (#2381)
 - `Pins::steal()` to unsafely obtain GPIO. (#2335)
 
 ### Changed
 
 - Peripheral type erasure for SPI (#2334)
 - Peripheral type erasure for I2S (#2367)
+- Peripheral type erasure for UART (#2381)
 
 ### Fixed
 

diff --git a/esp-hal/MIGRATING-0.21.md b/esp-hal/MIGRATING-0.21.md
@@ -30,6 +30,7 @@ peripherals:
 
 - SPI (both master and slave)
 - I2S
+- UART
 
 ```diff
 -Spi<'static, SPI2, FullDuplexMode>

diff --git a/esp-hal/src/soc/esp32/peripherals.rs b/esp-hal/src/soc/esp32/peripherals.rs
@@ -68,9 +68,9 @@ crate::peripherals! {
     TIMG1 <= TIMG1,
     TOUCH <= virtual,
     TWAI0 <= TWAI0,
-    UART0 <= UART0,
-    UART1 <= UART1,
-    UART2 <= UART2,
+    [Uart0] UART0 <= UART0,
+    [Uart1] UART1 <= UART1,
+    [Uart2] UART2 <= UART2,
     UHCI0 <= UHCI0,
     UHCI1 <= UHCI1,
     WIFI <= virtual,

diff --git a/esp-hal/src/soc/esp32c2/peripherals.rs b/esp-hal/src/soc/esp32c2/peripherals.rs
@@ -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,

diff --git a/esp-hal/src/soc/esp32c3/peripherals.rs b/esp-hal/src/soc/esp32c3/peripherals.rs
@@ -54,8 +54,8 @@ crate::peripherals! {
     TIMG0 <= TIMG0,
     TIMG1 <= TIMG1,
     TWAI0 <= TWAI0,
-    UART0 <= UART0,
-    UART1 <= UART1,
+    [Uart0] UART0 <= UART0,
+    [Uart1] UART1 <= UART1,
     UHCI0 <= UHCI0,
     UHCI1 <= UHCI1,
     USB_DEVICE <= USB_DEVICE,

diff --git a/esp-hal/src/soc/esp32c6/peripherals.rs b/esp-hal/src/soc/esp32c6/peripherals.rs
@@ -83,8 +83,8 @@ crate::peripherals! {
     TRACE0 <= TRACE,
     TWAI0 <= TWAI0,
     TWAI1 <= TWAI1,
-    UART0 <= UART0,
-    UART1 <= UART1,
+    [Uart0] UART0 <= UART0,
+    [Uart1] UART1 <= UART1,
     UHCI0 <= UHCI0,
     USB_DEVICE <= USB_DEVICE,
     WIFI <= virtual,

diff --git a/esp-hal/src/soc/esp32h2/peripherals.rs b/esp-hal/src/soc/esp32h2/peripherals.rs
@@ -74,8 +74,8 @@ crate::peripherals! {
     TIMG1 <= TIMG1,
     TRACE0 <= TRACE,
     TWAI0 <= TWAI0,
-    UART0 <= UART0,
-    UART1 <= UART1,
+    [Uart0] UART0 <= UART0,
+    [Uart1] UART1 <= UART1,
     UHCI0 <= UHCI0,
     USB_DEVICE <= USB_DEVICE,
     MEM2MEM1 <= virtual,

diff --git a/esp-hal/src/soc/esp32s2/peripherals.rs b/esp-hal/src/soc/esp32s2/peripherals.rs
@@ -61,8 +61,8 @@ crate::peripherals! {
     TIMG0 <= TIMG0,
     TIMG1 <= TIMG1,
     TWAI0 <= TWAI0,
-    UART0 <= UART0,
-    UART1 <= UART1,
+    [Uart0] UART0 <= UART0,
+    [Uart1] UART1 <= UART1,
     UHCI0 <= UHCI0,
     ULP_RISCV_CORE <= virtual,
     USB0 <= USB0,

diff --git a/esp-hal/src/soc/esp32s3/peripherals.rs b/esp-hal/src/soc/esp32s3/peripherals.rs
@@ -67,9 +67,9 @@ crate::peripherals! {
     TIMG0 <= TIMG0,
     TIMG1 <= TIMG1,
     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,
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ peripherals: @@
     - SPI (both master and slave)
     - I2S
+    - UART
     ```diff
     -Spi<'static, SPI2, FullDuplexMode>
@@ Expand Down @@