max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1718 from copterust/stm32-spi-set-freq-in-config

Browse Source 
Move frequency to SPI config
This commit is contained in:
Dario Nieuwenhuis
2023-07-30 22:05:22 +00:00
committed by GitHub
parent 3aef5999d5 d8f02e151b
commit 105aa8f452
19 changed files with 121 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/stm32f3/src/bin/spi_dma.rs
View File

@ -17,16 +17,10 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Hello World!");
let mut spi = Spi::new(
p.SPI1,
p.PB3,
p.PB5,
p.PB4,
p.DMA1_CH3,
p.DMA1_CH2,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI1, p.PB3, p.PB5, p.PB4, p.DMA1_CH3, p.DMA1_CH2, spi_config);
for n in 0u32.. {
let mut write: String<128> = String::new();

14
examples/stm32f4/src/bin/spi.rs
View File

@ -16,16 +16,10 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default());
let mut spi = Spi::new(
p.SPI3,
p.PC10,
p.PC12,
p.PC11,
NoDma,
NoDma,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, spi_config);
let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);

14
examples/stm32f4/src/bin/spi_dma.rs
View File

@ -17,16 +17,10 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Hello World!");
let mut spi = Spi::new(
p.SPI1,
p.PB3,
p.PB5,
p.PB4,
p.DMA2_CH3,
p.DMA2_CH2,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI1, p.PB3, p.PB5, p.PB4, p.DMA2_CH3, p.DMA2_CH2, spi_config);
for n in 0u32.. {
let mut write: String<128> = String::new();

4
examples/stm32g0/src/bin/spi_neopixel.rs
View File

@ -76,7 +76,9 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Start test using spi as neopixel driver");
let mut spi = Spi::new_txonly_nosck(p.SPI1, p.PB5, p.DMA1_CH3, NoDma, Hertz(4_000_000), Config::default());
let mut config = Config::default();
config.frequency = Hertz(4_000_000);
let mut spi = Spi::new_txonly_nosck(p.SPI1, p.PB5, p.DMA1_CH3, NoDma, config);
let mut neopixels = Ws2812::new();

14
examples/stm32h7/src/bin/spi.rs
View File

@ -43,16 +43,10 @@ fn main() -> ! {
config.rcc.pll1.q_ck = Some(mhz(100));
let p = embassy_stm32::init(config);
let spi = spi::Spi::new(
p.SPI3,
p.PB3,
p.PB5,
p.PB4,
NoDma,
NoDma,
mhz(1),
spi::Config::default(),
);
let mut spi_config = spi::Config::default();
spi_config.frequency = mhz(1);
let spi = spi::Spi::new(p.SPI3, p.PB3, p.PB5, p.PB4, NoDma, NoDma, spi_config);
let executor = EXECUTOR.init(Executor::new());

14
examples/stm32h7/src/bin/spi_dma.rs
View File

@ -39,16 +39,10 @@ fn main() -> ! {
config.rcc.pll1.q_ck = Some(mhz(100));
let p = embassy_stm32::init(config);
let spi = spi::Spi::new(
p.SPI3,
p.PB3,
p.PB5,
p.PB4,
p.DMA1_CH3,
p.DMA1_CH4,
mhz(1),
spi::Config::default(),
);
let mut spi_config = spi::Config::default();
spi_config.frequency = mhz(1);
let spi = spi::Spi::new(p.SPI3, p.PB3, p.PB5, p.PB4, p.DMA1_CH3, p.DMA1_CH4, spi_config);
let executor = EXECUTOR.init(Executor::new());

14
examples/stm32l0/src/bin/lora_cad.rs
View File

@ -27,17 +27,11 @@ async fn main(_spawner: Spawner) {
config.rcc.enable_hsi48 = true;
let p = embassy_stm32::init(config);
let mut spi_config = spi::Config::default();
spi_config.frequency = khz(200);
// SPI for sx1276
let spi = spi::Spi::new(
p.SPI1,
p.PB3,
p.PA7,
p.PA6,
p.DMA1_CH3,
p.DMA1_CH2,
khz(200),
spi::Config::default(),
);
let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

14
examples/stm32l0/src/bin/lora_lorawan.rs
View File

@ -32,17 +32,11 @@ async fn main(_spawner: Spawner) {
config.rcc.enable_hsi48 = true;
let p = embassy_stm32::init(config);
let mut spi_config = spi::Config::default();
spi_config.frequency = khz(200);
// SPI for sx1276
let spi = spi::Spi::new(
p.SPI1,
p.PB3,
p.PA7,
p.PA6,
p.DMA1_CH3,
p.DMA1_CH2,
khz(200),
spi::Config::default(),
);
let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

14
examples/stm32l0/src/bin/lora_p2p_receive.rs
View File

@ -27,17 +27,11 @@ async fn main(_spawner: Spawner) {
config.rcc.enable_hsi48 = true;
let p = embassy_stm32::init(config);
let mut spi_config = spi::Config::default();
spi_config.frequency = khz(200);
// SPI for sx1276
let spi = spi::Spi::new(
p.SPI1,
p.PB3,
p.PA7,
p.PA6,
p.DMA1_CH3,
p.DMA1_CH2,
khz(200),
spi::Config::default(),
);
let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

14
examples/stm32l0/src/bin/lora_p2p_send.rs
View File

@ -27,17 +27,11 @@ async fn main(_spawner: Spawner) {
config.rcc.enable_hsi48 = true;
let p = embassy_stm32::init(config);
let mut spi_config = spi::Config::default();
spi_config.frequency = khz(200);
// SPI for sx1276
let spi = spi::Spi::new(
p.SPI1,
p.PB3,
p.PA7,
p.PA6,
p.DMA1_CH3,
p.DMA1_CH2,
khz(200),
spi::Config::default(),
);
let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

14
examples/stm32l0/src/bin/spi.rs
View File

@ -15,16 +15,10 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Hello World, folks!");
let mut spi = Spi::new(
p.SPI1,
p.PB3,
p.PA7,
p.PA6,
NoDma,
NoDma,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, NoDma, NoDma, spi_config);
let mut cs = Output::new(p.PA15, Level::High, Speed::VeryHigh);

14
examples/stm32l1/src/bin/spi.rs
View File

@ -15,16 +15,10 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Hello World, folks!");
let mut spi = Spi::new(
p.SPI1,
p.PA5,
p.PA7,
p.PA6,
NoDma,
NoDma,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI1, p.PA5, p.PA7, p.PA6, NoDma, NoDma, spi_config);
let mut cs = Output::new(p.PA4, Level::High, Speed::VeryHigh);

14
examples/stm32l4/src/bin/spi.rs
View File

@ -15,16 +15,10 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default());
let mut spi = Spi::new(
p.SPI3,
p.PC10,
p.PC12,
p.PC11,
NoDma,
NoDma,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, spi_config);
let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);

14
examples/stm32l4/src/bin/spi_blocking_async.rs
View File

@ -17,16 +17,10 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Hello World!");
let spi = Spi::new(
p.SPI3,
p.PC10,
p.PC12,
p.PC11,
NoDma,
NoDma,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, spi_config);
let mut spi = BlockingAsync::new(spi);

14
examples/stm32l4/src/bin/spi_dma.rs
View File

@ -14,16 +14,10 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
info!("Hello World!");
let mut spi = Spi::new(
p.SPI3,
p.PC10,
p.PC12,
p.PC11,
p.DMA1_CH1,
p.DMA1_CH2,
Hertz(1_000_000),
Config::default(),
);
let mut spi_config = Config::default();
spi_config.frequency = Hertz(1_000_000);
let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, p.DMA1_CH1, p.DMA1_CH2, spi_config);
// These are the pins for the Inventek eS-Wifi SPI Wifi Adapter.