Skip to content

Commit

Permalink
switch to embassy fork, update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaspar030
kaspar030 committed Dec 18, 2023
1 parent 56c768c commit cb12551
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 50 deletions.
92 changes: 58 additions & 34 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ cortex-m-rt = { version = "0.7" }
cortex-m-semihosting = { version = "0.5" }
critical-section = { version = "1.1.2" }

embassy-executor = { version = "0.3.3", default-features = false }
embassy-executor = { version = "0.4", default-features = false }
embassy-net = { version = "0.2.1", default-features = false }
embassy-nrf = { version = "0.1.0", default-features = false }
embassy-rp = { version = "0.1.0", default-features = false }
embassy-sync = { version = "0.3.0", default-features = false }
embassy-time = { version = "0.1.5", default-features = false }
embassy-sync = { version = "0.5.0", default-features = false }
embassy-time = { version = "0.2", default-features = false }
embassy-usb = { version = "0.1.0", default-features = false }

linkme = { version = "0.3.17", features = ["used_linker"] }
linkme = { version = "0.3.19", features = ["used_linker"] }

riot-rs = { path = "src/riot-rs" }
riot-rs-rt = { path = "src/riot-rs-rt" }
Expand Down Expand Up @@ -79,11 +79,11 @@ riot-rs-runqueue = { path = "src/riot-rs-runqueue" }
nrf51-pac = { git = "https://github.com/kaspar030/nrf-pacs", branch = "riot-rs" }
nrf52840-pac = { git = "https://github.com/kaspar030/nrf-pacs", branch = "riot-rs" }
nrf52832-pac = { git = "https://github.com/kaspar030/nrf-pacs", branch = "riot-rs" }
embassy-macros = { git = "https://github.com/embassy-rs/embassy"}
embassy-executor = { git = "https://github.com/embassy-rs/embassy"}
embassy-net = { git = "https://github.com/embassy-rs/embassy"}
embassy-nrf = { git = "https://github.com/embassy-rs/embassy"}
embassy-rp = { git = "https://github.com/embassy-rs/embassy"}
embassy-time = { git = "https://github.com/embassy-rs/embassy"}
embassy-sync = { git = "https://github.com/embassy-rs/embassy"}
embassy-usb = { git = "https://github.com/embassy-rs/embassy"}
embassy-macros = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs"}
embassy-executor = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
embassy-net = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
embassy-nrf = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
embassy-rp = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
embassy-time = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
embassy-sync = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
embassy-usb = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs" }
2 changes: 1 addition & 1 deletion examples/embassy-net-tcp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ embassy-executor = { workspace = true, default-features = false }
embassy-time = { workspace = true, default-features = false }
linkme.workspace = true
embassy-net = { workspace = true, features = ["tcp", "nightly"] }
embedded-io-async = "0.6.0"
embedded-io-async = "0.6.1"
2 changes: 1 addition & 1 deletion examples/embassy-net-udp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ embassy-executor = { workspace = true, default-features = false }
embassy-time = { workspace = true, default-features = false }
linkme.workspace = true
embassy-net = { workspace = true, features = ["udp", "nightly"] }
embedded-io-async = "0.6.0"
embedded-io-async = "0.6.1"
1 change: 0 additions & 1 deletion src/riot-rs-embassy/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ riot-rs-rt = { path = "../riot-rs-rt" }

# time
embassy-time = { workspace = true, optional = true, features = [
"nightly",
"unstable-traits",
] }

Expand Down
2 changes: 1 addition & 1 deletion src/riot-rs-rt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cfg-if = "1.0.0"
cortex-m = { workspace = true, features = ["critical-section-single-core"] }
cortex-m-rt = { workspace = true }
cortex-m-semihosting = { workspace = true, optional = true }
portable-atomic = { version = "1.5.1", features = ["critical-section"] }
portable-atomic = { version = "1.6.0", features = ["critical-section"] }
riot-rs-threads = { path = "../riot-rs-threads", optional = true }
rtt-target = { version = "0.4.0", optional = true }
linkme.workspace = true
Expand Down

0 comments on commit cb12551

Please sign in to comment.