&Clocks instead of Clocks

Author: burrbull

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Replace UB code by a legitimate pointer access [#480]
 - Fix flash error flag clearing [#489]
 - Clarify README for windows users [#496]
+- Take `&Clocks` instead of `Clocks`
 
 ### Added
 

Cargo.toml

@@ -56,7 +56,7 @@ panic-itm = "0.4.2"
 cortex-m-rtic = "1.1.3"
 cortex-m-semihosting = "0.5.0"
 heapless = "0.7.16"
-mfrc522 = "0.3.0"
+mfrc522 = "0.5.0"
 usb-device = "0.2.8"
 usbd-serial = "0.1.1"
 

examples/adc-dma-circ.rs

@@ -28,7 +28,7 @@ fn main() -> ! {
     let dma_ch1 = p.DMA1.split().1;
 
     // Setup ADC
-    let adc1 = adc::Adc::adc1(p.ADC1, clocks);
+    let adc1 = adc::Adc::adc1(p.ADC1, &clocks);
 
     // Setup GPIOA
     let mut gpioa = p.GPIOA.split();

examples/adc-dma-rx.rs

@@ -28,7 +28,7 @@ fn main() -> ! {
     let dma_ch1 = p.DMA1.split().1;
 
     // Setup ADC
-    let adc1 = adc::Adc::adc1(p.ADC1, clocks);
+    let adc1 = adc::Adc::adc1(p.ADC1, &clocks);
 
     // Setup GPIOA
     let mut gpioa = p.GPIOA.split();

examples/adc.rs

@@ -25,10 +25,10 @@ fn main() -> ! {
     hprintln!("adc freq: {}", clocks.adcclk());
 
     // Setup ADC
-    let mut adc1 = adc::Adc::adc1(p.ADC1, clocks);
+    let mut adc1 = adc::Adc::adc1(p.ADC1, &clocks);
 
     #[cfg(any(feature = "stm32f103", feature = "connectivity"))]
-    let mut adc2 = adc::Adc::adc2(p.ADC2, clocks);
+    let mut adc2 = adc::Adc::adc2(p.ADC2, &clocks);
 
     // Setup GPIOB
     let mut gpiob = p.GPIOB.split();

examples/adc_temperature.rs

@@ -38,7 +38,7 @@ fn main() -> ! {
     hprintln!("adc freq: {}", clocks.adcclk());
 
     // Setup ADC
-    let mut adc = adc::Adc::adc1(p.ADC1, clocks);
+    let mut adc = adc::Adc::adc1(p.ADC1, &clocks);
 
     // Read temperature sensor
     loop {

examples/mfrc522.rs

@@ -7,7 +7,6 @@ use panic_itm as _;
 use cortex_m::iprintln;
 
 use cortex_m_rt::entry;
-use embedded_hal_02::digital::v1_compat::OldOutputPin;
 use embedded_hal_02::spi::{Mode, Phase, Polarity};
 use mfrc522::Mfrc522;
 use stm32f1xx_hal::{pac, prelude::*, spi::Spi};
@@ -39,11 +38,11 @@ fn main() -> ! {
         &mut afio.mapr,
         MODE,
         1.MHz(),
-        clocks,
+        &clocks,
     );
 
     let nss = gpioa.pa4.into_push_pull_output(&mut gpioa.crl);
-    let mut mfrc522 = Mfrc522::new(spi, OldOutputPin::from(nss)).unwrap();
+    let mut mfrc522 = Mfrc522::new(spi).with_nss(nss).init().unwrap();
 
     let mut led = gpioc.pc13.into_push_pull_output(&mut gpioc.crh);
     led.set_high();

examples/spi-dma.rs

@@ -40,7 +40,7 @@ fn main() -> ! {
         polarity: Polarity::IdleLow,
         phase: Phase::CaptureOnFirstTransition,
     };
-    let spi = Spi::spi2(dp.SPI2, pins, spi_mode, 100.kHz(), clocks);
+    let spi = Spi::spi2(dp.SPI2, pins, spi_mode, 100.kHz(), &clocks);
 
     // Set up the DMA device
     let dma = dp.DMA1.split();

examples/spi-slave.rs

@@ -67,7 +67,7 @@ fn main() -> ! {
         &mut afio.mapr,
         MODE,
         10.kHz(),
-        clocks,
+        &clocks,
     );
 
     // SPI2

examples/spi.rs

@@ -46,7 +46,7 @@ fn setup() -> (
         &mut afio.mapr,
         MODE,
         1.MHz(),
-        clocks,
+        &clocks,
     );
 
     (spi, cs)