Merge #449

449: Yet another timer refactoring r=therealprof a=burrbull

Should be last big one

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

Author: bors[bot]

CHANGELOG.md

@@ -22,7 +22,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Use fugit rate types instead of custom [#430]
 - Add channel events, make Event use bitflags (simplify interrupt handling) [#425]
 - reexport `digital::v2::PinState` again [#428]
-- Timer impls with time based on `fugit` moved to `fugit` module, added `Pwm` and `fugit-timer` impls [#423]
+- Timer impls with time based on `fugit::Duration` same as `Hertz` moved to `timer` module,
+  added appropriate `Ext` traits implemented on peripherals directly,
+  added `Pwm` and `fugit-timer` impls [#423] [#449]
 
 ### Fixed
 
@@ -60,6 +62,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#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
+[#449]: https://github.com/stm32-rs/stm32f4xx-hal/pull/449
 
 ### Changed
 

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

@@ -11,12 +11,12 @@ use panic_semihosting as _;
 use stm32f4xx_hal as hal;
 
 use crate::hal::{
-    fugit::{CounterUs, Event, Timer},
     gpio::{Edge, Input, PullDown, PA0},
     interrupt, pac,
     prelude::*,
     rcc::{Clocks, Rcc},
     spi::Spi,
+    timer::{CounterUs, Event, FTimer, Timer},
 };
 
 use core::cell::{Cell, RefCell};
@@ -112,7 +112,7 @@ fn main() -> ! {
 
     let dc = gpioe.pe3.into_push_pull_output();
     let mut ss = gpioe.pe4.into_push_pull_output();
-    let mut delay = hal::delay::Delay::new(cp.SYST, &clocks);
+    let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
     ss.set_high();
     delay.delay_ms(100_u32);
@@ -126,7 +126,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 = FTimer::new(dp.TIM2, &clocks).counter();
     timer.start(1.secs()).unwrap();
     timer.listen(Event::Update);
 

examples/blinky-timer-irq.rs

@@ -11,10 +11,10 @@ use panic_halt as _;
 use stm32f4xx_hal as hal;
 
 use crate::hal::{
-    fugit::{CounterUs, Event, Timer},
     gpio::{self, Output, PushPull},
     pac::{interrupt, Interrupt, Peripherals, TIM2},
     prelude::*,
+    timer::{CounterUs, Event},
 };
 
 use core::cell::RefCell;
@@ -78,7 +78,7 @@ 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).counter();
+    let mut timer = dp.TIM2.counter(&clocks);
     timer.start(1.secs()).unwrap();
 
     // Generate an interrupt when the timer expires

examples/delay-syst-blinky.rs

@@ -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 = cp.SYST.delay(&clocks);
 
         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/f413disco_lcd_ferris.rs

@@ -19,7 +19,7 @@ use crate::hal::{
     fsmc_lcd::{ChipSelect3, FsmcLcd, LcdPins, Timing},
     gpio::Speed,
     pac::{CorePeripherals, Peripherals},
-    {delay::Delay, prelude::*},
+    prelude::*,
 };
 
 use embedded_graphics::geometry::Size;
@@ -747,7 +747,7 @@ fn main() -> ! {
         gpioe.pe5.into_push_pull_output().set_high();
 
         // Get delay provider
-        let mut delay = Delay::new(cp.SYST, &clocks);
+        let mut delay = cp.SYST.delay(&clocks);
 
         // Set up timing
         let write_timing = Timing::default().data(3).address_setup(3).bus_turnaround(0);

examples/i2s-audio-out-dma.rs

@@ -48,7 +48,6 @@ use cortex_m_rt::entry;
 use stm32_i2s_v12x::format::{Data16Frame16, FrameFormat};
 use stm32_i2s_v12x::{MasterClock, MasterConfig, Polarity, TransmitMode};
 
-use stm32f4xx_hal::delay::Delay;
 use stm32f4xx_hal::dma::config::DmaConfig;
 use stm32f4xx_hal::dma::MemoryToPeripheral;
 use stm32f4xx_hal::dma::{Stream5, StreamsTuple, Transfer};
@@ -100,7 +99,7 @@ fn main() -> ! {
     let gpioc = dp.GPIOC.split();
     let gpiod = dp.GPIOD.split();
 
-    let mut delay = Delay::new(cp.SYST, &clocks);
+    let mut delay = cp.SYST.delay(&clocks);
 
     let i2c = I2c::new(
         dp.I2C1,

examples/i2s-audio-out.rs

@@ -45,7 +45,6 @@ use cortex_m_rt::entry;
 use stm32_i2s_v12x::format::{Data16Frame16, FrameFormat};
 use stm32_i2s_v12x::{MasterClock, MasterConfig, Polarity};
 
-use stm32f4xx_hal::delay::Delay;
 use stm32f4xx_hal::i2c::I2c;
 use stm32f4xx_hal::i2s::I2s;
 use stm32f4xx_hal::nb::block;
@@ -100,7 +99,7 @@ fn main() -> ! {
     // The 86 MHz frequency can be divided to get a sample rate very close to 48 kHz.
     let clocks = rcc.cfgr.use_hse(8.MHz()).i2s_clk(86.MHz()).freeze();
 
-    let mut delay = Delay::new(cp.SYST, &clocks);
+    let mut delay = cp.SYST.delay(&clocks);
 
     let i2c = I2c::new(
         dp.I2C1,

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,