Update smoltcp to 0.12.

Author: reitermarkus

Cargo.lock

@@ -54,15 +54,15 @@ panic-persist = { version = "0.3", features = ["custom-panic-handler", "utf8"] }
 miniconf = { version = "0.18", features = ["json-core", "derive", "postcard"]}
 miniconf_mqtt = "0.18"
 # Note: Keep `py/pyproject.toml` version in sync with the Minimq version used in FW.
-minimq = "0.9.0"
-w5500 = "0.5"
+minimq = "0.10.0"
+w5500 = "0.6"
 smlang= "0.8"
 minireq = "0.5"
 rtt-target = "0.6"
 enum-iterator = { version = "2.1", default-features = false }
 enc424j600 = "0.4"
 embedded-hal = "1"
-smoltcp-nal = { version = "0.5", features=["shared-stack"] }
+smoltcp-nal = { version = "0.7", features=["shared-stack"] }
 serial-settings = "0.2"
 stm32f4xx-hal = {version = "0.22.1", features = ["stm32f407", "usb_fs"] }
 
@@ -75,11 +75,12 @@ built = { version = "0.7", features = ["git2"], default-features = false }
 path = "ad5627"
 version = "0.2"
 
-[patch.crates-io.smoltcp]
-# Locking to a patch where the poll() function no longer loops infinitely during packet floods. This
-# can be removed once smoltcp is re-released.
-git = "https://github.com/smoltcp-rs/smoltcp"
-rev = "53caf70f640d5ccb3cd1492e1cb178bc7dfa3cdd"
+[patch.crates-io]
+miniconf = { git = "https://github.com/quartiq/miniconf" }
+miniconf_mqtt = { git = "https://github.com/quartiq/miniconf" }
+minireq = { git = "https://github.com/quartiq/minireq" }
+# See https://github.com/quartiq/smoltcp-nal/pull/57.
+smoltcp-nal = { git = "https://github.com/reitermarkus/smoltcp-nal", branch = "granular-poll" }
 
 [dependencies.ads7924]
 path = "ads7924"

Cargo.toml

@@ -5,7 +5,7 @@ MEMORY
   FLASH : ORIGIN = 0x08000000, LENGTH = 768K
   RAM : ORIGIN = 0x20000000, LENGTH = 126K
   PANDUMP : ORIGIN = 0x2001FC00, LENGTH = 1K
-  BOOTFLAG_RAM: ORIGIN = 0x2001F800, LENGTH = 1K
+  BOOTFLAG_RAM : ORIGIN = 0x2001F800, LENGTH = 1K
 }
 
 _bootflag = ORIGIN(BOOTFLAG_RAM);

memory.x

@@ -62,11 +62,11 @@ pub struct RxToken {
 }
 
 impl smoltcp::phy::RxToken for RxToken {
-    fn consume<R, F>(mut self, f: F) -> R
+    fn consume<R, F>(self, f: F) -> R
     where
-        F: FnOnce(&mut [u8]) -> R,
+        F: FnOnce(&[u8]) -> R,
     {
-        f(&mut self.frame_buffer[..self.length])
+        f(&self.frame_buffer[..self.length])
     }
 }
 

src/hardware/external_mac.rs

@@ -2,7 +2,7 @@
 
 use crate::hardware::{NetworkStack, SystemTimer};
 
-use core::fmt::Write;
+use core::{fmt::Write, num::NonZero};
 use heapless::String;
 
 pub mod mqtt_control;
@@ -139,6 +139,8 @@ impl NetworkDevices {
     pub fn process(&mut self) -> bool {
         self.telemetry.update();
 
-        self.stack.lock(|stack| stack.poll()).unwrap_or(true)
+        self.stack
+            .lock(|stack| stack.poll_n(const { NonZero::new(1).unwrap() }))
+            .unwrap_or(true)
     }
 }

src/net/mod.rs

@@ -5,7 +5,7 @@ use crate::{
     Channel,
 };
 
-use minimq::{DeferredPublication, Publication};
+use minimq::Publication;
 
 use super::NetworkStackProxy;
 
@@ -124,12 +124,9 @@ impl TelemetryClient {
         // All telemtry is published in a best-effort manner.
         self.mqtt
             .client()
-            .publish(
-                DeferredPublication::new(|buf| serde_json_core::to_slice(telemetry, buf))
-                    .topic(&topic)
-                    .finish()
-                    .unwrap(),
-            )
+            .publish(Publication::new(&topic, |buf: &mut [u8]| {
+                serde_json_core::to_slice(telemetry, buf)
+            }))
             .ok();
     }
 
@@ -155,23 +152,15 @@ impl TelemetryClient {
 
             if mqtt
                 .client()
-                .publish(
-                    DeferredPublication::new(|buf| serde_json_core::to_slice(&metadata, buf))
-                        .topic(&topic)
-                        .finish()
-                        .unwrap(),
-                )
+                .publish(Publication::new(&topic, |buf: &mut [u8]| {
+                    serde_json_core::to_slice(&metadata, buf)
+                }))
                 .is_err()
             {
                 // Note(unwrap): We can guarantee that this message will be sent because we checked
                 // for ability to publish above.
                 mqtt.client()
-                    .publish(
-                        Publication::new(DEFAULT_METADATA.as_bytes())
-                            .topic(&topic)
-                            .finish()
-                            .unwrap(),
-                    )
+                    .publish(Publication::new(&topic, DEFAULT_METADATA.as_bytes()))
                     .unwrap();
             }
 

src/net/mqtt_control.rs

@@ -46,8 +46,8 @@ fn identifier_is_valid(id: &str) -> bool {
 pub struct IpAddr(pub smoltcp_nal::smoltcp::wire::Ipv4Address);
 
 impl IpAddr {
-    pub fn new(bytes: &[u8]) -> Self {
-        Self(smoltcp::wire::Ipv4Address::from_bytes(bytes))
+    pub fn new(a: u8, b: u8, c: u8, d: u8) -> Self {
+        Self(smoltcp::wire::Ipv4Address::new(a, b, c, d))
     }
 }
 
@@ -78,11 +78,11 @@ impl encdec::Encode for IpAddr {
     type Error = encdec::Error;
 
     fn encode_len(&self) -> Result<usize, Self::Error> {
-        Ok(self.0 .0.len())
+        Ok(self.0.octets().len())
     }
 
     fn encode(&self, buff: &mut [u8]) -> Result<usize, Self::Error> {
-        self.0 .0.encode(buff)
+        self.0.octets().encode(buff)
     }
 }
 
@@ -91,8 +91,8 @@ impl encdec::DecodeOwned for IpAddr {
     type Error = encdec::Error;
 
     fn decode_owned(buff: &[u8]) -> Result<(Self::Output, usize), Self::Error> {
-        let (data, size) = <[u8; 4]>::decode_owned(buff)?;
-        Ok((Self::new(&data[..]), size))
+        let ([a, b, c, d], size) = <[u8; 4]>::decode_owned(buff)?;
+        Ok((Self::new(a, b, c, d), size))
     }
 }