alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-10-17 14:31:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90 from 9names/i2c-hacks

Browse source 
I2c fixes
This commit is contained in:
Jonathan 'theJPster' Pallant 2021-08-21 19:43:04 +01:00 committed by GitHub
parent 199ad891ed 151b754d90
commit ee5e6ee1cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rp2040-hal/src/gpio/reg.rs
View file

@ -88,6 +88,9 @@ impl From<DynPinMode> for ModeFields {
UsbAux => 9, UsbAux => 9,
}; };
fields.inen = true; fields.inen = true;
if func == I2C {
fields.pue = true;
}
} }
}; };

16
rp2040-hal/src/i2c.rs
View file

@ -105,7 +105,7 @@ macro_rules! hal {
i2c.ic_enable.write(|w| w.enable().disabled()); i2c.ic_enable.write(|w| w.enable().disabled());
i2c.ic_con.write(|w| { i2c.ic_con.modify(|_,w| {
w.speed().fast(); w.speed().fast();
w.master_mode().enabled(); w.master_mode().enabled();
w.ic_slave_disable().slave_disabled(); w.ic_slave_disable().slave_disabled();
@ -126,14 +126,14 @@ macro_rules! hal {
// There are some subtleties to I2C timing which we are completely ignoring here // There are some subtleties to I2C timing which we are completely ignoring here
// See: https://github.com/raspberrypi/pico-sdk/blob/bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7/src/rp2_common/hardware_i2c/i2c.c#L69 // See: https://github.com/raspberrypi/pico-sdk/blob/bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7/src/rp2_common/hardware_i2c/i2c.c#L69
let period = (freq_in + freq / 2) / freq; let period = (freq_in + freq / 2) / freq;
let hcnt = period * 3 / 5; // oof this one hurts let lcnt = period * 3 / 5; // oof this one hurts
let lcnt = period - hcnt; let hcnt = period - lcnt;
// Check for out-of-range divisors: // Check for out-of-range divisors:
assert!(hcnt < 0xffff); assert!(hcnt <= 0xffff);
assert!(lcnt < 0xffff); assert!(lcnt <= 0xffff);
assert!(hcnt > 8); assert!(hcnt >= 8);
assert!(lcnt > 8); assert!(lcnt >= 8);
// Per I2C-bus specification a device in standard or fast mode must // Per I2C-bus specification a device in standard or fast mode must
// internally provide a hold time of at least 300ns for the SDA signal to // internally provide a hold time of at least 300ns for the SDA signal to
@ -162,7 +162,7 @@ macro_rules! hal {
.bits(if lcnt < 16 { 1 } else { (lcnt / 16) as u8 }) .bits(if lcnt < 16 { 1 } else { (lcnt / 16) as u8 })
}); });
i2c.ic_sda_hold i2c.ic_sda_hold
.write(|w| w.ic_sda_tx_hold().bits(sda_tx_hold_count as u16)); .modify(|_r,w| w.ic_sda_tx_hold().bits(sda_tx_hold_count as u16));
} }
i2c.ic_enable.write(|w| w.enable().enabled()); i2c.ic_enable.write(|w| w.enable().enabled());