Fix examples and tests

- Updated all examples to use embedded-time
- Updated all tests to use embedded-time

Author: wbuck

examples/can.rs

@@ -6,12 +6,15 @@ use panic_semihosting as _;
 
 use stm32f3xx_hal as hal;
 
+use core::convert::TryFrom;
+
 use cortex_m::asm;
 use cortex_m_rt::entry;
 
 use hal::prelude::*;
 use hal::stm32;
 use hal::watchdog::IndependentWatchDog;
+use hal::time::{duration::*, rate::*};
 
 use hal::can::{Can, CanFilter, CanFrame, CanId, Filter, Frame, Receiver, Transmitter};
 use nb::block;
@@ -31,10 +34,10 @@ fn main() -> ! {
 
     let _clocks = rcc
         .cfgr
-        .use_hse(32.mhz())
-        .sysclk(32.mhz())
-        .pclk1(16.mhz())
-        .pclk2(16.mhz())
+        .use_hse(Hertz::try_from(32u32.MHz()).unwrap())
+        .sysclk(Hertz::try_from(32u32.MHz()).unwrap())
+        .pclk1(Hertz::try_from(16u32.MHz()).unwrap())
+        .pclk2(Hertz::try_from(16u32.MHz()).unwrap())
         .freeze(&mut flash.acr);
 
     // Configure CAN RX and TX pins (AF9)
@@ -60,7 +63,7 @@ fn main() -> ! {
     // Watchdog makes sure this gets restarted periodically if nothing happens
     let mut iwdg = IndependentWatchDog::new(dp.IWDG);
     iwdg.stop_on_debug(&dp.DBGMCU, true);
-    iwdg.start(100.ms());
+    iwdg.start(100u32.milliseconds());
 
     // Send an initial message!
     asm::delay(100_000);

examples/i2c_scanner.rs

@@ -10,11 +10,14 @@ use core::ops::Range;
 
 use panic_semihosting as _;
 
+use core::convert::TryFrom;
+
 use cortex_m::asm;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::{hprint, hprintln};
 
 use stm32f3xx_hal::{self as hal, pac, prelude::*};
+use hal::time::rate::*;
 
 const VALID_ADDR_RANGE: Range<u8> = 0x08..0x78;
 
@@ -33,7 +36,12 @@ fn main() -> ! {
         gpiob.pb6.into_af4(&mut gpiob.moder, &mut gpiob.afrl), // SCL
         gpiob.pb7.into_af4(&mut gpiob.moder, &mut gpiob.afrl), // SDA
     );
-    let mut i2c = hal::i2c::I2c::new(dp.I2C1, pins, 100.khz(), clocks, &mut rcc.apb1);
+    let mut i2c = hal::i2c::I2c::new(
+        dp.I2C1, 
+        pins, 
+        Hertz::try_from(100u32.kHz()).unwrap(), 
+        clocks, 
+        &mut rcc.apb1);
 
     hprintln!("Start i2c scanning...").expect("Error using hprintln.");
     hprintln!().unwrap();

examples/pwm.rs

@@ -7,6 +7,8 @@ use panic_semihosting as _;
 
 use stm32f3xx_hal as hal;
 
+use core::convert::TryFrom;
+
 use cortex_m::asm;
 use cortex_m_rt::entry;
 
@@ -18,7 +20,7 @@ use hal::gpio::GpioExt;
 use hal::pac;
 use hal::pwm::{tim16, tim2, tim3, tim8};
 use hal::rcc::RccExt;
-use hal::time::U32Ext;
+use hal::time::rate::*;
 
 #[entry]
 fn main() -> ! {
@@ -28,7 +30,7 @@ fn main() -> ! {
     // Configure our clocks
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();
-    let clocks = rcc.cfgr.sysclk(16.mhz()).freeze(&mut flash.acr);
+    let clocks = rcc.cfgr.sysclk(Hertz::try_from(16u32.MHz()).unwrap()).freeze(&mut flash.acr);
 
     // Prep the pins we need in their correct alternate function
     let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
@@ -53,7 +55,7 @@ fn main() -> ! {
     let tim3_channels = tim3(
         dp.TIM3,
         1280,    // resolution of duty cycle
-        50.hz(), // frequency of period
+        50u32.Hz(), // frequency of period
         &clocks, // To get the timer's clock speed
     );
 
@@ -102,7 +104,7 @@ fn main() -> ! {
     let tim2_channels = tim2(
         dp.TIM2,
         160000,  // resolution of duty cycle
-        50.hz(), // frequency of period
+        50u32.Hz(), // frequency of period
         &clocks, // To get the timer's clock speed
     );
 
@@ -117,7 +119,7 @@ fn main() -> ! {
     let mut tim16_ch1 = tim16(
         dp.TIM16,
         1280,    // resolution of duty cycle
-        50.hz(), // frequency of period
+        50u32.Hz(), // frequency of period
         &clocks, // To get the timer's clock speed
     )
     .output_to_pb8(pb8);
@@ -131,7 +133,7 @@ fn main() -> ! {
     let tim8_channels = tim8(
         dp.TIM8,
         1280,    // resolution of duty cycle
-        50.hz(), // frequency of period
+        50u32.Hz(), // frequency of period
         &clocks, // To get the timer's clock speed
     );
 

examples/serial_dma.rs

@@ -10,6 +10,7 @@ use panic_semihosting as _;
 use cortex_m::{asm, singleton};
 use cortex_m_rt::entry;
 use stm32f3xx_hal::{pac, prelude::*, serial::Serial};
+use stm32f3xx_hal::time::rate::*;
 
 #[entry]
 fn main() -> ! {
@@ -25,7 +26,7 @@ fn main() -> ! {
         gpioa.pa9.into_af7(&mut gpioa.moder, &mut gpioa.afrh),
         gpioa.pa10.into_af7(&mut gpioa.moder, &mut gpioa.afrh),
     );
-    let serial = Serial::usart1(dp.USART1, pins, 9600.bps(), clocks, &mut rcc.apb2);
+    let serial = Serial::usart1(dp.USART1, pins, 9600.Bd(), clocks, &mut rcc.apb2);
     let (tx, rx) = serial.split();
 
     let dma1 = dp.DMA1.split(&mut rcc.ahb);

examples/spi.rs

@@ -7,12 +7,15 @@ use panic_semihosting as _;
 
 use stm32f3xx_hal as hal;
 
+use core::convert::TryFrom;
+
 use cortex_m::asm;
 use cortex_m_rt::entry;
 
 use hal::pac;
 use hal::prelude::*;
 use hal::spi::{Mode, Phase, Polarity, Spi};
+use hal::time::rate::*;
 
 #[entry]
 fn main() -> ! {
@@ -24,9 +27,9 @@ fn main() -> ! {
 
     let clocks = rcc
         .cfgr
-        .use_hse(8.mhz())
-        .sysclk(48.mhz())
-        .pclk1(24.mhz())
+        .use_hse(Hertz::try_from(8u32.MHz()).unwrap())
+        .sysclk(Hertz::try_from(48u32.MHz()).unwrap())
+        .pclk1(Hertz::try_from(24u32.MHz()).unwrap())
         .freeze(&mut flash.acr);
 
     // Configure pins for SPI
@@ -43,7 +46,7 @@ fn main() -> ! {
         dp.SPI1,
         (sck, miso, mosi),
         spi_mode,
-        3.mhz(),
+        Hertz::try_from(3u32.MHz()).unwrap(),
         clocks,
         &mut rcc.apb2,
     );

examples/usb_serial.rs

@@ -10,9 +10,12 @@ use stm32f3xx_hal as hal;
 use cortex_m::asm::delay;
 use cortex_m_rt::entry;
 
+use core::convert::TryFrom;
+
 use hal::pac;
 use hal::prelude::*;
 use hal::usb::{Peripheral, UsbBus};
+use hal::time::rate::*;
 
 use usb_device::prelude::*;
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
@@ -26,10 +29,10 @@ fn main() -> ! {
 
     let clocks = rcc
         .cfgr
-        .use_hse(8.mhz())
-        .sysclk(48.mhz())
-        .pclk1(24.mhz())
-        .pclk2(24.mhz())
+        .use_hse(Hertz::try_from(8u32.MHz()).unwrap())
+        .sysclk(Hertz::try_from(48u32.MHz()).unwrap())
+        .pclk1(Hertz::try_from(24u32.MHz()).unwrap())
+        .pclk2(Hertz::try_from(24u32.MHz()).unwrap())
         .freeze(&mut flash.acr);
 
     assert!(clocks.usbclk_valid());