diff --git a/CHANGELOG.md b/CHANGELOG.md index 0338e93..be81761 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Breaking: Removed Features `init-log` and `init-rtt`. +### Changed + +- Breaking: Bump embassy-excecutor to 0.7.0 + ## [0.5.0] ### Changed diff --git a/Cargo.lock b/Cargo.lock index 254f13c..936687f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd0a2386252214d31d22400730e28e9c6bc62b346df62802e30a0bb3677e43b" +checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" dependencies = [ "critical-section", "document-features", @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "embassy-executor-macros" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853e6bcad2d1c0811f4de404cef87363a1fa2535430cf76824c163cf75689ba" +checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 8c25e32..886534d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ heapless = "0.8.0" # Optional dependencies defmt = { version = "0.3.8", optional = true } log = { version = "0.4.20", optional = true } -embassy-executor = { version = "0.6.1", optional = true, default-features = false } +embassy-executor = { version = "0.7.0", optional = true, default-features = false } [features] diff --git a/examples/esp32c6/Cargo.lock b/examples/esp32c6/Cargo.lock index a8a8393..bf0483d 100644 --- a/examples/esp32c6/Cargo.lock +++ b/examples/esp32c6/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "anyhow" @@ -204,6 +204,17 @@ dependencies = [ "embassy-executor-macros", ] +[[package]] +name = "embassy-executor" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" +dependencies = [ + "critical-section", + "document-features", + "embassy-executor-macros", +] + [[package]] name = "embassy-executor-macros" version = "0.6.2" @@ -348,7 +359,7 @@ name = "embedded-test" version = "0.6.0" dependencies = [ "defmt", - "embassy-executor", + "embassy-executor 0.7.0", "embedded-test-macros", "heapless 0.8.0", "log", @@ -362,7 +373,7 @@ name = "embedded-test-example-for-esp32c6" version = "0.1.0" dependencies = [ "defmt", - "embassy-executor", + "embassy-executor 0.6.3", "embassy-time", "embedded-test", "esp-backtrace", @@ -505,7 +516,7 @@ checksum = "c7d0f2537ea2ff9bea26a1c8bfe43ad580d4c89febf27189653a9cf95f1f7961" dependencies = [ "critical-section", "document-features", - "embassy-executor", + "embassy-executor 0.6.3", "embassy-time-driver", "esp-build", "esp-config", @@ -916,7 +927,7 @@ dependencies = [ [[package]] name = "rtt-target" version = "0.6.1" -source = "git+https://github.com/probe-rs/rtt-target?branch=feature/log#2f71e06fb87a90ab18def8b4cd4a5afe3808513b" +source = "git+https://github.com/probe-rs/rtt-target?branch=feature%2Flog#2f71e06fb87a90ab18def8b4cd4a5afe3808513b" dependencies = [ "critical-section", "defmt", diff --git a/examples/esp32c6/Cargo.toml b/examples/esp32c6/Cargo.toml index 9838cea..ea2122c 100644 --- a/examples/esp32c6/Cargo.toml +++ b/examples/esp32c6/Cargo.toml @@ -25,7 +25,7 @@ esp-hal = { version = "0.22.0", features = ["esp32c6"] } esp-println = { version = "0.12.0", features = ["esp32c6", "log"] } embassy-time = { version = "0.3.1", features = ["generic-queue-8"] } esp-hal-embassy = { version = "0.5.0", features = ["esp32c6"] } -embassy-executor = { default-features = false, version = "0.6.0" } +embassy-executor = { default-features = false, version = "0.6.0" } # TODO: update to 0.7.0 when esp-hal supports it [dev-dependencies] embedded-test = { version = "0.6.0", features = ["embassy", "external-executor"], path = "../.." } diff --git a/examples/stm32f767/Cargo.lock b/examples/stm32f767/Cargo.lock index c8fe6e9..aa917e7 100644 --- a/examples/stm32f767/Cargo.lock +++ b/examples/stm32f767/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "as-slice" @@ -209,9 +209,9 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64f84599b0f4296b92a4b6ac2109bc02340094bda47b9766c5f9ec6a318ebf8" +checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" dependencies = [ "cortex-m", "critical-section", @@ -477,7 +477,7 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rtt-target" version = "0.6.1" -source = "git+https://github.com/probe-rs/rtt-target?branch=feature/log#2f71e06fb87a90ab18def8b4cd4a5afe3808513b" +source = "git+https://github.com/probe-rs/rtt-target?branch=feature%2Flog#2f71e06fb87a90ab18def8b4cd4a5afe3808513b" dependencies = [ "critical-section", "defmt", diff --git a/examples/stm32f767/Cargo.toml b/examples/stm32f767/Cargo.toml index 150bb9f..a502136 100644 --- a/examples/stm32f767/Cargo.toml +++ b/examples/stm32f767/Cargo.toml @@ -12,8 +12,8 @@ cortex-m = { version = "0.7", features = ["critical-section-single-core"] } cortex-m-rt = "0.7" stm32f7xx-hal = { version = "0.8", features = ["stm32f767"] } # replace the model of your microcontroller here -embassy-executor = { default-features = false, version = "0.6.0", features = ["executor-thread", "arch-cortex-m"] } -# Note: You need to enable at least one executor feature on embassy 0.6.x +embassy-executor = { default-features = false, version = "0.7.0", features = ["executor-thread", "arch-cortex-m"] } +# Note: You need to enable at least one executor feature on embassy 0.7.x # dependencies when using the log/defmt feature log = { version = "0.4.20", optional = true } diff --git a/src/export.rs b/src/export.rs index 2463acd..4796e7f 100644 --- a/src/export.rs +++ b/src/export.rs @@ -18,7 +18,7 @@ pub fn ensure_linker_file_was_added_to_rustflags() -> ! { #[cfg(feature = "embassy")] pub use embassy_executor::task; #[cfg(all(feature = "embassy", not(feature = "external-executor")))] -pub use embassy_executor::Executor; // Please activate the `executor-thread` or `executor-interrupt` feature on the embassy-executor crate (v0.5.x/v0.6.x)! +pub use embassy_executor::Executor; // Please activate the `executor-thread` or `executor-interrupt` feature on the embassy-executor crate (v0.7.x)! const VERSION: u32 = 1; //Format version of our protocol between probe-rs and target running embedded-test