[arduino-hal] remove embedded-hal-v0 dependency

Rahix · Jan 4, 2025 · d475be1 · d475be1
1 parent b417d5c
commit d475be1
Show file tree

Hide file tree

Showing 26 changed files with 13 additions and 61 deletions.
diff --git a/arduino-hal/Cargo.toml b/arduino-hal/Cargo.toml
@@ -40,10 +40,6 @@ cfg-if = "1"
 embedded-hal = "1.0"
 ufmt = "0.2.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.avr-hal-generic]
 path = "../avr-hal-generic/"
 

diff --git a/arduino-hal/src/delay.rs b/arduino-hal/src/delay.rs
@@ -1,4 +1,4 @@
-use embedded_hal_v0::blocking::delay::{DelayMs, DelayUs};
+use embedded_hal::delay::DelayNs;
 
 /// Delay type for `embedded-hal` compatibility.
 ///
@@ -10,7 +10,7 @@ pub type Delay = avr_hal_generic::delay::Delay<crate::DefaultClock>;
 ///
 /// Busy-loop for the given time.  This function assumes the default clock speed defined by
 /// [`arduino_hal::DefaultClock`][crate::DefaultClock].
-pub fn delay_ms(ms: u16) {
+pub fn delay_ms(ms: u32) {
     Delay::new().delay_ms(ms)
 }
 
@@ -21,3 +21,11 @@ pub fn delay_ms(ms: u16) {
 pub fn delay_us(us: u32) {
     Delay::new().delay_us(us)
 }
+
+/// Delay execution for a number of nanoseconds.
+///
+/// Busy-loop for the given time.  This function assumes the default clock speed defined by
+/// [`arduino_hal::DefaultClock`][crate::DefaultClock].
+pub fn delay_ns(ns: u32) {
+    Delay::new().delay_ns(ns)
+}
diff --git a/arduino-hal/src/lib.rs b/arduino-hal/src/lib.rs
@@ -120,7 +120,7 @@ pub use clock::default::DefaultClock;
 #[cfg(feature = "board-selected")]
 mod delay;
 #[cfg(feature = "board-selected")]
-pub use delay::{delay_ms, delay_us, Delay};
+pub use delay::{delay_ms, delay_ns, delay_us, Delay};
 
 #[cfg(feature = "board-selected")]
 pub mod port;

diff --git a/examples/arduino-diecimila/Cargo.toml b/examples/arduino-diecimila/Cargo.toml
@@ -11,10 +11,6 @@ ufmt = "0.2.0"
 nb = "1.1.0"
 embedded-hal = "1.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["arduino-diecimila"]

diff --git a/examples/arduino-diecimila/src/bin/diecimila-spi-feedback.rs b/examples/arduino-diecimila/src/bin/diecimila-spi-feedback.rs
@@ -17,7 +17,6 @@
 
 use arduino_hal::prelude::*;
 use arduino_hal::spi;
-use embedded_hal_v0::spi::FullDuplex;
 use panic_halt as _;
 
 #[arduino_hal::entry]

diff --git a/examples/arduino-diecimila/src/bin/diecimila-usart.rs b/examples/arduino-diecimila/src/bin/diecimila-usart.rs
@@ -4,8 +4,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();

diff --git a/examples/arduino-leonardo/Cargo.toml b/examples/arduino-leonardo/Cargo.toml
@@ -11,10 +11,6 @@ ufmt = "0.2.0"
 nb = "1.1.0"
 embedded-hal = "1.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["arduino-leonardo"]

diff --git a/examples/arduino-leonardo/src/bin/leonardo-spi-feedback.rs b/examples/arduino-leonardo/src/bin/leonardo-spi-feedback.rs
@@ -17,7 +17,6 @@
 
 use arduino_hal::prelude::*;
 use arduino_hal::spi;
-use embedded_hal_v0::spi::FullDuplex;
 use panic_halt as _;
 
 #[arduino_hal::entry]

diff --git a/examples/arduino-leonardo/src/bin/leonardo-usart.rs b/examples/arduino-leonardo/src/bin/leonardo-usart.rs
@@ -4,8 +4,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();

diff --git a/examples/arduino-mega1280/Cargo.toml b/examples/arduino-mega1280/Cargo.toml
@@ -11,10 +11,6 @@ ufmt = "0.2.0"
 nb = "1.1.0"
 embedded-hal = "1.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["arduino-mega1280"]

diff --git a/examples/arduino-mega1280/src/bin/mega1280-usart.rs b/examples/arduino-mega1280/src/bin/mega1280-usart.rs
@@ -4,8 +4,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();

diff --git a/examples/arduino-mega1280/src/bin/mega1280spi-feedback.rs b/examples/arduino-mega1280/src/bin/mega1280spi-feedback.rs
@@ -17,7 +17,6 @@
 
 use arduino_hal::prelude::*;
 use arduino_hal::spi;
-use embedded_hal_v0::spi::FullDuplex;
 use panic_halt as _;
 
 #[arduino_hal::entry]

diff --git a/examples/arduino-mega2560/Cargo.toml b/examples/arduino-mega2560/Cargo.toml
@@ -11,10 +11,6 @@ ufmt = "0.2.0"
 nb = "1.1.0"
 embedded-hal = "1.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["arduino-mega2560"]

diff --git a/examples/arduino-mega2560/src/bin/mega2560-spi-feedback.rs b/examples/arduino-mega2560/src/bin/mega2560-spi-feedback.rs
@@ -17,7 +17,6 @@
 
 use arduino_hal::prelude::*;
 use arduino_hal::spi;
-use embedded_hal_v0::spi::FullDuplex;
 use panic_halt as _;
 
 #[arduino_hal::entry]

diff --git a/examples/arduino-mega2560/src/bin/mega2560-usart.rs b/examples/arduino-mega2560/src/bin/mega2560-usart.rs
@@ -4,8 +4,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();

diff --git a/examples/arduino-uno/Cargo.toml b/examples/arduino-uno/Cargo.toml
@@ -14,10 +14,6 @@ pwm-pca9685 = "1.0.0"
 infrared = "0.14.1"
 embedded-storage = "0.2"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["arduino-uno"]

diff --git a/examples/arduino-uno/src/bin/uno-ext-interrupt.rs b/examples/arduino-uno/src/bin/uno-ext-interrupt.rs
@@ -26,7 +26,7 @@ fn INT0() {
     REVERSED.store(!current, Ordering::SeqCst);
 }
 
-fn blink_for_range(range: impl Iterator<Item = u16>, leds: &mut [Pin<mode::Output>]) {
+fn blink_for_range(range: impl Iterator<Item = u32>, leds: &mut [Pin<mode::Output>]) {
     range.map(|i| i * 100).for_each(|ms| {
         let iter = if is_reversed() {
             Left(leds.iter_mut().rev())
@@ -35,7 +35,7 @@ fn blink_for_range(range: impl Iterator<Item = u16>, leds: &mut [Pin<mode::Outpu
         };
         iter.for_each(|led| {
             led.toggle();
-            arduino_hal::delay_ms(ms as u16);
+            arduino_hal::delay_ms(ms);
         })
     });
 }

diff --git a/examples/arduino-uno/src/bin/uno-millis.rs b/examples/arduino-uno/src/bin/uno-millis.rs
@@ -16,8 +16,6 @@ use arduino_hal::prelude::*;
 use core::cell;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 // Possible Values:
 //
 // ╔═══════════╦══════════════╦═══════════════════╗

diff --git a/examples/arduino-uno/src/bin/uno-spi-feedback.rs b/examples/arduino-uno/src/bin/uno-spi-feedback.rs
@@ -16,7 +16,6 @@
 
 use arduino_hal::prelude::*;
 use arduino_hal::spi;
-use embedded_hal_v0::spi::FullDuplex;
 use panic_halt as _;
 
 #[arduino_hal::entry]

diff --git a/examples/arduino-uno/src/bin/uno-usart.rs b/examples/arduino-uno/src/bin/uno-usart.rs
@@ -7,8 +7,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();

diff --git a/examples/nano168/Cargo.toml b/examples/nano168/Cargo.toml
@@ -12,10 +12,6 @@ ufmt = "0.2.0"
 nb = "1.1.0"
 embedded-hal = "1.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["nano168"]

diff --git a/examples/nano168/src/bin/nano168-millis.rs b/examples/nano168/src/bin/nano168-millis.rs
@@ -14,8 +14,6 @@ use arduino_hal::prelude::*;
 use core::cell;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 // Possible Values:
 //
 // ╔═══════════╦══════════════╦═══════════════════╗

diff --git a/examples/nano168/src/bin/nano168-usart.rs b/examples/nano168/src/bin/nano168-usart.rs
@@ -4,8 +4,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();

diff --git a/examples/sparkfun-promicro/Cargo.toml b/examples/sparkfun-promicro/Cargo.toml
@@ -11,10 +11,6 @@ ufmt = "0.2.0"
 nb = "1.1.0"
 embedded-hal = "1.0"
 
-[dependencies.embedded-hal-v0]
-version = "0.2.3"
-package = "embedded-hal"
-
 [dependencies.arduino-hal]
 path = "../../arduino-hal/"
 features = ["sparkfun-promicro"]

diff --git a/examples/sparkfun-promicro/src/bin/promicro-spi-feedback.rs b/examples/sparkfun-promicro/src/bin/promicro-spi-feedback.rs
@@ -17,7 +17,6 @@
 
 use arduino_hal::prelude::*;
 use arduino_hal::spi;
-use embedded_hal_v0::spi::FullDuplex;
 use panic_halt as _;
 
 #[arduino_hal::entry]

diff --git a/examples/sparkfun-promicro/src/bin/promicro-usart.rs b/examples/sparkfun-promicro/src/bin/promicro-usart.rs
@@ -4,8 +4,6 @@
 use arduino_hal::prelude::*;
 use panic_halt as _;
 
-use embedded_hal_v0::serial::Read;
-
 #[arduino_hal::entry]
 fn main() -> ! {
     let dp = arduino_hal::Peripherals::take().unwrap();