Skip to content

Pass Back I2C #49

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
isikkema wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pass Back I2C #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a797210
Add `destroy()` to `Bme680`
isikkema-ornl Jul 7, 2023
e0748fe
Pass back I2C dev on init error
isikkema-ornl Jul 7, 2023
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
25 changes: 20 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,17 +474,28 @@ where
mut i2c: I2C,
delay: &mut D,
dev_id: I2CAddress,
) -> Result<Bme680<I2C, D>, <I2C as Read>::Error, <I2C as Write>::Error> {
Bme680::soft_reset(&mut i2c, delay, dev_id)?;
) -> result::Result<Bme680<I2C, D>, (Error<<I2C as Read>::Error, <I2C as Write>::Error>, I2C)>
{
if let Err(e) = Bme680::soft_reset(&mut i2c, delay, dev_id) {
return Err((e, i2c));
}

debug!("Reading chip id");
/* Soft reset to restore it to default values*/
let chip_id = I2CUtil::read_byte::<I2C>(&mut i2c, dev_id.addr(), BME680_CHIP_ID_ADDR)?;
let chip_id = match I2CUtil::read_byte::<I2C>(&mut i2c, dev_id.addr(), BME680_CHIP_ID_ADDR)
{
Ok(chip_id) => chip_id,
Err(e) => return Err((e, i2c)),
};

debug!("Chip id: {}", chip_id);

if chip_id == BME680_CHIP_ID {
debug!("Reading calib data");
let calib = Bme680::<I2C, D>::get_calib_data::<I2C>(&mut i2c, dev_id)?;
let calib = match Bme680::<I2C, D>::get_calib_data::<I2C>(&mut i2c, dev_id) {
Ok(calib) => calib,
Err(e) => return Err((e, i2c)),
};
debug!("Calib data {:?}", calib);
let dev = Bme680 {
i2c,
Expand All @@ -499,10 +510,14 @@ where
Ok(dev)
} else {
error!("Device does not match chip id {}", BME680_CHIP_ID);
Err(Error::DeviceNotFound)
Err((Error::DeviceNotFound, i2c))
}
}

pub fn destroy(self) -> I2C {
self.i2c
}

fn bme680_set_regs(
&mut self,
reg: &[(u8, u8)],
Expand Down