HAL update finished

.cargo/def-config.toml

@@ -24,8 +24,7 @@ rustflags = [
   # "-C", "link-arg=-Tdefmt.x",
 
   # Can be useful for debugging.
-  "-Clink-args=-Map=app.map"
+  # "-Clink-args=-Map=app.map"
-
 ]
 
 [build]

va108xx-hal/CHANGELOG.md

@@ -8,7 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [v0.7.0] 2024-07-04
 
-- Replace `uarta` and `uartb` `Uart` constructors by `new` method.
+- Replace `uarta` and `uartb` `Uart` constructors by `new` constructor.
+- Replace SPI `spia`, `spib` and `spic` constructors by `new` constructor.
+- Replace I2C `i2ca`, `i2cb` constructors by `new` constructor. Update constructor
+  to fail on invalid fast I2C speed system clock values.
 
 ## [v0.6.0] 2024-06-16
 

va108xx-hal/src/i2c.rs

@@ -4,24 +4,29 @@
 //!
 //! - [REB1 I2C temperature sensor example](https://egit.irs.uni-stuttgart.de/rust/vorago-reb1/src/branch/main/examples/adt75-temp-sensor.rs)
 use crate::{
-    clock::{enable_peripheral_clock, PeripheralClocks},
+    clock::enable_peripheral_clock, pac, time::Hertz, typelevel::Sealed, PeripheralSelect,
-    pac,
-    time::Hertz,
-    typelevel::Sealed,
 };
-use core::marker::PhantomData;
+use core::{marker::PhantomData, ops::Deref};
 use embedded_hal::i2c::{self, Operation, SevenBitAddress, TenBitAddress};
 
 //==================================================================================================
 // Defintions
 //==================================================================================================
 
+const CLK_100K: Hertz = Hertz::from_raw(100_000);
+const CLK_400K: Hertz = Hertz::from_raw(400_000);
+const MIN_CLK_400K: Hertz = Hertz::from_raw(8_000_000);
+
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum FifoEmptyMode {
     Stall = 0,
     EndTransaction = 1,
 }
 
+#[derive(Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct ClockTooSlowForFastI2c;
+
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum Error {
@@ -34,7 +39,21 @@ pub enum Error {
     InsufficientDataReceived,
     /// Number of bytes in transfer too large (larger than 0x7fe)
     DataTooLarge,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub enum InitError {
+    /// Wrong address used in constructor
     WrongAddrMode,
+    /// APB1 clock is too slow for fast I2C mode.
+    ClkTooSlow(ClockTooSlowForFastI2c),
+}
+
+impl From<ClockTooSlowForFastI2c> for InitError {
+    fn from(value: ClockTooSlowForFastI2c) -> Self {
+        Self::ClkTooSlow(value)
+    }
 }
 
 impl embedded_hal::i2c::Error for Error {
@@ -47,10 +66,9 @@ impl embedded_hal::i2c::Error for Error {
             Error::NackData => {
                 embedded_hal::i2c::ErrorKind::NoAcknowledge(i2c::NoAcknowledgeSource::Data)
             }
-            Error::DataTooLarge
+            Error::DataTooLarge | Error::InsufficientDataReceived | Error::InvalidTimingParams => {
-            | Error::WrongAddrMode
+                embedded_hal::i2c::ErrorKind::Other
-            | Error::InsufficientDataReceived
+            }
-            | Error::InvalidTimingParams => embedded_hal::i2c::ErrorKind::Other,
         }
     }
 }
@@ -81,6 +99,37 @@ pub enum I2cAddress {
     TenBit(u16),
 }
 
+pub type I2cRegBlock = pac::i2ca::RegisterBlock;
+
+/// Common trait implemented by all PAC peripheral access structures. The register block
+/// format is the same for all SPI blocks.
+pub trait Instance: Deref<Target = I2cRegBlock> {
+    const IDX: u8;
+    const PERIPH_SEL: PeripheralSelect;
+
+    fn ptr() -> *const I2cRegBlock;
+}
+
+impl Instance for pac::I2ca {
+    const IDX: u8 = 0;
+    const PERIPH_SEL: PeripheralSelect = PeripheralSelect::I2c0;
+
+    #[inline(always)]
+    fn ptr() -> *const I2cRegBlock {
+        Self::ptr()
+    }
+}
+
+impl Instance for pac::I2cb {
+    const IDX: u8 = 1;
+    const PERIPH_SEL: PeripheralSelect = PeripheralSelect::I2c1;
+
+    #[inline(always)]
+    fn ptr() -> *const I2cRegBlock {
+        Self::ptr()
+    }
+}
+
 //==================================================================================================
 // Config
 //==================================================================================================
@@ -242,24 +291,20 @@ impl<I2C> I2cBase<I2C> {
     }
 }
 
