diff --git a/arduino-hal/Cargo.toml b/arduino-hal/Cargo.toml index 1f400c73f3..444f794e1e 100644 --- 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 index f1b590724f..049a2abe62 100644 --- 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; /// /// 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 index 5e78dc3318..eb513bb354 100644 --- 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 index f98939ce05..2dc2582ffe 100644 --- 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 index 95f0be133a..6c77eb5c7e 100644 --- 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 index ed6a719d41..7b2aeef696 100644 --- 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 index 832e5d4318..2344850bb4 100644 --- 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 index 11551f83da..7428c30a69 100644 --- 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 index a8c2339555..b110e7314a 100644 --- 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 index 09f9eebf6e..d550247c52 100644 --- 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 index a8c2339555..b110e7314a 100644 --- 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 index 6024ae46b0..920803fda9 100644 --- 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 index 4b0d214e75..ed85608441 100644 --- 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 index d05fa025f7..74ae76c711 100644 --- 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 index a8c2339555..b110e7314a 100644 --- 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 index 85092a492c..92fce2cf3e 100644 --- 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 index 2279841dfa..ee6ebc3d05 100644 --- 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, leds: &mut [Pin]) { +fn blink_for_range(range: impl Iterator, leds: &mut [Pin]) { 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, leds: &mut [Pin ! { let dp = arduino_hal::Peripherals::take().unwrap(); diff --git a/examples/nano168/Cargo.toml b/examples/nano168/Cargo.toml index 0caa120d25..5f48065197 100644 --- 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 index e957e62614..0375607ee7 100644 --- 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 index a8c2339555..b110e7314a 100644 --- 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 index 63e9a0814f..2747bb2d3c 100644 --- 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 index 00cb37406e..aa24469837 100644 --- 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 index a8c2339555..b110e7314a 100644 --- 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();