move IntoAf to markers

Author: burrbull

codegen/src/codegen/gpio.rs

@@ -49,6 +49,9 @@ fn merge_pins_by_port(pins: &[gpio::Pin]) -> Result<Vec<Port>> {
 
     let mut ports = Vec::new();
     for (id, mut pins) in pins_by_port {
+        pins.retain(|p| {
+            p.name != "PDR_ON" && p.name != "PC14OSC32_IN" && p.name != "PC15OSC32_OUT"
+        });
         pins.sort_by_key(|p| p.number().unwrap_or_default());
         pins.dedup_by_key(|p| p.number().unwrap_or_default());
         ports.push(Port { id, pins });

src/gpio.rs

@@ -168,6 +168,8 @@ mod marker {
     pub trait Active {}
     /// Marker trait for all pin modes except alternate
     pub trait NotAlt {}
+    /// Marker trait for pins with alternate function `A` mapping
+    pub trait IntoAf<const A: u8>: super::HL {}
 }
 
 impl marker::Readable for Input {}
@@ -230,9 +232,6 @@ pub trait HL {
     type Afr;
 }
 
-/// Marker trait for pins with alternate function `A` mapping
-pub trait IntoAf<const A: u8>: HL {}
-
 macro_rules! cr {
     ($high:literal: [$($i:literal),+]) => {
         $(
@@ -609,7 +608,7 @@ macro_rules! gpio {
         pub mod $gpiox {
             use crate::pac::$GPIOX;
             use crate::rcc::{Enable, Reset, AHB};
-            use super::{Afr, Input, MODER, OTYPER, OSPEEDR, PUPDR, IntoAf};
+            use super::{Afr, MODER, OTYPER, OSPEEDR, PUPDR};
 
             /// GPIO parts
             pub struct Parts {
@@ -660,10 +659,10 @@ macro_rules! gpio {
             $(
                 #[doc=stringify!($PXi)]
                 #[doc=" pin"]
-                pub type $PXi<MODE = Input> = super::Pin<$port_id, $i, MODE>;
+                pub type $PXi<MODE = super::Input> = super::Pin<$port_id, $i, MODE>;
 
                 $(
-                    impl<MODE> IntoAf<$A> for $PXi<MODE> { }
+                    impl<MODE> super::marker::IntoAf<$A> for $PXi<MODE> { }
                 )*
             )+
 
@@ -1197,7 +1196,7 @@ impl<const P: char> Gpio<P> {
             'G' => crate::pac::GPIOG::ptr() as _,
             #[cfg(feature = "gpio-f303e")]
             'H' => crate::pac::GPIOH::ptr() as _,
-            _ => crate::pac::GPIOA::ptr(),
+            _ => panic!("Unknown GPIO port"),
         }
     }
 }

src/gpio/convert.rs

@@ -9,7 +9,7 @@ impl<const P: char, const N: u8, MODE: PinMode> Pin<P, N, MODE> {
         _afr: &mut <Self as HL>::Afr,
     ) -> Pin<P, N, Alternate<A, PushPull>>
     where
-        Self: IntoAf<A>,
+        Self: super::marker::IntoAf<A>,
     {
         self.into_mode()
     }
@@ -22,7 +22,7 @@ impl<const P: char, const N: u8, MODE: PinMode> Pin<P, N, MODE> {
         _afr: &mut <Self as HL>::Afr,
     ) -> Pin<P, N, Alternate<A, OpenDrain>>
     where
-        Self: IntoAf<A>,
+        Self: super::marker::IntoAf<A>,
     {
         self.into_mode()
     }