Merge pull request #38 from probe-rs/embassy

t-moe · web-flow · commit 784f62c34f87 · 2024-08-26T10:27:55.000+02:00
Allow using embassy-executor 0.6
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ rtt-target = { version = "0.5.0", optional = true }
 rtt-log = { version = "0.3.0", optional = true }
 defmt = { version = "0.3.8", optional = true }
 log = { version = "0.4.20", optional = true }
-embassy-executor = { version = "0.5.0", optional = true, default-features = false }
+embassy-executor = { version = ">=0.5.0, <0.7.0", optional = true, default-features = false }
 
 
 [features]
diff --git 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)!
+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)!
 
 const VERSION: u32 = 1; //Format version of our protocol between probe-rs and target running embedded-test
 
