Upgrade to latest LPC8xx HAL

hannobraun · Jun 26, 2020 · 6f5b1a2 · 6f5b1a2
1 parent a4d0217
commit 6f5b1a2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/firmware-lib/Cargo.toml b/firmware-lib/Cargo.toml
@@ -12,7 +12,6 @@ postcard = "0.5.0"
 
 [dependencies.lpc8xx-hal]
 git      = "https://github.com/lpc-rs/lpc8xx-hal.git"
-rev      = "f8d837ecf8d086d294e96efe45bd47fe12da8f39"
 features = ["845"]
 
 [dependencies.serde]

diff --git a/test-assistant/Cargo.toml b/test-assistant/Cargo.toml
@@ -20,7 +20,6 @@ path     = "../firmware-lib"
 
 [dependencies.lpc8xx-hal]
 git      = "https://github.com/lpc-rs/lpc8xx-hal.git"
-rev      = "f8d837ecf8d086d294e96efe45bd47fe12da8f39"
 features = ["845m301jbd48", "845-rt"]
 
 [dependencies.void]

diff --git a/test-assistant/src/main.rs b/test-assistant/src/main.rs
@@ -12,7 +12,6 @@ extern crate panic_rtt;
 
 
 use lpc8xx_hal::{
-    prelude::*,
     Peripherals,
     cortex_m::{
         asm,
@@ -43,7 +42,6 @@ use lpc8xx_hal::{
     syscon::frg,
     usart,
 };
-use void::ResultVoidExt;
 
 use firmware_lib::{
     pin_interrupt::{
@@ -258,12 +256,10 @@ const APP: () = {
                         HostToAssistant::SetPin(level) => {
                             match level {
                                 PinState::High => {
-                                    red.set_high()
-                                        .void_unwrap();
+                                    red.set_high();
                                 }
                                 PinState::Low => {
-                                    red.set_low()
-                                        .void_unwrap();
+                                    red.set_low();
                                 }
                             }
                             Ok(())

diff --git a/test-target/Cargo.toml b/test-target/Cargo.toml
@@ -20,7 +20,6 @@ path     = "../firmware-lib"
 
 [dependencies.lpc8xx-hal]
 git      = "https://github.com/lpc-rs/lpc8xx-hal.git"
-rev      = "f8d837ecf8d086d294e96efe45bd47fe12da8f39"
 features = ["845m301jbd48", "845-rt"]
 
 [dependencies.void]

diff --git a/test-target/src/main.rs b/test-target/src/main.rs
@@ -12,7 +12,6 @@ extern crate panic_rtt;
 
 
 use lpc8xx_hal::{
-    prelude::*,
     Peripherals,
     cortex_m::{
         asm,
@@ -44,7 +43,6 @@ use lpc8xx_hal::{
     syscon::frg,
     usart,
 };
-use void::ResultVoidExt as _;
 
 use firmware_lib::usart::{
     RxIdle,
@@ -216,8 +214,7 @@ const APP: () = {
 
         let mut buf = [0; 256];
 
-        let mut input_was_high = red.is_high()
-            .void_unwrap();
+        let mut input_was_high = red.is_high();
 
         loop {
             usart_rx
@@ -236,10 +233,10 @@ const APP: () = {
                             usart_tx.send_raw(data)
                         }
                         HostToTarget::SetPin(PinState::High) => {
-                            green.set_high()
+                            Ok(green.set_high())
                         }
                         HostToTarget::SetPin(PinState::Low) => {
-                            green.set_low()
+                            Ok(green.set_low())
                         }
                         HostToTarget::StartTimerInterrupt { period_ms } => {
                             // By default (and we haven't changed that setting)
@@ -281,8 +278,7 @@ const APP: () = {
             // us up before the test suite times out. But it could also lead to
             // spurious test failures.
             interrupt::free(|_| {
-                let input_is_high = red.is_high()
-                    .void_unwrap();
+                let input_is_high = red.is_high();
                 if input_is_high != input_was_high {
                     let level = match input_is_high {
                         true  => PinState::High,
@@ -320,8 +316,7 @@ const APP: () = {
 
     #[task(binds = SysTick, resources = [blue])]
     fn syst(cx: syst::Context) {
-        cx.resources.blue.toggle()
-            .void_unwrap()
+        cx.resources.blue.toggle();
     }
 
     #[task(binds = PIN_INT0, resources = [red_int])]