diff --git a/Cargo.lock b/Cargo.lock index 9875f52..156231a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -490,9 +490,9 @@ dependencies = [ [[package]] name = "embassy-net" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558a231a47e7d4a06a28b5278c92e860f1200f24821d2f365a2f40fe3f3c7b2" +checksum = "97a788d93a10705db3350e81dc743c323e3e40371c5e52024afe7816d3ff05cf" dependencies = [ "document-features", "embassy-net-driver", @@ -500,7 +500,7 @@ dependencies = [ "embassy-time", "embedded-io-async", "embedded-nal-async", - "heapless 0.8.0", + "heapless", "managed", "smoltcp", ] @@ -513,16 +513,16 @@ checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" [[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", "futures-core", "futures-sink", - "heapless 0.8.0", + "heapless", ] [[package]] @@ -601,15 +601,15 @@ dependencies = [ [[package]] name = "embedded-io" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" +checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7" [[package]] name = "embedded-io-async" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" +checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0" dependencies = [ "embedded-io", ] @@ -625,9 +625,9 @@ dependencies = [ [[package]] name = "embedded-nal-async" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76959917cd2b86f40a98c28dd5624eddd1fa69d746241c8257eac428d83cb211" +checksum = "eb5a1bd585135d302f8f6d7de329310938093da6271b37a6c94b8798795c0c6d" dependencies = [ "embedded-io-async", "embedded-nal", @@ -772,16 +772,6 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" -[[package]] -name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - [[package]] name = "heapless" version = "0.9.2" @@ -1533,7 +1523,7 @@ name = "sachy-bthome" version = "0.1.0" dependencies = [ "defmt 1.0.1", - "heapless 0.9.2", + "heapless", "sachy-fmt", ] @@ -1747,14 +1737,14 @@ dependencies = [ [[package]] name = "smoltcp" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad095989c1533c1c266d9b1e8d70a1329dd3723c3edac6d03bbd67e7bf6f4bb" +checksum = "ac729b0a77bd092a3f06ddaddc59fe0d67f48ba0de45a9abe707c2842c7f8767" dependencies = [ "bitflags 1.3.2", "byteorder", "cfg-if", - "heapless 0.8.0", + "heapless", "managed", ] diff --git a/Cargo.toml b/Cargo.toml index e3ff66e..4b755b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,8 @@ rust-version = "1.89.0" [workspace.dependencies] embassy-futures = { version = "0.1" } embassy-time = { version = "0.5" } -embassy-sync = { version = "0.7" } -embassy-net = { version = "0.7" } +embassy-sync = { version = "0.8" } +embassy-net = { version = "0.9" } defmt = { version = "1" } [patch.crates-io] diff --git a/sachy-sntp/src/lib.rs b/sachy-sntp/src/lib.rs index 1a975b7..0df777d 100644 --- a/sachy-sntp/src/lib.rs +++ b/sachy-sntp/src/lib.rs @@ -82,14 +82,14 @@ impl SntpRequest { packet } - pub fn create_packet_from_buffer(packet: &mut [u8]) -> Result<(), SntpError> { + pub fn create_packet_from_buffer(packet: &mut [u8]) -> (usize, Result<(), SntpError>) { if packet.len() != Self::SNTP_PACKET_SIZE { - return Err(SntpError::InvalidPacket); + return (0, Err(SntpError::InvalidPacket)); } packet[0] = (3 << 6) | (4 << 3) | 3; - Ok(()) + (Self::SNTP_PACKET_SIZE, Ok(())) } pub fn read_timestamp(packet: &[u8]) -> Result {