Merge pull request #866 from jannic/port-861-to-rp235x

rp-rs · Oct 20, 2024 · 247dce8 · 247dce8
2 parents 1bce4c9 + 343f63f
commit 247dce8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/rp235x-hal/src/gpio/func.rs b/rp235x-hal/src/gpio/func.rs
@@ -85,6 +85,7 @@ macro_rules! pin_func {
     ($($fn:ident $(as $alias:ident)?),*) => {
         $(paste! {
             /// Type-level `variant` for pin [`Function`].
+            #[derive(Debug)]
             pub struct [<Function $fn>](pub(super) ());
             impl Function for [<Function $fn>] {}
             impl func_sealed::Function for [<Function $fn>] {
@@ -111,6 +112,7 @@ pin_func!(Xip, Spi, Uart, I2c as I2C, Pwm, Pio0, Pio1, Pio2, Clock, Usb, UartAux
 //==============================================================================
 
 /// Type-level `variant` for pin [`Function`].
+#[derive(Debug)]
 pub struct FunctionSio<C>(PhantomData<C>);
 impl<C: SioConfig> Function for FunctionSio<C> {}
 impl<C: SioConfig> func_sealed::Function for FunctionSio<C> {
@@ -133,12 +135,14 @@ pub trait SioConfig {
 }
 
 /// Type-level `variant` for SIO configuration.
+#[derive(Debug)]
 pub enum SioInput {}
 impl SioConfig for SioInput {
     #[allow(missing_docs)]
     const DYN: DynSioConfig = DynSioConfig::Input;
 }
 /// Type-level `variant` for SIO configuration.
+#[derive(Debug)]
 pub enum SioOutput {}
 impl SioConfig for SioOutput {
     #[allow(missing_docs)]

diff --git a/rp235x-hal/src/gpio/mod.rs b/rp235x-hal/src/gpio/mod.rs
@@ -175,6 +175,7 @@ pub enum OutputOverride {
 
 /// Represents a pin, with a given ID (e.g. Gpio3), a given function (e.g. FunctionUart) and a given pull type
 /// (e.g. pull-down).
+#[derive(Debug)]
 pub struct Pin<I: PinId, F: func::Function, P: PullType> {
     id: I,
     function: F,
@@ -1115,6 +1116,7 @@ macro_rules! gpio {
     (struct: $bank:ident $prefix:ident $($PXi:ident, $id:expr, $func:ident, $pull_type:ident),*) => {
         paste::paste!{
                 /// Collection of all the individual [`Pin`]s
+                #[derive(Debug)]
                 pub struct Pins {
                     _io: [<IO_ $bank:upper>],
                     _pads: [<PADS_ $bank:upper>],

diff --git a/rp235x-hal/src/gpio/pin.rs b/rp235x-hal/src/gpio/pin.rs
@@ -88,6 +88,7 @@ macro_rules! pin_ids {
         paste::paste!{
             $(
                 #[doc = "Type level variant for the pin `" $name "` in bank `" $prefix "`."]
+                #[derive(Debug)]
                 pub struct [<$prefix $name>] (pub(crate) ());
                 impl crate::typelevel::Sealed for [<$prefix $name>] {}
                 impl PinId for [<$prefix $name>] {

diff --git a/rp235x-hal/src/gpio/pull.rs b/rp235x-hal/src/gpio/pull.rs
@@ -47,6 +47,7 @@ macro_rules! pin_pull_type {
     ($($pull_type:ident),*) => {
         $(paste! {
             /// Type-level `variant` of [`PullType`].
+            #[derive(Debug)]
             pub struct [<Pull $pull_type>](pub(super) ());
             impl PullType for [<Pull $pull_type>] {}
             impl pull_sealed::PullType for [<Pull $pull_type>] {

diff --git a/rp235x-hal/src/sio.rs b/rp235x-hal/src/sio.rs
@@ -40,16 +40,19 @@ pub enum CoreId {
 }
 
 /// Marker struct for ownership of SIO gpio bank0
+#[derive(Debug)]
 pub struct SioGpioBank0 {
     _private: (),
 }
 
 /// Marker struct for ownership of SIO FIFO
+#[derive(Debug)]
 pub struct SioFifo {
     _private: (),
 }
 
 /// Marker struct for ownership of SIO gpio qspi
+#[derive(Debug)]
 pub struct SioGpioQspi {
     _private: (),
 }