Merge pull request #93 from stm32-rs/fix-ci

Fix ETHERNET_PTP being re-exported without ptp feature
stm32-rs · Mar 14, 2024 · b6d2ecf · b6d2ecf
2 parents 20776f0 + c7b2603
commit b6d2ecf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/examples/common.rs b/examples/common.rs
@@ -111,6 +111,7 @@ pub fn setup_peripherals(p: stm32_eth::stm32::Peripherals) -> (Clocks, Gpio, Par
     }
 }
 
+#[allow(unused_imports)]
 pub use pins::*;
 
 #[cfg(any(feature = "stm32f4xx-hal", feature = "stm32f7xx-hal",))]

diff --git a/src/peripherals.rs b/src/peripherals.rs
@@ -2,10 +2,16 @@
 //! and `ETHERNET_PTP` that introduce a delay for some registers on F4 parts.
 
 #[cfg(any(feature = "stm32f107", feature = "stm32f7xx-hal"))]
-pub use crate::hal::pac::{ETHERNET_DMA, ETHERNET_MAC, ETHERNET_PTP};
+pub use crate::hal::pac::{ETHERNET_DMA, ETHERNET_MAC};
+
+#[cfg(all(any(feature = "stm32f107", feature = "stm32f7xx-hal"), feature = "ptp"))]
+pub use crate::hal::pac::ETHERNET_PTP;
 
 #[cfg(feature = "stm32f4xx-hal")]
-pub use pac_override_impl::{ETHERNET_DMA, ETHERNET_MAC, ETHERNET_PTP};
+pub use pac_override_impl::{ETHERNET_DMA, ETHERNET_MAC};
+
+#[cfg(all(feature = "stm32f4xx-hal", feature = "ptp"))]
+pub use pac_override_impl::ETHERNET_PTP;
 
 #[cfg(feature = "stm32f4xx-hal")]
 mod pac_override_impl {