Merge pull request #201 from thalesfragoso/timers-rtc

Timers clock for stm32

embassy-stm32/gen.py

@@ -84,9 +84,11 @@ for chip in chips.values():
                 continue
 
             block = peri['block']
-            block_mod, block_name = block.rsplit('/')
+            block_mod, block_name_unparsed = block.rsplit('/')
             block_mod, block_version = block_mod.rsplit('_')
-            block_name = block_name.capitalize()
+            block_name = ''
+            for b in block_name_unparsed.split('_'):
+                block_name += b.capitalize()
 
             # Check all peripherals have the same version: it's not OK for the same chip to use both usart_v1 and usart_v2
             if old_version := peripheral_versions.get(block_mod):
@@ -184,6 +186,10 @@ for chip in chips.values():
                         if func := funcs.get(f'{name}_D7'):
                             f.write(f'impl_sdmmc_pin!({name}, D7Pin, {pin}, {func});')
 
+            if block_name == 'TimGp16':
+                if re.match('TIM[2345]$', name):
+                    f.write(f'impl_timer!({name});')
+
             if block_mod == 'exti':
                 for irq in chip['interrupts']:
                     if re.match('EXTI', irq):
@@ -236,7 +242,8 @@ for chip in chips.values():
 
         f.write(f"""
             pub mod interrupt {{
-                pub use cortex_m::interrupt::{{CriticalSection, Mutex}};
+                pub use bare_metal::Mutex;
+                pub use critical_section::CriticalSection;
                 pub use embassy::interrupt::{{declare, take, Interrupt}};
                 pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/clock.rs

@@ -0,0 +1,358 @@
+#![macro_use]
+
+use core::cell::Cell;
+use core::convert::TryInto;
+use core::sync::atomic::{compiler_fence, Ordering};
+
+use atomic_polyfill::AtomicU32;
+use embassy::interrupt::InterruptExt;
+use embassy::time::{Clock as EmbassyClock, TICKS_PER_SECOND};
+
+use crate::interrupt::{CriticalSection, Interrupt, Mutex};
+use crate::pac::timer::TimGp16;
+use crate::time::Hertz;
+
+// Clock timekeeping works with something we call "periods", which are time intervals
+// of 2^15 ticks. The Clock counter value is 16 bits, so one "overflow cycle" is 2 periods.
+//
+// A `period` count is maintained in parallel to the Timer hardware `counter`, like this:
+// - `period` and `counter` start at 0
+// - `period` is incremented on overflow (at counter value 0)
+// - `period` is incremented "midway" between overflows (at counter value 0x8000)
+//
+// Therefore, when `period` is even, counter is in 0..0x7FFF. When odd, counter is in 0x8000..0xFFFF
+// This allows for now() to return the correct value even if it races an overflow.
+//
+// To get `now()`, `period` is read first, then `counter` is read. If the counter value matches
+// the expected range for the `period` parity, we're done. If it doesn't, this means that
+// a new period start has raced us between reading `period` and `counter`, so we assume the `counter` value
+// corresponds to the next period.
+//
+// `period` is a 32bit integer, so It overflows on 2^32 * 2^15 / 32768 seconds of uptime, which is 136 years.
+fn calc_now(period: u32, counter: u16) -> u64 {
+    ((period as u64) << 15) + ((counter as u32 ^ ((period & 1) << 15)) as u64)
+}
+
+struct AlarmState {
+    timestamp: Cell<u64>,
+    #[allow(clippy::type_complexity)]
+    callback: Cell<Option<(fn(*mut ()), *mut ())>>,
+}
+
+impl AlarmState {
+    fn new() -> Self {
+        Self {
+            timestamp: Cell::new(u64::MAX),
+            callback: Cell::new(None),
+        }
+    }
+}
+
+const ALARM_COUNT: usize = 3;
+
+/// Clock timer that can be used by the executor and to set alarms.
+///
+/// It can work with Timers 2, 3, 4, 5. This timer works internally with a unit of 2^15 ticks, which
+/// means that if a call to [`embassy::time::Clock::now`] is blocked for that amount of ticks the
+/// returned value will be wrong (an old value). The current default tick rate is 32768 ticks per
+/// second.
+pub struct Clock<T: Instance> {
+    _inner: T,
+    irq: T::Interrupt,
+    /// Number of 2^23 periods elapsed since boot.
+    period: AtomicU32,
+    /// Timestamp at which to fire alarm. u64::MAX if no alarm is scheduled.
+    alarms: Mutex<[AlarmState; ALARM_COUNT]>,
+}
+
+impl<T: Instance> Clock<T> {
+    pub fn new(peripheral: T, irq: T::Interrupt) -> Self {
+        Self {
+            _inner: peripheral,
+            irq,
+            period: AtomicU32::new(0),
+            alarms: Mutex::new([AlarmState::new(), AlarmState::new(), AlarmState::new()]),
+        }
+    }
+
+    pub fn start(&'static self, timer_freq: Hertz) {
+        let inner = T::inner();
+
+        // NOTE(unsafe) Critical section to use the unsafe methods
+        critical_section::with(|_| {
+            unsafe {
+                inner.prepare(timer_freq);
+            }
+
+            self.irq.set_handler_context(self as *const _ as *mut _);
+            self.irq.set_handler(|ptr| unsafe {
+                let this = &*(ptr as *const () as *const Self);
+                this.on_interrupt();
+            });
+            self.irq.unpend();
+            self.irq.enable();
+
+            unsafe {
+                inner.start_counter();
+            }
+        })
+    }
+
+    fn on_interrupt(&self) {
+        let inner = T::inner();
+
+        // NOTE(unsafe) Use critical section to access the methods
+        // XXX: reduce the size of this critical section ?
+        critical_section::with(|cs| unsafe {
+            if inner.overflow_interrupt_status() {
+                inner.overflow_clear_flag();
+                self.next_period();
+            }
+
+            // Half overflow
+            if inner.compare_interrupt_status(0) {
+                inner.compare_clear_flag(0);
+                self.next_period();
+            }
+
+            for n in 1..=ALARM_COUNT {
+                if inner.compare_interrupt_status(n) {
+                    inner.compare_clear_flag(n);
+                    self.trigger_alarm(n, cs);
+                }
+            }
+        })
+    }
+
+    fn next_period(&self) {
+        let inner = T::inner();
+
+        let period = self.period.fetch_add(1, Ordering::Relaxed) + 1;
+        let t = (period as u64) << 15;
+
+        critical_section::with(move |cs| {
+            for n in 1..=ALARM_COUNT {
+                let alarm = &self.alarms.borrow(cs)[n - 1];
+                let at = alarm.timestamp.get();
+
+                let diff = at - t;
+                if diff < 0xc000 {
+                    inner.set_compare(n, at as u16);
+                    // NOTE(unsafe) We're in a critical section
+                    unsafe {
+                        inner.set_compare_interrupt(n, true);
+                    }
+                }
+            }
+        })
+    }
+
+    fn trigger_alarm(&self, n: usize, cs: CriticalSection) {
+        let inner = T::inner();
+        // NOTE(unsafe) We have a critical section
+        unsafe {
+            inner.set_compare_interrupt(n, false);
+        }
+
+        let alarm = &self.alarms.borrow(cs)[n - 1];
+        alarm.timestamp.set(u64::MAX);
+
+        // Call after clearing alarm, so the callback can set another alarm.
+        if let Some((f, ctx)) = alarm.callback.get() {
+            f(ctx);
+        }
+    }
+
+    fn set_alarm_callback(&self, n: usize, callback: fn(*mut ()), ctx: *mut ()) {
+        critical_section::with(|cs| {
+            let alarm = &self.alarms.borrow(cs)[n - 1];
+            alarm.callback.set(Some((callback, ctx)));
+        })
+    }
+
+    fn set_alarm(&self, n: usize, timestamp: u64) {
+        critical_section::with(|cs| {
+            let inner = T::inner();
+
+            let alarm = &self.alarms.borrow(cs)[n - 1];
+            alarm.timestamp.set(timestamp);
+
+            let t = self.now();
+            if timestamp <= t {
+                self.trigger_alarm(n, cs);
+                return;
+            }
+
+            let diff = timestamp - t;
+            if diff < 0xc000 {
+                let safe_timestamp = timestamp.max(t + 3);
+                inner.set_compare(n, safe_timestamp as u16);
+
+                // NOTE(unsafe) We're in a critical section
+                unsafe {
+                    inner.set_compare_interrupt(n, true);
+                }
+            } else {
+                unsafe {
+                    inner.set_compare_interrupt(n, false);
+                }
+            }
+        })
+    }
+
+    pub fn alarm1(&'static self) -> Alarm<T> {
+        Alarm { n: 1, rtc: self }
+    }
+    pub fn alarm2(&'static self) -> Alarm<T> {
+        Alarm { n: 2, rtc: self }
+    }
+    pub fn alarm3(&'static self) -> Alarm<T> {
+        Alarm { n: 3, rtc: self }
+    }
+}
+
+impl<T: Instance> EmbassyClock for Clock<T> {
+    fn now(&self) -> u64 {
+        let inner = T::inner();
+
+        let period = self.period.load(Ordering::Relaxed);
+        compiler_fence(Ordering::Acquire);
+        let counter = inner.counter();
+        calc_now(period, counter)
+    }
+}
+
+pub struct Alarm<T: Instance> {
+    n: usize,
+    rtc: &'static Clock<T>,
+}
+
+impl<T: Instance> embassy::time::Alarm for Alarm<T> {
+    fn set_callback(&self, callback: fn(*mut ()), ctx: *mut ()) {
+        self.rtc.set_alarm_callback(self.n, callback, ctx);
+    }
+
+    fn set(&self, timestamp: u64) {
+        self.rtc.set_alarm(self.n, timestamp);
+    }
+
+    fn clear(&self) {
+        self.rtc.set_alarm(self.n, u64::MAX);
+    }
+}
+
+pub struct TimerInner(pub(crate) TimGp16);
+
+impl TimerInner {
+    unsafe fn prepare(&self, timer_freq: Hertz) {
+        self.stop_and_reset();
+
+        let psc = timer_freq.0 / TICKS_PER_SECOND as u32 - 1;
+        let psc: u16 = psc.try_into().unwrap();
+
+        self.set_psc_arr(psc, u16::MAX);
+        // Mid-way point
+        self.set_compare(0, 0x8000);
+        self.set_compare_interrupt(0, true);
+    }
+
+    unsafe fn start_counter(&self) {
+        self.0.cr1().modify(|w| w.set_cen(true));
+    }
+
+    unsafe fn stop_and_reset(&self) {
+        let regs = self.0;
+
+        regs.cr1().modify(|w| w.set_cen(false));
+        regs.cnt().write(|w| w.set_cnt(0));
+    }
+
+    fn overflow_interrupt_status(&self) -> bool {
+        // NOTE(unsafe) Atomic read with no side-effects
+        unsafe { self.0.sr().read().uif() }
+    }
+
+    unsafe fn overflow_clear_flag(&self) {
+        self.0.sr().modify(|w| w.set_uif(false));
+    }
+
+    unsafe fn set_psc_arr(&self, psc: u16, arr: u16) {
+        use crate::pac::timer::vals::Urs;
+
+        let regs = self.0;
+
+        regs.psc().write(|w| w.set_psc(psc));
+        regs.arr().write(|w| w.set_arr(arr));
+
+        // Set URS, generate update and clear URS
+        regs.cr1().modify(|w| w.set_urs(Urs::COUNTERONLY));
+        regs.egr().write(|w| w.set_ug(true));
+        regs.cr1().modify(|w| w.set_urs(Urs::ANYEVENT));
+    }
+
+    fn compare_interrupt_status(&self, n: usize) -> bool {
+        if n > 3 {
+            false
+        } else {
+            // NOTE(unsafe) Atomic read with no side-effects
+            unsafe { self.0.sr().read().ccif(n) }
+        }
+    }
+
+    unsafe fn compare_clear_flag(&self, n: usize) {
+        if n > 3 {
+            return;
+        }
+        self.0.sr().modify(|w| w.set_ccif(n, false));
+    }
+
+    fn set_compare(&self, n: usize, value: u16) {
+        if n > 3 {
+            return;
+        }
+        // NOTE(unsafe) Atomic write
+        unsafe {
+            self.0.ccr(n).write(|w| w.set_ccr(value));
+        }
+    }
+
+    unsafe fn set_compare_interrupt(&self, n: usize, enable: bool) {
+        if n > 3 {
+            return;
+        }
+        self.0.dier().modify(|w| w.set_ccie(n, enable));
+    }
+
+    fn counter(&self) -> u16 {
+        // NOTE(unsafe) Atomic read with no side-effects
+        unsafe { self.0.cnt().read().cnt() }
+    }
+}
+
+// ------------------------------------------------------
+
+pub(crate) mod sealed {
+    use super::*;
+    pub trait Instance {
+        type Interrupt: Interrupt;
+
+        fn inner() -> TimerInner;
+    }
+}
+
+pub trait Instance: sealed::Instance + Sized + 'static {}
+
+macro_rules! impl_timer {
+    ($inst:ident) => {
+        impl crate::clock::sealed::Instance for peripherals::$inst {
+            type Interrupt = interrupt::$inst;
+
+            fn inner() -> crate::clock::TimerInner {
+                const INNER: crate::clock::TimerInner = crate::clock::TimerInner($inst);
+                INNER
+            }
+        }
+
+        impl crate::clock::Instance for peripherals::$inst {}
+    };
+}

embassy-stm32/src/lib.rs

@@ -9,6 +9,8 @@
 // This must go FIRST so that all the other modules see its macros.
 pub mod fmt;
 
+#[cfg(feature = "_timer")]
+pub mod clock;
 #[cfg(feature = "_dma")]
 pub mod dma;
 pub mod exti;

embassy-stm32/src/pac/stm32f401cb.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401cc.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401cd.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401ce.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401rb.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401rc.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401rd.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401re.rs

@@ -153,6 +153,18 @@ impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -186,6 +198,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -196,7 +209,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM2, TIM3,
+    TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -206,7 +220,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401vb.rs

@@ -161,6 +161,18 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -194,6 +206,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -204,7 +217,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM2,
+    TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -214,7 +228,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401vc.rs

@@ -161,6 +161,18 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -194,6 +206,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -204,7 +217,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM2,
+    TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -214,7 +228,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401vd.rs

@@ -161,6 +161,18 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -194,6 +206,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -204,7 +217,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM2,
+    TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -214,7 +228,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401ve.rs

@@ -161,6 +161,18 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -194,6 +206,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -204,7 +217,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM2,
+    TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -214,7 +228,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405oe.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405og.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405rg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405vg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405zg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ie.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ig.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ve.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407vg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ze.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407zg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410c8.rs

@@ -95,6 +95,12 @@ impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x40080000 as _);
 impl_rng!(RNG, RNG);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -125,6 +131,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -133,7 +140,8 @@ embassy_extras::peripherals!(
     PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PB0, PB1,
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
-    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
+    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, TIM1, TIM11, TIM5, TIM6,
+    TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -143,7 +151,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410cb.rs

@@ -95,6 +95,12 @@ impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x40080000 as _);
 impl_rng!(RNG, RNG);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -125,6 +131,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -133,7 +140,8 @@ embassy_extras::peripherals!(
     PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PB0, PB1,
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
-    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
+    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, TIM1, TIM11, TIM5, TIM6,
+    TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -143,7 +151,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410r8.rs

@@ -95,6 +95,12 @@ impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x40080000 as _);
 impl_rng!(RNG, RNG);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -125,6 +131,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -133,7 +140,8 @@ embassy_extras::peripherals!(
     PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PB0, PB1,
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
-    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
+    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, TIM1, TIM11, TIM5, TIM6,
+    TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -143,7 +151,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410rb.rs

@@ -95,6 +95,12 @@ impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x40080000 as _);
 impl_rng!(RNG, RNG);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -125,6 +131,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -133,7 +140,8 @@ embassy_extras::peripherals!(
     PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PB0, PB1,
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
-    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
+    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, TIM1, TIM11, TIM5, TIM6,
+    TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -143,7 +151,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410t8.rs

@@ -95,6 +95,12 @@ impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x40080000 as _);
 impl_rng!(RNG, RNG);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -118,6 +124,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -126,7 +133,8 @@ embassy_extras::peripherals!(
     PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PB0, PB1,
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
-    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2
+    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, TIM1, TIM11, TIM5, TIM6,
+    TIM9, USART1, USART2
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -136,7 +144,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410tb.rs

@@ -95,6 +95,12 @@ impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x40080000 as _);
 impl_rng!(RNG, RNG);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -118,6 +124,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -126,7 +133,8 @@ embassy_extras::peripherals!(
     PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PB0, PB1,
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
-    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2
+    PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, TIM1, TIM11, TIM5, TIM6,
+    TIM9, USART1, USART2
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -136,7 +144,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411cc.rs

@@ -178,6 +178,18 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -213,6 +225,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -223,8 +236,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11,
-    USART6
+    TIM2, TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -234,7 +247,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411ce.rs

@@ -178,6 +178,18 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -213,6 +225,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -223,8 +236,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11,
-    USART6
+    TIM2, TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -234,7 +247,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411rc.rs

@@ -178,6 +178,18 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -213,6 +225,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -223,8 +236,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11,
-    USART6
+    TIM2, TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -234,7 +247,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411re.rs

@@ -178,6 +178,18 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -213,6 +225,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -223,8 +236,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11,
-    USART6
+    TIM2, TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -234,7 +247,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411vc.rs

@@ -178,6 +178,18 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -213,6 +225,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -223,8 +236,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11,
-    USART6
+    TIM2, TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -234,7 +247,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411ve.rs

@@ -178,6 +178,18 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -213,6 +225,7 @@ pub use super::regs::exti_v1 as exti;
 pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -223,8 +236,8 @@ embassy_extras::peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PE0, PE1, PE2, PE3, PE4, PE5, PE6, PE7,
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
-    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
+    PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11,
-    USART6
+    TIM2, TIM3, TIM4, TIM5, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -234,7 +247,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412ce.rs

@@ -132,6 +132,24 @@ impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -174,6 +192,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -183,7 +202,8 @@ embassy_extras::peripherals!(
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5,
-    SYSCFG, USART1, USART2, USART3, USART6
+    SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8,
+    TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -193,7 +213,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412cg.rs

@@ -132,6 +132,24 @@ impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -174,6 +192,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -183,7 +202,8 @@ embassy_extras::peripherals!(
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5,
-    SYSCFG, USART1, USART2, USART3, USART6
+    SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8,
+    TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -193,7 +213,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412re.rs

@@ -151,6 +151,24 @@ impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -203,6 +221,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -212,8 +231,9 @@ embassy_extras::peripherals!(
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7,
-    PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG,
+    PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1,
-    USART1, USART2, USART3, USART6
+    TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1,
+    USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -223,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412rg.rs

@@ -151,6 +151,24 @@ impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -203,6 +221,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -212,8 +231,9 @@ embassy_extras::peripherals!(
     PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13, PB14, PB15, PC0, PC1, PC2, PC3,
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PD0, PD1, PD2, PD3, PD4, PD5,
     PD6, PD7, PD8, PD9, PD10, PD11, PD12, PD13, PD14, PD15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7,
-    PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG,
+    PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1,
-    USART1, USART2, USART3, USART6
+    TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1,
+    USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -223,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412ve.rs

@@ -214,6 +214,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -273,6 +291,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -285,8 +304,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -296,7 +315,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412vg.rs

@@ -214,6 +214,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -273,6 +291,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -285,8 +304,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -296,7 +315,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412ze.rs

@@ -214,6 +214,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -273,6 +291,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -285,8 +304,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -296,7 +315,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412zg.rs

@@ -214,6 +214,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -273,6 +291,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -285,8 +304,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -296,7 +315,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413cg.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -260,6 +278,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -272,7 +291,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART6
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -282,7 +302,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413ch.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -260,6 +278,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -272,7 +291,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART6
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -282,7 +302,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413mg.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413mh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413rg.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413rh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413vg.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413vh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413zg.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413zh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415og.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415rg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415vg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415zg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ie.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ig.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ve.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417vg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ze.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417zg.rs

@@ -207,6 +207,24 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -261,6 +279,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -274,7 +293,8 @@ embassy_extras::peripherals!(
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
-    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
+    PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -284,7 +304,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423ch.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -260,6 +278,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -272,7 +291,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART6
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -282,7 +302,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423mh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423rh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423vh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423zh.rs

@@ -217,6 +217,24 @@ impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -276,6 +294,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -288,8 +307,8 @@ embassy_extras::peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PF0, PF1, PF2, PF3, PF4, PF5, PF6, PF7, PF8, PF9,
     PF10, PF11, PF12, PF13, PF14, PF15, PG0, PG1, PG2, PG3, PG4, PG5, PG6, PG7, PG8, PG9, PG10,
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
-    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
+    PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12,
-    USART6
+    TIM13, TIM14, TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -299,7 +318,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ag.rs

@@ -259,6 +259,24 @@ impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -313,6 +331,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -328,7 +347,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -338,7 +358,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ai.rs

@@ -259,6 +259,24 @@ impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -313,6 +331,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -328,7 +347,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -338,7 +358,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ig.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ii.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427vg.rs

@@ -251,6 +251,24 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -305,6 +323,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -320,7 +339,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3,
+    TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -330,7 +350,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427vi.rs

@@ -251,6 +251,24 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -305,6 +323,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -320,7 +339,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3,
+    TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -330,7 +350,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427zg.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427zi.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ag.rs

@@ -259,6 +259,24 @@ impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -313,6 +331,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -328,7 +347,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -338,7 +358,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ai.rs

@@ -259,6 +259,24 @@ impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -313,6 +331,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -328,7 +347,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -338,7 +358,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429be.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429bg.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429bi.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ie.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ig.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ii.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ne.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ng.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ni.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ve.rs

@@ -251,6 +251,24 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -305,6 +323,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -320,7 +339,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3,
+    TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -330,7 +350,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429vg.rs

@@ -251,6 +251,24 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -305,6 +323,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -320,7 +339,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3,
+    TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -330,7 +350,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429vi.rs

@@ -251,6 +251,24 @@ impl_spi_pin!(SPI4, SckPin, PE2, 5);
 impl_spi_pin!(SPI4, MisoPin, PE5, 5);
 impl_spi_pin!(SPI4, MosiPin, PE6, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -305,6 +323,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -320,7 +339,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2, TIM3,
+    TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -330,7 +350,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ze.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429zg.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429zi.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437ai.rs

@@ -259,6 +259,24 @@ impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -313,6 +331,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -328,7 +347,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14, TIM2,
+    TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -338,7 +358,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437ig.rs

@@ -264,6 +264,24 @@ impl_spi_pin!(SPI6, MisoPin, PG12, 5);
 impl_spi_pin!(SPI6, SckPin, PG13, 5);
 impl_spi_pin!(SPI6, MosiPin, PG14, 5);
 pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
+pub const TIM1: timer::TimGp16 = timer::TimGp16(0x40010000 as _);
+pub const TIM10: timer::TimGp16 = timer::TimGp16(0x40014400 as _);
+pub const TIM11: timer::TimGp16 = timer::TimGp16(0x40014800 as _);
+pub const TIM12: timer::TimGp16 = timer::TimGp16(0x40001800 as _);
+pub const TIM13: timer::TimGp16 = timer::TimGp16(0x40001c00 as _);
+pub const TIM14: timer::TimGp16 = timer::TimGp16(0x40002000 as _);
+pub const TIM2: timer::TimGp16 = timer::TimGp16(0x40000000 as _);
+impl_timer!(TIM2);
+pub const TIM3: timer::TimGp16 = timer::TimGp16(0x40000400 as _);
+impl_timer!(TIM3);
+pub const TIM4: timer::TimGp16 = timer::TimGp16(0x40000800 as _);
+impl_timer!(TIM4);
+pub const TIM5: timer::TimGp16 = timer::TimGp16(0x40000c00 as _);
+impl_timer!(TIM5);
+pub const TIM6: timer::TimGp16 = timer::TimGp16(0x40001000 as _);
+pub const TIM7: timer::TimGp16 = timer::TimGp16(0x40001400 as _);
+pub const TIM8: timer::TimGp16 = timer::TimGp16(0x40010400 as _);
+pub const TIM9: timer::TimGp16 = timer::TimGp16(0x40014000 as _);
 pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
 impl_usart!(USART1);
 impl_usart_pin!(USART1, RxPin, PA10, 7);
@@ -318,6 +336,7 @@ pub use super::regs::gpio_v2 as gpio;
 pub use super::regs::rng_v1 as rng;
 pub use super::regs::spi_v1 as spi;
 pub use super::regs::syscfg_f4 as syscfg;
+pub use super::regs::timer_v1 as timer;
 pub use super::regs::usart_v1 as usart;
 embassy_extras::peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
@@ -333,7 +352,8 @@ embassy_extras::peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, PJ0, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13,
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
-    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
+    PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, TIM1, TIM10, TIM11, TIM12, TIM13, TIM14,
+    TIM2, TIM3, TIM4, TIM5, TIM6, TIM7, TIM8, TIM9, USART1, USART2, USART3, USART6
 );
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
@@ -343,7 +363,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;