Merge pull request #176 from burrbull/gpio-update

update gpio

Author: eldruin

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- Update gpios: add `DynamicPin`, add default modes, reexport pins, resort generics, etc.
 - Improved RCC infrastructure.
 - RTC support has been rewritten.
 - Bump `bxcan` dependency version.

Cargo.toml

@@ -1,9 +1,11 @@
 [package]
+edition = "2021"
+rust-version = "1.59"
+
 authors = ["Matt Vertescher <[email protected]>"]
 categories = ["embedded", "hardware-support", "no-std"]
 description = "HAL for the STM32F7xx family of microcontrollers"
 documentation = "https://docs.rs/stm32f7xx-hal"
-edition = "2018"
 keywords = ["arm", "cortex-m", "stm32f7xx", "hal"]
 license = "MIT OR Apache-2.0"
 name = "stm32f7xx-hal"

src/adc.rs

@@ -4,8 +4,7 @@
 
 use crate::rcc::{Clocks, Enable, Reset, APB2};
 
-use crate::gpio::Analog;
-use crate::gpio::{gpioa, gpiob, gpioc, gpiof};
+use crate::gpio::{self, Analog};
 
 use crate::pac::{ADC1, ADC2, ADC3, ADC_COMMON};
 
@@ -104,60 +103,60 @@ macro_rules! adc_pins {
 // See "Datasheet - production data"
 // Pinouts and pin description (page 66..)
 adc_pins!(ADC1,
-    gpioa::PA0<Analog> => 0_u8,
-    gpioa::PA1<Analog> => 1_u8,
-    gpioa::PA2<Analog> => 2_u8,
-    gpioa::PA3<Analog> => 3_u8,
-    gpioa::PA4<Analog> => 4_u8,
-    gpioa::PA5<Analog> => 5_u8,
-    gpioa::PA6<Analog> => 6_u8,
-    gpioa::PA7<Analog> => 7_u8,
-    gpiob::PB0<Analog>  => 8_u8,
-    gpiob::PB1<Analog>  => 9_u8,
-    gpioc::PC0<Analog>  => 10_u8,
-    gpioc::PC1<Analog>  => 11_u8,
-    gpioc::PC2<Analog>  => 12_u8,
-    gpioc::PC3<Analog>  => 13_u8,
-    gpioc::PC4<Analog>  => 14_u8,
-    gpioc::PC5<Analog>  => 15_u8,
+    gpio::PA0<Analog> => 0_u8,
+    gpio::PA1<Analog> => 1_u8,
+    gpio::PA2<Analog> => 2_u8,
+    gpio::PA3<Analog> => 3_u8,
+    gpio::PA4<Analog> => 4_u8,
+    gpio::PA5<Analog> => 5_u8,
+    gpio::PA6<Analog> => 6_u8,
+    gpio::PA7<Analog> => 7_u8,
+    gpio::PB0<Analog>  => 8_u8,
+    gpio::PB1<Analog>  => 9_u8,
+    gpio::PC0<Analog>  => 10_u8,
+    gpio::PC1<Analog>  => 11_u8,
+    gpio::PC2<Analog>  => 12_u8,
+    gpio::PC3<Analog>  => 13_u8,
+    gpio::PC4<Analog>  => 14_u8,
+    gpio::PC5<Analog>  => 15_u8,
 );
 
 adc_pins!(ADC2,
-    gpioa::PA0<Analog>  => 0_u8,
-    gpioa::PA1<Analog>  => 1_u8,
-    gpioa::PA2<Analog>  => 2_u8,
-    gpioa::PA3<Analog>  => 3_u8,
-    gpioa::PA4<Analog>  => 4_u8,
-    gpioa::PA5<Analog>  => 5_u8,
-    gpioa::PA6<Analog>  => 6_u8,
-    gpioa::PA7<Analog>  => 7_u8,
-    gpiob::PB0<Analog>  => 8_u8,
-    gpiob::PB1<Analog>  => 9_u8,
-    gpioc::PC0<Analog>  => 10_u8,
-    gpioc::PC1<Analog>  => 11_u8,
-    gpioc::PC2<Analog>  => 12_u8,
-    gpioc::PC3<Analog>  => 13_u8,
-    gpioc::PC4<Analog>  => 14_u8,
-    gpioc::PC5<Analog>  => 15_u8,
+    gpio::PA0<Analog>  => 0_u8,
+    gpio::PA1<Analog>  => 1_u8,
+    gpio::PA2<Analog>  => 2_u8,
+    gpio::PA3<Analog>  => 3_u8,
+    gpio::PA4<Analog>  => 4_u8,
+    gpio::PA5<Analog>  => 5_u8,
+    gpio::PA6<Analog>  => 6_u8,
+    gpio::PA7<Analog>  => 7_u8,
+    gpio::PB0<Analog>  => 8_u8,
+    gpio::PB1<Analog>  => 9_u8,
+    gpio::PC0<Analog>  => 10_u8,
+    gpio::PC1<Analog>  => 11_u8,
+    gpio::PC2<Analog>  => 12_u8,
+    gpio::PC3<Analog>  => 13_u8,
+    gpio::PC4<Analog>  => 14_u8,
+    gpio::PC5<Analog>  => 15_u8,
 );
 
 adc_pins!(ADC3,
-    gpioa::PA0<Analog> => 0_u8,
-    gpioa::PA1<Analog> => 1_u8,
-    gpioa::PA2<Analog> => 2_u8,
-    gpioa::PA3<Analog> => 3_u8,
-    gpiof::PF6<Analog> => 4_u8,
-    gpiof::PF7<Analog> => 5_u8,
-    gpiof::PF8<Analog> => 6_u8,
-    gpiof::PF9<Analog> => 7_u8,
-    gpiof::PF10<Analog> => 8_u8,
-    gpiof::PF3<Analog> => 9_u8,
-    gpioc::PC0<Analog> => 10_u8,
-    gpioc::PC1<Analog> => 11_u8,
-    gpioc::PC2<Analog> => 12_u8,
-    gpioc::PC3<Analog> => 13_u8,
-    gpiof::PF4<Analog> => 14_u8,
-    gpiof::PF5<Analog> => 15_u8,
+    gpio::PA0<Analog> => 0_u8,
+    gpio::PA1<Analog> => 1_u8,
+    gpio::PA2<Analog> => 2_u8,
+    gpio::PA3<Analog> => 3_u8,
+    gpio::PF6<Analog> => 4_u8,
+    gpio::PF7<Analog> => 5_u8,
+    gpio::PF8<Analog> => 6_u8,
+    gpio::PF9<Analog> => 7_u8,
+    gpio::PF10<Analog> => 8_u8,
+    gpio::PF3<Analog> => 9_u8,
+    gpio::PC0<Analog> => 10_u8,
+    gpio::PC1<Analog> => 11_u8,
+    gpio::PC2<Analog> => 12_u8,
+    gpio::PC3<Analog> => 13_u8,
+    gpio::PF4<Analog> => 14_u8,
+    gpio::PF5<Analog> => 15_u8,
 );
 
 ////////////////////////////////////