Add debug and default attributes to structs

9names · Apr 25, 2024 · 894dc88 · 894dc88
1 parent f5c12c9
commit 894dc88
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/wii-ext/src/async_impl/classic.rs b/wii-ext/src/async_impl/classic.rs
@@ -3,6 +3,7 @@ use crate::core::classic::*;
 use crate::core::ControllerType;
 use embedded_hal_async;
 
+#[derive(Debug, Default)]
 pub struct Classic<I2C, Delay> {
     interface: InterfaceAsync<I2C, Delay>,
     hires: bool,

diff --git a/wii-ext/src/async_impl/interface.rs b/wii-ext/src/async_impl/interface.rs
@@ -16,6 +16,8 @@ pub enum AsyncImplError {
     ParseError,
 }
 
+#[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
+#[derive(Debug, Default)]
 pub struct InterfaceAsync<I2C, Delay> {
     i2cdev: I2C,
     delay: Delay,

diff --git a/wii-ext/src/blocking_impl/classic.rs b/wii-ext/src/blocking_impl/classic.rs
@@ -14,6 +14,8 @@ pub enum ClassicError<E> {
     ParseError,
 }
 
+#[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
+#[derive(Debug, Default)]
 pub struct Classic<I2C, DELAY> {
     interface: Interface<I2C, DELAY>,
     hires: bool,

diff --git a/wii-ext/src/blocking_impl/interface.rs b/wii-ext/src/blocking_impl/interface.rs
@@ -4,14 +4,16 @@ use crate::core::{
 };
 use embedded_hal::i2c::{I2c, SevenBitAddress};
 
+#[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
+#[derive(Debug, Default)]
 pub struct Interface<I2C, Delay> {
     i2cdev: I2C,
     delay: Delay,
 }
 
 #[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
-/// Errors in this crate
 #[derive(Debug)]
+/// Errors in this crate
 pub enum BlockingImplError<E> {
     /// I²C bus communication error
     I2C(E),

diff --git a/wii-ext/src/core/classic.rs b/wii-ext/src/core/classic.rs
@@ -181,7 +181,8 @@ pub(crate) fn decode_classic_hd_report(data: &[u8]) -> ClassicReading {
 /// Relaxed/Center positions for each axis
 ///
 /// These are used to calculate the relative deflection of each access from their center point
-#[derive(Default)]
+#[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
+#[derive(Debug, Default)]
 pub struct CalibrationData {
     pub joystick_left_x: u8,
     pub joystick_left_y: u8,

diff --git a/wii-ext/src/core/nunchuk.rs b/wii-ext/src/core/nunchuk.rs
@@ -2,7 +2,7 @@
 use defmt;
 
 #[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct NunchukReading {
     pub joystick_x: u8,
     pub joystick_y: u8,
@@ -34,7 +34,8 @@ impl NunchukReading {
 /// Relaxed/Center positions for each axis
 ///
 /// These are used to calculate the relative deflection of each access from their center point
-#[derive(Default)]
+#[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
+#[derive(Debug, Default)]
 pub struct CalibrationData {
     pub joystick_x: u8,
     pub joystick_y: u8,