57 files changed, 97 insertions, 190 deletions

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/stm32f3/src/bin/button_exti.rs b/examples/stm32f3/src/bin/button_exti.rs
index d45e4365b..b11f38ea5 100644
--- a/examples/stm32f3/src/bin/button_exti.rs
+++ b/examples/stm32f3/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
diff --git a/examples/stm32f3/src/bin/usart_dma.rs b/examples/stm32f3/src/bin/usart_dma.rs
index 99530b5c0..0e67bb1f1 100644
--- a/examples/stm32f3/src/bin/usart_dma.rs
+++ b/examples/stm32f3/src/bin/usart_dma.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embassy_traits::uart::Write as _;
 use example_common::*;
 use heapless::String;
 
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/button_exti.rs b/examples/stm32f4/src/bin/button_exti.rs
index 2c4318d64..852fbe3c6 100644
--- a/examples/stm32f4/src/bin/button_exti.rs
+++ b/examples/stm32f4/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs
index 0192e1865..6b04f1fed 100644
--- a/examples/stm32f4/src/bin/spi.rs
+++ b/examples/stm32f4/src/bin/spi.rs
@@ -10,8 +10,6 @@ use embassy_stm32::dma::NoDma;
 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 +33,9 @@ fn main() -> ! {
 
     loop {
         let mut buf = [0x0Au8; 4];
-        unwrap!(cs.set_low());
-        unwrap!(spi.transfer(&mut buf));
-        unwrap!(cs.set_high());
+        cs.set_low();
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
+        cs.set_high();
         info!("xfer {=[u8]:x}", buf);
     }
 }
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;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embassy_traits::spi::FullDuplex;
 use example_common::*;
 use heapless::String;
 
@@ -33,7 +32,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         let mut write: String<128> = String::new();
         let mut read = [0; 128];
         core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
-        spi.read_write(&mut read[0..write.len()], write.as_bytes())
+        spi.transfer(&mut read[0..write.len()], write.as_bytes())
             .await
             .ok();
         info!("read via spi+dma: {}", from_utf8(&read).unwrap());
diff --git a/examples/stm32f4/src/bin/usart.rs b/examples/stm32f4/src/bin/usart.rs
index 391a8b9b0..b5ea98cca 100644
--- a/examples/stm32f4/src/bin/usart.rs
+++ b/examples/stm32f4/src/bin/usart.rs
@@ -7,7 +7,6 @@ mod example_common;
 use cortex_m_rt::entry;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
-use embedded_hal::blocking::serial::Write;
 use example_common::*;
 
 #[entry]
@@ -19,12 +18,12 @@ fn main() -> ! {
     let config = Config::default();
     let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, NoDma, NoDma, config);
 
-    unwrap!(usart.bwrite_all(b"Hello Embassy World!\r\n"));
+    unwrap!(usart.blocking_write(b"Hello Embassy World!\r\n"));
     info!("wrote Hello, starting echo");
 
     let mut buf = [0u8; 1];
     loop {
-        unwrap!(usart.read_blocking(&mut buf));
-        unwrap!(usart.bwrite_all(&buf));
+        unwrap!(usart.blocking_read(&mut buf));
+        unwrap!(usart.blocking_write(&buf));
     }
 }
diff --git a/examples/stm32f4/src/bin/usart_dma.rs b/examples/stm32f4/src/bin/usart_dma.rs
index 0dbdd7c05..862a91ea8 100644
--- a/examples/stm32f4/src/bin/usart_dma.rs
+++ b/examples/stm32f4/src/bin/usart_dma.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embassy_traits::uart::Write as _;
 use example_common::*;
 use heapless::String;
 
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/stm32f7/src/bin/button_exti.rs b/examples/stm32f7/src/bin/button_exti.rs
index 2c4318d64..852fbe3c6 100644
--- a/examples/stm32f7/src/bin/button_exti.rs
+++ b/examples/stm32f7/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
diff --git a/examples/stm32f7/src/bin/usart_dma.rs b/examples/stm32f7/src/bin/usart_dma.rs
index 82af0bc22..00deae8b3 100644
--- a/examples/stm32f7/src/bin/usart_dma.rs
+++ b/examples/stm32f7/src/bin/usart_dma.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embassy_traits::uart::Write as _Write;
 use example_common::*;
 
 use heapless::String;
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/stm32g0/src/bin/button_exti.rs b/examples/stm32g0/src/bin/button_exti.rs
index 0c2483ecb..848818bf2 100644
--- a/examples/stm32g0/src/bin/button_exti.rs
+++ b/examples/stm32g0/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
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/stm32g4/src/bin/button_exti.rs b/examples/stm32g4/src/bin/button_exti.rs
index 2c4318d64..852fbe3c6 100644
--- a/examples/stm32g4/src/bin/button_exti.rs
+++ b/examples/stm32g4/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
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/button_exti.rs b/examples/stm32h7/src/bin/button_exti.rs
index 2c4318d64..852fbe3c6 100644
--- a/examples/stm32h7/src/bin/button_exti.rs
+++ b/examples/stm32h7/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
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/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;
 use embassy::util::Forever;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::spi;
