Merge pull request #87 from no111u3/main

Fix time types in independent_watchdog and library build

Author: no111u3

src/independent_watchdog.rs

@@ -13,8 +13,9 @@
 //! Originally from stm32h7-hal, adapted for stm32g4xx-hal
 use crate::{
     stm32::{iwdg::pr::PR_A, IWDG},
-    time::{MicroSecond, U32Ext},
+    time::MicroSecond,
 };
+use fugit::ExtU32;
 
 /// The implementation of the hardware IWDG
 pub struct IndependentWatchdog {
@@ -83,7 +84,7 @@ impl IndependentWatchdog {
         // Set the prescaler
         let (prescaler, _) = Self::MAX_MILLIS_FOR_PRESCALER
             .iter()
-            .find(|(_, max_millis)| *max_millis >= max_window_time.0 / 1000)
+            .find(|(_, max_millis)| *max_millis >= max_window_time.to_millis())
             .expect("IWDG max time is greater than is possible");
         while self.iwdg.sr.read().pvu().bit_is_set() {
             cortex_m::asm::nop();
@@ -99,9 +100,9 @@ impl IndependentWatchdog {
             .write(|w| w.win().bits(Self::MAX_COUNTER_VALUE as u16));
 
         // Calculate the counter values
-        let reload_value = (max_window_time.0 / 1000) * (Self::CLOCK_SPEED / 1000)
+        let reload_value = max_window_time.to_millis() * (Self::CLOCK_SPEED / 1000)
             / Self::get_prescaler_divider(prescaler);
-        let window_value = (min_window_time.0 / 1000) * (Self::CLOCK_SPEED / 1000)
+        let window_value = min_window_time.to_millis() * (Self::CLOCK_SPEED / 1000)
             / Self::get_prescaler_divider(prescaler);
 
         // Set the reload value
@@ -132,7 +133,7 @@ impl IndependentWatchdog {
 
     /// Start the watchdog with the given max time and no minimal time
     pub fn start<T: Into<MicroSecond>>(&mut self, max_time: T) {
-        self.start_windowed(0_u32.ms(), max_time.into());
+        self.start_windowed(0_u32.millis(), max_time.into());
     }
 
     fn get_prescaler_divider(prescaler: &PR_A) -> u32 {

src/spi.rs

@@ -18,6 +18,7 @@ use crate::rcc::{Enable, GetBusFreq, Rcc, RccBus, Reset};
 use crate::stm32::SPI4;
 use crate::stm32::{RCC, SPI1, SPI2, SPI3};
 use crate::time::Hertz;
+use core::cell::UnsafeCell;
 use core::ptr;
 pub use hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 
@@ -210,8 +211,9 @@ macro_rules! spi {
                 } else if sr.crcerr().bit_is_set() {
                     nb::Error::Other(Error::Crc)
                 } else if sr.txe().bit_is_set() {
+                    let dr = &self.spi.dr as *const _ as *const UnsafeCell<u8>;
                     // NOTE(write_volatile) see note above
-                    unsafe { ptr::write_volatile(&self.spi.dr as *const _ as *mut u8, byte) }
+                    unsafe { ptr::write_volatile(UnsafeCell::raw_get(dr), byte) };
                     return Ok(());
                 } else {
                     nb::Error::WouldBlock

src/time.rs

@@ -1,6 +1,5 @@
 /// This code has been taken from the stm32g0xx-hal project and modified slightly to support
 /// STM32G4xx MCUs.
-
 pub use fugit::{
     Duration, ExtU32, HertzU32 as Hertz, HoursDurationU32 as Hour,
     MicrosDurationU32 as MicroSecond, MinutesDurationU32 as Minute, NanosDurationU32 as NanoSecond,