diff options
author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-01-14 22:02:00 +0100 |
---|---|---|
committer | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-01-19 17:59:55 +0100 |
commit | 58fc64722c65bbdc209ae0fd1700f03702bbcd08 (patch) | |
tree | 77f9412b47259cd4cf4170b0a257b371398d4f2c /examples/stm32l4 | |
parent | 52e156b429417bde59d0ea67d11256866f1dcec9 (diff) | |
download | embassy-58fc64722c65bbdc209ae0fd1700f03702bbcd08.zip |
stm32/gpio: expose all functionality as inherent methods.
Diffstat (limited to 'examples/stm32l4')
-rw-r--r-- | examples/stm32l4/src/bin/blinky.rs | 5 | ||||
-rw-r--r-- | examples/stm32l4/src/bin/button.rs | 3 | ||||
-rw-r--r-- | examples/stm32l4/src/bin/spi.rs | 5 | ||||
-rw-r--r-- | examples/stm32l4/src/bin/spi_blocking_async.rs | 9 | ||||
-rw-r--r-- | examples/stm32l4/src/bin/spi_dma.rs | 9 |
5 files changed, 13 insertions, 18 deletions
diff --git a/examples/stm32l4/src/bin/blinky.rs b/examples/stm32l4/src/bin/blinky.rs index 8a65858f..03028375 100644 --- a/examples/stm32l4/src/bin/blinky.rs +++ b/examples/stm32l4/src/bin/blinky.rs @@ -8,7 +8,6 @@ use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; use embassy_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::Peripherals; -use embedded_hal::digital::v2::OutputPin; use example_common::*; #[embassy::main] @@ -18,9 +17,9 @@ async fn main(_spawner: Spawner, p: Peripherals) { let mut led = Output::new(p.PB14, Level::High, Speed::Low); loop { - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32l4/src/bin/button.rs b/examples/stm32l4/src/bin/button.rs index fd867454..6073c137 100644 --- a/examples/stm32l4/src/bin/button.rs +++ b/examples/stm32l4/src/bin/button.rs @@ -5,7 +5,6 @@ #[path = "../example_common.rs"] mod example_common; use embassy_stm32::gpio::{Input, Pull}; -use embedded_hal::digital::v2::InputPin; use example_common::*; #[cortex_m_rt::entry] @@ -17,7 +16,7 @@ fn main() -> ! { let button = Input::new(p.PC13, Pull::Up); loop { - if unwrap!(button.is_high()) { + if button.is_high() { info!("high"); } else { info!("low"); diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs index 5b9ae1ce..1b6e3946 100644 --- a/examples/stm32l4/src/bin/spi.rs +++ b/examples/stm32l4/src/bin/spi.rs @@ -10,7 +10,6 @@ use embassy_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::spi::{Config, Spi}; use embassy_stm32::time::Hertz; use embedded_hal::blocking::spi::Transfer; -use embedded_hal::digital::v2::OutputPin; use example_common::*; #[cortex_m_rt::entry] @@ -34,9 +33,9 @@ fn main() -> ! { loop { let mut buf = [0x0Au8; 4]; - unwrap!(cs.set_low()); + cs.set_low(); unwrap!(spi.transfer(&mut buf)); - unwrap!(cs.set_high()); + cs.set_high(); info!("xfer {=[u8]:x}", buf); } } diff --git a/examples/stm32l4/src/bin/spi_blocking_async.rs b/examples/stm32l4/src/bin/spi_blocking_async.rs index f092706d..3be3f21c 100644 --- a/examples/stm32l4/src/bin/spi_blocking_async.rs +++ b/examples/stm32l4/src/bin/spi_blocking_async.rs @@ -12,7 +12,6 @@ use embassy_stm32::spi::{Config, Spi}; use embassy_stm32::time::Hertz; use embassy_stm32::Peripherals; use embassy_traits::{adapter::BlockingAsync, spi::FullDuplex}; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; #[embassy::main] @@ -41,17 +40,17 @@ async fn main(_spawner: Spawner, p: Peripherals) { let ready = Input::new(p.PE1, Pull::Up); cortex_m::asm::delay(100_000); - unwrap!(reset.set_high()); + reset.set_high(); cortex_m::asm::delay(100_000); - while unwrap!(ready.is_low()) { + while ready.is_low() { info!("waiting for ready"); } let write = [0x0A; 10]; let mut read = [0; 10]; - unwrap!(cs.set_low()); + cs.set_low(); spi.read_write(&mut read, &write).await.ok(); - unwrap!(cs.set_high()); + cs.set_high(); info!("xfer {=[u8]:x}", read); } diff --git a/examples/stm32l4/src/bin/spi_dma.rs b/examples/stm32l4/src/bin/spi_dma.rs index 4b74c7d7..d6464bbf 100644 --- a/examples/stm32l4/src/bin/spi_dma.rs +++ b/examples/stm32l4/src/bin/spi_dma.rs @@ -11,7 +11,6 @@ use embassy_stm32::spi::{Config, Spi}; use embassy_stm32::time::Hertz; use embassy_stm32::Peripherals; use embassy_traits::spi::FullDuplex; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; #[embassy::main] @@ -38,17 +37,17 @@ async fn main(_spawner: Spawner, p: Peripherals) { let ready = Input::new(p.PE1, Pull::Up); cortex_m::asm::delay(100_000); - unwrap!(reset.set_high()); + reset.set_high(); cortex_m::asm::delay(100_000); - while unwrap!(ready.is_low()) { + while ready.is_low() { info!("waiting for ready"); } let write = [0x0A; 10]; let mut read = [0; 10]; - unwrap!(cs.set_low()); + cs.set_low(); spi.read_write(&mut read, &write).await.ok(); - unwrap!(cs.set_high()); + cs.set_high(); info!("xfer {=[u8]:x}", read); } |