PinMode::new

Author: burrbull

examples/blinky_timer_irq.rs

@@ -15,7 +15,7 @@ use panic_halt as _;
 use stm32f1xx_hal as hal;
 
 use crate::hal::{
-    gpio::{gpioc, Output, PushPull},
+    gpio::{gpioc, Output, PinState, PushPull},
     pac::{interrupt, Interrupt, Peripherals, TIM2},
     prelude::*,
     timer::{CounterMs, Event},
@@ -79,8 +79,9 @@ fn main() -> ! {
 
     // Configure PC13 pin to blink LED
     let mut gpioc = dp.GPIOC.split();
-    let mut led = gpioc.pc13.into_push_pull_output(&mut gpioc.crh);
-    let _ = led.set_high(); // Turn off
+    let led = Output::new(gpioc.pc13, &mut gpioc.crh, PinState::High);
+    //or
+    //let led = gpioc.pc13.into_push_pull_output_with_state(&mut gpioc.crh, PinState::High);
 
     // Move the pin into our global storage
     cortex_m::interrupt::free(|cs| *G_LED.borrow(cs).borrow_mut() = Some(led));

src/gpio.rs

@@ -150,7 +150,7 @@ pub trait Active {}
 #[derive(Default)]
 pub struct Input<PULL = Floating>(PhantomData<PULL>);
 
-impl<MODE> Active for Input<MODE> {}
+impl<PULL> Active for Input<PULL> {}
 
 /// Used by the debugger (type state)
 #[derive(Default)]
@@ -986,6 +986,61 @@ where
     }
 }
 
+impl Analog {
+    pub fn new<const P: char, const N: u8, MODE>(
+        pin: Pin<P, N, MODE>,
+        cr: &mut <Pin<P, N, MODE> as HL>::Cr,
+    ) -> Pin<P, N, Self>
+    where
+        Pin<P, N, MODE>: HL,
+        Self: PinMode,
+    {
+        pin.into_mode(cr)
+    }
+}
+
+impl<PULL> Input<PULL> {
+    pub fn new<const P: char, const N: u8, MODE>(
+        pin: Pin<P, N, MODE>,
+        cr: &mut <Pin<P, N, MODE> as HL>::Cr,
+        _pull: PULL,
+    ) -> Pin<P, N, Self>
+    where
+        Pin<P, N, MODE>: HL,
+        Self: PinMode,
+    {
+        pin.into_mode(cr)
+    }
+}
+
+impl<Otype> Output<Otype> {
+    pub fn new<const P: char, const N: u8, MODE>(
+        mut pin: Pin<P, N, MODE>,
+        cr: &mut <Pin<P, N, MODE> as HL>::Cr,
+        state: PinState,
+    ) -> Pin<P, N, Self>
+    where
+        Pin<P, N, MODE>: HL,
+        Self: PinMode,
+    {
+        pin._set_state(state);
+        pin.into_mode(cr)
+    }
+}
+
+impl<Otype> Alternate<Otype> {
+    pub fn new<const P: char, const N: u8, MODE>(
+        pin: Pin<P, N, MODE>,
+        cr: &mut <Pin<P, N, MODE> as HL>::Cr,
+    ) -> Pin<P, N, Self>
+    where
+        Pin<P, N, MODE>: HL,
+        Self: PinMode,
+    {
+        pin.into_mode(cr)
+    }
+}
+
 gpio!(GPIOA, gpioa, PAx, 'A', [
     PA0: (pa0, 0),
     PA1: (pa1, 1),