diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock index cc6f576..9bb3d74 100644 --- a/firmware/Cargo.lock +++ b/firmware/Cargo.lock @@ -331,8 +331,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b8138aeafd7dd004d77bbf42a581060a018112ffaa3ffc1996da5d3867f345" dependencies = [ "digest", - "embassy-embedded-hal", - "embassy-sync", + "embassy-embedded-hal 0.5.0", + "embassy-sync 0.7.2", "embedded-storage", "embedded-storage-async", "signature", @@ -349,7 +349,7 @@ dependencies = [ "cortex-m-rt", "embassy-boot", "embassy-rp", - "embassy-sync", + "embassy-sync 0.7.2", "embassy-time", "embedded-storage", "embedded-storage-async", @@ -360,11 +360,28 @@ name = "embassy-embedded-hal" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" +dependencies = [ + "embassy-futures", + "embassy-hal-internal 0.3.0", + "embassy-sync 0.7.2", + "embedded-hal 0.2.7", + "embedded-hal 1.0.0", + "embedded-hal-async", + "embedded-storage", + "embedded-storage-async", + "nb 1.1.0", +] + +[[package]] +name = "embassy-embedded-hal" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0641612053b2f34fc250bb63f6630ae75de46e02ade7f457268447081d709ce" dependencies = [ "defmt", "embassy-futures", - "embassy-hal-internal", - "embassy-sync", + "embassy-hal-internal 0.4.0", + "embassy-sync 0.8.0", "embedded-hal 0.2.7", "embedded-hal 1.0.0", "embedded-hal-async", @@ -423,6 +440,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "embassy-hal-internal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f10ce10a4dfdf6402d8e9bd63128986b96a736b1a0a6680547ed2ac55d55dba" +dependencies = [ + "num-traits", +] + [[package]] name = "embassy-net-driver" version = "0.2.0" @@ -437,7 +463,7 @@ checksum = "b7b2739fbcf6cd206ae08779c7d709087b16577d255f2ea4a45bc4bbbf305b3f" dependencies = [ "embassy-futures", "embassy-net-driver", - "embassy-sync", + "embassy-sync 0.7.2", ] [[package]] @@ -453,10 +479,10 @@ dependencies = [ "critical-section", "defmt", "document-features", - "embassy-embedded-hal", + "embassy-embedded-hal 0.5.0", "embassy-futures", - "embassy-hal-internal", - "embassy-sync", + "embassy-hal-internal 0.3.0", + "embassy-sync 0.7.2", "embassy-time", "embassy-time-driver", "embassy-time-queue-utils", @@ -465,8 +491,8 @@ dependencies = [ "embedded-hal 1.0.0", "embedded-hal-async", "embedded-hal-nb", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io-async 0.6.1", "embedded-storage", "embedded-storage-async", "fixed", @@ -489,12 +515,26 @@ dependencies = [ "cfg-if", "critical-section", "defmt", - "embedded-io-async", + "embedded-io-async 0.6.1", "futures-core", "futures-sink", "heapless 0.8.0", ] +[[package]] +name = "embassy-sync" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bbd85cf5a5ae56bdf26f618364af642d1d0a4e245cdd75cd9aabda382f65a81" +dependencies = [ + "cfg-if", + "critical-section", + "embedded-io-async 0.7.0", + "futures-core", + "futures-sink", + "heapless 0.9.1", +] + [[package]] name = "embassy-time" version = "0.5.0" @@ -540,9 +580,9 @@ dependencies = [ "defmt", "embassy-futures", "embassy-net-driver-channel", - "embassy-sync", + "embassy-sync 0.7.2", "embassy-usb-driver", - "embedded-io-async", + "embedded-io-async 0.6.1", "heapless 0.8.0", "ssmarshal", "usbd-hid", @@ -555,7 +595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17119855ccc2d1f7470a39756b12068454ae27a3eabb037d940b5c03d9c77b7a" dependencies = [ "defmt", - "embedded-io-async", + "embedded-io-async 0.6.1", ] [[package]] @@ -599,13 +639,28 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" +[[package]] +name = "embedded-io" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7" + [[package]] name = "embedded-io-async" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" dependencies = [ - "embedded-io", + "embedded-io 0.6.1", +] + +[[package]] +name = "embedded-io-async" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0" +dependencies = [ + "embedded-io 0.7.1", ] [[package]] @@ -775,11 +830,11 @@ dependencies = [ "defmt", "defmt-rtt", "embassy-boot-rp", - "embassy-embedded-hal", + "embassy-embedded-hal 0.6.0", "embassy-executor", "embassy-futures", "embassy-rp", - "embassy-sync", + "embassy-sync 0.7.2", "embassy-time", "embassy-usb", "embedded-storage", diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml index 8fe112f..5093f00 100644 --- a/firmware/Cargo.toml +++ b/firmware/Cargo.toml @@ -21,7 +21,7 @@ test = false bench = false [dependencies] -embassy-embedded-hal = { version = "0.5.0", features = ["defmt"] } +embassy-embedded-hal = { version = "0.6.0", features = ["defmt"] } embassy-sync = { version = "0.7.2", features = ["defmt"] } embassy-executor = { version = "0.9.0", features = [ "arch-cortex-m",