diff --git a/Cargo.lock b/Cargo.lock index 3139b0769..106d00cae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,7 +161,7 @@ version = "0.1.0" dependencies = [ "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -321,11 +321,11 @@ version = "0.1.0" dependencies = [ "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-cfu-protocol", "embedded-services", - "heapless", + "heapless 0.8.0", "log", ] @@ -430,7 +430,7 @@ dependencies = [ "bbq2", "critical-section", "defmt 0.3.100", - "embassy-sync", + "embassy-sync 0.8.0", "embedded-services", "log", "rtt-target", @@ -485,8 +485,8 @@ checksum = "af0e43acfcbb0bb3b7435cc1b1dbb33596cacfec1eb243336b74a398e0bd6cbf" dependencies = [ "defmt 0.3.100", "device-driver-macros", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io-async 0.6.1", ] [[package]] @@ -541,7 +541,7 @@ checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" dependencies = [ "embassy-futures", "embassy-hal-internal", - "embassy-sync", + "embassy-sync 0.7.2", "embassy-time", "embedded-hal 0.2.7", "embedded-hal 1.0.0", @@ -589,7 +589,7 @@ dependencies = [ "embassy-embedded-hal", "embassy-futures", "embassy-hal-internal", - "embassy-sync", + "embassy-sync 0.7.2", "embassy-time", "embassy-time-driver", "embassy-time-queue-utils", @@ -597,8 +597,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-mcu-hal", "embedded-storage", "fixed", @@ -621,10 +621,25 @@ dependencies = [ "cfg-if", "critical-section", "defmt 1.0.1", - "embedded-io-async", + "embedded-io-async 0.6.1", "futures-core", "futures-sink", - "heapless", + "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", + "defmt 1.0.1", + "embedded-io-async 0.7.0", + "futures-core", + "futures-sink", + "heapless 0.9.2", "log", ] @@ -663,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" dependencies = [ "embassy-executor-timer-queue", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -697,7 +712,7 @@ version = "0.2.0" source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#a4cc8707842b878048447abbf2af4efa79fed368" dependencies = [ "defmt 0.3.100", - "embedded-io-async", + "embedded-io-async 0.6.1", "log", ] @@ -770,13 +785,28 @@ dependencies = [ "defmt 0.3.100", ] +[[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]] @@ -818,13 +848,13 @@ dependencies = [ "critical-section", "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embassy-time-driver", "embedded-batteries-async", "embedded-cfu-protocol", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "log", "mctp-rs", "num_enum", @@ -900,7 +930,7 @@ dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-imxrt", - "embassy-sync", + "embassy-sync 0.8.0", "embedded-services", "log", "mctp-rs", @@ -1015,6 +1045,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -1026,7 +1066,7 @@ name = "hid-service" version = "0.1.0" dependencies = [ "defmt 0.3.100", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-hal 1.0.0", "embedded-hal-async", @@ -1127,7 +1167,7 @@ dependencies = [ "arraydeque", "either", "embedded-hal 1.0.0", - "heapless", + "heapless 0.8.0", "keyberon-macros", "usb-device", ] @@ -1149,7 +1189,7 @@ dependencies = [ "bitflags 2.9.4", "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-hal 1.0.0", "embedded-services", @@ -1470,7 +1510,7 @@ dependencies = [ "block-device-driver", "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embedded-storage-async", "partition-manager-macros", ] @@ -1542,7 +1582,7 @@ dependencies = [ "crc", "defmt 0.3.100", "embassy-imxrt", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-services", "log", @@ -1571,10 +1611,10 @@ version = "0.1.0" dependencies = [ "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-services", - "heapless", + "heapless 0.8.0", "log", ] @@ -1944,12 +1984,12 @@ version = "0.1.0" dependencies = [ "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-fans-async", "embedded-sensors-hal-async", "embedded-services", - "heapless", + "heapless 0.8.0", "log", "uuid", ] @@ -2067,19 +2107,19 @@ dependencies = [ [[package]] name = "tps6699x" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/tps6699x#fc7bf70ec292191b630b79160eebc71e39ec8e50" +source = "git+https://github.com/OpenDevicePartnership/tps6699x#aa3425136216dccfb107bff6b172a49b8972bb70" dependencies = [ "bincode", "bitfield 0.19.2", "defmt 0.3.100", "device-driver", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-hal 1.0.0", "embedded-hal-async", - "embedded-io-async", + "embedded-io-async 0.6.1", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "itertools 0.14.0", "log", ] @@ -2154,14 +2194,14 @@ dependencies = [ "critical-section", "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embassy-time-driver", "embedded-cfu-protocol", "embedded-hal-async", "embedded-services", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "log", "static_cell", "tokio", @@ -2210,7 +2250,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98816b1accafbb09085168b90f27e93d790b4bfa19d883466b5e53315b5f06a6" dependencies = [ - "heapless", + "heapless 0.8.0", "portable-atomic", ] diff --git a/Cargo.toml b/Cargo.toml index 424221b97..28b4a6033 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ critical-section = "1.1" defmt = "0.3" embassy-futures = "0.1.2" embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" } -embassy-sync = "0.7.2" +embassy-sync = "0.8" embassy-time = "0.5.0" embassy-time-driver = "0.2.1" embedded-batteries-async = "0.3" diff --git a/examples/rt633/Cargo.lock b/examples/rt633/Cargo.lock index ba119a8a4..7da33433b 100644 --- a/examples/rt633/Cargo.lock +++ b/examples/rt633/Cargo.lock @@ -43,7 +43,7 @@ version = "0.1.0" dependencies = [ "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -326,8 +326,8 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1298272ea07037196af2fe8d1eb50792206f45476d79eefa435432b9323cf488" dependencies = [ - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io-async 0.6.1", ] [[package]] @@ -352,8 +352,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" dependencies = [ "embassy-futures", - "embassy-hal-internal", - "embassy-sync", + "embassy-hal-internal 0.3.0", + "embassy-sync 0.7.2", "embassy-time", "embedded-hal 0.2.7", "embedded-hal 1.0.0", @@ -363,6 +363,23 @@ dependencies = [ "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 = [ + "embassy-futures", + "embassy-hal-internal 0.4.0", + "embassy-sync 0.8.0", + "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-executor" version = "0.9.1" @@ -413,6 +430,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-imxrt" version = "0.1.0" @@ -424,10 +450,10 @@ dependencies = [ "critical-section", "defmt 1.0.1", "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", @@ -435,8 +461,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-mcu-hal", "embedded-storage", "fixed", @@ -459,10 +485,25 @@ dependencies = [ "cfg-if", "critical-section", "defmt 1.0.1", - "embedded-io-async", + "embedded-io-async 0.6.1", "futures-core", "futures-sink", - "heapless", + "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", + "defmt 1.0.1", + "embedded-io-async 0.7.0", + "futures-core", + "futures-sink", + "heapless 0.9.2", ] [[package]] @@ -498,7 +539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" dependencies = [ "embassy-executor-timer-queue", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -545,7 +586,7 @@ version = "0.2.0" source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#a4cc8707842b878048447abbf2af4efa79fed368" dependencies = [ "defmt 0.3.100", - "embedded-io-async", + "embedded-io-async 0.6.1", ] [[package]] @@ -595,13 +636,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]] @@ -622,12 +678,12 @@ dependencies = [ "cortex-m-rt", "critical-section", "defmt 0.3.100", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", "embedded-cfu-protocol", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "mctp-rs", "num_enum", "portable-atomic", @@ -684,7 +740,7 @@ dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-imxrt", - "embassy-sync", + "embassy-sync 0.8.0", "embedded-services", "mctp-rs", ] @@ -754,6 +810,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -987,10 +1053,10 @@ dependencies = [ "cortex-m-rt", "defmt 0.3.100", "defmt-rtt", - "embassy-embedded-hal", + "embassy-embedded-hal 0.6.0", "embassy-executor", "embassy-imxrt", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", "embedded-services", diff --git a/examples/rt633/Cargo.toml b/examples/rt633/Cargo.toml index 9da4f4525..2ce356b7a 100644 --- a/examples/rt633/Cargo.toml +++ b/examples/rt633/Cargo.toml @@ -32,7 +32,7 @@ embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" "unstable-pac", ] } -embassy-sync = { version = "0.7.2", features = ["defmt"] } +embassy-sync = { version = "0.8", features = ["defmt"] } embassy-executor = { version = "0.9.1", features = [ "arch-cortex-m", "executor-thread", @@ -51,7 +51,7 @@ embedded-batteries-async = { version = "0.3", features = ["defmt"] } battery-service = { path = "../../battery-service", features = ["defmt"] } bq40z50-rx = { version = "0.8", features = ["r5"] } static_cell = "2.1.0" -embassy-embedded-hal = { version = "0.5.0", default-features = false } +embassy-embedded-hal = { version = "0.6.0", default-features = false } # Needed otherwise cargo will pull from git [patch."https://github.com/OpenDevicePartnership/embedded-services"] diff --git a/examples/rt685s-evk/Cargo.lock b/examples/rt685s-evk/Cargo.lock index e9a5092d2..ae088bdcf 100644 --- a/examples/rt685s-evk/Cargo.lock +++ b/examples/rt685s-evk/Cargo.lock @@ -407,8 +407,8 @@ checksum = "af0e43acfcbb0bb3b7435cc1b1dbb33596cacfec1eb243336b74a398e0bd6cbf" dependencies = [ "defmt 0.3.100", "device-driver-macros", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io-async 0.6.1", ] [[package]] @@ -461,10 +461,9 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" dependencies = [ - "defmt 1.0.1", "embassy-futures", - "embassy-hal-internal", - "embassy-sync", + "embassy-hal-internal 0.3.0", + "embassy-sync 0.7.2", "embassy-time", "embedded-hal 0.2.7", "embedded-hal 1.0.0", @@ -474,6 +473,24 @@ dependencies = [ "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 1.0.1", + "embassy-futures", + "embassy-hal-internal 0.4.0", + "embassy-sync 0.8.0", + "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-executor" version = "0.9.1" @@ -524,6 +541,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-imxrt" version = "0.1.0" @@ -535,10 +561,10 @@ dependencies = [ "critical-section", "defmt 1.0.1", "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", @@ -546,8 +572,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-mcu-hal", "embedded-storage", "fixed", @@ -570,10 +596,25 @@ dependencies = [ "cfg-if", "critical-section", "defmt 1.0.1", - "embedded-io-async", + "embedded-io-async 0.6.1", "futures-core", "futures-sink", - "heapless", + "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", + "defmt 1.0.1", + "embedded-io-async 0.7.0", + "futures-core", + "futures-sink", + "heapless 0.9.2", ] [[package]] @@ -609,7 +650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" dependencies = [ "embassy-executor-timer-queue", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -656,7 +697,7 @@ version = "0.2.0" source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#a4cc8707842b878048447abbf2af4efa79fed368" dependencies = [ "defmt 0.3.100", - "embedded-io-async", + "embedded-io-async 0.6.1", ] [[package]] @@ -709,13 +750,28 @@ dependencies = [ "defmt 0.3.100", ] +[[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]] @@ -736,12 +792,12 @@ dependencies = [ "cortex-m-rt", "critical-section", "defmt 0.3.100", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", "embedded-cfu-protocol", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "mctp-rs", "num_enum", "portable-atomic", @@ -881,6 +937,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -1194,7 +1260,7 @@ dependencies = [ "crc", "defmt 0.3.100", "embassy-imxrt", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-services", ] @@ -1221,10 +1287,10 @@ version = "0.1.0" dependencies = [ "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-services", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -1288,11 +1354,11 @@ dependencies = [ "crc", "defmt 0.3.100", "defmt-rtt", - "embassy-embedded-hal", + "embassy-embedded-hal 0.6.0", "embassy-executor", "embassy-futures", "embassy-imxrt", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-cfu-protocol", "embedded-services", @@ -1505,19 +1571,19 @@ dependencies = [ [[package]] name = "tps6699x" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/tps6699x#fc7bf70ec292191b630b79160eebc71e39ec8e50" +source = "git+https://github.com/OpenDevicePartnership/tps6699x#aa3425136216dccfb107bff6b172a49b8972bb70" dependencies = [ "bincode", "bitfield 0.19.2", "defmt 0.3.100", "device-driver", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-hal 1.0.0", "embedded-hal-async", - "embedded-io-async", + "embedded-io-async 0.6.1", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "itertools 0.14.0", ] @@ -1529,13 +1595,13 @@ dependencies = [ "bitflags 2.9.4", "defmt 0.3.100", "embassy-futures", - "embassy-sync", + "embassy-sync 0.8.0", "embassy-time", "embedded-cfu-protocol", "embedded-hal-async", "embedded-services", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "static_cell", "tps6699x", ] diff --git a/examples/rt685s-evk/Cargo.toml b/examples/rt685s-evk/Cargo.toml index 53263b1cf..b5bdd0d46 100644 --- a/examples/rt685s-evk/Cargo.toml +++ b/examples/rt685s-evk/Cargo.toml @@ -32,9 +32,9 @@ embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" "mimxrt685s", ] } -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-sync = { version = "0.8", features = ["defmt"] } embassy-executor = { version = "0.9.1", features = [ "arch-cortex-m", "executor-thread", diff --git a/examples/std/Cargo.lock b/examples/std/Cargo.lock index d51acb9e6..6840a4dc0 100644 --- a/examples/std/Cargo.lock +++ b/examples/std/Cargo.lock @@ -268,7 +268,7 @@ dependencies = [ "embassy-time", "embedded-cfu-protocol", "embedded-services", - "heapless", + "heapless 0.8.0", "log", ] @@ -440,8 +440,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af0e43acfcbb0bb3b7435cc1b1dbb33596cacfec1eb243336b74a398e0bd6cbf" dependencies = [ "device-driver-macros", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io-async 0.6.1", ] [[package]] @@ -527,16 +527,16 @@ checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" [[package]] name = "embassy-sync" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" +checksum = "7bbd85cf5a5ae56bdf26f618364af642d1d0a4e245cdd75cd9aabda382f65a81" dependencies = [ "cfg-if", "critical-section", - "embedded-io-async", + "embedded-io-async 0.7.0", "futures-core", "futures-sink", - "heapless", + "heapless 0.9.2", "log", ] @@ -574,7 +574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" dependencies = [ "embassy-executor-timer-queue", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -605,7 +605,7 @@ name = "embedded-cfu-protocol" version = "0.2.0" source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#a4cc8707842b878048447abbf2af4efa79fed368" dependencies = [ - "embedded-io-async", + "embedded-io-async 0.6.1", "log", ] @@ -686,13 +686,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]] @@ -725,7 +740,7 @@ dependencies = [ "embedded-batteries-async", "embedded-cfu-protocol", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "log", "mctp-rs", "num_enum", @@ -870,6 +885,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -1274,7 +1299,7 @@ dependencies = [ "embassy-sync", "embassy-time", "embedded-services", - "heapless", + "heapless 0.8.0", "log", ] @@ -1588,7 +1613,7 @@ dependencies = [ "embedded-fans-async", "embedded-sensors-hal-async", "embedded-services", - "heapless", + "heapless 0.8.0", "log", "uuid", ] @@ -1645,7 +1670,7 @@ dependencies = [ [[package]] name = "tps6699x" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/tps6699x#fc7bf70ec292191b630b79160eebc71e39ec8e50" +source = "git+https://github.com/OpenDevicePartnership/tps6699x#aa3425136216dccfb107bff6b172a49b8972bb70" dependencies = [ "bincode", "bitfield 0.19.2", @@ -1654,9 +1679,9 @@ dependencies = [ "embassy-time", "embedded-hal 1.0.0", "embedded-hal-async", - "embedded-io-async", + "embedded-io-async 0.6.1", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "itertools 0.14.0", "log", ] @@ -1735,7 +1760,7 @@ dependencies = [ "embedded-hal-async", "embedded-services", "embedded-usb-pd", - "heapless", + "heapless 0.8.0", "log", "static_cell", "tps6699x", diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml index 9867a6069..24b7f3476 100644 --- a/examples/std/Cargo.toml +++ b/examples/std/Cargo.toml @@ -15,7 +15,7 @@ ignored = ["critical-section"] workspace = true [dependencies] -embassy-sync = { version = "0.7.2", features = ["log", "std"] } +embassy-sync = { version = "0.8", features = ["log", "std"] } embassy-time = { version = "0.5.0", features = ["log", "std"] } embassy-executor = { version = "0.9.1", features = [ "arch-std", diff --git a/supply-chain/config.toml b/supply-chain/config.toml index b76513c3d..c3410f5de 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -208,6 +208,10 @@ criteria = "safe-to-deploy" version = "0.7.2" criteria = "safe-to-deploy" +[[exemptions.embassy-sync]] +version = "0.8.0" +criteria = "safe-to-deploy" + [[exemptions.embassy-time]] version = "0.5.0" criteria = "safe-to-deploy" @@ -236,10 +240,18 @@ criteria = "safe-to-deploy" version = "1.0.0" criteria = "safe-to-deploy" +[[exemptions.embedded-io]] +version = "0.7.1" +criteria = "safe-to-deploy" + [[exemptions.embedded-io-async]] version = "0.6.1" criteria = "safe-to-deploy" +[[exemptions.embedded-io-async]] +version = "0.7.0" +criteria = "safe-to-deploy" + [[exemptions.embedded-storage]] version = "0.3.1" criteria = "safe-to-deploy" @@ -276,6 +288,10 @@ criteria = "safe-to-deploy" version = "0.8.0" criteria = "safe-to-deploy" +[[exemptions.heapless]] +version = "0.9.2" +criteria = "safe-to-deploy" + [[exemptions.indexmap]] version = "2.11.0" criteria = "safe-to-deploy"