Bump embassy dependencies to newly released versions

FactbirdHQ · Jan 12, 2025 · bd098e6 · bd098e6
1 parent 2162ac1
commit bd098e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "ublox-cellular-rs"
 version = "0.4.0"
-authors = ["Mathias Koch <mk@blackbird.online>"]
+authors = ["Mathias Koch <mk@Factbird.online>"]
 description = "Driver crate for u-blox cellular devices, implementation follows 'UBX-13002752 - R65'"
 readme = "../README.md"
 keywords = ["arm", "cortex-m", "ublox", "cellular", "embedded-hal-driver"]
 categories = ["embedded", "no-std"]
 license = "MIT OR Apache-2.0"
-repository = "https://github.com/BlackbirdHQ/ublox-cellular-rs"
+repository = "https://github.com/FactbirdHQ/ublox-cellular-rs"
 edition = "2021"
 
 [lib]
@@ -19,8 +19,8 @@ atat = { version = "0.23", features = ["derive", "bytes"] }
 heapless = { version = "^0.8", features = ["serde"] }
 serde = { version = "^1", default-features = false, features = ["derive"] }
 #ublox-sockets = { version = "0.5", optional = true }
-ublox-sockets = { git = "https://github.com/BlackbirdHQ/ublox-sockets", branch = "feature/async-borrowed-sockets", optional = true }
-embassy-time = "0.3"
+ublox-sockets = { git = "https://github.com/FactbirdHQ/ublox-sockets", rev = "0b0d186", optional = true }
+embassy-time = "0.4"
 embassy-sync = "0.6"
 
 log = { version = "^0.4", default-features = false, optional = true }
@@ -33,15 +33,15 @@ embassy-futures = { version = "0.1" }
 embedded-hal = "1.0.0"
 embedded-nal-async = { version = "0.8" }
 
-embassy-at-cmux = { git = "https://github.com/MathiasKoch/embassy", rev = "c83b7a052" }
+embassy-at-cmux = { git = "https://github.com/MathiasKoch/embassy", rev = "66d78d425" }
 # embassy-at-cmux = { path = "../embassy/embassy-at-cmux" }
 
 embassy-net-ppp = { version = "0.1", optional = true }
-embassy-net = { version = "0.4", features = [
+embassy-net = { version = "0.6", features = [
     "proto-ipv4",
     "medium-ip",
 ], optional = true }
-embassy-embedded-hal = { version = "0.1", optional = true }
+embassy-embedded-hal = { version = "0.3", optional = true }
 
 embedded-io-async = "0.6"
 
@@ -138,19 +138,13 @@ default-members = ["."]
 exclude = ["examples"]
 
 [patch.crates-io]
-#ublox-sockets = { git = "https://github.com/BlackbirdHQ/ublox-sockets", branch = "feature/async-borrowed-sockets" }
-#ublox-sockets = { path = "../ublox-sockets" }
-
-embassy-time = { git = "https://github.com/MathiasKoch/embassy", rev = "49e44344e" }
-embassy-sync = { git = "https://github.com/MathiasKoch/embassy", rev = "49e44344e" }
-embassy-futures = { git = "https://github.com/MathiasKoch/embassy", rev = "49e44344e" }
-embassy-net-ppp = { git = "https://github.com/MathiasKoch/embassy", rev = "49e44344e" }
-embassy-net = { git = "https://github.com/MathiasKoch/embassy", rev = "49e44344e" }
-
-#embassy-time = { path = "../embassy/embassy-time" }
-#embassy-sync = { path = "../embassy/embassy-sync" }
-#embassy-futures = { path = "../embassy/embassy-futures" }
-atat = { git = "https://github.com/BlackbirdHQ/atat", rev = "a466836" }
+# embassy-time = { git = "https://github.com/MathiasKoch/embassy", rev = "a991cd" }
+# embassy-sync = { git = "https://github.com/MathiasKoch/embassy", rev = "a991cd" }
+# embassy-futures = { git = "https://github.com/MathiasKoch/embassy", rev = "a991cd" }
+embassy-net-ppp = { git = "https://github.com/MathiasKoch/embassy", rev = "a991cd" }
+# embassy-net = { git = "https://github.com/MathiasKoch/embassy", rev = "a991cd" }
+
+atat = { git = "https://github.com/FactbirdHQ/atat", rev = "c31f700" }
 # atat = { path = "../atat/atat" }
 
 # [patch."https://github.com/MathiasKoch/embassy"]

diff --git a/src/modules/mod.rs b/src/modules/mod.rs
@@ -99,7 +99,10 @@ pub(crate) enum Module {
 impl Module {
     pub fn from_model_id(model_id: &ModelId) -> Self {
         match model_id.model.as_slice() {
+            #[cfg(any(feature = "any-module", feature = "lara-r6"))]
             b"LARA-R6001D" => Self::LaraR6(lara_r6::LaraR6),
+            #[cfg(any(feature = "any-module", feature = "toby-r2"))]
+            b"TOBY-R200" | b"TOBY-R201" | b"TOBY-R202" => Self::TobyR2(toby_r2::TobyR2),
             id => {
                 #[cfg(feature = "defmt")]
                 warn!("Attempting to run {=[u8]:a} using generic module parameters! This may or may not work.", id);