Switch to crates.io embedded-hal, embedded-hal-async.

This temporarily removes support for the async UART trait, since it's
not yet in embedded-hal-async.

5 files changed, 13 insertions, 40 deletions

diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
index 2cce0af37..827adea23 100644
--- a/examples/rp/Cargo.toml
+++ b/examples/rp/Cargo.toml
@@ -20,7 +20,8 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
 display-interface-spi = "0.4.1"
 embedded-graphics = "0.7.1"
 st7789 = "0.6.1"
-
-embedded-hal = { version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2" }
 display-interface = "0.4.1"
 byte-slice-cast = { version = "1.2.0", default-features = false }
+
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs
index bc93e0617..5c3c4c4c5 100644
--- a/examples/rp/src/bin/spi_display.rs
+++ b/examples/rp/src/bin/spi_display.rs
@@ -110,9 +110,9 @@ mod shared_spi {
     use core::cell::RefCell;
     use core::fmt::Debug;
 
-    use embedded_hal::digital::blocking::OutputPin;
-    use embedded_hal::spi;
-    use embedded_hal::spi::blocking::SpiDevice;
+    use embedded_hal_1::digital::blocking::OutputPin;
+    use embedded_hal_1::spi;
+    use embedded_hal_1::spi::blocking::SpiDevice;
 
     #[derive(Copy, Clone, Eq, PartialEq, Debug)]
     pub enum SpiDeviceWithCsError<BUS, CS> {
@@ -184,7 +184,7 @@ mod shared_spi {
 
 /// Driver for the XPT2046 resistive touchscreen sensor
 mod touch {
-    use embedded_hal::spi::blocking::{SpiBus, SpiBusRead, SpiBusWrite, SpiDevice};
+    use embedded_hal_1::spi::blocking::{SpiBus, SpiBusRead, SpiBusWrite, SpiDevice};
 
     struct Calibration {
         x1: i32,
@@ -248,8 +248,8 @@ mod touch {
 
 mod my_display_interface {
     use display_interface::{DataFormat, DisplayError, WriteOnlyDataCommand};
-    use embedded_hal::digital::blocking::OutputPin;
-    use embedded_hal::spi::blocking::{SpiBusWrite, SpiDevice};
+    use embedded_hal_1::digital::blocking::OutputPin;
+    use embedded_hal_1::spi::blocking::{SpiBusWrite, SpiDevice};
 
     /// SPI display interface.
     ///
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index f237a8173..419bbec31 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -18,7 +18,8 @@ defmt-rtt = "0.3"
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 heapless = { version = "0.7.5", default-features = false }
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml
index 5838d01db..2da549bb2 100644
--- a/examples/stm32l4/Cargo.toml
+++ b/examples/stm32l4/Cargo.toml
@@ -18,7 +18,8 @@ defmt-rtt = "0.3"
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 heapless = { version = "0.7.5", default-features = false }
diff --git a/examples/stm32l4/src/bin/usart_blocking_async.rs b/examples/stm32l4/src/bin/usart_blocking_async.rs
deleted file mode 100644
index 7efccace5..000000000
--- a/examples/stm32l4/src/bin/usart_blocking_async.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-#![no_std]
-#![no_main]
-#![feature(type_alias_impl_trait)]
-
-use defmt_rtt as _; // global logger
-use panic_probe as _;
-
-use defmt::*;
-use embassy::executor::Spawner;
-use embassy_stm32::dma::NoDma;
-use embassy_stm32::usart::{Config, Uart};
-use embassy_stm32::Peripherals;
-use embassy_traits::adapter::BlockingAsync;
-use embedded_hal_async::serial::{Read, Write};
-
-#[embassy::main]
-async fn main(_spawner: Spawner, p: Peripherals) {
-    let config = Config::default();
-    let usart = Uart::new(p.UART4, p.PA1, p.PA0, NoDma, NoDma, config);
-    let mut usart = BlockingAsync::new(usart);
-
-    unwrap!(usart.write(b"Hello Embassy World!\r\n").await);
-    info!("wrote Hello, starting echo");
-
-    let mut buf = [0u8; 1];
-    loop {
-        unwrap!(usart.read(&mut buf).await);
-        unwrap!(usart.write(&buf).await);
-    }
-}