Merge pull request #145 from burrbull/gpio

port gpio from f4-hal

Author: hannobraun

Cargo.toml

@@ -67,15 +67,15 @@ stm32f723 = ["stm32f7/stm32f7x3", "device-selected", "usb_hs_phy"]
 stm32f730 = ["stm32f7/stm32f730", "device-selected", "usb_hs_phy", "fmc"]
 stm32f732 = ["stm32f7/stm32f7x2", "device-selected"]
 stm32f733 = ["stm32f7/stm32f7x3", "device-selected", "usb_hs_phy"]
-stm32f745 = ["stm32f7/stm32f745", "device-selected", "fmc"]
-stm32f746 = ["stm32f7/stm32f7x6", "device-selected", "ltdc", "fmc", "has-can"]
-stm32f756 = ["stm32f7/stm32f7x6", "device-selected", "ltdc", "fmc"]
-stm32f765 = ["stm32f7/stm32f765", "device-selected", "fmc"]
-stm32f767 = ["stm32f7/stm32f7x7", "device-selected", "ltdc", "fmc"]
-stm32f769 = ["stm32f7/stm32f7x9", "device-selected", "ltdc", "fmc"]
-stm32f777 = ["stm32f7/stm32f7x7", "device-selected", "ltdc", "fmc"]
-stm32f778 = ["stm32f7/stm32f7x9", "device-selected", "ltdc", "fmc"]
-stm32f779 = ["stm32f7/stm32f7x9", "device-selected", "ltdc", "fmc"]
+stm32f745 = ["stm32f7/stm32f745", "device-selected", "gpioj", "gpiok", "fmc"]
+stm32f746 = ["stm32f7/stm32f7x6", "device-selected", "gpioj", "gpiok", "ltdc", "fmc", "has-can"]
+stm32f756 = ["stm32f7/stm32f7x6", "device-selected", "gpioj", "gpiok", "ltdc", "fmc"]
+stm32f765 = ["stm32f7/stm32f765", "device-selected", "gpioj", "gpiok", "fmc"]
+stm32f767 = ["stm32f7/stm32f7x7", "device-selected", "gpioj", "gpiok", "ltdc", "fmc"]
+stm32f769 = ["stm32f7/stm32f7x9", "device-selected", "gpioj", "gpiok", "ltdc", "fmc"]
+stm32f777 = ["stm32f7/stm32f7x7", "device-selected", "gpioj", "gpiok", "ltdc", "fmc"]
+stm32f778 = ["stm32f7/stm32f7x9", "device-selected", "gpioj", "gpiok", "ltdc", "fmc"]
+stm32f779 = ["stm32f7/stm32f7x9", "device-selected", "gpioj", "gpiok", "ltdc", "fmc"]
 
 fmc_lcd = ["display-interface"]
 
@@ -84,6 +84,9 @@ usb_hs = ["synopsys-usb-otg", "synopsys-usb-otg/hs"]
 
 has-can = []
 
+gpioj = []
+gpiok = []
+
 [profile.dev]
 incremental = false
 codegen-units = 1

examples/blinky.rs

@@ -21,10 +21,10 @@ fn main() -> ! {
 
     loop {
         for _ in 0..10_000 {
-            led.set_high().expect("GPIO can never fail");
+            led.set_high();
         }
         for _ in 0..10_000 {
-            led.set_low().expect("GPIO can never fail");
+            led.set_low();
         }
     }
 }

examples/blinky_delay.rs

@@ -28,10 +28,10 @@ fn main() -> ! {
     let mut delay = Delay::new(cp.SYST, clocks);
 
     loop {
-        led.set_high().expect("GPIO can never fail");
+        led.set_high();
         delay.delay_ms(500_u16);
 
-        led.set_low().expect("GPIO can never fail");
+        led.set_low();
         delay.delay_ms(500_u16);
     }
 }

examples/can-echo.rs

@@ -36,8 +36,8 @@ fn main() -> ! {
     let gpiob = dp.GPIOB.split();
 
     let mut can1 = {
-        let rx = gpioa.pa11.into_alternate_af9();
-        let tx = gpioa.pa12.into_alternate_af9();
+        let rx = gpioa.pa11.into_alternate();
+        let tx = gpioa.pa12.into_alternate();
 
         let can = Can::new(dp.CAN1, &mut rcc.apb1, (tx, rx));
         bxcan::Can::new(can)
@@ -53,8 +53,8 @@ fn main() -> ! {
     filters.enable_bank(0, Mask32::accept_all());
 
     let _can2 = {
-        let rx = gpiob.pb5.into_alternate_af9();
-        let tx = gpiob.pb6.into_alternate_af9();
+        let rx = gpiob.pb5.into_alternate();
+        let tx = gpiob.pb6.into_alternate();
 
         let can = Can::new(dp.CAN2, &mut rcc.apb1, (tx, rx));
 

examples/can-loopback.rs

@@ -36,8 +36,8 @@ fn main() -> ! {
 
     let gpioa = dp.GPIOA.split();
 
-    let rx = gpioa.pa11.into_alternate_af9();
-    let tx = gpioa.pa12.into_alternate_af9();
+    let rx = gpioa.pa11.into_alternate();
+    let tx = gpioa.pa12.into_alternate();
 
     let can = Can::new(dp.CAN1, &mut rcc.apb1, (tx, rx));
 

examples/exti_button.rs

@@ -62,11 +62,7 @@ fn main() -> ! {
         free(|cs| {
             if SEMAPHORE.borrow(cs).get() == false {
                 // Toggle debug LED
-                if let Ok(true) = led1.is_low() {
-                    led1.set_high().ok();
-                } else {
-                    led1.set_low().ok();
-                }
+                led1.toggle();
 
                 SEMAPHORE.borrow(cs).set(true);
             }

examples/fmc.rs

@@ -30,7 +30,7 @@ macro_rules! fmc_pins {
             $(
                 $pin.into_push_pull_output()
                     .set_speed(Speed::VeryHigh)
-                    .into_alternate_af12()
+                    .into_alternate()
                     .internal_pull_up(true)
             ),*
         )

examples/serial_delay.rs

@@ -32,8 +32,8 @@ fn main() -> ! {
     let gpioa = p.GPIOA.split();
     let gpiob = p.GPIOB.split();
 
-    let tx = gpioa.pa9.into_alternate_af7();
-    let rx = gpiob.pb7.into_alternate_af7();
+    let tx = gpioa.pa9.into_alternate();
+    let rx = gpiob.pb7.into_alternate();
 
     let serial = Serial::new(
         p.USART1,

examples/serial_dma.rs

@@ -39,8 +39,8 @@ fn main() -> ! {
 
     let gpiod = p.GPIOD.split();
 
-    let tx = gpiod.pd8.into_alternate_af7();
-    let rx = gpiod.pd9.into_alternate_af7();
+    let tx = gpiod.pd8.into_alternate();
+    let rx = gpiod.pd9.into_alternate();
 
     let serial = Serial::new(
         p.USART3,

examples/serial_echo.rs

@@ -28,8 +28,8 @@ fn main() -> ! {
     let gpioa = p.GPIOA.split();
     let gpiob = p.GPIOB.split();
 
-    let tx = gpioa.pa9.into_alternate_af7();
-    let rx = gpiob.pb7.into_alternate_af7();
+    let tx = gpioa.pa9.into_alternate();
+    let rx = gpiob.pb7.into_alternate();
 
     let serial = Serial::new(
         p.USART1,