From 4d32a9358ee57a14e5720380506d0e548ef6dbdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 12:45:32 +0000 Subject: [PATCH 1/4] build(deps): bump stm32h7xx-hal from `2d47a4a` to `11c5eba` Bumps [stm32h7xx-hal](https://github.com/stm32-rs/stm32h7xx-hal) from `2d47a4a` to `11c5eba`. - [Commits](https://github.com/stm32-rs/stm32h7xx-hal/compare/2d47a4a06c30cb95fa6e1f1fb9c8720c6e426c1a...11c5eba9fd2f0b66dd534d23c6c1365a710e456e) --- updated-dependencies: - dependency-name: stm32h7xx-hal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2df9935d8..b12840fcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -837,6 +837,19 @@ dependencies = [ "managed", ] +[[package]] +name = "smoltcp" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d2e3a36ac8fea7b94e666dfa3871063d6e0a5c9d5d4fec9a1a6b7b6760f0229" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "cfg-if", + "heapless", + "managed", +] + [[package]] name = "smoltcp-nal" version = "0.3.0" @@ -848,7 +861,7 @@ dependencies = [ "heapless", "nanorand", "shared-bus", - "smoltcp", + "smoltcp 0.9.1", ] [[package]] @@ -916,7 +929,7 @@ dependencies = [ [[package]] name = "stm32h7xx-hal" version = "0.14.0" -source = "git+https://github.com/stm32-rs/stm32h7xx-hal#2d47a4a06c30cb95fa6e1f1fb9c8720c6e426c1a" +source = "git+https://github.com/stm32-rs/stm32h7xx-hal#11c5eba9fd2f0b66dd534d23c6c1365a710e456e" dependencies = [ "bare-metal 1.0.0", "bitflags 2.3.3", @@ -928,7 +941,7 @@ dependencies = [ "fugit", "nb 1.1.0", "paste", - "smoltcp", + "smoltcp 0.10.0", "stm32h7", "void", ] From 52b2054da508d3fe0d1278b5a694846002920b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Fri, 21 Jul 2023 15:40:22 +0200 Subject: [PATCH 2/4] smoltcp-nal with smoltcp 0.10 --- Cargo.lock | 19 ++----------------- Cargo.toml | 2 +- src/hardware/setup.rs | 32 ++++++++++++++++---------------- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b12840fcf..e39aa0b16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -824,19 +824,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "smoltcp" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9786ac45091b96f946693e05bfa4d8ca93e2d3341237d97a380107a6b38dea" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "cfg-if", - "heapless", - "managed", -] - [[package]] name = "smoltcp" version = "0.10.0" @@ -853,15 +840,13 @@ dependencies = [ [[package]] name = "smoltcp-nal" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821854501c550f1d347b5ae469d8e273d21371ad2eb270a8ff6f37ca9a23f8bd" dependencies = [ "embedded-nal", "embedded-time", "heapless", "nanorand", "shared-bus", - "smoltcp 0.9.1", + "smoltcp", ] [[package]] @@ -941,7 +926,7 @@ dependencies = [ "fugit", "nb 1.1.0", "paste", - "smoltcp 0.10.0", + "smoltcp", "stm32h7", "void", ] diff --git a/Cargo.toml b/Cargo.toml index 5d70284f6..bf6f06682 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ rand_xorshift = "0.3.0" rand_core = "0.6.4" minimq = "0.7" miniconf = "0.7" -smoltcp-nal = { version = "0.3", features = ["shared-stack"]} +smoltcp-nal = { path = "../smoltcp-nal", features = ["shared-stack"]} [dependencies.stm32h7xx-hal] git = "https://github.com/stm32-rs/stm32h7xx-hal" diff --git a/src/hardware/setup.rs b/src/hardware/setup.rs index e459e0436..cd26f7424 100644 --- a/src/hardware/setup.rs +++ b/src/hardware/setup.rs @@ -38,10 +38,12 @@ pub struct NetStorage { pub struct UdpSocketStorage { rx_storage: [u8; 1024], tx_storage: [u8; 2048], - tx_metadata: - [smoltcp::storage::PacketMetadata; 10], - rx_metadata: - [smoltcp::storage::PacketMetadata; 10], + tx_metadata: [smoltcp::storage::PacketMetadata< + smoltcp::socket::udp::UdpMetadata, + >; 10], + rx_metadata: [smoltcp::storage::PacketMetadata< + smoltcp::socket::udp::UdpMetadata, + >; 10], } impl UdpSocketStorage { @@ -49,12 +51,8 @@ impl UdpSocketStorage { Self { rx_storage: [0; 1024], tx_storage: [0; 2048], - tx_metadata: [smoltcp::storage::PacketMetadata::< - smoltcp::wire::IpEndpoint, - >::EMPTY; 10], - rx_metadata: [smoltcp::storage::PacketMetadata::< - smoltcp::wire::IpEndpoint, - >::EMPTY; 10], + tx_metadata: [smoltcp::storage::PacketMetadata::EMPTY; 10], + rx_metadata: [smoltcp::storage::PacketMetadata::EMPTY; 10], } } } @@ -653,14 +651,16 @@ pub fn setup( store.ip_addrs[0] = smoltcp::wire::IpCidr::new(ip_addrs, 24); - let mut ethernet_config = smoltcp::iface::Config::default(); - ethernet_config - .hardware_addr - .replace(smoltcp::wire::HardwareAddress::Ethernet(mac_addr)); + let mut ethernet_config = smoltcp::iface::Config::new( + smoltcp::wire::HardwareAddress::Ethernet(mac_addr), + ); ethernet_config.random_seed = u64::from_be_bytes(random_seed); - let mut interface = - smoltcp::iface::Interface::new(ethernet_config, &mut eth_dma); + let mut interface = smoltcp::iface::Interface::new( + ethernet_config, + &mut eth_dma, + smoltcp::time::Instant::ZERO, + ); interface .routes_mut() From 3b0a2d493580d2acf7ce8ca63e53d46faea2cce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Fri, 21 Jul 2023 15:41:06 +0200 Subject: [PATCH 3/4] smoltcp-nal git --- Cargo.lock | 1 + Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index e39aa0b16..5894de752 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -840,6 +840,7 @@ dependencies = [ [[package]] name = "smoltcp-nal" version = "0.3.0" +source = "git+https://github.com/quartiq/smoltcp-nal.git?branch=rj/smoltcp-0.10#2204af582c95fb410da6ff03b7f6af6a44fba579" dependencies = [ "embedded-nal", "embedded-time", diff --git a/Cargo.toml b/Cargo.toml index bf6f06682..dbccfeb4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ rand_xorshift = "0.3.0" rand_core = "0.6.4" minimq = "0.7" miniconf = "0.7" -smoltcp-nal = { path = "../smoltcp-nal", features = ["shared-stack"]} +smoltcp-nal = { git = "https://github.com/quartiq/smoltcp-nal.git", branch = "rj/smoltcp-0.10", features = ["shared-stack"]} [dependencies.stm32h7xx-hal] git = "https://github.com/stm32-rs/stm32h7xx-hal" From 581fc99bb3839298b775f3e9e1043d460d47818b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Fri, 21 Jul 2023 16:29:34 +0200 Subject: [PATCH 4/4] smoltcp 0.4 --- Cargo.lock | 5 +++-- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5894de752..d536d6363 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -839,8 +839,9 @@ dependencies = [ [[package]] name = "smoltcp-nal" -version = "0.3.0" -source = "git+https://github.com/quartiq/smoltcp-nal.git?branch=rj/smoltcp-0.10#2204af582c95fb410da6ff03b7f6af6a44fba579" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75077a28569d93c2eed77164fd36dd224a9efcf6ecf0e574f293ed638783b000" dependencies = [ "embedded-nal", "embedded-time", diff --git a/Cargo.toml b/Cargo.toml index dbccfeb4a..9bd194cb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ rand_xorshift = "0.3.0" rand_core = "0.6.4" minimq = "0.7" miniconf = "0.7" -smoltcp-nal = { git = "https://github.com/quartiq/smoltcp-nal.git", branch = "rj/smoltcp-0.10", features = ["shared-stack"]} +smoltcp-nal = { version = "0.4", features = ["shared-stack"]} [dependencies.stm32h7xx-hal] git = "https://github.com/stm32-rs/stm32h7xx-hal"