spi unmacro

stm32-rs · Apr 17, 2023 · 57a03a5 · 57a03a5
1 parent 4093bd8
commit 57a03a5
Show file tree

Hide file tree

Showing 4 changed files with 723 additions and 841 deletions.
diff --git a/examples/spi-dma.rs b/examples/spi-dma.rs
@@ -70,7 +70,7 @@ fn main() -> ! {
     info!("");
 
     // Initialise the SPI peripheral.
-    let spi: spi::Spi<_, _, u8> = dp.SPI2.spi(
+    let spi = dp.SPI2.spi::<_, u8>(
         (sck, miso, mosi),
         spi::MODE_0,
         1.MHz(),

diff --git a/examples/spi_hardware_cs.rs b/examples/spi_hardware_cs.rs
@@ -44,11 +44,11 @@ fn main() -> ! {
     // GPIOA in the RCC register.
     let gpioa = dp.GPIOA.split(ccdr.peripheral.GPIOA);
 
-    let sck = gpioa.pa5.into_alternate::<5>();
-    let miso = gpioa.pa6.into_alternate();
-    let mosi = gpioa.pa7.into_alternate();
+    let sck = gpioa.pa5;
+    let miso = gpioa.pa6;
+    let mosi = gpioa.pa7;
     // Because we want to use the hardware chip select, we need to provide that too
-    let hcs = gpioa.pa4.into_alternate();
+    let hcs = gpioa.pa4;
 
     info!("");
     info!("stm32h7xx-hal example - SPI");

diff --git a/src/gpio/alt.rs b/src/gpio/alt.rs
@@ -2435,8 +2435,8 @@ pub mod spi1 {
             PD7<5>,
         ],
         <Nss> for [
-            PA15<5>,
             PA4<5>,
+            PA15<5>,
             PG10<5>,
         ],
     }
@@ -2446,8 +2446,8 @@ pub mod spi2 {
     use super::*;
     pin! {
         <Sck> for no:NoPin, [
-            PA12<5>,
             PA9<5>,
+            PA12<5>,
             PB10<5>,
             PB13<5>,
             PD3<5>,
@@ -2458,7 +2458,7 @@ pub mod spi2 {
         <Miso> for no:NoPin, [
             PB14<5>,
 
-            #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))]
+            // #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))] TODO: check
             PC2<5>,
             #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))]
             PI2<5>,
@@ -2467,15 +2467,15 @@ pub mod spi2 {
             PB15<5>,
             PC1<5>,
 
-            #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))]
+            // #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))] TODO: check
             PC3<5>,
             #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))]
             PI3<5>,
         ],
         <Nss> for [
             PA11<5>,
-            PB12<5>,
             PB4<7>,
+            PB12<5>,
             PB9<5>,
 
             #[cfg(any(feature = "gpio-h747", feature = "gpio-h7a2"))]