2 Commits

Author SHA1 Message Date
Priec
3134399c4e direct solution works 2025-11-06 00:36:38 +01:00
Priec
9358f2e8ec not working, i have no clue why 2025-11-05 23:40:59 +01:00
3 changed files with 56 additions and 62 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
*.pdf *.pdf
dma_example/

View File

@@ -4,10 +4,8 @@
use defmt::*; use defmt::*;
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_futures::yield_now;
use embassy_stm32::dma::Request; use embassy_stm32::dma::Request;
use embassy_stm32::gpio::{Input, Output, Level, Pull, Speed}; use embassy_stm32::gpio::{Input, Output, Level, Pull, Speed};
use embassy_sync::{blocking_mutex::raw::CriticalSectionRawMutex, pipe::Pipe};
use embassy_time::{Duration, Timer}; use embassy_time::{Duration, Timer};
use embassy_stm32::dma::{TransferOptions, WritableRingBuffer}; use embassy_stm32::dma::{TransferOptions, WritableRingBuffer};
use dma_gpio::software_uart::{ use dma_gpio::software_uart::{
@@ -15,88 +13,83 @@ use dma_gpio::software_uart::{
gpio_dma_uart_tx::encode_uart_frames, gpio_dma_uart_tx::encode_uart_frames,
debug::dump_tim6_regs, debug::dump_tim6_regs,
}; };
use dma_gpio::config::{BAUD, TX_PIN_BIT, RX_OVERSAMPLE, TX_OVERSAMPLE}; use dma_gpio::config::{BAUD, TX_PIN_BIT, TX_OVERSAMPLE, TX_RING_BYTES};
use dma_gpio::config::{TX_RING_BYTES, RX_RING_BYTES, PIPE_RX_SIZE};
use static_cell::StaticCell; use static_cell::StaticCell;
use core::slice;
use {defmt_rtt as _, panic_probe as _}; use {defmt_rtt as _, panic_probe as _};
// kapitola 17.4.11 - 2 casovace pre 2 DMA pub const TIM6_UP_REQ: Request = 4;
pub const TIM6_UP_REQ: Request = 4; // Table 137: tim6_upd_dma, strana 687 STM32U5xx datasheet
static TX_RING: StaticCell<[u32; TX_RING_BYTES]> = StaticCell::new(); static TX_RING: StaticCell<[u32; TX_RING_BYTES]> = StaticCell::new();
use core::future::poll_fn;
use core::task::Poll;
async fn wait_for_space<'a, W: embassy_stm32::dma::word::Word>(
ring: &mut embassy_stm32::dma::WritableRingBuffer<'a, W>,
min_free: usize,
) {
poll_fn(|cx| {
let used = ring.len().unwrap_or(0);
let cap = ring.capacity();
if cap - used > min_free {
Poll::Ready(())
} else {
ring.set_waker(cx.waker());
Poll::Pending
}
}).await
}
#[embassy_executor::main] #[embassy_executor::main]
async fn main(spawner: Spawner) { async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
info!("Hehe"); info!("DMA UART TX - Direct Buffer Modification");
let _rx = Input::new(p.PA3, Pull::Up); let _rx = Input::new(p.PA3, Pull::Up);
let _tx = Output::new(p.PA2, Level::High, Speed::VeryHigh); let _tx = Output::new(p.PA2, Level::High, Speed::VeryHigh);
init_tim6_for_uart(p.TIM6, BAUD, TX_OVERSAMPLE); init_tim6_for_uart(p.TIM6, BAUD, TX_OVERSAMPLE);
dump_tim6_regs(); dump_tim6_regs();
// Safe one-time init from StaticCell // Initialize buffer - keep reference for modification
let tx_ring_mem: &mut [u32; TX_RING_BYTES] = TX_RING.init([0; TX_RING_BYTES]); let tx_ring_mem: &'static mut [u32; TX_RING_BYTES] = TX_RING.init([0; TX_RING_BYTES]);
// Create and start the TX DMA ring in main. // Fill with UART idle state (pin high)
// let bsrr_ptr = embassy_stm32::pac::GPIOA.bsrr().as_ptr() as *mut u32; let pin_mask = 1u32 << TX_PIN_BIT;
for word in tx_ring_mem.iter_mut() {
*word = pin_mask;
}
// Create DMA ring buffer with a SEPARATE slice created from raw parts
// This allows us to keep modifying tx_ring_mem
let odr_ptr = embassy_stm32::pac::GPIOA.odr().as_ptr() as *mut u32; let odr_ptr = embassy_stm32::pac::GPIOA.odr().as_ptr() as *mut u32;
let mut tx_opts = TransferOptions::default(); let tx_opts = TransferOptions::default();
tx_opts.half_transfer_ir = true;
tx_opts.complete_transfer_ir = true;
// SAFETY: tx_ring_mem is exclusive
let mut tx_ring = unsafe { let mut tx_ring = unsafe {
// Create a separate mutable slice pointing to the same memory
let dma_slice = slice::from_raw_parts_mut(
tx_ring_mem.as_mut_ptr(),
tx_ring_mem.len()
);
WritableRingBuffer::new( WritableRingBuffer::new(
p.GPDMA1_CH0, p.GPDMA1_CH0,
TIM6_UP_REQ, TIM6_UP_REQ,
odr_ptr, odr_ptr,
tx_ring_mem, dma_slice,
tx_opts, tx_opts,
) )
}; };
// Start DMA
tx_ring.start(); tx_ring.start();
info!("TX DMA ring started"); info!("DMA started - continuously reading from buffer");
// Temporary buffer for encoding
let mut frame_buf = [0u32; 4096]; let mut frame_buf = [0u32; 4096];
loop { loop {
info!("tick start");
Timer::after(Duration::from_millis(400)).await; Timer::after(Duration::from_millis(400)).await;
info!("tick end");
// Encode the UART frames
let used = encode_uart_frames(TX_PIN_BIT, b"Hello marshmallow\r\n", &mut frame_buf).await; let frame_len = encode_uart_frames(
TX_PIN_BIT,
// Wait for DMA to free space, async style b"Hello marshmallow\r\n",
wait_for_space(&mut tx_ring, used / 2).await; &mut frame_buf
).await;
if let Err(e) = tx_ring.write_exact(&frame_buf[..used]).await {
warn!("DMA ring write error: {:?}", e); info!("Encoded {} words, copying to buffer...", frame_len);
} else {
info!("Frame queued to DMA ring"); // Copy directly into the ring buffer memory
// DMA will automatically read and transmit this!
let copy_len = frame_len.min(TX_RING_BYTES);
tx_ring_mem[..copy_len].copy_from_slice(&frame_buf[..copy_len]);
// Fill rest with idle state
for i in copy_len..TX_RING_BYTES {
tx_ring_mem[i] = pin_mask;
} }
yield_now().await; info!("Buffer updated - DMA transmitting now");
} }
} }

View File

@@ -4,9 +4,9 @@ use crate::software_uart::uart_emulation::{Parity, StopBits, UartConfig};
pub const BAUD: u32 = 9_600; pub const BAUD: u32 = 9_600;
pub const TX_PIN_BIT: u8 = 2; // PA2 pub const TX_PIN_BIT: u8 = 2; // PA2
pub const TX_OVERSAMPLE: u16 = 1; pub const TX_OVERSAMPLE: u16 = 1;
pub const RX_OVERSAMPLE: u16 = 16; pub const RX_OVERSAMPLE: u16 = 1;
pub const RX_RING_BYTES: usize = 4096; pub const RX_RING_BYTES: usize = 4096;
pub const TX_RING_BYTES: usize = 4096; pub const TX_RING_BYTES: usize = 256;
pub const PIPE_RX_SIZE: usize = 256; pub const PIPE_RX_SIZE: usize = 256;
pub const UART_CFG: UartConfig = UartConfig { pub const UART_CFG: UartConfig = UartConfig {