From 0ecf821e403d5a9c9855a468e81eecfd72534e0a Mon Sep 17 00:00:00 2001 From: Priec Date: Fri, 31 Oct 2025 13:19:54 +0100 Subject: [PATCH] moved properly --- usart_async_buffered_generalized2/src/lib.rs | 1 - usart_async_buffered_generalized2/src/uart/driver.rs | 2 +- usart_async_buffered_generalized2/src/uart/mod.rs | 1 + usart_async_buffered_generalized2/src/{ => uart}/safety.rs | 0 usart_async_buffered_generalized2/src/uart/usart1.rs | 4 +--- 5 files changed, 3 insertions(+), 5 deletions(-) rename usart_async_buffered_generalized2/src/{ => uart}/safety.rs (100%) diff --git a/usart_async_buffered_generalized2/src/lib.rs b/usart_async_buffered_generalized2/src/lib.rs index 9f593ed..43cce50 100644 --- a/usart_async_buffered_generalized2/src/lib.rs +++ b/usart_async_buffered_generalized2/src/lib.rs @@ -1,3 +1,2 @@ #![no_std] -pub mod safety; pub mod uart; diff --git a/usart_async_buffered_generalized2/src/uart/driver.rs b/usart_async_buffered_generalized2/src/uart/driver.rs index 8a6cc36..a18fb2f 100644 --- a/usart_async_buffered_generalized2/src/uart/driver.rs +++ b/usart_async_buffered_generalized2/src/uart/driver.rs @@ -8,7 +8,7 @@ use embassy_sync::pipe::Pipe; use embassy_time::Duration; use embedded_io_async::{Read, Write}; -use crate::safety::{RX_PIPE_CAP, TX_PIPE_CAP}; +use crate::uart::safety::{RX_PIPE_CAP, TX_PIPE_CAP}; pub struct UartHandle { pub tx: &'static Pipe, diff --git a/usart_async_buffered_generalized2/src/uart/mod.rs b/usart_async_buffered_generalized2/src/uart/mod.rs index e0d6d58..1ad692c 100644 --- a/usart_async_buffered_generalized2/src/uart/mod.rs +++ b/usart_async_buffered_generalized2/src/uart/mod.rs @@ -1,3 +1,4 @@ // src/uart/mod.rs pub mod driver; pub mod usart1; +pub mod safety; diff --git a/usart_async_buffered_generalized2/src/safety.rs b/usart_async_buffered_generalized2/src/uart/safety.rs similarity index 100% rename from usart_async_buffered_generalized2/src/safety.rs rename to usart_async_buffered_generalized2/src/uart/safety.rs diff --git a/usart_async_buffered_generalized2/src/uart/usart1.rs b/usart_async_buffered_generalized2/src/uart/usart1.rs index 864b258..41a8506 100644 --- a/usart_async_buffered_generalized2/src/uart/usart1.rs +++ b/usart_async_buffered_generalized2/src/uart/usart1.rs @@ -1,13 +1,11 @@ // src/uart/usart1.rs use defmt::info; use embassy_executor::Spawner; -use embassy_stm32::bind_interrupts; -use embassy_stm32::usart::BufferedInterruptHandler; use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; use embassy_sync::pipe::Pipe; use embassy_time::Duration; -use crate::safety::{preflight_and_suggest_yield_period, RX_PIPE_CAP, TX_PIPE_CAP}; +use crate::uart::safety::{preflight_and_suggest_yield_period, RX_PIPE_CAP, TX_PIPE_CAP}; use crate::uart::driver::{spawn_for, UartHandle}; // Static pipes and buffers