aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-01-19 17:29:47 +0100
committerDario Nieuwenhuis <[email protected]>2022-01-19 17:59:55 +0100
commit889d757ab8bcfc10caf0a7d75ffb7733a7e71ed1 (patch)
tree70a6590ad9da8c625eb69c21faddb5721bfbcea4 /examples
parent3d27a0e7cbf226d2a9df3e2efa058589ebfca858 (diff)
stm32/spi: expose all functionality as inherent methods.
Diffstat (limited to 'examples')
-rw-r--r--examples/stm32f4/src/bin/spi.rs3
-rw-r--r--examples/stm32f4/src/bin/spi_dma.rs3
-rw-r--r--examples/stm32h7/src/bin/spi.rs3
-rw-r--r--examples/stm32l0/src/bin/spi.rs3
-rw-r--r--examples/stm32l1/src/bin/spi.rs3
-rw-r--r--examples/stm32l4/src/bin/spi.rs3
6 files changed, 6 insertions, 12 deletions
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs
index b66eb9582..6b04f1fed 100644
--- a/examples/stm32f4/src/bin/spi.rs
+++ b/examples/stm32f4/src/bin/spi.rs
@@ -10,7 +10,6 @@ use embassy_stm32::dma::NoDma;
10use embassy_stm32::gpio::{Level, Output, Speed}; 10use embassy_stm32::gpio::{Level, Output, Speed};
11use embassy_stm32::spi::{Config, Spi}; 11use embassy_stm32::spi::{Config, Spi};
12use embassy_stm32::time::Hertz; 12use embassy_stm32::time::Hertz;
13use embedded_hal::blocking::spi::Transfer;
14use example_common::*; 13use example_common::*;
15 14
16#[entry] 15#[entry]
@@ -35,7 +34,7 @@ fn main() -> ! {
35 loop { 34 loop {
36 let mut buf = [0x0Au8; 4]; 35 let mut buf = [0x0Au8; 4];
37 cs.set_low(); 36 cs.set_low();
38 unwrap!(spi.transfer(&mut buf)); 37 unwrap!(spi.blocking_transfer_in_place(&mut buf));
39 cs.set_high(); 38 cs.set_high();
40 info!("xfer {=[u8]:x}", buf); 39 info!("xfer {=[u8]:x}", buf);
41 } 40 }
diff --git a/examples/stm32f4/src/bin/spi_dma.rs b/examples/stm32f4/src/bin/spi_dma.rs
index b3bf6fc28..9171f7516 100644
--- a/examples/stm32f4/src/bin/spi_dma.rs
+++ b/examples/stm32f4/src/bin/spi_dma.rs
@@ -10,7 +10,6 @@ use embassy::executor::Spawner;
10use embassy_stm32::spi::{Config, Spi}; 10use embassy_stm32::spi::{Config, Spi};
11use embassy_stm32::time::Hertz; 11use embassy_stm32::time::Hertz;
12use embassy_stm32::Peripherals; 12use embassy_stm32::Peripherals;
13use embassy_traits::spi::FullDuplex;
14use example_common::*; 13use example_common::*;
15use heapless::String; 14use heapless::String;
16 15
@@ -33,7 +32,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
33 let mut write: String<128> = String::new(); 32 let mut write: String<128> = String::new();
34 let mut read = [0; 128]; 33 let mut read = [0; 128];
35 core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap(); 34 core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
36 spi.read_write(&mut read[0..write.len()], write.as_bytes()) 35 spi.transfer(&mut read[0..write.len()], write.as_bytes())
37 .await 36 .await
38 .ok(); 37 .ok();
39 info!("read via spi+dma: {}", from_utf8(&read).unwrap()); 38 info!("read via spi+dma: {}", from_utf8(&read).unwrap());
diff --git a/examples/stm32h7/src/bin/spi.rs b/examples/stm32h7/src/bin/spi.rs
index 0b375b0d0..17e64da79 100644
--- a/examples/stm32h7/src/bin/spi.rs
+++ b/examples/stm32h7/src/bin/spi.rs
@@ -10,7 +10,6 @@ use embassy::executor::Executor;
10use embassy::util::Forever; 10use embassy::util::Forever;
11use embassy_stm32::dma::NoDma; 11use embassy_stm32::dma::NoDma;
12use embassy_stm32::spi; 12use embassy_stm32::spi;
13use embedded_hal::blocking::spi::Transfer;
14use example_common::*; 13use example_common::*;
15 14
16use core::str::from_utf8; 15use core::str::from_utf8;
@@ -25,7 +24,7 @@ async fn main_task(mut spi: spi::Spi<'static, SPI3, NoDma, NoDma>) {
25 let mut write: String<128> = String::new(); 24 let mut write: String<128> = String::new();
26 core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap(); 25 core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
27 unsafe { 26 unsafe {
28 let result = spi.transfer(write.as_bytes_mut()); 27 let result = spi.blocking_transfer_in_place(write.as_bytes_mut());
29 if let Err(_) = result { 28 if let Err(_) = result {
30 defmt::panic!("crap"); 29 defmt::panic!("crap");
31 } 30 }
diff --git a/examples/stm32l0/src/bin/spi.rs b/examples/stm32l0/src/bin/spi.rs
index d30bb8d7a..8d6e89d91 100644
--- a/examples/stm32l0/src/bin/spi.rs
+++ b/examples/stm32l0/src/bin/spi.rs
@@ -13,7 +13,6 @@ use embassy_stm32::dma::NoDma;
13use embassy_stm32::spi::{Config, Spi}; 13use embassy_stm32::spi::{Config, Spi};
14use embassy_stm32::time::Hertz; 14use embassy_stm32::time::Hertz;
15use embassy_stm32::Peripherals; 15use embassy_stm32::Peripherals;
16use embedded_hal::blocking::spi::Transfer;
17 16
18#[embassy::main] 17#[embassy::main]
19async fn main(_spawner: Spawner, p: Peripherals) { 18async fn main(_spawner: Spawner, p: Peripherals) {
@@ -35,7 +34,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
35 loop { 34 loop {
36 let mut buf = [0x0Au8; 4]; 35 let mut buf = [0x0Au8; 4];
37 cs.set_low(); 36 cs.set_low();
38 unwrap!(spi.transfer(&mut buf)); 37 unwrap!(spi.blocking_transfer_in_place(&mut buf));
39 cs.set_high(); 38 cs.set_high();
40 info!("xfer {=[u8]:x}", buf); 39 info!("xfer {=[u8]:x}", buf);
41 } 40 }
diff --git a/examples/stm32l1/src/bin/spi.rs b/examples/stm32l1/src/bin/spi.rs
index 9d1a2fc87..e97e3ebb4 100644
--- a/examples/stm32l1/src/bin/spi.rs
+++ b/examples/stm32l1/src/bin/spi.rs
@@ -13,7 +13,6 @@ use embassy_stm32::dma::NoDma;
13use embassy_stm32::spi::{Config, Spi}; 13use embassy_stm32::spi::{Config, Spi};
14use embassy_stm32::time::Hertz; 14use embassy_stm32::time::Hertz;
15use embassy_stm32::Peripherals; 15use embassy_stm32::Peripherals;
16use embedded_hal::blocking::spi::Transfer;
17 16
18#[embassy::main] 17#[embassy::main]
19async fn main(_spawner: Spawner, p: Peripherals) { 18async fn main(_spawner: Spawner, p: Peripherals) {
@@ -35,7 +34,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
35 loop { 34 loop {
36 let mut buf = [0x0Au8; 4]; 35 let mut buf = [0x0Au8; 4];
37 cs.set_low(); 36 cs.set_low();
38 unwrap!(spi.transfer(&mut buf)); 37 unwrap!(spi.blocking_transfer_in_place(&mut buf));
39 cs.set_high(); 38 cs.set_high();
40 info!("xfer {=[u8]:x}", buf); 39 info!("xfer {=[u8]:x}", buf);
41 } 40 }
diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs
index 1b6e3946e..8567d3062 100644
--- a/examples/stm32l4/src/bin/spi.rs
+++ b/examples/stm32l4/src/bin/spi.rs
@@ -9,7 +9,6 @@ use embassy_stm32::dma::NoDma;
9use embassy_stm32::gpio::{Level, Output, Speed}; 9use embassy_stm32::gpio::{Level, Output, Speed};
10use embassy_stm32::spi::{Config, Spi}; 10use embassy_stm32::spi::{Config, Spi};
11use embassy_stm32::time::Hertz; 11use embassy_stm32::time::Hertz;
12use embedded_hal::blocking::spi::Transfer;
13use example_common::*; 12use example_common::*;
14 13
15#[cortex_m_rt::entry] 14#[cortex_m_rt::entry]
@@ -34,7 +33,7 @@ fn main() -> ! {
34 loop { 33 loop {
35 let mut buf = [0x0Au8; 4]; 34 let mut buf = [0x0Au8; 4];
36 cs.set_low(); 35 cs.set_low();
37 unwrap!(spi.transfer(&mut buf)); 36 unwrap!(spi.blocking_transfer_in_place(&mut buf));
38 cs.set_high(); 37 cs.set_high();
39 info!("xfer {=[u8]:x}", buf); 38 info!("xfer {=[u8]:x}", buf);
40 } 39 }