diff --git a/CHANGELOG.md b/CHANGELOG.md index fbc1c5ca..e8dd8a26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - - Serial flow control enable + - Serial flow control enable [#775] - `i2c_scanner` example [#758] - Enable `sdio` for stm32f446 - port LTDC implementation and example from stm32f7xx-hal [#731] @@ -36,6 +36,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). [#758]: https://github.com/stm32-rs/stm32f4xx-hal/pull/758 [#773]: https://github.com/stm32-rs/stm32f4xx-hal/pull/773 +[#775]: https://github.com/stm32-rs/stm32f4xx-hal/pull/775 + ## [v0.21.0] - 2024-05-30 ### Changed diff --git a/src/serial.rs b/src/serial.rs index d4192bb2..bf00718c 100644 --- a/src/serial.rs +++ b/src/serial.rs @@ -111,6 +111,8 @@ pub enum CFlag { TransmissionComplete = 1 << 6, /// LIN break detection flag LinBreak = 1 << 8, + /// Clear to send flag + Cts = 1 << 9, } pub mod config; diff --git a/src/serial/uart_impls.rs b/src/serial/uart_impls.rs index 8d0ca7d2..4ae91e1c 100644 --- a/src/serial/uart_impls.rs +++ b/src/serial/uart_impls.rs @@ -268,15 +268,22 @@ macro_rules! uartCommon { pub trait RBFlowControlImpl { fn enable_rts(&self, state: bool); fn enable_cts(&self, state: bool); + fn listen_cts(&self, state: bool); } impl RBFlowControlImpl for RegisterBlockUsart { + #[inline(always)] fn enable_rts(&self, state: bool) { self.cr3().modify(|_, w| w.rtse().bit(state)); } + #[inline(always)] fn enable_cts(&self, state: bool) { self.cr3().modify(|_, w| w.ctse().bit(state)); } + #[inline(always)] + fn listen_cts(&self, state: bool) { + self.cr3().modify(|_, w| w.ctsie().bit(state)) + } } impl RegisterBlockImpl for RegisterBlockUsart { @@ -545,7 +552,7 @@ where { impl Serial where - UART::RegisterBlock: RBFlowControlImpl, + UART::RB: RBFlowControlImpl, { pub fn with_rts(self, rts: impl Into) -> Self { self.rx.usart.enable_rts(true); @@ -569,6 +576,12 @@ where pub fn disable_clear_to_send(&mut self) { self.tx.usart.enable_cts(false); } + pub fn listen_clear_to_send(&mut self) { + self.tx.usart.listen_cts(true) + } + pub fn unlisten_clear_to_send(&mut self) { + self.tx.usart.listen_cts(false) + } } impl RxISR for Serial