diff --git a/Cargo.toml b/Cargo.toml index 3495125..be2f21b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/src/lib.rs b/src/lib.rs index ef466f6..c1a95c7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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)), } @@ -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)), } @@ -407,10 +407,10 @@ where ) -> Result<(), ::Error, ::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(()) } @@ -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))?; } @@ -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; @@ -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)) }