Merge #381

381: try to use fugit::Duraction for CountDown::Time r=therealprof a=burrbull

~~Not for SysTick for now~~ Use 1 microsecond as minimal timeout for SysTick `Counter`

This PR lets to use `fugit` units for timer including values bigger then 1 second.
Sampling of timer (time of 1 tick) now can be set in by FREQ generic constant.

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

Author: bors[bot]

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added `Counter` with `CountDown<Time=fugit::TimerDuration>` and `atat::Clock` implementations [#381]
 - `Into<serial::Config>` for `Bps` [#387]
 - Added the missing DMA implementations for USART3 [#373]
 - `count_down` constructor for `Timer` -> `CountDownTimer` without start [#382]
@@ -23,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#382]: https://github.com/stm32-rs/stm32f4xx-hal/pull/382
 [#380]: https://github.com/stm32-rs/stm32f4xx-hal/pull/380
 [#374]: https://github.com/stm32-rs/stm32f4xx-hal/pull/374
+[#381]: https://github.com/stm32-rs/stm32f4xx-hal/pull/381
 
 ### Changed
 

Cargo.toml

@@ -41,8 +41,9 @@ cast = { default-features = false, version = "0.3.0" }
 void = { default-features = false, version = "1.0.2" }
 embedded-hal = { features = ["unproven"], version = "0.2.6" }
 display-interface = { version = "0.4.1", optional = true }
-fugit = "0.3.0"
+fugit = "0.3.3"
 rtic-monotonic = { version = "1.0", optional = true }
+atat = { version = "0.14.0", optional = true }
 
 [dependencies.stm32_i2s_v12x]
 version = "0.2.0"

examples/adc_dma_rtic.rs

@@ -7,7 +7,6 @@ use panic_semihosting as _;
 mod app {
     use cortex_m_semihosting::hprintln;
     use dwt_systick_monotonic::DwtSystick;
-    pub use fugit::ExtU32;
 
     use stm32f4xx_hal::{
         adc::{

examples/analog-stopwatch-with-spi-ssd1306.rs

@@ -16,7 +16,7 @@ use crate::hal::{
     prelude::*,
     rcc::{Clocks, Rcc},
     spi::Spi,
-    timer::{CountDownTimer, Event, Timer},
+    timer::{CounterUs, Event, Timer},
 };
 
 use core::cell::{Cell, RefCell};
@@ -43,8 +43,7 @@ use ssd1306::{prelude::*, Ssd1306};
 // Set up global state. It's all mutexed up for concurrency safety.
 static ELAPSED_MS: Mutex<Cell<u32>> = Mutex::new(Cell::new(0u32));
 static ELAPSED_RESET_MS: Mutex<Cell<u32>> = Mutex::new(Cell::new(0u32));
-static TIMER_TIM2: Mutex<RefCell<Option<CountDownTimer<pac::TIM2>>>> =
-    Mutex::new(RefCell::new(None));
+static TIMER_TIM2: Mutex<RefCell<Option<CounterUs<pac::TIM2>>>> = Mutex::new(RefCell::new(None));
 static STATE: Mutex<Cell<StopwatchState>> = Mutex::new(Cell::new(StopwatchState::Ready));
 static BUTTON: Mutex<RefCell<Option<PA0<Input<PullDown>>>>> = Mutex::new(RefCell::new(None));
 
@@ -127,8 +126,8 @@ fn main() -> ! {
     disp.flush().unwrap();
 
     // Create a 1ms periodic interrupt from TIM2
-    let mut timer = Timer::new(dp.TIM2, &clocks).count_down();
-    timer.start(1.hz());
+    let mut timer = Timer::new(dp.TIM2, &clocks).counter();
+    timer.start(1.secs()).unwrap();
     timer.listen(Event::TimeOut);
 
     free(|cs| {

examples/blinky-timer-irq.rs

@@ -14,13 +14,12 @@ use crate::hal::{
     gpio::{gpioa, Output, PushPull},
     pac::{interrupt, Interrupt, Peripherals, TIM2},
     prelude::*,
-    timer::{CountDownTimer, Event, Timer},
+    timer::{CounterUs, Event, Timer},
 };
 
 use core::cell::RefCell;
 use cortex_m::{asm::wfi, interrupt::Mutex};
 use cortex_m_rt::entry;
-use embedded_hal::timer::CountDown;
 
 // NOTE You can uncomment 'hprintln' here and in the code below for a bit more
 // verbosity at runtime, at the cost of throwing off the timing of the blink
@@ -36,14 +35,14 @@ type LedPin = gpioa::PA5<Output<PushPull>>;
 static G_LED: Mutex<RefCell<Option<LedPin>>> = Mutex::new(RefCell::new(None));
 
 // Make timer interrupt registers globally available
-static G_TIM: Mutex<RefCell<Option<CountDownTimer<TIM2>>>> = Mutex::new(RefCell::new(None));
+static G_TIM: Mutex<RefCell<Option<CounterUs<TIM2>>>> = Mutex::new(RefCell::new(None));
 
 // Define an interupt handler, i.e. function to call when interrupt occurs.
 // This specific interrupt will "trip" when the timer TIM2 times out
 #[interrupt]
 fn TIM2() {
     static mut LED: Option<LedPin> = None;
-    static mut TIM: Option<CountDownTimer<TIM2>> = None;
+    static mut TIM: Option<CounterUs<TIM2>> = None;
 
     let led = LED.get_or_insert_with(|| {
         cortex_m::interrupt::free(|cs| {
@@ -79,8 +78,8 @@ fn main() -> ! {
     cortex_m::interrupt::free(|cs| *G_LED.borrow(cs).borrow_mut() = Some(led));
 
     // Set up a timer expiring after 1s
-    let mut timer = Timer::new(dp.TIM2, &clocks).count_down();
-    timer.start(1.hz());
+    let mut timer = Timer::new(dp.TIM2, &clocks).counter();
+    timer.start(1.secs()).unwrap();
 
     // Generate an interrupt when the timer expires
     timer.listen(Event::TimeOut);

examples/rtic-tick.rs

@@ -5,7 +5,6 @@ use panic_halt as _;
 
 #[rtic::app(device = stm32f4xx_hal::pac, dispatchers = [USART1])]
 mod app {
-    use fugit::ExtU32;
     use stm32f4xx_hal::{
         gpio::{gpioc::PC13, Output, PushPull},
         pac,

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

@@ -28,7 +28,7 @@ use crate::hal::{
     interrupt, pac,
     prelude::*,
     rcc::{Clocks, Rcc},
-    timer::{CountDownTimer, Event, Timer},
+    timer::{CounterUs, Event, Timer},
 };
 use core::cell::{Cell, RefCell};
 use core::fmt::Write;
@@ -49,8 +49,7 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
 
 // Set up global state. It's all mutexed up for concurrency safety.
 static ELAPSED_MS: Mutex<Cell<u32>> = Mutex::new(Cell::new(0u32));
-static TIMER_TIM2: Mutex<RefCell<Option<CountDownTimer<pac::TIM2>>>> =
-    Mutex::new(RefCell::new(None));
+static TIMER_TIM2: Mutex<RefCell<Option<CounterUs<pac::TIM2>>>> = Mutex::new(RefCell::new(None));
 static STATE: Mutex<Cell<StopwatchState>> = Mutex::new(Cell::new(StopwatchState::Ready));
 static BUTTON: Mutex<RefCell<Option<PC13<Input<PullUp>>>>> = Mutex::new(RefCell::new(None));
 
@@ -93,8 +92,8 @@ fn main() -> ! {
         disp.flush().unwrap();
 
         // Create a 1ms periodic interrupt from TIM2
-        let mut timer = Timer::new(dp.TIM2, &clocks).count_down();
-        timer.start(1.hz());
+        let mut timer = Timer::new(dp.TIM2, &clocks).counter();
+        timer.start(1.secs()).unwrap();
         timer.listen(Event::TimeOut);
 
         free(|cs| {

examples/timer-periph.rs

@@ -15,7 +15,6 @@ use panic_halt as _;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::hprintln;
 
-use embedded_hal::timer::Cancel;
 use hal::timer;
 use hal::timer::Timer;
 use stm32f4xx_hal as hal;
@@ -29,8 +28,8 @@ fn main() -> ! {
     let clocks = rcc.cfgr.sysclk(24.mhz()).freeze();
 
     // Create a timer based on SysTick
-    let mut timer = Timer::new(dp.TIM1, &clocks).count_down();
-    timer.start(1.hz());
+    let mut timer = Timer::new(dp.TIM1, &clocks).counter_ms();
+    timer.start(1.secs()).unwrap();
 
     hprintln!("hello!").unwrap();
     // wait until timer expires
@@ -46,8 +45,7 @@ fn main() -> ! {
     timer.cancel().unwrap();
 
     // start it again
-    timer.start(1.hz());
-    nb::block!(timer.wait()).unwrap();
+    timer.delay(1.secs()).unwrap();
     hprintln!("timer expired 3").unwrap();
 
     timer.cancel().unwrap();

examples/timer-syst.rs

@@ -15,7 +15,6 @@ use panic_halt as _;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::hprintln;
 
-use embedded_hal::timer::Cancel;
 use hal::timer;
 use hal::timer::Timer;
 use stm32f4xx_hal as hal;
@@ -30,8 +29,8 @@ fn main() -> ! {
     let clocks = rcc.cfgr.sysclk(24.mhz()).freeze();
 
     // Create a timer based on SysTick
-    let mut timer = Timer::syst(cp.SYST, &clocks).count_down();
-    timer.start(24.hz());
+    let mut timer = Timer::syst(cp.SYST, &clocks).counter();
+    timer.start(42.millis()).unwrap();
 
     hprintln!("hello!").unwrap();
     // wait until timer expires
@@ -47,8 +46,7 @@ fn main() -> ! {
     timer.cancel().unwrap();
 
     // start it again
-    timer.start(24.hz());
-    nb::block!(timer.wait()).unwrap();
+    timer.delay(42.millis()).unwrap();
     hprintln!("timer expired 3").unwrap();
 
     timer.cancel().unwrap();

src/prelude.rs

@@ -57,6 +57,7 @@ pub use embedded_hal::watchdog::WatchdogEnable as _embedded_hal_watchdog_Watchdo
 pub use embedded_hal::Capture as _embedded_hal_Capture;
 pub use embedded_hal::Pwm as _embedded_hal_Pwm;
 pub use embedded_hal::Qei as _embedded_hal_Qei;
+pub use fugit::ExtU32 as _fugit_ExtU32;
 
 #[cfg(all(feature = "device-selected", feature = "dac"))]
 pub use crate::dac::DacExt as _stm32f4xx_hal_dac_DacExt;