Updating to embedded-hal digital::v2

Author: careyk007

boards/actinius-icarus/Cargo.toml

@@ -16,6 +16,7 @@ cortex-m = "0.6.0"
 cortex-m-rt = "0.6.10"
 panic-halt = "0.2.0"
 nrf9160-hal = { version = "0.1.0", path = "../../nrf9160-hal" }
+embedded-hal = "0.2.3"
 
 [dev-dependencies]
 nb = "0.1.1"

boards/actinius-icarus/src/lib.rs

@@ -18,10 +18,11 @@ pub mod prelude {
 use hal::{
     gpio::{p0, Floating, Input, Level, Output, Pin, PullUp, PushPull},
     pac::{CorePeripherals, Peripherals},
-    prelude::*,
     uarte::{self, Baudrate as UartBaudrate, Parity as UartParity, Uarte},
 };
 
+use embedded_hal::digital::v2::{InputPin, OutputPin};
+
 pub use hal::pac;
 
 /// Provides access to all features of the Actinius Icarus board
@@ -630,12 +631,12 @@ impl Led {
 
     /// Enable the LED
     pub fn enable(&mut self) {
-        self.0.set_low()
+        self.0.set_low().unwrap()
     }
 
     /// Disable the LED
     pub fn disable(&mut self) {
-        self.0.set_high()
+        self.0.set_high().unwrap()
     }
 }
 
@@ -648,6 +649,6 @@ impl Button {
     }
 
     pub fn is_active(&self) -> bool {
-        self.0.is_low()
+        self.0.is_low().unwrap()
     }
 }

boards/adafruit-nrf52-bluefruit-le/Cargo.toml

@@ -10,6 +10,7 @@ edition = "2018"
 
 [dependencies]
 nrf52832-hal = { path = "../../nrf52832-hal" }
+embedded-hal = "0.2.3"
 
 [dev-dependencies]
 cortex-m-rt = "0.6.8"

boards/adafruit-nrf52-bluefruit-le/src/lib.rs

@@ -6,11 +6,12 @@ pub mod prelude {
 
 use nrf52832_hal::{
     gpio::{p0, Floating, Input, Level, Output, Pin, PushPull},
-    prelude::*,
     target::{self as pac, CorePeripherals, Peripherals},
     uarte, Uarte,
 };
 
+use embedded_hal::digital::v2::OutputPin;
+
 #[allow(non_snake_case)]
 pub struct Board {
     pub pins: Pins,
@@ -378,11 +379,11 @@ impl Led {
     }
 
     pub fn enable(&mut self) {
-        self.0.set_high();
+        self.0.set_high().unwrap();
     }
 
     pub fn disable(&mut self) {
-        self.0.set_low();
+        self.0.set_low().unwrap();
     }
 }
 

boards/adafruit_nrf52pro/Cargo.toml

@@ -11,6 +11,7 @@ edition = "2018"
 
 [dependencies]
 nrf52832-hal = { path = "../../nrf52832-hal" }
+embedded-hal = "0.2.3"
 
 [dev-dependencies]
 cortex-m-rt = "0.6.8"

boards/adafruit_nrf52pro/examples/blinky.rs

@@ -15,6 +15,8 @@ use adafruit_nrf52pro_bsc::hal::{
 use adafruit_nrf52pro_bsc::nrf52832_pac::{Peripherals};
 use adafruit_nrf52pro_bsc::Pins;
 
+use embedded_hal::digital::v2::OutputPin;
+
 
 #[entry]
 fn main() -> ! {
@@ -28,11 +30,11 @@ fn main() -> ! {
 
     // Alternately flash the red and blue leds
     loop {
-        led1.set_low();
-        led2.set_high();
+        led1.set_low().unwrap();
+        led2.set_high().unwrap();
         delay(&mut timer, 250_000); // 250ms
-        led1.set_high();
-        led2.set_low();
+        led1.set_high().unwrap();
+        led2.set_low().unwrap();
         delay(&mut timer, 1_000_000); // 1s
     }
 }
@@ -42,5 +44,5 @@ where
     T: timer::Instance,
 {
     timer.start(cycles);
-    block!(timer.wait());
+    block!(timer.wait()).unwrap();
 }

boards/nRF52-DK/Cargo.toml

@@ -14,6 +14,7 @@ cortex-m = "0.6.0"
 cortex-m-rt = "0.6.7"
 panic-halt = "0.2.0"
 nrf52832-hal = { version = "0.8.0", path = "../../nrf52832-hal" }
+embedded-hal = "0.2.3"
 
 [dev-dependencies]
 nb = "0.1.1"

boards/nRF52-DK/src/lib.rs

@@ -14,7 +14,6 @@ pub mod prelude {
 }
 
 use nrf52832_hal::{
-    prelude::*,
     gpio::{
         p0,
         Pin,
@@ -38,6 +37,8 @@ use nrf52832_hal::{
     },
 };
 
+use embedded_hal::digital::v2::OutputPin;
+
 /// Provides access to all features of the nRF52-DK board
 #[allow(non_snake_case)]
 pub struct Board {
@@ -483,12 +484,12 @@ impl Led {
 
     /// Enable the LED
     pub fn enable(&mut self) {
-        self.0.set_low()
+        self.0.set_low().unwrap()
     }
 
     /// Disable the LED
     pub fn disable(&mut self) {
-        self.0.set_high()
+        self.0.set_high().unwrap()
     }
 }
 

boards/nRF52840-DK/Cargo.toml

@@ -19,6 +19,7 @@ cortex-m-rt = "0.6.5"
 cortex-m-semihosting = "~0.3"
 panic-semihosting = "~0.5"
 nb = "~0.1"
+embedded-hal = "0.2.3"
 
 [features]
 rt = ["nrf52840-hal/rt"]

boards/nRF52840-DK/src/lib.rs

@@ -18,7 +18,6 @@ pub mod prelude {
 // pub mod debug;
 
 use nrf52840_hal::{
-    prelude::*,
     gpio::{
         p0,
         p1,
@@ -49,6 +48,8 @@ use nrf52840_hal::{
     },
 };
 
+use embedded_hal::digital::v2::OutputPin;
+
 /// Provides access to all features of the nRF52840-DK board
 #[allow(non_snake_case)]
 pub struct Board {
@@ -532,12 +533,12 @@ impl Led {
 
     /// Enable the LED
     pub fn enable(&mut self) {
-        self.0.set_low()
+        self.0.set_low().unwrap()
     }
 
     /// Disable the LED
     pub fn disable(&mut self) {
-        self.0.set_high()
+        self.0.set_high().unwrap()
     }
 }