Fix defmt issuse with unions

Author: haata

hid-io-protocol/src/commands/mod.rs

@@ -471,7 +471,6 @@ pub mod h0021 {
     }
 
     #[derive(Clone, Copy)]
-    #[cfg_attr(feature = "defmt", derive(defmt::Format))]
     pub union Argument {
         pub raw: u16,
         pub control: args::Control,
@@ -486,6 +485,13 @@ pub mod h0021 {
         }
     }
 
+    #[cfg(feature = "defmt")]
+    impl defmt::Format for Argument {
+        fn format(&self, fmt: defmt::Formatter) {
+            defmt::write!(fmt, "{}", unsafe { self.raw })
+        }
+    }
+
     pub mod args {
         use num_enum::TryFromPrimitive;
 
@@ -741,7 +747,6 @@ pub mod h0050 {
     }
 
     #[derive(Clone, Copy)]
-    #[cfg_attr(feature = "defmt", derive(defmt::Format))]
     pub union Argument {
         pub raw: u16,
         pub led_test_sequence: args::LedTestSequence,
@@ -755,6 +760,13 @@ pub mod h0050 {
         }
     }
 
+    #[cfg(feature = "defmt")]
+    impl defmt::Format for Argument {
+        fn format(&self, fmt: defmt::Formatter) {
+            defmt::write!(fmt, "{}", unsafe { self.raw })
+        }
+    }
+
     #[derive(Clone, Debug)]
     #[cfg_attr(feature = "defmt", derive(defmt::Format))]
     pub struct Cmd {
@@ -815,7 +827,6 @@ pub mod h0051 {
     }
 
     #[derive(Clone, Copy)]
-    #[cfg_attr(feature = "defmt", derive(defmt::Format))]
     pub union Argument {
         pub raw: u16,
         pub led_test_sequence: args::LedTestSequence,
@@ -829,6 +840,13 @@ pub mod h0051 {
         }
     }
 
+    #[cfg(feature = "defmt")]
+    impl defmt::Format for Argument {
+        fn format(&self, fmt: defmt::Formatter) {
+            defmt::write!(fmt, "{}", unsafe { self.raw })
+        }
+    }
+
     #[derive(Clone, Debug)]
     #[cfg_attr(feature = "defmt", derive(defmt::Format))]
     pub struct Cmd<const D: usize> {

hid-io-protocol/src/lib.rs

@@ -607,8 +607,8 @@ impl<const H: usize> HidIoPacketBuffer<H> {
         let id_num = packet_id(packet_data)?;
         let id = match HidIoCommandId::try_from(id_num) {
             Ok(id) => id,
-            Err(_e) => {
-                error!("Failed to convert {} to HidIoCommandId: {}", id_num, _e);
+            Err(_) => {
+                error!("Failed to convert {} to HidIoCommandId", id_num);
                 return Err(HidIoParseError::InvalidHidIoCommandId(id_num));
             }
         };