The i2c module requires an io-* feature

stm32-rs · Mar 28, 2020 · 2f0109f · 2f0109f
1 parent 47c2ece
commit 2f0109f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -302,9 +302,13 @@ required-features = ["rt"]
 name = "flash"
 required-features = ["rt","stm32l082"]
 
+[[example]]
+name = "i2c"
+required-features = ["rt","stm32l0x2","io-STM32L071"]
+
 [[example]]
 name = "i2c_dma"
-required-features = ["rt","stm32l0x2"]
+required-features = ["rt","stm32l0x2","io-STM32L071"]
 
 [[example]]
 name = "rng"

diff --git a/src/dma.rs b/src/dma.rs
@@ -28,20 +28,24 @@ use as_slice::AsSlice;
 
 use crate::{
     adc,
-    i2c,
     pac::{
         self,
         dma1::ch::cr,
-        I2C1,
-        I2C2,
-        I2C3,
         USART1,
         USART2,
     },
     rcc::Rcc,
     serial,
 };
 
+#[cfg(any(
+    feature = "io-STM32L021",
+    feature = "io-STM32L031",
+    feature = "io-STM32L051",
+    feature = "io-STM32L071",
+))]
+use crate::{i2c, pac::{I2C1, I2C2, I2C3}};
+
 #[cfg(feature = "stm32l082")]
 use crate::aes;
 
@@ -536,6 +540,12 @@ impl_target!(
 );
 
 #[cfg(feature = "stm32l0x2")]
+#[cfg(any(
+    feature = "io-STM32L021",
+    feature = "io-STM32L031",
+    feature = "io-STM32L051",
+    feature = "io-STM32L071",
+))]
 impl_target!(
     // I2C1
     i2c::Tx<I2C1>, Channel2, 6;

diff --git a/src/i2c.rs b/src/i2c.rs
@@ -15,7 +15,6 @@ use as_slice::{
     AsMutSlice,
 };
 
-use crate::hal::blocking::i2c::{Read, Write, WriteRead};
 
 #[cfg(feature = "stm32l0x2")]
 use crate::dma::{
@@ -32,6 +31,9 @@ use crate::rcc::Rcc;
 use crate::time::Hertz;
 use cast::u8;
 
+// I²C traits
+use crate::hal::blocking::i2c::{Read, Write, WriteRead};
+
 // I/O Imports
 use crate::gpio::{AltMode, OpenDrain, Output};
 #[cfg(feature = "io-STM32L021")]

diff --git a/src/lib.rs b/src/lib.rs
@@ -23,6 +23,12 @@ pub mod exti;
 #[cfg(feature = "stm32l0x2")]
 pub mod flash;
 pub mod gpio;
+#[cfg(any(
+    feature = "io-STM32L021",
+    feature = "io-STM32L031",
+    feature = "io-STM32L051",
+    feature = "io-STM32L071",
+))]
 pub mod i2c;
 pub mod lptim;
 pub mod prelude;

diff --git a/src/prelude.rs b/src/prelude.rs
@@ -13,7 +13,6 @@ pub use crate::{
     adc::AdcExt as _,
     delay::DelayExt as _,
     gpio::GpioExt as _,
-    i2c::I2cExt as _,
     pwr::PowerMode as _,
     rcc::RccExt as _,
     serial::{
@@ -28,3 +27,11 @@ pub use crate::{
         WindowWatchdogExt as _,
     },
 };
+
+#[cfg(any(
+    feature = "io-STM32L021",
+    feature = "io-STM32L031",
+    feature = "io-STM32L051",
+    feature = "io-STM32L071",
+))]
+pub use crate::i2c::I2cExt as _;