From 1bfffa3d0ede6f41a90ec37f39eb01336576d7a3 Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Wed, 10 Jan 2024 07:19:42 -0800
Subject: [PATCH 1/2] Add `embedded-io` feature to each chip-specific HAL

---
 esp32-hal/Cargo.toml   | 25 +++++++++++++------------
 esp32c2-hal/Cargo.toml |  1 +
 esp32c3-hal/Cargo.toml |  1 +
 esp32c6-hal/Cargo.toml |  1 +
 esp32h2-hal/Cargo.toml |  1 +
 esp32s2-hal/Cargo.toml | 19 ++++++++++---------
 esp32s3-hal/Cargo.toml | 19 ++++++++++---------
 7 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml
index 5a5f9b89bb5..aed95b6265e 100644
--- a/esp32-hal/Cargo.toml
+++ b/esp32-hal/Cargo.toml
@@ -47,18 +47,19 @@ ssd1306            = "0.8.4"
 static_cell        = { version = "2.0.0", features = ["nightly"] }
 
 [features]
-default            = ["rt", "vectored", "xtal-40mhz", "embassy-integrated-timers"]
-async              = ["esp-hal-common/async"]
-bluetooth          = []
-debug              = ["esp-hal-common/debug"]
-defmt              = ["esp-hal-common/defmt", "esp-println/defmt"]
-eh1                = ["esp-hal-common/eh1"]
-log                = ["esp-hal-common/log", "esp-println/log"]
-rt                 = ["esp-hal-common/rt-xtensa"]
-ufmt               = ["esp-hal-common/ufmt"]
-vectored           = ["esp-hal-common/vectored"]
-xtal-26mhz         = ["esp-hal-common/xtal-26mhz"]
-xtal-40mhz         = ["esp-hal-common/xtal-40mhz"]
+default     = ["rt", "vectored", "xtal-40mhz", "embassy-integrated-timers"]
+async       = ["esp-hal-common/async"]
+bluetooth   = []
+debug       = ["esp-hal-common/debug"]
+defmt       = ["esp-hal-common/defmt", "esp-println/defmt"]
+eh1         = ["esp-hal-common/eh1"]
+embedded-io = ["esp-hal-common/embedded-io"]
+log         = ["esp-hal-common/log", "esp-println/log"]
+rt          = ["esp-hal-common/rt-xtensa"]
+ufmt        = ["esp-hal-common/ufmt"]
+vectored    = ["esp-hal-common/vectored"]
+xtal-26mhz  = ["esp-hal-common/xtal-26mhz"]
+xtal-40mhz  = ["esp-hal-common/xtal-40mhz"]
 
 # Embassy support
 embassy                    = ["esp-hal-common/embassy"]
diff --git a/esp32c2-hal/Cargo.toml b/esp32c2-hal/Cargo.toml
index a096b2c2ea5..8d91e07555b 100644
--- a/esp32c2-hal/Cargo.toml
+++ b/esp32c2-hal/Cargo.toml
@@ -53,6 +53,7 @@ debug                = ["esp-hal-common/debug"]
 defmt                = ["esp-hal-common/defmt", "esp-println/defmt"]
 direct-vectoring     = ["esp-hal-common/direct-vectoring"]
 eh1                  = ["esp-hal-common/eh1"]
+embedded-io          = ["esp-hal-common/embedded-io"]
 interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
 log                  = ["esp-hal-common/log", "esp-println/log"]
 rt                   = ["esp-hal-common/rt-riscv"]
diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml
index 9050dacfa9f..bec02766db9 100644
--- a/esp32c3-hal/Cargo.toml
+++ b/esp32c3-hal/Cargo.toml
@@ -56,6 +56,7 @@ debug                = ["esp-hal-common/debug"]
 defmt                = ["esp-hal-common/defmt", "esp-println/defmt"]
 direct-vectoring     = ["esp-hal-common/direct-vectoring"]
 eh1                  = ["esp-hal-common/eh1"]
+embedded-io          = ["esp-hal-common/embedded-io"]
 interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
 log                  = ["esp-hal-common/log", "esp-println/log"]
 rt                   = ["esp-hal-common/rt-riscv"]
diff --git a/esp32c6-hal/Cargo.toml b/esp32c6-hal/Cargo.toml
index 0fab5731c71..f3b991375f6 100644
--- a/esp32c6-hal/Cargo.toml
+++ b/esp32c6-hal/Cargo.toml
@@ -58,6 +58,7 @@ debug                = ["esp-hal-common/debug"]
 defmt                = ["esp-hal-common/defmt", "esp-println/defmt"]
 direct-vectoring     = ["esp-hal-common/direct-vectoring"]
 eh1                  = ["esp-hal-common/eh1"]
