newAM · newAM · May 23, 2022 · Sep 3, 2022 · Sep 3, 2022 · Sep 3, 2022
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,7 +1,7 @@
 [alias]
-test-all = "test --features std,log,eh0,eh1,time,chrono,num-rational,w5500-tls"
+test-all = "test --features std,log,eh0,eh1,time,chrono,num-rational,w5500-tls,ufmt"
 test-dhcp = "test -p w5500-dhcp --features log,std"
-test-ll = "test -p w5500-ll --features eh0,eh1,std"
+test-ll = "test -p w5500-ll --features eh0,eh1,std,ufmt"
 test-hl = "test -p w5500-hl --features eh0,eh1,std"
 test-mqtt = "test -p w5500-mqtt --features log,std,w5500-tls"
 test-regsim = "test -p w5500-regsim"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,12 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} -p w5500-dns  --features defmt
       - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features defmt
       - run: cargo build --target ${{ matrix.target }} -p w5500-tls  --features defmt
+      - run: cargo build --target ${{ matrix.target }} -p w5500-ll   --features ufmt
+      - run: cargo build --target ${{ matrix.target }} -p w5500-hl   --features ufmt
+      - run: cargo build --target ${{ matrix.target }} -p w5500-dhcp --features ufmt
+      - run: cargo build --target ${{ matrix.target }} -p w5500-dns  --features ufmt
+      - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features ufmt
+      - run: cargo build --target ${{ matrix.target }} -p w5500-tls  --features ufmt
       - run: cargo build --target ${{ matrix.target }} -p w5500-ll   --features eh0,eh1
       - run: cargo build --target ${{ matrix.target }} -p w5500-hl   --features eh0,eh1
       - run: cargo build --target ${{ matrix.target }} -p w5500-dhcp --features eh0,eh1

diff --git a/dhcp/CHANGELOG.md b/dhcp/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Added support for `embedded-hal` version `1.0.0-alpha.8` with the `eh1` feature.
+- Added support for `ufmt` with the `ufmt` feature.
 
 ### Changed
 - Changed the name of the `embedded-hal` feature to `eh0`.

diff --git a/dhcp/Cargo.toml b/dhcp/Cargo.toml
@@ -12,15 +12,17 @@ categories = ["embedded", "hardware-support", "no-std"]
 homepage = "https://github.com/newAM/w5500-rs"
 
 [features]
+defmt = ["w5500-hl/defmt", "dep:defmt"]
 eh0 = ["w5500-hl/eh0"]
 eh1 = ["w5500-hl/eh1"]
-defmt = ["w5500-hl/defmt", "dep:defmt"]
-std = ["w5500-hl/std"]
+std = ["w5500-hl/std", "ufmt?/std"]
+ufmt = ["w5500-hl/ufmt", "dep:ufmt"]
 
 [dependencies]
-w5500-hl = { path = "../hl", version = "0.9.0" }
 defmt = { version = "0.3", optional = true }
 log = { version = "0.4", optional = true }
+ufmt = { version = "0.2", optional = true }
+w5500-hl = { path = "../hl", version = "0.9.0" }
 
 [dev-dependencies]
 dhcproto = "0.8"

diff --git a/dhcp/README.md b/dhcp/README.md
@@ -11,11 +11,12 @@ This code has been tested, but only with a single DHCP server.
 
 All features are disabled by default.
 
+* `defmt`: Enable logging with `defmt`.
 * `eh0`: Passthrough to [`w5500-hl`].
 * `eh1`: Passthrough to [`w5500-hl`].
-* `std`: Passthrough to [`w5500-hl`].
-* `defmt`: Enable logging with `defmt`. Also a passthrough to [`w5500-hl`].
 * `log`: Enable logging with `log`.
+* `std`: Passthrough to [`w5500-hl`].
+* `ufmt`: Enable formatting types with `ufmt`.
 
 [`std::net`]: https://doc.rust-lang.org/std/net/index.html
 [`w5500-hl`]: https://crates.io/crates/w5500-hl

diff --git a/dhcp/src/lib.rs b/dhcp/src/lib.rs
@@ -9,11 +9,12 @@
 //!
 //! All features are disabled by default.
 //!
