Merge pull request #3415 from bkueng/stm32_uart_rx_pull

stm32: add RX Pull configuration option to USART

2 files changed, 13 insertions, 9 deletions

diff --git a/embassy-stm32/src/usart/buffered.rs b/embassy-stm32/src/usart/buffered.rs
index 86f56eb7c..4fbe33b2e 100644
--- a/embassy-stm32/src/usart/buffered.rs
+++ b/embassy-stm32/src/usart/buffered.rs
@@ -210,7 +210,7 @@ impl<'d> BufferedUart<'d> {
     ) -> Result<Self, ConfigError> {
         Self::new_inner(
             peri,
-            new_pin!(rx, AfType::input(Pull::None)),
+            new_pin!(rx, AfType::input(config.rx_pull)),
             new_pin!(tx, AfType::output(OutputType::PushPull, Speed::Medium)),
             None,
             None,
@@ -260,7 +260,7 @@ impl<'d> BufferedUart<'d> {
     ) -> Result<Self, ConfigError> {
         Self::new_inner(
             peri,
-            new_pin!(rx, AfType::input(Pull::None)),
+            new_pin!(rx, AfType::input(config.rx_pull)),
             new_pin!(tx, AfType::output(OutputType::PushPull, Speed::Medium)),
             None,
             None,
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs
index e7f2f890a..5c96e202d 100644
--- a/embassy-stm32/src/usart/mod.rs
+++ b/embassy-stm32/src/usart/mod.rs
@@ -167,6 +167,9 @@ pub struct Config {
     #[cfg(any(usart_v3, usart_v4))]
     pub invert_rx: bool,
 
+    /// Set the pull configuration for the RX pin.
+    pub rx_pull: Pull,
+
     // private: set by new_half_duplex, not by the user.
     half_duplex: bool,
 }
@@ -175,7 +178,7 @@ impl Config {
     fn tx_af(&self) -> AfType {
         #[cfg(any(usart_v3, usart_v4))]
         if self.swap_rx_tx {
-            return AfType::input(Pull::None);
+            return AfType::input(self.rx_pull);
         };
         AfType::output(OutputType::PushPull, Speed::Medium)
     }
@@ -185,7 +188,7 @@ impl Config {
         if self.swap_rx_tx {
             return AfType::output(OutputType::PushPull, Speed::Medium);
         };
-        AfType::input(Pull::None)
+        AfType::input(self.rx_pull)
     }
 }
 
@@ -206,6 +209,7 @@ impl Default for Config {
             invert_tx: false,
             #[cfg(any(usart_v3, usart_v4))]
             invert_rx: false,
+            rx_pull: Pull::None,
             half_duplex: false,
         }
     }
@@ -448,7 +452,7 @@ impl<'d> UartTx<'d, Blocking> {
         Self::new_inner(
             peri,
             new_pin!(tx, AfType::output(OutputType::PushPull, Speed::Medium)),
-            new_pin!(cts, AfType::input(Pull::None)),
+            new_pin!(cts, AfType::input(config.rx_pull)),
             None,
             config,
         )
@@ -567,7 +571,7 @@ impl<'d> UartRx<'d, Async> {
     ) -> Result<Self, ConfigError> {
         Self::new_inner(
             peri,
-            new_pin!(rx, AfType::input(Pull::None)),
+            new_pin!(rx, AfType::input(config.rx_pull)),
             None,
             new_dma!(rx_dma),
             config,
@@ -585,7 +589,7 @@ impl<'d> UartRx<'d, Async> {
     ) -> Result<Self, ConfigError> {
         Self::new_inner(
             peri,
-            new_pin!(rx, AfType::input(Pull::None)),
+            new_pin!(rx, AfType::input(config.rx_pull)),
             new_pin!(rts, AfType::output(OutputType::PushPull, Speed::Medium)),
             new_dma!(rx_dma),
             config,
@@ -815,7 +819,7 @@ impl<'d> UartRx<'d, Blocking> {
         rx: impl Peripheral<P = impl RxPin<T>> + 'd,
         config: Config,
     ) -> Result<Self, ConfigError> {
-        Self::new_inner(peri, new_pin!(rx, AfType::input(Pull::None)), None, None, config)
+        Self::new_inner(peri, new_pin!(rx, AfType::input(config.rx_pull)), None, None, config)
     }
 
     /// Create a new rx-only UART with a request-to-send pin
@@ -827,7 +831,7 @@ impl<'d> UartRx<'d, Blocking> {
     ) -> Result<Self, ConfigError> {
         Self::new_inner(
             peri,
-            new_pin!(rx, AfType::input(Pull::None)),
+            new_pin!(rx, AfType::input(config.rx_pull)),
             new_pin!(rts, AfType::output(OutputType::PushPull, Speed::Medium)),
             None,
             config,