+embedded-io          = ["esp-hal-common/embedded-io"]
 interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
 log                  = ["esp-hal-common/log", "esp-println/log"]
 rt                   = ["esp-hal-common/rt-riscv"]
diff --git a/esp32h2-hal/Cargo.toml b/esp32h2-hal/Cargo.toml
index e87d02d3672..2d5a739343a 100644
--- a/esp32h2-hal/Cargo.toml
+++ b/esp32h2-hal/Cargo.toml
@@ -58,6 +58,7 @@ debug                = ["esp-hal-common/debug"]
 defmt                = ["esp-hal-common/defmt", "esp-println/defmt"]
 direct-vectoring     = ["esp-hal-common/direct-vectoring"]
 eh1                  = ["esp-hal-common/eh1"]
+embedded-io          = ["esp-hal-common/embedded-io"]
 interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
 log                  = ["esp-hal-common/log", "esp-println/log"]
 rt                   = ["esp-hal-common/rt-riscv"]
diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml
index 13901d6d18f..d3b929c9684 100644
--- a/esp32s2-hal/Cargo.toml
+++ b/esp32s2-hal/Cargo.toml
@@ -53,15 +53,16 @@ usb-device         = "0.3.1"
 usbd-serial        = "0.2.0"
 
 [features]
-default   = ["rt", "vectored", "embassy-integrated-timers"]
-async     = ["esp-hal-common/async"]
-debug     = ["esp-hal-common/debug"]
-defmt     = ["esp-hal-common/defmt", "esp-println/defmt"]
-eh1       = ["esp-hal-common/eh1"]
-log       = ["esp-hal-common/log", "esp-println/log"]
-rt        = ["esp-hal-common/rt-xtensa"]
-ufmt      = ["esp-hal-common/ufmt"]
-vectored  = ["esp-hal-common/vectored"]
+default     = ["rt", "vectored", "embassy-integrated-timers"]
+async       = ["esp-hal-common/async"]
+debug       = ["esp-hal-common/debug"]
+defmt       = ["esp-hal-common/defmt", "esp-println/defmt"]
+eh1         = ["esp-hal-common/eh1"]
+embedded-io = ["esp-hal-common/embedded-io"]
+log         = ["esp-hal-common/log", "esp-println/log"]
+rt          = ["esp-hal-common/rt-xtensa"]
+ufmt        = ["esp-hal-common/ufmt"]
+vectored    = ["esp-hal-common/vectored"]
 
 # Embassy support
 embassy                    = ["esp-hal-common/embassy"]
diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml
index 0a1653fc8e7..22cd1d742fc 100644
--- a/esp32s3-hal/Cargo.toml
+++ b/esp32s3-hal/Cargo.toml
@@ -53,15 +53,16 @@ usb-device         = "0.3.1"
 usbd-serial        = "0.2.0"
 
 [features]
-default              = ["rt", "vectored", "embassy-integrated-timers"]
-async                = ["esp-hal-common/async"]
-debug                = ["esp-hal-common/debug"]
-defmt                = ["esp-hal-common/defmt", "esp-println/defmt"]
-eh1                  = ["esp-hal-common/eh1"]
-log                  = ["esp-hal-common/log", "esp-println/log"]
-rt                   = ["esp-hal-common/rt-xtensa"]
-ufmt                 = ["esp-hal-common/ufmt"]
-vectored             = ["esp-hal-common/vectored"]
+default     = ["rt", "vectored", "embassy-integrated-timers"]
+async       = ["esp-hal-common/async"]
+debug       = ["esp-hal-common/debug"]
+defmt       = ["esp-hal-common/defmt", "esp-println/defmt"]
+embedded-io = ["esp-hal-common/embedded-io"]
+eh1         = ["esp-hal-common/eh1"]
+log         = ["esp-hal-common/log", "esp-println/log"]
+rt          = ["esp-hal-common/rt-xtensa"]
+ufmt        = ["esp-hal-common/ufmt"]
+vectored    = ["esp-hal-common/vectored"]
 
 # Embassy support
 embassy                    = ["esp-hal-common/embassy"]

From e055034c9593c80363d22886c0cbc8ba31975410 Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Wed, 10 Jan 2024 09:33:54 -0800
Subject: [PATCH 2/2] Update `CHANGELOG.md`

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f892e8b5672..11bf1e68c66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Implement overriding base mac address (#1044)
 - Add `rt-riscv` and `rt-xtensa` features to enable/disable runtime support (#1057)
 - ESP32-C6: Implement deep sleep (#918)
+- Add `embedded-io` feature to each chip-specific HAL (#1072)
 
 ### Changed