fmpi2c ext

Author: burrbull

examples/i2c_scanner.rs

@@ -10,7 +10,7 @@ use rtt_target::{rprint, rprintln, rtt_init_print};
 
 use cortex_m_rt::entry;
 
-use stm32f4xx_hal::{self as hal, gpio::GpioExt, i2c::I2c, pac, prelude::*};
+use stm32f4xx_hal::{gpio::GpioExt, i2c, pac, prelude::*};
 
 const VALID_ADDR_RANGE: Range<u8> = 0x08..0x78;
 
@@ -26,11 +26,13 @@ fn main() -> ! {
     // Configure I2C1
     let scl = gpiob.pb8;
     let sda = gpiob.pb7;
-    let mut i2c = I2c::new(
+    let mut i2c = i2c::I2c::new(
         dp.I2C1,
         (scl, sda),
-        hal::i2c::Mode::standard(100.kHz()),
+        i2c::Mode::standard(100.kHz()),
         &mut rcc,
+        #[cfg(feature = "f7")]
+        i2c::ClockSource::Apb,
     );
 
     rprintln!("Start i2c scanning...");

examples/rng-display.rs

@@ -33,7 +33,7 @@ use embedded_graphics::{
 
 use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
 
-use hal::{i2c::I2c, pac, prelude::*};
+use hal::{pac, prelude::*};
 use rand_core::RngCore;
 
 use core::fmt::Write;
@@ -69,7 +69,7 @@ fn main() -> ! {
         let gpiob = dp.GPIOB.split(&mut rcc);
         let scl = gpiob.pb8;
         let sda = gpiob.pb9;
-        let i2c = I2c::new(dp.I2C1, (scl, sda), 400.kHz(), &mut rcc);
+        let i2c = dp.I2C1.i2c((scl, sda), 400.kHz(), &mut rcc);
 
         // Set up the display
         let interface = I2CDisplayInterface::new(i2c);

examples/stopwatch-with-ssd1306-and-interrupts-and-dma-i2c.rs

@@ -25,7 +25,6 @@ use crate::hal::{
     dma::{Stream1, StreamsTuple},
     gpio::*,
     i2c::dma::{I2CMasterDma, NoDMA, TxDMA},
-    i2c::I2c,
     interrupt, pac,
     pac::{DMA1, I2C1},
     prelude::*,
@@ -162,7 +161,7 @@ fn main() -> ! {
     if let (Some(mut dp), Some(cp)) = (pac::Peripherals::take(), cortex_m::Peripherals::take()) {
         let mut rcc = setup_clocks(dp.RCC);
         let gpiob = dp.GPIOB.split(&mut rcc);
-        let i2c = I2c::new(dp.I2C1, (gpiob.pb8, gpiob.pb9), 400.kHz(), &mut rcc);
+        let i2c = dp.I2C1.i2c((gpiob.pb8, gpiob.pb9), 400.kHz(), &mut rcc);
 
         // Then convert it to DMA
         let streams = StreamsTuple::new(dp.DMA1, &mut rcc);

examples/stopwatch-with-ssd1306-and-interrupts.rs

@@ -23,7 +23,6 @@ use stm32f4xx_hal::{self as hal, rcc::Config};
 
 use crate::hal::{
     gpio::{Edge, Input, PC13},
-    i2c::I2c,
     interrupt, pac,
     prelude::*,
     rcc::Rcc,
@@ -64,7 +63,7 @@ fn main() -> ! {
     if let (Some(mut dp), Some(cp)) = (pac::Peripherals::take(), cortex_m::Peripherals::take()) {
         let mut rcc = setup_clocks(dp.RCC);
         let gpiob = dp.GPIOB.split(&mut rcc);
-        let i2c = I2c::new(dp.I2C1, (gpiob.pb8, gpiob.pb9), 400.kHz(), &mut rcc);
+        let i2c = dp.I2C1.i2c((gpiob.pb8, gpiob.pb9), 400.kHz(), &mut rcc);
 
         let mut syscfg = dp.SYSCFG.constrain(&mut rcc);
 

src/fmpi2c.rs

@@ -253,7 +253,12 @@ pub trait I2cExt: Sized + Instance {
         pins: (impl Into<Self::Scl>, impl Into<Self::Sda>),
         mode: impl Into<Mode>,
         rcc: &mut Rcc,
-        clocks: ClockSource,
+    ) -> I2c<Self>;
+    fn i2c_hsi(
+        self,
+        pins: (impl Into<Self::Scl>, impl Into<Self::Sda>),
+        mode: impl Into<Mode>,
+        rcc: &mut Rcc,
     ) -> I2c<Self>;
 }
 
@@ -263,9 +268,16 @@ impl<I2C: Instance> I2cExt for I2C {
         pins: (impl Into<Self::Scl>, impl Into<Self::Sda>),
         mode: impl Into<Mode>,
         rcc: &mut Rcc,
-        clocks: ClockSource,
     ) -> I2c<Self> {
-        I2c::new(self, pins, mode, rcc, clocks)
+        I2c::new(self, pins, mode, rcc, ClockSource::Apb)
+    }
+    fn i2c_hsi(
+        self,
+        pins: (impl Into<Self::Scl>, impl Into<Self::Sda>),
+        mode: impl Into<Mode>,
+        rcc: &mut Rcc,
+    ) -> I2c<Self> {
+        I2c::new(self, pins, mode, rcc, ClockSource::Hsi)
     }
 }