split embedded-hal dependency

Author: almindor

Cargo.toml

@@ -11,7 +11,8 @@ edition = "2018"
 rust-version = "1.59"
 
 [dependencies]
-embedded-hal = { version = "0.2.6", features = ["unproven"] }
+embedded-hal-0 = { package = "embedded-hal", version = "0.2.7", features = ["unproven"] }
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0" }
 nb = "1.0.0"
 riscv = { version = "0.10.1", features = ["critical-section-single-hart"] }
 e310x = { version = "0.11.0", features = ["rt", "critical-section"] }

src/delay.rs

@@ -2,7 +2,7 @@
 
 use crate::clock::Clocks;
 use crate::core::clint::{MTIME, MTIMECMP};
-use embedded_hal::blocking::delay::{DelayMs, DelayUs};
+use embedded_hal_0::blocking::delay::{DelayMs, DelayUs};
 use riscv::register::{mie, mip};
 
 /// Machine timer (mtime) as a busyloop delay provider

src/gpio.rs

@@ -146,7 +146,7 @@ macro_rules! gpio {
             use core::marker::PhantomData;
             use core::convert::Infallible;
 
-            use embedded_hal::digital::v2::{InputPin, OutputPin, StatefulOutputPin,
+            use embedded_hal_0::digital::v2::{InputPin, OutputPin, StatefulOutputPin,
                                ToggleableOutputPin};
             use e310x::$GPIOX;
             use super::{Unknown, IOF0, IOF1, Drive, Floating, GpioExt, Input, Invert,

src/i2c.rs

@@ -16,7 +16,7 @@ use crate::time::Bps;
 use core::mem;
 use core::ops::Deref;
 use e310x::{i2c0, I2C0};
-use embedded_hal::blocking::i2c::{Read, Write, WriteRead};
+use embedded_hal_0::blocking::i2c::{Read, Write, WriteRead};
 
 /// SDA pin - DO NOT IMPLEMENT THIS TRAIT
 pub unsafe trait SdaPin<I2C> {}

src/prelude.rs

@@ -7,9 +7,9 @@ pub use crate::rtc::RtcExt as _e310x_hal_rtc_RtcExt;
 pub use crate::stdout::Write as _e310x_hal_stdout_Write;
 pub use crate::time::U32Ext as _e310x_hal_time_U32Ext;
 pub use crate::wdog::WdogExt as _e310x_hal_wdog_WdogExt;
-pub use embedded_hal::digital::v2::{
+pub use embedded_hal_0::digital::v2::{
     InputPin as _embedded_hal_digital_v2_InputPin, OutputPin as _embedded_hal_digital_v2_OutputPin,
     StatefulOutputPin as _embedded_hal_digital_v2_StatefulOutputPin,
     ToggleableOutputPin as _embedded_hal_digital_v2_ToggleableOutputPin,
 };
-pub use embedded_hal::prelude::*;
+pub use embedded_hal_0::prelude::*;

src/pwm.rs

@@ -175,7 +175,7 @@ impl<PWM: PwmX> Pwm<PWM> {
     }
 }
 
-impl<PWM: PwmX> embedded_hal::Pwm for Pwm<PWM> {
+impl<PWM: PwmX> embedded_hal_0::Pwm for Pwm<PWM> {
     type Channel = Channel<PWM>;
 
     type Time = PWM::CmpWidth;

src/serial.rs

@@ -16,7 +16,7 @@
 use core::convert::Infallible;
 use core::ops::Deref;
 
-use embedded_hal::serial;
+use embedded_hal_0::serial;
 use nb;
 
 use crate::clock::Clocks;

src/spi/bus.rs

@@ -1,7 +1,7 @@
 use core::convert::Infallible;
-use embedded_hal::blocking::spi::Operation;
-pub use embedded_hal::blocking::spi::{Transfer, Write, WriteIter};
-pub use embedded_hal::spi::{FullDuplex, Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
+use embedded_hal_0::blocking::spi::Operation;
+pub use embedded_hal_0::blocking::spi::{Transfer, Write, WriteIter};
+pub use embedded_hal_0::spi::{FullDuplex, Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 
 use nb;
 

src/spi/config.rs

@@ -1,5 +1,5 @@
 use e310x::qspi0::csmode::MODE_A;
-use embedded_hal::spi::Mode;
+use embedded_hal_0::spi::Mode;
 
 use crate::{clock::Clocks, time::Hertz};
 

src/spi/exclusive_device.rs

@@ -1,6 +1,6 @@
 use core::convert::Infallible;
 
-use embedded_hal::{
+use embedded_hal_0::{
     blocking::spi::{Operation, Transactional, Transfer, Write, WriteIter},
     spi::FullDuplex,
 };

src/spi/shared_bus.rs

@@ -1,6 +1,6 @@
 use core::cell::RefCell;
 use core::ops::Deref;
-pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
+// pub use embedded_hal_0::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 use riscv::interrupt;
 
 use super::{PinCS, PinsNoCS, SpiBus, SpiConfig, SpiSharedDevice, SpiX};

src/spi/shared_device.rs

@@ -1,6 +1,6 @@
 use core::convert::Infallible;
 
-use embedded_hal::{
+use embedded_hal_0::{
     blocking::spi::{Operation, Transactional, Transfer, Write, WriteIter},
     spi::FullDuplex,
 };

src/stdout.rs

@@ -10,7 +10,7 @@ where
 
 impl<'p, T> Write for Stdout<'p, T>
 where
-    T: embedded_hal::serial::Write<u8>,
+    T: embedded_hal_0::serial::Write<u8>,
 {
     fn write_str(&mut self, s: &str) -> ::core::fmt::Result {
         for byte in s.as_bytes() {