timer is now separated

dma_gpio/src/bin/main.rs

@@ -7,18 +7,17 @@ use defmt::*;
 use embassy_executor::Spawner;
 use embassy_sync::{blocking_mutex::raw::CriticalSectionRawMutex, pipe::Pipe};
 use embassy_time::{Duration, Timer};
+use dma_gpio::dma_timer::init_tim6_for_uart;
 use {defmt_rtt as _, panic_probe as _};
 
 use embassy_stm32::{
     gpio::{Level, Output, Speed},
-    peripherals::{GPDMA1_CH0, TIM6},
-    rcc,
-    timer::low_level::Timer as LlTimer,
+    peripherals::GPDMA1_CH0,
 };
 use embassy_stm32::Peri;
 
 use dma_gpio::gpio_dma_uart::{
-    write_uart_frames_to_pipe, GpioDmaBsrrTx, Parity, StopBits, UartConfig, TIM6_UP_REQ,
+    write_uart_frames_to_pipe, GpioDmaBsrrTx, Parity, StopBits, UartConfig,
 };
 
 static PIPE: Pipe<CriticalSectionRawMutex, 256> = Pipe::new();
@@ -26,6 +25,7 @@ static PIPE: Pipe<CriticalSectionRawMutex, 256> = Pipe::new();
 // Baud rate: one TIM6 update equals one UART bit-time
 const BAUD: u32 = 115_200;
 const TX_PIN_BIT: u8 = 2; // PA2
+const OVERSAMPLE: u16 = 6;
 
 const UART_CFG: UartConfig = UartConfig {
     data_bits: 8,
@@ -41,17 +41,7 @@ async fn main(spawner: Spawner) {
     // PA2 is the TX "wire"
     let _pa2 = Output::new(p.PA2, Level::High, Speed::VeryHigh);
     drop(_pa2);
-
-    // TIM6 generates one DMA request per bit-time
-    let tim6 = LlTimer::new(p.TIM6);
-    let f_tim6 = rcc::frequency::<TIM6>().0;
-    let arr = (f_tim6 / BAUD).saturating_sub(1) as u16;
-    tim6.regs_basic().arr().modify(|w| w.set_arr(arr));
-    tim6.regs_basic().dier().modify(|w| w.set_ude(true));
-    tim6.regs_basic().cr1().modify(|w| {
-        w.set_opm(false);
-        w.set_cen(true);
-    });
+    init_tim6_for_uart(p.TIM6, BAUD, OVERSAMPLE);
 
     // Start DMA consumer task
     spawner.spawn(dma_tx_task(p.GPDMA1_CH0)).unwrap();