9 files changed, 159 insertions, 57 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 1fc103b..4574afe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,6 +3,15 @@
 version = 4
 
 [[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -15,12 +24,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
+name = "cc"
+version = "1.2.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
 name = "cfg-if"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
+name = "cordyceps"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688d7fbb8092b8de775ef2536f36c8c31f2bc4006ece2e8d8ad2d17d00ce0a2a"
+dependencies = [
+ "loom",
+ "tracing",
+]
+
+[[package]]
 name = "critical-section"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -114,9 +143,9 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
+ "cordyceps",
  "critical-section",
  "document-features",
  "embassy-executor-macros",
@@ -126,8 +155,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor-macros"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -138,14 +166,12 @@ dependencies = [
 [[package]]
 name = "embassy-executor-timer-queue"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 
 [[package]]
 name = "embassy-futures"
 version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 
 [[package]]
 name = "embassy-ha"
@@ -158,7 +184,7 @@ dependencies = [
  "embassy-net",
  "embassy-sync",
  "embassy-time",
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "heapless 0.9.2",
  "rand",
  "serde",
@@ -171,15 +197,14 @@ dependencies = [
 [[package]]
 name = "embassy-net"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71f0aa32082b7df00164f485322d6edab59122c9718b363b07ec23424c2c06a0"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "defmt 1.0.1",
  "document-features",
  "embassy-net-driver",
  "embassy-sync",
  "embassy-time",
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "embedded-nal-async",
  "heapless 0.8.0",
  "managed",
@@ -189,22 +214,20 @@ dependencies = [
 [[package]]
 name = "embassy-net-driver"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
- "defmt 0.3.100",
+ "defmt 1.0.1",
 ]
 
 [[package]]
 name = "embassy-sync"
 version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "cfg-if",
  "critical-section",
  "defmt 1.0.1",
- "embedded-io-async 0.6.1",
+ "embedded-io-async",
  "futures-core",
  "futures-sink",
  "heapless 0.8.0",
@@ -213,8 +236,7 @@ dependencies = [
 [[package]]
 name = "embassy-time"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -231,8 +253,7 @@ dependencies = [
 [[package]]
 name = "embassy-time-driver"
 version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0a244c7dc22c8d0289379c8d8830cae06bb93d8f990194d0de5efb3b5ae7ba6"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "document-features",
 ]
@@ -240,8 +261,7 @@ dependencies = [
 [[package]]
 name = "embassy-time-queue-utils"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "embassy-executor-timer-queue",
  "heapless 0.8.0",
@@ -274,32 +294,17 @@ dependencies = [
 
 [[package]]
 name = "embedded-io"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
-
-[[package]]
-name = "embedded-io"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7"
 
 [[package]]
 name = "embedded-io-async"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
-dependencies = [
- "embedded-io 0.6.1",
-]
-
-[[package]]
-name = "embedded-io-async"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0"
 dependencies = [
- "embedded-io 0.7.1",
+ "embedded-io",
 ]
 
 [[package]]
@@ -317,11 +322,17 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb5a1bd585135d302f8f6d7de329310938093da6271b37a6c94b8798795c0c6d"
 dependencies = [
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "embedded-nal",
 ]
 
 [[package]]
+name = "find-msvc-tools"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
+
+[[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -340,6 +351,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
+name = "generator"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52f04ae4152da20c76fe800fa48659201d5cf627c5149ca0b707b69d7eef6cf9"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows-link",
+ "windows-result",
+]
+
+[[package]]
 name = "getrandom"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -413,12 +439,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
 name = "managed"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d"
 
 [[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
 name = "nb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -545,12 +599,41 @@ dependencies = [
 ]
 
 [[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
 name = "ryu"
 version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
 
 [[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
 name = "serde"
 version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -601,6 +684,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
 name = "smallvec"
 version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -730,10 +819,14 @@ version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
@@ -772,6 +865,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
 name = "windows-sys"
 version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 3ef77d6..62a777c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,21 +17,21 @@ defmt = ["dep:defmt", "embassy-net/defmt", "embassy-sync/defmt"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-embassy-net = { version = "0.8", features = ["medium-ip", "proto-ipv4", "tcp", "dns"] }
+embassy-net = { git = "https://github.com/embassy-rs/embassy", features = ["medium-ip", "proto-ipv4", "tcp", "dns"] }
 heapless = "0.9"
-embassy-time = { version = "0.5" }
+embassy-time = { git = "https://github.com/embassy-rs/embassy" }
 serde-json-core = "0.6"
 serde = { version = "1", default-features = false, features = ["derive"] }
 defmt = { version = "1", optional = true }
 tracing = { version = "0.1", optional = true, default-features = false }
-embassy-sync = { version = "0.7" }
-embassy-futures = "0.1"
+embassy-sync = { git = "https://github.com/embassy-rs/embassy" }
+embassy-futures = { git = "https://github.com/embassy-rs/embassy" }
 embedded-io-async = "0.7"
 
 [dev-dependencies]
-embassy-time = { version = "0.5", features = ["std"] }
-embassy-executor = { version = "0.9", features = ["arch-std", "executor-thread"] }
-embassy-sync = { version = "0.7" }
+embassy-time = { git = "https://github.com/embassy-rs/embassy", features = ["std"] }
+embassy-executor = { git = "https://github.com/embassy-rs/embassy", features = ["arch-std", "executor-thread"] }
+embassy-sync = { git = "https://github.com/embassy-rs/embassy" }
 static_cell = "2.1"
 embedded-io-async = { version = "0.7", features = ["std"] }
 critical-section = { version = "1", features = ["std"] }
diff --git a/examples/binary_sensor.rs b/examples/binary_sensor.rs
index a52a5fb..ed2fe51 100644
--- a/examples/binary_sensor.rs
+++ b/examples/binary_sensor.rs
@@ -33,7 +33,7 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    spawner.must_spawn(binary_sensor_class(sensor));
+    spawner.spawn(binary_sensor_class(sensor).unwrap());
 
     embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
diff --git a/examples/button.rs b/examples/button.rs
index ea8c4a9..1ea50d0 100644
--- a/examples/button.rs
+++ b/examples/button.rs
@@ -26,7 +26,7 @@ async fn main_task(spawner: Spawner) {
         embassy_ha::ButtonConfig::default(),
     );
 
-    spawner.must_spawn(button_task(button));
+    spawner.spawn(button_task(button).unwrap());
 
     embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
diff --git a/examples/common/mod.rs b/examples/common/mod.rs
index db97463..47def59 100644
--- a/examples/common/mod.rs
+++ b/examples/common/mod.rs
@@ -19,7 +19,7 @@ macro_rules! example_main {
 
             let executor = common::EXECUTOR.init(Executor::new());
             executor.run(|spawner| {
-                spawner.must_spawn(main_task(spawner));
+                spawner.spawn(main_task(spawner).unwrap());
             });
         }
     };
diff --git a/examples/device_tracker.rs b/examples/device_tracker.rs
index 7f02333..150226d 100644
--- a/examples/device_tracker.rs
+++ b/examples/device_tracker.rs
@@ -32,7 +32,7 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    spawner.must_spawn(tracker_task(tracker));
+    spawner.spawn(tracker_task(tracker).unwrap());
 
     embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
diff --git a/examples/number.rs b/examples/number.rs
index 8ef6656..0f7bd38 100644
--- a/examples/number.rs
+++ b/examples/number.rs
@@ -39,7 +39,7 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    spawner.must_spawn(number_task(number));
+    spawner.spawn(number_task(number).unwrap());
 
     embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
diff --git a/examples/sensor.rs b/examples/sensor.rs
index acbb3ab..3a0989d 100644
--- a/examples/sensor.rs
+++ b/examples/sensor.rs
@@ -67,9 +67,9 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    spawner.must_spawn(random_temperature_task(temperature_sensor));
-    spawner.must_spawn(random_humidity_task(humidity_sensor));
-    spawner.must_spawn(random_signal_strength_task(signal_strength_sensor));
+    spawner.spawn(random_temperature_task(temperature_sensor).unwrap());
+    spawner.spawn(random_humidity_task(humidity_sensor).unwrap());
+    spawner.spawn(random_signal_strength_task(signal_strength_sensor).unwrap());
 
     embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
diff --git a/examples/switch.rs b/examples/switch.rs
index 0158ede..634bbb6 100644
--- a/examples/switch.rs
+++ b/examples/switch.rs
@@ -33,7 +33,7 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    spawner.must_spawn(switch_task(switch));
+    spawner.spawn(switch_task(switch).unwrap());
 
     embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }