aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbofh <[email protected]>2023-07-30 18:58:40 +0200
committerbofh <[email protected]>2023-07-30 18:58:40 +0200
commitd2127f6b82e7a97744c81e2a3628ced59d8f1b49 (patch)
tree73c6df942b3bf5a29c8b7ab97aeb339dd25063c6
parent1d815f4ba09b7be88e650690806e18c8a4d8e051 (diff)
Fix stm32 SPI examples
-rw-r--r--examples/stm32f3/src/bin/spi_dma.rs2
-rw-r--r--examples/stm32f4/src/bin/spi.rs12
-rw-r--r--examples/stm32f4/src/bin/spi_dma.rs2
-rw-r--r--examples/stm32g0/src/bin/spi_neopixel.rs4
-rw-r--r--examples/stm32l0/src/bin/spi.rs2
-rw-r--r--examples/stm32l1/src/bin/spi.rs2
-rw-r--r--examples/stm32l4/src/bin/spi.rs12
-rw-r--r--examples/stm32l4/src/bin/spi_blocking_async.rs2
-rw-r--r--examples/stm32l4/src/bin/spi_dma.rs2
9 files changed, 5 insertions, 35 deletions
diff --git a/examples/stm32f3/src/bin/spi_dma.rs b/examples/stm32f3/src/bin/spi_dma.rs
index 95b2b6865..d8cdb7e65 100644
--- a/examples/stm32f3/src/bin/spi_dma.rs
+++ b/examples/stm32f3/src/bin/spi_dma.rs
@@ -8,7 +8,6 @@ use core::str::from_utf8;
8use defmt::*; 8use defmt::*;
9use embassy_executor::Spawner; 9use embassy_executor::Spawner;
10use embassy_stm32::spi::{Config, Spi}; 10use embassy_stm32::spi::{Config, Spi};
11use embassy_stm32::time::Hertz;
12use heapless::String; 11use heapless::String;
13use {defmt_rtt as _, panic_probe as _}; 12use {defmt_rtt as _, panic_probe as _};
14 13
@@ -24,7 +23,6 @@ async fn main(_spawner: Spawner) {
24 p.PB4, 23 p.PB4,
25 p.DMA1_CH3, 24 p.DMA1_CH3,
26 p.DMA1_CH2, 25 p.DMA1_CH2,
27 Hertz(1_000_000),
28 Config::default(), 26 Config::default(),
29 ); 27 );
30 28
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs
index 05b48f478..b0c62b3f0 100644
--- a/examples/stm32f4/src/bin/spi.rs
+++ b/examples/stm32f4/src/bin/spi.rs
@@ -7,7 +7,6 @@ use defmt::*;
7use embassy_stm32::dma::NoDma; 7use embassy_stm32::dma::NoDma;
8use embassy_stm32::gpio::{Level, Output, Speed}; 8use embassy_stm32::gpio::{Level, Output, Speed};
9use embassy_stm32::spi::{Config, Spi}; 9use embassy_stm32::spi::{Config, Spi};
10use embassy_stm32::time::Hertz;
11use {defmt_rtt as _, panic_probe as _}; 10use {defmt_rtt as _, panic_probe as _};
12 11
13#[entry] 12#[entry]
@@ -16,16 +15,7 @@ fn main() -> ! {
16 15
17 let p = embassy_stm32::init(Default::default()); 16 let p = embassy_stm32::init(Default::default());
18 17
19 let mut spi = Spi::new( 18 let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, Config::default());
20 p.SPI3,
21 p.PC10,
22 p.PC12,
23 p.PC11,
24 NoDma,
25 NoDma,
26 Hertz(1_000_000),
27 Config::default(),
28 );
29 19
30 let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh); 20 let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);
31 21
diff --git a/examples/stm32f4/src/bin/spi_dma.rs b/examples/stm32f4/src/bin/spi_dma.rs
index 3d2a1a1ae..d421b9d5f 100644
--- a/examples/stm32f4/src/bin/spi_dma.rs
+++ b/examples/stm32f4/src/bin/spi_dma.rs
@@ -8,7 +8,6 @@ use core::str::from_utf8;
8use defmt::*; 8use defmt::*;
9use embassy_executor::Spawner; 9use embassy_executor::Spawner;
10use embassy_stm32::spi::{Config, Spi}; 10use embassy_stm32::spi::{Config, Spi};
11use embassy_stm32::time::Hertz;
12use heapless::String; 11use heapless::String;
13use {defmt_rtt as _, panic_probe as _}; 12use {defmt_rtt as _, panic_probe as _};
14 13
@@ -24,7 +23,6 @@ async fn main(_spawner: Spawner) {
24 p.PB4, 23 p.PB4,
25 p.DMA2_CH3, 24 p.DMA2_CH3,
26 p.DMA2_CH2, 25 p.DMA2_CH2,
27 Hertz(1_000_000),
28 Config::default(), 26 Config::default(),
29 ); 27 );
30 28
diff --git a/examples/stm32g0/src/bin/spi_neopixel.rs b/examples/stm32g0/src/bin/spi_neopixel.rs
index 81fdd15cb..ee7aaf33f 100644
--- a/examples/stm32g0/src/bin/spi_neopixel.rs
+++ b/examples/stm32g0/src/bin/spi_neopixel.rs
@@ -76,7 +76,9 @@ async fn main(_spawner: Spawner) {
76 let p = embassy_stm32::init(Default::default()); 76 let p = embassy_stm32::init(Default::default());
77 info!("Start test using spi as neopixel driver"); 77 info!("Start test using spi as neopixel driver");
78 78
79 let mut spi = Spi::new_txonly_nosck(p.SPI1, p.PB5, p.DMA1_CH3, NoDma, Hertz(4_000_000), Config::default()); 79 let mut config = Config::default();
80 config.frequency = Hertz(4_000_000);
81 let mut spi = Spi::new_txonly_nosck(p.SPI1, p.PB5, p.DMA1_CH3, NoDma, config);
80 82
81 let mut neopixels = Ws2812::new(); 83 let mut neopixels = Ws2812::new();
82 84
diff --git a/examples/stm32l0/src/bin/spi.rs b/examples/stm32l0/src/bin/spi.rs
index 9b5b3e27d..54b7a2dd9 100644
--- a/examples/stm32l0/src/bin/spi.rs
+++ b/examples/stm32l0/src/bin/spi.rs
@@ -7,7 +7,6 @@ use embassy_executor::Spawner;
7use embassy_stm32::dma::NoDma; 7use embassy_stm32::dma::NoDma;
8use embassy_stm32::gpio::{Level, Output, Speed}; 8use embassy_stm32::gpio::{Level, Output, Speed};
9use embassy_stm32::spi::{Config, Spi}; 9use embassy_stm32::spi::{Config, Spi};
10use embassy_stm32::time::Hertz;
11use {defmt_rtt as _, panic_probe as _}; 10use {defmt_rtt as _, panic_probe as _};
12 11
13#[embassy_executor::main] 12#[embassy_executor::main]
@@ -22,7 +21,6 @@ async fn main(_spawner: Spawner) {
22 p.PA6, 21 p.PA6,
23 NoDma, 22 NoDma,
24 NoDma, 23 NoDma,
25 Hertz(1_000_000),
26 Config::default(), 24 Config::default(),
27 ); 25 );
28 26
diff --git a/examples/stm32l1/src/bin/spi.rs b/examples/stm32l1/src/bin/spi.rs
index 0a532e8e3..34faf0619 100644
--- a/examples/stm32l1/src/bin/spi.rs
+++ b/examples/stm32l1/src/bin/spi.rs
@@ -7,7 +7,6 @@ use embassy_executor::Spawner;
7use embassy_stm32::dma::NoDma; 7use embassy_stm32::dma::NoDma;
8use embassy_stm32::gpio::{Level, Output, Speed}; 8use embassy_stm32::gpio::{Level, Output, Speed};
9use embassy_stm32::spi::{Config, Spi}; 9use embassy_stm32::spi::{Config, Spi};
10use embassy_stm32::time::Hertz;
11use {defmt_rtt as _, panic_probe as _}; 10use {defmt_rtt as _, panic_probe as _};
12 11
13#[embassy_executor::main] 12#[embassy_executor::main]
@@ -22,7 +21,6 @@ async fn main(_spawner: Spawner) {
22 p.PA6, 21 p.PA6,
23 NoDma, 22 NoDma,
24 NoDma, 23 NoDma,
25 Hertz(1_000_000),
26 Config::default(), 24 Config::default(),
27 ); 25 );
28 26
diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs
index 76e316a25..a3097fb48 100644
--- a/examples/stm32l4/src/bin/spi.rs
+++ b/examples/stm32l4/src/bin/spi.rs
@@ -6,7 +6,6 @@ use defmt::*;
6use embassy_stm32::dma::NoDma; 6use embassy_stm32::dma::NoDma;
7use embassy_stm32::gpio::{Level, Output, Speed}; 7use embassy_stm32::gpio::{Level, Output, Speed};
8use embassy_stm32::spi::{Config, Spi}; 8use embassy_stm32::spi::{Config, Spi};
9use embassy_stm32::time::Hertz;
10use {defmt_rtt as _, panic_probe as _}; 9use {defmt_rtt as _, panic_probe as _};
11 10
12#[cortex_m_rt::entry] 11#[cortex_m_rt::entry]
@@ -15,16 +14,7 @@ fn main() -> ! {
15 14
16 let p = embassy_stm32::init(Default::default()); 15 let p = embassy_stm32::init(Default::default());
17 16
18 let mut spi = Spi::new( 17 let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, Config::default());
19 p.SPI3,
20 p.PC10,
21 p.PC12,
22 p.PC11,
23 NoDma,
24 NoDma,
25 Hertz(1_000_000),
26 Config::default(),
27 );
28 18
29 let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh); 19 let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);
30 20
diff --git a/examples/stm32l4/src/bin/spi_blocking_async.rs b/examples/stm32l4/src/bin/spi_blocking_async.rs
index 62ef0130e..868e22117 100644
--- a/examples/stm32l4/src/bin/spi_blocking_async.rs
+++ b/examples/stm32l4/src/bin/spi_blocking_async.rs
@@ -8,7 +8,6 @@ use embassy_executor::Spawner;
8use embassy_stm32::dma::NoDma; 8use embassy_stm32::dma::NoDma;
9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
10use embassy_stm32::spi::{Config, Spi}; 10use embassy_stm32::spi::{Config, Spi};
11use embassy_stm32::time::Hertz;
12use embedded_hal_async::spi::SpiBus; 11use embedded_hal_async::spi::SpiBus;
13use {defmt_rtt as _, panic_probe as _}; 12use {defmt_rtt as _, panic_probe as _};
14 13
@@ -24,7 +23,6 @@ async fn main(_spawner: Spawner) {
24 p.PC11, 23 p.PC11,
25 NoDma, 24 NoDma,
26 NoDma, 25 NoDma,
27 Hertz(1_000_000),
28 Config::default(), 26 Config::default(),
29 ); 27 );
30 28
diff --git a/examples/stm32l4/src/bin/spi_dma.rs b/examples/stm32l4/src/bin/spi_dma.rs
index 89471db5a..01265c49b 100644
--- a/examples/stm32l4/src/bin/spi_dma.rs
+++ b/examples/stm32l4/src/bin/spi_dma.rs
@@ -6,7 +6,6 @@ use defmt::*;
6use embassy_executor::Spawner; 6use embassy_executor::Spawner;
7use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 7use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
8use embassy_stm32::spi::{Config, Spi}; 8use embassy_stm32::spi::{Config, Spi};
9use embassy_stm32::time::Hertz;
10use {defmt_rtt as _, panic_probe as _}; 9use {defmt_rtt as _, panic_probe as _};
11 10
12#[embassy_executor::main] 11#[embassy_executor::main]
@@ -21,7 +20,6 @@ async fn main(_spawner: Spawner) {
21 p.PC11, 20 p.PC11,
22 p.DMA1_CH1, 21 p.DMA1_CH1,
23 p.DMA1_CH2, 22 p.DMA1_CH2,
24 Hertz(1_000_000),
25 Config::default(), 23 Config::default(),
26 ); 24 );
27 25