From d9aec181a4612ba5ffff4c2a9d1ba762021e3b29 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Tue, 15 Feb 2022 17:28:48 +0100
Subject: rp: impl eh1.0 blocking traits

---
 examples/rp/.cargo/config.toml     | 2 +-
 examples/rp/Cargo.toml             | 2 +-
 examples/rp/src/bin/spi.rs         | 2 +-
 examples/rp/src/bin/spi_display.rs | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/rp/.cargo/config.toml b/examples/rp/.cargo/config.toml
index 1ce57510b..ac54f9693 100644
--- a/examples/rp/.cargo/config.toml
+++ b/examples/rp/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "probe-run-rp --chip RP2040"
+runner = "probe-run --chip RP2040"
 
 [build]
 target = "thumbv6m-none-eabi"        # Cortex-M0 and Cortex-M0+
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
index b3dfb04dc..c067fbbcf 100644
--- a/examples/rp/Cargo.toml
+++ b/examples/rp/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
-embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt"] }
+embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac"] }
 atomic-polyfill = "0.1.5"
 
 defmt = "0.3"
diff --git a/examples/rp/src/bin/spi.rs b/examples/rp/src/bin/spi.rs
index 71dec94f3..3348dc999 100644
--- a/examples/rp/src/bin/spi.rs
+++ b/examples/rp/src/bin/spi.rs
@@ -34,7 +34,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     loop {
         cs.set_low();
         let mut buf = [0x90, 0x00, 0x00, 0xd0, 0x00, 0x00];
-        spi.transfer(&mut buf);
+        spi.blocking_transfer_in_place(&mut buf).unwrap();
         cs.set_high();
 
         let x = (buf[1] as u32) << 5 | (buf[2] as u32) >> 3;
diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs
index 96f0cf378..01149c250 100644
--- a/examples/rp/src/bin/spi_display.rs
+++ b/examples/rp/src/bin/spi_display.rs
@@ -131,7 +131,7 @@ impl<'a> embedded_hal::blocking::spi::Write<u8> for DisplaySpi<'a> {
             this.display_cs.set_low();
             this.last_mode = SpiMode::Display;
         }
-        this.spi.write(words);
+        this.spi.write(words).unwrap();
         Ok(())
     }
 }
@@ -147,7 +147,7 @@ impl<'a> embedded_hal::blocking::spi::Transfer<u8> for TouchSpi<'a> {
             this.display_cs.set_high();
             this.last_mode = SpiMode::Touch;
         }
-        this.spi.transfer(words);
+        this.spi.transfer(words).unwrap();
         Ok(words)
     }
 }
-- 
cgit