Infallible Pin

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- `InputPin`, `OutputPin`, `StatefulOutputPin`, `ToggleableOutputPin` traits.
+  Remove `embedded_hal` gpio traits from prelude.
 - Support for OpenDrain pin configuration on SPI CLK and MOSI pins
 - LSB/MSB bit format selection for `SPI`
 - Support for CAN peripherals with the `bxcan` crate

examples/blinky.rs

@@ -14,8 +14,7 @@ use panic_halt as _;
 use nb::block;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use stm32f1xx_hal::{pac, prelude::*, timer::Timer};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*, timer::Timer};
 
 #[entry]
 fn main() -> ! {
@@ -45,8 +44,8 @@ fn main() -> ! {
     // Wait for the timer to trigger an update and change the state of the LED
     loop {
         block!(timer.wait()).unwrap();
-        led.set_high().unwrap();
+        led.set_high();
         block!(timer.wait()).unwrap();
-        led.set_low().unwrap();
+        led.set_low();
     }
 }

examples/blinky_generic.rs

@@ -9,8 +9,7 @@ use panic_halt as _;
 use nb::block;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use stm32f1xx_hal::{pac, prelude::*, timer::Timer};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*, timer::Timer};
 
 #[entry]
 fn main() -> ! {
@@ -39,11 +38,11 @@ fn main() -> ! {
     loop {
         block!(timer.wait()).unwrap();
         for led in leds.iter_mut() {
-            led.set_high().unwrap();
+            led.set_high();
         }
         block!(timer.wait()).unwrap();
         for led in leds.iter_mut() {
-            led.set_low().unwrap();
+            led.set_low();
         }
     }
 }

examples/blinky_rtc.rs

@@ -12,10 +12,9 @@
 
 use panic_halt as _;
 
-use stm32f1xx_hal::{pac, prelude::*, rtc::Rtc};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*, rtc::Rtc};
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
 use nb::block;
 
 #[entry]
@@ -43,10 +42,10 @@ fn main() -> ! {
         rtc.set_alarm(5);
         block!(rtc.wait_alarm()).unwrap();
         if led_on {
-            led.set_low().unwrap();
+            led.set_low();
             led_on = false;
         } else {
-            led.set_high().unwrap();
+            led.set_high();
             led_on = true;
         }
     }

examples/blinky_rtcalarm_irq.rs

