Update cfg's

esp-rs · Jul 14, 2022 · 1e2a947 · 1e2a947
1 parent e4ed558
commit 1e2a947
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -38,7 +38,7 @@ pub mod i2c;
 #[cfg(not(feature = "riscv-ulp-hal"))]
 pub mod interrupt;
 pub mod ledc;
-#[cfg(any(esp32, esp32s3))]
+#[cfg(all(any(esp32, esp32s3), not(feature = "riscv-ulp-hal")))]
 pub mod mcpwm;
 #[cfg(not(feature = "riscv-ulp-hal"))]
 pub mod mutex;

diff --git a/src/mcpwm.rs b/src/mcpwm.rs
@@ -1,3 +1,5 @@
+#![cfg(all(any(esp32, esp32s3), not(feature = "riscv-ulp-hal")))]
+
 //! Motor Control Pulse Width Modulator peripheral
 //!
 //! Interface to the [Motor Control Pulse Width Modulator peripheral (MCPWM)

diff --git a/src/peripherals.rs b/src/peripherals.rs
@@ -14,7 +14,7 @@ use crate::hall;
 use crate::i2c;
 #[cfg(not(feature = "riscv-ulp-hal"))]
 use crate::ledc;
-#[cfg(any(esp32, esp32s3))]
+#[cfg(all(any(esp32, esp32s3), not(feature = "riscv-ulp-hal")))]
 use crate::mcpwm;
 #[cfg(not(feature = "riscv-ulp-hal"))]
 use crate::rmt;
@@ -55,9 +55,9 @@ pub struct Peripherals {
     pub can: can::CAN,
     #[cfg(not(feature = "riscv-ulp-hal"))]
     pub ledc: ledc::Peripheral,
-    #[cfg(any(esp32, esp32s3))]
+    #[cfg(all(any(esp32, esp32s3), not(feature = "riscv-ulp-hal")))]
     pub mcpwm0: mcpwm::Peripheral<mcpwm::UnitZero>,
-    #[cfg(any(esp32, esp32s3))]
+    #[cfg(all(any(esp32, esp32s3), not(feature = "riscv-ulp-hal")))]
     pub mcpwm1: mcpwm::Peripheral<mcpwm::UnitOne>,
     #[cfg(not(feature = "riscv-ulp-hal"))]
     pub rmt: rmt::Peripheral,