Merge pull request #143 from jamesmunns/fix-systick

Use the systick implementation from the nrf-hal which handles rollovers

Author: MabezDev

src/delay.rs

@@ -27,6 +27,7 @@ impl Delay {
     }
 }
 
+/// System timer (SysTick) as a delay provider.
 impl DelayMs<u32> for Delay {
     fn delay_ms(&mut self, ms: u32) {
         self.delay_us(ms * 1_000);
@@ -47,17 +48,29 @@ impl DelayMs<u8> for Delay {
 
 impl DelayUs<u32> for Delay {
     fn delay_us(&mut self, us: u32) {
-        let rvr = us * (self.clocks.sysclk().0 / 1_000_000);
+        // The SysTick Reload Value register supports values between 1 and 0x00FFFFFF.
+        const MAX_RVR: u32 = 0x00FF_FFFF;
 
-        // assert!(rvr < (1 << 24)); //TODO fix this assertion
+        let mut total_rvr = us * (self.clocks.sysclk().0 / 1_000_000);
 
-        self.syst.set_reload(rvr);
-        self.syst.clear_current();
-        self.syst.enable_counter();
+        while total_rvr != 0 {
+            let current_rvr = if total_rvr <= MAX_RVR {
+                total_rvr
+            } else {
+                MAX_RVR
+            };
 
-        while !self.syst.has_wrapped() {}
+            self.syst.set_reload(current_rvr);
+            self.syst.clear_current();
+            self.syst.enable_counter();
 
-        self.syst.disable_counter();
+            // Update the tracking variable while we are waiting...
+            total_rvr -= current_rvr;
+
+            while !self.syst.has_wrapped() {}
+
+            self.syst.disable_counter();
+        }
     }
 }