Merge pull request #610 from stm32-rs/from-output

enum from output

Author: burrbull

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
  - Split USART and UART implementations
  - Add `lapce` editor settings [#601]
- - Use `enum`s for alternate peripheral pins [#594]
+ - Use `enum`s for alternate peripheral pins [#594] [#610]
  - Added missing U(S)ART DMA traits for HAL serial types [#593]
  - Improve SPI::new* docs [#587]
  - Add advanced timer dead time insertion example [#585]
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#599]: https://github.com/stm32-rs/stm32f4xx-hal/pull/599
 [#601]: https://github.com/stm32-rs/stm32f4xx-hal/pull/601
 [#603]: https://github.com/stm32-rs/stm32f4xx-hal/pull/603
+[#610]: https://github.com/stm32-rs/stm32f4xx-hal/pull/610
 
 ## [v0.15.0] - 2023-03-13
 

src/gpio/alt.rs

@@ -1,4 +1,4 @@
-use super::{Alternate, NoPin, OpenDrain, PinMode};
+use super::{marker, Alternate, NoPin, OpenDrain, PinMode};
 use crate::gpio::{self, Edge, ExtiPin};
 use crate::pac::EXTI;
 use crate::syscfg::SysCfg;
@@ -122,8 +122,11 @@ macro_rules! pin {
 
             $(
                 $(#[$attr])*
-                impl From<gpio::$PX> for $name {
-                    fn from(p: gpio::$PX) -> Self {
+                impl<MODE> From<gpio::$PX<MODE>> for $name
+                where
+                    MODE: marker::NotAlt + PinMode
+                {
+                    fn from(p: gpio::$PX<MODE>) -> Self {
                         Self::$PX(p.into_mode())
                     }
                 }

src/uart.rs

@@ -271,17 +271,15 @@ impl Instance for pac::UART4 {
     }
 }
 
-use crate::serial::halUsart;
-
 #[cfg(feature = "uart5")]
 #[cfg(any(feature = "stm32f413", feature = "stm32f423"))]
-halUsart! { pac::UART5, uart5, Serial5, Rx5, Tx5 }
+crate::serial::halUsart! { pac::UART5, uart5, Serial5, Rx5, Tx5 }
 
 #[cfg(feature = "uart7")]
-halUsart! { pac::UART7, uart7, Serial7, Rx7, Tx7 }
+crate::serial::halUsart! { pac::UART7, uart7, Serial7, Rx7, Tx7 }
 #[cfg(feature = "uart8")]
-halUsart! { pac::UART8, uart8, Serial8, Rx8, Tx8 }
+crate::serial::halUsart! { pac::UART8, uart8, Serial8, Rx8, Tx8 }
 #[cfg(feature = "uart9")]
-halUsart! { pac::UART9, uart9, Serial9, Rx9, Tx9 }
+crate::serial::halUsart! { pac::UART9, uart9, Serial9, Rx9, Tx9 }
 #[cfg(feature = "uart10")]
-halUsart! { pac::UART10, uart10, Serial10, Rx10, Tx10 }
+crate::serial::halUsart! { pac::UART10, uart10, Serial10, Rx10, Tx10 }