Merge #401

401: use fugit::Rate types instead of custom r=therealprof a=burrbull

Goodby, `Into<Hertz>`

Remove `cast`

Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -22,10 +22,9 @@ nb = "1"
 stm32f1 = "0.14.0"
 embedded-dma = "0.1.2"
 bxcan = "0.6"
-cast = { default-features = false, version = "0.3.0" }
 void = { default-features = false, version = "1.0.2" }
 embedded-hal = { features = ["unproven"], version = "0.2.6" }
-fugit = "0.3.0"
+fugit = "0.3.5"
 rtic-monotonic = { version = "1.0", optional = true }
 
 [dependencies.stm32-usbd]

examples/adc-dma-circ.rs

@@ -23,7 +23,7 @@ fn main() -> ! {
     // clock is configurable. So its frequency may be tweaked to meet certain
     // practical needs. User specified value is be approximated using supported
     // prescaler values 2/4/6/8.
-    let clocks = rcc.cfgr.adcclk(2.mhz()).freeze(&mut flash.acr);
+    let clocks = rcc.cfgr.adcclk(2.MHz()).freeze(&mut flash.acr);
 
     let dma_ch1 = p.DMA1.split().1;
 

examples/adc-dma-rx.rs

@@ -23,7 +23,7 @@ fn main() -> ! {
     // clock is configurable. So its frequency may be tweaked to meet certain
     // practical needs. User specified value is be approximated using supported
     // prescaler values 2/4/6/8.
-    let clocks = rcc.cfgr.adcclk(2.mhz()).freeze(&mut flash.acr);
+    let clocks = rcc.cfgr.adcclk(2.MHz()).freeze(&mut flash.acr);
 
     let dma_ch1 = p.DMA1.split().1;
 

examples/adc.rs

@@ -21,8 +21,8 @@ fn main() -> ! {
     // clock is configurable. So its frequency may be tweaked to meet certain
     // practical needs. User specified value is be approximated using supported
     // prescaler values 2/4/6/8.
-    let clocks = rcc.cfgr.adcclk(2.mhz()).freeze(&mut flash.acr);
-    hprintln!("adc freq: {}", clocks.adcclk().0).unwrap();
+    let clocks = rcc.cfgr.adcclk(2.MHz()).freeze(&mut flash.acr);
+    hprintln!("adc freq: {}", clocks.adcclk()).unwrap();
 
     // Setup ADC
     let mut adc1 = adc::Adc::adc1(p.ADC1, clocks);

examples/adc_temperature.rs

@@ -18,10 +18,10 @@ fn main() -> ! {
 
     let clocks = rcc
         .cfgr
-        .use_hse(8.mhz())
-        .sysclk(56.mhz())
-        .pclk1(28.mhz())
-        .adcclk(14.mhz())
+        .use_hse(8.MHz())
+        .sysclk(56.MHz())
+        .pclk1(28.MHz())
+        .adcclk(14.MHz())
         .freeze(&mut flash.acr);
     /*
     // Alternative configuration using dividers and multipliers directly
@@ -34,8 +34,8 @@ fn main() -> ! {
         usbpre: rcc::UsbPre::DIV1_5,
         adcpre: rcc::AdcPre::DIV2,
     }, &mut flash.acr);*/
-    hprintln!("sysclk freq: {}", clocks.sysclk().0).unwrap();
-    hprintln!("adc freq: {}", clocks.adcclk().0).unwrap();
+    hprintln!("sysclk freq: {}", clocks.sysclk()).unwrap();
+    hprintln!("adc freq: {}", clocks.adcclk()).unwrap();
 
     // Setup ADC
     let mut adc = adc::Adc::adc1(p.ADC1, clocks);

examples/blinky.rs

@@ -39,7 +39,7 @@ fn main() -> ! {
     // in order to configure the port. For pins 0-7, crl should be passed instead.
     let mut led = gpioc.pc13.into_push_pull_output(&mut gpioc.crh);
     // Configure the syst timer to trigger an update every second
-    let mut timer = Timer::syst(cp.SYST, &clocks).start_count_down(1.hz());
+    let mut timer = Timer::syst(cp.SYST, &clocks).start_count_down(1.Hz());
 
     // Wait for the timer to trigger an update and change the state of the LED
     loop {

examples/blinky_generic.rs

@@ -26,7 +26,7 @@ fn main() -> ! {
     let mut gpioc = dp.GPIOC.split();
 
     // Configure the syst timer to trigger an update every second
-    let mut timer = Timer::syst(cp.SYST, &clocks).start_count_down(1.hz());
+    let mut timer = Timer::syst(cp.SYST, &clocks).start_count_down(1.Hz());
 
     // Create an array of LEDS to blink
     let mut leds = [

examples/blinky_timer_irq.rs

@@ -73,8 +73,8 @@ fn main() -> ! {
     let mut flash = dp.FLASH.constrain();
     let clocks = rcc
         .cfgr
-        .sysclk(8.mhz())
-        .pclk1(8.mhz())
+        .sysclk(8.MHz())
+        .pclk1(8.MHz())
         .freeze(&mut flash.acr);
 
     // Configure PC13 pin to blink LED
@@ -86,7 +86,7 @@ fn main() -> ! {
     cortex_m::interrupt::free(|cs| *G_LED.borrow(cs).borrow_mut() = Some(led));
 
     // Set up a timer expiring after 1s
-    let mut timer = Timer::new(dp.TIM2, &clocks).start_count_down(1.hz());
+    let mut timer = Timer::new(dp.TIM2, &clocks).start_count_down(1.Hz());
 
     // Generate an interrupt when the timer expires
     timer.listen(Event::Update);

examples/can-echo.rs

@@ -21,7 +21,7 @@ fn main() -> ! {
     // To meet CAN clock accuracy requirements an external crystal or ceramic
     // resonator must be used. The blue pill has a 8MHz external crystal.
     // Other boards might have a crystal with another frequency or none at all.
-    rcc.cfgr.use_hse(8.mhz()).freeze(&mut flash.acr);
+    rcc.cfgr.use_hse(8.MHz()).freeze(&mut flash.acr);
 
     let mut afio = dp.AFIO.constrain();
 

examples/can-loopback.rs

@@ -23,7 +23,7 @@ fn main() -> ! {
 
     // To meet CAN clock accuracy requirements, an external crystal or ceramic
     // resonator must be used.
-    rcc.cfgr.use_hse(8.mhz()).freeze(&mut flash.acr);
+    rcc.cfgr.use_hse(8.MHz()).freeze(&mut flash.acr);
 
     #[cfg(not(feature = "connectivity"))]
     let can = Can::new(dp.CAN1, dp.USB);