Skip to content

Commit

Permalink
Bump embassy dependencies to newly released versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@MathiasKoch
MathiasKoch committed Jan 12, 2025
1 parent 06a7b5c commit a6295e0
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 38 deletions.
30 changes: 15 additions & 15 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "ublox-short-range-rs"
version = "0.1.1"
authors = ["Mads Andresen <ma@blackbird.online>"]
authors = ["The Factbird Team"]
description = "Driver crate for u-blox short range devices, implementation follows 'UBX-14044127 - R40'"
readme = "../README.md"
keywords = ["ublox", "wifi", "shortrange", "bluetooth"]
categories = ["embedded", "no-std"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/BlackbirdHQ/ublox-short-range-rs"
repository = "https://github.com/FactbirdHQ/ublox-short-range-rs"
edition = "2021"

[lib]
Expand All @@ -20,14 +20,14 @@ 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", rev = "9f7fe54", optional = true }
ublox-sockets = { git = "https://github.com/FactbirdHQ/ublox-sockets", rev = "0b0d186", optional = true }
portable-atomic = "1.6"

log = { version = "^0.4", default-features = false, optional = true }
defmt = { version = "^0.3", optional = true }

embedded-hal = "1.0"
embassy-time = "0.3"
embassy-time = "0.4"
embassy-sync = "0.6"
embassy-futures = "0.1"

Expand All @@ -37,7 +37,7 @@ futures-util = { version = "0.3.29", default-features = false }
embedded-io-async = "0.6"

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 }
Expand Down Expand Up @@ -82,15 +82,15 @@ exclude = ["examples"]


[patch.crates-io]
atat = { git = "https://github.com/BlackbirdHQ/atat", rev = "a466836" }
atat = { git = "https://github.com/FactbirdHQ/atat", rev = "c31f700" }
# atat = { path = "../atat/atat" }

embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-net-driver = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-net-driver-channel = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-net-ppp = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "80cb2bc" }
# embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-net-driver = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-net-driver-channel = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
embassy-net-ppp = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
# embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "a991cd6" }
27 changes: 4 additions & 23 deletions examples/rpi-pico/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,23 @@ edition = "2021"

[dependencies]
ublox-short-range-rs = { path = "../../", features = ["odin-w2xx", "defmt"] }
embassy-executor = { version = "0.5", features = [
embassy-executor = { version = "0.7", features = [
"defmt",
"integrated-timers",
"nightly",
"arch-cortex-m",
"executor-thread",
] }
embassy-time = { version = "0.3", features = [
embassy-time = { version = "0.4", features = [
"defmt",
"defmt-timestamp-uptime",
] }
embassy-sync = { version = "0.6" }
embassy-rp = { version = "0.1.0", features = [
embassy-rp = { version = "0.3", features = [
"defmt",
"unstable-pac",
"time-driver",
] }
embassy-futures = { version = "0.1.0" }
no-std-net = { version = "0.6", features = ["serde"] }

static_cell = { version = "2", features = ["nightly"] }
defmt = "0.3.4"
Expand All @@ -43,7 +41,7 @@ embedded-io-async = { version = "0.6" }
heapless = "0.8"
portable-atomic = { version = "*", features = ["unsafe-assume-single-core"] }

embassy-net = { version = "0.4", optional = true, features = [
embassy-net = { version = "0.6", optional = true, features = [
"defmt",
"proto-ipv4",
"medium-ip",
Expand All @@ -63,24 +61,7 @@ internal-network-stack = ["ublox-short-range-rs/internal-network-stack"]
ppp = ["dep:embassy-net", "dep:embassy-net-ppp", "ublox-short-range-rs/ppp"]

[patch.crates-io]
# embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "03d6363d5af5dcaf21b52734994a466ca593d2b6" }
# embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "03d6363d5af5dcaf21b52734994a466ca593d2b6" }
# embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "03d6363d5af5dcaf21b52734994a466ca593d2b6" }
# embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "03d6363d5af5dcaf21b52734994a466ca593d2b6" }
# embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "03d6363d5af5dcaf21b52734994a466ca593d2b6" }
# embassy-net-driver-channel = { git = "https://github.com/embassy-rs/embassy", rev = "03d6363d5af5dcaf21b52734994a466ca593d2b6" }


embassy-rp = { path = "../../../embassy/embassy-rp" }
embassy-time = { path = "../../../embassy/embassy-time" }
embassy-sync = { path = "../../../embassy/embassy-sync" }
embassy-net = { path = "../../../embassy/embassy-net" }
embassy-net-ppp = { path = "../../../embassy/embassy-net-ppp" }
embassy-futures = { path = "../../../embassy/embassy-futures" }
embassy-executor = { path = "../../../embassy/embassy-executor" }
ublox-sockets = { path = "../../../ublox-sockets" }
no-std-net = { path = "../../../no-std-net" }
atat = { path = "../../../atat/atat" }

[profile.dev]
debug = 2
Expand Down

0 comments on commit a6295e0

Please sign in to comment.