Move i2c mappings to pin_mappings

Author: david-sawatzke

src/i2c.rs

@@ -20,88 +20,6 @@ pub struct I2c<I2C, SCLPIN, SDAPIN> {
 pub trait SclPin<I2C> {}
 pub trait SdaPin<I2C> {}
 
-#[allow(unused)]
-macro_rules! i2c_pins {
-    ($($I2C:ident => {
-        scl => [$($scl:ty),+ $(,)*],
-        sda => [$($sda:ty),+ $(,)*],
-    })+) => {
-        $(
-            $(
-                impl SclPin<crate::stm32::$I2C> for $scl {}
-            )+
-            $(
-                impl SdaPin<crate::stm32::$I2C> for $sda {}
-            )+
-        )+
-    }
-}
-
-#[cfg(any(feature = "stm32f030", feature = "stm32f042"))]
-i2c_pins! {
-    I2C1 => {
-        scl => [gpioa::PA11<Alternate<AF5>>, gpiob::PB6<Alternate<AF1>>, gpiob::PB8<Alternate<AF1>>],
-        sda => [gpioa::PA12<Alternate<AF5>>, gpiob::PB7<Alternate<AF1>>, gpiob::PB9<Alternate<AF1>>],
-    }
-}
-#[cfg(any(
-    feature = "stm32f030x6",
-    feature = "stm32f030xc",
-    feature = "stm32f042",
-))]
-i2c_pins! {
-    I2C1 => {
-        scl => [gpioa::PA9<Alternate<AF4>>],
-        sda => [gpioa::PA10<Alternate<AF4>>],
-    }
-}
-#[cfg(any(feature = "stm32f042", feature = "stm32f030x6"))]
-i2c_pins! {
-    I2C1 => {
-        scl => [gpiob::PB10<Alternate<AF1>>],
-        sda => [gpiob::PB11<Alternate<AF1>>],
-    }
-}
-#[cfg(any(feature = "stm32f042", feature = "stm32f030xc"))]
-i2c_pins! {
-    I2C1 => {
-        scl => [gpiob::PB13<Alternate<AF5>>, gpiof::PF1<Alternate<AF1>>],
-        sda => [gpiob::PB14<Alternate<AF5>>, gpiof::PF0<Alternate<AF1>>],
-    }
-}
-#[cfg(feature = "stm32f070")]
-i2c_pins! {
-    I2C1 => {
-        scl => [gpiob::PB6<Alternate<AF1>>, gpiob::PB8<Alternate<AF1>>],
-        sda => [gpiob::PB7<Alternate<AF1>>, gpiob::PB9<Alternate<AF1>>],
-    }
-}
-#[cfg(feature = "stm32f070x6")]
-i2c_pins! {
-    I2C1 => {
-        scl => [gpioa::PA9<Alternate<AF4>>, gpiof::PF0<Alternate<AF1>>],
-        sda => [gpioa::PA10<Alternate<AF4>>, gpiof::PF1<Alternate<AF1>>],
-    }
-}
-#[cfg(any(
-    feature = "stm32f030x8",
-    feature = "stm32f030xc",
-    feature = "stm32f070xb"
-))]
-i2c_pins! {
-    I2C2 => {
-        scl => [gpiob::PB10<Alternate<AF1>>],
-        sda => [gpiob::PB11<Alternate<AF1>>],
-    }
-}
-#[cfg(any(feature = "stm32f030xc", feature = "stm32f070xb"))]
-i2c_pins! {
-    I2C2 => {
-        scl => [gpiob::PB13<Alternate<AF5>>],
-        sda => [gpiob::PB14<Alternate<AF5>>],
-    }
-}
-
 #[derive(Debug)]
 pub enum Error {
     OVERRUN,

src/pin_mappings.rs

@@ -8,7 +8,11 @@ use crate::gpio::gpioc::*;
 #[cfg(feature = "stm32f030xc")]
 use crate::gpio::gpiod::*;
 #[allow(unused)]
+#[cfg(feature = "device-selected")]
+use crate::gpio::gpiof::*;
+#[allow(unused)]
 use crate::gpio::{Alternate, AF0, AF1, AF2, AF4, AF5};
+use crate::i2c::*;
 use crate::serial::*;
 use crate::spi::*;
 #[cfg(feature = "device-selected")]
@@ -36,8 +40,22 @@ pins! {
     PB3 => {AF0: SckPin<SPI1>},
     PB4 => {AF0: MisoPin<SPI1>},
     PB5 => {AF0: MosiPin<SPI1>},
-    PB6 => {AF0: TxPin<USART1>},
-    PB7 => {AF0: RxPin<USART1>}
+    PB6 => {
+        AF0: TxPin<USART1>,
+        AF1: SclPin<I2C1>
+    },
+    PB7 => {
+        AF0: RxPin<USART1>,
+        AF1: SdaPin<I2C1>
+    },
+    PB8 => {AF1: SclPin<I2C1>},
+    PB9 => {AF1: SdaPin<I2C1>}
+}
+
+#[cfg(any(feature = "stm32f030", feature = "stm32f042"))]
+pins! {
+    PA11 => {AF5: SclPin<I2C1>},
+    PA12 => {AF5: SdaPin<I2C1>}
 }
 
 #[cfg(feature = "stm32f030x6")]
@@ -109,3 +127,47 @@ pins! {
     PB14 => {AF0: MisoPin<SPI2>},
     PB15 => {AF0: MosiPin<SPI2>}
 }
+
+#[cfg(any(
+    feature = "stm32f030x6",
+    feature = "stm32f030xc",
+    feature = "stm32f042",
+    feature = "stm32f070x6",
+))]
+pins! {
+    PA9 => {AF4: SclPin<I2C1>},
+    PA10 => {AF4: SdaPin<I2C1>}
+}
+
+#[cfg(any(
+    feature = "stm32f042",
+    feature = "stm32f030x6",
+    feature = "stm32f030x8",
+    feature = "stm32f030xc",
+    feature = "stm32f070xb"
+))]
+pins! {
+    PB10 => {AF1: SclPin<I2C1>},
+    PB11 => {AF1: SdaPin<I2C1>}
+}
+
+#[cfg(any(
+    feature = "stm32f042",
+    feature = "stm32f030xc",
+    feature = "stm32f070x6",
+))]
+pins! {
+    PF1 => {AF1: SclPin<I2C1>},
+    PF0 => {AF1: SdaPin<I2C1>}
+}
+
+#[cfg(any(
+    feature = "stm32f042",
+    feature = "stm32f030xc",
+    feature = "stm32f030xc",
+    feature = "stm32f070xb"
+))]
+pins! {
+    PB13 => {AF5: SclPin<I2C1>},
+    PB14 => {AF5: SdaPin<I2C1>}
+}