Skip to content

Demacrofy I2C #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Demacrofy I2C #219

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27de0ec
i2c: move methods from macro to instance trait
techmccat Jul 30, 2024
41d2c25
i2c: use deref in instance
techmccat Jul 17, 2025
3f9ea67
i2c: run cargo fmt
techmccat Jul 17, 2025
be11054
i2c: new() constructor
techmccat Jul 17, 2025
cb4bb01
i2c: drop new, make pins tuple
techmccat Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ pub trait Instance:
}

macro_rules! i2c {
($I2CX:ident, $i2cx:ident,
($I2CX:ident,
sda: [ $($( #[ $pmetasda:meta ] )* $PSDA:ident<$AFDA:ident>,)+ ],
scl: [ $($( #[ $pmetascl:meta ] )* $PSCL:ident<$AFCL:ident>,)+ ],
) => {
Expand Down Expand Up @@ -235,7 +235,7 @@ impl<I2C: Instance> I2cExt<I2C> for I2C {
SDA: SDAPin<I2C>,
SCL: SCLPin<I2C>,
{
I2c::i2c(self, sda, scl, config.into(), rcc)
I2c::new(self, (sda, scl), config.into(), rcc)
}
}

Expand All @@ -246,7 +246,7 @@ where
SCL: SCLPin<I2C>,
{
/// Initializes the I2C peripheral.
pub fn i2c(i2c: I2C, sda: SDA, scl: SCL, config: Config, rcc: &mut Rcc) -> Self
pub fn new(i2c: I2C, (sda, scl): (SDA, SCL), config: Config, rcc: &mut Rcc) -> Self
where
SDA: SDAPin<I2C>,
SCL: SCLPin<I2C>,
Expand Down Expand Up @@ -490,7 +490,6 @@ where

i2c!(
I2C1,
i2c1,
sda: [
PA14<AF4>,
PB7<AF4>,
Expand All @@ -505,7 +504,6 @@ i2c!(

i2c!(
I2C2,
i2c2,
sda: [
PA8<AF4>,
PF0<AF4>,
Expand All @@ -525,7 +523,6 @@ i2c!(

i2c!(
I2C3,
i2c3,
sda: [
PB5<AF8>,
PC11<AF8>,
Expand Down Expand Up @@ -573,7 +570,6 @@ i2c!(
))]
i2c!(
I2C4,
i2c4,
sda: [
PB7<AF3>,
PC7<AF8>,
Expand Down
Loading