From 09af8a4dc277a96d25b1a1f1e0074bf0070a7de7 Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Tue, 2 May 2023 07:09:48 -0700
Subject: [PATCH] Use published release of `embassy-executor`

---
 esp32-hal/Cargo.toml   | 7 +------
 esp32c2-hal/Cargo.toml | 7 +------
 esp32c3-hal/Cargo.toml | 7 +------
 esp32c6-hal/Cargo.toml | 7 +------
 esp32s2-hal/Cargo.toml | 7 +------
 esp32s3-hal/Cargo.toml | 7 +------
 6 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml
index d7c703f16ea..12515eefe37 100644
--- a/esp32-hal/Cargo.toml
+++ b/esp32-hal/Cargo.toml
@@ -36,6 +36,7 @@ esp-hal-common     = { version = "0.8.0",  features = ["esp32"], path = "../esp-
 aes               = "0.8.2"
 critical-section  = "1.1.1"
 crypto-bigint     = {version = "0.5.1", default-features = false}
+embassy-executor  = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"] }
 embedded-graphics = "0.7.1"
 esp-backtrace     = { version = "0.7.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] }
 esp-hal-smartled  = { version = "0.1.0", features = ["esp32"], path = "../esp-hal-smartled" }
@@ -45,12 +46,6 @@ smart-leds        = "0.3.0"
 ssd1306           = "0.7.1"
 static_cell       = "1.0.0"
 
-[dev-dependencies.embassy-executor]
-package  = "embassy-executor"
-git      = "https://github.com/embassy-rs/embassy/"
-rev      = "fb27594"
-features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"]
-
 [features]
 default            = ["rt", "vectored", "xtal40mhz"]
 bluetooth          = []
diff --git a/esp32c2-hal/Cargo.toml b/esp32c2-hal/Cargo.toml
index 8c1a4257e4b..75437c1fec5 100644
--- a/esp32c2-hal/Cargo.toml
+++ b/esp32c2-hal/Cargo.toml
@@ -34,6 +34,7 @@ esp-hal-common     = { version = "0.8.0", features = ["esp32c2"], path = "../esp
 
 [dev-dependencies]
 critical-section  = "1.1.1"
+embassy-executor  = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"] }
 embedded-graphics = "0.7.1"
 esp-backtrace     = { version = "0.7.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] }
 esp-println       = { version = "0.5.0", features = ["esp32c2"] }
@@ -41,12 +42,6 @@ sha2              = { version = "0.10.6", default-features = false}
 ssd1306           = "0.7.1"
 static_cell       = "1.0.0"
 
-[dev-dependencies.embassy-executor]
-package  = "embassy-executor"
-git      = "https://github.com/embassy-rs/embassy/"
-rev      = "fb27594"
-features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"]
-
 [features]
 default              = ["rt", "vectored", "xtal40mhz"]
 direct-boot          = ["esp-hal-common/rv-init-data"]
diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml
index cef416e867b..acff20926ba 100644
--- a/esp32c3-hal/Cargo.toml
+++ b/esp32c3-hal/Cargo.toml
@@ -38,6 +38,7 @@ esp-hal-common     = { version = "0.8.0",  features = ["esp32c3"], path = "../es
 aes               = "0.8.2"
 critical-section  = "1.1.1"
 crypto-bigint     = {version = "0.5.1",default-features = false}
+embassy-executor  = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"] }
 embedded-graphics = "0.7.1"
 esp-backtrace     = { version = "0.7.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] }
 esp-hal-smartled  = { version = "0.1.0", features = ["esp32c3"], path = "../esp-hal-smartled" }
@@ -47,12 +48,6 @@ smart-leds        = "0.3.0"
 ssd1306           = "0.7.1"
 static_cell       = "1.0.0"
 
-[dev-dependencies.embassy-executor]
-package  = "embassy-executor"
-git      = "https://github.com/embassy-rs/embassy/"
-rev      = "fb27594"
-features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"]
-
 [features]
 default              = ["rt", "vectored", "esp-hal-common/rv-zero-rtc-bss"]
 mcu-boot             = []
diff --git a/esp32c6-hal/Cargo.toml b/esp32c6-hal/Cargo.toml
index b34189dccec..7621e7b7d8c 100644
--- a/esp32c6-hal/Cargo.toml
+++ b/esp32c6-hal/Cargo.toml
@@ -39,6 +39,7 @@ esp-hal-common     = { version = "0.8.0",  features = ["esp32c6"], path = "../es
 aes               = "0.8.2"
 critical-section  = "1.1.1"
 crypto-bigint     = {version = "0.5.1",default-features = false}
+embassy-executor  = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"] }
 embedded-graphics = "0.7.1"
 esp-backtrace     = { version = "0.7.0", features = ["esp32c6", "panic-handler", "exception-handler", "print-uart"] }
 esp-hal-smartled  = { version = "0.1.0", features = ["esp32c6"], path = "../esp-hal-smartled" }
@@ -48,12 +49,6 @@ smart-leds        = "0.3.0"
 ssd1306           = "0.7.1"
 static_cell       = "1.0.0"
 
-[dev-dependencies.embassy-executor]
-package  = "embassy-executor"
-git      = "https://github.com/embassy-rs/embassy/"
-rev      = "fb27594"
-features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"]
-
 [features]
 default              = ["rt", "vectored", "esp-hal-common/rv-zero-rtc-bss"]
 direct-boot          = ["esp-hal-common/rv-init-data", "esp-hal-common/rv-init-rtc-data"]
diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml
index 3fdb60cbe9f..ad77f1caefa 100644
--- a/esp32s2-hal/Cargo.toml
+++ b/esp32s2-hal/Cargo.toml
@@ -37,6 +37,7 @@ xtensa-atomic-emulation-trap = { version = "0.4.0" }
 aes               = "0.8.2"
 critical-section  = "1.1.1"
 crypto-bigint     = {version = "0.5.1",default-features = false}
+embassy-executor  = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"] }
 embedded-graphics = "0.7.1"
 esp-backtrace     = { version = "0.7.0", features = ["esp32s2", "panic-handler", "print-uart", "exception-handler"] }
 esp-hal-smartled  = { version = "0.1.0", features = ["esp32s2"], path = "../esp-hal-smartled" }
@@ -49,12 +50,6 @@ usb-device        = { version = "0.2.9" }
 usbd-serial       = "0.1.1"
 esp-alloc         = "0.3.0"
 
-[dev-dependencies.embassy-executor]
-package      = "embassy-executor"
-git      = "https://github.com/embassy-rs/embassy/"
-rev      = "fb27594"
-features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"]
-
 [features]
 default   = ["rt", "vectored"]
 eh1       = ["esp-hal-common/eh1", "dep:embedded-hal-1", "dep:embedded-hal-nb"]
diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml
index 5c632603c38..a3178651864 100644
--- a/esp32s3-hal/Cargo.toml
+++ b/esp32s3-hal/Cargo.toml
@@ -39,6 +39,7 @@ r0                 = { version = "1.0.0",  optional = true }
 aes               = "0.8.2"
 critical-section  = "1.1.1"
 crypto-bigint     = {version = "0.5.1",default-features = false}
+embassy-executor  = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"] }
 embedded-graphics = "0.7.1"
 esp-backtrace     = { version = "0.7.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] }
 esp-hal-smartled  = { version = "0.1.0", features = ["esp32s3"], path = "../esp-hal-smartled" }
@@ -50,12 +51,6 @@ static_cell       = "1.0.0"
 usb-device        = "0.2.9"
 usbd-serial       = "0.1.1"
 
-[dev-dependencies.embassy-executor]
-package  = "embassy-executor"
-git      = "https://github.com/embassy-rs/embassy/"
-rev      = "fb27594"
-features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"]
-
 [features]
 default              = ["rt", "vectored"]
 direct-boot          = ["r0"]