Merge pull request #403 from stm32-rs/cleanups

reexport gpio, other cleanups

Author: burrbull

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Reexport gpio pins to `gpio` mod
 - Added the ability to specify the word size (8 or 9 bits) for `Serial` (USART). When using parity, the parity bit is included in the number of bits of the word.
 - `blocking::serial::Write` for `Tx` and `Serial`. `core::fmt::Write` for `Serial`
 - `Instance` for Timer's, rtic-monotonic fugit impl

examples/delay.rs

@@ -30,7 +30,7 @@ fn main() -> ! {
     #[cfg(any(feature = "stm32f103", feature = "stm32f105", feature = "stm32f107"))]
     let mut led = gpioc.pc13.into_push_pull_output(&mut gpioc.crh);
 
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
 
     loop {
         led.set_high();

examples/enc28j60-coap.rs.disabled

@@ -95,7 +95,7 @@ fn main() -> ! {
     );
 
     // ENC28J60
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
     let mut enc28j60 = Enc28j60::new(
         spi,
         ncs,

examples/enc28j60.rs.disabled

@@ -89,7 +89,7 @@ fn main() -> ! {
     // ENC28J60
     let mut reset = gpioa.pa3.into_push_pull_output(&mut gpioa.crl);
     reset.set_high();
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
     let mut enc28j60 = Enc28j60::new(
         spi,
         ncs,

examples/gpio_input.rs

@@ -53,7 +53,7 @@ fn main() -> ! {
     // The key_up for check buttons if long press.
     // if key_up is true, and buttons were not long press.
     let mut key_up: bool = true;
-    let mut delay = Delay::new(cp.SYST, clock);
+    let mut delay = Delay::new(cp.SYST, &clock);
     loop {
         let key_result = (key_0.is_low(), key_1.is_low());
         if key_up && (key_result.0 || key_result.1) {

examples/i2c-bme280/src/main.rs

@@ -80,7 +80,7 @@ fn main() -> ! {
 
     // The Adafruit boards have address 0x77 without closing the jumper on the back, the BME280 lib connects to 0x77 with `new_secondary`, use
     // `new_primary` for 0x76 if you close the jumper/solder bridge.
-    let mut bme280 = BME280::new_secondary(i2c, Delay::new(cp.SYST, clocks));
+    let mut bme280 = BME280::new_secondary(i2c, Delay::new(cp.SYST, &clocks));
     bme280
         .init()
         .map_err(|error| {

examples/mpu9250.rs.disabled

@@ -55,7 +55,7 @@ fn main() -> ! {
         clocks,
     );
 
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
 
     let mut mpu9250 = Mpu9250::marg(spi, nss, &mut delay).unwrap();
 

examples/qei.rs

@@ -39,7 +39,7 @@ fn main() -> ! {
     let c2 = gpiob.pb7;
 
     let qei = Timer::new(dp.TIM4, &clocks).qei((c1, c2), &mut afio.mapr, QeiOptions::default());
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
 
     loop {
         let before = qei.count();

src/adc.rs

@@ -6,21 +6,14 @@ use embedded_hal::adc::{Channel, OneShot};
 #[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
 use crate::dma::dma2;
 use crate::dma::{dma1, CircBuffer, Receive, RxDma, Transfer, TransferPayload, W};
-#[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
-use crate::gpio::gpiof;
-use crate::gpio::Analog;
-use crate::gpio::{gpioa, gpiob, gpioc};
+use crate::gpio::{self, Analog};
 use crate::rcc::{Clocks, Enable, Reset};
 use crate::time::kHz;
 use core::sync::atomic::{self, Ordering};
 use cortex_m::asm::delay;
 use embedded_dma::StaticWriteBuffer;
 
-#[cfg(any(feature = "stm32f103", feature = "connectivity"))]
-use crate::pac::ADC2;
-#[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl")))]
-use crate::pac::ADC3;
-use crate::pac::{ADC1, RCC};
+use crate::pac::{self, RCC};
 
 /// Continuous mode
 pub struct Continuous;
@@ -108,7 +101,7 @@ impl From<Align> for bool {
 }
 
 macro_rules! adc_pins {
-    ($ADC:ident, $($pin:ty => $chan:expr),+ $(,)*) => {
+    ($ADC:ty, $($pin:ty => $chan:expr),+ $(,)*) => {
         $(
             impl Channel<$ADC> for $pin {
                 type ID = u8;
@@ -119,60 +112,60 @@ macro_rules! adc_pins {
     };
 }
 
-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,
+adc_pins!(pac::ADC1,
+    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,
 );
 
 #[cfg(any(feature = "stm32f103", feature = "connectivity"))]
-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,
+adc_pins!(pac::ADC2,
+    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,
 );
 
 #[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
-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,
-    gpioc::PC0<Analog> => 10_u8,
-    gpioc::PC1<Analog> => 11_u8,
-    gpioc::PC2<Analog> => 12_u8,
-    gpioc::PC3<Analog> => 13_u8,
+adc_pins!(pac::ADC3,
+    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::PC0<Analog> => 10_u8,
+    gpio::PC1<Analog> => 11_u8,
+    gpio::PC2<Analog> => 12_u8,
+    gpio::PC3<Analog> => 13_u8,
 );
 
 /// Stored ADC config can be restored using the `Adc::restore_cfg` method
@@ -181,7 +174,7 @@ pub struct StoredConfig(SampleTime, Align);
 
 macro_rules! adc_hal {
     ($(
-        $ADC:ident: ($adc:ident),
+        $ADC:ty: ($adc:ident),
     )+) => {
         $(
 
@@ -279,17 +272,17 @@ macro_rules! adc_hal {
 
                 fn reset(&mut self) {
                     let rcc = unsafe { &(*RCC::ptr()) };
-                    $ADC::reset(rcc);
+                    <$ADC>::reset(rcc);
                 }
 
                 fn enable_clock(&mut self) {
                     let rcc = unsafe { &(*RCC::ptr()) };
-                    $ADC::enable(rcc);
+                    <$ADC>::enable(rcc);
                 }
 
                 fn disable_clock(&mut self) {
                     let rcc = unsafe { &(*RCC::ptr()) };
-                    $ADC::disable(rcc);
+                    <$ADC>::disable(rcc);
                 }
 
                 fn calibrate(&mut self) {
@@ -461,7 +454,7 @@ macro_rules! adc_hal {
     }
 }
 
-impl Adc<ADC1> {
+impl Adc<pac::ADC1> {
     fn read_aux(&mut self, chan: u8) -> u16 {
         let tsv_off = if self.rb.cr2.read().tsvrefe().bit_is_clear() {
             self.rb.cr2.modify(|_, w| w.tsvrefe().set_bit());
@@ -545,17 +538,17 @@ impl Adc<ADC1> {
 }
 
 adc_hal! {
-    ADC1: (adc1),
+    pac::ADC1: (adc1),
 }
 
 #[cfg(any(feature = "stm32f103", feature = "connectivity"))]
 adc_hal! {
-    ADC2: (adc2),
+    pac::ADC2: (adc2),
 }
 
 #[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
 adc_hal! {
-    ADC3: (adc3),
+    pac::ADC3: (adc3),
 }
 
 pub struct AdcPayload<ADC, PINS, MODE> {
@@ -608,7 +601,7 @@ pub trait SetChannels<PINS>: ChannelTimeSequence {
 pub type AdcDma<ADC, PINS, MODE, CHANNEL> = RxDma<AdcPayload<ADC, PINS, MODE>, CHANNEL>;
 
 macro_rules! adcdma {
-    ($ADCX:ident: (
+    ($ADCX:ty: (
         $rxdma:ident,
         $dmarxch:ty,
     )) => {
@@ -750,7 +743,7 @@ macro_rules! adcdma {
                 // until the end of the transfer.
                 let (ptr, len) = unsafe { buffer.static_write_buffer() };
                 self.channel.set_peripheral_address(
-                    unsafe { &(*$ADCX::ptr()).dr as *const _ as u32 },
+                    unsafe { &(*<$ADCX>::ptr()).dr as *const _ as u32 },
                     false,
                 );
                 self.channel.set_memory_address(ptr as u32, true);
@@ -789,7 +782,7 @@ macro_rules! adcdma {
                 // until the end of the transfer.
                 let (ptr, len) = unsafe { buffer.static_write_buffer() };
                 self.channel.set_peripheral_address(
-                    unsafe { &(*$ADCX::ptr()).dr as *const _ as u32 },
+                    unsafe { &(*<$ADCX>::ptr()).dr as *const _ as u32 },
                     false,
                 );
                 self.channel.set_memory_address(ptr as u32, true);
@@ -819,15 +812,15 @@ macro_rules! adcdma {
 }
 
 adcdma! {
-    ADC1: (
+    pac::ADC1: (
         AdcDma1,
         dma1::C1,
     )
 }
 
 #[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
 adcdma! {
-    ADC3: (
+    pac::ADC3: (
         AdcDma3,
         dma2::C5,
     )

src/afio.rs

@@ -4,9 +4,7 @@ use crate::pac::{afio, AFIO, RCC};
 use crate::rcc::{Enable, Reset};
 
 use crate::gpio::{
-    gpioa::PA15,
-    gpiob::{PB3, PB4},
-    Debugger, Floating, Input,
+    Debugger, Floating, Input, PA15, {PB3, PB4},
 };
 
 pub trait AfioExt {