common

Author: burrbull

src/fmpi2c.rs

@@ -1,13 +1,18 @@
 use core::ops::Deref;
 
 use crate::gpio;
-use crate::i2c::{Address, Error, Hal02Operation, Hal1Operation, NoAcknowledgeSource};
+
 use crate::pac::fmpi2c1 as i2c1;
 use crate::pac::{self, rcc, RCC};
 use crate::rcc::{BusClock, Clocks, Enable, Reset};
 use fugit::{HertzU32 as Hertz, RateExtU32};
 use micromath::F32Ext;
 
+#[path = "i2c/common.rs"]
+mod common;
+pub use common::{Address, Error, NoAcknowledgeSource};
+use common::{Hal02Operation, Hal1Operation};
+
 #[path = "i2c/hal_02.rs"]
 mod hal_02;
 #[path = "i2c/hal_1.rs"]

src/i2c.rs

@@ -8,28 +8,14 @@ use crate::gpio;
 use crate::rcc::Clocks;
 use fugit::{HertzU32 as Hertz, RateExtU32};
 
+mod common;
 mod hal_02;
 mod hal_1;
 
-pub mod dma;
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Address {
-    Seven(u8),
-    Ten(u16),
-}
+pub use common::{Address, Error, NoAcknowledgeSource};
+use common::{Hal02Operation, Hal1Operation};
 
-impl From<u8> for Address {
-    fn from(value: u8) -> Self {
-        Self::Seven(value)
-    }
-}
-
-impl From<u16> for Address {
-    fn from(value: u16) -> Self {
-        Self::Ten(value)
-    }
-}
+pub mod dma;
 
 #[derive(Debug, Eq, PartialEq)]
 pub enum DutyCycle {
@@ -88,52 +74,6 @@ pub struct I2c<I2C: Instance> {
     pins: (I2C::Scl, I2C::Sda),
 }
 
-pub use embedded_hal::i2c::NoAcknowledgeSource;
-
-#[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[non_exhaustive]
-pub enum Error {
-    Overrun,
-    NoAcknowledge(NoAcknowledgeSource),
-    Timeout,
-    // Note: The Bus error type is not currently returned, but is maintained for compatibility.
-    Bus,
-    Crc,
-    ArbitrationLoss,
-}
-
-impl Error {
-    pub(crate) fn nack_addr(self) -> Self {
-        match self {
-            Error::NoAcknowledge(NoAcknowledgeSource::Unknown) => {
-                Error::NoAcknowledge(NoAcknowledgeSource::Address)
-            }
-            e => e,
-        }
-    }
-    pub(crate) fn nack_data(self) -> Self {
-        match self {
-            Error::NoAcknowledge(NoAcknowledgeSource::Unknown) => {
-                Error::NoAcknowledge(NoAcknowledgeSource::Data)
-            }
-            e => e,
-        }
-    }
-}
-
-use embedded_hal::i2c::ErrorKind;
-impl embedded_hal::i2c::Error for Error {
-    fn kind(&self) -> ErrorKind {
-        match *self {
-            Self::Overrun => ErrorKind::Overrun,
-            Self::Bus => ErrorKind::Bus,
-            Self::ArbitrationLoss => ErrorKind::ArbitrationLoss,
-            Self::NoAcknowledge(nack) => ErrorKind::NoAcknowledge(nack),
-            Self::Crc | Self::Timeout => ErrorKind::Other,
-        }
-    }
-}
-
 pub trait Instance:
     crate::Sealed + Deref<Target = i2c1::RegisterBlock> + Enable + Reset + gpio::alt::I2cCommon
 {
@@ -727,9 +667,6 @@ macro_rules! transaction_impl {
 }
 use transaction_impl;
 
-pub(crate) type Hal1Operation<'a> = embedded_hal::i2c::Operation<'a>;
-pub(crate) type Hal02Operation<'a> = embedded_hal_02::blocking::i2c::Operation<'a>;
-
 impl<I2C: Instance> embedded_hal_02::blocking::i2c::WriteIter for I2c<I2C> {
     type Error = Error;
 

src/i2c/common.rs

@@ -0,0 +1,66 @@
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum Address {
+    Seven(u8),
+    Ten(u16),
+}
+
+impl From<u8> for Address {
+    fn from(value: u8) -> Self {
+        Self::Seven(value)
+    }
+}
+
+impl From<u16> for Address {
+    fn from(value: u16) -> Self {
+        Self::Ten(value)
+    }
+}
+
+pub use embedded_hal::i2c::NoAcknowledgeSource;
+
+#[derive(Debug, Eq, PartialEq, Copy, Clone)]
+#[non_exhaustive]
+pub enum Error {
+    Overrun,
+    NoAcknowledge(NoAcknowledgeSource),
+    Timeout,
+    // Note: The Bus error type is not currently returned, but is maintained for compatibility.
+    Bus,
+    Crc,
+    ArbitrationLoss,
+}
+
+impl Error {
+    pub(crate) fn nack_addr(self) -> Self {
+        match self {
+            Error::NoAcknowledge(NoAcknowledgeSource::Unknown) => {
+                Error::NoAcknowledge(NoAcknowledgeSource::Address)
+            }
+            e => e,
+        }
+    }
+    pub(crate) fn nack_data(self) -> Self {
+        match self {
+            Error::NoAcknowledge(NoAcknowledgeSource::Unknown) => {
+                Error::NoAcknowledge(NoAcknowledgeSource::Data)
+            }
+            e => e,
+        }
+    }
+}
+
+use embedded_hal::i2c::ErrorKind;
+impl embedded_hal::i2c::Error for Error {
+    fn kind(&self) -> ErrorKind {
+        match *self {
+            Self::Overrun => ErrorKind::Overrun,
+            Self::Bus => ErrorKind::Bus,
+            Self::ArbitrationLoss => ErrorKind::ArbitrationLoss,
+            Self::NoAcknowledge(nack) => ErrorKind::NoAcknowledge(nack),
+            Self::Crc | Self::Timeout => ErrorKind::Other,
+        }
+    }
+}
+
+pub(crate) type Hal1Operation<'a> = embedded_hal::i2c::Operation<'a>;
+pub(crate) type Hal02Operation<'a> = embedded_hal_02::blocking::i2c::Operation<'a>;