Merge pull request #178 from burrbull/counter

BusClock + &Clock

Author: eldruin

CHANGELOG.md

@@ -13,7 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- Usw `fugit`-based time types instead of `embedded-time`
+- split `GetBusFreq` on `BusClock` & `BusTimerClock`, use `&Clock` everywhere
+- Use `fugit`-based time types instead of `embedded-time`
 - Update gpios: add `DynamicPin`, add default modes, reexport pins, resort generics, etc.
 - Improved RCC infrastructure.
 - RTC support has been rewritten.

examples/blinky_delay.rs

@@ -25,7 +25,7 @@ fn main() -> ! {
     let clocks = rcc.cfgr.sysclk(216.MHz()).freeze();
 
     // Get delay provider
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
 
     loop {
         led.set_high();

examples/fmc.rs

@@ -44,7 +44,7 @@ fn main() -> ! {
 
     // Get the delay provider.
     let clocks = dp.RCC.constrain().cfgr.sysclk(216_000_000.Hz()).freeze();
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
 
     // IO
     let gpioc = dp.GPIOC.split();

examples/i2c_scanner.rs

@@ -31,7 +31,7 @@ fn main() -> ! {
         dp.I2C1,
         (scl, sda),
         hal::i2c::Mode::fast(100_000.Hz()),
-        clocks,
+        &clocks,
         &mut rcc.apb1,
         50_000,
     );

examples/serial_delay.rs

@@ -27,7 +27,7 @@ fn main() -> ! {
     let rcc = p.RCC.constrain();
     let clocks = rcc.cfgr.sysclk(216_000_000.Hz()).freeze();
 
-    let mut delay = Delay::new(cp.SYST, clocks);
+    let mut delay = Delay::new(cp.SYST, &clocks);
 
     let gpioa = p.GPIOA.split();
     let gpiob = p.GPIOB.split();
@@ -38,11 +38,12 @@ fn main() -> ! {
     let serial = Serial::new(
         p.USART1,
         (tx, rx),
-        clocks,
+        &clocks,
         serial::Config {
             baud_rate: 115_200.bps(),
             oversampling: serial::Oversampling::By16,
             character_match: None,
+            sysclock: false,
         },
     );
     let (mut tx, _) = serial.split();

examples/serial_dma.rs

@@ -45,11 +45,12 @@ fn main() -> ! {
     let serial = Serial::new(
         p.USART3,
         (tx, rx),
-        clocks,
+        &clocks,
         serial::Config {
             baud_rate: 115_200.bps(),
             oversampling: serial::Oversampling::By16,
             character_match: None,
+            sysclock: false,
         },
     );
     let (mut tx, mut rx) = serial.split();

examples/serial_echo.rs

@@ -34,11 +34,12 @@ fn main() -> ! {
     let serial = Serial::new(
         p.USART1,
         (tx, rx),
-        clocks,
+        &clocks,
         serial::Config {
             baud_rate: 115_200.bps(),
             oversampling: serial::Oversampling::By16,
             character_match: None,
+            sysclock: false,
         },
     );
 

examples/spi.rs

@@ -15,6 +15,7 @@ fn main() -> ! {
     let p = pac::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
+    let clocks = rcc.cfgr.freeze();
 
     let gpiob = p.GPIOB.split();
     let gpioc = p.GPIOC.split();
@@ -35,12 +36,13 @@ fn main() -> ! {
 
     // Initialize SPI
     let mut spi = Spi::new(p.SPI3, (sck, miso, mosi)).enable::<u8>(
-        &mut rcc.apb1,
-        spi::ClockDivider::DIV32,
         spi::Mode {
             polarity: spi::Polarity::IdleHigh,
             phase: spi::Phase::CaptureOnSecondTransition,
         },
+        250.kHz(),
+        &clocks,
+        &mut rcc.apb1,
     );
 
     loop {

examples/spi_16.rs

@@ -15,6 +15,7 @@ fn main() -> ! {
     let p = pac::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
+    let clocks = rcc.cfgr.freeze();
 
     let gpioa = p.GPIOA.split();
     let gpioc = p.GPIOC.split();
@@ -34,9 +35,10 @@ fn main() -> ! {
 
     // Initialize SPI
     let mut spi = Spi::new(p.SPI1, (sck, spi::NoMiso, mosi)).enable::<u16>(
-        &mut rcc.apb2,
-        spi::ClockDivider::DIV32,
         embedded_hal::spi::MODE_0,
+        250.kHz(),
+        &clocks,
+        &mut rcc.apb2,
     );
 
     // Use a button to control output via the Maxim Integrated MAX5214 DAC.

examples/spi_dma.rs

@@ -19,6 +19,7 @@ fn main() -> ! {
     let p = pac::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
+    let clocks = rcc.cfgr.freeze();
 
     let dma = DMA::new(p.DMA1);
     let gpiob = p.GPIOB.split();
@@ -46,12 +47,13 @@ fn main() -> ! {
 
     // Initialize SPI
     let mut spi = Spi::new(p.SPI3, (sck, miso, mosi)).enable(
-        &mut rcc.apb1,
-        spi::ClockDivider::DIV32,
         spi::Mode {
             polarity: spi::Polarity::IdleHigh,
             phase: spi::Phase::CaptureOnSecondTransition,
         },
+        250.kHz(),
+        &clocks,
+        &mut rcc.apb1,
     );
 
     // Create the buffer we're going to use for DMA. This is safe, as this