Merge #448

448: move MonoTimer to dwt r=burrbull a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- Unify serial trait impls for embedded-hal 0.2 & 1.0
+- Move `MonoTimer` from `timer` to dwt mode [#448]
+- Unify serial trait impls for embedded-hal 0.2 & 1.0 [#447]
 - Add possibility to select Timer master mode
 - Add inherent impl of `embedded_hal::Pwm` methods on `Pwm`s [#439]
 - Use `embedded-dma` v0.2 [#440]
@@ -57,6 +58,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#443]: https://github.com/stm32-rs/stm32f4xx-hal/pull/443
 [#441]: https://github.com/stm32-rs/stm32f4xx-hal/pull/441
 [#430]: https://github.com/stm32-rs/stm32f4xx-hal/pull/430
+[#447]: https://github.com/stm32-rs/stm32f4xx-hal/pull/447
+[#448]: https://github.com/stm32-rs/stm32f4xx-hal/pull/448
 
 ### Changed
 

src/dwt.rs

@@ -226,3 +226,54 @@ impl ClockDuration {
         self.ticks as f64 / self.clock.raw() as f64
     }
 }
+
+/// A monotonic non-decreasing timer
+///
+/// This uses the timer in the debug watch trace peripheral. This means, that if the
+/// core is stopped, the timer does not count up. This may be relevant if you are using
+/// cortex_m_semihosting::hprintln for debugging in which case the timer will be stopped
+/// while printing
+#[derive(Clone, Copy)]
+pub struct MonoTimer {
+    frequency: Hertz,
+}
+
+impl MonoTimer {
+    /// Creates a new `Monotonic` timer
+    pub fn new(mut dwt: DWT, mut dcb: DCB, clocks: &Clocks) -> Self {
+        dcb.enable_trace();
+        dwt.enable_cycle_counter();
+
+        // now the CYCCNT counter can't be stopped or reset
+        drop(dwt);
+
+        MonoTimer {
+            frequency: clocks.hclk(),
+        }
+    }
+
+    /// Returns the frequency at which the monotonic timer is operating at
+    pub fn frequency(self) -> Hertz {
+        self.frequency
+    }
+
+    /// Returns an `Instant` corresponding to "now"
+    pub fn now(self) -> Instant {
+        Instant {
+            now: DWT::cycle_count(),
+        }
+    }
+}
+
+/// A measurement of a monotonically non-decreasing clock
+#[derive(Clone, Copy)]
+pub struct Instant {
+    now: u32,
+}
+
+impl Instant {
+    /// Ticks elapsed since the `Instant` was created
+    pub fn elapsed(self) -> u32 {
+        DWT::cycle_count().wrapping_sub(self.now)
+    }
+}

src/timer.rs

@@ -5,7 +5,7 @@
 #![allow(non_upper_case_globals)]
 
 use cortex_m::peripheral::syst::SystClkSource;
-use cortex_m::peripheral::{DCB, DWT, SYST};
+use cortex_m::peripheral::SYST;
 use embedded_hal::timer::{Cancel, CountDown, Periodic};
 use void::Void;
 
@@ -154,57 +154,6 @@ impl Cancel for CountDownTimer<SYST> {
     }
 }
 
-/// A monotonic non-decreasing timer
-///
-/// This uses the timer in the debug watch trace peripheral. This means, that if the
-/// core is stopped, the timer does not count up. This may be relevant if you are using
-/// cortex_m_semihosting::hprintln for debugging in which case the timer will be stopped
-/// while printing
-#[derive(Clone, Copy)]
-pub struct MonoTimer {
-    frequency: Hertz,
-}
-
-impl MonoTimer {
-    /// Creates a new `Monotonic` timer
-    pub fn new(mut dwt: DWT, mut dcb: DCB, clocks: &Clocks) -> Self {
-        dcb.enable_trace();
-        dwt.enable_cycle_counter();
-
-        // now the CYCCNT counter can't be stopped or reset
-        drop(dwt);
-
-        MonoTimer {
-            frequency: clocks.hclk(),
-        }
-    }
-
-    /// Returns the frequency at which the monotonic timer is operating at
-    pub fn frequency(self) -> Hertz {
-        self.frequency
-    }
-
-    /// Returns an `Instant` corresponding to "now"
-    pub fn now(self) -> Instant {
-        Instant {
-            now: DWT::cycle_count(),
-        }
-    }
-}
-
-/// A measurement of a monotonically non-decreasing clock
-#[derive(Clone, Copy)]
-pub struct Instant {
-    now: u32,
-}
-
-impl Instant {
-    /// Ticks elapsed since the `Instant` was created
-    pub fn elapsed(self) -> u32 {
-        DWT::cycle_count().wrapping_sub(self.now)
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[repr(u8)]
 pub enum Ocm {