usb

Author: burrbull

examples/rtic-usb-cdc-echo.rs

@@ -60,8 +60,8 @@ mod app {
             usb_global: dp.OTG_FS_GLOBAL,
             usb_device: dp.OTG_FS_DEVICE,
             usb_pwrclk: dp.OTG_FS_PWRCLK,
-            pin_dm: gpioa.pa11.into_alternate(),
-            pin_dp: gpioa.pa12.into_alternate(),
+            pin_dm: gpioa.pa11.into(),
+            pin_dp: gpioa.pa12.into(),
             hclk: clocks.hclk(),
         };
         unsafe {

examples/usb-serial-irq.rs

@@ -40,8 +40,8 @@ fn main() -> ! {
         usb_global: dp.OTG_FS_GLOBAL,
         usb_device: dp.OTG_FS_DEVICE,
         usb_pwrclk: dp.OTG_FS_PWRCLK,
-        pin_dm: gpioa.pa11.into_alternate(),
-        pin_dp: gpioa.pa12.into_alternate(),
+        pin_dm: gpioa.pa11.into(),
+        pin_dp: gpioa.pa12.into(),
         hclk: clocks.hclk(),
     };
 

examples/usb-serial-poll.rs

@@ -31,8 +31,8 @@ fn main() -> ! {
         usb_global: dp.OTG_FS_GLOBAL,
         usb_device: dp.OTG_FS_DEVICE,
         usb_pwrclk: dp.OTG_FS_PWRCLK,
-        pin_dm: gpioa.pa11.into_alternate(),
-        pin_dp: gpioa.pa12.into_alternate(),
+        pin_dm: gpioa.pa11.into(),
+        pin_dp: gpioa.pa12.into(),
         hclk: clocks.hclk(),
     };
 

src/gpio/alt.rs

@@ -2223,3 +2223,31 @@ pub mod fsmc {
     // Because external addresses are in units of 16 bits, external address line 25 can never
     // be high. The internal memory address would overflow into the next sub-bank.
 }
+
+#[cfg(feature = "otg-fs")]
+pub mod otg_fs {
+    use super::*;
+
+    pin! {
+        <Dm> for [
+            PA11<10>,
+        ],
+        <Dp> for [
+            PA12<10>,
+        ],
+    }
+}
+
+#[cfg(feature = "otg-hs")]
+pub mod otg_hs {
+    use super::*;
+
+    pin! {
+        <Dm> for [
+            PB14<12>,
+        ],
+        <Dp> for [
+            PB15<12>,
+        ],
+    }
+}

src/otg_fs.rs

@@ -5,7 +5,7 @@
 
 use crate::pac;
 
-use crate::gpio::{Alternate, PushPull, PA11, PA12};
+use crate::gpio::alt::otg_fs as alt;
 use crate::rcc::{Enable, Reset};
 use fugit::HertzU32 as Hertz;
 
@@ -16,8 +16,8 @@ pub struct USB {
     pub usb_global: pac::OTG_FS_GLOBAL,
     pub usb_device: pac::OTG_FS_DEVICE,
     pub usb_pwrclk: pac::OTG_FS_PWRCLK,
-    pub pin_dm: PA11<Alternate<10, PushPull>>,
-    pub pin_dp: PA12<Alternate<10, PushPull>>,
+    pub pin_dm: alt::Dm,
+    pub pin_dp: alt::Dp,
     pub hclk: Hertz,
 }
 

src/otg_hs.rs

@@ -8,7 +8,7 @@
 
 use crate::pac;
 
-use crate::gpio::{Alternate, PushPull, PB14, PB15};
+use crate::gpio::alt::otg_hs as alt;
 use crate::rcc::{Enable, Reset};
 use fugit::HertzU32 as Hertz;
 
@@ -19,8 +19,8 @@ pub struct USB {
     pub usb_global: pac::OTG_HS_GLOBAL,
     pub usb_device: pac::OTG_HS_DEVICE,
     pub usb_pwrclk: pac::OTG_HS_PWRCLK,
-    pub pin_dm: PB14<Alternate<12, PushPull>>,
-    pub pin_dp: PB15<Alternate<12, PushPull>>,
+    pub pin_dm: alt::Dm,
+    pub pin_dp: alt::Dp,
     pub hclk: Hertz,
 }