Merge pull request #609 from stm32-rs/spi_slave

split master/slave spi structures

Author: burrbull

CHANGELOG.md

@@ -7,8 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
- - Simplify `gpio::Outport`
- - Split USART and UART implementations
+ - Simplify `gpio::Outport` [#611]
+ - Split SPI master and slave implementations [#609]
+ - Split USART and UART implementations [#608]
  - Add `lapce` editor settings [#601]
  - Use `enum`s for alternate peripheral pins [#594] [#610]
  - Added missing U(S)ART DMA traits for HAL serial types [#593]
@@ -27,6 +28,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#601]: https://github.com/stm32-rs/stm32f4xx-hal/pull/601
 [#603]: https://github.com/stm32-rs/stm32f4xx-hal/pull/603
 [#610]: https://github.com/stm32-rs/stm32f4xx-hal/pull/610
+[#608]: https://github.com/stm32-rs/stm32f4xx-hal/pull/608
+[#609]: https://github.com/stm32-rs/stm32f4xx-hal/pull/609
+[#611]: https://github.com/stm32-rs/stm32f4xx-hal/pull/611
 
 ## [v0.15.0] - 2023-03-13
 

examples/rtic-spi-slave-dma.rs

@@ -16,7 +16,7 @@ mod app {
         pac::{DMA1, SPI3},
         prelude::*,
         rcc::RccExt,
-        spi::{Rx, Spi, Tx},
+        spi::{Rx, SpiSlave, Tx},
     };
     use panic_semihosting as _;
     use systick_monotonic::*;
@@ -56,7 +56,7 @@ mod app {
 
         let rcc = device_peripherals.RCC;
         let rcc = rcc.constrain();
-        let clocks = rcc.cfgr.sysclk(100.MHz()).pclk1(36.MHz()).freeze();
+        let _clocks = rcc.cfgr.sysclk(100.MHz()).pclk1(36.MHz()).freeze();
 
         let mono = Systick::new(core.SYST, 100_000_000);
 
@@ -77,7 +77,8 @@ mod app {
             phase: Phase::CaptureOnFirstTransition,
         };
 
-        let spi3 = Spi::new_slave(spi, (sck, miso, mosi), mode, 8_000_000.Hz(), &clocks);
+        let mut spi3 = SpiSlave::new(spi, (sck, miso, mosi, None), mode);
+        spi3.set_internal_nss(false);
 
         let (tx, rx) = spi3.use_dma().txrx();
 

examples/spi_slave.rs

@@ -0,0 +1,49 @@
+#![no_main]
+#![no_std]
+
+use panic_halt as _;
+
+use crate::hal::spi::{Mode, Phase, Polarity};
+use crate::hal::{gpio::Pull, pac, prelude::*};
+use cortex_m::asm;
+use cortex_m_rt::entry;
+use stm32f4xx_hal as hal;
+
+/// SPI mode
+pub const MODE: Mode = Mode {
+    phase: Phase::CaptureOnFirstTransition,
+    polarity: Polarity::IdleLow,
+};
+
+#[entry]
+fn main() -> ! {
+    let p = pac::Peripherals::take().unwrap();
+
+    let rcc = p.RCC.constrain();
+    let _clocks = rcc.cfgr.freeze();
+
+    let gpioa = p.GPIOA.split();
+
+    let sck = gpioa.pa5.internal_resistor(Pull::Up);
+    let miso = gpioa.pa6.internal_resistor(Pull::Down);
+    let mosi = gpioa.pa7.internal_resistor(Pull::Down);
+
+    // clock speed is determined by the master
+    let nss = gpioa.pa4.internal_resistor(Pull::Up).into();
+    let mut spi = p.SPI1.spi_slave((sck, miso, mosi, Some(nss)), MODE);
+    // alternativelly you could use software `chip select`
+    // let mut spi = SpiSlave::new(p.SPI1, (sck, miso, mosi, None), MODE);
+    // spi.set_internal_nss(false);
+
+    let mut data = [0x1];
+    // this will block until the master starts the clock
+    spi.transfer_in_place(&mut data).unwrap();
+
+    // when you reach this breakpoint you'll be able to inspect the variable `data` which contains the
+    // data sent by the master
+    asm::bkpt();
+
+    loop {
+        continue;
+    }
+}

src/gpio/alt.rs

@@ -427,21 +427,7 @@ pub mod spi1 {
         ],
 
         <Nss> for [
-            #[cfg(any(
-                feature = "gpio-f410",
-                feature = "gpio-f411",
-                feature = "gpio-f412",
-                feature = "gpio-f413",
-                feature = "gpio-f446"
-            ))]
             PA4<5>,
-            #[cfg(any(
-                feature = "gpio-f410",
-                feature = "gpio-f411",
-                feature = "gpio-f412",
-                feature = "gpio-f413",
-                feature = "gpio-f446"
-            ))]
             PA15<5>,
         ],
     }

src/prelude.rs

@@ -40,12 +40,8 @@ pub use embedded_hal::adc::OneShot as _embedded_hal_adc_OneShot;
 pub use embedded_hal::blocking::delay::DelayMs as _embedded_hal_blocking_delay_DelayMs;
 pub use embedded_hal::blocking::delay::DelayUs as _embedded_hal_blocking_delay_DelayUs;
 pub use embedded_hal::blocking::serial::Write as _embedded_hal_blocking_serial_Write;
-pub use embedded_hal::blocking::spi::{
-    Transfer as _embedded_hal_blocking_spi_Transfer, Write as _embedded_hal_blocking_spi_Write,
-};
 pub use embedded_hal::serial::Read as _embedded_hal_serial_Read;
 pub use embedded_hal::serial::Write as _embedded_hal_serial_Write;
-pub use embedded_hal::spi::FullDuplex as _embedded_hal_spi_FullDuplex;
 pub use embedded_hal::Capture as _embedded_hal_Capture;
 pub use embedded_hal::Pwm as _embedded_hal_Pwm;
 pub use embedded_hal::Qei as _embedded_hal_Qei;