CounterHz

Author: burrbull

examples/delay-syst-blinky.rs

@@ -11,7 +11,7 @@ use panic_halt as _; // panic handler
 use cortex_m_rt::entry;
 use stm32f4xx_hal as hal;
 
-use crate::hal::{pac, prelude::*};
+use crate::hal::{pac, prelude::*, timer::Timer};
 
 #[entry]
 fn main() -> ! {
@@ -28,7 +28,7 @@ fn main() -> ! {
         let clocks = rcc.cfgr.sysclk(48.MHz()).freeze();
 
         // Create a delay abstraction based on SysTick
-        let mut delay = hal::delay::Delay::new(cp.SYST, &clocks);
+        let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
         loop {
             // On for 1s, off for 1s.

examples/delay-timer-blinky.rs

@@ -33,8 +33,10 @@ fn main() -> ! {
         loop {
             // On for 1s, off for 3s.
             led.set_high();
-            delay.delay(1.secs()).unwrap();
+            // Use `embedded_hal::DelayMs` trait
+            delay.delay_ms(1000_u32);
             led.set_low();
+            // or use `fugit::ExtU32` trait
             delay.delay(3.secs()).unwrap();
         }
     }

examples/dynamic_gpio.rs

@@ -29,7 +29,7 @@ fn main() -> ! {
 
     let mut pin = gpioc.pc13.into_dynamic();
     // Configure the syst timer to trigger an update every second
-    let mut timer = Timer::syst(cp.SYST, &clocks).counter();
+    let mut timer = Timer::syst(cp.SYST, &clocks).counter_us();
     timer.start(1.secs()).unwrap();
 
     // Wait for the timer to trigger an update and change the state of the LED

examples/ist7920_bidi_normal_spi.rs

@@ -7,7 +7,7 @@ use cortex_m_rt::entry;
 
 use stm32f4xx_hal as hal;
 
-use crate::hal::{pac, prelude::*};
+use crate::hal::{pac, prelude::*, timer::Timer};
 
 use hal::spi::{Mode, NoMiso, Phase, Polarity};
 
@@ -36,7 +36,7 @@ fn main() -> ! {
     let mut res = gpiob.pb10.into_push_pull_output();
     let cs = gpiob.pb13.into_push_pull_output();
 
-    let mut delay = hal::delay::Delay::new(cp.SYST, &clocks);
+    let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
     let mode = Mode {
         polarity: Polarity::IdleLow,

examples/qei.rs

@@ -14,7 +14,7 @@ use panic_halt as _;
 
 use cortex_m_rt::entry;
 use embedded_hal::Direction as RotaryDirection;
-use stm32f4xx_hal::{delay::Delay, pac, prelude::*, qei::Qei};
+use stm32f4xx_hal::{pac, prelude::*, qei::Qei, timer::Timer};
 
 #[entry]
 fn main() -> ! {
@@ -31,7 +31,7 @@ fn main() -> ! {
     let clocks = rcc.cfgr.freeze();
 
     // Create a delay abstraction based on SysTick.
-    let mut delay = Delay::new(cp.SYST, &clocks);
+    let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
     let gpioa = dp.GPIOA.split();
 

examples/serial-9bit.rs

@@ -34,7 +34,7 @@ use panic_halt as _;
 use cortex_m_rt::entry;
 use stm32f4xx_hal as hal;
 
-use crate::hal::{block, pac, prelude::*, serial::config::Config};
+use crate::hal::{block, pac, prelude::*, serial::config::Config, timer::Timer};
 
 use core::ops::Range;
 
@@ -55,7 +55,7 @@ fn main() -> ! {
 
     let clocks = rcc.cfgr.use_hse(8.MHz()).freeze();
 
-    let mut delay = hal::delay::Delay::new(cp.SYST, &clocks);
+    let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
     // define RX/TX pins
     let tx_pin = gpioa.pa2.into_alternate();

examples/stopwatch-with-ssd1306-and-interrupts.rs

@@ -22,13 +22,13 @@ use panic_semihosting as _; // logs messages to the host stderr; requires a debu
 use stm32f4xx_hal as hal;
 
 use crate::hal::{
-    delay::Delay,
-    fugit::{CounterUs, Event, Timer},
+    fugit::{CounterUs, Event},
     gpio::{Edge, Input, PullUp, PC13},
     i2c::I2c,
     interrupt, pac,
     prelude::*,
     rcc::{Clocks, Rcc},
+    timer::Timer,
 };
 use core::cell::{Cell, RefCell};
 use core::fmt::Write;
@@ -92,7 +92,7 @@ fn main() -> ! {
         disp.flush().unwrap();
 
         // Create a 1ms periodic interrupt from TIM2
-        let mut timer = Timer::new(dp.TIM2, &clocks).counter();
+        let mut timer = dp.TIM2.counter(&clocks);
         timer.start(1.secs()).unwrap();
         timer.listen(Event::Update);
 
@@ -108,7 +108,7 @@ fn main() -> ! {
             pac::NVIC::unmask(hal::pac::Interrupt::EXTI15_10);
         };
 
-        let mut delay = Delay::new(cp.SYST, &clocks);
+        let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
         loop {
             let elapsed = free(|cs| ELAPSED_MS.borrow(cs).get());

src/fugit/hal_02.rs

@@ -1,7 +1,7 @@
-use super::{Channel, Counter, Delay, Error, Instance, Pins, Pwm, SysCounter, WithPwm};
+use super::{Channel, Counter, Delay, Error, Instance, Pins, Pwm, WithPwm};
 
 use embedded_hal::blocking::delay::{DelayMs, DelayUs};
-use fugit::{ExtU32, MicrosDurationU32, TimerDurationU32};
+use fugit::{ExtU32, TimerDurationU32};
 use void::Void;
 
 impl<TIM: Instance, const FREQ: u32> DelayUs<u32> for Delay<TIM, FREQ> {
@@ -74,32 +74,6 @@ impl<TIM: Instance, const FREQ: u32> Cancel for Counter<TIM, FREQ> {
     }
 }
 
-impl CountDown for SysCounter {
-    type Time = MicrosDurationU32;
-
-    fn start<T>(&mut self, timeout: T)
-    where
-        T: Into<Self::Time>,
-    {
-        self.start(timeout.into()).unwrap()
-    }
-
-    fn wait(&mut self) -> nb::Result<(), Void> {
-        match self.wait() {
-            Err(nb::Error::WouldBlock) => Err(nb::Error::WouldBlock),
-            _ => Ok(()),
-        }
-    }
-}
-
-impl Cancel for SysCounter {
-    type Error = Error;
-
-    fn cancel(&mut self) -> Result<(), Self::Error> {
-        self.cancel()
-    }
-}
-
 impl<TIM, P, PINS, const FREQ: u32> embedded_hal::Pwm for Pwm<TIM, P, PINS, FREQ>
 where
     TIM: Instance + WithPwm,

src/fugit/mod.rs

@@ -2,7 +2,9 @@
 
 use crate::pac::RCC;
 use crate::rcc::Clocks;
-pub use crate::timer::{Channel, Error, Event, Instance, Ocm, SysEvent};
+pub use crate::timer::{
+    CPin, Channel, Error, Event, Instance, Ocm, Pins, PwmChannel, C1, C2, C3, C4,
+};
 use crate::timer::{MasterTimer, WithPwm};
 use cast::u16;
 
@@ -11,8 +13,6 @@ pub use delay::*;
 
 pub mod counter;
 pub use counter::*;
-pub mod syscounter;
-pub use syscounter::*;
 
 #[cfg(feature = "rtic")]
 #[cfg(not(feature = "stm32f410"))]

src/fugit/pwm.rs

@@ -4,8 +4,7 @@ use core::marker::PhantomData;
 use core::ops::{Deref, DerefMut};
 use fugit::TimerDurationU32;
 
-pub use crate::pwm::{Pins, PwmChannel};
-pub use crate::timer::{CPin, C1, C2, C3, C4};
+pub use super::{CPin, Pins, PwmChannel, C1, C2, C3, C4};
 
 pub trait PwmExt<P, PINS>
 where