@@ -15,7 +15,7 @@ use panic_halt as _;
 use stm32f1xx_hal as hal;
 
 use crate::hal::{
-    gpio::{gpioc, Output, PushPull},
+    gpio::{gpioc, infallible::*, Output, PushPull},
     pac::{interrupt, Interrupt, Peripherals, EXTI},
     prelude::*,
     rtc::Rtc,
@@ -24,7 +24,6 @@ use crate::hal::{
 use core::cell::RefCell;
 use cortex_m::{asm::wfi, interrupt::Mutex};
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
 
 // A type definition for the GPIO pin to be used for our LED
 type LEDPIN = gpioc::PC13<Output<PushPull>>;

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, infallible::*, Output, PushPull},
     pac::{interrupt, Interrupt, Peripherals, TIM2},
     prelude::*,
     timer::{CountDownTimer, Event, Timer},
@@ -24,7 +24,6 @@ use crate::hal::{
 use core::cell::RefCell;
 use cortex_m::{asm::wfi, interrupt::Mutex};
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
 
 // NOTE You can uncomment 'hprintln' here and in the code below for a bit more
 // verbosity at runtime, at the cost of throwing off the timing of the blink

examples/can-loopback.rs

@@ -11,9 +11,8 @@ use bxcan::{
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
 use nb::block;
-use stm32f1xx_hal::{can::Can, pac, prelude::*};
+use stm32f1xx_hal::{can::Can, gpio::infallible::*, pac, prelude::*};
 
 #[entry]
 fn main() -> ! {
@@ -111,7 +110,7 @@ fn main() -> ! {
 
     let mut gpiob = dp.GPIOB.split(&mut rcc.apb2);
     let mut led = gpiob.pb9.into_push_pull_output(&mut gpiob.crh);
-    led.set_high().unwrap();
+    led.set_high();
 
     loop {}
 }

examples/delay.rs

@@ -7,8 +7,7 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use stm32f1xx_hal::{delay::Delay, pac, prelude::*};
+use stm32f1xx_hal::{delay::Delay, gpio::infallible::*, pac, prelude::*};
 
 #[entry]
 fn main() -> ! {
@@ -34,9 +33,9 @@ fn main() -> ! {
     let mut delay = Delay::new(cp.SYST, clocks);
 
     loop {
-        led.set_high().unwrap();
+        led.set_high();
         delay.delay_ms(1_000_u16);
-        led.set_low().unwrap();
+        led.set_low();
         delay.delay_ms(1_000_u16);
     }
 }

examples/exti.rs

@@ -12,7 +12,7 @@ use core::mem::MaybeUninit;
 use cortex_m_rt::entry;
 use pac::interrupt;
 use stm32f1xx_hal::gpio::*;
-use stm32f1xx_hal::{pac, prelude::*};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*};
 
 // These two are owned by the ISR. main() may only access them during the initialization phase,
 // where the interrupt is not yet enabled (i.e. no concurrent accesses can occur).
@@ -29,7 +29,7 @@ fn EXTI9_5() {
     let int_pin = unsafe { &mut *INT_PIN.as_mut_ptr() };
 
     if int_pin.check_interrupt() {
-        led.toggle().unwrap();
+        led.toggle();
 
         // if we don't clear this bit, the ISR would trigger indefinitely
         int_pin.clear_interrupt_pending_bit();

examples/led.rs

@@ -16,8 +16,7 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use stm32f1xx_hal::{pac, prelude::*};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*};
 
 #[entry]
 fn main() -> ! {
@@ -27,25 +26,13 @@ fn main() -> ! {
     let mut gpioc = p.GPIOC.split(&mut rcc.apb2);
 
     #[cfg(feature = "stm32f100")]
-    gpioc
-        .pc9
-        .into_push_pull_output(&mut gpioc.crh)
-        .set_high()
-        .unwrap();
+    gpioc.pc9.into_push_pull_output(&mut gpioc.crh).set_high();
 
     #[cfg(feature = "stm32f101")]
-    gpioc
-        .pc9
-        .into_push_pull_output(&mut gpioc.crh)
-        .set_high()
-        .unwrap();
+    gpioc.pc9.into_push_pull_output(&mut gpioc.crh).set_high();
 
     #[cfg(any(feature = "stm32f103", feature = "stm32f105", feature = "stm32f107"))]
-    gpioc
-        .pc13
-        .into_push_pull_output(&mut gpioc.crh)
-        .set_low()
-        .unwrap();
+    gpioc.pc13.into_push_pull_output(&mut gpioc.crh).set_low();
 
     loop {}
 }

examples/mfrc522.rs

@@ -7,9 +7,9 @@ use panic_itm as _;
 use cortex_m::iprintln;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::{v1_compat::OldOutputPin, v2::OutputPin};
+use embedded_hal::digital::v1_compat::OldOutputPin;
 use mfrc522::Mfrc522;
-use stm32f1xx_hal::{pac, prelude::*, spi::Spi};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*, spi::Spi};
 
 #[entry]
 fn main() -> ! {
@@ -42,7 +42,7 @@ fn main() -> ! {
     let mut mfrc522 = Mfrc522::new(spi, OldOutputPin::from(nss)).unwrap();
 
     let mut led = gpioc.pc13.into_push_pull_output(&mut gpioc.crh);
-    led.set_high().unwrap();
+    led.set_high();
 
     loop {
         if let Ok(atqa) = mfrc522.reqa() {

examples/multi_mode_gpio.rs

@@ -8,8 +8,12 @@ use nb::block;
 
 use cortex_m_rt::entry;
 use cortex_m_semihosting::hprintln;
-use embedded_hal::digital::v2::{InputPin, OutputPin};
-use stm32f1xx_hal::{gpio::State, pac, prelude::*, timer::Timer};
+use stm32f1xx_hal::{
+    gpio::{infallible::*, State},
+    pac,
+    prelude::*,
+    timer::Timer,
+};
 
 #[entry]
 fn main() -> ! {
@@ -37,16 +41,16 @@ fn main() -> ! {
     // Wait for the timer to trigger an update and change the state of the LED
     loop {
         block!(timer.wait()).unwrap();
-        hprintln!("{}", pin.is_high().unwrap()).unwrap();
+        hprintln!("{}", pin.is_high()).unwrap();
         pin.as_push_pull_output(&mut gpioc.crh, |out| {
-            out.set_high().unwrap();
+            out.set_high();
             block!(timer.wait()).unwrap();
-            out.set_low().unwrap();
+            out.set_low();
             block!(timer.wait()).unwrap();
         });
         pin.as_push_pull_output_with_state(&mut gpioc.crh, State::High, |out| {
             block!(timer.wait()).unwrap();
-            out.set_low().unwrap();
+            out.set_low();
             block!(timer.wait()).unwrap();
         });
     }

examples/nojtag.rs

@@ -7,7 +7,7 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use stm32f1xx_hal::{pac, prelude::*};
+use stm32f1xx_hal::{gpio::infallible::*, pac, prelude::*};
 
 #[entry]
 fn main() -> ! {
@@ -25,9 +25,9 @@ fn main() -> ! {
     let mut pb4 = pb4.into_push_pull_output(&mut gpiob.crl);
 
     loop {
-        pa15.toggle().unwrap();
-        pb3.toggle().unwrap();
-        pb4.toggle().unwrap();
+        pa15.toggle();
+        pb3.toggle();
+        pb4.toggle();
         cortex_m::asm::delay(8_000_000);
     }
 }

examples/timer-interrupt-rtic.rs

@@ -13,8 +13,8 @@ use panic_halt as _;
 
 use rtic::app;
 
-use embedded_hal::digital::v2::OutputPin;
 use stm32f1xx_hal::{
+    gpio::infallible::*,
     gpio::{gpioc::PC13, Output, PushPull, State},
     pac,
     prelude::*,
@@ -85,10 +85,10 @@ const APP: () = {
 
         if *cx.resources.led_state {
             // Uses resources managed by rtic to turn led off (on bluepill)
-            cx.resources.led.set_high().unwrap();
+            cx.resources.led.set_high();
             *cx.resources.led_state = false;
         } else {
-            cx.resources.led.set_low().unwrap();
+            cx.resources.led.set_low();
             *cx.resources.led_state = true;
         }
         *COUNT += 1;

examples/usb_serial.rs

@@ -13,9 +13,12 @@ extern crate panic_semihosting;
 
 use cortex_m::asm::delay;
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use stm32f1xx_hal::usb::{Peripheral, UsbBus};
-use stm32f1xx_hal::{prelude::*, stm32};
+use stm32f1xx_hal::{
+    gpio::infallible::*,
+    pac,
+    prelude::*,
+    usb::{Peripheral, UsbBus},
+};
 use usb_device::prelude::*;
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
 

examples/usb_serial_interrupt.rs

@@ -7,10 +7,12 @@ extern crate panic_semihosting;
 
 use cortex_m::asm::{delay, wfi};
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use stm32f1xx_hal::pac::{interrupt, Interrupt};
-use stm32f1xx_hal::usb::{Peripheral, UsbBus, UsbBusType};
-use stm32f1xx_hal::{prelude::*, stm32};
+use stm32f1xx_hal::{
+    gpio::infallible::*,
+    pac::{self, interrupt, Interrupt},
+    prelude::*,
+    usb::{Peripheral, UsbBus, UsbBusType},
+};
 use usb_device::{bus::UsbBusAllocator, prelude::*};
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
 

examples/usb_serial_rtic.rs

@@ -7,10 +7,12 @@
 extern crate panic_semihosting;
 
 use cortex_m::asm::delay;
-use embedded_hal::digital::v2::OutputPin;
 use rtic::app;
-use stm32f1xx_hal::prelude::*;
-use stm32f1xx_hal::usb::{Peripheral, UsbBus, UsbBusType};
+use stm32f1xx_hal::{
+    gpio::infallible::*,
+    prelude::*,
+    usb::{Peripheral, UsbBus, UsbBusType},
+};
 use usb_device::bus;
 use usb_device::prelude::*;
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
@@ -45,7 +47,7 @@ const APP: () = {
         // This forced reset is needed only for development, without it host
         // will not reset your device when you upload new firmware.
         let mut usb_dp = gpioa.pa12.into_push_pull_output(&mut gpioa.crh);
-        usb_dp.set_low().unwrap();
+        usb_dp.set_low();
         delay(clocks.sysclk().0 / 100);
 
         let usb_dm = gpioa.pa11;