-use embedded_hal::blocking::spi::Transfer;
 use example_common::*;
 
 use core::str::from_utf8;
@@ -25,7 +24,7 @@ async fn main_task(mut spi: spi::Spi<'static, SPI3, NoDma, NoDma>) {
         let mut write: String<128> = String::new();
         core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
         unsafe {
-            let result = spi.transfer(write.as_bytes_mut());
+            let result = spi.blocking_transfer_in_place(write.as_bytes_mut());
             if let Err(_) = result {
                 defmt::panic!("crap");
             }
diff --git a/examples/stm32h7/src/bin/usart.rs b/examples/stm32h7/src/bin/usart.rs
index 95f0a8604..211e57cda 100644
--- a/examples/stm32h7/src/bin/usart.rs
+++ b/examples/stm32h7/src/bin/usart.rs
@@ -4,7 +4,6 @@
 
 #[path = "../example_common.rs"]
 mod example_common;
-use cortex_m::prelude::_embedded_hal_blocking_serial_Write;
 use embassy::executor::Executor;
 use embassy::util::Forever;
 use embassy_stm32::dma::NoDma;
@@ -20,13 +19,13 @@ async fn main_task() {
     let config = Config::default();
     let mut usart = Uart::new(p.UART7, p.PF6, p.PF7, NoDma, NoDma, config);
 
-    unwrap!(usart.bwrite_all(b"Hello Embassy World!\r\n"));
+    unwrap!(usart.blocking_write(b"Hello Embassy World!\r\n"));
     info!("wrote Hello, starting echo");
 
     let mut buf = [0u8; 1];
     loop {
-        unwrap!(usart.read_blocking(&mut buf));
-        unwrap!(usart.bwrite_all(&buf));
+        unwrap!(usart.blocking_read(&mut buf));
+        unwrap!(usart.blocking_write(&buf));
     }
 }
 
diff --git a/examples/stm32h7/src/bin/usart_dma.rs b/examples/stm32h7/src/bin/usart_dma.rs
index d603347ac..a9221e1b6 100644
--- a/examples/stm32h7/src/bin/usart_dma.rs
+++ b/examples/stm32h7/src/bin/usart_dma.rs
@@ -9,7 +9,6 @@ use embassy::executor::Executor;
 use embassy::util::Forever;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
-use embassy_traits::uart::Write as _Write;
 use example_common::*;
 
 use cortex_m_rt::entry;
diff --git a/examples/stm32l0/.cargo/config.toml b/examples/stm32l0/.cargo/config.toml
index 4ea047484..840faa62e 100644
--- a/examples/stm32l0/.cargo/config.toml
+++ b/examples/stm32l0/.cargo/config.toml
@@ -1,6 +1,6 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
 # replace your chip as listed in `probe-run --list-chips`
-runner = "probe-run --chip STM32L072CZ"
+runner = "probe-run --chip STM32L072CZTx"
 
 [build]
 target = "thumbv6m-none-eabi"
diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml
index 7056d580a..20a2ec8d0 100644
--- a/examples/stm32l0/Cargo.toml
+++ b/examples/stm32l0/Cargo.toml
@@ -8,7 +8,7 @@ resolver = "2"
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-tim3", "exti"]  }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-tim3", "exti", "memory-x"]  }
 
 embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx127x", "time", "defmt"] }
 
