From 2a1eb07a24a87405ff67889871c3097885bb6696 Mon Sep 17 00:00:00 2001
From: Mathias <mk@factbird.com>
Date: Tue, 24 Sep 2024 14:59:03 +0200
Subject: [PATCH] Bump embassy

---
 Cargo.toml                   | 12 ++++++------
 src/asynch/runner.rs         |  5 +----
 src/command/general/types.rs |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 010a286..cccffdc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ embedded-hal = "1.0.0"
 embedded-nal = "0.8"
 embedded-nal-async = { version = "0.7" }
 
-embassy-at-cmux = { git = "https://github.com/MathiasKoch/embassy", rev = "e2f4365" }
+embassy-at-cmux = { git = "https://github.com/MathiasKoch/embassy", rev = "c83b7a052" }
 # embassy-at-cmux = { path = "../embassy/embassy-at-cmux" }
 
 embassy-net-ppp = { version = "0.1", optional = true }
@@ -145,11 +145,11 @@ exclude = ["examples"]
 no-std-net = { git = "https://github.com/rushmorem/no-std-net", branch = "issue-15" }
 #ublox-sockets = { path = "../ublox-sockets" }
 
-embassy-time = { git = "https://github.com/MathiasKoch/embassy", rev = "e9ce1e2" }
-embassy-sync = { git = "https://github.com/MathiasKoch/embassy", rev = "e9ce1e2" }
-embassy-futures = { git = "https://github.com/MathiasKoch/embassy", rev = "e9ce1e2" }
-embassy-net-ppp = { git = "https://github.com/MathiasKoch/embassy", rev = "e9ce1e2" }
-embassy-net = { git = "https://github.com/MathiasKoch/embassy", rev = "e9ce1e2" }
+embassy-time = { git = "https://github.com/MathiasKoch/embassy", rev = "84dba2941" }
+embassy-sync = { git = "https://github.com/MathiasKoch/embassy", rev = "84dba2941" }
+embassy-futures = { git = "https://github.com/MathiasKoch/embassy", rev = "84dba2941" }
+embassy-net-ppp = { git = "https://github.com/MathiasKoch/embassy", rev = "84dba2941" }
+embassy-net = { git = "https://github.com/MathiasKoch/embassy", rev = "84dba2941" }
 
 #embassy-time = { path = "../embassy/embassy-time" }
 #embassy-sync = { path = "../embassy/embassy-sync" }
diff --git a/src/asynch/runner.rs b/src/asynch/runner.rs
index a4bc211..f5344e9 100644
--- a/src/asynch/runner.rs
+++ b/src/asynch/runner.rs
@@ -479,10 +479,7 @@ where
         Ok(())
     }
 
-    pub async fn run<D: embassy_net::driver::Driver>(
-        &mut self,
-        stack: &embassy_net::Stack<D>,
-    ) -> ! {
+    pub async fn run(&mut self, stack: embassy_net::Stack<'_>) -> ! {
         loop {
             let _ = PwrCtrl::new(&self.ch, &mut self.config).power_down().await;
 
diff --git a/src/command/general/types.rs b/src/command/general/types.rs
index 15b01b4..86a6d0c 100644
--- a/src/command/general/types.rs
+++ b/src/command/general/types.rs
@@ -78,7 +78,7 @@ impl Serialize for FirmwareVersion {
         let mut str = heapless::String::<7>::new();
         str.write_fmt(format_args!("{}.{}", self.major, self.minor))
             .map_err(serde::ser::Error::custom)?;
-        serializer.serialize_bytes(str.as_bytes())
+        serializer.serialize_str(&str)
     }
 }