+//! * `defmt`: Enable logging with `defmt`.
 //! * `eh0`: Passthrough to [`w5500-hl`].
 //! * `eh1`: Passthrough to [`w5500-hl`].
-//! * `std`: Passthrough to [`w5500-hl`].
-//! * `defmt`: Enable logging with `defmt`. Also a passthrough to [`w5500-hl`].
 //! * `log`: Enable logging with `log`.
+//! * `std`: Passthrough to [`w5500-hl`].
+//! * `ufmt`: Enable formatting types with `ufmt`.
 //!
 //! [`std::net`]: https://doc.rust-lang.org/std/net/index.html
 //! [`w5500-hl`]: https://crates.io/crates/w5500-hl
@@ -56,6 +57,7 @@ const LINK_UP_TIMEOUT_SECS: u32 = 1;
 /// DHCP client states.
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 #[non_exhaustive] // may support rebooting and ini-reboot in the future
 #[doc(hidden)]
 pub enum State {
@@ -111,6 +113,7 @@ pub enum State {
 /// ```
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct Client<'a> {
     /// Socket to use for the DHCP client.
     sn: Sn,

diff --git a/dhcp/src/pkt.rs b/dhcp/src/pkt.rs
@@ -48,6 +48,7 @@ impl From<Options> for u8 {
 #[repr(u8)]
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub enum MsgType {
     /// DHCPDISCOVER
     Discover = 1,

diff --git a/dhcp/src/rand.rs b/dhcp/src/rand.rs
@@ -3,6 +3,7 @@
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub(crate) struct Rand {
     state: u64,
 }

diff --git a/dns/CHANGELOG.md b/dns/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Added support for `embedded-hal` version `1.0.0-alpha.8` with the `eh1` feature.
+- Added support for `ufmt` with the `ufmt` feature.
 
 ### Changed
 - Changed the name of the `embedded-hal` feature to `eh0`.

diff --git a/dns/Cargo.toml b/dns/Cargo.toml
@@ -12,15 +12,17 @@ categories = ["embedded", "hardware-support", "no-std"]
 homepage = "https://github.com/newAM/w5500-rs"
 
 [features]
+defmt = ["w5500-hl/defmt", "dep:defmt"]
 eh0 = ["w5500-hl/eh0"]
 eh1 = ["w5500-hl/eh1"]
-defmt = ["w5500-hl/defmt", "dep:defmt"]
-std = ["w5500-hl/std"]
+std = ["w5500-hl/std", "ufmt?/std"]
+ufmt = ["w5500-hl/ufmt", "dep:ufmt"]
 
 [dependencies]
-w5500-hl = { path = "../hl", version = "0.9.0" }
 defmt = { version = "0.3", optional = true }
 log = { version = "0.4", optional = true }
+ufmt = { version = "0.2", optional = true }
+w5500-hl = { path = "../hl", version = "0.9.0" }
 
 [dev-dependencies]
 log = "0.4"

diff --git a/dns/README.md b/dns/README.md
@@ -50,11 +50,12 @@ response.done()?;
 
 All features are disabled by default.
 
+* `defmt`: Enable logging with `defmt`.
 * `eh0`: Passthrough to [w5500-hl].
 * `eh1`: Passthrough to [w5500-hl].
-* `std`: Passthrough to [w5500-hl].
-* `defmt`: Enable logging with `defmt`. Also a passthrough to [w5500-hl].
 * `log`: Enable logging with `log`.
+* `std`: Passthrough to [w5500-hl].
+* `ufmt`: Enable formatting types with `ufmt`.
 
 [w5500-hl]: https://crates.io/crates/w5500-hl
 [`std::net`]: https://doc.rust-lang.org/std/net/index.html

diff --git a/dns/src/header.rs b/dns/src/header.rs
@@ -1,6 +1,7 @@
 /// Query or Response flag.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub(crate) enum Qr {
     Query,
     Response,
@@ -13,6 +14,7 @@ pub(crate) enum Qr {
 /// * [RFC 1035 Section 4.1.1](https://www.rfc-editor.org/rfc/rfc1035#section-4.1.1)
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 #[repr(u8)]
 pub enum ResponseCode {
     /// No Error.
@@ -71,6 +73,7 @@ impl TryFrom<u8> for ResponseCode {
 /// * [RFC 1035 Section 4.1.1](https://www.rfc-editor.org/rfc/rfc1035#section-4.1.1)
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub(crate) struct Header {
     buf: [u8; Self::LEN_USIZE],
 }

diff --git a/dns/src/lib.rs b/dns/src/lib.rs
@@ -51,11 +51,12 @@
 //!
 //! All features are disabled by default.
 //!
+//! * `defmt`: Enable logging with `defmt`.
 //! * `eh0`: Passthrough to [w5500-hl].
 //! * `eh1`: Passthrough to [w5500-hl].
-//! * `std`: Passthrough to [w5500-hl].
-//! * `defmt`: Enable logging with `defmt`. Also a passthrough to [w5500-hl].
 //! * `log`: Enable logging with `log`.
+//! * `std`: Passthrough to [w5500-hl].
+//! * `ufmt`: Enable formatting types with `ufmt`.
 //!
 //! [w5500-hl]: https://crates.io/crates/w5500-hl
 //! [`std::net`]: https://doc.rust-lang.org/std/net/index.html
@@ -117,6 +118,7 @@ pub mod servers {
 /// Decoded fields from SRV rdata.
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct ServiceData {
     /// The priority of this target host.
     pub priority: u16,
@@ -129,6 +131,7 @@ pub struct ServiceData {
 /// Decoded rdata.
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub enum RData {
     /// Decoded rdata for A records.
     A(Ipv4Addr),
@@ -154,6 +157,7 @@ impl Default for RData {
 /// * [RFC 1035 Section 4.1.4](https://www.rfc-editor.org/rfc/rfc1035#section-4.1.4)
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct ResourceRecord<'a> {
     /// A domain name to which this resource record pertains.
     ///
@@ -276,6 +280,7 @@ fn read_u32<E, Reader: Read<E>>(reader: &mut Reader) -> Result<u32, Error<E>> {
 /// This is created with [`Client::response`].
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct Response<'a, W5500: Udp> {
     reader: UdpReader<'a, W5500>,
     header: Header,
@@ -383,6 +388,7 @@ impl<'a, W5500: Udp> Response<'a, W5500> {
 /// This is created with [`Client::query`].
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 struct Query<'a, W5500: Udp> {
     writer: UdpWriter<'a, W5500>,
     header: Header,
@@ -443,6 +449,7 @@ impl<'a, W5500: Udp> Query<'a, W5500> {
 /// W5500 DNS client.
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct Client {
     sn: Sn,
     port: u16,

diff --git a/dns/src/mdns.rs b/dns/src/mdns.rs
@@ -20,6 +20,7 @@ const MDNS_HARDWARE_DST: Eui48Addr = Eui48Addr::new(0x01, 0x00, 0x5E, 0x00, 0x00
 /// W5500 MDNS client.
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct Client {
     sn: Sn,
     port: u16,

diff --git a/dns/src/qclass.rs b/dns/src/qclass.rs
@@ -5,6 +5,7 @@
 /// * [RFC 1035 Section 3.2.4](https://tools.ietf.org/rfc/rfc1035#section-3.2.4).
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 #[repr(u16)]
 pub enum Qclass {
     /// Internet

diff --git a/dns/src/qtype.rs b/dns/src/qtype.rs
@@ -6,6 +6,7 @@
 /// * [RFC 1035 Section 3.2.3](https://tools.ietf.org/rfc/rfc1035#section-3.2.3)
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 #[repr(u16)]
 pub enum Qtype {
     /// a host address

diff --git a/dns/src/rand.rs b/dns/src/rand.rs
@@ -3,6 +3,7 @@
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub(crate) struct Rand {
     state: u64,
 }

diff --git a/hl/CHANGELOG.md b/hl/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Added support for `embedded-hal` version `1.0.0-alpha.8` with the `eh1` feature.
+- Added support for `ufmt` with the `ufmt` feature.
 
 ### Changed
 - Changed the name of the `embedded-hal` feature to `eh0`.

diff --git a/hl/Cargo.toml b/hl/Cargo.toml
@@ -15,10 +15,12 @@ homepage = "https://github.com/newAM/w5500-rs"
 defmt = ["w5500-ll/defmt", "dep:defmt"]
 eh0 = ["w5500-ll/eh0"]
 eh1 = ["w5500-ll/eh1"]
-std = ["w5500-ll/std"]
+std = ["w5500-ll/std", "ufmt?/std"]
+ufmt = ["w5500-ll/ufmt", "dep:ufmt"]
 
 [dependencies]
 defmt = { version = "0.3", optional = true }
+ufmt = { version = "0.2", optional = true }
 w5500-ll = { path = "../ll", version = "0.10" }
 
 [dev-dependencies]

diff --git a/hl/README.md b/hl/README.md
@@ -23,10 +23,11 @@ structures utilizing whatever Mutex is available for your platform / RTOS.
 
 All features are disabled by default.
 
-* `defmt`: Passthrough to [`w5500-ll`].
+* `defmt`: Enable formatting types with `defmt`.
 * `eh0`: Passthrough to [`w5500-ll`].
 * `eh1`: Passthrough to [`w5500-ll`].
 * `std`: Passthrough to [`w5500-ll`].
+* `ufmt`: Enable formatting types with `ufmt`.
 
 ## Examples
 

diff --git a/hl/src/hostname.rs b/hl/src/hostname.rs
@@ -4,6 +4,7 @@
 /// implementing protocols such as DNS and DHCP to use.
 #[derive(Debug, Clone, Copy)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct Hostname<'a> {
     hostname: &'a str,
 }
@@ -194,6 +195,7 @@ impl<'a> Hostname<'a> {
 /// The error type returned when a str to [`Hostname`] conversion fails.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct TryFromStrError(pub(crate) ());
 
 impl<'a> TryFrom<&'a str> for Hostname<'a> {

diff --git a/hl/src/io.rs b/hl/src/io.rs
@@ -9,6 +9,7 @@ use crate::Error;
 /// [`std::io::SeekFrom`]: https://doc.rust-lang.org/std/io/enum.SeekFrom.html
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub enum SeekFrom {
     /// Sets the offset to the provided number of bytes.
     Start(u16),

diff --git a/hl/src/lib.rs b/hl/src/lib.rs
@@ -21,10 +21,11 @@
 //!
 //! All features are disabled by default.
 //!
-//! * `defmt`: Passthrough to [`w5500-ll`].
+//! * `defmt`: Enable formatting types with `defmt`.
 //! * `eh0`: Passthrough to [`w5500-ll`].
 //! * `eh1`: Passthrough to [`w5500-ll`].
 //! * `std`: Passthrough to [`w5500-ll`].
+//! * `ufmt`: Enable formatting types with `ufmt`.
 //!
 //! # Examples
 //!
@@ -135,6 +136,7 @@ where
 /// Higher level W5500 errors.
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub enum Error<E> {
     /// Unexpected "end of file".
     ///

diff --git a/hl/src/tcp.rs b/hl/src/tcp.rs
@@ -58,6 +58,7 @@ use w5500_ll::{
 /// ```
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct TcpReader<'w, W5500: Registers> {
     pub(crate) w5500: &'w mut W5500,
     pub(crate) sn: Sn,
@@ -158,6 +159,7 @@ impl<'a, W5500: Registers> Read<W5500::Error> for TcpReader<'a, W5500> {
 /// ```
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct TcpWriter<'w, W5500: Registers> {
     pub(crate) w5500: &'w mut W5500,
     pub(crate) sn: Sn,

diff --git a/hl/src/udp.rs b/hl/src/udp.rs
@@ -11,6 +11,7 @@ use w5500_ll::{
 /// W5500 UDP Header.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct UdpHeader {
     /// Origin IP address and port.
     pub origin: SocketAddrV4,
@@ -78,6 +79,7 @@ impl UdpHeader {
 /// ```
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct UdpReader<'w, W: Registers> {
     inner: TcpReader<'w, W>,
     header: UdpHeader,
@@ -162,6 +164,7 @@ impl<'w, W5500: Registers> Read<W5500::Error> for UdpReader<'w, W5500> {
 /// ```
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[cfg_attr(feature = "ufmt", derive(ufmt::derive::uDebug))]
 pub struct UdpWriter<'w, W5500: Registers> {
     pub(crate) w5500: &'w mut W5500,
     pub(crate) sn: Sn,