Skip to content

Commit

Permalink
Bump embassy
Browse files Browse the repository at this point in the history
  • Loading branch information
MathiasKoch committed Sep 24, 2024
1 parent a3890fd commit 2a1eb07
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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" }
Expand Down
5 changes: 1 addition & 4 deletions src/asynch/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/command/general/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down

0 comments on commit 2a1eb07

Please sign in to comment.