Skip to content

Commit

Permalink
Extend SPI2 feature guard for some stm32l0x1 devices
Browse files Browse the repository at this point in the history
There are members of the stm32l0x1 subfamily that thave two SPIs.  In
particular the STM32l051 and the STM32l071.

Compile tested as:

cargo build --release --example spi2 --features mcu-STM32L051C8Tx
(builds)

cargo build --release --example spi2  --features mcu-STM32L031C6Tx
(fails to build, as this subfamily only has 1 SPI)

but not run on actual hardware.
  • Loading branch information
jcard0na committed Nov 24, 2022
1 parent 3ab5002 commit fa6e250
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 3 deletions.
55 changes: 55 additions & 0 deletions examples/spi2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//! An example to show the configuration and usage of SPI1 and SPI2 on `stm32l0x2`, `stm32l0x3` and
//! the subset of `stm32l0x1` series that have two SPI ports
//!
#![deny(unsafe_code)]
#![no_main]
#![no_std]

extern crate panic_halt;

use cortex_m_rt::entry;
use stm32l0xx_hal::{pac, prelude::*, rcc::Config, spi};

#[entry]
fn main() -> ! {
let dp = pac::Peripherals::take().unwrap();

// Configure the clock.
let mut rcc = dp.RCC.freeze(Config::hsi16());

// Acquire the GPIOA peripheral. This also enables the clock for GPIOA in
// the RCC register.
let gpioa = dp.GPIOA.split(&mut rcc);

let mut nss = gpioa.pa4.into_push_pull_output();
let sck = gpioa.pa5;
let miso = gpioa.pa6;
let mosi = gpioa.pa7;

// Initialise the SPI1 peripheral.
let mut spi = dp
.SPI1
.spi((sck, miso, mosi), spi::MODE_0, 100_000.Hz(), &mut rcc);

let gpiob = dp.GPIOB.split(&mut rcc);

let mut nss2 = gpiob.pb12.into_push_pull_output();
let sck2 = gpiob.pb13;
let miso2 = gpiob.pb14;
let mosi2 = gpiob.pb15;

// Initialise the SPI2 peripheral.
let mut spi2 = dp
.SPI2
.spi((sck2, miso2, mosi2), spi::MODE_0, 100_000.Hz(), &mut rcc);

loop {
nss.set_low().unwrap();
spi.write(&[0, 1]).unwrap();
nss.set_high().unwrap();

nss2.set_low().unwrap();
spi2.write(&[0, 1]).unwrap();
nss2.set_high().unwrap();
}
}
21 changes: 18 additions & 3 deletions src/spi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ use crate::gpio::gpiob::*;
use crate::gpio::{AltMode, Analog};
use crate::hal;
use crate::pac::SPI1;
#[cfg(any(feature = "stm32l0x2", feature = "stm32l0x3"))]
#[cfg(any(
feature = "io-STM32L051",
feature = "io-STM32L071",
feature = "stm32l0x2",
feature = "stm32l0x3"
))]
use crate::pac::SPI2;
use crate::rcc::{Enable, Rcc};

Expand Down Expand Up @@ -131,7 +136,12 @@ pins! {
]
}

#[cfg(any(feature = "stm32l0x2", feature = "stm32l0x3"))]
#[cfg(any(
feature = "io-STM32L051",
feature = "io-STM32L071",
feature = "stm32l0x2",
feature = "stm32l0x3"
))]
pins! {
SPI2:
SCK: [
Expand Down Expand Up @@ -435,7 +445,12 @@ spi! {
SPI1: (spi1, apb2_clk),
}

#[cfg(any(feature = "stm32l0x2", feature = "stm32l0x3"))]
#[cfg(any(
feature = "io-STM32L051",
feature = "io-STM32L071",
feature = "stm32l0x2",
feature = "stm32l0x3"
))]
spi! {
SPI2: (spi2, apb1_clk),
}
Expand Down

0 comments on commit fa6e250

Please sign in to comment.