From 58fc64722c65bbdc209ae0fd1700f03702bbcd08 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Fri, 14 Jan 2022 22:02:00 +0100 Subject: stm32/gpio: expose all functionality as inherent methods. --- examples/stm32f1/src/bin/blinky.rs | 5 ++--- examples/stm32f3/src/bin/blinky.rs | 5 ++--- examples/stm32f3/src/bin/button.rs | 11 +++++------ examples/stm32f4/src/bin/blinky.rs | 5 ++--- examples/stm32f4/src/bin/button.rs | 11 +++++------ examples/stm32f4/src/bin/spi.rs | 5 ++--- examples/stm32f7/src/bin/blinky.rs | 5 ++--- examples/stm32f7/src/bin/button.rs | 11 +++++------ examples/stm32g0/src/bin/blinky.rs | 5 ++--- examples/stm32g0/src/bin/button.rs | 3 +-- examples/stm32g4/src/bin/blinky.rs | 5 ++--- examples/stm32g4/src/bin/button.rs | 3 +-- examples/stm32h7/src/bin/blinky.rs | 5 ++--- examples/stm32h7/src/bin/camera.rs | 5 ++--- examples/stm32h7/src/bin/mco.rs | 5 ++--- examples/stm32h7/src/bin/rng.rs | 5 ++--- examples/stm32l0/src/bin/blinky.rs | 5 ++--- examples/stm32l0/src/bin/button.rs | 11 +++++------ examples/stm32l0/src/bin/spi.rs | 5 ++--- examples/stm32l1/src/bin/blinky.rs | 5 ++--- examples/stm32l1/src/bin/spi.rs | 5 ++--- examples/stm32l4/src/bin/blinky.rs | 5 ++--- examples/stm32l4/src/bin/button.rs | 3 +-- examples/stm32l4/src/bin/spi.rs | 5 ++--- examples/stm32l4/src/bin/spi_blocking_async.rs | 9 ++++----- examples/stm32l4/src/bin/spi_dma.rs | 9 ++++----- examples/stm32wb55/src/bin/blinky.rs | 5 ++--- examples/stm32wl55/src/bin/blinky.rs | 5 ++--- examples/stm32wl55/src/bin/button.rs | 11 +++++------ examples/stm32wl55/src/bin/subghz.rs | 11 +++++------ 30 files changed, 79 insertions(+), 109 deletions(-) (limited to 'examples') diff --git a/examples/stm32f1/src/bin/blinky.rs b/examples/stm32f1/src/bin/blinky.rs index 1e4f2deec..0d9537453 100644 --- a/examples/stm32f1/src/bin/blinky.rs +++ b/examples/stm32f1/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32f3/src/bin/blinky.rs b/examples/stm32f3/src/bin/blinky.rs index 321643557..e8b8dc23f 100644 --- a/examples/stm32f3/src/bin/blinky.rs +++ b/examples/stm32f3/src/bin/blinky.rs @@ -9,7 +9,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] @@ -20,11 +19,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(1000)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(1000)).await; } } diff --git a/examples/stm32f3/src/bin/button.rs b/examples/stm32f3/src/bin/button.rs index c5fab138b..131d4af42 100644 --- a/examples/stm32f3/src/bin/button.rs +++ b/examples/stm32f3/src/bin/button.rs @@ -6,7 +6,6 @@ mod example_common; use cortex_m_rt::entry; use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; #[entry] @@ -20,14 +19,14 @@ fn main() -> ! { let mut led2 = Output::new(p.PE15, Level::High, Speed::Low); loop { - if unwrap!(button.is_high()) { + if button.is_high() { info!("high"); - unwrap!(led1.set_high()); - unwrap!(led2.set_low()); + led1.set_high(); + led2.set_low(); } else { info!("low"); - unwrap!(led1.set_low()); - unwrap!(led2.set_high()); + led1.set_low(); + led2.set_high(); } } } diff --git a/examples/stm32f4/src/bin/blinky.rs b/examples/stm32f4/src/bin/blinky.rs index c4857195f..00d67dac0 100644 --- a/examples/stm32f4/src/bin/blinky.rs +++ b/examples/stm32f4/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32f4/src/bin/button.rs b/examples/stm32f4/src/bin/button.rs index 95dee7c74..24eef75b2 100644 --- a/examples/stm32f4/src/bin/button.rs +++ b/examples/stm32f4/src/bin/button.rs @@ -6,7 +6,6 @@ mod example_common; use cortex_m_rt::entry; use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; #[entry] @@ -21,14 +20,14 @@ fn main() -> ! { let mut led3 = Output::new(p.PB14, Level::High, Speed::Low); loop { - if unwrap!(button.is_high()) { + if button.is_high() { info!("high"); - unwrap!(led1.set_high()); - unwrap!(led3.set_low()); + led1.set_high(); + led3.set_low(); } else { info!("low"); - unwrap!(led1.set_low()); - unwrap!(led3.set_high()); + led1.set_low(); + led3.set_high(); } } } diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs index 0192e1865..b66eb9582 100644 --- a/examples/stm32f4/src/bin/spi.rs +++ b/examples/stm32f4/src/bin/spi.rs @@ -11,7 +11,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::*; #[entry] @@ -35,9 +34,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/stm32f7/src/bin/blinky.rs b/examples/stm32f7/src/bin/blinky.rs index c4857195f..00d67dac0 100644 --- a/examples/stm32f7/src/bin/blinky.rs +++ b/examples/stm32f7/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32f7/src/bin/button.rs b/examples/stm32f7/src/bin/button.rs index 95dee7c74..24eef75b2 100644 --- a/examples/stm32f7/src/bin/button.rs +++ b/examples/stm32f7/src/bin/button.rs @@ -6,7 +6,6 @@ mod example_common; use cortex_m_rt::entry; use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; #[entry] @@ -21,14 +20,14 @@ fn main() -> ! { let mut led3 = Output::new(p.PB14, Level::High, Speed::Low); loop { - if unwrap!(button.is_high()) { + if button.is_high() { info!("high"); - unwrap!(led1.set_high()); - unwrap!(led3.set_low()); + led1.set_high(); + led3.set_low(); } else { info!("low"); - unwrap!(led1.set_low()); - unwrap!(led3.set_high()); + led1.set_low(); + led3.set_high(); } } } diff --git a/examples/stm32g0/src/bin/blinky.rs b/examples/stm32g0/src/bin/blinky.rs index c4857195f..00d67dac0 100644 --- a/examples/stm32g0/src/bin/blinky.rs +++ b/examples/stm32g0/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32g0/src/bin/button.rs b/examples/stm32g0/src/bin/button.rs index 4ca2a43b2..e901c5750 100644 --- a/examples/stm32g0/src/bin/button.rs +++ b/examples/stm32g0/src/bin/button.rs @@ -6,7 +6,6 @@ mod example_common; use cortex_m_rt::entry; use embassy_stm32::gpio::{Input, Pull}; -use embedded_hal::digital::v2::InputPin; use example_common::*; #[entry] @@ -18,7 +17,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/stm32g4/src/bin/blinky.rs b/examples/stm32g4/src/bin/blinky.rs index a43922a63..1dc67f99e 100644 --- a/examples/stm32g4/src/bin/blinky.rs +++ b/examples/stm32g4/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32g4/src/bin/button.rs b/examples/stm32g4/src/bin/button.rs index f0a4c8745..8c0d7d4fe 100644 --- a/examples/stm32g4/src/bin/button.rs +++ b/examples/stm32g4/src/bin/button.rs @@ -6,7 +6,6 @@ mod example_common; use cortex_m_rt::entry; use embassy_stm32::gpio::{Input, Pull}; -use embedded_hal::digital::v2::InputPin; use example_common::*; #[entry] @@ -18,7 +17,7 @@ fn main() -> ! { let button = Input::new(p.PC13, Pull::Down); loop { - if unwrap!(button.is_high()) { + if button.is_high() { info!("high"); } else { info!("low"); diff --git a/examples/stm32h7/src/bin/blinky.rs b/examples/stm32h7/src/bin/blinky.rs index 78edb5e27..7e5934239 100644 --- a/examples/stm32h7/src/bin/blinky.rs +++ b/examples/stm32h7/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(500)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(500)).await; } } diff --git a/examples/stm32h7/src/bin/camera.rs b/examples/stm32h7/src/bin/camera.rs index d94592071..9e8071bb3 100644 --- a/examples/stm32h7/src/bin/camera.rs +++ b/examples/stm32h7/src/bin/camera.rs @@ -11,7 +11,6 @@ use embassy_stm32::interrupt; use embassy_stm32::rcc::{Mco, Mco1Source, McoClock}; use embassy_stm32::time::U32Ext; use embassy_stm32::Peripherals; -use embedded_hal::digital::v2::OutputPin; use defmt_rtt as _; // global logger use panic_probe as _; @@ -114,11 +113,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { defmt::info!("main loop running"); loop { defmt::info!("high"); - defmt::unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(500)).await; defmt::info!("low"); - defmt::unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(500)).await; } } diff --git a/examples/stm32h7/src/bin/mco.rs b/examples/stm32h7/src/bin/mco.rs index 4cecd9b04..f27bd8ef8 100644 --- a/examples/stm32h7/src/bin/mco.rs +++ b/examples/stm32h7/src/bin/mco.rs @@ -9,7 +9,6 @@ use embassy::time::{Duration, Timer}; use embassy_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::rcc::{Mco, Mco1Source, McoClock}; use embassy_stm32::Peripherals; -use embedded_hal::digital::v2::OutputPin; use example_common::*; #[embassy::main] @@ -22,11 +21,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(500)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(500)).await; } } diff --git a/examples/stm32h7/src/bin/rng.rs b/examples/stm32h7/src/bin/rng.rs index d64ad9bcd..8e03861d5 100644 --- a/examples/stm32h7/src/bin/rng.rs +++ b/examples/stm32h7/src/bin/rng.rs @@ -10,7 +10,6 @@ use embassy::traits::rng::Random; use embassy_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::rng::Rng; use embassy_stm32::Peripherals; -use embedded_hal::digital::v2::OutputPin; use example_common::*; #[embassy::main] @@ -23,11 +22,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high {}", unwrap!(rng.next_u8(16).await)); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(500)).await; info!("low {}", unwrap!(rng.next_u8(16).await)); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(500)).await; } } diff --git a/examples/stm32l0/src/bin/blinky.rs b/examples/stm32l0/src/bin/blinky.rs index 1198b29da..46e29a897 100644 --- a/examples/stm32l0/src/bin/blinky.rs +++ b/examples/stm32l0/src/bin/blinky.rs @@ -9,7 +9,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] @@ -20,11 +19,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(300)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(300)).await; } } diff --git a/examples/stm32l0/src/bin/button.rs b/examples/stm32l0/src/bin/button.rs index c29155302..046c43caf 100644 --- a/examples/stm32l0/src/bin/button.rs +++ b/examples/stm32l0/src/bin/button.rs @@ -7,7 +7,6 @@ mod example_common; use embassy::executor::Spawner; use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; use embassy_stm32::Peripherals; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; #[embassy::main] @@ -19,14 +18,14 @@ async fn main(_spawner: Spawner, p: Peripherals) { let mut led2 = Output::new(p.PB5, Level::High, Speed::Low); loop { - if unwrap!(button.is_high()) { + if button.is_high() { info!("high"); - unwrap!(led1.set_high()); - unwrap!(led2.set_low()); + led1.set_high(); + led2.set_low(); } else { info!("low"); - unwrap!(led1.set_low()); - unwrap!(led2.set_high()); + led1.set_low(); + led2.set_high(); } } } diff --git a/examples/stm32l0/src/bin/spi.rs b/examples/stm32l0/src/bin/spi.rs index f768a5227..d30bb8d7a 100644 --- a/examples/stm32l0/src/bin/spi.rs +++ b/examples/stm32l0/src/bin/spi.rs @@ -7,7 +7,6 @@ mod example_common; use embassy::executor::Spawner; use embassy_stm32::gpio::{Level, Output, Speed}; -use embedded_hal::digital::v2::OutputPin; use example_common::*; use embassy_stm32::dma::NoDma; @@ -35,9 +34,9 @@ async fn main(_spawner: Spawner, p: Peripherals) { 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/stm32l1/src/bin/blinky.rs b/examples/stm32l1/src/bin/blinky.rs index deabdddba..07c804e9f 100644 --- a/examples/stm32l1/src/bin/blinky.rs +++ b/examples/stm32l1/src/bin/blinky.rs @@ -9,7 +9,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] @@ -20,11 +19,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(1000)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(1000)).await; } } diff --git a/examples/stm32l1/src/bin/spi.rs b/examples/stm32l1/src/bin/spi.rs index 3cfbe3fc4..9d1a2fc87 100644 --- a/examples/stm32l1/src/bin/spi.rs +++ b/examples/stm32l1/src/bin/spi.rs @@ -7,7 +7,6 @@ mod example_common; use embassy::executor::Spawner; use embassy_stm32::gpio::{Level, Output, Speed}; -use embedded_hal::digital::v2::OutputPin; use example_common::*; use embassy_stm32::dma::NoDma; @@ -35,9 +34,9 @@ async fn main(_spawner: Spawner, p: Peripherals) { 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/blinky.rs b/examples/stm32l4/src/bin/blinky.rs index 8a65858f8..030283756 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 fd8674549..6073c137e 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 5b9ae1ce0..1b6e3946e 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 f092706d4..3be3f21c9 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 4b74c7d7d..d6464bbfa 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); } diff --git a/examples/stm32wb55/src/bin/blinky.rs b/examples/stm32wb55/src/bin/blinky.rs index 42522fe9b..e1dbb30de 100644 --- a/examples/stm32wb55/src/bin/blinky.rs +++ b/examples/stm32wb55/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(500)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(500)).await; } } diff --git a/examples/stm32wl55/src/bin/blinky.rs b/examples/stm32wl55/src/bin/blinky.rs index 3c12a79d0..9ec208c3d 100644 --- a/examples/stm32wl55/src/bin/blinky.rs +++ b/examples/stm32wl55/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] @@ -19,11 +18,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { info!("high"); - unwrap!(led.set_high()); + led.set_high(); Timer::after(Duration::from_millis(500)).await; info!("low"); - unwrap!(led.set_low()); + led.set_low(); Timer::after(Duration::from_millis(500)).await; } } diff --git a/examples/stm32wl55/src/bin/button.rs b/examples/stm32wl55/src/bin/button.rs index 55b688663..be8f60e26 100644 --- a/examples/stm32wl55/src/bin/button.rs +++ b/examples/stm32wl55/src/bin/button.rs @@ -5,7 +5,6 @@ #[path = "../example_common.rs"] mod example_common; use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; -use embedded_hal::digital::v2::{InputPin, OutputPin}; use example_common::*; use cortex_m_rt::entry; @@ -21,12 +20,12 @@ fn main() -> ! { let mut led2 = Output::new(p.PB9, Level::High, Speed::Low); loop { - if button.is_high().unwrap() { - led1.set_high().unwrap(); - led2.set_low().unwrap(); + if button.is_high() { + led1.set_high(); + led2.set_low(); } else { - led1.set_low().unwrap(); - led2.set_high().unwrap(); + led1.set_low(); + led2.set_high(); } } } diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl55/src/bin/subghz.rs index 52fe6e9fa..570bd980f 100644 --- a/examples/stm32wl55/src/bin/subghz.rs +++ b/examples/stm32wl55/src/bin/subghz.rs @@ -17,7 +17,6 @@ use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; use embassy_stm32::interrupt; use embassy_stm32::subghz::*; use embassy_stm32::Peripherals; -use embedded_hal::digital::v2::OutputPin; use example_common::unwrap; const PING_DATA: &str = "PING"; @@ -89,9 +88,9 @@ async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { defmt::info!("Radio ready for use"); - unwrap!(led1.set_low()); + led1.set_low(); - unwrap!(led2.set_high()); + led2.set_high(); unwrap!(radio.set_standby(StandbyClk::Rc)); unwrap!(radio.set_tcxo_mode(&TCXO_MODE)); @@ -110,11 +109,11 @@ async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { defmt::info!("Status: {:?}", unwrap!(radio.status())); - unwrap!(led2.set_low()); + led2.set_low(); loop { pin.wait_for_rising_edge().await; - unwrap!(led3.set_high()); + led3.set_high(); unwrap!(radio.set_irq_cfg(&CfgIrq::new().irq_enable_all(Irq::TxDone))); unwrap!(radio.write_buffer(TX_BUF_OFFSET, PING_DATA_BYTES)); unwrap!(radio.set_tx(Timeout::DISABLED)); @@ -127,6 +126,6 @@ async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { defmt::info!("TX done"); } unwrap!(radio.clear_irq_status(irq_status)); - unwrap!(led3.set_low()); + led3.set_low(); } } -- cgit