semestralka joinig all worlds together

This commit is contained in:
Filipriec
2025-11-11 15:51:37 +01:00
parent 25c6d3d265
commit 541173bfcb
16 changed files with 865 additions and 311 deletions

View File

@@ -1,157 +1,92 @@
// src/bin/main.rs
#![no_std]
#![no_main]
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::bind_interrupts;
use embassy_stm32::peripherals;
use embassy_stm32::peripherals::{PA2, PA3};
use embassy_stm32::gpio::{Input, Output, Pull, Speed, Level};
use embassy_stm32::Peripherals;
use embassy_stm32::usart::{BufferedInterruptHandler, BufferedUart, Config};
use embassy_stm32::timer::low_level::Timer as HardwareTimer;
use embassy_stm32::interrupt::{self, typelevel::TIM2 as TIM2_IRQ, Priority};
use embassy_stm32::peripherals::TIM2;
use embedded_io_async::{Read, Write};
use embassy_stm32::time::Hertz;
use embassy_time::{Timer, Duration, Instant};
use embassy_futures::yield_now;
use embassy_futures::select::{select, Either};
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
use embassy_sync::pipe::Pipe;
use embassy_sync::signal::Signal;
use embassy_stm32::dma::Request;
use embassy_stm32::gpio::{Input, Output, Level, Pull, Speed};
use embassy_sync::{blocking_mutex::raw::CriticalSectionRawMutex, pipe::Pipe};
use embassy_stm32::dma::{TransferOptions, WritableRingBuffer};
use dma_gpio::software_uart::{
dma_timer::{init_tim6_for_uart, init_tim7_for_uart},
gpio_dma_uart_tx::encode_uart_frames,
gpio_dma_uart_rx::rx_dma_task,
debug::dump_tim6_regs,
};
use dma_gpio::config::{BAUD, TX_PIN_BIT, RX_OVERSAMPLE, TX_OVERSAMPLE};
use dma_gpio::config::{TX_RING_BYTES, RX_RING_BYTES, PIPE_RX_SIZE};
use static_cell::StaticCell;
use embassy_futures::yield_now;
use {defmt_rtt as _, panic_probe as _};
use async_uart::safety::{preflight_and_suggest_yield_period, RX_PIPE_CAP, TX_PIPE_CAP};
static UART_TX: Pipe<CriticalSectionRawMutex, TX_PIPE_CAP> = Pipe::new();
static UART_RX: Pipe<CriticalSectionRawMutex, RX_PIPE_CAP> = Pipe::new();
static TIM2_TICK: Signal<CriticalSectionRawMutex, ()> = Signal::new();
pub const TIM6_UP_REQ: Request = 4;
bind_interrupts!(
struct Irqs {
USART1 => BufferedInterruptHandler<peripherals::USART1>;
}
);
#[embassy_executor::task]
async fn uart_task(mut uart: BufferedUart<'static>) {
let mut rx_byte = [0u8; 1];
let mut tx_buf = [0u8; 64];
loop {
// Wait for either RX or TX events.
let rx_fut = uart.read(&mut rx_byte);
let tx_fut = async {
// Until there's outgoing data in TX pipe
let n = UART_TX.read(&mut tx_buf).await;
n
};
match select(rx_fut, tx_fut).await {
// Incoming data from UART hardware
Either::First(res) => {
if let Ok(_) = res {
// Forward to RX pipe
let _ = UART_RX.write(&rx_byte).await;
let _ = UART_TX.try_write(&rx_byte);
}
}
// Outgoing data waiting in TX pipe
Either::Second(n) => {
unwrap!(uart.write(&tx_buf[..n]).await);
}
}
}
}
static PIPE_RX: Pipe<CriticalSectionRawMutex, PIPE_RX_SIZE> = Pipe::new();
static TX_RING: StaticCell<[u32; TX_RING_BYTES]> = StaticCell::new();
static RX_RING: StaticCell<[u8; RX_RING_BYTES]> = StaticCell::new();
#[embassy_executor::main]
async fn main(spawner: Spawner) {
info!("tititititi");
let p = embassy_stm32::init(Default::default());
static TX_BUF: StaticCell<[u8; 256]> = StaticCell::new();
static RX_BUF: StaticCell<[u8; 256]> = StaticCell::new();
let tx_buf = TX_BUF.init([0; 256]);
let rx_buf = RX_BUF.init([0; 256]);
let mut cfg = Config::default();
cfg.baudrate = 230_400;
info!("Hehe");
// Call preflight and get the computed yield period
let yield_period = preflight_and_suggest_yield_period(cfg.baudrate);
let usart = BufferedUart::new(
p.USART1,
p.PA10, // RX
p.PA9, // TX
tx_buf,
rx_buf,
Irqs,
cfg,
).unwrap();
info!("starting uart task");
spawner.spawn(uart_task(usart)).unwrap();
let mut transfer: u32 = 16;
let mut rx_buf = [0u8; 64];
let mut last_yield = Instant::now();
// Software UART bits init
let mut tx = Output::new(p.PA2, Level::Low, Speed::Low);
let _rx = Input::new(p.PA3, Pull::Up);
let _tx = Output::new(p.PA2, Level::High, Speed::VeryHigh);
let tim = HardwareTimer::new(p.TIM2);
init_tim6_for_uart(p.TIM6, BAUD, TX_OVERSAMPLE);
init_tim7_for_uart(p.TIM7, BAUD, RX_OVERSAMPLE);
// Configure for 230_400 Hz
tim.set_frequency(Hertz(cfg.baudrate*transfer));
tim.enable_update_interrupt(true);
tim.start();
dump_tim6_regs();
tx.set_high();
loop {
// Safe one-time init from StaticCell
let rx_ring: &mut [u8; RX_RING_BYTES] = RX_RING.init([0; RX_RING_BYTES]);
let tx_ring_mem: &mut [u32; TX_RING_BYTES] = TX_RING.init([0; TX_RING_BYTES]);
TIM2_TICK.wait().await;
tx.set_low();
TIM2_TICK.wait().await;
// Spawn tasks
spawner.spawn(rx_dma_task(p.GPDMA1_CH1, &PIPE_RX, rx_ring).unwrap());
Timer::after(Duration::from_millis(1000)).await;
// Poll RX pipe for new data (non-blocking)
if let Ok(n) = UART_RX.try_read(&mut rx_buf) {
if n > 0 {
if let Ok(s) = core::str::from_utf8(&rx_buf[..n]) {
info!("RX got: {}", s);
} else {
info!("RX got (nonutf8): {:?}", &rx_buf[..n]);
}
}
}
// Create and start the TX DMA ring in main.
// let bsrr_ptr = embassy_stm32::pac::GPIOA.bsrr().as_ptr() as *mut u32;
let odr_ptr = embassy_stm32::pac::GPIOA.odr().as_ptr() as *mut u32;
let mut tx_opts = TransferOptions::default();
tx_opts.half_transfer_ir = true;
tx_opts.complete_transfer_ir = true;
// Guaranteed to yield before ISR RX buffer can overflow
if Instant::now().duration_since(last_yield) >= yield_period {
yield_now().await;
last_yield = Instant::now();
// info!("Yield mf {}", counter);
}
// Timer::after(Duration::from_micros(1)).await;
// Timer::after(Duration::from_secs(5)).await;
}
}
#[embassy_stm32::interrupt]
fn TIM2() {
use embassy_stm32::timer::CoreInstance;
// Access TIM2 core registers directly.
let regs = unsafe {
embassy_stm32::pac::timer::TimCore::from_ptr(
<peripherals::TIM2 as CoreInstance>::regs(),
// SAFETY: tx_ring_mem is exclusive
let mut tx_ring = unsafe {
WritableRingBuffer::new(
p.GPDMA1_CH0,
TIM6_UP_REQ,
odr_ptr,
tx_ring_mem,
tx_opts,
)
};
// Start DMA
tx_ring.start();
info!("TX DMA ring started");
// Clear update flag to avoid retriggering.
let sr = regs.sr().read();
if sr.uif() {
regs.sr().modify(|r| r.set_uif(false));
let mut frame_buf = [0u32; 4096];
// Signal the waiting task that a tick occurred.
TIM2_TICK.signal(());
loop {
info!("tick start");
// Timer::after(Duration::from_millis(100)).await;
// info!("tick end");
let used = encode_uart_frames(
TX_PIN_BIT,
b"Hello marshmallow\r\n",
&mut frame_buf,
)
.await;
if used == 0 {
info!("encode_uart_frames() produced 0 words, skipping write");
yield_now().await;
continue;
}
let _ = tx_ring.write_exact(&frame_buf[..used]).await;
info!("text");
yield_now().await;
}
}