Update smoltcp to 0.12.0 and embassy-net to 0.5.0 (#2849)

* chore: Update smoltcp to `0.12.0` and embassy-net to `0.5.0` * Add CHANGELOG entry * Remove `wifi_dhcp_smoltcp_nal.rs` example `smoltcp-nal`, a core dependency on which this example depends on doesn't receive the desired amount of maintainability needed to keep up to date with new dependencies releases.
esp-rs · Jan 2, 2025 · 0f38499 · 0f38499
1 parent 36095e4
commit 0f38499
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 319 deletions.
diff --git a/esp-wifi/CHANGELOG.md b/esp-wifi/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Bump MSRV to 1.83 (#2615)
+- Bump smoltcp to 0.12.0 (#2849)
 
 ### Fixed
 

diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml
@@ -18,7 +18,7 @@ log = { version = "0.4.22", optional = true }
 document-features  = "0.2.10"
 esp-alloc = { version = "0.5.0", path = "../esp-alloc", optional = true }
 esp-hal = { version = "0.22.0", path = "../esp-hal", default-features = false }
-smoltcp = { version = "0.11.0", default-features = false, features = [
+smoltcp = { version = "0.12.0", default-features = false, features = [
   "medium-ethernet",
   "socket-raw",
 ], optional = true }

diff --git a/esp-wifi/src/wifi/mod.rs b/esp-wifi/src/wifi/mod.rs
@@ -2686,9 +2686,9 @@ impl<Dm: Sealed> WifiRxToken<Dm> {
 impl<Dm: Sealed> RxToken for WifiRxToken<Dm> {
     fn consume<R, F>(self, f: F) -> R
     where
-        F: FnOnce(&mut [u8]) -> R,
+        F: FnOnce(&[u8]) -> R,
     {
-        self.consume_token(f)
+        self.consume_token(|t| f(t))
     }
 }
 

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -8,13 +8,13 @@ publish = false
 [dependencies]
 aligned             = { version = "0.4.2", optional = true }
 bleps               = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "a5148d8ae679e021b78f53fd33afb8bb35d0b62e", features = [ "macros", "async"] }
-blocking-network-stack = { git = "https://github.com/bjoernQ/blocking-network-stack.git", rev = "1c581661d78e0cf0f17b936297179b993fb149d7" }
+blocking-network-stack = { git = "https://github.com/bjoernQ/blocking-network-stack.git", rev = "b3ecefc222d8806edd221f266999ca339c52d34e" }
 bt-hci              = "0.1.1"
 cfg-if              = "1.0.0"
 critical-section    = "1.1.3"
 embassy-executor    = { version = "0.6.0", features = ["task-arena-size-20480"] }
 embassy-futures     = "0.1.1"
-embassy-net = { version = "0.4.0", features = [ "tcp", "udp", "dhcpv4", "medium-ethernet"] }
+embassy-net = { version = "0.5.0", features = [ "tcp", "udp", "dhcpv4", "medium-ethernet"] }
 embassy-sync        = "0.6.0"
 embassy-time        = "0.3.2"
 embassy-usb         = { version = "0.2.0", default-features = false }
@@ -40,8 +40,7 @@ log                 = "0.4.22"
 nb                  = "1.1.0"
 portable-atomic     = { version = "1.9.0",  default-features = false }
 sha2                = { version = "0.10.8", default-features = false }
-smoltcp             = { version = "0.11.0", default-features = false, features = [ "medium-ethernet", "socket-raw"] }
-smoltcp-nal         = "0.5.1"
+smoltcp             = { version = "0.12.0", default-features = false, features = [ "medium-ethernet", "socket-raw"] }
 embedded-time       = "=0.12.1"
 static_cell         = { version = "2.1.0", features = ["nightly"] }
 trouble-host        = { git = "https://github.com/embassy-rs/trouble", package = "trouble-host", rev = "4f1114ce58e96fe54f5ed7e726f66e1ad8d9ce54", features = [ "log", "gatt" ] }
@@ -74,3 +73,8 @@ incremental      = false
 opt-level        = 3
 lto = 'fat'
 overflow-checks  = false
+
+[patch.crates-io]
+# Patch until https://github.com/ivmarkov/edge-net/pull/50 is merged
+edge-nal = { git = "https://github.com/ivmarkov/edge-net", rev = "5a85bcc8b8726e8b7044e9526f01cdba1fd684da"}
+edge-nal-embassy = { git = "https://github.com/ivmarkov/edge-net", rev = "5a85bcc8b8726e8b7044e9526f01cdba1fd684da"}
diff --git a/examples/src/bin/wifi_access_point_with_sta.rs b/examples/src/bin/wifi_access_point_with_sta.rs
@@ -15,6 +15,8 @@
 #![no_std]
 #![no_main]
 
+use core::net::Ipv4Addr;
+
 use blocking_network_stack::Stack;
 use embedded_io::*;
 use esp_alloc as _;
@@ -38,7 +40,7 @@ use esp_wifi::{
 };
 use smoltcp::{
     iface::{SocketSet, SocketStorage},
-    wire::{IpAddress, Ipv4Address},
+    wire::IpAddress,
 };
 
 const SSID: &str = env!("SSID");
@@ -183,7 +185,7 @@ fn main() -> ! {
                 sta_socket.work();
 
                 sta_socket
-                    .open(IpAddress::Ipv4(Ipv4Address::new(142, 250, 185, 115)), 80)
+                    .open(IpAddress::Ipv4(Ipv4Addr::new(142, 250, 185, 115)), 80)
                     .unwrap();
 
                 sta_socket

diff --git a/examples/src/bin/wifi_bench.rs b/examples/src/bin/wifi_bench.rs
@@ -14,6 +14,8 @@
 #![no_std]
 #![no_main]
 
+use core::net::Ipv4Addr;
+
 use blocking_network_stack::Stack;
 use embedded_io::*;
 use esp_alloc as _;
@@ -40,7 +42,7 @@ use esp_wifi::{
 };
 use smoltcp::{
     iface::{SocketSet, SocketStorage},
-    wire::{DhcpOption, IpAddress, Ipv4Address},
+    wire::{DhcpOption, IpAddress},
 };
 
 const SSID: &str = env!("SSID");
@@ -63,7 +65,7 @@ fn main() -> ! {
 
     esp_alloc::heap_allocator!(72 * 1024);
 
-    let server_address: Ipv4Address = HOST_IP.parse().expect("Invalid HOST_IP address");
+    let server_address: Ipv4Addr = HOST_IP.parse().expect("Invalid HOST_IP address");
 
     let timg0 = TimerGroup::new(peripherals.TIMG0);
 
@@ -155,7 +157,7 @@ fn main() -> ! {
 }
 
 fn test_download<'a, D: smoltcp::phy::Device>(
-    server_address: Ipv4Address,
+    server_address: Ipv4Addr,
     socket: &mut blocking_network_stack::Socket<'a, 'a, D>,
 ) {
     println!("Testing download...");
@@ -189,7 +191,7 @@ fn test_download<'a, D: smoltcp::phy::Device>(
 }
 
 fn test_upload<'a, D: smoltcp::phy::Device>(
-    server_address: Ipv4Address,
+    server_address: Ipv4Addr,
     socket: &mut blocking_network_stack::Socket<'a, 'a, D>,
 ) {
     println!("Testing upload...");
@@ -223,7 +225,7 @@ fn test_upload<'a, D: smoltcp::phy::Device>(
 }
 
 fn test_upload_download<'a, D: smoltcp::phy::Device>(
-    server_address: Ipv4Address,
+    server_address: Ipv4Addr,
     socket: &mut blocking_network_stack::Socket<'a, 'a, D>,
 ) {
     println!("Testing upload+download...");

diff --git a/examples/src/bin/wifi_coex.rs b/examples/src/bin/wifi_coex.rs
@@ -15,6 +15,8 @@
 #![no_std]
 #![no_main]
 
+use core::net::Ipv4Addr;
+
 use bleps::{
     ad_structure::{
         create_advertising_data,
@@ -45,7 +47,7 @@ use esp_wifi::{
 };
 use smoltcp::{
     iface::{SocketSet, SocketStorage},
-    wire::{DhcpOption, IpAddress, Ipv4Address},
+    wire::{DhcpOption, IpAddress},
 };
 
 const SSID: &str = env!("SSID");
@@ -172,7 +174,7 @@ fn main() -> ! {
         socket.work();
 
         socket
-            .open(IpAddress::Ipv4(Ipv4Address::new(142, 250, 185, 115)), 80)
+            .open(IpAddress::Ipv4(Ipv4Addr::new(142, 250, 185, 115)), 80)
             .unwrap();
 
         socket

diff --git a/examples/src/bin/wifi_dhcp.rs b/examples/src/bin/wifi_dhcp.rs
@@ -13,6 +13,7 @@
 #![no_main]
 
 extern crate alloc;
+use core::net::Ipv4Addr;
 
 use blocking_network_stack::Stack;
 use embedded_io::*;
@@ -39,7 +40,7 @@ use esp_wifi::{
 };
 use smoltcp::{
     iface::{SocketSet, SocketStorage},
-    wire::{DhcpOption, IpAddress, Ipv4Address},
+    wire::{DhcpOption, IpAddress},
 };
 
 const SSID: &str = env!("SSID");
@@ -134,7 +135,7 @@ fn main() -> ! {
         socket.work();
 
         socket
-            .open(IpAddress::Ipv4(Ipv4Address::new(142, 250, 185, 115)), 80)
+            .open(IpAddress::Ipv4(Ipv4Addr::new(142, 250, 185, 115)), 80)
             .unwrap();
 
         socket