I2s::CK Speed::VeryHigh always

Author: burrbull

examples/rtic-dual-i2s-audio-in-out.rs

@@ -80,7 +80,7 @@ mod app {
 
     use super::hal;
 
-    use hal::gpio::{Edge, Speed};
+    use hal::gpio::Edge;
     use hal::i2s::stm32_i2s_v12x::driver::*;
     use hal::i2s::DualI2s;
     use hal::pac::Interrupt;
@@ -163,14 +163,10 @@ mod app {
             .i2s_clk(61440.kHz())
             .freeze();
 
-        // Workaround for corrupted last bit of data issue, see stm32f411 errata
-        let mut pb13 = gpiob.pb13.into_alternate::<5>();
-        pb13.set_speed(Speed::VeryHigh);
-
         // I2S pins: (WS, CK, MCLK, SD) for I2S2
         let i2s2_pins = (
             gpiob.pb12, //WS
-            pb13,       //CK
+            gpiob.pb13, //CK
             gpioc.pc6,  //MCK
             gpiob.pb15, //SD
             gpiob.pb14, //ExtSD

examples/rtic-i2s-audio-in-out.rs

@@ -80,7 +80,7 @@ mod app {
 
     use super::hal;
 
-    use hal::gpio::{Edge, NoPin, Speed};
+    use hal::gpio::{Edge, NoPin};
     use hal::i2s::stm32_i2s_v12x::driver::*;
     use hal::i2s::I2s;
     use hal::pac::Interrupt;
@@ -167,14 +167,10 @@ mod app {
             .i2s_clk(61440.kHz())
             .freeze();
 
-        // Workaround for the corrupted last bit of data issue, see stm32f411 errata
-        let mut pb13 = gpiob.pb13.into_alternate::<5>();
-        pb13.set_speed(Speed::VeryHigh); //CK
-
         // I2S pins: (WS, CK, MCLK, SD) for I2S2
         let i2s2_pins = (
             gpiob.pb12, //WS
-            pb13,       //CK
+            gpiob.pb13, //CK
             gpioc.pc6,  //MCK
             gpiob.pb15, //SD
         );

src/gpio/alt.rs

@@ -348,7 +348,7 @@ pub trait I2cCommon {
 
 // I2S pins
 pub trait I2sCommon {
-    type Ck;
+    type Ck: crate::gpio::PinSpeed;
     type Sd;
     type Ws: crate::gpio::ReadPin + crate::gpio::ExtiPin;
 }

src/i2s.rs

@@ -6,7 +6,7 @@
 //! these chips because their `I2S2EXT` and `I2S3EXT` peripherals are missing from their package
 //! access crate.
 
-use crate::gpio::{self, NoPin};
+use crate::gpio::{self, NoPin, PinSpeed, Speed};
 use crate::pac;
 #[allow(unused)]
 use crate::rcc::{self, Clocks, Reset};
@@ -142,7 +142,13 @@ impl<SPI: Instance> I2s<SPI> {
             SPI::reset_unchecked();
         }
 
-        let pins = (pins.0.into(), pins.1.into(), pins.2.into(), pins.3.into());
+        let pins = (
+            pins.0.into(),
+            // Workaround for corrupted last bit of data issue, see stm32f411 errata
+            pins.1.into().speed(Speed::VeryHigh),
+            pins.2.into(),
+            pins.3.into(),
+        );
 
         I2s {
             spi,
@@ -314,7 +320,8 @@ impl<SPI: DualInstance> DualI2s<SPI> {
 
         let pins = (
             pins.0.into(),
-            pins.1.into(),
+            // Workaround for corrupted last bit of data issue, see stm32f411 errata
+            pins.1.into().speed(Speed::VeryHigh),
             pins.2.into(),
             pins.3.into(),
             pins.4.into(),