Merge pull request #436 from nrf-rs/embedded-hal-examples

Use embedded-hal 1.0 in tests and examples

examples/blinky-button-demo/Cargo.toml

@@ -9,9 +9,6 @@ edition = "2018"
 [dependencies]
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
+embedded-hal = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52832-hal = { features = ["rt"], path = "../../nrf52832-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/blinky-button-demo/src/main.rs

@@ -1,8 +1,8 @@
 #![no_main]
 #![no_std]
 
-use embedded_hal::digital::v2::InputPin;
-use embedded_hal::digital::v2::OutputPin;
+use embedded_hal::digital::InputPin;
+use embedded_hal::digital::OutputPin;
 use nrf52832_hal as hal;
 use nrf52832_hal::gpio::Level;
 use rtt_target::{rprintln, rtt_init_print};
@@ -19,7 +19,7 @@ fn main() -> ! {
     rtt_init_print!();
     let p = hal::pac::Peripherals::take().unwrap();
     let port0 = hal::gpio::p0::Parts::new(p.P0);
-    let button = port0.p0_13.into_pullup_input();
+    let mut button = port0.p0_13.into_pullup_input();
     let mut led = port0.p0_17.into_push_pull_output(Level::Low);
 
     rprintln!("Blinky button demo starting");

examples/comp-demo/Cargo.toml

@@ -11,9 +11,6 @@ publish = false
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/comp-demo/src/main.rs

@@ -5,7 +5,7 @@ use {core::panic::PanicInfo, rtt_target::rprintln};
 
 #[rtic::app(device = nrf52840_hal::pac, peripherals = true)]
 mod app {
-    use embedded_hal::digital::v2::OutputPin;
+    use embedded_hal::digital::OutputPin;
     use nrf52840_hal::clocks::Clocks;
     use nrf52840_hal::comp::*;
     use nrf52840_hal::gpio::{self, Level, Output, Pin, PushPull};

examples/gpiote-demo/Cargo.toml

@@ -10,10 +10,7 @@ edition = "2018"
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0.0"
 systick-monotonic = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/gpiote-demo/src/main.rs

@@ -5,7 +5,7 @@ use {core::panic::PanicInfo, nrf52840_hal as hal, rtt_target::rprintln};
 
 #[rtic::app(device = crate::hal::pac, peripherals = true, dispatchers = [SWI0_EGU0])]
 mod app {
-    use embedded_hal::digital::v2::InputPin;
+    use embedded_hal::digital::InputPin;
     use systick_monotonic::*;
     use {
         hal::{

examples/hello-world/Cargo.toml

@@ -11,10 +11,6 @@ publish = false
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]
-
 [dependencies.nrf9160-hal]
 features = ["rt"]
 path = "../../nrf9160-hal"

examples/i2s-controller-demo/Cargo.toml

@@ -11,12 +11,9 @@ publish = false
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0.0"
 systick-monotonic = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 heapless = "0.7.10"
 small_morse = "0.1.0"
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/i2s-controller-demo/src/main.rs

@@ -13,7 +13,7 @@ pub struct Aligned<T: ?Sized>(T);
 #[rtic::app(device = crate::hal::pac, peripherals = true, dispatchers = [SWI0_EGU0, SWI1_EGU1])]
 mod app {
     use crate::{hal, triangle_wave, Aligned};
-    use embedded_hal::digital::v2::{InputPin, OutputPin};
+    use embedded_hal::digital::{InputPin, OutputPin};
     use heapless::spsc::{Consumer, Producer, Queue};
     use small_morse::{encode, State};
     use systick_monotonic::*;

examples/i2s-peripheral-demo/Cargo.toml

@@ -11,9 +11,6 @@ publish = false
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/i2s-peripheral-demo/src/main.rs

@@ -19,7 +19,7 @@ mod app {
         spim::{self, Frequency, Mode as SPIMode, Phase, Polarity, Spim},
     };
     use crate::Aligned;
-    use embedded_hal::blocking::spi::Write;
+    use embedded_hal::spi::SpiBus;
     use rtt_target::{rprintln, rtt_init_print};
 
     const OFF: [u8; 9] = [0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF];
@@ -105,7 +105,7 @@ mod app {
                 10_338..=16_383 => &ORANGE,
                 _ => &RED,
             };
-            <Spim<SPIM0> as Write<u8>>::write(ctx.local.rgb, color).ok();
+            <Spim<SPIM0> as SpiBus<u8>>::write(ctx.local.rgb, color).ok();
         }
         *ctx.local.transfer = i2s.rx(rx_buf).ok();
     }

examples/lpcomp-demo/Cargo.toml

@@ -10,9 +10,6 @@ edition = "2018"
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/lpcomp-demo/src/main.rs

@@ -5,7 +5,7 @@ use {core::panic::PanicInfo, nrf52840_hal as hal, rtt_target::rprintln};
 
 #[rtic::app(device = crate::hal::pac, peripherals = true)]
 mod app {
-    use embedded_hal::digital::v2::OutputPin;
+    use embedded_hal::digital::OutputPin;
     use {
         hal::{
             gpio::{Level, Output, Pin, PushPull},

examples/nvmc-demo/Cargo.toml

@@ -14,10 +14,6 @@ embedded-storage = "0.3.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 panic-probe = { version = "0.3.0", features = ["print-rtt"] }
 
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]
-
 [dependencies.nrf52840-hal]
 features = ["rt"]
 path = "../../nrf52840-hal"

examples/pwm-blinky-demo/Cargo.toml

@@ -4,18 +4,12 @@ version = "0.1.0"
 authors = ["Christopher Hunt <huntchr@gmail.com>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nb = "1.0.0"
 
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]
-
 [dependencies.nrf9160-hal]
 features = ["rt"]
 path = "../../nrf9160-hal"

examples/pwm-blinky-demo/src/main.rs

@@ -1,8 +1,12 @@
 #![no_main]
 #![no_std]
 
-use hal::{gpio, prelude::*, pwm, pwm::Pwm, timer, timer::Timer};
-use nb::block;
+use hal::{
+    gpio,
+    prelude::*,
+    pwm::{Channel, Pwm},
+    timer::Timer,
+};
 #[cfg(feature = "52832")]
 use nrf52832_hal as hal;
 #[cfg(feature = "52840")]
@@ -30,11 +34,11 @@ fn main() -> ! {
 
     rprintln!("PWM Blinky demo starting");
 
-    let wait_time = 1_000_000u32 / pwm.get_max_duty() as u32;
+    let wait_time = 1_000_000u32 / pwm.max_duty() as u32;
     loop {
-        for duty in 0..pwm.get_max_duty() {
+        for duty in 0..pwm.max_duty() {
             pwm.set_duty_on_common(duty);
-            delay(&mut timer, wait_time);
+            timer.delay(wait_time);
         }
     }
 }
@@ -45,7 +49,7 @@ fn init_device(p: hal::pac::Peripherals) -> (Pwm<hal::pac::PWM0_NS>, Timer<hal::
 
     let pwm = Pwm::new(p.PWM0_NS);
     pwm.set_output_pin(
-        pwm::Channel::C0,
+        Channel::C0,
         p0.p0_02.into_push_pull_output(gpio::Level::High).degrade(),
     );
 
@@ -60,7 +64,7 @@ fn init_device(p: hal::pac::Peripherals) -> (Pwm<hal::pac::PWM0>, Timer<hal::pac
 
     let pwm = Pwm::new(p.PWM0);
     pwm.set_output_pin(
-        pwm::Channel::C0,
+        Channel::C0,
         p0.p0_13.into_push_pull_output(gpio::Level::High).degrade(),
     );
 
@@ -75,19 +79,11 @@ fn init_device(p: hal::pac::Peripherals) -> (Pwm<hal::pac::PWM0>, Timer<hal::pac
 
     let pwm = Pwm::new(p.PWM0);
     pwm.set_output_pin(
-        pwm::Channel::C0,
+        Channel::C0,
         p0.p0_30.into_push_pull_output(gpio::Level::High).degrade(),
     );
 
     let timer = Timer::new(p.TIMER0);
 
     (pwm, timer)
 }
-
-fn delay<T>(timer: &mut Timer<T>, cycles: u32)
-where
-    T: timer::Instance,
-{
-    timer.start(cycles);
-    let _ = block!(timer.wait());
-}

examples/pwm-demo/Cargo.toml

@@ -10,13 +10,10 @@ edition = "2018"
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0"
 systick-monotonic = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]
-
 [dependencies.nrf52840-hal]
 features = ["rt"]
 path = "../../nrf52840-hal"

examples/pwm-demo/src/main.rs

@@ -5,7 +5,7 @@ use {core::panic::PanicInfo, nrf52840_hal as hal, rtt_target::rprintln};
 
 #[rtic::app(device = crate::hal::pac, peripherals = true, dispatchers = [SWI0_EGU0])]
 mod app {
-    use embedded_hal::digital::v2::InputPin;
+    use embedded_hal::digital::InputPin;
     use {
         hal::{
             gpio::{p0::Parts, Input, Level, Pin, PullUp},

examples/qdec-demo/Cargo.toml

@@ -4,15 +4,9 @@ version = "0.1.0"
 authors = ["Henrik Alsér"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/rtc-demo/Cargo.toml

@@ -11,7 +11,3 @@ cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/spi-demo/Cargo.toml

@@ -7,12 +7,8 @@ publish = false
 
 [dependencies]
 cortex-m-rt = "0.7.0"
+embedded-hal = "1.0.0"
 panic-halt = "0.2.0"
-embedded-hal-spy = "0.0.5"
-
-[dependencies.embedded-hal]
-features = ["unproven"]
-version = "0.2"
 
 [dependencies.nrf52832-hal]
 path = "../../nrf52832-hal"

examples/spi-demo/src/main.rs

@@ -3,13 +3,11 @@
 
 extern crate cortex_m_rt as rt; // v0.5.x
 
-extern crate embedded_hal_spy;
 extern crate nrf52832_hal;
 extern crate panic_halt;
-use embedded_hal::blocking::spi::*;
-
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
+use embedded_hal::digital::OutputPin;
+use embedded_hal::spi::SpiBus;
 use nrf52832_hal::gpio;
 use nrf52832_hal::gpio::p0::*;
 use nrf52832_hal::gpio::Level;
@@ -90,10 +88,7 @@ fn main() -> ! {
         }
     }
 
-    // Wrap interface in embedded-hal-spy to access embedded_hal traits
-    let mut eh_spi = embedded_hal_spy::new(spi, |_| {});
-    use embedded_hal::blocking::spi::Write;
-    match eh_spi.write(reference_data) {
+    match SpiBus::write(&mut spi, reference_data) {
         Ok(_) => {}
         Err(_) => {
             tests_ok = false;
@@ -102,7 +97,7 @@ fn main() -> ! {
     }
 
     let mut test_vec2 = *reference_data;
-    match eh_spi.transfer(&mut test_vec2) {
+    match SpiBus::transfer_in_place(&mut spi, &mut test_vec2) {
         Ok(_) => {
             for i in 0..test_vec2.len() {
                 if test_vec2[i] != reference_data[i] {

examples/spis-demo/Cargo.toml

@@ -12,7 +12,3 @@ cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/twi-ssd1306/Cargo.toml

@@ -14,10 +14,6 @@ ssd1306 = "0.2.6"
 embedded-graphics = "0.4.7"
 panic-semihosting = "0.5.3"
 
-[dependencies.embedded-hal]
-features = ["unproven"]
-version = "0.2"
-
 [dependencies.nrf52832-hal]
 path = "../../nrf52832-hal"
 optional = true

examples/twim-demo/Cargo.toml

@@ -10,10 +10,7 @@ edition = "2018"
 cortex-m = "0.7.3"
 cortex-m-rt = { version = "0.7.0", features = ["device"] }
 cortex-m-rtic = { version = "1.0.0", default-features = false }
+embedded-hal = "1.0.0"
 systick-monotonic = "1.0.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-
-[dependencies.embedded-hal]
-version = "0.2.3"
-features = ["unproven"]

examples/twim-demo/src/main.rs

@@ -5,7 +5,7 @@ use {core::panic::PanicInfo, nrf52840_hal as hal, rtt_target::rprintln};
 
 #[rtic::app(device = crate::hal::pac, peripherals = true, dispatchers = [SWI0_EGU0])]
 mod app {
-    use embedded_hal::digital::v2::InputPin;
+    use embedded_hal::digital::InputPin;
     use systick_monotonic::*;
     use {
         hal::{