diff --git a/examples/stm32l0/build.rs b/examples/stm32l0/build.rs
index 30691aa97..8cd32d7ed 100644
--- a/examples/stm32l0/build.rs
+++ b/examples/stm32l0/build.rs
@@ -1,34 +1,4 @@
-//! This build script copies the `memory.x` file from the crate root into
-//! a directory where the linker can always find it at build time.
-//! For many projects this is optional, as the linker always searches the
-//! project root directory -- wherever `Cargo.toml` is. However, if you
-//! are using a workspace or have a more complicated build setup, this
-//! build script becomes required. Additionally, by requesting that
-//! Cargo re-run the build script whenever `memory.x` is changed,
-//! updating `memory.x` ensures a rebuild of the application with the
-//! new memory settings.
-
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-
 fn main() {
-    // Put `memory.x` in our output directory and ensure it's
-    // on the linker search path.
-    let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    File::create(out.join("memory.x"))
-        .unwrap()
-        .write_all(include_bytes!("memory.x"))
-        .unwrap();
-    println!("cargo:rustc-link-search={}", out.display());
-
-    // By default, Cargo will re-run a build script whenever
-    // any file in the project changes. By specifying `memory.x`
-    // here, we ensure the build script is only re-run when
-    // `memory.x` is changed.
-    println!("cargo:rerun-if-changed=memory.x");
-
     println!("cargo:rustc-link-arg-bins=--nmagic");
     println!("cargo:rustc-link-arg-bins=-Tlink.x");
     println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
diff --git a/examples/stm32l0/memory.x b/examples/stm32l0/memory.x
deleted file mode 100644
index 67a50a5ff..000000000
--- a/examples/stm32l0/memory.x
+++ /dev/null
@@ -1,5 +0,0 @@
-MEMORY
-{
-  FLASH : ORIGIN = 0x08000000, LENGTH = 192K
-  RAM : ORIGIN = 0x20000000, LENGTH = 20K
-}
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/button_exti.rs b/examples/stm32l0/src/bin/button_exti.rs
index 88c75ce6d..3edea3976 100644
--- a/examples/stm32l0/src/bin/button_exti.rs
+++ b/examples/stm32l0/src/bin/button_exti.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 fn config() -> embassy_stm32::Config {
diff --git a/examples/stm32l0/src/bin/spi.rs b/examples/stm32l0/src/bin/spi.rs
index f768a5227..8d6e89d91 100644
--- a/examples/stm32l0/src/bin/spi.rs
+++ b/examples/stm32l0/src/bin/spi.rs
@@ -7,14 +7,12 @@ 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;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::spi::Transfer;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
@@ -35,9 +33,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
 
     loop {
         let mut buf = [0x0Au8; 4];
-        unwrap!(cs.set_low());
-        unwrap!(spi.transfer(&mut buf));
-        unwrap!(cs.set_high());
+        cs.set_low();
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
+        cs.set_high();
         info!("xfer {=[u8]:x}", buf);
     }
 }
diff --git a/examples/stm32l0/src/bin/usart_dma.rs b/examples/stm32l0/src/bin/usart_dma.rs
index 3fe61c13d..543e66f62 100644
--- a/examples/stm32l0/src/bin/usart_dma.rs
+++ b/examples/stm32l0/src/bin/usart_dma.rs
@@ -10,7 +10,6 @@ use example_common::*;
 use embassy::executor::Spawner;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embassy_traits::uart::{Read, Write};
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
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..e97e3ebb4 100644
--- a/examples/stm32l1/src/bin/spi.rs
+++ b/examples/stm32l1/src/bin/spi.rs
@@ -7,14 +7,12 @@ 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;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::spi::Transfer;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
@@ -35,9 +33,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
 
     loop {
         let mut buf = [0x0Au8; 4];
-        unwrap!(cs.set_low());
-        unwrap!(spi.transfer(&mut buf));
-        unwrap!(cs.set_high());
+        cs.set_low();
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
+        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/button_exti.rs b/examples/stm32l4/src/bin/button_exti.rs
index 0c2483ecb..848818bf2 100644
--- a/examples/stm32l4/src/bin/button_exti.rs
+++ b/examples/stm32l4/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
diff --git a/examples/stm32l4/src/bin/i2c.rs b/examples/stm32l4/src/bin/i2c.rs
index 86215697b..615012a06 100644
--- a/examples/stm32l4/src/bin/i2c.rs
+++ b/examples/stm32l4/src/bin/i2c.rs
@@ -11,7 +11,6 @@ use embassy_stm32::i2c::I2c;
 use embassy_stm32::interrupt;
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::i2c::WriteRead;
 use example_common::{info, unwrap};
 
 const ADDRESS: u8 = 0x5F;
@@ -23,6 +22,6 @@ async fn main(_spawner: Spawner, p: Peripherals) -> ! {
     let mut i2c = I2c::new(p.I2C2, p.PB10, p.PB11, irq, NoDma, NoDma, Hertz(100_000));
 
     let mut data = [0u8; 1];
-    unwrap!(i2c.write_read(ADDRESS, &[WHOAMI], &mut data));
+    unwrap!(i2c.blocking_write_read(ADDRESS, &[WHOAMI], &mut data));
     info!("Whoami: {}", data[0]);
 }
diff --git a/examples/stm32l4/src/bin/i2c_dma.rs b/examples/stm32l4/src/bin/i2c_dma.rs
index b0596aab8..d77bee8c1 100644
--- a/examples/stm32l4/src/bin/i2c_dma.rs
+++ b/examples/stm32l4/src/bin/i2c_dma.rs
@@ -6,7 +6,6 @@
 mod example_common;
 
 use embassy::executor::Spawner;
-use embassy::traits::i2c::I2c as I2cTrait;
 use embassy_stm32::i2c::I2c;
 use embassy_stm32::interrupt;
 use embassy_stm32::time::Hertz;
diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs
index 5b9ae1ce0..8567d3062 100644
--- a/examples/stm32l4/src/bin/spi.rs
+++ b/examples/stm32l4/src/bin/spi.rs
@@ -9,8 +9,6 @@ use embassy_stm32::dma::NoDma;
 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 +32,9 @@ fn main() -> ! {
 
     loop {
         let mut buf = [0x0Au8; 4];
-        unwrap!(cs.set_low());
-        unwrap!(spi.transfer(&mut buf));
-        unwrap!(cs.set_high());
+        cs.set_low();
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
+        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/stm32l4/src/bin/usart.rs b/examples/stm32l4/src/bin/usart.rs
index b6decbc9d..00875c896 100644
--- a/examples/stm32l4/src/bin/usart.rs
+++ b/examples/stm32l4/src/bin/usart.rs
@@ -7,7 +7,6 @@ mod example_common;
 
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
-use embedded_hal::blocking::serial::Write;
 use example_common::*;
 
 #[cortex_m_rt::entry]
@@ -19,12 +18,12 @@ fn main() -> ! {
     let config = Config::default();
     let mut usart = Uart::new(p.UART4, p.PA1, p.PA0, NoDma, NoDma, config);
 
-    unwrap!(usart.bwrite_all(b"Hello Embassy World!\r\n"));
+    unwrap!(usart.blocking_write(b"Hello Embassy World!\r\n"));
     info!("wrote Hello, starting echo");
 
     let mut buf = [0u8; 1];
     loop {
-        unwrap!(usart.read_blocking(&mut buf));
-        unwrap!(usart.bwrite_all(&buf));
+        unwrap!(usart.blocking_read(&mut buf));
+        unwrap!(usart.blocking_write(&buf));
     }
 }
diff --git a/examples/stm32l4/src/bin/usart_dma.rs b/examples/stm32l4/src/bin/usart_dma.rs
index b49d3d882..b3a1e3897 100644
--- a/examples/stm32l4/src/bin/usart_dma.rs
+++ b/examples/stm32l4/src/bin/usart_dma.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embassy_traits::uart::Write as _;
 use example_common::*;
 use heapless::String;
 
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/stm32wb55/src/bin/button_exti.rs b/examples/stm32wb55/src/bin/button_exti.rs
index aeb7bd8a6..4592fa308 100644
--- a/examples/stm32wb55/src/bin/button_exti.rs
+++ b/examples/stm32wb55/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
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/button_exti.rs b/examples/stm32wl55/src/bin/button_exti.rs
index 31adfb5d1..8d66c7258 100644
--- a/examples/stm32wl55/src/bin/button_exti.rs
+++ b/examples/stm32wl55/src/bin/button_exti.rs
@@ -8,7 +8,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
 #[embassy::main]
diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl55/src/bin/subghz.rs
index 52fe6e9fa..42d4eb64c 100644
--- a/examples/stm32wl55/src/bin/subghz.rs
+++ b/examples/stm32wl55/src/bin/subghz.rs
@@ -10,14 +10,12 @@ mod example_common;
 
 use embassy::channel::signal::Signal;
 use embassy::interrupt::{Interrupt, InterruptExt};
-use embassy::traits::gpio::WaitForRisingEdge;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::exti::ExtiInput;
 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 +87,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 +108,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 +125,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();
     }
 }