Merge branch 'main' into curl-cleanup

Author: jonathanpallant

nrf52-code/boards/dk-solution/src/lib.rs

@@ -179,10 +179,10 @@ impl Timer {
 
     /// Start the timer with the given microsecond duration.
     pub fn start(&mut self, microseconds: u32) {
-        self.0.cc(0).clear_events();
+        self.0.stop();
+        self.0.clear();
         self.0.cc(0).write(microseconds);
-        self.0.task_clear();
-        self.0.task_start();
+        self.0.start();
     }
 
     /// If the timer has finished, resets it and returns true.

nrf52-code/boards/dk-solution/src/radio.rs

@@ -454,11 +454,15 @@ impl<'d> Radio<'d> {
             // Check if either receive is done or timeout occured
             loop {
                 match recv.is_done() {
-                    Ok(crc) => break Ok(crc),
-                    Err(err) => match err {
-                        nb::Error::Other(crc) => break Err(Error::Crc(crc)),
-                        nb::Error::WouldBlock => (),
-                    },
+                    Ok(crc) => {
+                        break Ok(crc);
+                    }
+                    Err(nb::Error::Other(crc)) => {
+                        break Err(Error::Crc(crc));
+                    }
+                    Err(nb::Error::WouldBlock) => {
+                        // do nothing
+                    }
                 }
 
                 if timer.reset_if_finished() {

nrf52-code/boards/dk/src/lib.rs

@@ -151,10 +151,10 @@ impl Timer {
 
     /// Start the timer with the given microsecond duration.
     pub fn start(&mut self, microseconds: u32) {
-        self.0.cc(0).clear_events();
+        self.0.stop();
+        self.0.clear();
         self.0.cc(0).write(microseconds);
-        self.0.task_clear();
-        self.0.task_start();
+        self.0.start();
     }
 
     /// If the timer has finished, resets it and returns true.

nrf52-code/boards/dk/src/radio.rs

@@ -454,11 +454,15 @@ impl<'d> Radio<'d> {
             // Check if either receive is done or timeout occured
             loop {
                 match recv.is_done() {
-                    Ok(crc) => break Ok(crc),
-                    Err(err) => match err {
-                        nb::Error::Other(crc) => break Err(Error::Crc(crc)),
-                        nb::Error::WouldBlock => (),
-                    },
+                    Ok(crc) => {
+                        break Ok(crc);
+                    }
+                    Err(nb::Error::Other(crc)) => {
+                        break Err(Error::Crc(crc));
+                    }
+                    Err(nb::Error::WouldBlock) => {
+                        // do nothing
+                    }
                 }
 
                 if timer.reset_if_finished() {

nrf52-code/hal-app/Cargo.toml

@@ -9,7 +9,8 @@ description = "Solutions for the nRF52 HAL exercises"
 [dependencies]
 cortex-m = {version = "0.7.7", features = ["critical-section-single-core"]}
 cortex-m-rt = "0.7.5"
-dk = { path = "../boards/dk-solution", features = ["radio"] }
+dk = { path = "../boards/dk", features = ["radio"] }
+# dk = { path = "../boards/dk-solution", features = ["radio"] }
 heapless = "0.9"
 defmt = "1"
 defmt-rtt = "1.1"