-macro_rules! i2c_base {
+impl<I2c: Instance> I2cBase<I2c> {
-    ($($I2CX:path: ($i2cx:ident, $clk_enb:path),)+) => {
+    pub fn new(
-        $(
+        syscfg: &mut pac::Sysconfig,
-            impl I2cBase<$I2CX> {
+        sysclk: impl Into<Hertz>,
-                pub fn $i2cx(
+        i2c: I2c,
-                    i2c: $I2CX,
-                    sys_clk: impl Into<Hertz>,
         speed_mode: I2cSpeed,
         ms_cfg: Option<&MasterConfig>,
         sl_cfg: Option<&SlaveConfig>,
-                    sys_cfg: Option<&mut va108xx::Sysconfig>,
+    ) -> Result<Self, ClockTooSlowForFastI2c> {
-                ) -> Self {
+        enable_peripheral_clock(syscfg, I2c::PERIPH_SEL);
-                    if let Some(sys_cfg) = sys_cfg {
+
-                        enable_peripheral_clock(sys_cfg, $clk_enb);
-                    }
         let mut i2c_base = I2cBase {
             i2c,
-                        sys_clk: sys_clk.into(),
+            sys_clk: sysclk.into(),
         };
         if let Some(ms_cfg) = ms_cfg {
             i2c_base.cfg_master(ms_cfg);
@@ -268,8 +313,8 @@ macro_rules! i2c_base {
         if let Some(sl_cfg) = sl_cfg {
             i2c_base.cfg_slave(sl_cfg);
         }
-                    i2c_base.cfg_clk_scale(speed_mode);
+        i2c_base.cfg_clk_scale(speed_mode)?;
-                    i2c_base
+        Ok(i2c_base)
     }
 
     fn cfg_master(&mut self, ms_cfg: &MasterConfig) {
@@ -286,7 +331,9 @@ macro_rules! i2c_base {
             w.algfilter().bit(ms_cfg.alg_filt)
         });
         if let Some(ref tm_cfg) = ms_cfg.tm_cfg {
-                        self.i2c.tmconfig().write(|w| unsafe { w.bits(tm_cfg.reg()) });
+            self.i2c
+                .tmconfig()
+                .write(|w| unsafe { w.bits(tm_cfg.reg()) });
         }
         self.i2c.fifo_clr().write(|w| {
             w.rxfifo().set_bit();
@@ -355,19 +402,24 @@ macro_rules! i2c_base {
         });
     }
 
-                fn calc_clk_div(&self, speed_mode: I2cSpeed) -> u8 {
+    fn calc_clk_div(&self, speed_mode: I2cSpeed) -> Result<u8, ClockTooSlowForFastI2c> {
         if speed_mode == I2cSpeed::Regular100khz {
-                        ((self.sys_clk.raw() / (u32::pow(10, 5) * 20)) - 1) as u8
+            Ok(((self.sys_clk.raw() / CLK_100K.raw() / 20) - 1) as u8)
         } else {
-                        (((10 * self.sys_clk.raw()) / u32::pow(10, 8)) - 1) as u8
+            if self.sys_clk.raw() < MIN_CLK_400K.raw() {
+                return Err(ClockTooSlowForFastI2c);
+            }
+            Ok(((self.sys_clk.raw() / CLK_400K.raw() / 25) - 1) as u8)
         }
     }
 
     /// Configures the clock scale for a given speed mode setting
-                pub fn cfg_clk_scale(&mut self, speed_mode: I2cSpeed) {
+    pub fn cfg_clk_scale(&mut self, speed_mode: I2cSpeed) -> Result<(), ClockTooSlowForFastI2c> {
-                    self.i2c.clkscale().write(|w| unsafe {
+        let clk_div = self.calc_clk_div(speed_mode)?;
-                        w.bits((speed_mode as u32) << 31 | self.calc_clk_div(speed_mode) as u32)
+        self.i2c
-                    });
+            .clkscale()
+            .write(|w| unsafe { w.bits((speed_mode as u32) << 31 | clk_div as u32) });
+        Ok(())
     }
 
     pub fn load_address(&mut self, addr: u16) {
@@ -384,9 +436,6 @@ macro_rules! i2c_base {
             .write(|w| unsafe { w.bits(I2cCmd::Stop as u32) });
     }
 }
-        )+
-    }
-}
 
 // Unique mode to use the loopback functionality
 // pub struct I2cLoopback<I2C> {
@@ -395,20 +444,218 @@ macro_rules! i2c_base {
 //     slave_cfg: SlaveConfig,
 // }
 
-i2c_base!(
-    pac::I2ca: (i2ca, PeripheralClocks::I2c0),
-    pac::I2cb: (i2cb, PeripheralClocks::I2c1),
-);
-
 //==================================================================================================
 // I2C Master
 //==================================================================================================
 
-pub struct I2cMaster<I2C, ADDR = SevenBitAddress> {
+pub struct I2cMaster<I2c, Addr = SevenBitAddress> {
-    i2c_base: I2cBase<I2C>,
+    i2c_base: I2cBase<I2c>,
-    _addr: PhantomData<ADDR>,
+    addr: PhantomData<Addr>,
 }
 
+impl<I2c: Instance, Addr> I2cMaster<I2c, Addr> {
+    pub fn new(
+        syscfg: &mut pac::Sysconfig,
+        sysclk: impl Into<Hertz>,
+        i2c: I2c,
+        cfg: MasterConfig,
+        speed_mode: I2cSpeed,
+    ) -> Result<Self, ClockTooSlowForFastI2c> {
+        Ok(I2cMaster {
+            i2c_base: I2cBase::new(syscfg, sysclk, i2c, speed_mode, Some(&cfg), None)?,
+            addr: PhantomData,
+        }
+        .enable_master())
+    }
+
+    #[inline]
+    pub fn cancel_transfer(&self) {
+        self.i2c_base
+            .i2c
+            .cmd()
+            .write(|w| unsafe { w.bits(I2cCmd::Cancel as u32) });
+    }
+
+    #[inline]
+    pub fn clear_tx_fifo(&self) {
+        self.i2c_base.i2c.fifo_clr().write(|w| w.txfifo().set_bit());
+    }
+
+    #[inline]
+    pub fn clear_rx_fifo(&self) {
+        self.i2c_base.i2c.fifo_clr().write(|w| w.rxfifo().set_bit());
+    }
+
+    #[inline]
+    pub fn enable_master(self) -> Self {
+        self.i2c_base.i2c.ctrl().modify(|_, w| w.enable().set_bit());
+        self
+    }
+
+    #[inline]
+    pub fn disable_master(self) -> Self {
+        self.i2c_base
+            .i2c
+            .ctrl()
+            .modify(|_, w| w.enable().clear_bit());
+        self
+    }
+
+    #[inline(always)]
+    fn load_fifo(&self, word: u8) {
+        self.i2c_base
+            .i2c
+            .data()
+            .write(|w| unsafe { w.bits(word as u32) });
+    }
+
+    #[inline(always)]
+    fn read_fifo(&self) -> u8 {
+        self.i2c_base.i2c.data().read().bits() as u8
+    }
+
+    fn error_handler_write(&mut self, init_cmd: &I2cCmd) {
+        self.clear_tx_fifo();
+        if *init_cmd == I2cCmd::Start {
+            self.i2c_base.stop_cmd()
+        }
+    }
+
+    fn write_base(
+        &mut self,
+        addr: I2cAddress,
+        init_cmd: I2cCmd,
+        bytes: impl IntoIterator<Item = u8>,
+    ) -> Result<(), Error> {
+        let mut iter = bytes.into_iter();
+        // Load address
+        let (addr, addr_mode_bit) = I2cBase::<I2c>::unwrap_addr(addr);
+        self.i2c_base.i2c.address().write(|w| unsafe {
+            w.bits(I2cDirection::Send as u32 | (addr << 1) as u32 | addr_mode_bit)
+        });
+
+        self.i2c_base
+            .i2c
+            .cmd()
+            .write(|w| unsafe { w.bits(init_cmd as u32) });
+        let mut load_if_next_available = || {
+            if let Some(next_byte) = iter.next() {
+                self.load_fifo(next_byte);
+            }
+        };
+        loop {
+            let status_reader = self.i2c_base.i2c.status().read();
+            if status_reader.arblost().bit_is_set() {
+                self.error_handler_write(&init_cmd);
+                return Err(Error::ArbitrationLost);
+            } else if status_reader.nackaddr().bit_is_set() {
+                self.error_handler_write(&init_cmd);
+                return Err(Error::NackAddr);
+            } else if status_reader.nackdata().bit_is_set() {
+                self.error_handler_write(&init_cmd);
+                return Err(Error::NackData);
+            } else if status_reader.idle().bit_is_set() {
+                return Ok(());
+            } else {
+                while !status_reader.txnfull().bit_is_set() {
+                    load_if_next_available();
+                }
+            }
+        }
+    }
+
+    fn write_from_buffer(
+        &mut self,
+        init_cmd: I2cCmd,
+        addr: I2cAddress,
+        output: &[u8],
+    ) -> Result<(), Error> {
+        let len = output.len();
+        // It should theoretically possible to transfer larger data sizes by tracking
+        // the number of sent words and setting it to 0x7fe as soon as only that many
+        // bytes are remaining. However, large transfer like this are not common. This
+        // feature will therefore not be supported for now.
+        if len > 0x7fe {
+            return Err(Error::DataTooLarge);
+        }
+        // Load number of words
+        self.i2c_base
+            .i2c
+            .words()
+            .write(|w| unsafe { w.bits(len as u32) });
+        let mut bytes = output.iter();
+        // FIFO has a depth of 16. We load slightly above the trigger level
+        // but not all of it because the transaction might fail immediately
+        const FILL_DEPTH: usize = 12;
+
+        // load the FIFO
+        for _ in 0..core::cmp::min(FILL_DEPTH, len) {
+            self.load_fifo(*bytes.next().unwrap());
+        }
+
+        self.write_base(addr, init_cmd, output.iter().cloned())
+    }
+
+    fn read_internal(&mut self, addr: I2cAddress, buffer: &mut [u8]) -> Result<(), Error> {
+        let len = buffer.len();
+        // It should theoretically possible to transfer larger data sizes by tracking
+        // the number of sent words and setting it to 0x7fe as soon as only that many
+        // bytes are remaining. However, large transfer like this are not common. This
+        // feature will therefore not be supported for now.
+        if len > 0x7fe {
+            return Err(Error::DataTooLarge);
+        }
+        // Clear the receive FIFO
+        self.clear_rx_fifo();
+
+        // Load number of words
+        self.i2c_base
+            .i2c
+            .words()
+            .write(|w| unsafe { w.bits(len as u32) });
+        let (addr, addr_mode_bit) = match addr {
+            I2cAddress::Regular(addr) => (addr as u16, 0 << 15),
+            I2cAddress::TenBit(addr) => (addr, 1 << 15),
+        };
+        // Load address
+        self.i2c_base.i2c.address().write(|w| unsafe {
+            w.bits(I2cDirection::Read as u32 | (addr << 1) as u32 | addr_mode_bit)
+        });
+
+        let mut buf_iter = buffer.iter_mut();
+        let mut read_bytes = 0;
+        // Start receive transfer
+        self.i2c_base
+            .i2c
+            .cmd()
+            .write(|w| unsafe { w.bits(I2cCmd::StartWithStop as u32) });
+        let mut read_if_next_available = || {
+            if let Some(next_byte) = buf_iter.next() {
+                *next_byte = self.read_fifo();
+            }
+        };
+        loop {
+            let status_reader = self.i2c_base.i2c.status().read();
+            if status_reader.arblost().bit_is_set() {
+                self.clear_rx_fifo();
+                return Err(Error::ArbitrationLost);
+            } else if status_reader.nackaddr().bit_is_set() {
+                self.clear_rx_fifo();
+                return Err(Error::NackAddr);
+            } else if status_reader.idle().bit_is_set() {
+                if read_bytes != len {
+                    return Err(Error::InsufficientDataReceived);
+                }
+                return Ok(());
+            } else if status_reader.rxnempty().bit_is_set() {
+                read_if_next_available();
+                read_bytes += 1;
+            }
+        }
+    }
+}
+
+/*
 macro_rules! i2c_master {
     ($($I2CX:path: ($i2cx:ident, $clk_enb:path),)+) => {
         $(
@@ -675,39 +922,80 @@ i2c_master!(
     pac::I2ca: (i2ca, PeripheralClocks::I2c0),
     pac::I2cb: (i2cb, PeripheralClocks::I2c1),
 );
+*/
+
+//======================================================================================
+// Embedded HAL I2C implementations
+//======================================================================================
+
+impl<I2c> embedded_hal::i2c::ErrorType for I2cMaster<I2c, SevenBitAddress> {
+    type Error = Error;
+}
+
+impl<I2c: Instance> embedded_hal::i2c::I2c for I2cMaster<I2c, SevenBitAddress> {
+    fn transaction(
+        &mut self,
+        address: SevenBitAddress,
+        operations: &mut [Operation<'_>],
+    ) -> Result<(), Self::Error> {
+        for operation in operations {
+            match operation {
+                Operation::Read(buf) => self.read_internal(I2cAddress::Regular(address), buf)?,
+                Operation::Write(buf) => self.write_from_buffer(
+                    I2cCmd::StartWithStop,
+                    I2cAddress::Regular(address),
+                    buf,
+                )?,
+            }
+        }
+        Ok(())
+    }
+}
+
+impl<I2c> embedded_hal::i2c::ErrorType for I2cMaster<I2c, TenBitAddress> {
+    type Error = Error;
+}
+
+impl<I2c: Instance> embedded_hal::i2c::I2c<TenBitAddress> for I2cMaster<I2c, TenBitAddress> {
+    fn transaction(
+        &mut self,
+        address: TenBitAddress,
+        operations: &mut [Operation<'_>],
+    ) -> Result<(), Self::Error> {
+        for operation in operations {
+            match operation {
+                Operation::Read(buf) => self.read_internal(I2cAddress::TenBit(address), buf)?,
+                Operation::Write(buf) => {
+                    self.write_from_buffer(I2cCmd::StartWithStop, I2cAddress::TenBit(address), buf)?
+                }
+            }
+        }
+        Ok(())
+    }
+}
 
 //==================================================================================================
 // I2C Slave
 //==================================================================================================
 
-pub struct I2cSlave<I2C, ADDR = SevenBitAddress> {
+pub struct I2cSlave<I2c, Addr = SevenBitAddress> {
-    i2c_base: I2cBase<I2C>,
+    i2c_base: I2cBase<I2c>,
-    _addr: PhantomData<ADDR>,
+    addr: PhantomData<Addr>,
 }
 
-macro_rules! i2c_slave {
+impl<I2c: Instance, Addr> I2cSlave<I2c, Addr> {
-    ($($I2CX:path: ($i2cx:ident, $i2cx_slave:ident),)+) => {
+    fn new_generic(
-        $(
+        sys_cfg: &mut pac::Sysconfig,
-            impl<ADDR> I2cSlave<$I2CX, ADDR> {
-                fn $i2cx_slave(
-                    i2c: $I2CX,
-                    cfg: SlaveConfig,
         sys_clk: impl Into<Hertz>,
+        i2c: I2c,
+        cfg: SlaveConfig,
         speed_mode: I2cSpeed,
-                    sys_cfg: Option<&mut pac::Sysconfig>,
+    ) -> Result<Self, ClockTooSlowForFastI2c> {
-                ) -> Self {
+        Ok(I2cSlave {
-                    I2cSlave {
+            i2c_base: I2cBase::new(sys_cfg, sys_clk, i2c, speed_mode, None, Some(&cfg))?,
-                        i2c_base: I2cBase::$i2cx(
+            addr: PhantomData,
-                            i2c,
-                            sys_clk,
-                            speed_mode,
-                            None,
-                            Some(&cfg),
-                            sys_cfg
-                        ),
-                        _addr: PhantomData,
         }
-                    .enable_slave()
+        .enable_slave())
     }
 
     #[inline]
@@ -841,38 +1129,30 @@ macro_rules! i2c_slave {
     }
 }
 
-
+impl<I2c: Instance> I2cSlave<I2c, SevenBitAddress> {
-            impl I2cSlave<$I2CX, SevenBitAddress> {
     /// Create a new I2C slave for seven bit addresses
-                ///
+    pub fn new(
-                /// Returns a [`Error::WrongAddrMode`] error if a ten bit address is passed
+        sys_cfg: &mut pac::Sysconfig,
-                pub fn i2ca(
-                    i2c: $I2CX,
-                    cfg: SlaveConfig,
         sys_clk: impl Into<Hertz>,
+        i2c: I2c,
+        cfg: SlaveConfig,
         speed_mode: I2cSpeed,
-                    sys_cfg: Option<&mut pac::Sysconfig>,
+    ) -> Result<Self, InitError> {
-                ) -> Result<Self, Error> {
         if let I2cAddress::TenBit(_) = cfg.addr {
-                        return Err(Error::WrongAddrMode);
+            return Err(InitError::WrongAddrMode);
         }
-                    Ok(Self::$i2cx_slave(i2c, cfg, sys_clk, speed_mode, sys_cfg))
+        Ok(Self::new_generic(sys_cfg, sys_clk, i2c, cfg, speed_mode)?)
     }
 }
 
-            impl I2cSlave<$I2CX, TenBitAddress> {
+impl<I2c: Instance> I2cSlave<I2c, TenBitAddress> {
-                pub fn $i2cx(
+    pub fn new_ten_bit_addr(
-                    i2c: $I2CX,
+        sys_cfg: &mut pac::Sysconfig,
-                    cfg: SlaveConfig,
         sys_clk: impl Into<Hertz>,
+        i2c: I2c,
+        cfg: SlaveConfig,
         speed_mode: I2cSpeed,
-                    sys_cfg: Option<&mut pac::Sysconfig>,
+    ) -> Result<Self, ClockTooSlowForFastI2c> {
-                ) -> Self {
+        Self::new_generic(sys_cfg, sys_clk, i2c, cfg, speed_mode)
-                    Self::$i2cx_slave(i2c, cfg, sys_clk, speed_mode, sys_cfg)
     }
 }
-        )+
-    }
-}
-
-i2c_slave!(pac::I2ca: (i2ca, i2ca_slave), pac::I2cb: (i2cb, i2cb_slave),);

va108xx-hal/src/prelude.rs

@@ -1,3 +1,5 @@
 //! Prelude
 pub use fugit::ExtU32 as _;
 pub use fugit::RateExtU32 as _;
+
+pub use crate::time::*;

vorago-reb1/Cargo.toml

@@ -19,6 +19,7 @@ embedded-hal = "1"
 version = "0.3"
 
 [dependencies.va108xx-hal]
+path = "../va108xx-hal"
 version = "0.6"
 features = ["rt"]
 
@@ -26,7 +27,6 @@ features = ["rt"]
 rt = ["va108xx-hal/rt"]
 
 [dev-dependencies]
-cortex-m-rtic = "1.1"
 panic-halt = "0.2"
 nb = "1"
 
@@ -36,6 +36,14 @@ version = "0.5"
 [dev-dependencies.panic-rtt-target]
 version = "0.1"
 
+[dev-dependencies.rtic]
+version = "2"
+features = ["thumbv6-backend"]
+
+[dev-dependencies.rtic-monotonics]
+version = "1"
+features = ["cortex-m-systick"]
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--generate-link-to-definition"]

vorago-reb1/examples/adt75-temp-sensor.rs

@@ -13,7 +13,7 @@ fn main() -> ! {
     rprintln!("-- Vorago Temperature Sensor and I2C Example --");
     let mut dp = pac::Peripherals::take().unwrap();
     let mut delay = set_up_ms_delay_provider(&mut dp.sysconfig, 50.MHz(), dp.tim0);
-    let mut temp_sensor = Adt75TempSensor::new(dp.i2ca, 50.MHz(), Some(&mut dp.sysconfig))
+    let mut temp_sensor = Adt75TempSensor::new(&mut dp.sysconfig, 50.MHz(), dp.i2ca)
         .expect("Creating temperature sensor struct failed");
     loop {
         let temp = temp_sensor

vorago-reb1/examples/adxl343-accelerometer.rs

@@ -52,12 +52,12 @@ fn main() -> ! {
         false,
         true,
     );
-    let mut spi = Spi::spib(
+    let mut spi = Spi::new(
+        &mut dp.sysconfig,
+        50.MHz(),
         dp.spib,
         (sck, miso, mosi),
-        50.MHz(),
         spi_cfg,
-        Some(&mut dp.sysconfig),
         Some(&transfer_cfg.downgrade()),
     );
 

vorago-reb1/examples/blinky-button-rtic.rs

@@ -5,6 +5,7 @@
 #[rtic::app(device = pac)]
 mod app {
     use panic_rtt_target as _;
+    use rtic_monotonics::systick::Systick;
     use rtt_target::{rprintln, rtt_init_default, set_print_channel};
     use va108xx_hal::{
         clock::{set_clk_div_register, FilterClkSel},
@@ -43,10 +44,18 @@ mod app {
     struct Shared {}
 
     #[init]
-    fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
+    fn init(ctx: init::Context) -> (Shared, Local) {
         let channels = rtt_init_default!();
         set_print_channel(channels.up.0);
         rprintln!("-- Vorago Button IRQ Example --");
+        // Initialize the systick interrupt & obtain the token to prove that we did
+        let systick_mono_token = rtic_monotonics::create_systick_token!();
+        Systick::start(
+            ctx.core.SYST,
+            Hertz::from(50.MHz()).raw(),
+            systick_mono_token,
+        );
+
         let mode = match CFG_MODE {
             // Ask mode from user via RTT
             CfgMode::Prompt => prompt_mode(channels.down.0),
@@ -90,7 +99,7 @@ mod app {
             50.MHz(),
             dp.tim0,
         );
-        (Shared {}, Local { leds, button, mode }, init::Monotonics())
+        (Shared {}, Local { leds, button, mode })
     }
 
     // `shared` cannot be accessed from this context

vorago-reb1/examples/max11619-adc.rs

@@ -139,12 +139,12 @@ fn main() -> ! {
         .expect("Setting accelerometer chip select high failed");
 
     let transfer_cfg = TransferConfig::<NoneT>::new(3.MHz(), spi::MODE_0, None, true, false);
-    let spi = Spi::spib(
+    let spi = Spi::new(
+        &mut dp.sysconfig,
+        50.MHz(),
         dp.spib,
         (sck, miso, mosi),
-        50.MHz(),
         spi_cfg,
-        Some(&mut dp.sysconfig),
         Some(&transfer_cfg.downgrade()),
     )
     .downgrade();

vorago-reb1/src/temp_sensor.rs

@@ -7,7 +7,7 @@
 //! - [Temperature Sensor example](https://egit.irs.uni-stuttgart.de/rust/vorago-reb1/src/branch/main/examples/adt75-temp-sensor.rs)
 use embedded_hal::i2c::{I2c, SevenBitAddress};
 use va108xx_hal::{
-    i2c::{Error, I2cMaster, I2cSpeed, MasterConfig},
+    i2c::{Error, I2cMaster, I2cSpeed, InitError, MasterConfig},
     pac,
     time::Hertz,
 };
@@ -29,20 +29,40 @@ pub enum RegAddresses {
     OneShot = 0x04,
 }
 
+#[derive(Debug)]
+pub enum AdtInitError {
+    Init(InitError),
+    I2c(Error),
+}
+
+impl From<InitError> for AdtInitError {
+    fn from(value: InitError) -> Self {
+        Self::Init(value)
+    }
+}
+
+impl From<Error> for AdtInitError {
+    fn from(value: Error) -> Self {
+        Self::I2c(value)
+    }
+}
+
 impl Adt75TempSensor {
     pub fn new(
-        i2ca: pac::I2ca,
+        sys_cfg: &mut pac::Sysconfig,
         sys_clk: impl Into<Hertz> + Copy,
-        sys_cfg: Option<&mut pac::Sysconfig>,
+        i2ca: pac::I2ca,
     ) -> Result<Self, Error> {
         let mut sensor = Adt75TempSensor {
-            sensor_if: I2cMaster::i2ca(
+            // The master construction can not fail for regular I2C speed.
+            sensor_if: I2cMaster::new(
+                sys_cfg,
+                sys_clk,
                 i2ca,
                 MasterConfig::default(),
-                sys_clk,
                 I2cSpeed::Regular100khz,
-                sys_cfg,
+            )
-            ),
+            .unwrap(),
             cmd_buf: [RegAddresses::Temperature as u8],
             current_reg: RegAddresses::Temperature,
         };