Skip to content

WIP: Update to Embedded hal 1.0 #25

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

WIP: Update to Embedded hal 1.0 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77449eb
Update to embedded hal 1.0a2
caemor Oct 26, 2020
30da8e6
Update dev-deps env_logger & tokio
caemor Oct 26, 2020
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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ maintenance = { status = "passively-maintained" }

[dependencies]
bitflags = "1.2"
embedded-hal = "0.2"
embedded-hal = "1.0.0-alpha.2"
log = "0.4"

[dev-dependencies]
env_logger = "0.7"
env_logger = "0.8.1"
futures = { version = "0.3" }
i2cdev = "0.4"
influx_db_client = { version = "0.4", default-features= false, features = ["rustls-tls"] }
linux-embedded-hal = "0.3"
tokio = {version = "0.2", features = ["full"] }
tokio = {version = "0.3.1", features = ["full"] }
url = "2.1"
18 changes: 9 additions & 9 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,10 @@ impl I2CUtil {
{
let mut buf = [0; 1];

i2c.write(dev_id, &mut [reg_addr])
i2c.try_write(dev_id, &mut [reg_addr])
.map_err(|e| Error::I2CWrite(e))?;

match i2c.read(dev_id, &mut buf) {
match i2c.try_read(dev_id, &mut buf) {
Ok(()) => Ok(buf[0]),
Err(e) => Err(Error::I2CRead(e)),
}
Expand All @@ -345,10 +345,10 @@ impl I2CUtil {
where
I2C: Read + Write,
{
i2c.write(dev_id, &mut [reg_addr])
i2c.try_write(dev_id, &mut [reg_addr])
.map_err(|e| Error::I2CWrite(e))?;

match i2c.read(dev_id, buf) {
match i2c.try_read(dev_id, buf) {
Ok(()) => Ok(()),
Err(e) => Err(Error::I2CRead(e)),
}
Expand Down Expand Up @@ -407,10 +407,10 @@ where
) -> Result<(), <I2C as Read>::Error, <I2C as Write>::Error> {
let tmp_buff: [u8; 2] = [BME680_SOFT_RESET_ADDR, BME680_SOFT_RESET_CMD];

i2c.write(dev_id.addr(), &tmp_buff)
i2c.try_write(dev_id.addr(), &tmp_buff)
.map_err(|e| Error::I2CWrite(e))?;

delay.delay_ms(BME680_RESET_PERIOD);
delay.try_delay_ms(BME680_RESET_PERIOD);
Ok(())
}

Expand Down Expand Up @@ -462,7 +462,7 @@ where
reg_addr, tmp_buff
);
self.i2c
.write(self.dev_id.addr(), &tmp_buff)
.try_write(self.dev_id.addr(), &tmp_buff)
.map_err(|e| Error::I2CWrite(e))?;
}

Expand Down Expand Up @@ -674,7 +674,7 @@ where
tmp_pow_mode = tmp_pow_mode & !BME680_MODE_MSK;
debug!("Setting to sleep tmp_pow_mode: {}", tmp_pow_mode);
self.bme680_set_regs(&[(BME680_CONF_T_P_MODE_ADDR, tmp_pow_mode)])?;
self.delay.delay_ms(BME680_POLL_PERIOD_MS);
self.delay.try_delay_ms(BME680_POLL_PERIOD_MS);
} else {
// TODO do while in Rust?
break;
Expand Down Expand Up @@ -935,7 +935,7 @@ where
return Ok((data, FieldDataCondition::NewData));
}

self.delay.delay_ms(BME680_POLL_PERIOD_MS);
self.delay.try_delay_ms(BME680_POLL_PERIOD_MS);
}
Ok((data, FieldDataCondition::Unchanged))
}
Expand Down